X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=rcS.c;h=c2e1abb5d44a433cf541f307aad5bc0cb772e947;hp=d6a3f7c428fb9eba4e0d1c0efd56dd982cbd8211;hb=653629f19e591a0827ab39de07b4526bb119a57a;hpb=2397901d9d5cdc1ccf42777036e70fe9248182a0

diff --git a/rcS.c b/rcS.c
index d6a3f7c..c2e1abb 100644
--- a/rcS.c
+++ b/rcS.c
@@ -24,6 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <glob.h>
 
 #include <libubox/ustream.h>
@@ -36,13 +37,14 @@ static struct runqueue q, r;
 struct initd {
 	struct ustream_fd fd;
 	struct runqueue_process proc;
+	struct timespec ts_start;
 	char *file;
 	char *param;
 };
 
 static void pipe_cb(struct ustream *s, int bytes)
 {
-	struct ustream_buf *buf = s->r.head;
+	struct initd *initd = container_of(s, struct initd, fd.stream);
 	char *newline, *str;
 	int len;
 
@@ -50,12 +52,15 @@ static void pipe_cb(struct ustream *s, int bytes)
 		str = ustream_get_read_buf(s, NULL);
 		if (!str)
 			break;
-		newline = strchr(buf->data, '\n');
+		newline = strchr(str, '\n');
 		if (!newline)
 			break;
 		*newline = 0;
 		len = newline + 1 - str;
-		syslog(0, buf->data);
+		ULOG_NOTE("%s: %s", initd->file, str);
+#ifdef SHOW_BOOT_ON_CONSOLE
+		fprintf(stderr, "%s: %s\n", initd->file, str);
+#endif
 		ustream_consume(s, len);
 	} while (1);
 }
@@ -66,9 +71,10 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 	int pipefd[2];
 	pid_t pid;
 
+	clock_gettime(CLOCK_MONOTONIC_RAW, &s->ts_start);
 	DEBUG(2, "start %s %s \n", s->file, s->param);
 	if (pipe(pipefd) == -1) {
-		ERROR("Failed to create pipe\n");
+		ERROR("Failed to create pipe: %m\n");
 		return;
 	}
 
@@ -78,6 +84,7 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 
 	if (pid) {
 		close(pipefd[1]);
+		fcntl(pipefd[0], F_SETFD, FD_CLOEXEC);
 		s->fd.stream.string_data = true,
 		s->fd.stream.notify_read = pipe_cb,
 		runqueue_process_add(q, &s->proc, pid);
@@ -85,9 +92,15 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 		return;
 	}
 	close(pipefd[0]);
+
+	int devnull = open("/dev/null", O_RDONLY);
+	dup2(devnull, STDIN_FILENO);
 	dup2(pipefd[1], STDOUT_FILENO);
 	dup2(pipefd[1], STDERR_FILENO);
 
+	if (devnull > STDERR_FILENO)
+		close(devnull);
+
 	execlp(s->file, s->file, s->param, NULL);
 	exit(1);
 }
@@ -95,14 +108,23 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 static void q_initd_complete(struct runqueue *q, struct runqueue_task *p)
 {
 	struct initd *s = container_of(p, struct initd, proc.task);
+	struct timespec ts_stop, ts_res;
+
+	clock_gettime(CLOCK_MONOTONIC_RAW, &ts_stop);
+	ts_res.tv_sec = ts_stop.tv_sec - s->ts_start.tv_sec;
+	ts_res.tv_nsec = ts_stop.tv_nsec - s->ts_start.tv_nsec;
+	if (ts_res.tv_nsec < 0) {
+		--ts_res.tv_sec;
+		ts_res.tv_nsec += 1000000000;
+	}
 
-	DEBUG(2, "stop %s %s \n", s->file, s->param);
+	DEBUG(2, "stop %s %s - took %lu.%09lus\n", s->file, s->param, ts_res.tv_sec, ts_res.tv_nsec);
 	ustream_free(&s->fd.stream);
 	close(s->fd.fd.fd);
 	free(s);
 }
 
-static void add_initd(struct runqueue *q, char *file, char *param, int first)
+static void add_initd(struct runqueue *q, char *file, char *param)
 {
 	static const struct runqueue_task_type initd_type = {
 		.run = q_initd_run,
@@ -110,34 +132,48 @@ static void add_initd(struct runqueue *q, char *file, char *param, int first)
 		.kill = runqueue_process_kill_cb,
 	};
 	struct initd *s;
+	char *p, *f;
 
-	s = calloc(1, sizeof(*s));
+	s = calloc_a(sizeof(*s), &f, strlen(file) + 1, &p, strlen(param) + 1);
+	if (!s) {
+		ERROR("Out of memory in %s.\n", file);
+		return;
+	}
 	s->proc.task.type = &initd_type;
 	s->proc.task.complete = q_initd_complete;
-	s->param = param;
-	s->file = file;
-	if (first)
-		runqueue_task_add_first(q, &s->proc.task, false);
-	else
-		runqueue_task_add(q, &s->proc.task, false);
+	if (!strcmp(param, "stop") || !strcmp(param, "shutdown")) {
+		s->proc.task.run_timeout = 15000;
+		s->proc.task.cancel_timeout = 10000;
+	}
+	s->param = p;
+	s->file = f;
+	strcpy(s->param, param);
+	strcpy(s->file, file);
+	runqueue_task_add(q, &s->proc.task, false);
 }
 
 static int _rc(struct runqueue *q, char *path, const char *file, char *pattern, char *param)
 {
-	char dir[64];
+	char *dir = alloca(2 + strlen(path) + strlen(file) + strlen(pattern));
 	glob_t gl;
 	int j;
 
+	if (!dir) {
+		ERROR("Out of memory in %s.\n", file);
+		return -1;
+	}
 
 	DEBUG(2, "running %s/%s%s %s\n", path, file, pattern, param);
-	snprintf(dir, sizeof(dir), "%s/%s%s", path, file, pattern);
+	sprintf(dir, "%s/%s%s", path, file, pattern);
 	if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {
 		DEBUG(2, "glob failed on %s\n", dir);
 		return -1;
 	}
 
 	for (j = 0; j < gl.gl_pathc; j++)
-		add_initd(q, gl.gl_pathv[j], param, 0);
+		add_initd(q, gl.gl_pathv[j], param);
+
+	globfree(&gl);
 
 	return 0;
 }
@@ -156,23 +192,13 @@ int rc(const char *file, char *param)
 	return _rc(&r, "/etc/init.d", file, "", param);
 }
 
-int rcnow(const char *file, char *param)
-{
-	char path[64] = { 0 };
-
-	snprintf(path, sizeof(path), "/etc/init.d/%s", file);
-	add_initd(&r, path, param, 0);
-
-	return 0;
-}
-
 static void r_empty(struct runqueue *q)
 {
 
 }
 
-static void __attribute__((constructor)) measure_init() {
+static void __attribute__((constructor)) rc_init() {
 	runqueue_init(&r);
 	r.empty_cb = r_empty;
-	r.max_running_tasks = 1;
+	r.max_running_tasks = 8;
 }