New ZC API calls to check if a queue is locked and in use

ntop · Dec 19, 2024 · 0c04f72 · 0c04f72
1 parent 860d63d
commit 0c04f72
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 4 deletions.
diff --git a/userland/examples_zc/zbalance_ipc.c b/userland/examples_zc/zbalance_ipc.c
@@ -280,8 +280,7 @@ void print_stats() {
   char stats_buf[1024];
   char time_buf[128];
   double duration;
-  int i;
-  int b;
+  int i, b, in_use;
 
   if (start_time.tv_sec == 0)
     gettimeofday(&start_time, NULL);
@@ -394,10 +393,12 @@ void print_stats() {
     for (b = 0; b < num_balancers; b++) {
       for (i = 0; i < num_consumer_queues; i++) {
         if (pfring_zc_stats(balancer[b].outzqs[i], &stats) == 0) {
+          in_use = pfring_zc_ipc_queue_in_use_from_queue(balancer[b].outzqs[i], rx_only);
           if (!daemon_mode && !proc_stats_only) {
-            trace(TRACE_INFO, "                   Balancer %2u Queue %2u: RX %lu pkts Dropped %lu pkts (%.1f %%)\n", 
+            trace(TRACE_INFO, "                   Balancer %2u Queue %2u: RX %lu pkts Dropped %lu pkts (%.1f %%) %s\n", 
                     b, i, stats.recv, stats.drop, 
-	            stats.recv == 0 ? 0 : ((double)(stats.drop*100)/(double)(stats.recv + stats.drop)));
+	            stats.recv == 0 ? 0 : ((double)(stats.drop*100)/(double)(stats.recv + stats.drop)),
+                    in_use == 1 ? "Locked" : (in_use == 0 ? "Not-in-use" : ""));
           }
           if (outdevs[i]) {
             snprintf(&stats_buf[strlen(stats_buf)], sizeof(stats_buf)-strlen(stats_buf),
@@ -412,6 +413,9 @@ void print_stats() {
                i, (long unsigned int) stats.recv, 
 	       i, (long unsigned int) stats.drop);
           }
+          if (in_use != -1)
+            snprintf(&stats_buf[strlen(stats_buf)], sizeof(stats_buf)-strlen(stats_buf), 
+               "Q%uLocked:     %s\n", i, in_use ? "Yes" : "No");
         }
       }
     }

diff --git a/userland/lib/libs/libpfring_zc_x86_64.a b/userland/lib/libs/libpfring_zc_x86_64.a
diff --git a/userland/lib/libs/libpfring_zc_x86_64.so b/userland/lib/libs/libpfring_zc_x86_64.so
diff --git a/userland/lib/libs/libpfring_zc_x86_64_core-avx2.a b/userland/lib/libs/libpfring_zc_x86_64_core-avx2.a
diff --git a/userland/lib/libs/libpfring_zc_x86_64_corei7-avx.a b/userland/lib/libs/libpfring_zc_x86_64_corei7-avx.a
diff --git a/userland/lib/libs/libpfring_zc_x86_64_corei7.a b/userland/lib/libs/libpfring_zc_x86_64_corei7.a
diff --git a/userland/lib/pfring_zc.h b/userland/lib/pfring_zc.h
@@ -1047,6 +1047,48 @@ pfring_zc_ipc_detach_queue(
   pfring_zc_queue *queue
 );
 
+/**
+ * Check if a (rx or tx) queue is locked by another (live or dead) process.
+ * This function opens a new pfring file descriptor.
+ * @param cluster_id The cluster identifier.
+ * @param queue_id   The queue identifier.
+ * @param queue_mode The direction to open, RX or TX.
+ * @return           1 is the queue is in use, 0 otherwise, -1 on failure checking.
+ */
+int
+pfring_zc_ipc_queue_in_use(
+  u_int32_t cluster_id,
+  u_int32_t queue_id,
+  pfring_zc_queue_mode queue_mode
+);
+
+/**
+ * Check if a (rx or tx) queue is locked by another (live or dead) process.
+ * This function uses the file descriptor from a cluster handle.
+ * @param cluster    The cluster handle.
+ * @param queue_id   The queue identifier.
+ * @param queue_mode The direction to open, RX or TX.
+ * @return           1 is the queue is in use, 0 otherwise, -1 on failure checking.
+ */
+int
+pfring_zc_ipc_queue_in_use_from_cluster(
+  pfring_zc_cluster *cluster,
+  u_int32_t queue_id,
+  pfring_zc_queue_mode queue_mode
+);
+
+/**
+ * Check if a (rx or tx) queue is locked by another (live or dead) process.
+ * @param queue      The queue handle.
+ * @param queue_mode The direction to open, RX or TX.
+ * @return           1 is the queue is in use, 0 otherwise, -1 on failure checking.
+ */
+int
+pfring_zc_ipc_queue_in_use_from_queue(
+  pfring_zc_queue *queue,
+  pfring_zc_queue_mode queue_mode
+);
+
 /* **************************************************************************************** */
 
 /**