add pretty printing for pipe and endpoint names

OldUser101 · OldUser101 · commit 3cf4ae29f14d · 2026-01-14T23:14:02.000Z
diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
@@ -59,9 +59,6 @@ void HopperDaemon::process_events(struct epoll_event *events, int n_events) {
 int HopperDaemon::run() {
     int res = 0;
 
-    std::cout << "Started event loop, max " << m_max_events
-              << " events, timeout " << m_timeout << " ms" << std::endl;
-
     while (res == 0) {
         struct epoll_event *events = new struct epoll_event[m_max_events];
 
diff --git a/daemon/daemon_endpoint.cpp b/daemon/daemon_endpoint.cpp
@@ -17,7 +17,7 @@ uint32_t HopperDaemon::create_endpoint(const std::filesystem::path &path) {
     auto *endpoint = new HopperEndpoint(endpoint_id, inotify_watch_fd, path);
     m_endpoints[endpoint_id] = endpoint;
 
-    std::cout << "CREATE " << endpoint->path() << std::endl;
+    std::cout << "CREATE " << *endpoint << std::endl;
 
     return endpoint_id;
 }
@@ -26,7 +26,7 @@ void HopperDaemon::delete_endpoint(uint32_t id) {
     if (!m_endpoints.contains(id))
         return;
 
-    std::cout << "DELETE " << m_endpoints[id]->path() << std::endl;
+    std::cout << "DELETE " << *(m_endpoints[id]) << std::endl;
 
     delete m_endpoints[id];
     m_endpoints.erase(id);
diff --git a/daemon/daemon_inotify.cpp b/daemon/daemon_inotify.cpp
@@ -62,7 +62,7 @@ void HopperDaemon::handle_endpoint_inotify(struct inotify_event *ev,
                                        : endpoint->add_output_pipe(p));
 
         if (pipe != nullptr)
-            add_pipe(endpoint, pipe);
+            add_pipe(pipe);
     }
 
     if (ev->mask & IN_DELETE) {
diff --git a/daemon/daemon_pipe.cpp b/daemon/daemon_pipe.cpp
@@ -16,12 +16,11 @@ void HopperDaemon::remove_pipe(HopperEndpoint *endpoint, uint64_t pipe_id) {
             throw_errno("epoll_ctl DEL");
         pipe->close_pipe();
 
-        std::cout << "DOWN " << pipe->name() << "(" << endpoint->name()
-                  << ")\n";
+        std::cout << "DOWN " << *pipe << "\n";
     }
 }
 
-void HopperDaemon::add_pipe(HopperEndpoint *endpoint, HopperPipe *pipe) {
+void HopperDaemon::add_pipe(HopperPipe *pipe) {
     if (pipe == nullptr)
         return;
 
@@ -37,7 +36,7 @@ void HopperDaemon::add_pipe(HopperEndpoint *endpoint, HopperPipe *pipe) {
     if (epoll_ctl(m_epoll_fd, EPOLL_CTL_ADD, pipe->fd(), &ev) != 0)
         throw_errno("epoll_ctl ADD");
 
-    std::cout << "UP " << pipe->name() << "(" << endpoint->name() << ")\n";
+    std::cout << "UP " << *pipe << "\n";
 }
 
 void HopperDaemon::refresh_pipes() {
@@ -46,12 +45,12 @@ void HopperDaemon::refresh_pipes() {
         for (const auto &[id, pipe] : endpoint->inputs()) {
             if (pipe->status() == PipeStatus::ACTIVE || !pipe->open_pipe())
                 continue;
-            add_pipe(endpoint, pipe);
+            add_pipe(pipe);
         }
         for (const auto &[id, pipe] : endpoint->outputs()) {
             if (pipe->status() == PipeStatus::ACTIVE || !pipe->open_pipe())
                 continue;
-            add_pipe(endpoint, pipe);
+            add_pipe(pipe);
         }
 
         // Try to empty buffers into pipes
diff --git a/daemon/endpoint.cpp b/daemon/endpoint.cpp
@@ -30,15 +30,17 @@ void HopperEndpoint::on_pipe_readable(uint64_t id) {
     if (res == (size_t)-1)
         throw_errno("read");
 
-    std::cout << pipe->name() << "(" << m_name << ") -> " << res << " bytes\n";
+    std::cout << *pipe << " -> " << res << " bytes\n";
 }
 
 void HopperEndpoint::flush_pipes() {
     for (const auto &[_, pipe] : m_outputs) {
         if (pipe->status() == PipeStatus::INACTIVE)
             continue;
 
-        m_buffer.read(pipe);
+        size_t res = m_buffer.read(pipe);
+        if (res > 0)
+            std::cout << *pipe << " <- " << res << " bytes\n";
     }
 }
 
@@ -61,11 +63,11 @@ HopperPipe *HopperEndpoint::add_input_pipe(const std::filesystem::path &path) {
     if (id == 0)                   // ID 0 is never valid
         return nullptr;
 
-    std::cout << "OPEN IN " << path << "\n";
-
-    HopperPipe *p = new HopperPipe(id, PipeType::IN, path, nullptr);
+    HopperPipe *p = new HopperPipe(id, m_name, PipeType::IN, path, nullptr);
     m_inputs[id] = p;
 
+    std::cout << "OPEN " << *p << "\n";
+
     return p;
 }
 
@@ -78,11 +80,11 @@ HopperPipe *HopperEndpoint::add_output_pipe(const std::filesystem::path &path) {
     if (id == 0)
         return nullptr;
 
-    std::cout << "OPEN OUT " << path << "\n";
-
-    HopperPipe *p = new HopperPipe(id, PipeType::OUT, path, marker);
+    HopperPipe *p = new HopperPipe(id, m_name, PipeType::OUT, path, marker);
     m_outputs[id] = p;
 
+    std::cout << "OPEN " << *p << "\n";
+
     return p;
 }
 
@@ -92,15 +94,15 @@ void HopperEndpoint::remove_by_id(uint64_t pipe_id) {
     if (type == PipeType::IN && m_inputs.contains(pipe_id)) {
         HopperPipe *pipe = m_inputs[pipe_id];
         m_buffer.delete_marker(pipe->marker());
-        std::cout << "CLOSE IN " << pipe->path() << "\n";
-        
+        std::cout << "CLOSE " << *pipe << "\n";
+
         delete pipe;
         m_inputs.erase(pipe_id);
     } else if (type == PipeType::OUT && m_outputs.contains(pipe_id)) {
         HopperPipe *pipe = m_outputs[pipe_id];
         m_buffer.delete_marker(pipe->marker());
-        std::cout << "CLOSE OUT " << pipe->path() << "\n";
-        
+        std::cout << "CLOSE " << *pipe << "\n";
+
         delete pipe;
         m_outputs.erase(pipe_id);
     }
diff --git a/daemon/main.cpp b/daemon/main.cpp
@@ -10,11 +10,11 @@ int main(int argc, char *argv[]) {
             std::cout << "Usage: hopperd <hopper path>" << std::endl;
             return 1;
         } else if (argc == 2) {
-            std::cout << "Using Hopper at " << argv[1] << std::endl;
+            std::cout << "HOPPER " << argv[1] << std::endl;
             auto daemon = hopper::HopperDaemon(argv[1]);
             return daemon.run();
         } else if (char *p = getenv("HOPPER_PATH")) {
-            std::cout << "Using Hopper at " << p << std::endl;
+            std::cout << "HOPPER " << p << std::endl;
             auto daemon = hopper::HopperDaemon(p);
             return daemon.run();
         } else {
diff --git a/daemon/pipe.cpp b/daemon/pipe.cpp
@@ -1,5 +1,4 @@
 #include <fcntl.h>
-#include <iostream>
 #include <unistd.h>
 
 #include "hopper/daemon/pipe.hpp"
@@ -9,8 +8,11 @@ namespace hopper {
 
 /* HopperPipe */
 
-HopperPipe::HopperPipe(uint64_t id, PipeType type, std::filesystem::path path, BufferMarker *marker)
-    : m_marker(marker), m_type(type), m_path(path), m_id(id) {
+HopperPipe::HopperPipe(uint64_t id, const std::string &endpoint_name,
+                       PipeType type, std::filesystem::path path,
+                       BufferMarker *marker)
+    : m_marker(marker), m_type(type), m_path(path),
+      m_endpoint_name(endpoint_name), m_id(id) {
     m_name = path.replace_extension("").filename();
     open_pipe();
 }
diff --git a/daemon/util.cpp b/daemon/util.cpp
@@ -1,7 +1,7 @@
 #include "hopper/daemon/util.hpp"
 
 namespace hopper {
-    
+
 PipeType detect_pipe_type(const std::filesystem::path &path) {
     if (!path.has_extension())
         return PipeType::NONE;
@@ -15,4 +15,4 @@ PipeType detect_pipe_type(const std::filesystem::path &path) {
     return PipeType::NONE;
 }
 
-};
+}; // namespace hopper
diff --git a/include/hopper/daemon/buffer.hpp b/include/hopper/daemon/buffer.hpp
@@ -21,7 +21,7 @@ class HopperBuffer {
     HopperBuffer(size_t len = 1024 * 1024)
         : m_buf(len) {} // Use 1 MiB size by default
 
-    BufferMarker* create_marker();
+    BufferMarker *create_marker();
     void delete_marker(BufferMarker *marker);
 
     size_t write(void *src, size_t len);
diff --git a/include/hopper/daemon/daemon.hpp b/include/hopper/daemon/daemon.hpp
@@ -19,7 +19,6 @@ class HopperDaemon {
 private:
     std::unordered_map<uint32_t, HopperEndpoint *> m_endpoints;
 
-
     // endpoint IDs are 24 bit
     uint32_t m_last_endpoint_id = 1;
     uint32_t next_endpoint_id() {
@@ -46,12 +45,14 @@ class HopperDaemon {
     void setup_inotify();
     void handle_inotify();
     void handle_root_inotify(struct inotify_event *ev);
-    void handle_endpoint_inotify(struct inotify_event *ev, HopperEndpoint *endpoint);
+    void handle_endpoint_inotify(struct inotify_event *ev,
+                                 HopperEndpoint *endpoint);
 
     void process_events(struct epoll_event *events, int n_events);
     void remove_pipe(HopperEndpoint *endpoint, uint64_t pipe_id);
-    void add_pipe(HopperEndpoint *endpoint, HopperPipe *pipe);
+    void add_pipe(HopperPipe *pipe);
     void refresh_pipes();
+
 public:
     HopperDaemon(std::filesystem::path path, int max_events = 64,
                  int m_timeout = 250);
diff --git a/include/hopper/daemon/endpoint.hpp b/include/hopper/daemon/endpoint.hpp
@@ -62,6 +62,12 @@ class HopperEndpoint {
     }
     int id() { return m_id; }
     int watch_fd() { return m_watch_fd; }
+
+    friend std::ostream &operator<<(std::ostream &os,
+                                    HopperEndpoint &endpoint) {
+        os << endpoint.m_name << "(" << endpoint.m_id << ")";
+        return os;
+    }
 };
 
 }; // namespace hopper
diff --git a/include/hopper/daemon/pipe.hpp b/include/hopper/daemon/pipe.hpp
@@ -28,12 +28,14 @@ class HopperPipe {
     PipeType m_type;
     std::filesystem::path m_path;
 
+    const std::string &m_endpoint_name;
+
     int m_fd = -1;
     uint64_t m_id;
 
 public:
-    HopperPipe(uint64_t id, PipeType type, std::filesystem::path path,
-               BufferMarker *marker = nullptr);
+    HopperPipe(uint64_t id, const std::string &endpoint_name, PipeType type,
+               std::filesystem::path path, BufferMarker *marker = nullptr);
     ~HopperPipe();
 
     int open_pipe();
@@ -48,6 +50,12 @@ class HopperPipe {
     const std::string &name() { return m_name; }
     uint64_t id() { return m_id; }
     int fd() { return m_fd; }
+
+    friend std::ostream &operator<<(std::ostream &os, const HopperPipe &pipe) {
+        os << (pipe.m_type == PipeType::IN ? "+" : "-") << pipe.m_name << "("
+           << pipe.m_endpoint_name << ")";
+        return os;
+    };
 };
 
 }; // namespace hopper
diff --git a/meson.build b/meson.build
@@ -2,7 +2,7 @@ project(
     'hopper',
     ['cpp'],
     version: '0.1.0',
-    default_options: ['optimization=0', 'warning_level=3', 'cpp_std=c++20'],
+    default_options: ['optimization=2', 'warning_level=3', 'cpp_std=c++20'],
 )
 
 

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ void HopperDaemon::handle_endpoint_inotify(struct inotify_event *ev,`
`62`	`62`	`: endpoint->add_output_pipe(p));`
`63`	`63`
`64`	`64`	`if (pipe != nullptr)`
`65`		`- add_pipe(endpoint, pipe);`
	`65`	`+ add_pipe(pipe);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`if (ev->mask & IN_DELETE) {`