Changes in benchmark/io/http/protocol.cfa [e54d0c3:197df9b]

File:

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

benchmark/io/http/protocol.cfa

@@ -5 +5 @@
         #include <fcntl.h>
 }
+
+#define xstr(s) str(s)
+#define str(s) #s
 
 #include <fstream.hfa>
@@ -21 +24 @@
 
 #define PLAINTEXT_1WRITE
+#define PLAINTEXT_MEMCPY
 #define PLAINTEXT_NOCOPY
 
@@ -85 +89 @@
 #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
+        return answer(fd, http_msgs[OK200_PlainText]->msg, http_msgs[OK200_PlainText]->len); // +1 cause snprintf doesn't count nullterminator
+}
+#elif defined(PLAINTEXT_MEMCPY)
+#define TEXTSIZE 15
+int answer_plaintext( int fd ) {
+        char text[] = "Hello, World!\n\n";
+        char ts[] = xstr(TEXTSIZE) " \n\n";
+        _Static_assert(sizeof(text) - 1 == TEXTSIZE);
+        char buffer[512 + TEXTSIZE];
+        char * it = buffer;
+        memcpy(it, http_msgs[OK200]->msg, http_msgs[OK200]->len);
+        it += http_msgs[OK200]->len;
+        int len = http_msgs[OK200]->len;
+        memcpy(it, ts, sizeof(ts) - 1);
+        it += sizeof(ts) - 1;
+        len += sizeof(ts) - 1;
+        memcpy(it, text, TEXTSIZE);
+        return answer(fd, buffer, len + TEXTSIZE);
 }
 #elif defined(PLAINTEXT_1WRITE)
 int answer_plaintext( int fd ) {
-        char text[] = "Hello, World!\n";
+        char text[] = "Hello, World!\n\n";
         char buffer[512 + sizeof(text)];
         char * it = buffer;
@@ -103 +124 @@
 #else
 int answer_plaintext( int fd ) {
-        char text[] = "Hello, World!\n";
+        char text[] = "Hello, World!\n\n";
         int ret = answer_header(fd, sizeof(text));
         if( ret < 0 ) return ret;
@@ -193 +214 @@
 
 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",
+        "HTTP/1.1 200 OK\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: ",
+        "HTTP/1.1 200 OK\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 15\n\nHello, World!\n\n",
+        "HTTP/1.1 400 Bad Request\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 404 Not Found\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 405 Method Not Allowed\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 408 Request Timeout\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 413 Payload Too Large\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
+        "HTTP/1.1 414 URI Too Long\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
 };
 
@@ -230 +251 @@
                 Time now = timeHiRes();
                 strftime( buff, 100, "%a, %d %b %Y %H:%M:%S %Z", now );
-                sout | "Updated date to '" | buff | "'";
+                if( options.log ) sout | "Updated date to '" | buff | "'";
 
                 for(i; KNOWN_CODES) {
@@ -243 +264 @@
                 this.idx = (this.idx + 1) % 2;
 
-                sout | "Date thread sleeping";
+                if( options.log ) sout | "Date thread sleeping";
 
                 sleep(1`s);