From de1d221881fa87e1c16884ee9cc9f76c6913e5e9 Mon Sep 17 00:00:00 2001
From: Philippe Pittoli <karchnu@karchnu.fr>
Date: Thu, 29 Dec 2022 10:12:40 +0100
Subject: [PATCH] Grooming.

---
 zig-impl/src/context.zig |  6 +++---
 zig-impl/src/ipcd.zig    | 35 +++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/zig-impl/src/context.zig b/zig-impl/src/context.zig
index 9a4dfe4..db5c2d6 100644
--- a/zig-impl/src/context.zig
+++ b/zig-impl/src/context.zig
@@ -247,9 +247,9 @@ pub const Context = struct {
         var count: usize = undefined;
 
         // print("Let's wait for an event (either stdin or unix socket)\n", .{});
-        print("fds:     {any}\n", .{self.pollfd.items});
+        // print("fds:     {any}\n", .{self.pollfd.items});
         count = try os.poll(self.pollfd.items, wait_duration);
-        print("fds NOW: {any}\n", .{self.pollfd.items});
+        // print("fds NOW: {any}\n", .{self.pollfd.items});
 
         if (count < 0) {
             print("there is a problem: poll < 0\n", .{});
@@ -259,7 +259,7 @@ pub const Context = struct {
 
         var duration = timer.read() / 1000000; // ns -> ms
         if (count == 0) {
-            print("wait: configured {} measured {}\n", .{wait_duration, duration});
+            // print("wait: configured {} measured {}\n", .{wait_duration, duration});
             if (duration >= wait_duration) {
                 current_event = Event.init(Event.Type.TIMER, 0, 0, null);
             }
diff --git a/zig-impl/src/ipcd.zig b/zig-impl/src/ipcd.zig
index 18220d3..c91e1a7 100644
--- a/zig-impl/src/ipcd.zig
+++ b/zig-impl/src/ipcd.zig
@@ -9,7 +9,8 @@ const print = std.debug.print;
 const testing = std.testing;
 const print_eq = @import("./util.zig").print_eq;
 
-// TODO: file descriptors should have a specific type (but i32 is used in std.net...).
+// TODO: standard library is unecessary complex regarding networking.
+//       Should libipc drop it and use plain old file descriptors instead?
 
 // TODO: path => std.XXX.YYY, not simple [] const u8
 
@@ -38,48 +39,62 @@ fn create_service() !void {
     // TODO: signal handler, to quit when asked
 
     var some_event: ipc.Event = undefined;
-    ctx.timer = 2000; // 1 second
+    ctx.timer = 2000; // 2 seconds
     while(true) {
         some_event = try ctx.wait_event();
         switch (some_event.t) {
-            .CONNECTION => {
-                print("New connection: {}!\n", .{some_event});
-            },
             .TIMER => {
                 print("Timer!\n", .{});
             },
+
+            .CONNECTION => {
+                print("New connection: {} so far!\n", .{ctx.pollfd.items.len});
+            },
+
+            .DISCONNECTION => {
+                print("User {} disconnected, {} remainaing.\n"
+                    , .{some_event.origin, ctx.pollfd.items.len});
+            },
+
             .EXTERNAL => {
                 print("Message received from a non IPC socket.\n", .{});
                 print("NOT IMPLEMENTED, YET. It's a suicide, then.\n", .{});
                 break;
             },
+
             .SWITCH => {
                 print("Message to send to a corresponding fd.\n", .{});
                 print("NOT IMPLEMENTED, YET. It's a suicide, then.\n", .{});
                 break;
             },
-            .DISCONNECTION => {
-                print("User disconnected.\n", .{});
-            },
+
             .MESSAGE => {
-                print("New message. {}\n", .{some_event});
-                print("Let's echo, once\n", .{});
                 if (some_event.m) |m| {
+                    print("New message: {}\n", .{m});
+                    print("Let's echo it...\n", .{});
                     try ctx.schedule(m);
                 }
+                else {
+                    print("Error while receiving new message.\n", .{});
+                    print("Ignoring...\n", .{});
+                }
             },
+
             .LOOKUP => {
                 print("Client asking for a service through ipcd.\n", .{});
                 print("NOT IMPLEMENTED, YET. It's a suicide, then.\n", .{});
                 break;
             },
+
             .TX => {
                 print("Message sent.\n", .{});
             },
+
             .NOT_SET => {
                 print("Event type not set. Something is wrong, let's suicide.\n", .{});
                 break;
             },
+
             .ERROR => {
                 print("A problem occured, event: {}, let's suicide\n", .{some_event});
                 break;