/[magellan-source]/trunk/mkinitrd-magellan/busybox/runit/runsv.c

Diff of /trunk/mkinitrd-magellan/busybox/runit/runsv.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 78 
 struct svdir {
  	int pid;
  	smallint state;
  	smallint ctrl;
- 	smallint want;
+ 	smallint sd_want;
  	smallint islog;
  	struct timespec start;
  	int fdlock;
  	int fdcontrol;
  	int fdcontrolwrite;
+ 	int wstat;
  };
  struct globals {
-Line 138 
 static void s_term(int sig_no UNUSED_PAR
+Line 139 
 static void s_term(int sig_no UNUSED_PAR
  	write(selfpipe.wr, "", 1); /* XXX */
  }
- static char *add_str(char *p, const char *to_add)
+ /* libbb candidate */
+ static char *bb_stpcpy(char *p, const char *to_add)
  {
  	while ((*p = *to_add) != '\0') {
  		p++;
-Line 189 
 static void update_status(struct svdir *
+Line 191 
 static void update_status(struct svdir *
  		char *p = stat_buf;
  		switch (s->state) {
  		case S_DOWN:
- 			p = add_str(p, "down");
+ 			p = bb_stpcpy(p, "down");
  			break;
  		case S_RUN:
- 			p = add_str(p, "run");
+ 			p = bb_stpcpy(p, "run");
  			break;
  		case S_FINISH:
- 			p = add_str(p, "finish");
+ 			p = bb_stpcpy(p, "finish");
  			break;
  		}
- 		if (s->ctrl & C_PAUSE) p = add_str(p, ", paused");
+ 		if (s->ctrl & C_PAUSE)
- 		if (s->ctrl & C_TERM) p = add_str(p, ", got TERM");
+ 			p = bb_stpcpy(p, ", paused");
+ 		if (s->ctrl & C_TERM)
+ 			p = bb_stpcpy(p, ", got TERM");
  		if (s->state != S_DOWN)
- 			switch (s->want) {
+ 			switch (s->sd_want) {
  			case W_DOWN:
- 				p = add_str(p, ", want down");
+ 				p = bb_stpcpy(p, ", want down");
  				break;
  			case W_EXIT:
- 				p = add_str(p, ", want exit");
+ 				p = bb_stpcpy(p, ", want exit");
  				break;
  			}
  		*p++ = '\n';
-Line 224 
 static void update_status(struct svdir *
+Line 228 
 static void update_status(struct svdir *
  	status.pid_le32 = SWAP_LE32(s->pid);
  	if (s->ctrl & C_PAUSE)
  		status.paused = 1;
- 	if (s->want == W_UP)
+ 	if (s->sd_want == W_UP)
  		status.want = 'u';
  	else
  		status.want = 'd';
-Line 251 
 static unsigned custom(struct svdir *s,
+Line 255 
 static unsigned custom(struct svdir *s,
  	int w;
  	char a[10];
  	struct stat st;
- 	char *prog[2];
- 	if (s->islog) return 0;
+ 	if (s->islog)
+ 		return 0;
  	strcpy(a, "control/?");
  	a[8] = c; /* replace '?' */
  	if (stat(a, &st) == 0) {
-Line 263 
 static unsigned custom(struct svdir *s,
+Line 267 
 static unsigned custom(struct svdir *s,
  				warn_cannot("vfork for control/?");
  				return 0;
  			}
- 			if (!pid) {
+ 			if (pid == 0) {
  				/* child */
  				if (haslog && dup2(logpipe.wr, 1) == -1)
  					warn_cannot("setup stdout for control/?");
- 				prog[0] = a;
+ 				execl(a, a, (char *) NULL);
- 				prog[1] = NULL;
- 				execv(a, prog);
  				fatal_cannot("run control/?");
  			}
  			/* parent */
- 			while (safe_waitpid(pid, &w, 0) == -1) {
+ 			if (safe_waitpid(pid, &w, 0) == -1) {
  				warn_cannot("wait for child control/?");
  				return 0;
  			}
- 			return !wait_exitcode(w);
+ 			return WEXITSTATUS(w) == 0;
  		}
  	} else {
  		if (errno != ENOENT)
-Line 293 
 static void stopservice(struct svdir *s)
+Line 295 
 static void stopservice(struct svdir *s)
  		s->ctrl |= C_TERM;
  		update_status(s);
  	}
- 	if (s->want == W_DOWN) {
+ 	if (s->sd_want == W_DOWN) {
  		kill(s->pid, SIGCONT);
  		custom(s, 'd');
  		return;
  	}
- 	if (s->want == W_EXIT) {
+ 	if (s->sd_want == W_EXIT) {
  		kill(s->pid, SIGCONT);
  		custom(s, 'x');
  	}
-Line 307 
 static void stopservice(struct svdir *s)
+Line 309 
 static void stopservice(struct svdir *s)
  static void startservice(struct svdir *s)
  {
  	int p;
- 	char *run[2];
+ 	const char *arg[4];
+ 	char exitcode[sizeof(int)*3 + 2];
- 	if (s->state == S_FINISH)
+ 	if (s->state == S_FINISH) {
- 		run[0] = (char*)"./finish";
+ /* Two arguments are given to ./finish. The first one is ./run exit code,
- 	else {
+  * or -1 if ./run didnt exit normally. The second one is
- 		run[0] = (char*)"./run";
+  * the least significant byte of the exit status as determined by waitpid;
+  * for instance it is 0 if ./run exited normally, and the signal number
+  * if ./run was terminated by a signal. If runsv cannot start ./run
+  * for some reason, the exit code is 111 and the status is 0.
+  */
+ 		arg[0] = "./finish";
+ 		arg[1] = "-1";
+ 		if (WIFEXITED(s->wstat)) {
+ 			*utoa_to_buf(WEXITSTATUS(s->wstat), exitcode, sizeof(exitcode)) = '\0';
+ 			arg[1] = exitcode;
+ 		}
+ 		//arg[2] = "0";
+ 		//if (WIFSIGNALED(s->wstat)) {
+ 			arg[2] = utoa(WTERMSIG(s->wstat));
+ 		//}
+ 		arg[3] = NULL;
+ 	} else {
+ 		arg[0] = "./run";
+ 		arg[1] = NULL;
  		custom(s, 'u');
  	}
- 	run[1] = NULL;
  	if (s->pid != 0)
  		stopservice(s); /* should never happen */
-Line 343 
 static void startservice(struct svdir *s
+Line 363 
 static void startservice(struct svdir *s
  			, SIG_DFL);*/
  		sig_unblock(SIGCHLD);
  		sig_unblock(SIGTERM);
- 		execvp(*run, run);
+ 		execv(arg[0], (char**) arg);
- 		fatal2_cannot(s->islog ? "start log/" : "start ", *run);
+ 		fatal2_cannot(s->islog ? "start log/" : "start ", arg[0]);
  	}
  	/* parent */
  	if (s->state != S_FINISH) {
-Line 363 
 static int ctrl(struct svdir *s, char c)
+Line 383 
 static int ctrl(struct svdir *s, char c)
  	switch (c) {
  	case 'd': /* down */
- 		s->want = W_DOWN;
+ 		s->sd_want = W_DOWN;
  		update_status(s);
  		if (s->pid && s->state != S_FINISH)
  			stopservice(s);
  		break;
  	case 'u': /* up */
- 		s->want = W_UP;
+ 		s->sd_want = W_UP;
  		update_status(s);
  		if (s->pid == 0)
  			startservice(s);
-Line 377 
 static int ctrl(struct svdir *s, char c)
+Line 397 
 static int ctrl(struct svdir *s, char c)
  	case 'x': /* exit */
  		if (s->islog)
  			break;
- 		s->want = W_EXIT;
+ 		s->sd_want = W_EXIT;
  		update_status(s);
  		/* FALLTHROUGH */
  	case 't': /* sig term */
-Line 398 
 static int ctrl(struct svdir *s, char c)
+Line 418 
 static int ctrl(struct svdir *s, char c)
  	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 */
- 		s->want = W_DOWN;
+ 		s->sd_want = W_DOWN;
  		update_status(s);
  		if (!s->pid)
  			startservice(s);
-Line 444 
 int runsv_main(int argc UNUSED_PARAM, ch
+Line 463 
 int runsv_main(int argc UNUSED_PARAM, ch
  	INIT_G();
- 	if (!argv[1] || argv[2])
+ 	dir = single_argv(argv);
- 		bb_show_usage();
- 	dir = argv[1];
  	xpiped_pair(selfpipe);
  	close_on_exec_on(selfpipe.rd);
-Line 455 
 int runsv_main(int argc UNUSED_PARAM, ch
+Line 472 
 int runsv_main(int argc UNUSED_PARAM, ch
  	ndelay_on(selfpipe.wr);
  	sig_block(SIGCHLD);
- 	bb_signals_recursive(1 << SIGCHLD, s_child);
+ 	bb_signals_recursive_norestart(1 << SIGCHLD, s_child);
  	sig_block(SIGTERM);
- 	bb_signals_recursive(1 << SIGTERM, s_term);
+ 	bb_signals_recursive_norestart(1 << SIGTERM, s_term);
  	xchdir(dir);
  	/* bss: svd[0].pid = 0; */
  	if (S_DOWN) svd[0].state = S_DOWN; /* otherwise already 0 (bss) */
  	if (C_NOOP) svd[0].ctrl = C_NOOP;
- 	if (W_UP) svd[0].want = W_UP;
+ 	if (W_UP) svd[0].sd_want = W_UP;
  	/* bss: svd[0].islog = 0; */
  	/* bss: svd[1].pid = 0; */
  	gettimeofday_ns(&svd[0].start);
- 	if (stat("down", &s) != -1) svd[0].want = W_DOWN;
+ 	if (stat("down", &s) != -1)
+ 		svd[0].sd_want = W_DOWN;
  	if (stat("log", &s) == -1) {
  		if (errno != ENOENT)
-Line 480 
 int runsv_main(int argc UNUSED_PARAM, ch
+Line 498 
 int runsv_main(int argc UNUSED_PARAM, ch
  			haslog = 1;
  			svd[1].state = S_DOWN;
  			svd[1].ctrl = C_NOOP;
- 			svd[1].want = W_UP;
+ 			svd[1].sd_want = W_UP;
  			svd[1].islog = 1;
  			gettimeofday_ns(&svd[1].start);
  			if (stat("log/down", &s) != -1)
- 				svd[1].want = W_DOWN;
+ 				svd[1].sd_want = W_DOWN;
  			xpiped_pair(logpipe);
  			close_on_exec_on(logpipe.rd);
  			close_on_exec_on(logpipe.wr);
-Line 562 
 int runsv_main(int argc UNUSED_PARAM, ch
+Line 580 
 int runsv_main(int argc UNUSED_PARAM, ch
  		char ch;
  		if (haslog)
- 			if (!svd[1].pid && svd[1].want == W_UP)
+ 			if (!svd[1].pid && svd[1].sd_want == W_UP)
  				startservice(&svd[1]);
  		if (!svd[0].pid)
- 			if (svd[0].want == W_UP || svd[0].state == S_FINISH)
+ 			if (svd[0].sd_want == W_UP || svd[0].state == S_FINISH)
  				startservice(&svd[0]);
  		x[0].fd = selfpipe.rd;
-Line 594 
 int runsv_main(int argc UNUSED_PARAM, ch
+Line 612 
 int runsv_main(int argc UNUSED_PARAM, ch
  			if ((child == -1) && (errno != EINTR))
  				break;
  			if (child == svd[0].pid) {
+ 				svd[0].wstat = wstat;
  				svd[0].pid = 0;
  				pidchanged = 1;
- 				svd[0].ctrl &=~ C_TERM;
+ 				svd[0].ctrl &= ~C_TERM;
  				if (svd[0].state != S_FINISH) {
  					fd = open_read("finish");
  					if (fd != -1) {
-Line 615 
 int runsv_main(int argc UNUSED_PARAM, ch
+Line 634 
 int runsv_main(int argc UNUSED_PARAM, ch
  			}
  			if (haslog) {
  				if (child == svd[1].pid) {
+ 					svd[0].wstat = wstat;
  					svd[1].pid = 0;
  					pidchanged = 1;
  					svd[1].state = S_DOWN;
-Line 638 
 int runsv_main(int argc UNUSED_PARAM, ch
+Line 658 
 int runsv_main(int argc UNUSED_PARAM, ch
  			sigterm = 0;
  		}
- 		if (svd[0].want == W_EXIT && svd[0].state == S_DOWN) {
+ 		if (svd[0].sd_want == W_EXIT && svd[0].state == S_DOWN) {
  			if (svd[1].pid == 0)
  				_exit(EXIT_SUCCESS);
- 			if (svd[1].want != W_EXIT) {
+ 			if (svd[1].sd_want != W_EXIT) {
- 				svd[1].want = W_EXIT;
+ 				svd[1].sd_want = W_EXIT;
  				/* stopservice(&svd[1]); */
  				update_status(&svd[1]);
  				close(logpipe.wr);

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984