Rename internal run/task/service states => changes condition names

This patch renames the internal states for run/task/services to avoid
any confusion with the introduction of 'ready:scripts'.

 * WAITING -> PAUSED
 * READY   -> WAITING

A service condition that used, e.g., <service/foo/ready> should now
instead use <service/foo/waiting>.

Note: A new condition with the old name <service/foo/ready> will be
      introduced shortly to signify service "readiness", a concept
      used in other PID 1, like systemd and s6.

For details, see issue #299.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2022-08-23 15:31:24 +02:00
1 parent 9d79673cea
commit 51ade57723
6 files changed
+20 -20

No files matched your search

+1 -1
View File
@@ -169,7 +169,7 @@ Debugging
If a service is not being started as it should, the problem might be If a service is not being started as it should, the problem might be
that one of its conditions is not in the expected state. Use the that one of its conditions is not in the expected state. Use the
command `initctl status` to inspect service status. Services in the command `initctl status` to inspect service status. Services in the
`ready` state are pending a condition. `waiting` state are pending a condition.
In that situation, running `initctl cond show` reveals which of the In that situation, running `initctl cond show` reveals which of the
conditions that are not satisfied. Listed as `off` below. conditions that are not satisfied. Listed as `off` below.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 KiB

After

Width:  |  Height:  |  Size: 230 KiB

+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Do not edit this file with editors other than diagrams.net --> <!-- Do not edit this file with editors other than diagrams.net -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" style="background-color: rgb(255, 255, 255);" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="653px" height="811px" viewBox="-0.5 -0.5 653 811" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2022-06-25T17:03:14.573Z&quot; agent=&quot;5.0 (X11)&quot; etag=&quot;9tP9OtnljXbCHbcDNUAU&quot; version=&quot;20.0.3&quot; type=&quot;google&quot;&gt;&lt;diagram id=&quot;BWodz9NWZF2PVd7xISEX&quot; name=&quot;Page-1&quot;&gt;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&lt;/diagram&gt;&lt;/mxfile&gt;"><defs><style type="text/css">@import url(https://fonts.googleapis.com/css?family=Architects+Daughter);&#xa;</style></defs><g><path d="M 366.94 60 L 366.94 233.63" fill="none" stroke="none" pointer-events="stroke"/><path d="M 366.94 238.88 L 363.44 231.88 L 366.94 233.63 L 370.44 231.88 Z" fill="none" stroke="none" pointer-events="all"/><path d="M 366.94 60 M 366.94 60 C 367.51 116.64 369.16 175.25 366.94 233.63 M 366.94 60 C 366.46 106.08 368.39 150.48 366.94 233.63" fill="none" stroke="rgb(0, 0, 0)" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 363.74 231.53 C 363.74 231.53 363.74 231.53 363.74 231.53 M 363.74 231.53 C 363.74 231.53 363.74 231.53 363.74 231.53 M 365.45 235.66 C 366.01 234.95 366.71 233.95 367.42 233.4 M 365.45 235.66 C 366.01 234.82 366.91 234.01 367.42 233.4" fill="none" stroke="rgb(0, 0, 0)" stroke-width="0.5" stroke-linejoin="round" stroke-linecap="round" stroke-miterlimit="10" pointer-events="all"/><path d="M 366.94 238.88 M 366.94 238.88 C 366.87 236.87 365.6 235.72 363.44 231.88 M 366.94 238.88 C 365.58 236.57 364.78 233.81 363.44 231.88 M 363.44 231.88 C 364.98 232.75 365.75 232.78 366.94 233.63 M 363.44 231.88 C 364.25 232.25 365.14 232.83 366.94 233.63 M 366.94 233.63 C 368.58 233.08 369.89 232.64 370.44 231.88 M 366.94 233.63 C 368.32 233 369.55 232.09 370.44 231.88 M 370.44 231.88 C 369.16 234.1 369.15 234.71 366.94 238.88 M 370.44 231.88 C 369.29 234.05 367.73 236.62 366.94 Line truncated <svg xmlns="http://www.w3.org/2000/svg" style="background-color: rgb(255, 255, 255);" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="732px" height="888px" viewBox="-0.5 -0.5 732 888" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2022-08-23T13:29:07.417Z&quot; agent=&quot;5.0 (X11)&quot; version=&quot;20.2.4&quot; etag=&quot;2-w-AmAkF4Yj3b3JyTHu&quot; type=&quot;google&quot;&gt;&lt;diagram id=&quot;2QNQ_rVyMpIu31uE8ppT&quot;&gt;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&lt;/diagram&gt;&lt;/mxfile&gt;"><defs><style type="text/css">@font-face { font-family: "Architects Daughter"; src: url("data:application/x-font-ttf;charset=utf-8;base64,AAEAAAAMAIAAAwBAT1MvMoWwV7IAAGWAAAAAYGNtYXDPBugkAABl4AAAARxnYXNwAAAAEAAAkvgAAAAIZ2x5Zv2v7C0AAADMAABb/GhlYWQC0dksAABfqAAAADZoaGVhCEMEFgAAZVwAAAAkaG10eN2yH1kAAF/gAAAFfGxvY2GKxKMcAABc6AAAAsBtYXhwAa4AzAAAXMgAAAAgbmFtZUarZSoAAGcEAAAlEHBvc3QANIw5AACMFAAABuNwcmVwaAaMhQAAZvwAAAAHAAIAFv/5AHwDhQAKABMAADcyFhUGBwYiJicmEwYQByM0NxI1PyoTCyUGDhUFC1sGD0MIDkMQCSgIAQgKGQNhGv2rLWebAS1pAAIANgHqANcC+wALABcAABM3JzQ3FxUXDgEjIic3JzQ3FxUXDgEjIpIBASQREAMZBSRcAQEkEBEEGAUkAlIcKVMREMciAw1XHSpTERDHIgQNAAACADgAxgKdApgAQwBQAAATNDMyFjM1Ii4BJyY0Nz4BNzYzNTQ2MzIWHQE3NTMXMxQjIiYjFTI2MxUUBw4BBw4BBwYjNSYiDgEeAQYHIyInJicuASQmIgYHBh0BMjc2NTRWKhIlAwLine truncated

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 164 KiB

+6 -6
View File
@@ -234,9 +234,9 @@ static void pidfile_reconf(void *arg)
} }
/* /*
* This will call service_step(), which in turn will schedule itself * This calls service_step(), which in turn schedules itself as
* as long as stepped services change state. Services going from * long as stepped services change state. Services going from
* WAITING to RUNNING will reassert their conditions in that loop, * PAUSED to RUNNING reassert their conditions in that loop,
* which in turn may unlock other services, and so on. * which in turn may unlock other services, and so on.
*/ */
service_step_all(SVC_TYPE_SERVICE | SVC_TYPE_RUNTASK); service_step_all(SVC_TYPE_SERVICE | SVC_TYPE_RUNTASK);
@@ -283,9 +283,9 @@ static void pidfile_init(void *arg)
* *
* service <net/iface/lo> /sbin/dropbear ... * service <net/iface/lo> /sbin/dropbear ...
* *
* Which provides the <pid/dropbear> condition, will not be set by * This service provides the <pid/dropbear> condition, which will not be
* pidfile.so during `initctl reload` because dropbear is still * set by pidfile.so during `initctl reload` because dropbear is still
* SIGSTP:ed waiting for <net/iface/lo>. * SIGSTP:ed (in state PAUSED) waiting for <net/iface/lo>.
*/ */
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = __FILE__,
+6 -6
View File
@@ -1993,14 +1993,14 @@ restart:
switch (svc->state) { switch (svc->state) {
case SVC_HALTED_STATE: case SVC_HALTED_STATE:
if (enabled) if (enabled)
svc_set_state(svc, SVC_READY_STATE); svc_set_state(svc, SVC_WAITING_STATE);
break; break;
case SVC_DONE_STATE: case SVC_DONE_STATE:
if (svc_is_changed(svc)) if (svc_is_changed(svc))
svc_set_state(svc, SVC_HALTED_STATE); svc_set_state(svc, SVC_HALTED_STATE);
if (svc_is_runtask(svc) && svc_is_manual(svc) && enabled) if (svc_is_runtask(svc) && svc_is_manual(svc) && enabled)
svc_set_state(svc, SVC_READY_STATE); svc_set_state(svc, SVC_WAITING_STATE);
break; break;
case SVC_STOPPING_STATE: case SVC_STOPPING_STATE:
@@ -2046,7 +2046,7 @@ restart:
svc_set_state(svc, SVC_STARTING_STATE); svc_set_state(svc, SVC_STARTING_STATE);
break; break;
case SVC_READY_STATE: case SVC_WAITING_STATE:
if (!enabled) { if (!enabled) {
svc_set_state(svc, SVC_HALTED_STATE); svc_set_state(svc, SVC_HALTED_STATE);
} else if (cond_get_agg(svc->cond) == COND_ON) { } else if (cond_get_agg(svc->cond) == COND_ON) {
@@ -2125,7 +2125,7 @@ restart:
case COND_FLUX: case COND_FLUX:
kill(svc->pid, SIGSTOP); kill(svc->pid, SIGSTOP);
svc_set_state(svc, SVC_WAITING_STATE); svc_set_state(svc, SVC_PAUSED_STATE);
break; break;
case COND_ON: case COND_ON:
@@ -2148,7 +2148,7 @@ restart:
} }
break; break;
case SVC_WAITING_STATE: case SVC_PAUSED_STATE:
if (!enabled) { if (!enabled) {
kill(svc->pid, SIGCONT); kill(svc->pid, SIGCONT);
service_stop(svc); service_stop(svc);
@@ -2157,7 +2157,7 @@ restart:
if (!svc->pid) { if (!svc->pid) {
(*restart_cnt)++; (*restart_cnt)++;
svc_set_state(svc, SVC_READY_STATE); svc_set_state(svc, SVC_WAITING_STATE);
break; break;
} }
+6 -6
View File
@@ -61,8 +61,8 @@ typedef enum {
SVC_STOPPING_STATE, /* Waiting to collect the child process */ SVC_STOPPING_STATE, /* Waiting to collect the child process */
SVC_CLEANUP_STATE, /* Running post: script */ SVC_CLEANUP_STATE, /* Running post: script */
SVC_SETUP_STATE, /* Running pre: script */ SVC_SETUP_STATE, /* Running pre: script */
SVC_WAITING_STATE, /* Condition is in flux, process SIGSTOPed */ SVC_PAUSED_STATE, /* Condition is in flux, process SIGSTOPed */
SVC_READY_STATE, /* Enabled but condition not satisfied */ SVC_WAITING_STATE, /* Enabled but condition not satisfied */
SVC_STARTING_STATE, /* Conditions OK and pre: script done, start */ SVC_STARTING_STATE, /* Conditions OK and pre: script done, start */
SVC_RUNNING_STATE, /* Process running */ SVC_RUNNING_STATE, /* Process running */
} svc_state_t; } svc_state_t;
@@ -353,8 +353,8 @@ static inline char *svc_status(svc_t *svc)
return "stopping"; return "stopping";
} }
case SVC_WAITING_STATE: case SVC_PAUSED_STATE:
return "waiting"; return "paused";
case SVC_CLEANUP_STATE: case SVC_CLEANUP_STATE:
return "cleanup"; return "cleanup";
@@ -362,8 +362,8 @@ static inline char *svc_status(svc_t *svc)
case SVC_SETUP_STATE: case SVC_SETUP_STATE:
return "setup"; return "setup";
case SVC_READY_STATE: case SVC_WAITING_STATE:
return "ready"; return "waiting";
case SVC_RUNNING_STATE: case SVC_RUNNING_STATE:
return "running"; return "running";