[trafficserver] branch master updated: UDPNet: Yet another timing fix for test_UDPnet.

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f80dc8  UDPNet: Yet another timing fix for test_UDPnet.
3f80dc8 is described below

commit 3f80dc8ca0b3507ba6980c9b208e746abdf66752
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Sun Oct 1 14:53:52 2017 -0500

    UDPNet: Yet another timing fix for test_UDPnet.
---
 iocore/net/test_I_UDPNet.cc | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/iocore/net/test_I_UDPNet.cc b/iocore/net/test_I_UDPNet.cc
index fa73101..00e7ad6 100644
--- a/iocore/net/test_I_UDPNet.cc
+++ b/iocore/net/test_I_UDPNet.cc
@@ -36,8 +36,9 @@
 
 #include "diags.i"
 
-static const int port       = 56912;
 static const char payload[] = "hello";
+in_port_t port              = 0;
+int pfd[2]; // Pipe used to signal client with transient port.
 
 /*This implements a standard Unix echo server: just send every udp packet you
   get back to where it came from*/
@@ -58,7 +59,7 @@ EchoServer::start()
   sockaddr_in addr;
   addr.sin_family      = AF_INET;
   addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-  addr.sin_port        = htons(port);
+  addr.sin_port        = 0;
 
   udpNet.UDPBind(static_cast<Continuation *>(this), reinterpret_cast<sockaddr const *>(&addr), 1024000, 1024000);
 
@@ -71,7 +72,12 @@ EchoServer::handle_packet(int event, void *data)
   switch (event) {
   case NET_EVENT_DATAGRAM_OPEN: {
     UDPConnection *con = reinterpret_cast<UDPConnection *>(data);
-    std::cout << "port: " << con->getPortNum() << std::endl;
+    port               = con->getPortNum(); // store this for later signalling.
+    /* For some reason the UDP packet handling isn't fully set up at this time. We need another
+       pass through the event loop for that or the packet is never read even thought it arrives
+       on the port (as reported by ss --udp --numeric --all).
+    */
+    eventProcessor.schedule_in(this, 1, ET_UDP);
     break;
   }
 
@@ -97,6 +103,12 @@ EchoServer::handle_packet(int event, void *data)
     std::exit(EXIT_FAILURE);
   }
 
+  case EVENT_INTERVAL:
+    // Done the extra event loop, signal the client to start.
+    std::cout << "Echo Server port: " << port << std::endl;
+    write(pfd[1], &port, sizeof(port));
+    break;
+
   default:
     std::cout << "got unknown event [" << event << "]" << std::endl;
     std::exit(EXIT_FAILURE);
@@ -131,7 +143,7 @@ udp_echo_server()
   signal(SIGTERM, signal_handler);
 
   EchoServer server;
-  eventProcessor.schedule_imm(&server, ET_UDP);
+  eventProcessor.schedule_in(&server, 1, ET_UDP);
 
   this_thread()->execute();
 }
@@ -146,7 +158,7 @@ udp_client(char *buf)
   }
 
   struct timeval tv;
-  tv.tv_sec  = 1;
+  tv.tv_sec  = 20;
   tv.tv_usec = 0;
 
   setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, sizeof(tv));
@@ -180,14 +192,25 @@ REGRESSION_TEST(UDPNet_echo)(RegressionTest *t, int /* atype ATS_UNUSED */, int
   box         = REGRESSION_TEST_PASSED;
   char buf[8] = {0};
 
+  int z = pipe(pfd);
+  if (z < 0) {
+    std::cout << "Unable to create pipe" << std::endl;
+    std::exit(EXIT_FAILURE);
+  }
+
   pid_t pid = fork();
   if (pid < 0) {
     std::cout << "Couldn't fork" << std::endl;
     std::exit(EXIT_FAILURE);
   } else if (pid == 0) {
+    close(pfd[0]);
     udp_echo_server();
   } else {
-    sleep(1);
+    close(pfd[1]);
+    if (read(pfd[0], &port, sizeof(port)) <= 0) {
+      std::cout << "Failed to get signal with port data [" << errno << ']' << std::endl;
+      std::exit(EXIT_FAILURE);
+    }
     udp_client(buf);
 
     kill(pid, SIGTERM);

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].