X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fprocd.git;a=blobdiff_plain;f=rcS.c;h=c2e1abb5d44a433cf541f307aad5bc0cb772e947;hp=4ecf0c10d7da1392c905717c2f15906ea6f5fe6e;hb=653629f19e591a0827ab39de07b4526bb119a57a;hpb=992b796204caf5b0290ea4a1246b43b353b6c1d7;ds=sidebyside

diff --git a/rcS.c b/rcS.c
index 4ecf0c1..c2e1abb 100644
--- a/rcS.c
+++ b/rcS.c
@@ -37,6 +37,7 @@ static struct runqueue q, r;
 struct initd {
 	struct ustream_fd fd;
 	struct runqueue_process proc;
+	struct timespec ts_start;
 	char *file;
 	char *param;
 };
@@ -70,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;
 	}
 
@@ -82,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);
@@ -105,8 +108,17 @@ 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);