Changes in / [b583113:578c09a]

Files:

• benchmark/io/http/protocol.cfa (modified) (5 diffs)
• benchmark/io/http/worker.cfa (modified) (1 diff)
• libcfa/src/concurrency/stats.cfa (modified) (1 diff)

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;
@@ -194 +215 @@
 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 200 OK\nServer: HttoForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 15\n\nHello, World!\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",

benchmark/io/http/worker.cfa

@@ -18 +18 @@
 void ?{}( Worker & this ) {
         size_t cli = rand() % options.clopts.cltr_cnt;
-        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli] };
+        ((thread&)this){ "Server Worker Thread", *options.clopts.instance[cli], 512000 };
         options.clopts.thrd_cnt[cli]++;
         this.pipe[0] = -1;

libcfa/src/concurrency/stats.cfa

@@ -126 +126 @@
                         double sExt_len = ready.push.extrn.success ? ((double)ready.push.extrn.attempt) / ready.push.extrn.success : 0;
 
-                        double rLcl_len  = ready.pop.local .success ? ((double)ready.pop.local .attempt) / ready.pop.local .success : 0;
-                        double rHlp_len  = ready.pop.help  .success ? ((double)ready.pop.help  .attempt) / ready.pop.help  .success : 0;
-                        double rStl_len  = ready.pop.steal .success ? ((double)ready.pop.steal .attempt) / ready.pop.steal .success : 0;
-                        double rSch_len  = ready.pop.search.success ? ((double)ready.pop.search.attempt) / ready.pop.search.success : 0;
+                        uint64_t total = ready.pop.local.success + ready.pop.help.success + ready.pop.steal.success + ready.pop.search.success;
+                        double rLcl_pc = (100.0 * (double)ready.pop.local .success) / total;
+                        double rHlp_pc = (100.0 * (double)ready.pop.help  .success) / total;
+                        double rStl_pc = (100.0 * (double)ready.pop.steal .success) / total;
+                        double rSch_pc = (100.0 * (double)ready.pop.search.success) / total;
 
                         __cfaabi_bits_print_safe( STDOUT_FILENO,
                                 "----- %s \"%s\" (%p) - Ready Q Stats -----\n"
                                 "- totals   : %'3" PRIu64 " run, %'3" PRIu64 " schd (%'" PRIu64 "ext, %'" PRIu64 "mig, %'" PRId64 " )\n"
-                                "- push avg : %'3.2lf (l: %'3.2lf/%'" PRIu64 ", s: %'3.2lf/%'" PRIu64 ", e: %'3.2lf : %'" PRIu64 "e)\n"
-                                "- local    : %'3.2lf (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
-                                "- help     : %'3.2lf (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
-                                "- steal    : %'3.2lf (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
-                                "- search   : %'3.2lf (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
+                                "- push avg : %'3.0lf (l: %'3.2lf/%'" PRIu64 ", s: %'3.2lf/%'" PRIu64 ", e: %'3.2lf : %'" PRIu64 "e)\n"
+                                "- local    : %'3.0lf%%: %'3" PRIu64 " (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
+                                "- help     : %'3.0lf%%: %'3" PRIu64 " (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
+                                "- steal    : %'3.0lf%%: %'3" PRIu64 " (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
+                                "- search   : %'3.0lf%%: %'3" PRIu64 " (%'3" PRIu64 " try, %'3" PRIu64 " spc, %'3" PRIu64 " lck, %'3" PRIu64 " ept)\n"
                                 "- Idle Slp : %'3" PRIu64 "h, %'3" PRIu64 "c, %'3" PRIu64 "w, %'3" PRIu64 "e\n"
                                 "\n"
                                 , type, name, id
-                                , ready.pop.local.success + ready.pop.help.success + ready.pop.steal.success + ready.pop.search.success
+                                , total
                                 , ready.push.local.success + ready.push.share.success + ready.push.extrn.success
                                 , ready.push.extrn.success, ready.threads.migration, ready.threads.threads
                                 , push_len, sLcl_len, ready.push.local.attempt, sOth_len, ready.push.share.attempt, sExt_len, ready.push.extrn.attempt
-                                , rLcl_len, ready.pop.local .attempt, ready.pop.local .espec, ready.pop.local .elock, ready.pop.local .eempty
-                                , rHlp_len, ready.pop.help  .attempt, ready.pop.help  .espec, ready.pop.help  .elock, ready.pop.help  .eempty
-                                , rStl_len, ready.pop.steal .attempt, ready.pop.steal .espec, ready.pop.steal .elock, ready.pop.steal .eempty
-                                , rSch_len, ready.pop.search.attempt, ready.pop.search.espec, ready.pop.search.elock, ready.pop.search.eempty
+                                , rLcl_pc, ready.pop.local .success, ready.pop.local .attempt, ready.pop.local .espec, ready.pop.local .elock, ready.pop.local .eempty
+                                , rHlp_pc, ready.pop.help  .success, ready.pop.help  .attempt, ready.pop.help  .espec, ready.pop.help  .elock, ready.pop.help  .eempty
+                                , rStl_pc, ready.pop.steal .success, ready.pop.steal .attempt, ready.pop.steal .espec, ready.pop.steal .elock, ready.pop.steal .eempty
+                                , rSch_pc, ready.pop.search.success, ready.pop.search.attempt, ready.pop.search.espec, ready.pop.search.elock, ready.pop.search.eempty
                                 , ready.sleep.halts, ready.sleep.cancels, ready.sleep.wakes, ready.sleep.exits
                         );