tmf: bug 492744 Reverse CAUSE and EFFECT in event matching

The code worked OK, but what was called cause was actually the effect and
reversely.

Change-Id: I5cf80cc31fd355e12e2c4024709a6ad32d6033d4
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/71736
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpEventMatching.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpEventMatching.java
index 2feeb23663bed477795a1bf8ab254c48c0d05f55..ba711ff802dcb3267d078764cf701619fd271a98 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpEventMatching.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpEventMatching.java
@@ -67,9 +67,9 @@ public class TcpEventMatching implements ITmfMatchEventDefinition {
 
         /* Is the event a tcp socket in or out event */
         if (evname.equals(TcpEventStrings.INET_SOCK_LOCAL_IN)) {
-            return Direction.CAUSE;
-        } else if (evname.equals(TcpEventStrings.INET_SOCK_LOCAL_OUT)) {
             return Direction.EFFECT;
+        } else if (evname.equals(TcpEventStrings.INET_SOCK_LOCAL_OUT)) {
+            return Direction.CAUSE;
         }
         return null;
     }

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
index 3a58e05ae375ed82d1eaa8f3f23a9ead6718ece7..01747fa27dbdecce2e26c5e2fcaa03d999fbab66 100644 (file)
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core/src/org/eclipse/tracecompass/internal/lttng2/kernel/core/event/matching/TcpLttngEventMatching.java
@@ -82,9 +82,9 @@ public class TcpLttngEventMatching implements ITmfMatchEventDefinition {
 
         /* Is the event a tcp socket in or out event */
         if (evname.equals(TcpEventStrings.NETIF_RECEIVE_SKB) && canMatchPacket(event)) {
-            return Direction.CAUSE;
-        } else if (evname.equals(TcpEventStrings.NET_DEV_QUEUE) && canMatchPacket(event)) {
             return Direction.EFFECT;
+        } else if (evname.equals(TcpEventStrings.NET_DEV_QUEUE) && canMatchPacket(event)) {
+            return Direction.CAUSE;
         }
         return null;
     }

diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TmfEventMatching.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TmfEventMatching.java
index b6366e5eb814ec65369cf434caec0a56b99f18d0..05d138a37da6647a3aa9e851ab48208e27c944c3 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TmfEventMatching.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/event/matching/TmfEventMatching.java
@@ -246,11 +246,11 @@ public class TmfEventMatching implements ITmfEventMatching {
 
         /* Point to the appropriate table */
         switch (evType) {
-        case CAUSE:
+        case EFFECT:
             unmatchedTbl = fUnmatchedIn;
             companionTbl = fUnmatchedOut;
             break;
-        case EFFECT:
+        case CAUSE:
             unmatchedTbl = fUnmatchedOut;
             companionTbl = fUnmatchedIn;
             break;
@@ -271,10 +271,10 @@ public class TmfEventMatching implements ITmfEventMatching {
 
                 /* Create the dependency object */
                 switch (evType) {
-                case CAUSE:
+                case EFFECT:
                     dep = new TmfEventDependency(companionEvent, event);
                     break;
-                case EFFECT:
+                case CAUSE:
                     dep = new TmfEventDependency(event, companionEvent);
                     break;
                 default: