diff options
Diffstat (limited to 'tests/MT_SOCK_Test.cpp')
| -rw-r--r-- | tests/MT_SOCK_Test.cpp | 139 |
1 files changed, 58 insertions, 81 deletions
diff --git a/tests/MT_SOCK_Test.cpp b/tests/MT_SOCK_Test.cpp index eb407f5f596..0cb9bab0827 100644 --- a/tests/MT_SOCK_Test.cpp +++ b/tests/MT_SOCK_Test.cpp @@ -63,7 +63,8 @@ client (void *arg) ACE_Time_Value *timeout = &tv; #endif /* ACE_HAS_BROKEN_NON_BLOCKING_CONNECTS */ - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) client: Connecting...\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) client: Connecting...\n"))); // Initiate timed connection with server. // Attempt a timed connect to the server. @@ -73,24 +74,24 @@ client (void *arg) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("client: Connection timed out."))); + ACE_TEXT ("client: Connection timed out."))); return 0; } if (cli_stream.get_local_addr (client_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("client: get_local_addr")), + ACE_TEXT ("client: get_local_addr")), 0); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) client: Connected at %d\n"), + ACE_TEXT ("(%P|%t) client: Connected at %d\n"), client_addr.get_port_number ())); if (cli_stream.disable (ACE_NONBLOCK) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("client: disable"))); + ACE_TEXT ("client: disable"))); // Send data to server (correctly handles "incomplete writes"). @@ -99,43 +100,26 @@ client (void *arg) for (const char *c = ACE_ALPHABET; *c != '\0'; c++) if (cli_stream.send_n (c, 1) == -1) { - // This is, I believe, more of an issue with WinXP-64 _server_ - // side, but we can trap it here since we know we're connecting - // to localhost. It appears, though I haven't found documentation - // stating, that WinXP-64 will appear to accept connections at the - // TCP level past the listen backlog but if data arrives before the - // actual application-level accept() occurs, the connection is reset. - // So, if we get a reset on the first send, don't flag the error - - // just note it and act like the connection was refused. - if (c == ACE_ALPHABET && errno == ECONNRESET) // First byte sent - { - ACE_DEBUG - ((LM_DEBUG, - ACE_TEXT ("(%P|%t) client: Connection refused (delayed)\n"))); - cli_stream.close (); - return 0; - } - - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) (errno %d) %p\n"), errno, - ACE_TEXT ("client: send_n"))); + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("(%P|%t) (%d) %p\n"), errno, + ACE_TEXT ("client: send_n"))); ACE_ERROR ((LM_ERROR, "client: Closing stream.\n")); cli_stream.close(); return 0; } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) client: Closing writer...\n"))); + ACE_TEXT ("(%P|%t) client: Closing writer...\n"))); // Explicitly close the writer-side of the connection. if (cli_stream.close_writer () == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("client: close_writer"))); + ACE_TEXT ("client: close_writer"))); char buf[1]; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) client: Waiting for server handshake...\n"))); + ACE_TEXT ("(%P|%t) client: Waiting for server handshake...\n"))); // Wait for handshake with server. if (cli_stream.recv_n (buf, 1) != 1) @@ -143,15 +127,14 @@ client (void *arg) ACE_TEXT ("(%P|%t) %p\n"), ACE_TEXT ("client: recv_n"))); - ACE_DEBUG - ((LM_DEBUG, - ACE_TEXT ("(%P|%t) client: Handshake received. Closing stream.\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) client: Handshake received. Closing stream.\n"))); // Close the connection completely. if (cli_stream.close () == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("client: close"))); + ACE_TEXT ("client: close"))); return 0; } @@ -164,7 +147,7 @@ server (void *arg) if (peer_acceptor->enable (ACE_NONBLOCK) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("server: enable acceptor"))); + ACE_TEXT ("server: enable acceptor"))); // Keep these objects out here to prevent excessive constructor // calls... @@ -190,7 +173,7 @@ server (void *arg) handle_set.reset (); handle_set.set_bit (peer_acceptor->get_handle ()); - ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Waiting for connection...\n")); + ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Waiting for connection...\n")); int select_width; # if defined (ACE_WIN64) @@ -200,28 +183,26 @@ server (void *arg) # else select_width = int (peer_acceptor->get_handle ()) + 1; # endif /* ACE_WIN64 */ - int result = ACE_OS::select (select_width, handle_set, 0, 0, &tv); + int result = ACE_OS::select (select_width, handle_set, 0, 0, &tv); ACE_ASSERT (tv == def_timeout); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("server: select acceptor")), + ACE_TEXT ("server: select acceptor")), 0); else if (result == 0) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: Test finished.\n"))); - // The meaning of the backlog parameter for listen() varies by - // platform. For some reason lost to history, the specified value - // is typically backlog * 1.5, backlog * 1.5 + 1, or event taken - // literally as on Windows. We'll accept any number less than - // backlog * 2 as valid. - if (num_clients_connected >= BACKLOG * 2) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) server: Incorrect # client ") - ACE_TEXT ("connections. Expected:%d-%d Actual:%d\n"), - BACKLOG, BACKLOG * 2, num_clients_connected)); + ACE_TEXT ("(%P|%t) server: Test finished.\n"))); + // The meaning of the backlog parameter for listen() varies by platform. For + // some reason lost to history, the specified value is typically + // backlog * 1.5, backlog * 1.5 + 1, or event taken literally as on Windows. + // We'll accept any number less than backlog * 2 as valid. + if (num_clients_connected >= BACKLOG * 2) + ACE_ERROR((LM_ERROR, + "(%P|%t) server: Incorrect # client connections. Expected:%d-%d Actual:%d\n", + BACKLOG, BACKLOG * 2, num_clients_connected)); return 0; } @@ -233,25 +214,25 @@ server (void *arg) { const char *t = ACE_ALPHABET; - ++num_clients_connected; + ++num_clients_connected; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: Client %C connected from %d\n"), - cli_addr.get_host_name (), + ACE_TEXT ("(%P|%t) server: Client %s connected from %d\n"), + ACE_TEXT_TO_TCHAR_IN(cli_addr.get_host_name ()), cli_addr.get_port_number ())); // Enable non-blocking I/O. if (new_stream.enable (ACE_NONBLOCK) == -1) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("server: enable non blocking i/o")), + ACE_TEXT ("server: enable non blocking i/o")), 0); handle_set.reset (); handle_set.set_bit (new_stream.get_handle ()); // Read data from client (terminate on error). - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: Waiting for data...\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) server: Waiting for data...\n"))); for (ssize_t r_bytes; ;) { @@ -271,7 +252,7 @@ server (void *arg) ACE_TEXT ("select")), 0); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server: Receiving data...\n")); + ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Receiving data...\n")); while ((r_bytes = new_stream.recv (buf, 1)) > 0) { @@ -279,42 +260,39 @@ server (void *arg) t++; } - ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Received data.\n")); + ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Received data.\n")); if (r_bytes == 0) { // Handshake back with client. - ACE_DEBUG - ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: Connection closed by client.\n"))); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%P|%t) server: Connection closed by client.\n"))); - ACE_DEBUG - ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: Sending handshake.\n"))); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server: Sending handshake.\n")); if (new_stream.send_n ("", 1) != 1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("server: send_n"))); + ACE_TEXT ("server: send_n"))); - ACE_DEBUG ((LM_DEBUG, "(%P|%t) server: Closing stream.\n")); + ACE_DEBUG((LM_DEBUG, "(%P|%t) server: Closing stream.\n")); // Close endpoint. if (new_stream.close () == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("server: close"))); + ACE_TEXT ("server: close"))); break; } else if (r_bytes == -1) { if (errno == EWOULDBLOCK || errno == EAGAIN) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: (EWOULDBLOCK) Waiting for more data...\n"))); + ACE_TEXT ("(%P|%t) server: (EWOULDBLOCK) Waiting for more data...\n"))); else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("server: recv_n")), + ACE_TEXT ("server: recv_n")), 0); } } @@ -323,11 +301,11 @@ server (void *arg) { if (errno == EWOULDBLOCK) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) server: No more connections pending.\n"))); + ACE_TEXT ("(%P|%t) server: No more connections pending.\n"))); else ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("server: accept"))); + ACE_TEXT ("server: accept"))); } } ACE_NOTREACHED (return 0); @@ -349,7 +327,7 @@ spawn (int num_clients) || peer_acceptor.get_local_addr (server_addr) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n"), - ACE_TEXT ("spawn: open"))); + ACE_TEXT ("spawn: open"))); else { ACE_DEBUG ((LM_DEBUG, @@ -363,8 +341,8 @@ spawn (int num_clients) { case -1: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%P|%t) %p\n"), "spawn: fork failed")); - i = num_clients; + "(%P|%t) %p\n", "spawn: fork failed")); + i = num_clients; // Break out of 'for' loop. break; case 0: @@ -383,11 +361,11 @@ spawn (int num_clients) // Reap the child pids. for (pid_t pid; (pid = ACE_OS::wait ()) != -1; ) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) spawn: reaping pid %d\n"), pid)); + "(%P|%t) spawn: reaping pid %d\n", pid)); #elif defined (ACE_HAS_THREADS) - ACE_DEBUG((LM_DEBUG, "Spawning server...\n")); + ACE_DEBUG((LM_DEBUG, "Spawning server...\n")); if (ACE_Thread_Manager::instance ()->spawn (ACE_THR_FUNC (server), @@ -395,34 +373,33 @@ spawn (int num_clients) THR_BOUND | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("spawn: failed"), + ACE_TEXT ("spawn: failed"), 1)); - ACE_DEBUG((LM_DEBUG, "Spawning %d clients...\n", num_clients)); + ACE_DEBUG((LM_DEBUG, "Spawning %d clients...\n", num_clients)); if (ACE_Thread_Manager::instance ()->spawn_n - (num_clients, + (num_clients, ACE_THR_FUNC (client), (void *) &server_addr, THR_BOUND | THR_DETACHED) == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) %p\n%a"), - ACE_TEXT ("spawn: failed 2"), + ACE_TEXT ("spawn: failed 2"), 1)); - ACE_DEBUG((LM_DEBUG, "Waiting for threads to finish...\n")); + ACE_DEBUG((LM_DEBUG, "Waiting for threads to finish...\n")); // Wait for the threads to exit. ACE_Thread_Manager::instance ()->wait (); #else ACE_ERROR ((LM_INFO, ACE_TEXT ("(%P|%t) ") - ACE_TEXT ("spawn: only one thread may be run") + ACE_TEXT ("spawn: only one thread may be run") ACE_TEXT (" in a process on this platform\n"))); #endif /* !ACE_LACKS_FORK */ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Threads complete. Closing Acceptor.\n"))); + ACE_DEBUG((LM_DEBUG, "Threads complete. Closing Acceptor.\n")); peer_acceptor.close (); } |