Changes in / [b6e0b61:c8f5f7d]

Location:

benchmark/io/http

Files:

• main.cfa (modified) (4 diffs)
• options.cfa (modified) (2 diffs)
• options.hfa (modified) (1 diff)
• socket.cfa (modified) (1 diff)
• worker.cfa (modified) (1 diff)

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";

benchmark/io/http/options.cfa

@@ -35 +35 @@
 
         { // socket
-                8080,  // port
-                10,    // backlog
-                1024,  // buflen
-                false, // onereuse
-                false  // manyreuse
+                8080, // port
+                10,   // backlog
+                1024  // buflen
         },
 
@@ -72 +70 @@
                 {'\0', "shell",          "Disable interactive mode", options.interactive, parse_setfalse},
                 {'\0', "accept-backlog", "Maximum number of pending accepts", options.socket.backlog},
-                {'\0', "reuseport-one",  "Create a single listen socket with SO_REUSEPORT", options.socket.onereuse, parse_settrue},
-                {'\0', "reuseport",      "Use many listen sockets with SO_REUSEPORT", options.socket.manyreuse, parse_settrue},
                 {'\0', "request_len",    "Maximum number of bytes in the http request, requests with more data will be answered with Http Code 414", options.socket.buflen},
                 {'\0', "seed",           "seed to use for hashing", options.file_cache.hash_seed },

benchmark/io/http/options.hfa

@@ -27 +27 @@
                 int backlog;
                 int buflen;
-                bool onereuse;
-                bool manyreuse;
         } socket;
 

benchmark/io/http/socket.cfa

@@ -31 +31 @@
         }
 
-        if(options.socket.onereuse || options.socket.manyreuse) {
-                int value = 1;
-                // if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const void*)&on, sizeof(on)))
-                //      abort( "setsockopt SO_REUSEADDR error: (%d) %s\n", (int)errno, strerror(errno) );
-                if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &value, sizeof(int)) < 0)
-                        abort( "setsockopt SO_REUSEPORT error: (%d) %s\n", (int)errno, strerror(errno) );
-        }
+        int value = 1;
+        if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &value, sizeof(int)) < 0)
+                abort( "setsockopt error: (%d) %s\n", (int)errno, strerror(errno) );
 
         int ret = 0;

benchmark/io/http/worker.cfa

@@ -43 +43 @@
         /* paranoid */ assert( this.pipe[0] != -1 );
         /* paranoid */ assert( this.pipe[1] != -1 );
-
-        const bool reuse = options.socket.manyreuse;
 
         CONNECTION: