source/child: Implement

6 files changed, 119 insertions, 0 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 236e347..518ac1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,9 @@ nobase_include_HEADERS += sdeventplus/internal/utils.hpp
 nobase_include_HEADERS += sdeventplus/source/base.hpp
 libsdeventplus_la_SOURCES += sdeventplus/source/base.cpp
 
+nobase_include_HEADERS += sdeventplus/source/child.hpp
+libsdeventplus_la_SOURCES += sdeventplus/source/child.cpp
+
 nobase_include_HEADERS += sdeventplus/source/event.hpp
 libsdeventplus_la_SOURCES += sdeventplus/source/event.cpp
 
diff --git a/src/sdeventplus/internal/sdevent.cpp b/src/sdeventplus/internal/sdevent.cpp
index ad5114c..b5e4542 100644
--- a/src/sdeventplus/internal/sdevent.cpp
+++ b/src/sdeventplus/internal/sdevent.cpp
@@ -249,6 +249,12 @@ int SdEventImpl::sd_event_source_get_signal(sd_event_source* source) const
     return ::sd_event_source_get_signal(source);
 }
 
+int SdEventImpl::sd_event_source_get_child_pid(sd_event_source* source,
+                                               pid_t* pid) const
+{
+    return ::sd_event_source_get_child_pid(source, pid);
+}
+
 SdEventImpl sdevent_impl;
 
 } // namespace internal
diff --git a/src/sdeventplus/internal/sdevent.hpp b/src/sdeventplus/internal/sdevent.hpp
index 42427eb..3151981 100644
--- a/src/sdeventplus/internal/sdevent.hpp
+++ b/src/sdeventplus/internal/sdevent.hpp
@@ -28,6 +28,10 @@ class SdEvent
     virtual int sd_event_add_signal(sd_event* event, sd_event_source** source,
                                     int sig, sd_event_signal_handler_t callback,
                                     void* userdata) const = 0;
+    virtual int sd_event_add_child(sd_event* event, sd_event_source** source,
+                                   pid_t, int options,
+                                   sd_event_child_handler_t callback,
+                                   void* userdata) const = 0;
     virtual int sd_event_add_defer(sd_event* event, sd_event_source** source,
                                    sd_event_handler_t callback,
                                    void* userdata) const = 0;
@@ -100,6 +104,8 @@ class SdEvent
     virtual int sd_event_source_set_time_accuracy(sd_event_source* source,
                                                   uint64_t usec) const = 0;
     virtual int sd_event_source_get_signal(sd_event_source*) const = 0;
+    virtual int sd_event_source_get_child_pid(sd_event_source*,
+                                              pid_t* pid) const = 0;
 };
 
 class SdEventImpl : public SdEvent
@@ -125,6 +131,14 @@ class SdEventImpl : public SdEvent
         return ::sd_event_add_signal(event, source, sig, callback, userdata);
     }
 
+    int sd_event_add_child(sd_event* event, sd_event_source** source, pid_t pid,
+                           int options, sd_event_child_handler_t callback,
+                           void* userdata) const override
+    {
+        return ::sd_event_add_child(event, source, pid, options, callback,
+                                    userdata);
+    }
+
     int sd_event_add_defer(sd_event* event, sd_event_source** source,
                            sd_event_handler_t callback,
                            void* userdata) const override;
@@ -193,6 +207,8 @@ class SdEventImpl : public SdEvent
     int sd_event_source_set_time_accuracy(sd_event_source* source,
                                           uint64_t usec) const override;
     int sd_event_source_get_signal(sd_event_source*) const override;
+    int sd_event_source_get_child_pid(sd_event_source*,
+                                      pid_t* pid) const override;
 };
 
 extern SdEventImpl sdevent_impl;
diff --git a/src/sdeventplus/source/child.cpp b/src/sdeventplus/source/child.cpp
new file mode 100644
index 0000000..cda067b
--- /dev/null
+++ b/src/sdeventplus/source/child.cpp
@@ -0,0 +1,55 @@
+#include <sdeventplus/exception.hpp>
+#include <sdeventplus/source/child.hpp>
+#include <type_traits>
+#include <utility>
+
+namespace sdeventplus
+{
+namespace source
+{
+
+Child::Child(const Event& event, pid_t pid, int options, Callback&& callback) :
+    Base(event, create_source(event, pid, options), std::false_type()),
+    callback(std::move(callback))
+{
+}
+
+pid_t Child::get_pid() const
+{
+    pid_t pid;
+    int r =
+        event.getSdEvent()->sd_event_source_get_child_pid(source.get(), &pid);
+    if (r < 0)
+    {
+        throw SdEventError(-r, "sd_event_source_get_child_pid");
+    }
+    return pid;
+}
+
+const Child::Callback& Child::get_callback() const
+{
+    return callback;
+}
+
+sd_event_source* Child::create_source(const Event& event, pid_t pid,
+                                      int options)
+{
+    sd_event_source* source;
+    int r = event.getSdEvent()->sd_event_add_child(
+        event.get(), &source, pid, options, childCallback, nullptr);
+    if (r < 0)
+    {
+        throw SdEventError(-r, "sd_event_add_child");
+    }
+    return source;
+}
+
+int Child::childCallback(sd_event_source* source, const siginfo_t* si,
+                         void* userdata)
+{
+    return sourceCallback<Callback, Child, &Child::get_callback>(
+        "childCallback", source, userdata, si);
+}
+
+} // namespace source
+} // namespace sdeventplus
diff --git a/src/sdeventplus/source/child.hpp b/src/sdeventplus/source/child.hpp
new file mode 100644
index 0000000..5af359a
--- /dev/null
+++ b/src/sdeventplus/source/child.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#include <functional>
+#include <sdeventplus/source/base.hpp>
+#include <signal.h>
+
+namespace sdeventplus
+{
+namespace source
+{
+
+class Child : public Base
+{
+  public:
+    using Callback = std::function<void(Child& source, const siginfo_t* si)>;
+
+    Child(const Event& event, pid_t pid, int options, Callback&& callback);
+
+    pid_t get_pid() const;
+
+  private:
+    Callback callback;
+
+    const Callback& get_callback() const;
+
+    static sd_event_source* create_source(const Event& event, pid_t pid,
+                                          int options);
+
+    static int childCallback(sd_event_source* source, const siginfo_t* si,
+                             void* userdata);
+};
+
+} // namespace source
+} // namespace sdeventplus
diff --git a/src/sdeventplus/test/sdevent.hpp b/src/sdeventplus/test/sdevent.hpp
index 37b4464..1d87174 100644
--- a/src/sdeventplus/test/sdevent.hpp
+++ b/src/sdeventplus/test/sdevent.hpp
@@ -26,6 +26,9 @@ class SdEventMock : public internal::SdEvent
     MOCK_CONST_METHOD5(sd_event_add_signal,
                        int(sd_event*, sd_event_source**, int,
                            sd_event_signal_handler_t, void*));
+    MOCK_CONST_METHOD6(sd_event_add_child,
+                       int(sd_event*, sd_event_source**, pid_t, int,
+                           sd_event_child_handler_t, void*));
     MOCK_CONST_METHOD4(sd_event_add_defer, int(sd_event*, sd_event_source**,
                                                sd_event_handler_t, void*));
     MOCK_CONST_METHOD4(sd_event_add_post, int(sd_event*, sd_event_source**,
@@ -87,6 +90,8 @@ class SdEventMock : public internal::SdEvent
     MOCK_CONST_METHOD2(sd_event_source_set_time_accuracy,
                        int(sd_event_source*, uint64_t));
     MOCK_CONST_METHOD1(sd_event_source_get_signal, int(sd_event_source*));
+    MOCK_CONST_METHOD2(sd_event_source_get_child_pid,
+                       int(sd_event_source*, pid_t*));
 };
 
 } // namespace test