Set target state to STOPPED when stop is issued
[oweals/dinit.git] / src / service.cc
index 7f030885e6bd80305153eb2a2648876853d7973d..18987c669ba69cc5e811bc55930f91d3cff1a7e0 100644 (file)
@@ -1,42 +1,33 @@
 #include <cstring>
 #include <cerrno>
-#include <sstream>
 #include <iterator>
 #include <memory>
 #include <cstddef>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/un.h>
-#include <sys/socket.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <termios.h>
 
+#include "dinit.h"
 #include "service.h"
 #include "dinit-log.h"
 #include "dinit-socket.h"
 #include "dinit-util.h"
+#include "baseproc-sys.h"
 
 /*
  * service.cc - Service management.
  * See service.h for details.
  */
 
-// from dinit.cc:
-void open_control_socket(bool report_ro_failure = true) noexcept;
-void setup_external_log() noexcept;
-extern eventloop_t eventLoop;
-
 // Find the requested service by name
 static service_record * find_service(const std::list<service_record *> & records,
                                     const char *name) noexcept
 {
     using std::list;
     list<service_record *>::const_iterator i = records.begin();
-    for ( ; i != records.end(); i++ ) {
-        if (strcmp((*i)->get_service_name().c_str(), name) == 0) {
+    for ( ; i != records.end(); ++i ) {
+        if (strcmp((*i)->get_name().c_str(), name) == 0) {
             return *i;
         }
     }
@@ -48,41 +39,44 @@ service_record * service_set::find_service(const std::string &name) noexcept
     return ::find_service(records, name.c_str());
 }
 
-void service_set::stop_service(const std::string & name) noexcept
-{
-    service_record *record = find_service(name);
-    if (record != nullptr) {
-        record->stop();
-        process_queues();
-    }
-}
-
 // Called when a service has actually stopped; dependents have stopped already, unless this stop
 // is due to an unexpected process termination.
 void service_record::stopped() noexcept
 {
-    if (onstart_flags.runs_on_console) {
-        tcsetpgrp(0, getpgrp());
-        discard_console_log_buffer();
+    if (have_console) {
+        bp_sys::tcsetpgrp(0, bp_sys::getpgrp());
         release_console();
     }
 
     force_stop = false;
 
-    // If we are a soft dependency of another target, break the acquisition from that target now:
-    for (auto & dependent : dependents) {
-        if (dependent->dep_type != dependency_type::REGULAR) {
-            if (dependent->holding_acq) {
-                dependent->holding_acq = false;
-                release();
+    restarting |= auto_restart;
+    bool will_restart = restarting && required_by > 0;
+    if (restarting && ! will_restart) {
+        notify_listeners(service_event_t::STARTCANCELLED);
+    }
+    restarting = false;
+
+    // If we won't restart, break soft dependencies now
+    if (! will_restart) {
+        for (auto dept : dependents) {
+            if (! dept->is_hard()) {
+                // waits-for or soft dependency:
+                if (dept->waiting_on) {
+                    dept->waiting_on = false;
+                    dept->get_from()->dependency_started();
+                }
+                if (dept->holding_acq) {
+                    dept->holding_acq = false;
+                    // release without issuing stop, since we're called only when this
+                    // service is already stopped/stopping:
+                    release(false);
+                }
             }
         }
     }
 
-    bool will_restart = (desired_state == service_state_t::STARTED)
-            && services->get_auto_restart();
-
-    for (auto dependency : depends_on) {
+    for (auto & dependency : depends_on) {
         // we signal dependencies in case they are waiting for us to stop:
         dependency.get_to()->dependent_stopped();
     }
@@ -95,348 +89,45 @@ void service_record::stopped() noexcept
         start(false);
     }
     else {
-        if (socket_fd != -1) {
-            close(socket_fd);
-            socket_fd = -1;
-        }
+        becoming_inactive();
         
         if (start_explicit) {
+            // If we were explicitly started, our required_by count must be at least 1. Use
+            // release() to correctly release, mark inactive and release dependencies.
             start_explicit = false;
             release();
         }
         else if (required_by == 0) {
+            // This can only be the case if we didn't have start_explicit, since required_by would
+            // otherwise by non-zero.
+            prop_release = !prop_require;
+            prop_require = false;
+            services->add_prop_queue(this);
             services->service_inactive(this);
         }
     }
 
-    log_service_stopped(service_name);
-    notify_listeners(service_event_t::STOPPED);
-}
-
-dasynq::rearm service_child_watcher::status_change(eventloop_t &loop, pid_t child, int status) noexcept
-{
-    base_process_service *sr = service;
-    
-    sr->pid = -1;
-    sr->exit_status = status;
-    
-    // Ok, for a process service, any process death which we didn't rig
-    // ourselves is a bit... unexpected. Probably, the child died because
-    // we asked it to (sr->service_state == STOPPING). But even if
-    // we didn't, there's not much we can do.
-    
-    if (sr->waiting_for_execstat) {
-        // We still don't have an exec() status from the forked child, wait for that
-        // before doing any further processing.
-        return rearm::NOOP; // hold watch reservation
-    }
-    
-    // Must stop watch now since handle_exit_status might result in re-launch:
-    // (stop_watch instead of deregister, so that we hold watch reservation).
-    stop_watch(loop);
-    
-    if (sr->stop_timer_armed) {
-        sr->restart_timer.stop_timer(loop);
-        sr->stop_timer_armed = false;
-    }
-
-    sr->handle_exit_status(status);
-    return rearm::NOOP;
-}
-
-bool service_record::do_auto_restart() noexcept
-{
-    if (auto_restart) {
-        return services->get_auto_restart();
-    }
-    return false;
-}
-
-void service_record::emergency_stop() noexcept
-{
-    if (! do_auto_restart() && start_explicit) {
-        start_explicit = false;
-        release();
-    }
-    forced_stop();
-    stop_dependents();
-    stopped();
-}
-
-void base_process_service::do_smooth_recovery() noexcept
-{
-    if (! restart_ps_process()) {
-        emergency_stop();
-        services->process_queues();
-    }
-}
-
-void process_service::handle_exit_status(int exit_status) noexcept
-{
-    bool did_exit = WIFEXITED(exit_status);
-    bool was_signalled = WIFSIGNALED(exit_status);
-    restarting = false;
-
-    if (exit_status != 0 && service_state != service_state_t::STOPPING) {
-        if (did_exit) {
-            log(loglevel_t::ERROR, "Service ", service_name, " process terminated with exit code ",
-                    WEXITSTATUS(exit_status));
-        }
-        else if (was_signalled) {
-            log(loglevel_t::ERROR, "Service ", service_name, " terminated due to signal ",
-                    WTERMSIG(exit_status));
-        }
-    }
-
-    if (service_state == service_state_t::STARTING) {
-        if (did_exit && WEXITSTATUS(exit_status) == 0) {
-            started();
-        }
-        else {
-            failed_to_start();
-        }
-    }
-    else if (service_state == service_state_t::STOPPING) {
-        // We won't log a non-zero exit status or termination due to signal here -
-        // we assume that the process died because we signalled it.
-        stopped();
-    }
-    else if (smooth_recovery && service_state == service_state_t::STARTED
-            && desired_state == service_state_t::STARTED) {
-        do_smooth_recovery();
-        return;
-    }
-    else {
-        emergency_stop();
-    }
-    services->process_queues();
-}
-
-void process_service::exec_failed(int errcode) noexcept
-{
-    log(loglevel_t::ERROR, service_name, ": execution failed: ", strerror(errcode));
-    if (service_state == service_state_t::STARTING) {
-        failed_to_start();
-    }
-    else {
-        // Process service in smooth recovery:
-        emergency_stop();
-    }
-}
-
-void bgproc_service::handle_exit_status(int exit_status) noexcept
-{
-    begin:
-    bool did_exit = WIFEXITED(exit_status);
-    bool was_signalled = WIFSIGNALED(exit_status);
-
-    if (exit_status != 0 && service_state != service_state_t::STOPPING) {
-        if (did_exit) {
-            log(loglevel_t::ERROR, "Service ", service_name, " process terminated with exit code ",
-                    WEXITSTATUS(exit_status));
-        }
-        else if (was_signalled) {
-            log(loglevel_t::ERROR, "Service ", service_name, " terminated due to signal ",
-                    WTERMSIG(exit_status));
-        }
-    }
-
-    // This may be a "smooth recovery" where we are restarting the process while leaving the
-    // service in the STARTED state.
-    if (restarting && service_state == service_state_t::STARTED) {
-        restarting = false;
-        bool need_stop = false;
-        if ((did_exit && WEXITSTATUS(exit_status) != 0) || was_signalled) {
-            need_stop = true;
-        }
-        else {
-            // We need to re-read the PID, since it has now changed.
-            if (pid_file.length() != 0) {
-                auto pid_result = read_pid_file(&exit_status);
-                switch (pid_result) {
-                    case pid_result_t::FAILED:
-                        // Failed startup: no auto-restart.
-                        need_stop = true;
-                        break;
-                    case pid_result_t::TERMINATED:
-                        goto begin;
-                    case pid_result_t::OK:
-                        break;
-                }
-            }
-        }
-
-        if (need_stop) {
-            // Failed startup: no auto-restart.
-            emergency_stop();
-            services->process_queues();
-        }
-
-        return;
-    }
-
-    restarting = false;
-    if (service_state == service_state_t::STARTING) {
-        // POSIX requires that if the process exited clearly with a status code of 0,
-        // the exit status value will be 0:
-        if (exit_status == 0) {
-            auto pid_result = read_pid_file(&exit_status);
-            switch (pid_result) {
-                case pid_result_t::FAILED:
-                    // Failed startup: no auto-restart.
-                    failed_to_start();
-                    break;
-                case pid_result_t::TERMINATED:
-                    // started, but immediately terminated
-                    started();
-                    goto begin;
-                case pid_result_t::OK:
-                    started();
-                    break;
-            }
-        }
-        else {
-            failed_to_start();
-        }
-    }
-    else if (service_state == service_state_t::STOPPING) {
-        // We won't log a non-zero exit status or termination due to signal here -
-        // we assume that the process died because we signalled it.
-        stopped();
-    }
-    else if (smooth_recovery && service_state == service_state_t::STARTED && desired_state == service_state_t::STARTED) {
-        do_smooth_recovery();
-        return;
-    }
-    else {
-        // we must be STARTED
-        if (! do_auto_restart() && start_explicit) {
-            start_explicit = false;
-            release();
-        }
-        forced_stop();
-        stop_dependents();
-        stopped();
-    }
-    services->process_queues();
-}
-
-void bgproc_service::exec_failed(int errcode) noexcept
-{
-    log(loglevel_t::ERROR, service_name, ": execution failed: ", strerror(errcode));
-    // Only time we execute is for startup:
-    failed_to_start();
-}
-
-void scripted_service::handle_exit_status(int exit_status) noexcept
-{
-    bool did_exit = WIFEXITED(exit_status);
-    bool was_signalled = WIFSIGNALED(exit_status);
-
-    if (service_state == service_state_t::STOPPING) {
-        if (did_exit && WEXITSTATUS(exit_status) == 0) {
-            stopped();
-        }
-        else {
-            // ??? failed to stop! Let's log it as info:
-            if (did_exit) {
-                log(loglevel_t::INFO, "Service ", service_name, " stop command failed with exit code ",
-                        WEXITSTATUS(exit_status));
-            }
-            else if (was_signalled) {
-                log(loglevel_t::INFO, "Service ", service_name, " stop command terminated due to signal ",
-                        WTERMSIG(exit_status));
-            }
-            // Just assume that we stopped, so that any dependencies
-            // can be stopped:
-            stopped();
-        }
-        services->process_queues();
-    }
-    else { // STARTING
-        if (exit_status == 0) {
-            started();
-        }
-        else {
-            // failed to start
-            if (did_exit) {
-                log(loglevel_t::ERROR, "Service ", service_name, " command failed with exit code ",
-                        WEXITSTATUS(exit_status));
-            }
-            else if (was_signalled) {
-                log(loglevel_t::ERROR, "Service ", service_name, " command terminated due to signal ",
-                        WTERMSIG(exit_status));
-            }
-            failed_to_start();
-        }
-        services->process_queues();
-    }
-}
-
-void scripted_service::exec_failed(int errcode) noexcept
-{
-    log(loglevel_t::ERROR, service_name, ": execution failed: ", strerror(errcode));
-    if (service_state == service_state_t::STARTING) {
-        failed_to_start();
-    }
-    else if (service_state == service_state_t::STOPPING) {
-        // We've logged the failure, but it's probably better not to leave the service in
-        // STOPPING state:
-        stopped();
-    }
-}
+    // Start failure will have been logged already, only log if we are stopped for other reasons:
+    if (! start_failed) {
+        log_service_stopped(service_name);
 
-rearm exec_status_pipe_watcher::fd_event(eventloop_t &loop, int fd, int flags) noexcept
-{
-    base_process_service *sr = service;
-    sr->waiting_for_execstat = false;
-    
-    int exec_status;
-    int r = read(get_watched_fd(), &exec_status, sizeof(int));
-    deregister(loop);
-    close(get_watched_fd());
-    
-    if (r > 0) {
-        // We read an errno code; exec() failed, and the service startup failed.
-        if (sr->pid != -1) {
-            sr->child_listener.deregister(eventLoop, sr->pid);
-            sr->reserved_child_watch = false;
-            if (sr->stop_timer_armed) {
-                sr->restart_timer.stop_timer(loop);
-                sr->stop_timer_armed = false;
+        // If this service chains to another, start the other service now:
+        if (! will_restart && ! start_on_completion.empty()) {
+            try {
+                auto chain_to = services->load_service(start_on_completion.c_str());
+                chain_to->start();
             }
-        }
-        sr->pid = -1;
-        sr->exec_failed(exec_status);
-    }
-    else {
-        // exec() succeeded.
-        if (sr->record_type == service_type::PROCESS) {
-            // This could be a smooth recovery (state already STARTED). Even more, the process
-            // might be stopped (and killed via a signal) during smooth recovery.  We don't to
-            // process startup again in either case, so we check for state STARTING:
-            if (sr->service_state == service_state_t::STARTING) {
-                sr->started();
+            catch (service_load_exc &sle) {
+                log(loglevel_t::ERROR, "Couldn't chain to service ", start_on_completion, ": ",
+                        "couldn't load ", sle.service_name, ": ", sle.exc_description);
             }
-            else if (sr->service_state == service_state_t::STOPPING) {
-                // stopping, but smooth recovery was in process. That's now over so we can
-                // commence normal stop. Note that if pid == -1 the process already stopped(!),
-                // that's handled below.
-                if (sr->pid != -1 && sr->stop_check_dependents()) {
-                    sr->all_deps_stopped();
-                }
+            catch (std::bad_alloc &bae) {
+                log(loglevel_t::ERROR, "Couldn't chain to service ", start_on_completion,
+                        ": Out of memory");
             }
         }
-        
-        if (sr->pid == -1) {
-            // Somehow the process managed to complete before we even saw the status.
-            sr->handle_exit_status(sr->exit_status);
-        }
     }
-    
-    sr->services->process_queues();
-    
-    return rearm::REMOVED;
+    notify_listeners(service_event_t::STOPPED);
 }
 
 void service_record::require() noexcept
@@ -445,24 +136,31 @@ void service_record::require() noexcept
         prop_require = !prop_release;
         prop_release = false;
         services->add_prop_queue(this);
+        if (service_state != service_state_t::STARTING && service_state != service_state_t::STARTED) {
+            prop_start = true;
+        }
     }
 }
 
-void service_record::release() noexcept
+void service_record::release(bool issue_stop) noexcept
 {
     if (--required_by == 0) {
         desired_state = service_state_t::STOPPED;
+        prop_require = false;
 
         // Can stop, and can release dependencies now. We don't need to issue a release if
         // the require was pending though:
-        prop_release = !prop_require;
-        prop_require = false;
-        services->add_prop_queue(this);
+        if (service_state != service_state_t::STOPPED && service_state != service_state_t::STOPPING) {
+            prop_release = !prop_require;
+            prop_require = false;
+            services->add_prop_queue(this);
+        }
 
         if (service_state == service_state_t::STOPPED) {
             services->service_inactive(this);
         }
-        else {
+        else if (issue_stop) {
+               stop_reason = stopped_reason_t::NORMAL;
             do_stop();
         }
     }
@@ -473,8 +171,10 @@ void service_record::release_dependencies() noexcept
     for (auto & dependency : depends_on) {
         service_record * dep_to = dependency.get_to();
         if (dependency.holding_acq) {
-            dep_to->release();
+            // We must clear holding_acq before calling release, otherwise the dependency
+            // may decide to stop, check this link and release itself a second time.
             dependency.holding_acq = false;
+            dep_to->release();
         }
     }
 }
@@ -485,8 +185,6 @@ void service_record::start(bool activate) noexcept
         require();
         start_explicit = true;
     }
-    
-    if (desired_state == service_state_t::STARTED && service_state != service_state_t::STOPPED) return;
 
     bool was_active = service_state != service_state_t::STOPPED || desired_state != service_state_t::STOPPED;
     desired_state = service_state_t::STARTED;
@@ -494,9 +192,15 @@ void service_record::start(bool activate) noexcept
     if (service_state != service_state_t::STOPPED) {
         // We're already starting/started, or we are stopping and need to wait for
         // that the complete.
-        if (service_state != service_state_t::STOPPING || ! can_interrupt_stop()) {
+        if (service_state != service_state_t::STOPPING) {
             return;
         }
+
+        if (! can_interrupt_stop()) {
+            restarting = true;
+            return;
+        }
+
         // We're STOPPING, and that can be interrupted. Our dependencies might be STOPPING,
         // but if so they are waiting (for us), so they too can be instantly returned to
         // STARTING state.
@@ -506,6 +210,8 @@ void service_record::start(bool activate) noexcept
         services->service_active(this);
     }
 
+    start_failed = false;
+    start_skipped = false;
     service_state = service_state_t::STARTING;
     waiting_for_deps = true;
 
@@ -532,6 +238,7 @@ void service_record::do_propagation() noexcept
     
     if (prop_failure) {
         prop_failure = false;
+        stop_reason = stopped_reason_t::DEPFAILED;
         failed_to_start(true);
     }
     
@@ -552,13 +259,21 @@ void service_record::execute_transition() noexcept
     if (service_state == service_state_t::STARTING || (service_state == service_state_t::STARTED
             && restarting)) {
         if (check_deps_started()) {
-            bool have_console = service_state == service_state_t::STARTED && onstart_flags.runs_on_console;
-            all_deps_started(have_console);
+            all_deps_started();
         }
     }
     else if (service_state == service_state_t::STOPPING) {
         if (stop_check_dependents()) {
-            all_deps_stopped();
+            waiting_for_deps = false;
+
+            // A service that does actually stop for any reason should have its explicit activation released, unless
+            // it will restart:
+            if (start_explicit && !auto_restart && !restarting) {
+                start_explicit = false;
+                release(false);
+            }
+
+            bring_down();
         }
     }
 }
@@ -584,6 +299,8 @@ void service_record::do_start() noexcept
 
 void service_record::dependency_started() noexcept
 {
+    // Note that we check for STARTED state here in case the service is in smooth recovery while pinned.
+    // In that case it will wait for dependencies to start before restarting the process.
     if ((service_state == service_state_t::STARTING || service_state == service_state_t::STARTED)
             && waiting_for_deps) {
         services->add_transition_queue(this);
@@ -620,89 +337,9 @@ bool service_record::check_deps_started() noexcept
     return true;
 }
 
-bool service_record::open_socket() noexcept
+void service_record::all_deps_started() noexcept
 {
-    if (socket_path.empty() || socket_fd != -1) {
-        // No socket, or already open
-        return true;
-    }
-    
-    const char * saddrname = socket_path.c_str();
-    
-    // Check the specified socket path
-    struct stat stat_buf;
-    if (stat(saddrname, &stat_buf) == 0) {
-        if ((stat_buf.st_mode & S_IFSOCK) == 0) {
-            // Not a socket
-            log(loglevel_t::ERROR, service_name, ": Activation socket file exists (and is not a socket)");
-            return false;
-        }
-    }
-    else if (errno != ENOENT) {
-        // Other error
-        log(loglevel_t::ERROR, service_name, ": Error checking activation socket: ", strerror(errno));
-        return false;
-    }
-
-    // Remove stale socket file (if it exists).
-    // We won't test the return from unlink - if it fails other than due to ENOENT, we should get an
-    // error when we try to create the socket anyway.
-    unlink(saddrname);
-
-    uint sockaddr_size = offsetof(struct sockaddr_un, sun_path) + socket_path.length() + 1;
-    struct sockaddr_un * name = static_cast<sockaddr_un *>(malloc(sockaddr_size));
-    if (name == nullptr) {
-        log(loglevel_t::ERROR, service_name, ": Opening activation socket: out of memory");
-        return false;
-    }
-
-    name->sun_family = AF_UNIX;
-    strcpy(name->sun_path, saddrname);
-
-    int sockfd = dinit_socket(AF_UNIX, SOCK_STREAM, 0, SOCK_NONBLOCK | SOCK_CLOEXEC);
-    if (sockfd == -1) {
-        log(loglevel_t::ERROR, service_name, ": Error creating activation socket: ", strerror(errno));
-        free(name);
-        return false;
-    }
-
-    if (bind(sockfd, (struct sockaddr *) name, sockaddr_size) == -1) {
-        log(loglevel_t::ERROR, service_name, ": Error binding activation socket: ", strerror(errno));
-        close(sockfd);
-        free(name);
-        return false;
-    }
-    
-    free(name);
-    
-    // POSIX (1003.1, 2013) says that fchown and fchmod don't necessarily work on sockets. We have to
-    // use chown and chmod instead.
-    if (chown(saddrname, socket_uid, socket_gid)) {
-        log(loglevel_t::ERROR, service_name, ": Error setting activation socket owner/group: ", strerror(errno));
-        close(sockfd);
-        return false;
-    }
-    
-    if (chmod(saddrname, socket_perms) == -1) {
-        log(loglevel_t::ERROR, service_name, ": Error setting activation socket permissions: ", strerror(errno));
-        close(sockfd);
-        return false;
-    }
-
-    if (listen(sockfd, 128) == -1) { // 128 "seems reasonable".
-        log(loglevel_t::ERROR, ": Error listening on activation socket: ", strerror(errno));
-        close(sockfd);
-        return false;
-    }
-    
-    socket_fd = sockfd;
-    return true;
-}
-
-void service_record::all_deps_started(bool has_console) noexcept
-{
-    if (onstart_flags.starts_on_console && ! has_console) {
-        waiting_for_deps = true;
+    if (onstart_flags.starts_on_console && ! have_console) {
         queue_for_console();
         return;
     }
@@ -714,11 +351,8 @@ void service_record::all_deps_started(bool has_console) noexcept
         return;
     }
 
-    if (! open_socket()) {
-        failed_to_start();
-    }
-
-    bool start_success = start_ps_process();
+    bool start_success = bring_up();
+    restarting = false;
     if (! start_success) {
         failed_to_start();
     }
@@ -726,12 +360,15 @@ void service_record::all_deps_started(bool has_console) noexcept
 
 void service_record::acquired_console() noexcept
 {
+    waiting_for_console = false;
+    have_console = true;
+
     if (service_state != service_state_t::STARTING) {
         // We got the console but no longer want it.
         release_console();
     }
     else if (check_deps_started()) {
-        all_deps_started(true);
+        all_deps_started();
     }
     else {
         // We got the console but can't use it yet.
@@ -739,88 +376,20 @@ void service_record::acquired_console() noexcept
     }
 }
 
-bgproc_service::pid_result_t
-bgproc_service::read_pid_file(int *exit_status) noexcept
-{
-    const char *pid_file_c = pid_file.c_str();
-    int fd = open(pid_file_c, O_CLOEXEC);
-    if (fd == -1) {
-        log(loglevel_t::ERROR, service_name, ": read pid file: ", strerror(errno));
-        return pid_result_t::FAILED;
-    }
-
-    char pidbuf[21]; // just enough to hold any 64-bit integer
-    int r = ss_read(fd, pidbuf, 20);
-    if (r < 0) {
-        // Could not read from PID file
-        log(loglevel_t::ERROR, service_name, ": could not read from pidfile; ", strerror(errno));
-        close(fd);
-        return pid_result_t::FAILED;
-    }
-
-    close(fd);
-    pidbuf[r] = 0; // store nul terminator
-
-    bool valid_pid = false;
-    try {
-        unsigned long long v = std::stoull(pidbuf, nullptr, 0);
-        if (v <= std::numeric_limits<pid_t>::max()) {
-            pid = (pid_t) v;
-            valid_pid = true;
-        }
-    }
-    catch (std::out_of_range &exc) {
-        // Too large?
-    }
-    catch (std::invalid_argument &exc) {
-        // Ok, so it doesn't look like a number: proceed...
-    }
-
-    if (valid_pid) {
-        pid_t wait_r = waitpid(pid, exit_status, WNOHANG);
-        if (wait_r == -1 && errno == ECHILD) {
-            // We can't track this child - check process exists:
-            if (kill(pid, 0) == 0 || errno != ESRCH) {
-                tracking_child = false;
-                return pid_result_t::OK;
-            }
-            else {
-                log(loglevel_t::ERROR, service_name, ": pid read from pidfile (", pid, ") is not valid");
-                pid = -1;
-                return pid_result_t::FAILED;
-            }
-        }
-        else if (wait_r == pid) {
-            pid = -1;
-            return pid_result_t::TERMINATED;
-        }
-        else if (wait_r == 0) {
-            // We can track the child
-            child_listener.add_reserved(eventLoop, pid, DEFAULT_PRIORITY - 10);
-            tracking_child = true;
-            reserved_child_watch = true;
-            return pid_result_t::OK;
-        }
-    }
-
-    log(loglevel_t::ERROR, service_name, ": pid read from pidfile (", pid, ") is not valid");
-    pid = -1;
-    return pid_result_t::FAILED;
-}
-
 void service_record::started() noexcept
 {
-    if (onstart_flags.starts_on_console && ! onstart_flags.runs_on_console) {
-        tcsetpgrp(0, getpgrp());
+    // If we start on console but don't keep it, release it now:
+    if (have_console && ! onstart_flags.runs_on_console) {
+        bp_sys::tcsetpgrp(0, bp_sys::getpgrp());
         release_console();
     }
 
-    log_service_started(service_name);
+    log_service_started(get_name());
     service_state = service_state_t::STARTED;
     notify_listeners(service_event_t::STARTED);
 
     if (onstart_flags.rw_ready) {
-        open_control_socket();
+        rootfs_is_rw();
     }
     if (onstart_flags.log_ready) {
         setup_external_log();
@@ -839,21 +408,18 @@ void service_record::started() noexcept
     }
 }
 
-void service_record::failed_to_start(bool depfailed) noexcept
+void service_record::failed_to_start(bool depfailed, bool immediate_stop) noexcept
 {
-    if (!depfailed && onstart_flags.starts_on_console) {
-        tcsetpgrp(0, getpgrp());
-        release_console();
+    if (waiting_for_console) {
+        services->unqueue_console(this);
+        waiting_for_console = false;
     }
-    
-    log_service_failed(service_name);
-    service_state = service_state_t::STOPPED;
+
     if (start_explicit) {
         start_explicit = false;
-        release();
+        release(false);
     }
-    notify_listeners(service_event_t::FAILEDSTART);
-    
+
     // Cancel start of dependents:
     for (auto & dept : dependents) {
         switch (dept->dep_type) {
@@ -870,254 +436,30 @@ void service_record::failed_to_start(bool depfailed) noexcept
                 dept->waiting_on = false;
                 dept->get_from()->dependency_started();
             }
-            if (dept->holding_acq) {
-                dept->holding_acq = false;
-                release();
-            }
         }
-    }
-}
 
-bool service_record::start_ps_process() noexcept
-{
-    // default implementation: there is no process, so we are started.
-    started();
-    return true;
-}
-
-bool base_process_service::start_ps_process() noexcept
-{
-    if (restarting) {
-        if (pid == -1) {
-            return restart_ps_process();
+        // Always release now, so that our desired state will be STOPPED before we call
+        // stopped() below (if we do so). Otherwise it may decide to restart us.
+        if (dept->holding_acq) {
+            dept->holding_acq = false;
+            release(false);
         }
-        return true;
     }
-    else {
-        eventLoop.get_time(restart_interval_time, clock_type::MONOTONIC);
-        restart_interval_count = 0;
-        return start_ps_process(exec_arg_parts, onstart_flags.starts_on_console);
-    }
-}
-
-bool base_process_service::start_ps_process(const std::vector<const char *> &cmd, bool on_console) noexcept
-{
-    // In general, you can't tell whether fork/exec is successful. We use a pipe to communicate
-    // success/failure from the child to the parent. The pipe is set CLOEXEC so a successful
-    // exec closes the pipe, and the parent sees EOF. If the exec is unsuccessful, the errno
-    // is written to the pipe, and the parent can read it.
-
-    eventLoop.get_time(last_start_time, clock_type::MONOTONIC);
 
-    int pipefd[2];
-    if (pipe2(pipefd, O_CLOEXEC)) {
-        log(loglevel_t::ERROR, service_name, ": can't create status check pipe: ", strerror(errno));
-        return false;
-    }
-
-    const char * logfile = this->logfile.c_str();
-    if (*logfile == 0) {
-        logfile = "/dev/null";
-    }
-
-    bool child_status_registered = false;
-    control_conn_t *control_conn = nullptr;
-    
-    int control_socket[2] = {-1, -1};
-    if (onstart_flags.pass_cs_fd) {
-        if (dinit_socketpair(AF_UNIX, SOCK_STREAM, /* protocol */ 0, control_socket, SOCK_NONBLOCK)) {
-            log(loglevel_t::ERROR, service_name, ": can't create control socket: ", strerror(errno));
-            goto out_p;
-        }
-        
-        // Make the server side socket close-on-exec:
-        int fdflags = fcntl(control_socket[0], F_GETFD);
-        fcntl(control_socket[0], F_SETFD, fdflags | FD_CLOEXEC);
-        
-        try {
-            control_conn = new control_conn_t(eventLoop, services, control_socket[0]);
-        }
-        catch (std::exception &exc) {
-            log(loglevel_t::ERROR, service_name, ": can't launch process; out of memory");
-            goto out_cs;
-        }
-    }
-    
-    // Set up complete, now fork and exec:
-    
-    pid_t forkpid;
-    
-    try {
-        child_status_listener.add_watch(eventLoop, pipefd[0], IN_EVENTS);
-        child_status_registered = true;
-        
-        // We specify a high priority (i.e. low priority value) so that process termination is
-        // handled early. This means we have always recorded that the process is terminated by the
-        // time that we handle events that might otherwise cause us to signal the process, so we
-        // avoid sending a signal to an invalid (and possibly recycled) process ID.
-        forkpid = child_listener.fork(eventLoop, reserved_child_watch, DEFAULT_PRIORITY - 10);
-        reserved_child_watch = true;
-    }
-    catch (std::exception &e) {
-        log(loglevel_t::ERROR, service_name, ": Could not fork: ", e.what());
-        goto out_cs_h;
-    }
-
-    if (forkpid == 0) {
-        run_child_proc(cmd.data(), logfile, on_console, pipefd[1], control_socket[1]);
-    }
-    else {
-        // Parent process
-        close(pipefd[1]); // close the 'other end' fd
-        if (control_socket[1] != -1) {
-            close(control_socket[1]);
-        }
-        pid = forkpid;
-
-        waiting_for_execstat = true;
-        return true;
-    }
+    start_failed = true;
+    log_service_failed(get_name());
+    notify_listeners(service_event_t::FAILEDSTART);
 
-    // Failure exit:
-    
-    out_cs_h:
-    if (child_status_registered) {
-        child_status_listener.deregister(eventLoop);
-    }
-    
-    if (onstart_flags.pass_cs_fd) {
-        delete control_conn;
-    
-        out_cs:
-        close(control_socket[0]);
-        close(control_socket[1]);
+    if (immediate_stop) {
+        stopped();
     }
-    
-    out_p:
-    close(pipefd[0]);
-    close(pipefd[1]);
-    
-    return false;
 }
 
-void service_record::run_child_proc(const char * const *args, const char *logfile, bool on_console,
-        int wpipefd, int csfd) noexcept
+bool service_record::bring_up() noexcept
 {
-    // Child process. Must not allocate memory (or otherwise risk throwing any exception)
-    // from here until exit().
-
-    // If the console already has a session leader, presumably it is us. On the other hand
-    // if it has no session leader, and we don't create one, then control inputs such as
-    // ^C will have no effect.
-    bool do_set_ctty = (tcgetsid(0) == -1);
-    
-    // Copy signal mask, but unmask signals that we masked on startup. For the moment, we'll
-    // also block all signals, since apparently dup() can be interrupted (!!! really, POSIX??).
-    sigset_t sigwait_set;
-    sigset_t sigall_set;
-    sigfillset(&sigall_set);
-    sigprocmask(SIG_SETMASK, &sigall_set, &sigwait_set);
-    sigdelset(&sigwait_set, SIGCHLD);
-    sigdelset(&sigwait_set, SIGINT);
-    sigdelset(&sigwait_set, SIGTERM);
-    sigdelset(&sigwait_set, SIGQUIT);
-    
-    constexpr int bufsz = ((CHAR_BIT * sizeof(pid_t)) / 3 + 2) + 11;
-    // "LISTEN_PID=" - 11 characters; the expression above gives a conservative estimate
-    // on the maxiumum number of bytes required for LISTEN=nnn, including nul terminator,
-    // where nnn is a pid_t in decimal (i.e. one decimal digit is worth just over 3 bits).
-    char nbuf[bufsz];
-    
-    // "DINIT_CS_FD=" - 12 bytes. (we -1 from sizeof(int) in account of sign bit).
-    constexpr int csenvbufsz = ((CHAR_BIT * sizeof(int) - 1) / 3 + 2) + 12;
-    char csenvbuf[csenvbufsz];
-    
-    int minfd = (socket_fd == -1) ? 3 : 4;
-
-    // Move wpipefd/csfd to another fd if necessary
-    if (wpipefd < minfd) {
-        wpipefd = fcntl(wpipefd, F_DUPFD_CLOEXEC, minfd);
-        if (wpipefd == -1) goto failure_out;
-    }
-    
-    if (csfd != -1 && csfd < minfd) {
-        csfd = fcntl(csfd, F_DUPFD, minfd);
-        if (csfd == -1) goto failure_out;
-    }
-    
-    if (socket_fd != -1) {
-        
-        if (dup2(socket_fd, 3) == -1) goto failure_out;
-        if (socket_fd != 3) {
-            close(socket_fd);
-        }
-        
-        if (putenv(const_cast<char *>("LISTEN_FDS=1"))) goto failure_out;
-        snprintf(nbuf, bufsz, "LISTEN_PID=%jd", static_cast<intmax_t>(getpid()));
-        if (putenv(nbuf)) goto failure_out;
-    }
-    
-    if (csfd != -1) {
-        snprintf(csenvbuf, csenvbufsz, "DINIT_CS_FD=%d", csfd);
-        if (putenv(csenvbuf)) goto failure_out;
-    }
-
-    if (! on_console) {
-        // Re-set stdin, stdout, stderr
-        close(0); close(1); close(2);
-
-        if (open("/dev/null", O_RDONLY) == 0) {
-            // stdin = 0. That's what we should have; proceed with opening
-            // stdout and stderr.
-            if (open(logfile, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR) != 1) {
-                goto failure_out;
-            }
-            if (dup2(1, 2) != 2) {
-                goto failure_out;
-            }
-        }
-        else goto failure_out;
-        
-        // We have the option of creating a session and process group, or just a new process
-        // group. If we just create a new process group, the child process cannot make itself
-        // a session leader if it wants to do that (eg getty/login will generally want this).
-        // If we do neither, and we are running with a controlling terminal, a ^C or similar
-        // will also affect the child process (which probably isn't so bad, though since we
-        // will handle the shutdown ourselves it's not necessary). Creating a new session
-        // (and a new process group as part of that) seems like a safe bet, and has the
-        // advantage of letting us signal the process as part of a process group.
-        setsid();
-    }
-    else {
-        // "run on console" - run as a foreground job on the terminal/console device
-        
-        // if do_set_ctty is false, we are the session leader; we are probably running
-        // as a user process. Don't create a new session leader in that case, and run
-        // as part of the parent session. Otherwise, the new session cannot claim the
-        // terminal as a controlling terminal (it is already claimed), meaning that it
-        // will not see control signals from ^C etc.
-        
-        if (do_set_ctty) {
-            // Disable suspend (^Z) (and on some systems, delayed suspend / ^Y)
-            signal(SIGTSTP, SIG_IGN);
-            
-            // Become session leader
-            setsid();
-            ioctl(0, TIOCSCTTY, 0);
-        }
-        setpgid(0,0);
-        tcsetpgrp(0, getpgrp());
-    }
-    
-    sigprocmask(SIG_SETMASK, &sigwait_set, nullptr);
-    
-    execvp(args[0], const_cast<char **>(args));
-    
-    // If we got here, the exec failed:
-    failure_out:
-    int exec_status = errno;
-    write(wpipefd, &exec_status, sizeof(int));
-    _exit(0);
+    // default implementation: there is no process, so we are started.
+    started();
+    return true;
 }
 
 // Mark this and all dependent services as force-stopped.
@@ -1125,7 +467,10 @@ void service_record::forced_stop() noexcept
 {
     if (service_state != service_state_t::STOPPED) {
         force_stop = true;
-        services->add_transition_queue(this);
+        if (! pinned_started) {
+            prop_stop = true;
+            services->add_prop_queue(this);
+        }
     }
 }
 
@@ -1140,39 +485,69 @@ void service_record::stop(bool bring_down) noexcept
 {
     if (start_explicit) {
         start_explicit = false;
-        release();
+        required_by--;
+    }
+
+    // If our required_by count is 0, we should treat this as a full manual stop regardless
+    if (required_by == 0) {
+        bring_down = true;
     }
 
-    if (bring_down) {
+    desired_state = service_state_t::STOPPED;
+
+    if (bring_down && service_state != service_state_t::STOPPED
+               && service_state != service_state_t::STOPPING) {
+       stop_reason = stopped_reason_t::NORMAL;
         do_stop();
     }
 }
 
-void service_record::do_stop() noexcept
+bool service_record::restart() noexcept
 {
-    if (pinned_started) return;
+    // Re-start without affecting dependency links/activation.
 
-    if (start_explicit && ! do_auto_restart()) {
-        start_explicit = false;
-        release();
-        if (required_by == 0) return; // release will re-call us anyway
+    if (service_state == service_state_t::STARTED) {
+        restarting = true;
+        stop_reason = stopped_reason_t::NORMAL;
+        do_stop();
+        return true;
     }
 
+    // Wrong state
+    return false;
+}
+
+void service_record::do_stop() noexcept
+{
+    // Called when we should definitely stop. We may need to restart afterwards, but we
+    // won't know that for sure until the execution transition.
+
+    bool all_deps_stopped = stop_dependents();
+
     if (service_state != service_state_t::STARTED) {
         if (service_state == service_state_t::STARTING) {
-            if (! can_interrupt_start()) {
-                // Well this is awkward: we're going to have to continue
-                // starting, but we don't want any dependents to think that
-                // they are still waiting to start.
-                // Make sure they remain stopped:
-                stop_dependents();
-                return;
+            // If waiting for a dependency, or waiting for the console, we can interrupt start. Otherwise,
+            // we need to delegate to can_interrupt_start() (which can be overridden).
+            if (! waiting_for_deps && ! waiting_for_console) {
+                if (! can_interrupt_start()) {
+                    // Well this is awkward: we're going to have to continue starting. We can stop once
+                    // we've reached the started state.
+                    return;
+                }
+
+                if (! interrupt_start()) {
+                    // Now wait for service startup to actually end; we don't need to handle it here.
+                    notify_listeners(service_event_t::STARTCANCELLED);
+                    return;
+                }
+            }
+            else if (waiting_for_console) {
+                services->unqueue_console(this);
+                waiting_for_console = false;
             }
 
             // We must have had desired_state == STARTED.
             notify_listeners(service_event_t::STARTCANCELLED);
-            
-            interrupt_start();
 
             // Reaching this point, we are starting interruptibly - so we
             // stop now (by falling through to below).
@@ -1184,9 +559,11 @@ void service_record::do_stop() noexcept
         }
     }
 
+    if (pinned_started) return;
+
     service_state = service_state_t::STOPPING;
     waiting_for_deps = true;
-    if (stop_dependents()) {
+    if (all_deps_stopped) {
         services->add_transition_queue(this);
     }
 }
@@ -1195,12 +572,12 @@ bool service_record::stop_check_dependents() noexcept
 {
     bool all_deps_stopped = true;
     for (auto dept : dependents) {
-        if (dept->dep_type == dependency_type::REGULAR && ! dept->get_from()->is_stopped()) {
+        if (dept->is_hard() && dept->holding_acq) {
             all_deps_stopped = false;
             break;
         }
     }
-    
+
     return all_deps_stopped;
 }
 
@@ -1208,7 +585,7 @@ bool service_record::stop_dependents() noexcept
 {
     bool all_deps_stopped = true;
     for (auto dept : dependents) {
-        if (dept->dep_type == dependency_type::REGULAR) {
+        if (dept->is_hard() && dept->holding_acq) {
             if (! dept->get_from()->is_stopped()) {
                 // Note we check *first* since if the dependent service is not stopped,
                 // 1. We will issue a stop to it shortly and
@@ -1225,120 +602,37 @@ bool service_record::stop_dependents() noexcept
             dept->get_from()->prop_stop = true;
             services->add_prop_queue(dept->get_from());
         }
+        // Note that soft dependencies are held (for now). If we restart, we don't want those dependencies
+        // to be broken.
     }
 
     return all_deps_stopped;
 }
 
 // All dependents have stopped; we can stop now, too. Only called when STOPPING.
-void service_record::all_deps_stopped() noexcept
+void service_record::bring_down() noexcept
 {
     waiting_for_deps = false;
     stopped();
 }
 
-void base_process_service::kill_pg(int signo) noexcept
-{
-    pid_t pgid = getpgid(pid);
-    if (pgid == -1) {
-        // only should happen if pid is invalid, which should never happen...
-        log(loglevel_t::ERROR, service_name, ": can't signal process: ", strerror(errno));
-        return;
-    }
-    kill(-pgid, signo);
-}
-
-void base_process_service::all_deps_stopped() noexcept
-{
-    waiting_for_deps = false;
-    if (pid != -1) {
-        // The process is still kicking on - must actually kill it. We signal the process
-        // group (-pid) rather than just the process as there's less risk then of creating
-        // an orphaned process group:
-        if (! onstart_flags.no_sigterm) {
-            kill_pg(SIGTERM);
-        }
-        if (term_signal != -1) {
-            kill_pg(term_signal);
-        }
-
-        // In most cases, the rest is done in handle_exit_status.
-        // If we are a BGPROCESS and the process is not our immediate child, however, that
-        // won't work - check for this now:
-        if (record_type == service_type::BGPROCESS && ! tracking_child) {
-            stopped();
-        }
-        else if (stop_timeout != time_val(0,0)) {
-            restart_timer.arm_timer_rel(eventLoop, stop_timeout);
-            stop_timer_armed = true;
-        }
-    }
-    else {
-        // The process is already dead.
-        stopped();
-    }
-}
-
-void process_service::all_deps_stopped() noexcept
-{
-    waiting_for_deps = false;
-    if (waiting_for_execstat) {
-        // The process is still starting. This should be uncommon, but can occur during
-        // smooth recovery. We can't do much now; we have to wait until we get the
-        // status, and then act appropriately.
-        return;
-    }
-    else if (pid != -1) {
-        // The process is still kicking on - must actually kill it. We signal the process
-        // group (-pid) rather than just the process as there's less risk then of creating
-        // an orphaned process group:
-        if (! onstart_flags.no_sigterm) {
-            kill_pg(SIGTERM);
-        }
-        if (term_signal != -1) {
-            kill_pg(term_signal);
-        }
-
-        // In most cases, the rest is done in handle_exit_status.
-        // If we are a BGPROCESS and the process is not our immediate child, however, that
-        // won't work - check for this now:
-        if (record_type == service_type::BGPROCESS && ! tracking_child) {
-            stopped();
-        }
-        else if (stop_timeout != time_val(0,0)) {
-            restart_timer.arm_timer_rel(eventLoop, stop_timeout);
-            stop_timer_armed = true;
-        }
-    }
-    else {
-        // The process is already dead.
-        stopped();
-    }
-}
-
-void scripted_service::all_deps_stopped() noexcept
-{
-    waiting_for_deps = false;
-    if (stop_command.length() == 0) {
-        stopped();
-    }
-    else if (! start_ps_process(stop_arg_parts, false)) {
-        // Couldn't execute stop script, but there's not much we can do:
-        stopped();
-    }
-    else {
-        // successfully started stop script: start kill timer:
-        if (stop_timeout != time_val(0,0)) {
-            restart_timer.arm_timer_rel(eventLoop, stop_timeout);
-            stop_timer_armed = true;
-        }
-    }
-}
-
 void service_record::unpin() noexcept
 {
     if (pinned_started) {
         pinned_started = false;
+
+        for (auto &dep : depends_on) {
+            if (dep.is_hard()) {
+                if (dep.get_to()->get_state() != service_state_t::STARTED) {
+                    desired_state = service_state_t::STOPPED;
+                }
+            }
+            else if (dep.holding_acq) {
+                dep.holding_acq = false;
+                dep.get_to()->release();
+            }
+        }
+
         if (desired_state == service_state_t::STOPPED || force_stop) {
             do_stop();
             services->process_queues();
@@ -1355,17 +649,19 @@ void service_record::unpin() noexcept
 
 void service_record::queue_for_console() noexcept
 {
+    waiting_for_console = true;
     services->append_console_queue(this);
 }
 
 void service_record::release_console() noexcept
 {
+    have_console = false;
     services->pull_console_queue();
 }
 
-void service_record::interrupt_start() noexcept
+bool service_record::interrupt_start() noexcept
 {
-    services->unqueue_console(this);
+    return true;
 }
 
 void service_set::service_active(service_record *sr) noexcept
@@ -1377,125 +673,3 @@ void service_set::service_inactive(service_record *sr) noexcept
 {
     active_services--;
 }
-
-base_process_service::base_process_service(service_set *sset, string name,
-        service_type service_type_p, string &&command,
-        std::list<std::pair<unsigned,unsigned>> &command_offsets,
-        const std::list<prelim_dep> &deplist_p)
-     : service_record(sset, name, service_type_p, std::move(command), command_offsets,
-         deplist_p), child_listener(this), child_status_listener(this)
-{
-    restart_interval_count = 0;
-    restart_interval_time = {0, 0};
-    restart_timer.service = this;
-    restart_timer.add_timer(eventLoop);
-
-    // By default, allow a maximum of 3 restarts within 10.0 seconds:
-    restart_interval.seconds() = 10;
-    restart_interval.nseconds() = 0;
-    max_restart_interval_count = 3;
-
-    waiting_restart_timer = false;
-    reserved_child_watch = false;
-    tracking_child = false;
-    stop_timer_armed = false;
-}
-
-void base_process_service::do_restart() noexcept
-{
-    waiting_restart_timer = false;
-    restart_interval_count++;
-
-    // We may be STARTING (regular restart) or STARTED ("smooth recovery"). This affects whether
-    // the process should be granted access to the console:
-    bool on_console = service_state == service_state_t::STARTING
-            ? onstart_flags.starts_on_console : onstart_flags.runs_on_console;
-
-    if (service_state == service_state_t::STARTING) {
-        // for a smooth recovery, we want to check dependencies are available before actually
-        // starting:
-        if (! check_deps_started()) {
-            waiting_for_deps = true;
-            return;
-        }
-    }
-
-    if (! start_ps_process(exec_arg_parts, on_console)) {
-        restarting = false;
-        if (service_state == service_state_t::STARTING) {
-            failed_to_start();
-        }
-        else {
-            desired_state = service_state_t::STOPPED;
-            forced_stop();
-        }
-        services->process_queues();
-    }
-}
-
-bool base_process_service::restart_ps_process() noexcept
-{
-    using time_val = dasynq::time_val;
-
-    time_val current_time;
-    eventLoop.get_time(current_time, clock_type::MONOTONIC);
-
-    if (max_restart_interval_count != 0) {
-        // Check whether we're still in the most recent restart check interval:
-        time_val int_diff = current_time - restart_interval_time;
-        if (int_diff < restart_interval) {
-            if (restart_interval_count >= max_restart_interval_count) {
-                log(loglevel_t::ERROR, "Service ", service_name, " restarting too quickly; stopping.");
-                return false;
-            }
-        }
-        else {
-            restart_interval_time = current_time;
-            restart_interval_count = 0;
-        }
-    }
-
-    // Check if enough time has lapsed since the prevous restart. If not, start a timer:
-    time_val tdiff = current_time - last_start_time;
-    if (restart_delay <= tdiff) {
-        // > restart delay (normally 200ms)
-        do_restart();
-    }
-    else {
-        time_val timeout = restart_delay - tdiff;
-        restart_timer.arm_timer_rel(eventLoop, timeout);
-        waiting_restart_timer = true;
-    }
-    return true;
-}
-
-void base_process_service::interrupt_start() noexcept
-{
-    // overridden in subclasses
-    if (waiting_restart_timer) {
-        restart_timer.stop_timer(eventLoop);
-        waiting_restart_timer = false;
-    }
-    service_record::interrupt_start();
-}
-
-void base_process_service::kill_with_fire() noexcept
-{
-    if (pid != -1) {
-        log(loglevel_t::WARN, "Service ", service_name, "with pid ", pid, " exceeded allowed stop time; killing.");
-        kill_pg(SIGKILL);
-    }
-}
-
-dasynq::rearm process_restart_timer::timer_expiry(eventloop_t &, int expiry_count)
-{
-    if (service->service_state == service_state_t::STOPPING) {
-        service->kill_with_fire();
-        service->stop_timer_armed = false;
-    }
-    else {
-        // STARTING / STARTED:
-        service->do_restart();
-    }
-    return dasynq::rearm::DISARM;
-}