diff options
Diffstat (limited to 'winsup/cygwin/fhandler_socket.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_socket.cc | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 50aaf1f83..9f8aa2c6a 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -403,15 +403,9 @@ fhandler_socket::af_local_set_secret (char *buf) /* Maximum number of concurrently opened sockets from all Cygwin processes per session. Note that shared sockets (through dup/fork/exec) are counted as one socket. */ -#define NUM_SOCKS (65536 / sizeof (wsa_event)) - #define LOCK_EVENTS WaitForSingleObject (wsock_mtx, INFINITE) #define UNLOCK_EVENTS ReleaseMutex (wsock_mtx) -static wsa_event wsa_events[NUM_SOCKS] __attribute__((section (".cygwin_dll_common"), shared)) = { 0 }; - -static LONG socket_serial_number __attribute__((section (".cygwin_dll_common"), shared)) = 0; - static HANDLE wsa_slot_mtx; static wsa_event * @@ -422,7 +416,7 @@ search_wsa_event_slot (LONG new_serial_number) if (!wsa_slot_mtx) { wsa_slot_mtx = CreateMutex (&sec_all, FALSE, - shared_name (name, "sock", 0, true)); + shared_name (name, "sock", 0)); if (!wsa_slot_mtx) api_fatal ("Couldn't create/open shared socket mutex, %E"); } @@ -436,11 +430,11 @@ search_wsa_event_slot (LONG new_serial_number) break; } unsigned int slot = new_serial_number % NUM_SOCKS; - while (wsa_events[slot].serial_number) + while (cygwin_shared->wsa_events[slot].serial_number) { HANDLE searchmtx = OpenMutex (STANDARD_RIGHTS_READ, FALSE, - shared_name (searchname, "sock", wsa_events[slot].serial_number, - true)); + shared_name (searchname, "sock", + cygwin_shared->wsa_events[slot].serial_number)); if (!searchmtx) break; /* Mutex still exists, attached socket is active, try next slot. */ @@ -454,10 +448,10 @@ search_wsa_event_slot (LONG new_serial_number) return NULL; } } - memset (&wsa_events[slot], 0, sizeof (wsa_event)); - wsa_events[slot].serial_number = new_serial_number; + memset (&cygwin_shared->wsa_events[slot], 0, sizeof (wsa_event)); + cygwin_shared->wsa_events[slot].serial_number = new_serial_number; ReleaseMutex (wsa_slot_mtx); - return wsa_events + slot; + return cygwin_shared->wsa_events + slot; } bool @@ -469,12 +463,12 @@ fhandler_socket::init_events () do { - new_serial_number = InterlockedIncrement (&socket_serial_number); + new_serial_number = + InterlockedIncrement (&cygwin_shared->socket_serial_number); if (!new_serial_number) /* 0 is reserved for global mutex */ - InterlockedIncrement (&socket_serial_number); + InterlockedIncrement (&cygwin_shared->socket_serial_number); wsock_mtx = CreateMutex (&sec_all, FALSE, - shared_name (name, "sock", new_serial_number, - true)); + shared_name (name, "sock", new_serial_number)); if (!wsock_mtx) { debug_printf ("CreateMutex, %E"); |