task and user_intf: make debug messages require debug flag

LinuxCNC · Feb 8, 2025 · de88a59 · de88a59
1 parent 78654f1
commit de88a59
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 41 deletions.
diff --git a/src/emc/task/emcsvr.cc b/src/emc/task/emcsvr.cc
@@ -100,17 +100,19 @@ static int iniLoad(const char *filename)
         }
     }
 
-    inistring = inifile.Find("VERSION", "EMC");
-    strncpy(version, inistring.value_or("unknown"), LINELEN-1);
-
-    inistring = inifile.Find("MACHINE", "EMC");
-    strncpy(machine, inistring.value_or("unknown"), LINELEN-1);
-
-    extern char *program_invocation_short_name;
-    rcs_print(
-        "%s (%d) emcsvr: machine '%s'  version '%s'\n",
-        program_invocation_short_name, getpid(), machine, version
-    );
+    if (emc_debug & EMC_DEBUG_CONFIG) {
+        inistring = inifile.Find("VERSION", "EMC");
+        strncpy(version, inistring.value_or("unknown"), LINELEN-1);
+
+        inistring = inifile.Find("MACHINE", "EMC");
+        strncpy(machine, inistring.value_or("unknown"), LINELEN-1);
+
+        extern char *program_invocation_short_name;
+        rcs_print(
+            "%s (%d) emcsvr: machine '%s'  version '%s'\n",
+            program_invocation_short_name, getpid(), machine, version
+        );
+    }
 
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 	// copy to global

diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc
@@ -3163,16 +3163,18 @@ static int iniLoad(const char *filename)
         }
     }
 
-    inistring = inifile.Find("VERSION", "EMC");
-    rtapi_strlcpy(version, inistring.value_or("unknown"), LINELEN-1);
-
-    inistring = inifile.Find("MACHINE", "EMC");
-    rtapi_strlcpy(machine, inistring.value_or("unknown"), LINELEN-1);
-    extern char *program_invocation_short_name;
-    rcs_print(
-	"%s (%d) task: machine '%s'  version '%s'\n",
-	program_invocation_short_name, getpid(), machine, version
-    );
+	if (emc_debug & EMC_DEBUG_CONFIG) {
+		inistring = inifile.Find("VERSION", "EMC");
+		rtapi_strlcpy(version, inistring.value_or("unknown"), LINELEN-1);
+
+		inistring = inifile.Find("MACHINE", "EMC");
+		rtapi_strlcpy(machine, inistring.value_or("unknown"), LINELEN-1);
+		extern char *program_invocation_short_name;
+		rcs_print(
+		"%s (%d) task: machine '%s'  version '%s'\n",
+		program_invocation_short_name, getpid(), machine, version
+		);
+	}
 
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 	// copy to global

diff --git a/src/emc/usr_intf/halui.cc b/src/emc/usr_intf/halui.cc
@@ -1452,19 +1452,20 @@ static int iniLoad(const char *filename)
 	    strncpy(version, *inistring, LINELEN-1);
     }
 
+    if (emc_debug & EMC_DEBUG_CONFIG) {
+        if ((inistring = inifile.Find("MACHINE", "EMC"))) {
+            strncpy(machine, *inistring, LINELEN-1);
+        } else {
+            strncpy(machine, "unknown", LINELEN-1);
+        }
 
-    if ((inistring = inifile.Find("MACHINE", "EMC"))) {
-	    strncpy(machine, *inistring, LINELEN-1);
-    } else {
-	    strncpy(machine, "unknown", LINELEN-1);
+        extern char *program_invocation_short_name;
+        rcs_print(
+            "%s (%d) halui: machine '%s'  version '%s'\n",
+            program_invocation_short_name, getpid(), machine, version
+        );
     }
 
-    extern char *program_invocation_short_name;
-    rcs_print(
-        "%s (%d) halui: machine '%s'  version '%s'\n",
-        program_invocation_short_name, getpid(), machine, version
-    );
-
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 	// copy to global
 	rtapi_strxcpy(emc_nmlfile, *inistring);

diff --git a/src/emc/usr_intf/shcom.cc b/src/emc/usr_intf/shcom.cc
@@ -1324,19 +1324,20 @@ int iniLoad(const char *filename)
 	    strncpy(version, *inistring, LINELEN-1);
     }
 
+    if (emc_debug & EMC_DEBUG_CONFIG) {
+        if ((inistring = inifile.Find("MACHINE", "EMC"))) {
+            strncpy(machine, *inistring, LINELEN-1);
+        } else {
+            strncpy(machine, "unknown", LINELEN-1);
+        }
 
-    if ((inistring = inifile.Find("MACHINE", "EMC"))) {
-	    strncpy(machine, *inistring, LINELEN-1);
-    } else {
-	    strncpy(machine, "unknown", LINELEN-1);
+        extern char *program_invocation_short_name;
+        rcs_print(
+            "%s (%d) shcom: machine '%s'  version '%s'\n",
+            program_invocation_short_name, getpid(), machine, version
+        );
     }
 
-    extern char *program_invocation_short_name;
-    rcs_print(
-        "%s (%d) shcom: machine '%s'  version '%s'\n",
-        program_invocation_short_name, getpid(), machine, version
-    );
-
     if ((inistring = inifile.Find("NML_FILE", "EMC"))) {
 
 	// copy to global