Potential solution no.1 for trace bug discussed in the last schedulin…

…g meeting.
lf-lang · Apr 2, 2022 · 1827ed8 · 1827ed8
1 parent 7a7e3a5
commit 1827ed8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
diff --git a/org.lflang/src/org/lflang/TargetConfig.java b/org.lflang/src/org/lflang/TargetConfig.java
@@ -110,6 +110,7 @@ public class TargetConfig {
      * The first string is the definition itself, and the second string is the value to attribute to that definition, if any.
      * The second value could be left empty.
      */
+    // related to the ifdef in trace.h
     public Map<String, String> compileDefinitions = new HashMap<>();
 
     /**

diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
@@ -146,6 +146,7 @@ CodeBuilder generateCMakeCode(
         cMakeCode.pr(")");
         cMakeCode.newLine();
 
+        // This logic doesn't make sense?
         if (targetConfig.threading || targetConfig.tracing != null) {
             // If threaded computation is requested, add a the threads option.
             cMakeCode.pr("# Find threads and link to it");
@@ -156,9 +157,15 @@ CodeBuilder generateCMakeCode(
             // If the LF program itself is threaded or if tracing is enabled, we need to define
             // NUMBER_OF_WORKERS so that platform-specific C files will contain the appropriate functions
             cMakeCode.pr("# Set the number of workers to enable threading");
+            // Where we want to add line for target_compile_definitions( ${LF_MAIN_TARGET} LINGUA_FRANCA_TRACE)
             cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} PUBLIC NUMBER_OF_WORKERS="+targetConfig.workers+")");
             cMakeCode.newLine();
         }
+
+        if (targetConfig.tracing != null) {
+            cMakeCode.pr("target_compile_definitions( ${LF_MAIN_TARGET} LINGUA_FRANCA_TRACE ");
+            cMakeCode.newLine();
+        }
 
         cMakeCode.pr("# Target definitions\n");
         targetConfig.compileDefinitions.forEach( (key, value) -> {

diff --git a/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java b/org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
@@ -75,9 +75,9 @@ public static String generateDefineDirectives(
                     GeneratorBase.timeInTargetLanguage(advanceMessageInterval));
             }
         }
-        if (tracing != null) {
-            code.pr(generateTracingDefineDirective(tracing.traceFileName));
-        }
+//        if (tracing != null) {
+//            code.pr(generateTracingDefineDirective(tracing.traceFileName));
+//        }
         if (hasModalReactors) {
             code.pr("#define MODAL_REACTORS");
         }
@@ -108,12 +108,13 @@ private static String generateFederatedDefineDirective(CoordinationType coordina
         return String.join("\n", directives);
     }
 
-    private static String generateTracingDefineDirective(String traceFileName) {
-        if (traceFileName == null) {
-            return "#define LINGUA_FRANCA_TRACE";
-        }
-        return "#define LINGUA_FRANCA_TRACE " + traceFileName;
-    }
+    // Remove this
+//    private static String generateTracingDefineDirective(String traceFileName) {
+//        if (traceFileName == null) {
+//            return "#define LINGUA_FRANCA_TRACE";
+//        }
+//        return "#define LINGUA_FRANCA_TRACE " + traceFileName;
+//    }
 
     /**
      * Initialize clock synchronization (if enabled) and its related options for a given federate.
+0 −4		core/reactor.h
+1 −1		core/tag.c
+1 −0		core/threaded/scheduler_GEDF_NP.c
+2 −0		core/trace.c
+1 −0		core/trace.h
+7 −7		core/utils/util.c
+9 −9		core/utils/util.h
+1 −1		util/sensor_simulator.c