Disable tooth logger if ptrace is started rusefi#5983

andreika-git · Feb 22, 2024 · d4d4ddb · d4d4ddb
1 parent 178e1f3
commit d4d4ddb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/firmware/console/binary/tooth_logger.cpp b/firmware/console/binary/tooth_logger.cpp
@@ -326,4 +326,8 @@ void EnableToothLoggerIfNotEnabled() {
 	}
 }
 
+bool IsToothLoggerEnabled() {
+	return ToothLoggerEnabled;
+}
+
 #endif /* EFI_TOOTH_LOGGER */
diff --git a/firmware/console/binary/tooth_logger.h b/firmware/console/binary/tooth_logger.h
@@ -24,6 +24,8 @@ void EnableToothLogger();
 // Stop logging - leave buffer intact
 void DisableToothLogger();
 
+bool IsToothLoggerEnabled();
+
 // A new tooth has arrived! Log to the buffer if enabled.
 void LogTriggerTooth(trigger_event_e tooth, efitick_t timestamp);
 

diff --git a/firmware/development/perf_trace.cpp b/firmware/development/perf_trace.cpp
@@ -117,6 +117,12 @@ void perfEventInstantGlobal(PE event) {
 }
 
 void perfTraceEnable() {
+	// force release of the buffer if occupied by the tooth logger
+	if (IsToothLoggerEnabled()) {
+		// don't worry, it will be automatically enabled 
+		// when the next TS_GET_COMPOSITE_BUFFER_DONE_DIFFERENTLY command arrives
+		DisableToothLogger();
+	}
 	s_traceBuffer = getBigBuffer(BigBufferUser::PerfTrace);
 	s_isTracing = true;
 }