]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
af-packet: output cleanups
authorVictor Julien <vjulien@oisf.net>
Wed, 30 Nov 2022 15:12:53 +0000 (16:12 +0100)
committerVictor Julien <vjulien@oisf.net>
Thu, 15 Dec 2022 14:56:36 +0000 (15:56 +0100)
src/runmode-af-packet.c
src/source-af-packet.c

index 006e0a4cc065dfc605c8de353a21e3c2946f74bb..7442332ed1eaf6592e3a08c7fa564bae171f6e4e 100644 (file)
@@ -622,20 +622,20 @@ finalize:
         /* for cluster_flow use core count */
         if (cluster_type == PACKET_FANOUT_HASH) {
             aconf->threads = (int)UtilCpuGetNumProcessorsOnline();
-            SCLogPerf("%u cores, so using %u threads", aconf->threads, aconf->threads);
+            SCLogPerf("cluster_flow: %u cores, using %u threads", aconf->threads, aconf->threads);
 
-        /* for cluster_qm use RSS queue count */
+            /* for cluster_qm use RSS queue count */
         } else if (cluster_type == PACKET_FANOUT_QM) {
             int rss_queues = GetIfaceRSSQueuesNum(iface);
             if (rss_queues > 0) {
                 aconf->threads = rss_queues;
-                SCLogPerf("%d RSS queues, so using %u threads", rss_queues, aconf->threads);
+                SCLogPerf(
+                        "cluster_qm: %d RSS queues, using %u threads", rss_queues, aconf->threads);
             }
         }
 
         if (aconf->threads) {
-            SCLogPerf("Using %d AF_PACKET threads for interface %s",
-                    aconf->threads, iface);
+            SCLogDebug("using %d threads for interface %s", aconf->threads, iface);
         }
     }
     if (aconf->threads <= 0) {
index f2f8f3a5c9836a27d4aa589b3b7b0318016c8f42..ebea917db5e232ee5fd49dd7e2905ca416525b64 100644 (file)
@@ -1570,9 +1570,9 @@ frame size: TPACKET_ALIGN(snaplen + TPACKET_ALIGN(TPACKET_ALIGN(tp_hdrlen) + siz
     ptv->req.v2.tp_block_nr = ptv->req.v2.tp_frame_nr / frames_per_block + 1;
     /* exact division */
     ptv->req.v2.tp_frame_nr = ptv->req.v2.tp_block_nr * frames_per_block;
-    SCLogPerf("AF_PACKET RX Ring params: block_size=%d block_nr=%d frame_size=%d frame_nr=%d",
-              ptv->req.v2.tp_block_size, ptv->req.v2.tp_block_nr,
-              ptv->req.v2.tp_frame_size, ptv->req.v2.tp_frame_nr);
+    SCLogPerf("rx ring: block_size=%d block_nr=%d frame_size=%d frame_nr=%d",
+            ptv->req.v2.tp_block_size, ptv->req.v2.tp_block_nr, ptv->req.v2.tp_frame_size,
+            ptv->req.v2.tp_frame_nr);
     return 1;
 }