Changeset e95a117 for benchmark/io

Timestamp:

Jul 20, 2020, 10:23:32 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

289a21c

Parents:

2ecbd7b

Message:

Fixed handling of closed connections.
Started work on cleanly closing server

Location:

benchmark/io/http

Files:

• main.cfa (modified) (2 diffs)
• protocol.cfa (modified) (1 diff)
• worker.cfa (modified) (2 diffs)

benchmark/io/http/main.cfa ¶

@@ -100 +100 @@
                                 {
                                         Acceptor acceptor = { server_fd, (struct sockaddr *)&address, (socklen_t*)&addrlen, 0 };
+
+                                        char buffer[128];
+                                        while(!feof(stdin)) {
+                                                fgets(buffer, 128, stdin);
+                                        }
+
+                                        printf("Shutting Down\n");
                                 }
-                                printf("Shutting Down\n");
+                                printf("Acceptor Closed\n");
 
                                 // Clean-up the workers
@@ -108 +115 @@
                                 }
                         }
+                        printf("Workers Closed\n");
                 }
         }

benchmark/io/http/protocol.cfa ¶

@@ -75 +75 @@
         for() {
                 int ret = cfa_read(fd, it, count);
+                if(ret == 0 ) return [OK200, true, 0p, 0];
                 if(ret < 0 ) {
-                        if( errno ) return [OK200, true, 0p, 0];
                         if( errno == EAGAIN || errno == EWOULDBLOCK) continue READ;
                         abort( "read error: (%d) %s\n", (int)errno, strerror(errno) );

benchmark/io/http/worker.cfa ¶

@@ -33 +33 @@
 void main( Worker & this ) {
         CONNECTION:
-        while( int fd = take(wait_connect); fd >= 0) {
-            printf("New connection, waiting for requests\n");
+        for() {
+                int fd = take(wait_connect);
+                if (fd < 0) break;
+
+                printf("New connection %d, waiting for requests\n", fd);
                 REQUEST:
                 for() {
@@ -105 +108 @@
                 }
 
-            printf("New connection accepted\n");
+                printf("New connection accepted\n");
                 put( wait_connect, ret );
-      }
+        }
 }