force all runqueue tasks to a timeout of 15s

[project/procd.git] / rcS.c

diff --git a/rcS.c b/rcS.c
index ae8f08e..039b595 100644 (file)
--- a/rcS.c
+++ b/rcS.c
@@ -110,24 +110,27 @@ static void add_initd(struct runqueue *q, char *file, char *param)
                .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);
        s->proc.task.type = &initd_type;
        s->proc.task.complete = q_initd_complete;
-       s->param = param;
-       s->file = file;
+       s->proc.task.run_timeout = 15000;
+       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;
 
-
        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;
@@ -136,6 +139,8 @@ static int _rc(struct runqueue *q, char *path, const char *file, char *pattern,
        for (j = 0; j < gl.gl_pathc; j++)
                add_initd(q, gl.gl_pathv[j], param);
 
+       globfree(&gl);
+
        return 0;
 }
 
@@ -158,8 +163,8 @@ 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;
 }