60/2 perf grab #1850

firmware/console/binary/tooth_logger.cpp

@@ -8,6 +8,7 @@
 #include "tooth_logger.h"
 
 #include "global.h"
+#include "perf_trace.h"
 
 #if EFI_TOOTH_LOGGER
 
@@ -97,6 +98,7 @@ static void SetNextCompositeEntry(efitick_t timestamp, bool trigger1, bool trigg
 }
 
 void LogTriggerTooth(trigger_event_e tooth, efitick_t timestamp DECLARE_ENGINE_PARAMETER_SUFFIX) {
+	ScopePerf perf(PE::LogTriggerTooth);
 	// bail if we aren't enabled
 	if (!ToothLoggerEnabled) {
 		return;

firmware/controllers/trigger/trigger_central.cpp

@@ -272,7 +272,7 @@ void hwHandleShaftSignal(trigger_event_e signal, efitick_t timestamp) {
 	// We want to do this before anything else as we
 	// actually want to capture any noise/jitter that may be occurring
 
-	bool logLogicState = CONFIG(displayLogicLevelsInEngineSniffer && engineConfiguration->useOnlyRisingEdgeForTrigger);
+	bool logLogicState = CONFIG(displayLogicLevelsInEngineSniffer) && CONFIG(useOnlyRisingEdgeForTrigger);
 
 	if (!logLogicState) {
 		// we log physical state even if displayLogicLevelsInEngineSniffer if both fronts are used by decoder

firmware/development/perf_trace.cpp

@@ -1,6 +1,8 @@
 /**
  * @file perf_trace.cpp
  *
+ * https://github.com/rusefi/rusefi/wiki/Developer-Performance-Tracing
+ *
  * See JsonOutput.java in rusEfi console
  */
 

firmware/development/perf_trace.h

@@ -12,7 +12,7 @@
 // each element in PE more than once, as they should each indicate that a specific thing began,
 // ended, or occurred.
 enum class PE : uint8_t {
-	// The tag below is consumed by PerfTraceTool.java
+	// The tag below is consumed by PerfTraceTool.java which generates EnumNames.java
 	// enum_start_tag
 	INVALID,
 	ISR,
@@ -63,6 +63,7 @@ enum class PE : uint8_t {
 	GlobalLock,
 	GlobalUnlock,
 	SoftwareKnockProcess,
+	LogTriggerTooth,
 	// enum_end_tag
 	// The tag above is consumed by PerfTraceTool.java
 	// please note that the tool requires a comma at the end of last value

java_console/.gitignore

@@ -10,4 +10,5 @@ openocd
 DfuSe
 rusefi_*.*
 triggers
-unit_test*.xml
+unit_test*.xml
+*trace.json

java_console/models/src/main/java/com/rusefi/tracing/EnumNames.java

@@ -51,5 +51,6 @@ public class EnumNames {
 	"GlobalLock",
 	"GlobalUnlock",
 	"SoftwareKnockProcess",
+	"LogTriggerTooth",
 	};
 }

java_console/models/src/main/java/com/rusefi/tracing/JsonOutput.java

@@ -12,7 +12,7 @@ import java.util.List;
  * This class helps to write JSON files readable by chrome://tracing/
  * <p>
  * See https://github.com/catapult-project/catapult/blob/master/tracing/README.md
- * @see PerfTraceTool
+ * @see PerfTraceTool code generator for EnumNames.java
  */
 public class JsonOutput {
 

java_console/ui/src/main/java/com/rusefi/BenchTestPane.java

@@ -74,7 +74,7 @@ public class BenchTestPane {
                     List<Entry> data = Entry.parseBuffer(packet);
 
                     int rpm = RpmModel.getInstance().getValue();
-                    String fileName = Logger.getDate() + "_rpm_" + rpm + "_rusEfi_trace" + ".json";
+                    String fileName = Logger.getDate() + "_rpm_" + rpm + "_rusEFI_trace" + ".json";
 
 
                     JsonOutput.writeToStream(data, new FileOutputStream(fileName));