Changeset c4b10e2 for benchmark

Timestamp:

Jun 4, 2022, 1:12:56 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

ce98816

Parents:

153570d

Message:

Moved socket creation to a different file.
Makefile now has debug symbol.
Pipes are now closed earlier for a cleaner exit.

Location:

benchmark/io/http

Files:

• Makefile.am (modified) (2 diffs)
• main.cfa (modified) (5 diffs)
• socket.cfa (added)
• socket.hfa (added)

benchmark/io/http/Makefile.am

@@ -21 +21 @@
 include $(top_srcdir)/tools/build/cfa.make
 
-AM_CFLAGS = -O3 -Wall -Wextra -I$(srcdir) -lrt -pthread # -Werror
+AM_CFLAGS = -O3 -Wall -Wextra -I$(srcdir) -lrt -pthread -g # -Werror
 AM_CFAFLAGS = -quiet -nodebug
 AM_LDFLAGS = -quiet -nodebug
@@ -39 +39 @@
         protocol.cfa \
         protocol.hfa \
+        socket.cfa \
+        socket.hfa \
         worker.cfa \
         worker.hfa

benchmark/io/http/main.cfa

@@ -23 +23 @@
 #include "filecache.hfa"
 #include "options.hfa"
+#include "socket.hfa"
 #include "worker.hfa"
 
@@ -195 +196 @@
 //============================================================================================='
 int main( int argc, char * argv[] ) {
+        int ret;
         __sighandler_t s = 1p;
         signal(SIGPIPE, s);
@@ -226 +228 @@
         // Open Socket
         sout | getpid() | ": Listening on port" | options.socket.port;
-        int server_fd = socket(AF_INET, SOCK_STREAM, 0);
-        if(server_fd < 0) {
-                abort( "socket error: (%d) %s\n", (int)errno, strerror(errno) );
-        }
-
-        int ret = 0;
+
         struct sockaddr_in address;
-        int addrlen = sizeof(address);
-        memset( (char *)&address, '\0' );
-        address.sin_family = AF_INET;
-        address.sin_addr.s_addr = htonl(INADDR_ANY);
-        address.sin_port = htons( options.socket.port );
-
-        int waited = 0;
-        for() {
-                int sockfd = server_fd;
-                __CONST_SOCKADDR_ARG addr;
-                addr.__sockaddr__ = (struct sockaddr *)&address;
-                socklen_t addrlen = sizeof(address);
-                ret = bind( sockfd, addr, addrlen );
-                if(ret < 0) {
-                        if(errno == EADDRINUSE) {
-                                if(waited == 0) {
-                                        if(!options.interactive) abort | "Port already in use in non-interactive mode. Aborting";
-                                        sout | "Waiting for port";
-                                } else {
-                                        sout | "\r" | waited | nonl;
-                                        flush( sout );
-                                }
-                                waited ++;
-                                sleep( 1`s );
-                                continue;
-                        }
-                        abort( "bind error: (%d) %s\n", (int)errno, strerror(errno) );
-                }
-                break;
-        }
-
-        ret = listen( server_fd, options.socket.backlog );
-        if(ret < 0) {
-                abort( "listen error: (%d) %s\n", (int)errno, strerror(errno) );
-        }
+        int addrlen = prepaddr(address);
+
+        int server_fd = listener(address, addrlen);
 
         //===================
@@ -361 +326 @@
                                 sout | "Stopping connection threads..." | nonl; flush( sout );
                                 for(i; options.clopts.nworkers) {
+                                        for(j; 2) {
+                                                ret = close(workers[i].pipe[j]);
+                                                if(ret < 0) abort( "close pipe %d error: (%d) %s\n", j, (int)errno, strerror(errno) );
+                                        }
                                         join(workers[i]);
                                 }
@@ -384 +353 @@
                 sout | "done";
 
-                sout | "Closing splice fds..." | nonl; flush( sout );
-                for(i; pipe_cnt) {
-                        ret = close( fds[pipe_off + i] );
-                        if(ret < 0) {
-                                abort( "close pipe error: (%d) %s\n", (int)errno, strerror(errno) );
-                        }
-                }
+                // sout | "Closing splice fds..." | nonl; flush( sout );
+                // for(i; pipe_cnt) {
+                //      ret = close( fds[pipe_off + i] );
+                //      if(ret < 0) {
+                //              abort( "close pipe error: (%d) %s\n", (int)errno, strerror(errno) );
+                //      }
+                // }
                 free(fds);
                 sout | "done";