@yuneta/gobj-js 7.13.6 → 7.13.8

package/README.md

@@ -627,9 +627,26 @@ gobj_global_trace_level()                  // the mask in force
 gobj_trace_level(gobj)                     // global | gclass | gobj, combined
 gobj_repr_global_trace_levels()            // [{name, bit, description, set}]
 gobj_set_deep_trace(1)                     // everything, everywhere
-gobj_set_trace_machine_format(1)           // 1 = one compact line per transition
+gobj_set_trace_machine_format(1)           // 1 = simpler (DEFAULT), 0 = legacy
 ```
 
+**Two shapes for the machine trace**, the C kernel's two, and the same default
+(`1`, since 7.13.7):
+
+```
+1  🔄 EV_TIMEOUT C_TIMER^t ST_IDLE from C_TIMER^t
+0  🔄 mach(C_TIMER^t), st: ST_IDLE, ev: EV_TIMEOUT, ac: fi(), from(C_TIMER^t)
+   🔀🔀 mach(C_TIMER^t), new st(ST_IDLE), prev st(ST_IDLE)
+   <- mach(C_TIMER^t), st: ST_IDLE, ev: EV_TIMEOUT, ret: 0
+```
+
+One line per transition against three. Both name the event, so anything that
+reads the trace back by event name works across the switch. Every line is
+prefixed by its nesting depth (two spaces per level of `__inside__`), so an
+event sent from inside another one's action is indented under it — **keep that
+indentation when you render the line somewhere else**; it is the only thing
+that says a transition happened *during* another.
+
 Levels: `machine`, `create_delete`, `create_delete2`, `subscriptions`,
 `start_stop`, `ev_kw`, `authzs`, `states`, `gbuffers`, `timer`, `fs`,
 `liburing`, `timer_periodic`, `liburing_timer`, `commands`. The ones that only

package/dist/gobj-js.cjs.js

@@ -384,7 +384,7 @@ var Event_Type = class {
 function tab() {
 	return " ".repeat(Math.max(1, __inside__ * 2));
 }
-var __trace_machine_format__ = 0;
+var __trace_machine_format__ = 1;
 function gobj_set_trace_machine_format(format) {
 	__trace_machine_format__ = Number(format) === 1 ? 1 : 0;
 }
@@ -2297,7 +2297,9 @@ function gobj_change_state(gobj, state_name) {
 	gobj.current_state = new_state;
 	let tracea = is_machine_tracing(gobj, "EV_STATE_CHANGED");
 	let tracea_states = __trace_gobj_states__(gobj) ? true : false;
-	if (tracea || tracea_states) trace_machine(sprintf("🔀🔀 mach(%s%s^%s), new st(%s), prev st(%s)", !gobj.running ? "!!" : "", gobj_gclass_name(gobj), gobj_name(gobj), gobj_current_state(gobj), gobj.last_state.state_name));
+	if (tracea || tracea_states) {
+		if (__trace_machine_format__ === 1) {} else trace_machine(sprintf("🔀🔀 mach(%s%s^%s), new st(%s), prev st(%s)", !gobj.running ? "!!" : "", gobj_gclass_name(gobj), gobj_name(gobj), gobj_current_state(gobj), gobj.last_state.state_name));
+	}
 	return true;
 }
 /***************************************************************************
@@ -2490,7 +2492,8 @@ function gobj_send_event(dst, event, kw, src) {
 		if (dst.gclass.gmt.mt_inject_event) {
 			__inside__--;
 			if (tracea) {
-				trace_machine(sprintf("🔃 mach(%s%s), st: %s, ev: %s, from(%s%s)", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name, event ? event : "", src && !src.running ? "!!" : "", gobj_short_name(src)));
+				if (__trace_machine_format__ === 1) trace_machine(sprintf("🔜 %s %s%s %s", event ? event : "", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name));
+				else trace_machine(sprintf("🔃 mach(%s%s), st: %s, ev: %s, from(%s%s)", !dst.running ? "!!" : "", gobj_short_name(dst), state.state_name, event ? event : "", src && !src.running ? "!!" : "", gobj_short_name(src)));
 				if (kw) {
 					if (tracea > 1) {
 						if (json_object_size(kw)) trace_json(kw);
@@ -2871,8 +2874,9 @@ function gobj_publish_event(publisher, event, kw) {
 	}
 	let tracea = __yuno__ && gobj_read_bool_attr(__yuno__, "trace_subscriptions");
 	if (tracea) {
-		trace_machine(sprintf("🔝🔝 mach(%s%s^%s), st: %s, ev: %s%s%s", !publisher.running ? "!!" : "", gobj_gclass_name(publisher), gobj_name(publisher), publisher.current_state.state_name, "", event ? event : "", ""));
-		trace_json(kw);
+		if (__trace_machine_format__ === 1) trace_machine(sprintf("🔝🔝 %s %s%s %s", event ? event : "", !publisher.running ? "!!" : "", gobj_short_name(publisher), publisher.current_state.state_name));
+		else trace_machine(sprintf("🔝🔝 mach(%s%s^%s), st: %s, ev: %s%s%s", !publisher.running ? "!!" : "", gobj_gclass_name(publisher), gobj_name(publisher), publisher.current_state.state_name, "", event ? event : "", ""));
+		if (json_object_size(kw)) trace_json(kw);
 	}
 	if (publisher.gclass.gmt.mt_publish_event) {
 		let topublish = publisher.gclass.gmt.mt_publish_event(publisher, event, kw);
@@ -2919,8 +2923,9 @@ function gobj_publish_event(publisher, event, kw) {
 			if (__config__) {}
 			if (__global__) json_object_update(kw2publish, __global__);
 			if (tracea) {
-				trace_machine(sprintf("🔝🔄 mach(%s%s), st: %s, ev: %s, from(%s%s)", !subscriber.running ? "!!" : "", gobj_short_name(subscriber), gobj_current_state(subscriber), event ? event : "", publisher && !publisher.running ? "!!" : "", gobj_short_name(publisher)));
-				trace_json(kw2publish);
+				if (__trace_machine_format__ === 1) trace_machine(sprintf("🔝🔄 %s (%s) %s%s", event ? event : "", event ? event : "", !subscriber.running ? "!!" : "", gobj_short_name(subscriber)));
+				else trace_machine(sprintf("🔝🔄 mach(%s%s), st: %s, ev: %s, from(%s%s)", !subscriber.running ? "!!" : "", gobj_short_name(subscriber), gobj_current_state(subscriber), event ? event : "", publisher && !publisher.running ? "!!" : "", gobj_short_name(publisher)));
+				if (json_object_size(kw2publish)) trace_json(kw2publish);
 			}
 			let ret_ = gobj_send_event(subscriber, event, kw2publish, publisher);
 			if (ret_ < 0 && subs_flag & subs_flag_t.__own_event__) {