Changeset 07997cd for benchmark/io/http

Timestamp:

Jun 10, 2022, 5:35:55 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1f0ee71

Parents:

8419b76

Message:

Fixed errors with the accept many version

Location:

benchmark/io/http

Files:

• socket.cfa (modified) (1 diff)
• worker.cfa (modified) (3 diffs)

benchmark/io/http/socket.cfa

@@ -27 +27 @@
 int listener(struct sockaddr_in & address, int addrlen) {
         int type = SOCK_STREAM;
-        if(options.socket.reuseport) type |= SOCK_NONBLOCK;
+        // if(options.socket.reuseport) type |= SOCK_NONBLOCK;
         int sockfd = socket(AF_INET, type, 0);
         if(sockfd < 0) {

benchmark/io/http/worker.cfa

@@ -189 +189 @@
 }
 
-#define ACCEPT_SPIN
+static inline __s32 get_res( io_future_t & this ) {
+        if( this.result < 0 ) {{
+                errno = -this.result;
+                return -1;
+        }}
+        return this.result;
+}
+
+static inline void push_connection( Acceptor & this, int fd ) {
+        PendingRead * p = 0p;
+        for() {
+                if(this.done) return;
+                p = pop(*this.queue);
+                if(p) break;
+                yield();
+                this.stats.creates++;
+        };
+
+        p->out.fd = fd;
+        async_recv(p->f, p->out.fd, p->in.buf, p->in.len, 0, CFA_IO_LAZY);
+}
+
+// #define ACCEPT_SPIN
+#define ACCEPT_MANY
 
 void main( Acceptor & this ) {
@@ -215 +238 @@
                 if( options.log ) sout | "=== New connection" | fd | "" | ", waiting for requests ===";
 
-                if(fd) {
-                        PendingRead * p = 0p;
-                        for() {
-                                if(this.done) return;
-                                p = pop(*this.queue);
-                                if(p) break;
-                                yield();
-                                this.stats.creates++;
-                        };
-
-                        p->out.fd = fd;
-                        async_recv(p->f, p->out.fd, p->in.buf, p->in.len, 0, CFA_IO_LAZY);
-                }
+                if(fd) push_connection(this, fd);
 
                 if (stats_thrd) {
@@ -243 +254 @@
         }
 
-#elif define(ACCEPT_MANY)
+#elif defined(ACCEPT_MANY)
         const int nacc = 10;
         io_future_t results[nacc];