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

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.hfa (modified) (1 diff)

benchmark/io/http/printer.hfa

@@ -12 +12 @@
         volatile uint64_t maxfd;
         volatile uint64_t close;
+        volatile uint64_t error;
         volatile uint64_t calls;
+        volatile uint64_t eagain;
         volatile uint64_t tries;
         volatile uint64_t header;