Rebase using current 3.18+ master

davidBar-On · davidBar-On · commit 45e70198123a · 2025-02-28T19:07:27.000+02:00
diff --git a/src/iperf.h b/src/iperf.h
@@ -193,7 +193,7 @@ struct iperf_stream
     struct iperf_test* test;
 
     pthread_t thr;
-    int thread_created;
+    int       thread_created;
     int       done;
 
     /* configurable members */
diff --git a/src/iperf_api.c b/src/iperf_api.c
@@ -2062,7 +2062,7 @@ iperf_send_mt(struct iperf_stream *sp)
     }
 #if defined(HAVE_CLOCK_NANOSLEEP) || defined(HAVE_NANOSLEEP)
      /* Should check if green light can be set, as pacing timer is not supported in this case */
-    if (throttle_check && !throttle_check_per_message) {
+    if (throttle_check && (!throttle_check_per_message || message_sent == 0)) {
 #else /* !HAVE_CLOCK_NANOSLEEP && !HAVE_NANOSLEEP */
     if (!throttle_check_per_message || message_sent == 0) {   /* Throttle check if was not checked for each send */
 #endif /* HAVE_CLOCK_NANOSLEEP, HAVE_NANOSLEEP */

Original file line number	Diff line number	Diff line change
`@@ -2062,7 +2062,7 @@ iperf_send_mt(struct iperf_stream *sp)`
`2062`	`2062`	`}`
`2063`	`2063`	`#if defined(HAVE_CLOCK_NANOSLEEP) \|\| defined(HAVE_NANOSLEEP)`
`2064`	`2064`	`/* Should check if green light can be set, as pacing timer is not supported in this case */`
`2065`		`- if (throttle_check && !throttle_check_per_message) {`
	`2065`	`+ if (throttle_check && (!throttle_check_per_message \|\| message_sent == 0)) {`
`2066`	`2066`	`#else /* !HAVE_CLOCK_NANOSLEEP && !HAVE_NANOSLEEP */`
`2067`	`2067`	`if (!throttle_check_per_message \|\| message_sent == 0) { /* Throttle check if was not checked for each send */`
`2068`	`2068`	`#endif /* HAVE_CLOCK_NANOSLEEP, HAVE_NANOSLEEP */`