Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/bin/socket.cc

Issue 81013002: Cleanup the getting and setting of the socket file descriptor (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Correctly rebased Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/socket.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket.cc
diff --git a/runtime/bin/socket.cc b/runtime/bin/socket.cc
index 4b6b37785bbeb1078dccea66e74ab22c87c732a1..02f53e75fb246644c0e26eec2fcd44f8858c2c3b 100644
--- a/runtime/bin/socket.cc
+++ b/runtime/bin/socket.cc
@@ -114,8 +114,7 @@ void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
OSError error;
Dart_TypedDataReleaseData(host_obj);
if (socket >= 0) {
- Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ Socket::SetSocketIdNativeField(socket_obj, socket);
Dart_SetReturnValue(args, Dart_True());
} else {
Dart_SetReturnValue(args, DartUtils::NewDartOSError(&error));
@@ -130,10 +129,8 @@ void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
intptr_t available = Socket::Available(socket);
if (available >= 0) {
Dart_SetReturnValue(args, Dart_NewInteger(available));
@@ -145,10 +142,8 @@ void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
static bool short_socket_reads = Dart_IsVMFlagSet("short_socket_read");
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
intptr_t available = Socket::Available(socket);
if (available > 0) {
int64_t length = 0;
@@ -200,10 +195,8 @@ void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
static bool short_socket_writes = Dart_IsVMFlagSet("short_socket_write");
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
ASSERT(Dart_IsList(buffer_obj));
intptr_t offset =
@@ -235,10 +228,8 @@ void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
OSError os_error;
intptr_t port = Socket::GetPort(socket);
if (port > 0) {
@@ -250,10 +241,8 @@ void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
OSError os_error;
intptr_t port = 0;
SocketAddress* addr = Socket::GetRemotePeer(socket, &port);
@@ -281,10 +270,8 @@ void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
OSError os_error;
Socket::GetError(socket, &os_error);
Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
@@ -292,9 +279,8 @@ void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
void FUNCTION_NAME(Socket_GetType)(Dart_NativeArguments args) {
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Socket::GetSocketIdNativeField(socket_obj, &socket);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
OSError os_error;
intptr_t type = Socket::GetType(socket);
if (type >= 0) {
@@ -311,8 +297,7 @@ void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 1));
ASSERT(num == 0 || num == 1 || num == 2);
intptr_t socket = Socket::GetStdioHandle(num);
- Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ Socket::SetSocketIdNativeField(socket_obj, socket);
Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
}
@@ -321,8 +306,7 @@ void FUNCTION_NAME(Socket_SetSocketId)(Dart_NativeArguments args) {
Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
intptr_t id =
DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 1));
- Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, id);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ Socket::SetSocketIdNativeField(socket_obj, id);
}
@@ -345,8 +329,7 @@ void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
OSError error;
Dart_TypedDataReleaseData(host_obj);
if (socket >= 0) {
- Dart_Handle err = Socket::SetSocketIdNativeField(socket_obj, socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ Socket::SetSocketIdNativeField(socket_obj, socket);
Dart_SetReturnValue(args, Dart_True());
} else {
if (socket == -5) {
@@ -366,16 +349,12 @@ void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
Dart_Handle result_socket_obj = Dart_GetNativeArgument(args, 1);
intptr_t new_socket = ServerSocket::Accept(socket);
if (new_socket >= 0) {
- Dart_Handle err = Socket::SetSocketIdNativeField(result_socket_obj,
- new_socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ Socket::SetSocketIdNativeField(result_socket_obj, new_socket);
Dart_SetReturnValue(args, Dart_True());
} else if (new_socket == ServerSocket::kTemporaryFailure) {
Dart_SetReturnValue(args, Dart_False());
@@ -509,14 +488,12 @@ CObject* Socket::ListInterfacesRequest(const CObjectArray& request) {
void FUNCTION_NAME(Socket_SetOption)(Dart_NativeArguments args) {
- Dart_Handle socket_obj = Dart_GetNativeArgument(args, 0);
- intptr_t socket = 0;
bool result = false;
- Dart_Handle err = Socket::GetSocketIdNativeField(socket_obj, &socket);
- if (Dart_IsError(err)) Dart_PropagateError(err);
+ intptr_t socket =
+ Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
Dart_Handle option_obj = Dart_GetNativeArgument(args, 1);
int64_t option;
- err = Dart_IntegerToInt64(option_obj, &option);
+ Dart_Handle err = Dart_IntegerToInt64(option_obj, &option);
if (Dart_IsError(err)) Dart_PropagateError(err);
Dart_Handle enabled_obj = Dart_GetNativeArgument(args, 2);
bool enabled;
@@ -533,13 +510,19 @@ void FUNCTION_NAME(Socket_SetOption)(Dart_NativeArguments args) {
}
-Dart_Handle Socket::SetSocketIdNativeField(Dart_Handle socket, intptr_t id) {
- return Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
+void Socket::SetSocketIdNativeField(Dart_Handle socket, intptr_t id) {
+ Dart_Handle err =
+ Dart_SetNativeInstanceField(socket, kSocketIdNativeField, id);
+ if (Dart_IsError(err)) Dart_PropagateError(err);
}
-Dart_Handle Socket::GetSocketIdNativeField(Dart_Handle socket, intptr_t* id) {
- return Dart_GetNativeInstanceField(socket, kSocketIdNativeField, id);
+intptr_t Socket::GetSocketIdNativeField(Dart_Handle socket_obj) {
+ intptr_t socket = 0;
+ Dart_Handle err =
+ Dart_GetNativeInstanceField(socket_obj, kSocketIdNativeField, &socket);
+ if (Dart_IsError(err)) Dart_PropagateError(err);
+ return socket;
}
} // namespace bin
« no previous file with comments | « runtime/bin/socket.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698