Changes in benchmark/io/http/main.cfa [ee913e0a:075b8fd]

File:

• benchmark/io/http/main.cfa (modified) (7 diffs)

benchmark/io/http/main.cfa

@@ -46 +46 @@
 }
 
+extern void init_protocol(void);
+extern void deinit_protocol(void);
+
 //=============================================================================================
 // Main
@@ -61 +64 @@
         //===================
         // Open Socket
-        printf("Listening on port %d\n", options.socket.port);
+        printf("%ld : Listening on port %d\n", getpid(), options.socket.port);
         int server_fd = socket(AF_INET, SOCK_STREAM, 0);
         if(server_fd < 0) {
@@ -79 +82 @@
                 ret = bind( server_fd, (struct sockaddr *)&address, sizeof(address) );
                 if(ret < 0) {
-                        if(errno == 98) {
+                        if(errno == EADDRINUSE) {
                                 if(waited == 0) {
                                         printf("Waiting for port\n");
@@ -109 +112 @@
                 options.clopts.instance = &cl;
 
+
                 int pipe_cnt = options.clopts.nworkers * 2;
                 int pipe_off;
@@ -124 +128 @@
                 {
                         ServerProc procs[options.clopts.nprocs];
+
+                        init_protocol();
                         {
                                 Worker workers[options.clopts.nworkers];
@@ -151 +157 @@
                                         printf("Shutting Down\n");
                                 }
+
+                                for(i; options.clopts.nworkers) {
+                                        printf("Cancelling %p\n", (void*)workers[i].cancel.target);
+                                        workers[i].done = true;
+                                        cancel(workers[i].cancel);
+                                }
+
+                                printf("Shutting down socket\n");
+                                int ret = shutdown( server_fd, SHUT_RD );
+                                if( ret < 0 ) { abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) ); }
+
+                                //===================
+                                // Close Socket
+                                printf("Closing Socket\n");
+                                ret = close( server_fd );
+                                if(ret < 0) {
+                                        abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
+                                }
                         }
                         printf("Workers Closed\n");
+
+                        deinit_protocol();
                 }
 
@@ -162 +188 @@
                 }
                 free(fds);
-        }
 
-        //===================
-        // Close Socket
-        printf("Closing Socket\n");
-        ret = close( server_fd );
-        if(ret < 0) {
-                abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
         }