tool - ndp: [FIX] do not clear main counters in multithread stats

This allows to correctly check packet limits.
CESNET · Aug 30, 2024 · d95cc50 · d95cc50
1 parent 2f8dd4e
commit d95cc50
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/tools/ndptool/common.h b/tools/ndptool/common.h
@@ -48,16 +48,18 @@ typedef enum fastwrite_mode {
 struct stats_info {
 	unsigned long long packet_cnt;
 	unsigned long long bytes_cnt;
-
+	unsigned long long last_packet_cnt;
+	unsigned long long last_bytes_cnt;
+	unsigned long long last_update;
 	unsigned long long progress_counter;
 	unsigned long long sampling;
-	char progress_letter;
-	enum progress_type progress_type;
-
 	unsigned long long thread_packet_cnt;
 	unsigned long long thread_bytes_cnt;
 	unsigned long long thread_total_bytes_cnt;
 	void *priv;
+
+	char progress_letter;
+	enum progress_type progress_type;
 	bool incremental;
 
 	struct timeval startTime;

diff --git a/tools/ndptool/stats.c b/tools/ndptool/stats.c
@@ -245,15 +245,17 @@ void update_stats_thread(struct ndp_packet *packets, int count, struct stats_inf
 {
 	update_print_progress(packets, count, si);
 
-	if (si->packet_cnt > 100000 || count == 0) {
+	si->last_update += count;
+	if (si->last_update > 100000 || count == 0) {
 		/* Update global stats */
 		pthread_spin_lock(&((struct thread_data *)si->priv)->lock);
-		si->thread_packet_cnt += si->packet_cnt;
-		si->thread_bytes_cnt += si->bytes_cnt;
+		si->thread_packet_cnt += (si->packet_cnt - si->last_packet_cnt);
+		si->thread_bytes_cnt += (si->bytes_cnt - si->last_bytes_cnt);
 		pthread_spin_unlock(&((struct thread_data *)si->priv)->lock);
 
-		si->packet_cnt = 0;
-		si->bytes_cnt = 0;
+		si->last_packet_cnt = si->packet_cnt;
+		si->last_bytes_cnt = si->bytes_cnt;
+		si->last_update = 0;
 	}
 }