Improve tracing of events (in table, x_mng and event_mng)

malaise · Aug 24, 2023 · a7f715d · a7f715d
1 parent dcf21a8
commit a7f715d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/usr/freecell/freecell.adb b/usr/freecell/freecell.adb
@@ -48,7 +48,8 @@ procedure Freecell is
 begin
   -- Init traces to debug
   Trace.Init_Env (
-    (As.U.Tus ("Main"), As.U.Tus ("Memory"),
+    (As.U.Tus ("X_Mng"), As.U.Tus ("Event_Mng"),
+     As.U.Tus ("Main"), As.U.Tus ("Memory"),
      As.U.Tus ("Movements"), As.U.Tus ("Table")),
     "Debug", "/tmp/Freecell.log");
   Logger.Init ("Main");

diff --git a/usr/freecell/table.adb b/usr/freecell/table.adb
@@ -379,7 +379,7 @@ package body Table is
       if Dur = Timers.Infinite_Seconds and then not Event_Pool.Is_Empty then
         -- Event expected and present
         Event := Event_Pool.Pop;
-        Logger.Log_Debug ("  Popping " & Event.Kind'Img &
+        Logger.Log_Debug ("  Wait: Popping " & Event.Kind'Img &
             (if Event.Kind in Card_Event_List then
              " " & Event.Card.Image else "") );
         return Event;
@@ -392,7 +392,9 @@ package body Table is
         when Con_Io.Break =>
           Event := (Kind => Quit);
           Event_Pool.Push (Event);
+        Logger.Log_Debug ("  Wait: Break");
         when Con_Io.Mouse_Button =>
+        Logger.Log_Debug ("  Wait: Mouse");
           Console.Get_Mouse_Event (Mouse_Event, Con_Io.X_Y);
           if Mouse_Event.Xref /= X_Mng.Null_Reference then
             if Decode_Card_Event (Mouse_Event, Event) then
@@ -408,11 +410,13 @@ package body Table is
           end if;
           Console.Get_Mouse_Event (Mouse_Event, Con_Io.X_Y);
         when Con_Io.Refresh =>
+          Logger.Log_Debug ("  Wait: Refresh");
           Put_Menu;
         when Con_Io.Timeout =>
+          Logger.Log_Debug ("  Wait: Timeout");
           return Event;
         when others =>
-          null;
+          Logger.Log_Debug ("  Wait: " & Stat'Img);
       end case;
     end loop;
   end Wait;

diff --git a/usr/lapeau/lapeau.adb b/usr/lapeau/lapeau.adb
@@ -48,7 +48,8 @@ procedure Lapeau is
 begin
   -- Init traces to debug
   Trace.Init_Env (
-    (As.U.Tus ("Main"), As.U.Tus ("Memory"),
+    (As.U.Tus ("X_Mng"), As.U.Tus ("Event_Mng"),
+     As.U.Tus ("Main"), As.U.Tus ("Memory"),
      As.U.Tus ("Movements"), As.U.Tus ("Table")),
     "Debug", "/tmp/Lapeau.log");
   Logger.Init ("Main");

diff --git a/usr/lapeau/table.adb b/usr/lapeau/table.adb
@@ -397,7 +397,7 @@ package body Table is
       if Dur = Timers.Infinite_Seconds and then not Event_Pool.Is_Empty then
         -- Event expected and present
         Event := Event_Pool.Pop;
-        Logger.Log_Debug ("  Popping " & Event.Kind'Img &
+        Logger.Log_Debug ("  Wait: Popping " & Event.Kind'Img &
             (if Event.Kind in Card_Event_List then
              " " & Event.Card.Image else "") );
         return Event;
@@ -408,9 +408,11 @@ package body Table is
                                 Time_Out => Expiration);
       case Stat is
         when Con_Io.Break =>
+          Logger.Log_Debug ("  Wait: Break");
           Event := (Kind => Quit);
           Event_Pool.Push (Event);
         when Con_Io.Mouse_Button =>
+          Logger.Log_Debug ("  Wait: Mouse");
           Console.Get_Mouse_Event (Mouse_Event, Con_Io.X_Y);
           if Mouse_Event.Xref /= X_Mng.Null_Reference then
             if Decode_Card_Event (Mouse_Event, Event) then
@@ -426,11 +428,13 @@ package body Table is
           end if;
           Console.Get_Mouse_Event (Mouse_Event, Con_Io.X_Y);
         when Con_Io.Refresh =>
+          Logger.Log_Debug ("  Wait: Refresh");
           Put_Menu;
         when Con_Io.Timeout =>
+          Logger.Log_Debug ("  Wait: Tiemout");
           return Event;
         when others =>
-          null;
+          Logger.Log_Debug ("  Wait: " & Stat'Img);
       end case;
     end loop;
   end Wait;