trigger: replace trigger_init() with static runqueue initialization

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/procd.c b/procd.c
index a7ac6c18af999520370a19b54c7e1680e305b7b2..dd4909ea4168f3b8e5acdd4afdcd27697d76a4d8 100644 (file)
--- a/procd.c
+++ b/procd.c
@@ -73,7 +73,6 @@ int main(int argc, char **argv)
        setsid();
        uloop_init();
        procd_signal();
-       trigger_init();
        if (getpid() != 1)
                procd_connect_ubus();
        else

diff --git a/procd.h b/procd.h
index e87c87a917016af7829c95d6ba4e6d11f50b0765..88886a3e13eab2a566514bd69c6210c6a7bcd6e0 100644 (file)
--- a/procd.h
+++ b/procd.h
@@ -46,7 +46,6 @@ void procd_inittab_run(const char *action);
 void procd_bcast_event(char *event, struct blob_attr *msg);
 
 struct trigger;
-void trigger_init(void);
 void trigger_event(const char *type, struct blob_attr *data);
 void trigger_add(struct blob_attr *rule, void *id);
 void trigger_del(void *id);

diff --git a/service/trigger.c b/service/trigger.c
index 042b3b6aa6d76a8d5ac6ec3cdcd353eb2879da69..55d07e4dfa9b1611eb90b540befc32513d31656e 100644 (file)
--- a/service/trigger.c
+++ b/service/trigger.c
@@ -62,7 +62,7 @@ struct job {
 };
 
 static LIST_HEAD(triggers);
-static struct runqueue q;
+static RUNQUEUE(q, 1);
 
 static const char* rule_handle_var(struct json_script_ctx *ctx, const char *name, struct blob_attr *vars)
 {
@@ -312,12 +312,6 @@ void trigger_del(void *id)
        }
 }
 
-void trigger_init(void)
-{
-       runqueue_init(&q);
-       q.max_running_tasks = 1;
-}
-
 static bool trigger_match(const char *event, const char *match)
 {
        char *wildcard = strstr(match, ".*");