Fix: Unify stats name fix the ports frame calculation

DawidWesierski4 · DawidWesierski4 · commit f8b1896ae895 · 2025-08-12T06:57:01.000-04:00
diff --git a/include/st20_api.h b/include/st20_api.h
@@ -1681,7 +1681,7 @@ struct st22_rx_ops {
 /**
  * A structure used to retrieve general statistics(I/O) for a st20 tx session.
  */
-struct st20_tx_users_stats {
+struct st20_tx_user_stats {
   struct st_tx_port_stats port[MTL_SESSION_PORT_MAX];
   uint64_t stat_pkts_dummy;
   uint64_t stat_epoch_troffset_mismatch;
@@ -1893,7 +1893,7 @@ int st20_tx_get_sch_idx(st20_tx_handle handle);
  *   - >=0 succ.
  *   - <0: Error code.
  */
-int st20_tx_get_session_stats(st20_tx_handle handle, struct st20_tx_users_stats* stats);
+int st20_tx_get_session_stats(st20_tx_handle handle, struct st20_tx_user_stats* stats);
 
 /**
  * Reset the general statistics(I/O) for one tx st2110-20(video) session.
diff --git a/include/st30_api.h b/include/st30_api.h
@@ -531,7 +531,7 @@ struct st30_rx_ops {
 /**
  * A structure used to retrieve general statistics(I/O) for a st30 tx session.
  */
-struct st30_tx_users_stats {
+struct st30_tx_user_stats {
   struct st_tx_port_stats port[MTL_SESSION_PORT_MAX];
   uint64_t stat_epoch_mismatch;
   uint64_t stat_epoch_drop;
@@ -577,7 +577,7 @@ struct st30_rx_user_stats {
  *   - >=0 succ.
  *   - <0: Error code.
  */
-int st30_tx_get_session_stats(st30_tx_handle handle, struct st30_tx_users_stats* stats);
+int st30_tx_get_session_stats(st30_tx_handle handle, struct st30_tx_user_stats* stats);
 
 /**
  * Reset the general statistics(I/O) for one tx st2110-30(audio) session.
diff --git a/include/st30_pipeline_api.h b/include/st30_pipeline_api.h
@@ -171,7 +171,7 @@ struct st30p_tx_ops {
  *   - >=0 succ.
  *   - <0: Error code.
  */
-int st30p_tx_get_session_stats(st30p_tx_handle handle, struct st30_tx_users_stats* stats);
+int st30p_tx_get_session_stats(st30p_tx_handle handle, struct st30_tx_user_stats* stats);
 
 /**
  * Reset the general statistics(I/O) for one rx st2110-30(pipeline) session.
diff --git a/include/st_pipeline_api.h b/include/st_pipeline_api.h
@@ -1770,7 +1770,7 @@ int st20p_tx_get_sch_idx(st20p_tx_handle handle);
  *   - >=0 succ.
  *   - <0: Error code.
  */
-int st20p_tx_get_session_stats(st20p_tx_handle handle, struct st20_tx_users_stats* stats);
+int st20p_tx_get_session_stats(st20p_tx_handle handle, struct st20_tx_user_stats* stats);
 
 /**
  * Reset the general statistics(I/O) for one tx st2110-20(pipeline) session.
diff --git a/lib/src/st2110/pipeline/st20_pipeline_tx.c b/lib/src/st2110/pipeline/st20_pipeline_tx.c
@@ -985,7 +985,7 @@ int st20p_tx_get_sch_idx(st20p_tx_handle handle) {
 }
 
 int st20p_tx_get_session_stats(st20p_tx_handle handle,
-                               struct st20_tx_users_stats* stats) {
+                               struct st20_tx_user_stats* stats) {
   struct st20p_tx_ctx* ctx = handle;
   int cidx = ctx->idx;
 
diff --git a/lib/src/st2110/pipeline/st30_pipeline_tx.c b/lib/src/st2110/pipeline/st30_pipeline_tx.c
@@ -636,7 +636,7 @@ void* st30p_tx_get_fb_addr(st30p_tx_handle handle, uint16_t idx) {
 }
 
 int st30p_tx_get_session_stats(st30p_tx_handle handle,
-                               struct st30_tx_users_stats* stats) {
+                               struct st30_tx_user_stats* stats) {
   struct st30p_tx_ctx* ctx = handle;
   int cidx = ctx->idx;
 
diff --git a/lib/src/st2110/st_header.h b/lib/src/st2110/st_header.h
@@ -416,7 +416,7 @@ struct st_tx_video_session_impl {
   double stat_cpu_busy_score;
   /* for tasklet session time measure */
   struct mt_stat_u64 stat_time;
-  struct st20_tx_users_stats port_user_stats[MTL_SESSION_PORT_MAX];
+  struct st20_tx_user_stats port_user_stats[MTL_SESSION_PORT_MAX];
 };
 
 struct st_tx_video_sessions_mgr {
@@ -834,7 +834,7 @@ struct st_tx_audio_session_impl {
   struct mt_txq_entry* queue[MTL_SESSION_PORT_MAX];
   bool shared_queue;
 
-  struct st30_tx_users_stats port_user_stats[MTL_SESSION_PORT_MAX];
+  struct st30_tx_user_stats port_user_stats[MTL_SESSION_PORT_MAX];
 
   enum st30_tx_pacing_way tx_pacing_way;
   /* for rl based pacing */
diff --git a/lib/src/st2110/st_rx_ancillary_session.c b/lib/src/st2110/st_rx_ancillary_session.c
@@ -158,7 +158,7 @@ static int rx_ancillary_session_handle_pkt(struct mtl_main_impl* impl,
 
   if (tmstamp != s->tmstamp) {
     rte_atomic32_inc(&s->stat_frames_received);
-    s->port_user_stats->port[MTL_PORT_P].frames++;
+    s->port_user_stats->port[s_port].frames++;
     s->tmstamp = tmstamp;
   }
   ST_SESSION_STAT_INC(s, stat_pkts_received);
diff --git a/lib/src/st2110/st_rx_fastmetadata_session.c b/lib/src/st2110/st_rx_fastmetadata_session.c
@@ -145,7 +145,7 @@ static int rx_fastmetadata_session_handle_pkt(struct mtl_main_impl* impl,
 
   if (tmstamp != s->tmstamp) {
     rte_atomic32_inc(&s->stat_frames_received);
-    s->port_user_stats->port[MTL_PORT_P].frames++;
+    s->port_user_stats->port[s_port].frames++;
     s->tmstamp = tmstamp;
   }
   ST_SESSION_STAT_INC(s, stat_pkts_received);
diff --git a/lib/src/st2110/st_rx_video_session.c b/lib/src/st2110/st_rx_video_session.c
@@ -907,7 +907,6 @@ static void rv_frame_notify(struct st_rx_video_session_impl* s,
                                      meta->frame_recv_size, s->st20_frame_size);
     meta->status = ST_FRAME_STATUS_CORRUPTED;
     ST_SESSION_STAT_INC(s, stat_frames_dropped);
-    s->port_user_stats->stat_frames_dropped++;
 
     /* record the miss pkts */
     float pd_sz_per_pkt = (float)meta->frame_recv_size / slot->pkts_received;
diff --git a/lib/src/st2110/st_tx_audio_session.c b/lib/src/st2110/st_tx_audio_session.c
@@ -2970,7 +2970,7 @@ int st30_tx_put_mbuf(st30_tx_handle handle, void* mbuf, uint16_t len) {
   return 0;
 }
 
-int st30_tx_get_session_stats(st30_tx_handle handle, struct st30_tx_users_stats* stats) {
+int st30_tx_get_session_stats(st30_tx_handle handle, struct st30_tx_user_stats* stats) {
   struct st_tx_audio_session_handle_impl* s_impl = handle;
 
   if (s_impl->type != MT_HANDLE_TX_AUDIO) {
diff --git a/lib/src/st2110/st_tx_video_session.c b/lib/src/st2110/st_tx_video_session.c
@@ -4312,7 +4312,7 @@ int st20_tx_get_sch_idx(st20_tx_handle handle) {
   return s_impl->sch->idx;
 }
 
-int st20_tx_get_session_stats(st20_tx_handle handle, struct st20_tx_users_stats* stats) {
+int st20_tx_get_session_stats(st20_tx_handle handle, struct st20_tx_user_stats* stats) {
   struct st_tx_video_session_handle_impl* s_impl = handle;
 
   if (s_impl->type != MT_HANDLE_TX_VIDEO) {
diff --git a/tests/tools/RxTxApp/src/legacy/tx_video_app.c b/tests/tools/RxTxApp/src/legacy/tx_video_app.c
@@ -706,7 +706,7 @@ static int app_tx_video_io_stat(struct st_app_tx_video_session* s) {
   double time_sec = (double)(cur_time - s->last_stat_time_ns) / NS_PER_S;
   double tx_rate_m, fps;
   int ret;
-  struct st20_tx_users_stats stats;
+  struct st20_tx_user_stats stats;
 
   if (!s->handle) return 0;
 
diff --git a/tests/tools/RxTxApp/src/rx_st20p_app.c b/tests/tools/RxTxApp/src/rx_st20p_app.c
@@ -136,7 +136,8 @@ static int app_rx_st20p_uinit(struct st_app_rx_st20p_session* s) {
     /* wake up the thread */
     info("%s(%d), wait app thread stop\n", __func__, idx);
     if (s->handle) st20p_rx_wake_block(s->handle);
-    pthread_join(s->st20p_app_thread, NULL);
+    if (s->st20p_app_thread)
+      pthread_join(s->st20p_app_thread, NULL);
   }
 
   if (s->handle) {
diff --git a/tests/tools/RxTxApp/src/tx_st20p_app.c b/tests/tools/RxTxApp/src/tx_st20p_app.c
@@ -216,7 +216,7 @@ static int app_tx_st20p_io_stat(struct st_app_tx_st20p_session* s) {
   double time_sec = (double)(cur_time - s->last_stat_time_ns) / NS_PER_S;
   double tx_rate_m, fps;
   int ret;
-  struct st20_tx_users_stats stats;
+  struct st20_tx_user_stats stats;
 
   if (!s->handle) return 0;
 

Original file line number	Diff line number	Diff line change
`@@ -985,7 +985,7 @@ int st20p_tx_get_sch_idx(st20p_tx_handle handle) {`
`985`	`985`	`}`
`986`	`986`
`987`	`987`	`int st20p_tx_get_session_stats(st20p_tx_handle handle,`
`988`		`- struct st20_tx_users_stats* stats) {`
	`988`	`+ struct st20_tx_user_stats* stats) {`
`989`	`989`	`struct st20p_tx_ctx* ctx = handle;`
`990`	`990`	`int cidx = ctx->idx;`
`991`	`991`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ void* st30p_tx_get_fb_addr(st30p_tx_handle handle, uint16_t idx) {`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`int st30p_tx_get_session_stats(st30p_tx_handle handle,`
`639`		`- struct st30_tx_users_stats* stats) {`
	`639`	`+ struct st30_tx_user_stats* stats) {`
`640`	`640`	`struct st30p_tx_ctx* ctx = handle;`
`641`	`641`	`int cidx = ctx->idx;`
`642`	`642`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ static int rx_ancillary_session_handle_pkt(struct mtl_main_impl* impl,`
`158`	`158`
`159`	`159`	`if (tmstamp != s->tmstamp) {`
`160`	`160`	`rte_atomic32_inc(&s->stat_frames_received);`
`161`		`- s->port_user_stats->port[MTL_PORT_P].frames++;`
	`161`	`+ s->port_user_stats->port[s_port].frames++;`
`162`	`162`	`s->tmstamp = tmstamp;`
`163`	`163`	`}`
`164`	`164`	`ST_SESSION_STAT_INC(s, stat_pkts_received);`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static int rx_fastmetadata_session_handle_pkt(struct mtl_main_impl* impl,`
`145`	`145`
`146`	`146`	`if (tmstamp != s->tmstamp) {`
`147`	`147`	`rte_atomic32_inc(&s->stat_frames_received);`
`148`		`- s->port_user_stats->port[MTL_PORT_P].frames++;`
	`148`	`+ s->port_user_stats->port[s_port].frames++;`
`149`	`149`	`s->tmstamp = tmstamp;`
`150`	`150`	`}`
`151`	`151`	`ST_SESSION_STAT_INC(s, stat_pkts_received);`