Changeset f3e87af for benchmark/io

Timestamp:

Jan 19, 2021, 3:32:14 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:

2fab24e3

Parents:

3acbf89

Message:

httpc now supports attach feature.

File:

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

benchmark/io/http/http_ring.cpp ¶

@@ -45 +45 @@
 
         int endfd;
-        unsigned entries;
+        struct io_uring * ring;
 
         struct {
@@ -297 +297 @@
         struct options_t & opt = *(struct options_t *)arg;
 
-        struct io_uring ring_storage;
-        struct io_uring * ring = &ring_storage;
-        io_uring_queue_init(opt.entries, ring, 0);
+        struct io_uring * ring = opt.ring;
 
         char endfd_buf[8];
@@ -348 +346 @@
         }
 
-        io_uring_queue_exit(ring);
-
         return (void*)count;
 }
 
 //=========================================================
+struct __attribute__((aligned(128))) aligned_ring {
+        struct io_uring storage;
+};
+
 #include <bit>
 
@@ -371 +371 @@
         unsigned entries = 256;
         unsigned backlog = 10;
+        bool attach = false;
 
         //===================
         // Arguments
         int c;
-        while ((c = getopt (argc, argv, "t:p:e:b:")) != -1) {
+        while ((c = getopt (argc, argv, "t:p:e:b:a")) != -1) {
                 switch (c)
                 {
@@ -390 +391 @@
                         backlog = atoi(optarg);
                         break;
+                case 'a':
+                        attach = true;
+                        break;
                 case '?':
                 default:
-                        std::cerr << "Usage: -t <threads> -p <port> -e <entries> -b <backlog>" << std::endl;
+                        std::cerr << "Usage: -t <threads> -p <port> -e <entries> -b <backlog> -a" << std::endl;
                         return EXIT_FAILURE;
                 }
@@ -464 +468 @@
         //===================
         // Run Server Threads
-        std::cout << "Starting " << nthreads << " Threads" << std::endl;
-        pthread_t thrd_hdls[nthreads];
-        options_t thrd_opts[nthreads];
+        std::cout << "Starting " << nthreads << " Threads";
+        if(attach) {
+                std::cout << " with attached Rings";
+        }
+        std::cout << std::endl;
+
+        aligned_ring thrd_rings[nthreads];
+        pthread_t    thrd_hdls[nthreads];
+        options_t    thrd_opts[nthreads];
         for(unsigned i = 0; i < nthreads; i++) {
+                if(!attach || i == 0) {
+                        io_uring_queue_init(entries, &thrd_rings[i].storage, 0);
+                }
+                else {
+                        struct io_uring_params p;
+                        memset(&p, 0, sizeof(p));
+                        p.flags = IORING_SETUP_ATTACH_WQ;
+                        p.wq_fd = thrd_rings[0].storage.ring_fd;
+                        io_uring_queue_init_params(entries, &thrd_rings[i].storage, &p);
+                }
+
                 thrd_opts[i].acpt.sockfd  = server_fd;
                 thrd_opts[i].acpt.addr    = (struct sockaddr *)&address;
                 thrd_opts[i].acpt.addrlen = (socklen_t*)&addrlen;
                 thrd_opts[i].acpt.flags   = 0;
-                thrd_opts[i].endfd   = efd;
-                thrd_opts[i].entries = entries;
+                thrd_opts[i].endfd        = efd;
+                thrd_opts[i].ring         = &thrd_rings[i].storage;
 
                 int ret = pthread_create(&thrd_hdls[i], nullptr, proc_loop, &thrd_opts[i]);
@@ -527 +548 @@
                 total += thrd_opts[i].result.subs;
                 count += thrd_opts[i].result.cnts;
+
+                io_uring_queue_exit(thrd_opts[i].ring);
         }
         std::cout << "done" << std::endl;