projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add platform tweaks
[oweals/busybox.git]
/
runit
/
runsv.c
diff --git
a/runit/runsv.c
b/runit/runsv.c
index 7cf142d8a265f989d0c6621ab2bd71ac0289afb3..6d34dc133005de7a4b6022327d5d6deb6f6ad3fc 100644
(file)
--- a/
runit/runsv.c
+++ b/
runit/runsv.c
@@
-25,7
+25,7
@@
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* Busyboxed by Den
i
s Vlasenko <vda.linux@googlemail.com> */
+/* Busyboxed by Den
y
s Vlasenko <vda.linux@googlemail.com> */
/* TODO: depends on runit_lib.c - review and reduce/eliminate */
#include <sys/poll.h>
/* TODO: depends on runit_lib.c - review and reduce/eliminate */
#include <sys/poll.h>
@@
-90,8
+90,8
@@
struct globals {
smallint haslog;
smallint sigterm;
smallint pidchanged;
smallint haslog;
smallint sigterm;
smallint pidchanged;
-
int selfpipe[2]
;
-
int logpipe[2]
;
+
struct fd_pair selfpipe
;
+
struct fd_pair logpipe
;
char *dir;
struct svdir svd[2];
};
char *dir;
struct svdir svd[2];
};
@@
-103,10
+103,9
@@
struct globals {
#define logpipe (G.logpipe )
#define dir (G.dir )
#define svd (G.svd )
#define logpipe (G.logpipe )
#define dir (G.dir )
#define svd (G.svd )
-#define INIT_G() \
- do { \
- pidchanged = 1; \
- } while (0)
+#define INIT_G() do { \
+ pidchanged = 1; \
+} while (0)
static void fatal2_cannot(const char *m1, const char *m2)
{
static void fatal2_cannot(const char *m1, const char *m2)
{
@@
-128,15
+127,15
@@
static void warn_cannot(const char *m)
bb_perror_msg("%s: warning: cannot %s", dir, m);
}
bb_perror_msg("%s: warning: cannot %s", dir, m);
}
-static void s_child(int sig_no)
+static void s_child(int sig_no
UNUSED_PARAM
)
{
{
- write(selfpipe
[1]
, "", 1);
+ write(selfpipe
.wr
, "", 1);
}
}
-static void s_term(int sig_no)
+static void s_term(int sig_no
UNUSED_PARAM
)
{
sigterm = 1;
{
sigterm = 1;
- write(selfpipe
[1]
, "", 1); /* XXX */
+ write(selfpipe
.wr
, "", 1); /* XXX */
}
static char *add_str(char *p, const char *to_add)
}
static char *add_str(char *p, const char *to_add)
@@
-157,16
+156,6
@@
static int open_trunc_or_warn(const char *name)
return fd;
}
return fd;
}
-static int rename_or_warn(const char *old, const char *new)
-{
- if (rename(old, new) == -1) {
- bb_perror_msg("%s: warning: cannot rename %s to %s",
- dir, old, new);
- return -1;
- }
- return 0;
-}
-
static void update_status(struct svdir *s)
{
ssize_t sz;
static void update_status(struct svdir *s)
{
ssize_t sz;
@@
-258,32
+247,30
@@
static void update_status(struct svdir *s)
static unsigned custom(struct svdir *s, char c)
{
static unsigned custom(struct svdir *s, char c)
{
-
in
t pid;
+
pid_
t pid;
int w;
char a[10];
struct stat st;
int w;
char a[10];
struct stat st;
- char *prog[2];
if (s->islog) return 0;
strcpy(a, "control/?");
if (s->islog) return 0;
strcpy(a, "control/?");
- a[8] = c;
+ a[8] = c;
/* replace '?' */
if (stat(a, &st) == 0) {
if (st.st_mode & S_IXUSR) {
if (stat(a, &st) == 0) {
if (st.st_mode & S_IXUSR) {
- pid = fork();
+ pid =
v
fork();
if (pid == -1) {
if (pid == -1) {
- warn_cannot("fork for control/?");
+ warn_cannot("
v
fork for control/?");
return 0;
}
if (!pid) {
return 0;
}
if (!pid) {
- if (haslog && dup2(logpipe[1], 1) == -1)
+ /* child */
+ if (haslog && dup2(logpipe.wr, 1) == -1)
warn_cannot("setup stdout for control/?");
warn_cannot("setup stdout for control/?");
- prog[0] = a;
- prog[1] = NULL;
- execve(a, prog, environ);
+ execl(a, a, (char *) NULL);
fatal_cannot("run control/?");
}
fatal_cannot("run control/?");
}
- while (wait_pid(&w, pid) == -1) {
- if (errno == EINTR) continue;
+ /* parent */
+ if (safe_waitpid(pid, &w, 0) == -1) {
warn_cannot("wait for child control/?");
return 0;
}
warn_cannot("wait for child control/?");
return 0;
}
@@
-317,41
+304,45
@@
static void stopservice(struct svdir *s)
static void startservice(struct svdir *s)
{
int p;
static void startservice(struct svdir *s)
{
int p;
- c
har *run[2]
;
+ c
onst char *run
;
if (s->state == S_FINISH)
if (s->state == S_FINISH)
- run
[0] = (char*)
"./finish";
+ run
=
"./finish";
else {
else {
- run
[0] = (char*)
"./run";
+ run
=
"./run";
custom(s, 'u');
}
custom(s, 'u');
}
- run[1] = NULL;
if (s->pid != 0)
stopservice(s); /* should never happen */
if (s->pid != 0)
stopservice(s); /* should never happen */
- while ((p = fork()) == -1) {
- warn_cannot("fork, sleeping");
+ while ((p =
v
fork()) == -1) {
+ warn_cannot("
v
fork, sleeping");
sleep(5);
}
if (p == 0) {
/* child */
if (haslog) {
sleep(5);
}
if (p == 0) {
/* child */
if (haslog) {
+ /* NB: bug alert! right order is close, then dup2 */
if (s->islog) {
if (s->islog) {
- xdup2(logpipe[0], 0);
- close(logpipe[1]);
xchdir("./log");
xchdir("./log");
+ close(logpipe.wr);
+ xdup2(logpipe.rd, 0);
} else {
} else {
-
xdup2(logpipe[1], 1
);
-
close(logpipe[0]
);
+
close(logpipe.rd
);
+
xdup2(logpipe.wr, 1
);
}
}
}
}
- signal(SIGCHLD, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
+ /* Non-ignored signals revert to SIG_DFL on exec anyway */
+ /*bb_signals(0
+ + (1 << SIGCHLD)
+ + (1 << SIGTERM)
+ , SIG_DFL);*/
sig_unblock(SIGCHLD);
sig_unblock(SIGTERM);
sig_unblock(SIGCHLD);
sig_unblock(SIGTERM);
- exec
vp(*run, run
);
- fatal2_cannot(s->islog ? "start log/" : "start ",
*
run);
+ exec
l(run, run, (char *) NULL
);
+ fatal2_cannot(s->islog ? "start log/" : "start ", run);
}
}
+ /* parent */
if (s->state != S_FINISH) {
gettimeofday_ns(&s->start);
s->state = S_RUN;
if (s->state != S_FINISH) {
gettimeofday_ns(&s->start);
s->state = S_RUN;
@@
-403,8
+394,7
@@
static int ctrl(struct svdir *s, char c)
case 'c': /* sig cont */
if (s->pid && !custom(s, c))
kill(s->pid, SIGCONT);
case 'c': /* sig cont */
if (s->pid && !custom(s, c))
kill(s->pid, SIGCONT);
- if (s->ctrl & C_PAUSE)
- s->ctrl &= ~C_PAUSE;
+ s->ctrl &= ~C_PAUSE;
update_status(s);
break;
case 'o': /* once */
update_status(s);
break;
case 'o': /* once */
@@
-439,8
+429,8
@@
static int ctrl(struct svdir *s, char c)
return 1;
}
return 1;
}
-int runsv_main(int argc, char **argv);
-int runsv_main(int argc, char **argv)
+int runsv_main(int argc, char **argv)
MAIN_EXTERNALLY_VISIBLE
;
+int runsv_main(int argc
UNUSED_PARAM
, char **argv)
{
struct stat s;
int fd;
{
struct stat s;
int fd;
@@
-453,16
+443,16
@@
int runsv_main(int argc, char **argv)
bb_show_usage();
dir = argv[1];
bb_show_usage();
dir = argv[1];
- xpipe(selfpipe);
- close_on_exec_on(selfpipe
[0]
);
- close_on_exec_on(selfpipe
[1]
);
- ndelay_on(selfpipe
[0]
);
- ndelay_on(selfpipe
[1]
);
+ xpipe
d_pair
(selfpipe);
+ close_on_exec_on(selfpipe
.rd
);
+ close_on_exec_on(selfpipe
.wr
);
+ ndelay_on(selfpipe
.rd
);
+ ndelay_on(selfpipe
.wr
);
sig_block(SIGCHLD);
sig_block(SIGCHLD);
-
sig_catch(
SIGCHLD, s_child);
+
bb_signals_recursive_norestart(1 <<
SIGCHLD, s_child);
sig_block(SIGTERM);
sig_block(SIGTERM);
-
sig_catch(
SIGTERM, s_term);
+
bb_signals_recursive_norestart(1 <<
SIGTERM, s_term);
xchdir(dir);
/* bss: svd[0].pid = 0; */
xchdir(dir);
/* bss: svd[0].pid = 0; */
@@
-490,9
+480,9
@@
int runsv_main(int argc, char **argv)
gettimeofday_ns(&svd[1].start);
if (stat("log/down", &s) != -1)
svd[1].want = W_DOWN;
gettimeofday_ns(&svd[1].start);
if (stat("log/down", &s) != -1)
svd[1].want = W_DOWN;
- xpipe(logpipe);
- close_on_exec_on(logpipe
[0]
);
- close_on_exec_on(logpipe
[1]
);
+ xpipe
d_pair
(logpipe);
+ close_on_exec_on(logpipe
.rd
);
+ close_on_exec_on(logpipe
.wr
);
}
}
}
}
@@
-573,7
+563,7
@@
int runsv_main(int argc, char **argv)
if (svd[0].want == W_UP || svd[0].state == S_FINISH)
startservice(&svd[0]);
if (svd[0].want == W_UP || svd[0].state == S_FINISH)
startservice(&svd[0]);
- x[0].fd = selfpipe
[0]
;
+ x[0].fd = selfpipe
.rd
;
x[0].events = POLLIN;
x[1].fd = svd[0].fdcontrol;
x[1].events = POLLIN;
x[0].events = POLLIN;
x[1].fd = svd[0].fdcontrol;
x[1].events = POLLIN;
@@
-586,14
+576,14
@@
int runsv_main(int argc, char **argv)
sig_block(SIGTERM);
sig_block(SIGCHLD);
sig_block(SIGTERM);
sig_block(SIGCHLD);
- while (read(selfpipe
[0]
, &ch, 1) == 1)
+ while (read(selfpipe
.rd
, &ch, 1) == 1)
continue;
for (;;) {
continue;
for (;;) {
-
in
t child;
+
pid_
t child;
int wstat;
int wstat;
- child = wait_nohang(&wstat);
+ child = wait_
any_
nohang(&wstat);
if (!child)
break;
if ((child == -1) && (errno != EINTR))
if (!child)
break;
if ((child == -1) && (errno != EINTR))
@@
-631,7
+621,7
@@
int runsv_main(int argc, char **argv)
sleep(1);
}
}
sleep(1);
}
}
- }
+ }
/* for (;;) */
if (read(svd[0].fdcontrol, &ch, 1) == 1)
ctrl(&svd[0], ch);
if (haslog)
if (read(svd[0].fdcontrol, &ch, 1) == 1)
ctrl(&svd[0], ch);
if (haslog)
@@
-645,16
+635,16
@@
int runsv_main(int argc, char **argv)
if (svd[0].want == W_EXIT && svd[0].state == S_DOWN) {
if (svd[1].pid == 0)
if (svd[0].want == W_EXIT && svd[0].state == S_DOWN) {
if (svd[1].pid == 0)
- _exit(
0
);
+ _exit(
EXIT_SUCCESS
);
if (svd[1].want != W_EXIT) {
svd[1].want = W_EXIT;
/* stopservice(&svd[1]); */
update_status(&svd[1]);
if (svd[1].want != W_EXIT) {
svd[1].want = W_EXIT;
/* stopservice(&svd[1]); */
update_status(&svd[1]);
- close(logpipe
[1]
);
- close(logpipe
[0]
);
+ close(logpipe
.wr
);
+ close(logpipe
.rd
);
}
}
}
}
- }
+ }
/* for (;;) */
/* not reached */
return 0;
}
/* not reached */
return 0;
}