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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/bin/socket.cc

Issue 2974233002: VM: Re-format to use at most one newline between functions (Closed)
Patch Set: Rebase and merge Created 3 years, 5 months 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') | runtime/bin/socket_android.cc » ('j') | 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 89d5459db32be6ea77f8bf72436cfc198d915282..3f4ac0332224928cc53b36db40561a72d9222404 100644
--- a/runtime/bin/socket.cc
+++ b/runtime/bin/socket.cc
@@ -35,18 +35,15 @@ void ListeningSocketRegistry::Initialize() {
globalTcpListeningSocketRegistry = new ListeningSocketRegistry();
}
-
ListeningSocketRegistry* ListeningSocketRegistry::Instance() {
return globalTcpListeningSocketRegistry;
}
-
void ListeningSocketRegistry::Cleanup() {
delete globalTcpListeningSocketRegistry;
globalTcpListeningSocketRegistry = NULL;
}
-
ListeningSocketRegistry::OSSocket* ListeningSocketRegistry::LookupByPort(
intptr_t port) {
HashMap::Entry* entry = sockets_by_port_.Lookup(
@@ -57,7 +54,6 @@ ListeningSocketRegistry::OSSocket* ListeningSocketRegistry::LookupByPort(
return reinterpret_cast<OSSocket*>(entry->value);
}
-
void ListeningSocketRegistry::InsertByPort(intptr_t port, OSSocket* socket) {
HashMap::Entry* entry = sockets_by_port_.Lookup(
GetHashmapKeyFromIntptr(port), GetHashmapHashFromIntptr(port), true);
@@ -65,13 +61,11 @@ void ListeningSocketRegistry::InsertByPort(intptr_t port, OSSocket* socket) {
entry->value = reinterpret_cast<void*>(socket);
}
-
void ListeningSocketRegistry::RemoveByPort(intptr_t port) {
sockets_by_port_.Remove(GetHashmapKeyFromIntptr(port),
GetHashmapHashFromIntptr(port));
}
-
ListeningSocketRegistry::OSSocket* ListeningSocketRegistry::LookupByFd(
Socket* fd) {
HashMap::Entry* entry = sockets_by_fd_.Lookup(
@@ -83,7 +77,6 @@ ListeningSocketRegistry::OSSocket* ListeningSocketRegistry::LookupByFd(
return reinterpret_cast<OSSocket*>(entry->value);
}
-
void ListeningSocketRegistry::InsertByFd(Socket* fd, OSSocket* socket) {
HashMap::Entry* entry = sockets_by_fd_.Lookup(
GetHashmapKeyFromIntptr(reinterpret_cast<intptr_t>(fd)),
@@ -92,14 +85,12 @@ void ListeningSocketRegistry::InsertByFd(Socket* fd, OSSocket* socket) {
entry->value = reinterpret_cast<void*>(socket);
}
-
void ListeningSocketRegistry::RemoveByFd(Socket* fd) {
sockets_by_fd_.Remove(
GetHashmapKeyFromIntptr(reinterpret_cast<intptr_t>(fd)),
GetHashmapHashFromIntptr(reinterpret_cast<intptr_t>(fd)));
}
-
Dart_Handle ListeningSocketRegistry::CreateBindListen(Dart_Handle socket_object,
RawAddr addr,
intptr_t backlog,
@@ -204,7 +195,6 @@ Dart_Handle ListeningSocketRegistry::CreateBindListen(Dart_Handle socket_object,
return Dart_True();
}
-
bool ListeningSocketRegistry::CloseOneSafe(OSSocket* os_socket,
bool update_hash_maps) {
ASSERT(!mutex_->TryLock());
@@ -243,7 +233,6 @@ bool ListeningSocketRegistry::CloseOneSafe(OSSocket* os_socket,
return true;
}
-
void ListeningSocketRegistry::CloseAllSafe() {
MutexLocker ml(mutex_);
@@ -253,7 +242,6 @@ void ListeningSocketRegistry::CloseAllSafe() {
}
}
-
bool ListeningSocketRegistry::CloseSafe(Socket* socketfd) {
ASSERT(!mutex_->TryLock());
OSSocket* os_socket = LookupByFd(socketfd);
@@ -267,7 +255,6 @@ bool ListeningSocketRegistry::CloseSafe(Socket* socketfd) {
}
}
-
void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
RawAddr addr;
SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
@@ -285,7 +272,6 @@ void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_CreateBindConnect)(Dart_NativeArguments args) {
RawAddr addr;
SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
@@ -305,7 +291,6 @@ void FUNCTION_NAME(Socket_CreateBindConnect)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_CreateBindDatagram)(Dart_NativeArguments args) {
RawAddr addr;
SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
@@ -324,7 +309,6 @@ void FUNCTION_NAME(Socket_CreateBindDatagram)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -338,7 +322,6 @@ void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -380,7 +363,6 @@ void FUNCTION_NAME(Socket_Read)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_RecvFrom)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -451,7 +433,6 @@ void FUNCTION_NAME(Socket_RecvFrom)(Dart_NativeArguments args) {
Dart_SetReturnValue(args, result);
}
-
void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -495,7 +476,6 @@ void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_SendTo)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -532,7 +512,6 @@ void FUNCTION_NAME(Socket_SendTo)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -545,7 +524,6 @@ void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -571,7 +549,6 @@ void FUNCTION_NAME(Socket_GetRemotePeer)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -580,7 +557,6 @@ void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
}
-
void FUNCTION_NAME(Socket_GetType)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -593,7 +569,6 @@ void FUNCTION_NAME(Socket_GetType)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
int64_t num =
DartUtils::GetInt64ValueCheckRange(Dart_GetNativeArgument(args, 1), 0, 2);
@@ -603,7 +578,6 @@ void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
}
-
void FUNCTION_NAME(Socket_GetSocketId)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -611,14 +585,12 @@ void FUNCTION_NAME(Socket_GetSocketId)(Dart_NativeArguments args) {
Dart_SetReturnValue(args, Dart_NewInteger(id));
}
-
void FUNCTION_NAME(Socket_SetSocketId)(Dart_NativeArguments args) {
intptr_t id = DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 1));
Socket::SetSocketIdNativeField(Dart_GetNativeArgument(args, 0), id,
Socket::kFinalizerNormal);
}
-
void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
RawAddr addr;
SocketAddress::GetSockAddr(Dart_GetNativeArgument(args, 1), &addr);
@@ -636,7 +608,6 @@ void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
Dart_SetReturnValue(args, result);
}
-
void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -652,7 +623,6 @@ void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
}
}
-
CObject* Socket::LookupRequest(const CObjectArray& request) {
if ((request.Length() == 2) && request[0]->IsString() &&
request[1]->IsInt32()) {
@@ -695,7 +665,6 @@ CObject* Socket::LookupRequest(const CObjectArray& request) {
return CObject::IllegalArgumentError();
}
-
CObject* Socket::ReverseLookupRequest(const CObjectArray& request) {
if ((request.Length() == 1) && request[0]->IsTypedData()) {
CObjectUint8Array addr_object(request[0]);
@@ -727,7 +696,6 @@ CObject* Socket::ReverseLookupRequest(const CObjectArray& request) {
return CObject::IllegalArgumentError();
}
-
CObject* Socket::ListInterfacesRequest(const CObjectArray& request) {
if ((request.Length() == 1) && request[0]->IsInt32()) {
CObjectInt32 type(request[0]);
@@ -777,7 +745,6 @@ CObject* Socket::ListInterfacesRequest(const CObjectArray& request) {
return CObject::IllegalArgumentError();
}
-
void FUNCTION_NAME(Socket_GetOption)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -832,7 +799,6 @@ void FUNCTION_NAME(Socket_GetOption)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_SetOption)(Dart_NativeArguments args) {
bool result = false;
Socket* socket =
@@ -877,7 +843,6 @@ void FUNCTION_NAME(Socket_SetOption)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_JoinMulticast)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -897,7 +862,6 @@ void FUNCTION_NAME(Socket_JoinMulticast)(Dart_NativeArguments args) {
}
}
-
void FUNCTION_NAME(Socket_LeaveMulticast)(Dart_NativeArguments args) {
Socket* socket =
Socket::GetSocketIdNativeField(Dart_GetNativeArgument(args, 0));
@@ -917,7 +881,6 @@ void FUNCTION_NAME(Socket_LeaveMulticast)(Dart_NativeArguments args) {
}
}
-
static void NormalSocketFinalizer(void* isolate_data,
Dart_WeakPersistentHandle handle,
void* data) {
@@ -931,7 +894,6 @@ static void NormalSocketFinalizer(void* isolate_data,
socket->Release();
}
-
static void ListeningSocketFinalizer(void* isolate_data,
Dart_WeakPersistentHandle handle,
void* data) {
@@ -945,7 +907,6 @@ static void ListeningSocketFinalizer(void* isolate_data,
socket->Release();
}
-
static void StdioSocketFinalizer(void* isolate_data,
Dart_WeakPersistentHandle handle,
void* data) {
@@ -956,7 +917,6 @@ static void StdioSocketFinalizer(void* isolate_data,
socket->Release();
}
-
void Socket::ReuseSocketIdNativeField(Dart_Handle handle,
Socket* socket,
SocketFinalizer finalizer) {
@@ -987,7 +947,6 @@ void Socket::ReuseSocketIdNativeField(Dart_Handle handle,
}
}
-
void Socket::SetSocketIdNativeField(Dart_Handle handle,
intptr_t id,
SocketFinalizer finalizer) {
@@ -995,7 +954,6 @@ void Socket::SetSocketIdNativeField(Dart_Handle handle,
ReuseSocketIdNativeField(handle, socket, finalizer);
}
-
Socket* Socket::GetSocketIdNativeField(Dart_Handle socket_obj) {
intptr_t id;
Dart_Handle err =
« no previous file with comments | « runtime/bin/socket.h ('k') | runtime/bin/socket_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698