Changes in benchmark/io/http/main.cfa [86c12d65:ce98816]

File:

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

benchmark/io/http/main.cfa

@@ -234 +234 @@
         int addrlen = prepaddr(address);
 
-        int server_fd;
-        if(!options.socket.manyreuse) {
-                server_fd = listener(address, addrlen);
-        }
+        int server_fd = listener(address, addrlen);
 
         //===================
@@ -274 +271 @@
                                                 workers[i].pipe[0] = fds[pipe_off + (i * 2) + 0];
                                                 workers[i].pipe[1] = fds[pipe_off + (i * 2) + 1];
-                                                workers[i].sockfd  = options.socket.manyreuse ?  listener(address, addrlen) : server_fd;
+                                                workers[i].sockfd  = server_fd;
                                                 workers[i].addr    = (struct sockaddr *)&address;
                                                 workers[i].addrlen = (socklen_t*)&addrlen;
@@ -314 +311 @@
 
                                 sout | "Shutting down socket..." | nonl; flush( sout );
-                                if(options.socket.manyreuse) {
-                                        for(i; options.clopts.nworkers) {
-                                                ret = shutdown( workers[i].sockfd, SHUT_RD );
-                                                if(ret < 0) abort( "close socket %d error: (%d) %s\n", i, (int)errno, strerror(errno) );
-                                        }
-                                }
-                                else {
-                                        ret = shutdown( server_fd, SHUT_RD );
-                                        if( ret < 0 ) {
-                                                abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) );
-                                        }
+                                int ret = shutdown( server_fd, SHUT_RD );
+                                if( ret < 0 ) {
+                                        abort( "shutdown error: (%d) %s\n", (int)errno, strerror(errno) );
                                 }
                                 sout | "done";
@@ -331 +320 @@
                                 // Close Socket
                                 sout | "Closing Socket..." | nonl; flush( sout );
-                                if(options.socket.manyreuse) {
-                                        for(i; options.clopts.nworkers) {
-                                                ret = close(workers[i].sockfd);
-                                                if(ret < 0) abort( "close socket %d error: (%d) %s\n", i, (int)errno, strerror(errno) );
-                                        }
-                                }
-                                else {
-                                        ret = close( server_fd );
-                                        if(ret < 0) {
-                                                abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
-                                        }
+                                ret = close( server_fd );
+                                if(ret < 0) {
+                                        abort( "close socket error: (%d) %s\n", (int)errno, strerror(errno) );
                                 }
                                 sout | "done";