dpdk: merging the ethdev packet throughput and packet rate analyses

eclipse-tracecompass-incubator · Oct 15, 2024 · 0b9fd6f · 0b9fd6f
1 parent d2177e1
commit 0b9fd6f
Show file tree

Hide file tree

Showing 34 changed files with 719 additions and 1,585 deletions.
diff --git a/analyses/org.eclipse.tracecompass.incubator.dpdk.core/META-INF/MANIFEST.MF b/analyses/org.eclipse.tracecompass.incubator.dpdk.core/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.tracecompass.analysis.lami.core,
  com.google.guava
 Export-Package: org.eclipse.tracecompass.incubator.dpdk.core.trace,
- org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.rate.analysis,
  org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.spin.analysis,
  org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.throughput.analysis,
  org.eclipse.tracecompass.incubator.internal.dpdk.core.lcore.analysis;x-friends:="org.eclipse.tracecompass.incubator.dpdk.core.tests"

diff --git a/analyses/org.eclipse.tracecompass.incubator.dpdk.core/plugin.xml b/analyses/org.eclipse.tracecompass.incubator.dpdk.core/plugin.xml
@@ -11,16 +11,6 @@
                applies="true"
                class="org.eclipse.tracecompass.incubator.dpdk.core.trace.DpdkTrace">
          </tracetype>
-      </module>
-            <module
-            analysis_module="org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.rate.analysis.DpdkEthdevRateAnalysis"
-            automatic="true"
-            id="org.eclipse.tracecompass.incubator.dpdk.ethdev.rate.analysis"
-            name="DPDK Ethernet Rate Analysis">
-         <tracetype
-               applies="true"
-               class="org.eclipse.tracecompass.incubator.dpdk.core.trace.DpdkTrace">
-         </tracetype>
       </module>
       <module
             analysis_module="org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.spin.analysis.DpdkEthdevSpinAnalysisModule"
@@ -33,7 +23,7 @@
       </module>
       <module
             analysis_module="org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.throughput.analysis.DpdkEthdevThroughputAnalysisModule"
-            automatic="true"
+            automatic="false"
             id="org.eclipse.tracecompass.incubator.dpdk.ethdev.throughput.analysis"
             name="DPDK Ethernet Throughput Analysis">
          <tracetype
@@ -48,10 +38,6 @@
             class="org.eclipse.tracecompass.incubator.internal.dpdk.core.lcore.analysis.DpdkLogicalCoreDataProviderFactory"
             id="org.eclipse.tracecompass.incubator.dpdk.lcore.dataprovider">
       </dataProviderFactory>
-      <dataProviderFactory
-            class="org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.rate.analysis.DpdkEthdevRateDataProviderFactory"
-            id="org.eclipse.tracecompass.incubator.dpdk.ethdev.rate.dataprovider">
-      </dataProviderFactory>
       <dataProviderFactory
             class="org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.spin.analysis.DpdkEthdevSpinDataProviderFactory"
             id="org.eclipse.tracecompass.incubator.internal.dpdk.core.ethdev.spin.dataprovider">

diff --git a/...org/eclipse/tracecompass/incubator/internal/dpdk/core/analysis/DpdkEthdevEventLayout.java b/...org/eclipse/tracecompass/incubator/internal/dpdk/core/analysis/DpdkEthdevEventLayout.java
@@ -44,9 +44,9 @@
 public class DpdkEthdevEventLayout {
     /* Event names */
     private static final String ETH_DEV_CONFIGURE = "lib.ethdev.configure"; //$NON-NLS-1$
-    private static final String ETH_DEV_RXQ_BURST_EMPTY = "lib.ethdev.rx.burst.empty"; //$NON-NLS-1$
-    private static final String ETH_DEV_RXQ_BURST_NON_EMPTY = "lib.ethdev.rx.burst.nonempty"; //$NON-NLS-1$
-    private static final String ETH_DEV_TXQ_BURST = "lib.ethdev.tx.burst"; //$NON-NLS-1$
+    private static final String ETH_DEV_RX_BURST_EMPTY = "lib.ethdev.rx.burst.empty"; //$NON-NLS-1$
+    private static final String ETH_DEV_RX_BURST_NON_EMPTY = "lib.ethdev.rx.burst.nonempty"; //$NON-NLS-1$
+    private static final String ETH_DEV_TX_BURST = "lib.ethdev.tx.burst"; //$NON-NLS-1$
     private static final String PROFILE_ETH_DEV_RX_BURST = "lib.ethdev.rx.burst.extended"; //$NON-NLS-1$
     private static final String PROFILE_ETH_DEV_TX_BURST = "lib.ethdev.tx.burst.extended"; //$NON-NLS-1$
 
@@ -82,26 +82,26 @@ public static String eventEthdevConfigure() {
      *
      * @return The event name
      */
-    public static String eventEthdevRxqBurstEmpty() {
-        return ETH_DEV_RXQ_BURST_EMPTY;
+    public static String eventEthdevRxBurstEmpty() {
+        return ETH_DEV_RX_BURST_EMPTY;
     }
 
     /**
      * This event is generated when a burst of one or more packets is received
      *
      * @return The event name
      */
-    public static String eventEthdevRxqBurstNonEmpty() {
-        return ETH_DEV_RXQ_BURST_NON_EMPTY;
+    public static String eventEthdevRxBurstNonEmpty() {
+        return ETH_DEV_RX_BURST_NON_EMPTY;
     }
 
     /**
      * This event is generated when a burst of packets is sent
      *
      * @return The event name
      */
-    public static String eventEthdevTxqBurst() {
-        return ETH_DEV_TXQ_BURST;
+    public static String eventEthdevTxBurst() {
+        return ETH_DEV_TX_BURST;
     }
 
     /**

diff --git a/...racecompass/incubator/internal/dpdk/core/ethdev/rate/analysis/DpdkEthdevRateAnalysis.java b/...racecompass/incubator/internal/dpdk/core/ethdev/rate/analysis/DpdkEthdevRateAnalysis.java
diff --git a/...cecompass/incubator/internal/dpdk/core/ethdev/rate/analysis/DpdkEthdevRateAttributes.java b/...cecompass/incubator/internal/dpdk/core/ethdev/rate/analysis/DpdkEthdevRateAttributes.java