Changes in benchmark/io/http/protocol.cfa [2cd784a:b57db73]

File:

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

benchmark/io/http/protocol.cfa

@@ -20 +20 @@
 #include "options.hfa"
 
-#define PLAINTEXT_1WRITE
-#define PLAINTEXT_NOCOPY
-
-struct https_msg_str {
-        char msg[512];
-        size_t len;
-};
-
-const https_msg_str * volatile http_msgs[KNOWN_CODES] = { 0 };
+const char * volatile date = 0p;
+
+const char * http_msgs[] = {
+        "HTTP/1.1 200 OK\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: %zu \n\n",
+        "HTTP/1.1 400 Bad Request\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 404 Not Found\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 405 Method Not Allowed\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 408 Request Timeout\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 413 Payload Too Large\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 414 URI Too Long\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+};
 
 _Static_assert( KNOWN_CODES == (sizeof(http_msgs ) / sizeof(http_msgs [0])));
 
-const int http_codes[KNOWN_CODES] = {
-        200,
+const int http_codes[] = {
         200,
         400,
@@ -52 +53 @@
         while(len > 0) {
                 // Call write
-                int ret = cfa_send(fd, it, len, 0, CFA_IO_LAZY);
+                int ret = cfa_write(fd, it, len, 0, -1`s, 0p, 0p);
+                // int ret = write(fd, it, len);
                 if( ret < 0 ) {
                         if( errno == ECONNRESET || errno == EPIPE ) return -ECONNRESET;
@@ -70 +72 @@
         /* paranoid */ assert( code < KNOWN_CODES && code != OK200 );
         int idx = (int)code;
-        return answer( fd, http_msgs[idx]->msg, http_msgs[idx]->len );
+        return answer( fd, http_msgs[idx], strlen( http_msgs[idx] ) );
 }
 
 int answer_header( int fd, size_t size ) {
-        char buffer[512];
-        char * it = buffer;
-        memcpy(it, http_msgs[OK200]->msg, http_msgs[OK200]->len);
-        it += http_msgs[OK200]->len;
-        int len = http_msgs[OK200]->len;
-        len += snprintf(it, 512 - len, "%d \n\n", size);
+        const char * fmt = http_msgs[OK200];
+        int len = 200;
+        char buffer[len];
+        len = snprintf(buffer, len, fmt, date, size);
         return answer( fd, buffer, len );
 }
 
-#if defined(PLAINTEXT_NOCOPY)
-int answer_plaintext( int fd ) {
-        return answer(fd, http_msgs[OK200_PlainText]->msg, http_msgs[OK200_PlainText]->len + 1); // +1 cause snprintf doesn't count nullterminator
-}
-#elif defined(PLAINTEXT_1WRITE)
-int answer_plaintext( int fd ) {
-        char text[] = "Hello, World!\n";
-        char buffer[512 + sizeof(text)];
-        char * it = buffer;
-        memcpy(it, http_msgs[OK200]->msg, http_msgs[OK200]->len);
-        it += http_msgs[OK200]->len;
-        int len = http_msgs[OK200]->len;
-        int r = snprintf(it, 512 - len, "%d \n\n", sizeof(text));
-        it += r;
-        len += r;
-        memcpy(it, text, sizeof(text));
-        return answer(fd, buffer, len + sizeof(text));
-}
-#else
-int answer_plaintext( int fd ) {
-        char text[] = "Hello, World!\n";
-        int ret = answer_header(fd, sizeof(text));
+int answer_plain( int fd, char buffer[], size_t size ) {
+        int ret = answer_header(fd, size);
         if( ret < 0 ) return ret;
-        return answer(fd, text, sizeof(text));
-}
-#endif
+        return answer(fd, buffer, size);
+}
 
 int answer_empty( int fd ) {
@@ -115 +94 @@
 
 
-[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;
@@ -121 +100 @@
         READ:
         for() {
-                int ret = cfa_recv(fd, (void*)it, count, 0, CFA_IO_LAZY);
+                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];
@@ -160 +139 @@
         ssize_t ret;
         SPLICE1: while(count > 0) {
-                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, CFA_IO_LAZY);
+                ret = cfa_splice(ans_fd, &offset, pipe[1], 0p, count, sflags, 0, -1`s, 0p, 0p);
+                // ret = splice(ans_fd, &offset, pipe[1], 0p, count, sflags);
                 if( ret < 0 ) {
                         if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE1;
@@ -172 +152 @@
                 size_t in_pipe = ret;
                 SPLICE2: while(in_pipe > 0) {
-                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, CFA_IO_LAZY);
+                        ret = cfa_splice(pipe[0], 0p, fd, 0p, in_pipe, sflags, 0, -1`s, 0p, 0p);
+                        // ret = splice(pipe[0], 0p, fd, 0p, in_pipe, sflags);
                         if( ret < 0 ) {
                                 if( errno != EAGAIN && errno != EWOULDBLOCK) continue SPLICE2;
@@ -192 +173 @@
 #include <thread.hfa>
 
-const char * original_http_msgs[] = {
-        "HTTP/1.1 200 OK\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: ",
-        "HTTP/1.1 200 OK\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 15\n\nHello, World!\n",
-        "HTTP/1.1 400 Bad Request\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
-        "HTTP/1.1 404 Not Found\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
-        "HTTP/1.1 405 Method Not Allowed\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
-        "HTTP/1.1 408 Request Timeout\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
-        "HTTP/1.1 413 Payload Too Large\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
-        "HTTP/1.1 414 URI Too Long\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
-};
-
 struct date_buffer {
-        https_msg_str strs[KNOWN_CODES];
+        char buff[100];
 };
 
@@ -213 +183 @@
 
 void ?{}( DateFormater & this ) {
-        ((thread&)this){ "Server Date Thread", *options.clopts.instance[0] };
+        ((thread&)this){ "Server Date Thread", *options.clopts.instance };
         this.idx = 0;
-        memset( &this.buffers[0], 0, sizeof(this.buffers[0]) );
-        memset( &this.buffers[1], 0, sizeof(this.buffers[1]) );
+        memset( this.buffers[0].buff, 0, sizeof(this.buffers[0]) );
+        memset( this.buffers[1].buff, 0, sizeof(this.buffers[1]) );
 }
 
@@ -226 +196 @@
                 or else {}
 
-
-                char buff[100];
                 Time now = getTimeNsec();
-                strftime( buff, 100, "%a, %d %b %Y %H:%M:%S %Z", now );
-                sout | "Updated date to '" | buff | "'";
-
-                for(i; KNOWN_CODES) {
-                        size_t len = snprintf( this.buffers[this.idx].strs[i].msg, 512, original_http_msgs[i], buff );
-                        this.buffers[this.idx].strs[i].len = len;
-                }
-
-                for(i; KNOWN_CODES) {
-                        https_msg_str * next = &this.buffers[this.idx].strs[i];
-                        __atomic_exchange_n((https_msg_str * volatile *)&http_msgs[i], next, __ATOMIC_SEQ_CST);
-                }
+
+                strftime( this.buffers[this.idx].buff, 100, "%a, %d %b %Y %H:%M:%S %Z", now );
+
+                char * next = this.buffers[this.idx].buff;
+                __atomic_exchange_n((char * volatile *)&date, next, __ATOMIC_SEQ_CST);
                 this.idx = (this.idx + 1) % 2;
-
-                sout | "Date thread sleeping";
 
                 sleep(1`s);