Refactoring: move process-service specific classes to process-service.h

diff --git a/src/includes/proc-service.h b/src/includes/proc-service.h
index a8ad6fba95206ac7e9d04aae096046b6fa843124..469fc6765013ba36680250b9f3b81d8575d3db97 100644 (file)
--- a/src/includes/proc-service.h
+++ b/src/includes/proc-service.h
@@ -30,6 +30,31 @@ class process_restart_timer : public eventloop_t::timer_impl<process_restart_tim
     dasynq::rearm timer_expiry(eventloop_t &, int expiry_count);
 };
 
+// Watcher for the pipe used to receive exec() failure status errno
+class exec_status_pipe_watcher : public eventloop_t::fd_watcher_impl<exec_status_pipe_watcher>
+{
+    public:
+    base_process_service * service;
+    dasynq::rearm fd_event(eventloop_t &eloop, int fd, int flags) noexcept;
+
+    exec_status_pipe_watcher(base_process_service * sr) noexcept : service(sr) { }
+
+    exec_status_pipe_watcher(const exec_status_pipe_watcher &) = delete;
+    void operator=(exec_status_pipe_watcher &) = delete;
+};
+
+class service_child_watcher : public eventloop_t::child_proc_watcher_impl<service_child_watcher>
+{
+    public:
+    base_process_service * service;
+    dasynq::rearm status_change(eventloop_t &eloop, pid_t child, int status) noexcept;
+
+    service_child_watcher(base_process_service * sr) noexcept : service(sr) { }
+
+    service_child_watcher(const service_child_watcher &) = delete;
+    void operator=(const service_child_watcher &) = delete;
+};
+
 // Base class for process-based services.
 class base_process_service : public service_record
 {

diff --git a/src/includes/service.h b/src/includes/service.h
index 4f3f0d6b61b44173d9db0cfbeb4db6ebb542c360..5d34a009ef960e1463a7af560702c1d954a8385a 100644 (file)
--- a/src/includes/service.h
+++ b/src/includes/service.h
@@ -183,31 +183,6 @@ class prelim_dep
     }
 };
 
-class service_child_watcher : public eventloop_t::child_proc_watcher_impl<service_child_watcher>
-{
-    public:
-    base_process_service * service;
-    dasynq::rearm status_change(eventloop_t &eloop, pid_t child, int status) noexcept;
-    
-    service_child_watcher(base_process_service * sr) noexcept : service(sr) { }
-
-    service_child_watcher(const service_child_watcher &) = delete;
-    void operator=(const service_child_watcher &) = delete;
-};
-
-// Watcher for the pipe used to receive exec() failure status errno
-class exec_status_pipe_watcher : public eventloop_t::fd_watcher_impl<exec_status_pipe_watcher>
-{
-    public:
-    base_process_service * service;
-    dasynq::rearm fd_event(eventloop_t &eloop, int fd, int flags) noexcept;
-    
-    exec_status_pipe_watcher(base_process_service * sr) noexcept : service(sr) { }
-
-    exec_status_pipe_watcher(const exec_status_pipe_watcher &) = delete;
-    void operator=(exec_status_pipe_watcher &) = delete;
-};
-
 // service_record: base class for service record containing static information
 // and current state of each service.
 //