utrace: Sort syscalls by number of invocations

[project/procd.git] / rcS.c

diff --git a/rcS.c b/rcS.c
index 0e1b0ba..b1202bf 100644 (file)
--- a/rcS.c
+++ b/rcS.c
@@ -24,6 +24,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <fcntl.h>

 #include <glob.h>
 
 #include <libubox/ustream.h>
 #include <glob.h>
 
 #include <libubox/ustream.h>


@@ -42,6 +43,7 @@ struct initd {
 
 static void pipe_cb(struct ustream *s, int bytes)
 {
 
 static void pipe_cb(struct ustream *s, int bytes)
 {

+       struct initd *initd = container_of(s, struct initd, fd.stream);

        char *newline, *str;
        int len;
 
        char *newline, *str;
        int len;
 


@@ -54,7 +56,10 @@ static void pipe_cb(struct ustream *s, int bytes)
                        break;
                *newline = 0;
                len = newline + 1 - str;
                        break;
                *newline = 0;
                len = newline + 1 - str;

-               syslog(0, "%s", str);
+               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);
 }
                ustream_consume(s, len);
        } while (1);
 }


@@ -77,6 +82,7 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
 
        if (pid) {
                close(pipefd[1]);
 
        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);
                s->fd.stream.string_data = true,
                s->fd.stream.notify_read = pipe_cb,
                runqueue_process_add(q, &s->proc, pid);


@@ -84,9 +90,15 @@ static void q_initd_run(struct runqueue *q, struct runqueue_task *t)
                return;
        }
        close(pipefd[0]);
                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);
 
        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);
 }
        execlp(s->file, s->file, s->param, NULL);
        exit(1);
 }


@@ -112,10 +124,16 @@ static void add_initd(struct runqueue *q, char *file, char *param)
        char *p, *f;
 
        s = calloc_a(sizeof(*s), &f, strlen(file) + 1, &p, strlen(param) + 1);
        char *p, *f;
 
        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->proc.task.type = &initd_type;
        s->proc.task.complete = q_initd_complete;

-       if (!strcmp(param, "stop"))
+       if (!strcmp(param, "stop") || !strcmp(param, "shutdown")) {

                s->proc.task.run_timeout = 15000;
                s->proc.task.run_timeout = 15000;

+               s->proc.task.cancel_timeout = 10000;
+       }

        s->param = p;
        s->file = f;
        strcpy(s->param, param);
        s->param = p;
        s->file = f;
        strcpy(s->param, param);


@@ -129,6 +147,11 @@ static int _rc(struct runqueue *q, char *path, const char *file, char *pattern,
        glob_t gl;
        int j;
 
        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);
        sprintf(dir, "%s/%s%s", path, file, pattern);
        if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {
        DEBUG(2, "running %s/%s%s %s\n", path, file, pattern, param);
        sprintf(dir, "%s/%s%s", path, file, pattern);
        if (glob(dir, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl)) {