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

Diff of /trunk/mkinitrd-magellan/busybox/runit/sv.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 228 
 static int svstatus_get(void)
  			             : failx("runsv not running");
  			return 0;
  		}
- 		warn("cannot open supervise/ok");
+ 		warn("can't open supervise/ok");
  		return -1;
  	}
  	close(fd);
  	fd = open_read("supervise/status");
  	if (fd == -1) {
- 		warn("cannot open supervise/status");
+ 		warn("can't open supervise/status");
  		return -1;
  	}
  	r = read(fd, &svstatus, 20);
 Line 243 
 static int svstatus_get(void)
  	case 20:
  		break;
  	case -1:
- 		warn("cannot read supervise/status");
+ 		warn("can't read supervise/status");
  		return -1;
  	default:
  		errno = 0;
- 		warn("cannot read supervise/status: bad format");
+ 		warn("can't read supervise/status: bad format");
  		return -1;
  	}
  	return 1;
 Line 263 
 static unsigned svstatus_print(const cha
  	if (stat("down", &s) == -1) {
  		if (errno != ENOENT) {
- 			bb_perror_msg(WARN"cannot stat %s/down", *service);
+ 			bb_perror_msg(WARN"can't stat %s/down", *service);
  			return 0;
  		}
  		normallyup = 1;
 Line 297 
 static int status(const char *unused UNU
  {
  	int r;
- 	r = svstatus_get();
+ 	if (svstatus_get() <= 0)
- 	switch (r) { case -1: case 0: return 0; }
+ 		return 0;
  	r = svstatus_print(*service);
  	if (chdir("log") == -1) {
  		if (errno != ENOENT) {
- 			printf("; log: "WARN"cannot change to log service directory: %s",
+ 			printf("; log: "WARN"can't change to log service directory: %s",
  					strerror(errno));
  		}
  	} else if (svstatus_get()) {
 Line 322 
 static int checkscript(void)
  	if (stat("check", &s) == -1) {
  		if (errno == ENOENT) return 1;
- 		bb_perror_msg(WARN"cannot stat %s/check", *service);
+ 		bb_perror_msg(WARN"can't stat %s/check", *service);
  		return 0;
  	}
  	/* if (!(s.st_mode & S_IXUSR)) return 1; */
 Line 330 
 static int checkscript(void)
  	prog[1] = NULL;
  	pid = spawn(prog);
  	if (pid <= 0) {
- 		bb_perror_msg(WARN"cannot %s child %s/check", "run", *service);
+ 		bb_perror_msg(WARN"can't %s child %s/check", "run", *service);
  		return 0;
  	}
  	while (safe_waitpid(pid, &w, 0) == -1) {
- 		bb_perror_msg(WARN"cannot %s child %s/check", "wait for", *service);
+ 		bb_perror_msg(WARN"can't %s child %s/check", "wait for", *service);
  		return 0;
  	}
- 	return !wait_exitcode(w);
+ 	return WEXITSTATUS(w) == 0;
  }
  static int check(const char *a)
  {
  	int r;
- 	unsigned pid;
+ 	unsigned pid_le32;
  	uint64_t timestamp;
  	r = svstatus_get();
 Line 354 
 static int check(const char *a)
  			return 1;
  		return -1;
  	}
- 	pid = SWAP_LE32(svstatus.pid_le32);
+ 	pid_le32 = svstatus.pid_le32;
  	switch (*a) {
  	case 'x':
  		return 0;
  	case 'u':
- 		if (!pid || svstatus.run_or_finish != 1) return 0;
+ 		if (!pid_le32 || svstatus.run_or_finish != 1) return 0;
  		if (!checkscript()) return 0;
  		break;
  	case 'd':
- 		if (pid) return 0;
+ 		if (pid_le32) return 0;
  		break;
  	case 'c':
- 		if (pid && !checkscript()) return 0;
+ 		if (pid_le32 && !checkscript()) return 0;
  		break;
  	case 't':
- 		if (!pid && svstatus.want == 'd') break;
+ 		if (!pid_le32 && svstatus.want == 'd') break;
  		timestamp = SWAP_BE64(svstatus.time_be64);
- 		if ((tstart > timestamp) || !pid || svstatus.got_term || !checkscript())
+ 		if ((tstart > timestamp) || !pid_le32 || svstatus.got_term || !checkscript())
  			return 0;
  		break;
  	case 'o':
  		timestamp = SWAP_BE64(svstatus.time_be64);
- 		if ((!pid && tstart > timestamp) || (pid && svstatus.want != 'd'))
+ 		if ((!pid_le32 && tstart > timestamp) || (pid_le32 && svstatus.want != 'd'))
  			return 0;
  	}
  	printf(OK);
 Line 387 
 static int check(const char *a)
  static int control(const char *a)
  {
- 	int fd, r;
+ 	int fd, r, l;
+ /* Is it an optimization?
+    It causes problems with "sv o SRV; ...; sv d SRV"
+    ('d' is not passed to SRV because its .want == 'd'):
  	if (svstatus_get() <= 0)
  		return -1;
  	if (svstatus.want == *a)
  		return 0;
+ */
  	fd = open_write("supervise/control");
  	if (fd == -1) {
  		if (errno != ENODEV)
- 			warn("cannot open supervise/control");
+ 			warn("can't open supervise/control");
  		else
  			*a == 'x' ? ok("runsv not running") : failx("runsv not running");
  		return -1;
  	}
- 	r = write(fd, a, strlen(a));
+ 	l = strlen(a);
+ 	r = write(fd, a, l);
  	close(fd);
- 	if (r != strlen(a)) {
+ 	if (r != l) {
- 		warn("cannot write to supervise/control");
+ 		warn("can't write to supervise/control");
  		return -1;
  	}
  	return 1;
  }
  int sv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int sv_main(int argc, char **argv)
+ int sv_main(int argc UNUSED_PARAM, char **argv)
  {
  	unsigned opt;
- 	unsigned i, want_exit;
  	char *x;
  	char *action;
  	const char *varservice = CONFIG_SV_DEFAULT_SERVICE_DIR;
- 	unsigned services;
- 	char **servicex;
  	unsigned waitsec = 7;
  	smallint kll = 0;
  	int verbose = 0;
-Line 438 
 int sv_main(int argc, char **argv)
+Line 440 
 int sv_main(int argc, char **argv)
  	opt_complementary = "w+:vv"; /* -w N, -v is a counter */
  	opt = getopt32(argv, "w:v", &waitsec, &verbose);
- 	argc -= optind;
  	argv += optind;
  	action = *argv++;
  	if (!action || !*argv) bb_show_usage();
- 	service = argv;
- 	services = argc - 1;
- 	tnow = time(0) + 0x400000000000000aULL;
+ 	tnow = time(NULL) + 0x400000000000000aULL;
  	tstart = tnow;
  	curdir = open_read(".");
  	if (curdir == -1)
-Line 534 
 int sv_main(int argc, char **argv)
+Line 533 
 int sv_main(int argc, char **argv)
  		bb_show_usage();
  	}
- 	servicex = service;
+ 	service = argv;
- 	for (i = 0; i < services; ++i) {
+ 	while ((x = *service) != NULL) {
- 		if ((**service != '/') && (**service != '.')) {
+ 		if (x[0] != '/' && x[0] != '.') {
  			if (chdir(varservice) == -1)
  				goto chdir_failed_0;
  		}
- 		if (chdir(*service) == -1) {
+ 		if (chdir(x) == -1) {
   chdir_failed_0:
- 			fail("cannot change to service directory");
+ 			fail("can't change to service directory");
  			goto nullify_service_0;
  		}
  		if (act && (act(acts) == -1)) {
   nullify_service_0:
- 			*service = NULL;
+ 			*service = (char*) -1L; /* "dead" */
  		}
  		if (fchdir(curdir) == -1)
  			fatal_cannot("change to original directory");
-Line 555 
 int sv_main(int argc, char **argv)
+Line 554 
 int sv_main(int argc, char **argv)
  	}
  	if (cbk) while (1) {
+ 		int want_exit;
  		int diff;
  		diff = tnow - tstart;
- 		service = servicex;
+ 		service = argv;
  		want_exit = 1;
- 		for (i = 0; i < services; ++i, ++service) {
+ 		while ((x = *service) != NULL) {
- 			if (!*service)
+ 			if (x == (char*) -1L) /* "dead" */
- 				continue;
+ 				goto next;
- 			if ((**service != '/') && (**service != '.')) {
+ 			if (x[0] != '/' && x[0] != '.') {
  				if (chdir(varservice) == -1)
  					goto chdir_failed;
  			}
- 			if (chdir(*service) == -1) {
+ 			if (chdir(x) == -1) {
   chdir_failed:
- 				fail("cannot change to service directory");
+ 				fail("can't change to service directory");
  				goto nullify_service;
  			}
  			if (cbk(acts) != 0)
 Line 578 
 int sv_main(int argc, char **argv)
  			if (diff >= waitsec) {
  				printf(kll ? "kill: " : "timeout: ");
  				if (svstatus_get() > 0) {
- 					svstatus_print(*service);
+ 					svstatus_print(x);
  					++rc;
  				}
  				bb_putchar('\n'); /* will also flush the output */
  				if (kll)
  					control("k");
   nullify_service:
- 				*service = NULL;
+ 				*service = (char*) -1L; /* "dead" */
  			}
  			if (fchdir(curdir) == -1)
  				fatal_cannot("change to original directory");
+  next:
+ 			service++;
  		}
  		if (want_exit) break;
  		usleep(420000);
- 		tnow = time(0) + 0x400000000000000aULL;
+ 		tnow = time(NULL) + 0x400000000000000aULL;
  	}
  	return rc > 99 ? 99 : rc;
  }

 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