Changeset eeb4866 for benchmark/io/http

Timestamp:

Feb 1, 2021, 12:42:13 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

cd70477

Parents:

9715567

Message:

Changed read/write to send/recv to work around small bug in io_uring.
Some clean-up.

File:

• benchmark/io/http/http_ring.cpp (modified) (9 diffs)

benchmark/io/http/http_ring.cpp

@@ -8 +8 @@
 #include <unistd.h>
 #include <liburing.h>
+
+// #define NOBATCHING
+// #define USE_ASYNC
 
 // Options passed to each threads
@@ -167 +170 @@
                 , buffer( new char[buffer_size])
                 , iterator(nullptr)
-        {
-                ::stats.conns.max++;
-                ::stats.conns.current++;
-        }
+        {}
 
         ~connection() {
@@ -192 +192 @@
         static void submit(struct io_uring * ring, struct io_uring_sqe * sqe, connection * conn) {
                 (void)ring;
-                // io_uring_sqe_set_flags(sqe, IOSQE_ASYNC);
+                #ifdef USE_ASYNC
+                        io_uring_sqe_set_flags(sqe, IOSQE_ASYNC);
+                #endif
                 io_uring_sqe_set_data(sqe, conn);
-                // io_uring_submit(ring);
+                #ifdef NOBATCHING
+                        io_uring_submit(ring);
+                #endif
         }
 
@@ -206 +210 @@
                 state = REQUESTING;
                 struct io_uring_sqe * sqe = get_sqe(ring);
-                io_uring_prep_read(sqe, fd, (void*)buffer, buffer_size, 0);
+                io_uring_prep_recv(sqe, fd, (void*)buffer, buffer_size, 0);
                 submit(ring, sqe);
         }
@@ -226 +230 @@
                 state = ANSWERING;
                 struct io_uring_sqe * sqe = get_sqe(ring);
-                io_uring_prep_write(sqe, fd, iterator, to_send, 0);
+                io_uring_prep_send(sqe, fd, iterator, to_send, 0);
                 submit(ring, sqe);
         }
@@ -247 +251 @@
                 // Count the connections
                 ::stats.completions.conns++;
+                ::stats.conns.current++;
+                if(::stats.conns.current > ::stats.conns.max) {
+                        ::stats.conns.max = ::stats.conns.current;
+                }
 
                 // Read on the data
@@ -373 +381 @@
                 if( res == to_send ) {
                         // Yes, more stats
-                        stats.answers++;
-                        if(stats.answers == 2) ::stats.conns.used++;
+                        this->stats.answers++;
+                        if(this->stats.answers == 1) ::stats.conns.used++;
                         // Then read a new request
                         request(ring);
@@ -459 +467 @@
                         req->handle( ring, cqe->res, opt );
 
+                        // Every now and then, print some stats
                         reset--;
                         if(reset == 0) {
                                 std::cout << "Submit average: " << sqes << "/" << call << "(" << (((double)sqes) / call) << ")" << std::endl;
+                                // Reset to some random number of completions
+                                // use the ring_fd in the number of threads don't all print at once
                                 reset = 100000 + (100000 * (ring->ring_fd % 5));
                         }
@@ -755 +766 @@
         std::cout << "Max FD: " << max_fd << std::endl;
         std::cout << "Successful connections: " << global_stats.conns.used << std::endl;
+        std::cout << "Max concurrent connections: " << global_stats.conns.max << std::endl;
         std::cout << "Accepts on non-zeros: " << global_stats.recycle_errors << std::endl;
         std::cout << "Leaked conn objects: " << global_stats.conns.current << std::endl;
 }
+
+// compile-command: "g++ http_ring.cpp -std=c++2a -pthread -luring -O3" //