Changeset 36cc24a for benchmark/io/http/printer.cfa

Timestamp:

Aug 17, 2022, 4:34:10 PM (20 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

ff370d8

Parents:

3ce3fb9 (diff), 683cc13 (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 conflict from pull

File:

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

benchmark/io/http/printer.cfa

@@ -2 +2 @@
 #include "options.hfa"
 
+#include <clock.hfa>
 #include <fstream.hfa>
 #include <stats.hfa>
@@ -22 +23 @@
         to.maxfd = max( to.maxfd, from.maxfd);
         to.close += from.close; from.close = 0;
+        to.error += from.error; from.error = 0;
         to.calls += from.calls; from.calls = 0;
+        to.eagain += from.eagain; from.eagain = 0;
         to.tries += from.tries; from.tries = 0;
         to.header += from.header; from.header = 0;
@@ -80 +83 @@
                         uint64_t accp_open = this.stats.accpt.accepts;
                         uint64_t accp_clse = this.stats.send.close;
+                        uint64_t accp_errs = this.stats.send.error;
                         uint64_t accp_live = accp_open - accp_clse;
 
+                        sout | "-----" | time() | "-----";
                         sout | "----- Acceptor Stats -----";
-                        sout | "accepts : " | eng3(accp_open) |"opened," | eng3(accp_clse) |"closed," | eng3(accp_live) |"live";
+                        sout | "accepts : " | eng3(accp_open) |"opened," | eng3(accp_clse) |"closed," | eng3(accp_live) |"live," | eng3(accp_errs) |"errors";
                         sout | "accept  : " | eng3(this.stats.accpt.accepts) | "calls," | eng3(this.stats.accpt.eagains) | "eagains," | eng3(this.stats.accpt.creates) | " thrds";
                         sout | nl;
@@ -89 +94 @@
                         sout | "----- Connection Stats -----";
                         sout | "max fd    : " | this.stats.send.maxfd;
-                        sout | "sendfile  : " | eng3(calls) | "calls," | eng3(tries) | "tries (" | ratio | " try/call)";
+                        sout | "sendfile  : " | eng3(calls) | "calls," | eng3(tries) | "tries (" | ratio | " try/call)," | eng3(this.stats.send.eagain) | "eagains";
                         sout | "            " | eng3(header) | "header," | eng3(splcin) | "splice in," | eng3(splcot) | "splice out";
-                        sout | " - zipf sizes:";
-                        for(i; zipf_cnts) {
-                                double written = avgrd[i].calls > 0 ? ((double)avgrd[i].bytes) / avgrd[i].calls : 0;
-                                sout | "        " | zipf_sizes[i] | "bytes," | avgrd[i].calls | "shorts," | written | "written";
-                        }
+                        // sout | " - zipf sizes:";
+                        // for(i; zipf_cnts) {
+                        //      double written = avgrd[i].calls > 0 ? ((double)avgrd[i].bytes) / avgrd[i].calls : 0;
+                        //      sout | "        " | zipf_sizes[i] | "bytes," | avgrd[i].calls | "shorts," | written | "written";
+                        // }
                 }