Changes in / [3e3f236:97aca3d]

Files:

• benchmark/io/http/main.cfa (modified) (1 diff)
• libcfa/src/concurrency/io/setup.cfa (modified) (6 diffs)

benchmark/io/http/main.cfa

@@ -75 +75 @@
         address.sin_port = htons( options.socket.port );
 
-        ret = bind( server_fd, (struct sockaddr *)&address, sizeof(address) );
-        if(ret < 0) {
-                abort( "bind error: (%d) %s\n", (int)errno, strerror(errno) );
+        int waited = 0;
+        for() {
+                ret = bind( server_fd, (struct sockaddr *)&address, sizeof(address) );
+                if(ret < 0) {
+                        if(errno == 98) {
+                                if(waited == 0) {
+                                        printf("Waiting for port\n");
+                                } else {
+                                        printf("\r%d", waited);
+                                        fflush(stdout);
+                                }
+                                waited ++;
+                                sleep( 1`s );
+                                continue;
+                        }
+                        abort( "bind error: (%d) %s\n", (int)errno, strerror(errno) );
+                }
+                break;
         }
 

libcfa/src/concurrency/io/setup.cfa

@@ -17 +17 @@
 #define _GNU_SOURCE         /* See feature_test_macros(7) */
 
+#if defined(__CFA_DEBUG__)
+        // #define __CFA_DEBUG_PRINT_IO__
+        // #define __CFA_DEBUG_PRINT_IO_CORE__
+#endif
+
 #include "io/types.hfa"
 #include "kernel.hfa"
@@ -111 +116 @@
 
         void __kernel_io_startup(void) {
-                __cfaabi_dbg_print_safe( "Kernel : Creating EPOLL instance\n" );
+                __cfadbg_print_safe(io_core, "Kernel : Creating EPOLL instance\n" );
 
                 iopoll.epollfd = epoll_create1(0);
@@ -118 +123 @@
                 }
 
-                __cfaabi_dbg_print_safe( "Kernel : Starting io poller thread\n" );
+                __cfadbg_print_safe(io_core, "Kernel : Starting io poller thread\n" );
 
                 iopoll.run = true;
@@ -141 +146 @@
                 // Io polling is now fully stopped
 
-                __cfaabi_dbg_print_safe( "Kernel : IO poller stopped\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller stopped\n" );
         }
 
@@ -149 +154 @@
                 id.id = doregister(&id);
                 __cfaabi_tls.this_proc_id = &id;
-                __cfaabi_dbg_print_safe( "Kernel : IO poller thread starting\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller thread starting\n" );
 
                 // Block signals to control when they arrive
@@ -184 +189 @@
                 }
 
-                __cfaabi_dbg_print_safe( "Kernel : IO poller thread stopping\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller thread stopping\n" );
                 unregister(&id);
                 return 0p;