Changeset 23a08aa0 for benchmark/io/http/worker.cfa

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix merge conflict

File:

• benchmark/io/http/worker.cfa (modified) (1 diff)

benchmark/io/http/worker.cfa

@@ -145 +145 @@
                 if( options.log ) mutex(sout) sout | "=== Accepting connection ===";
                 int fd = cfa_accept4( this.sockfd, this.[addr, addrlen, flags], CFA_IO_LAZY );
-                if(fd < 0) {
+                if(fd <= 0) {
                         if( errno == ECONNABORTED ) break;
                         if( this.done && (errno == EINVAL || errno == EBADF) ) break;
-                        abort( "accept error: (%d) %s\n", (int)errno, strerror(errno) );
+                        abort( "accept error %d: (%d) %s\n", fd, (int)errno, strerror(errno) );
                 }
                 if(this.done) break;