fedsd: Add support for physical connections matching

lf-lang · Jun 9, 2023 · c749a39 · c749a39
1 parent a33e135
commit c749a39
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/util/tracing/visualization/fedsd.py b/util/tracing/visualization/fedsd.py
@@ -50,6 +50,10 @@
 parser.add_argument('-f','--federates', nargs='+', action='append',
                     help='List of the federates csv trace files.')
 
+# Events matching at the sender and receiver ends depend on whether they are tagged
+# (the elapsed logical time and microstep have to be the same) or not. 
+# Set of tagged events (messages)
+non_tagged_messages = {'FED_ID', 'ACK', 'REJECT', 'ADR_RQ', 'ADR_AD', 'MSG', 'P2P_MSG'}
 
 def load_and_process_csv_file(csv_file) :
     '''
@@ -183,15 +187,25 @@ def load_and_process_csv_file(csv_file) :
             inout = trace_df.at[index, 'inout']
 
             # Match tracepoints
-            matching_df = trace_df[\
-                (trace_df['inout'] != inout) & \
-                (trace_df['self_id'] == partner_id) & \
-                (trace_df['partner_id'] == self_id) & \
-                (trace_df['arrow'] == 'pending') & \
-                (trace_df['event'] == event) & \
-                (trace_df['logical_time'] == logical_time) & \
-                (trace_df['microstep'] == microstep) \
-            ]
+            # Depends on whether the event is tagged or not
+            if (trace_df.at[index,'event'] not in non_tagged_messages):
+                matching_df = trace_df[\
+                    (trace_df['inout'] != inout) & \
+                    (trace_df['self_id'] == partner_id) & \
+                    (trace_df['partner_id'] == self_id) & \
+                    (trace_df['arrow'] == 'pending') & \
+                    (trace_df['event'] == event) & \
+                    (trace_df['logical_time'] == logical_time) & \
+                    (trace_df['microstep'] == microstep) \
+                ]
+            else :
+                matching_df = trace_df[\
+                    (trace_df['inout'] != inout) & \
+                    (trace_df['self_id'] == partner_id) & \
+                    (trace_df['partner_id'] == self_id) & \
+                    (trace_df['arrow'] == 'pending') & \
+                    (trace_df['event'] == event)
+                ]
 
             if (matching_df.empty) :
                 # If no matching receiver, than set the arrow to 'dot',
@@ -261,9 +275,6 @@ def load_and_process_csv_file(csv_file) :
 
             if (row['event'] in {'FED_ID', 'ACK', 'REJECT', 'ADR_RQ', 'ADR_AD', 'MSG', 'P2P_MSG'}):
                 label = row['event']
-            elif (row['logical_time'] == -1678240241788173894) :
-                # FIXME: This isn't right.  NEVER == -9223372036854775808.
-                label = row['event'] + '(NEVER)'
             else:
                 label = row['event'] + '(' + f'{int(row["logical_time"]):,}' + ', ' + str(row['microstep']) + ')'