reduce initial micro bursts (#283)

rtbrick · Oct 2, 2024 · 0522f17 · 0522f17
1 parent cc6699d
commit 0522f17
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/code/bngblaster/src/bbl_stream.c b/code/bngblaster/src/bbl_stream.c
@@ -1490,6 +1490,22 @@ bbl_stream_io_send(bbl_stream_s *stream)
     return PROTOCOL_SUCCESS;
 }
 
+/**
+ * bbl_stream_io_stop
+ *
+ * @param io IO handle
+ */
+void
+bbl_stream_io_stop(io_handle_s *io)
+{
+    io_bucket_s *io_bucket = io->bucket_head;
+    while(io_bucket) {
+        io_bucket->base = 0;
+        io_bucket->stream_cur = NULL;
+        io_bucket = io_bucket->next;
+    }
+}
+
 /**
  * bbl_stream_io_send_iter
  *
@@ -1510,9 +1526,13 @@ bbl_stream_io_send_iter(io_handle_s *io, uint64_t now)
         } else {
             stream = io_bucket->stream_head;
             io_bucket->stream_cur = stream;
-            io_bucket->base += io_bucket->nsec;
-            if(io_bucket->base < min) {
-                io_bucket->base = min;
+            if(io_bucket->base) {
+                io_bucket->base += io_bucket->nsec;
+                if(io_bucket->base < min) {
+                    io_bucket->base = min;
+                }
+            } else {
+                io_bucket->base = now - io_bucket->nsec;
             }
         }
         if(io_bucket->base >= now) {

diff --git a/code/bngblaster/src/bbl_stream.h b/code/bngblaster/src/bbl_stream.h
@@ -236,6 +236,9 @@ bbl_stream_init();
 void
 bbl_stream_final();
 
+void
+bbl_stream_io_stop(io_handle_s *io);
+
 bbl_stream_s *
 bbl_stream_io_send_iter(io_handle_s *io, uint64_t now);
 

diff --git a/code/bngblaster/src/io/io_dpdk.c b/code/bngblaster/src/io/io_dpdk.c
@@ -348,6 +348,8 @@ io_dpdk_tx_job(timer_s *timer)
                 burst = 0;
             }
         }
+    } else {
+        bbl_stream_io_stop(io);
     }
     if(pcap) {
         pcapng_fflush();
@@ -477,6 +479,8 @@ io_dpdk_thread_tx_run_fn(io_thread_s *thread)
                     burst = 0;
                 }
             }
+        } else {
+            bbl_stream_io_stop(io);
         }
     }
 }

diff --git a/code/bngblaster/src/io/io_packet_mmap.c b/code/bngblaster/src/io/io_packet_mmap.c
@@ -174,6 +174,7 @@ io_packet_mmap_tx_job(timer_s *timer)
                 }
             } else {
                 if(!(g_traffic && g_init_phase == false && interface->state == INTERFACE_UP)) {
+                    bbl_stream_io_stop(io);
                     break;
                 }
                 stream = bbl_stream_io_send_iter(io, now);
@@ -342,6 +343,7 @@ io_packet_mmap_thread_tx_run_fn(io_thread_s *thread)
                 }
             } else {
                 if(!(g_traffic && g_init_phase == false && interface->state == INTERFACE_UP)) {
+                    bbl_stream_io_stop(io);
                     break;
                 }
                 /* Send traffic streams up to allowed burst. */

diff --git a/code/bngblaster/src/io/io_raw.c b/code/bngblaster/src/io/io_raw.c
@@ -181,6 +181,8 @@ io_raw_tx_job(timer_s *timer)
                 }
             }
         }
+    } else {
+        bbl_stream_io_stop(io);
     }
     if(unlikely(pcap)) {
         pcapng_fflush();
@@ -287,6 +289,8 @@ io_raw_thread_tx_run_fn(io_thread_s *thread)
                     }
                 }
             }
+        } else {
+            bbl_stream_io_stop(io);
         }
     }
 }

diff --git a/code/bngblaster/src/io/io_stream.c b/code/bngblaster/src/io/io_stream.c
@@ -67,16 +67,16 @@ bucket_shuffle(io_bucket_s *io_bucket)
 }
 
 static void
-bucket_smear(io_bucket_s *io_bucket, uint64_t start_nsec)
+bucket_smear(io_bucket_s *io_bucket)
 {
     uint64_t nsec = 0;
     uint64_t step_nsec;
     bbl_stream_s *stream;
 
     if(io_bucket && io_bucket->stream_count) {
         step_nsec = io_bucket->nsec / io_bucket->stream_count;
-        io_bucket->base = start_nsec - io_bucket->nsec;
-
+        io_bucket->base = 0;
+        io_bucket->stream_cur = NULL;
         stream = io_bucket->stream_head;
         while(stream) {
             nsec += step_nsec;
@@ -124,14 +124,9 @@ void
 io_stream_smear(io_handle_s *io)
 {
     io_bucket_s *io_bucket = io->bucket_head;
-    struct timespec now;
-    uint64_t now_nsec;
-
-    clock_gettime(CLOCK_MONOTONIC, &now);
-    now_nsec = timespec_to_nsec(&now);
     while(io_bucket) {
         bucket_shuffle(io_bucket);
-        bucket_smear(io_bucket, now_nsec);
+        bucket_smear(io_bucket);
         io_bucket = io_bucket->next;
     }
 }