Changeset ece0e80 for benchmark/io/http/protocol.cfa

Timestamp:

Jan 9, 2021, 4:27:57 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

561dd26

Parents:

35fd2c4

Message:

Added prints.
Naive implementation of cancel.
Server now shutdown cleanly.

File:

• benchmark/io/http/protocol.cfa (modified) (4 diffs)

benchmark/io/http/protocol.cfa

@@ -71 +71 @@
 }
 
-[HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len) {
+[HttpCode code, bool closed, * const char file, size_t len] http_read(int fd, []char buffer, size_t len, io_cancellation * cancel) {
         char * it = buffer;
         size_t count = len - 1;
@@ -77 +77 @@
         READ:
         for() {
-                int ret = cfa_read(fd, (void*)it, count, 0, -1`s, 0p, 0p);
+                int ret = cfa_read(fd, (void*)it, count, 0, -1`s, cancel, 0p);
                 // int ret = read(fd, (void*)it, count);
                 if(ret == 0 ) return [OK200, true, 0, 0];
@@ -148 +148 @@
 
 void ?{}( DateFormater & this ) {
-        ((thread&)this){ *options.clopts.instance };
+        ((thread&)this){ "Server Date Thread", *options.clopts.instance };
         this.idx = 0;
         memset( this.buffers[0].buff, 0, sizeof(this.buffers[0]) );
@@ -162 +162 @@
 
                 Time now = getTimeNsec();
-                // Date: Wed, 17 Apr 2013 12:00:00 GMT
+
                 strftime( this.buffers[this.idx].buff, 100, "%a, %d %b %Y %H:%M:%S %Z", now );
-                printf("Changing date to %s\n", this.buffers[this.idx].buff);
 
                 char * next = this.buffers[this.idx].buff;