ncd: NCDModule: replace NCDModuleInst_Backend_Event with NCDModuleInst_Backend_Up,

NCDModuleInst_Backend_Down and NCDModuleInst_Backend_Dead

ncd/NCDModule.c

@@ -281,72 +281,77 @@ void NCDModuleInst_Backend_SetUser (NCDModuleInst *n, void *user)
     n->inst_user = user;
 }
 
-void NCDModuleInst_Backend_Event (NCDModuleInst *n, int event)
+void NCDModuleInst_Backend_Up (NCDModuleInst *n)
 {
     DebugObject_Access(&n->d_obj);
-    ASSERT(event == NCDMODULE_EVENT_UP || event == NCDMODULE_EVENT_DOWN || event == NCDMODULE_EVENT_DEAD)
-    
-    if (event == NCDMODULE_EVENT_UP) {
-        switch (n->state) {
-            case STATE_DOWN_CLEAN:
-            case STATE_DOWN_UNCLEAN: {
-                n->state = STATE_UP;
-                frontend_event(n, NCDMODULE_EVENT_UP);
-            } break;
-            
-            case STATE_DOWN_PCLEAN: {
-                n->state = STATE_UP;
-                BPending_Unset(&n->clean_job);
-                frontend_event(n, NCDMODULE_EVENT_UP);
-            } break;
-            
-            case STATE_DOWN_DIE: {
-                n->state = STATE_UP_DIE;
-            } break;
-            
-            default: ASSERT(0);
-        }
+    
+    switch (n->state) {
+        case STATE_DOWN_CLEAN:
+        case STATE_DOWN_UNCLEAN: {
+            n->state = STATE_UP;
+            frontend_event(n, NCDMODULE_EVENT_UP);
+        } break;
+        
+        case STATE_DOWN_PCLEAN: {
+            n->state = STATE_UP;
+            BPending_Unset(&n->clean_job);
+            frontend_event(n, NCDMODULE_EVENT_UP);
+        } break;
+        
+        case STATE_DOWN_DIE: {
+            n->state = STATE_UP_DIE;
+        } break;
+        
+        default: ASSERT(0);
     }
-    else if (event == NCDMODULE_EVENT_DOWN) {
-        switch (n->state) {
-            case STATE_UP: {
-                n->state = STATE_DOWN_UNCLEAN;
-                frontend_event(n, NCDMODULE_EVENT_DOWN);
-            } break;
-            
-            case STATE_UP_DIE: {
-                n->state = STATE_DOWN_DIE;
-            } break;
-            
-            default: ASSERT(0);
-        }
+}
+
+void NCDModuleInst_Backend_Down (NCDModuleInst *n)
+{
+    DebugObject_Access(&n->d_obj);
+    
+    switch (n->state) {
+        case STATE_UP: {
+            n->state = STATE_DOWN_UNCLEAN;
+            frontend_event(n, NCDMODULE_EVENT_DOWN);
+        } break;
+        
+        case STATE_UP_DIE: {
+            n->state = STATE_DOWN_DIE;
+        } break;
+        
+        default: ASSERT(0);
     }
-    else if (event == NCDMODULE_EVENT_DEAD) {
-        switch (n->state) {
-            case STATE_DOWN_DIE:
-            case STATE_UP_DIE: {
-                n->state = STATE_DEAD;
-                BPending_Unset(&n->die_job);
-            } break;
-            
-            case STATE_DOWN_CLEAN:
-            case STATE_DOWN_UNCLEAN:
-            case STATE_UP:
-            case STATE_DYING: {
-                n->state = STATE_DEAD;
-            } break;
-            
-            case STATE_DOWN_PCLEAN: {
-                n->state = STATE_DEAD;
-                BPending_Unset(&n->clean_job);
-            } break;
-            
-            default: ASSERT(0);
-        }
+}
+
+void NCDModuleInst_Backend_Dead (NCDModuleInst *n)
+{
+    DebugObject_Access(&n->d_obj);
+    
+    switch (n->state) {
+        case STATE_DOWN_DIE:
+        case STATE_UP_DIE: {
+            n->state = STATE_DEAD;
+            BPending_Unset(&n->die_job);
+        } break;
         
-        frontend_event(n, NCDMODULE_EVENT_DEAD);
-        return;
+        case STATE_DOWN_CLEAN:
+        case STATE_DOWN_UNCLEAN:
+        case STATE_UP:
+        case STATE_DYING: {
+            n->state = STATE_DEAD;
+        } break;
+        
+        case STATE_DOWN_PCLEAN: {
+            n->state = STATE_DEAD;
+            BPending_Unset(&n->clean_job);
+        } break;
+        
+        default: ASSERT(0);
     }
+    
+    frontend_event(n, NCDMODULE_EVENT_DEAD);
+    return;
 }
 
 int NCDModuleInst_Backend_GetVar (NCDModuleInst *n, const char *varname, NCDValue *out)

ncd/NCDModule.h

@@ -113,7 +113,9 @@ int NCDModuleInst_GetVar (NCDModuleInst *n, const char *name, NCDValue *out) WAR
 NCDModuleInst * NCDModuleInst_GetObj (NCDModuleInst *n, const char *objname) WARN_UNUSED;
 int NCDModuleInst_HaveError (NCDModuleInst *n);
 void NCDModuleInst_Backend_SetUser (NCDModuleInst *n, void *user);
-void NCDModuleInst_Backend_Event (NCDModuleInst *n, int event);
+void NCDModuleInst_Backend_Up (NCDModuleInst *n);
+void NCDModuleInst_Backend_Down (NCDModuleInst *n);
+void NCDModuleInst_Backend_Dead (NCDModuleInst *n);
 int NCDModuleInst_Backend_GetVar (NCDModuleInst *n, const char *varname, NCDValue *out) WARN_UNUSED;
 NCDModuleInst * NCDModuleInst_Backend_GetObj (NCDModuleInst *n, const char *objname) WARN_UNUSED;
 void NCDModuleInst_Backend_Log (NCDModuleInst *n, int channel, int level, const char *fmt, ...);

ncd/modules/blocker.c

@@ -96,7 +96,7 @@ static void func_new (NCDModuleInst *i)
     o->dying = 0;
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -104,7 +104,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void instance_free (struct instance *o)
@@ -115,7 +115,7 @@ static void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -153,7 +153,7 @@ static void updown_func_new_templ (NCDModuleInst *i, int up)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // get method object
     struct instance *mo = i->method_object->inst_user;
@@ -169,7 +169,11 @@ static void updown_func_new_templ (NCDModuleInst *i, int up)
         while (node = LinkedList2Iterator_Next(&it)) {
             struct use_instance *user = UPPER_OBJECT(node, struct use_instance, blocker_node);
             ASSERT(user->blocker == mo)
-            NCDModuleInst_Backend_Event(user->i, up ? NCDMODULE_EVENT_UP : NCDMODULE_EVENT_DOWN);
+            if (up) {
+                NCDModuleInst_Backend_Up(user->i);
+            } else {
+                NCDModuleInst_Backend_Down(user->i);
+            }
         }
     }
     
@@ -179,7 +183,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void up_func_new (NCDModuleInst *i)
@@ -200,7 +204,7 @@ static void updown_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void use_func_new (NCDModuleInst *i)
@@ -230,7 +234,7 @@ static void use_func_new (NCDModuleInst *i)
     
     // signal up if needed
     if (o->blocker->up) {
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
     
     return;
@@ -239,7 +243,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void use_func_die (void *vo)
@@ -258,7 +262,7 @@ static void use_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/call.c

@@ -69,7 +69,7 @@ static void process_handler_event (struct instance *o, int event)
             ASSERT(o->state == STATE_WORKING)
             
             // signal up
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+            NCDModuleInst_Backend_Up(o->i);
             
             // set state up
             o->state = STATE_UP;
@@ -79,7 +79,7 @@ static void process_handler_event (struct instance *o, int event)
             ASSERT(o->state == STATE_UP)
             
             // signal down
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+            NCDModuleInst_Backend_Down(o->i);
             
             // set state waiting
             o->state = STATE_WAITING;
@@ -144,7 +144,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o)
@@ -157,7 +157,7 @@ void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/command_template.c

@@ -98,7 +98,7 @@ static void process_handler (command_template_instance *o, int normally, uint8_t
             o->state = STATE_DONE;
             
             // signal up
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+            NCDModuleInst_Backend_Up(o->i);
         } break;
         
         case STATE_ADDING_NEED_DELETE: {
@@ -160,7 +160,7 @@ void command_template_new (command_template_instance *o, NCDModuleInst *i, comma
         o->state = STATE_DONE;
         
         // signal up
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
     
     return;

ncd/modules/concat.c

@@ -82,7 +82,7 @@ static void func_new (NCDModuleInst *i)
     o->string = ExpString_Get(&s);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -92,7 +92,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -106,7 +106,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)

ncd/modules/concatlist.c

@@ -65,7 +65,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -73,7 +73,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -84,7 +84,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)

ncd/modules/concatv.c

@@ -93,7 +93,7 @@ static void func_new (NCDModuleInst *i)
     o->string = ExpString_Get(&s);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -103,7 +103,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -117,7 +117,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)

ncd/modules/depend.c

@@ -143,7 +143,7 @@ static void provide_promote (struct provide *o)
         d->p = o;
         
         // signal up
-        NCDModuleInst_Backend_Event(d->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(d->i);
     }
 }
 
@@ -186,7 +186,7 @@ static void provide_func_new_templ (NCDModuleInst *i, int event)
     // signal up.
     // This comes above provide_promote(), so that effects on related depend statements are
     // computed before this process advances, avoiding problems like failed variable resolutions.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // check for existing provide with this name
     struct provide *ep = find_provide(o->name);
@@ -217,7 +217,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void provide_func_new (NCDModuleInst *i)
@@ -261,7 +261,7 @@ static void provide_free (struct provide *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void provide_func_die (void *vo)
@@ -287,7 +287,7 @@ static void provide_func_die (void *vo)
         ASSERT(d->p == o)
         
         // signal down
-        NCDModuleInst_Backend_Event(d->i, NCDMODULE_EVENT_DOWN);
+        NCDModuleInst_Backend_Down(d->i);
     }
 }
 
@@ -328,7 +328,7 @@ static void depend_func_new (NCDModuleInst *i)
         o->p = p;
         
         // signal up
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     } else {
         // insert to free depends list
         LinkedList2_Append(&free_depends, &o->node);
@@ -343,7 +343,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void depend_free (struct depend *o)
@@ -367,7 +367,7 @@ static void depend_free (struct depend *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void depend_func_die (void *vo)

ncd/modules/event_template.c

@@ -51,7 +51,7 @@ static void enable_event (event_template *o)
     o->enabled = 1;
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
 }
 
 void event_template_new (event_template *o, NCDModuleInst *i, int blog_channel, int maxevents, void *user,
@@ -165,7 +165,7 @@ void event_template_dequeue (event_template *o, int *out_is_empty)
     o->enabled = 0;
     
     // signal down
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+    NCDModuleInst_Backend_Down(o->i);
     
     // enable if there are more events
     if (!LinkedList1_IsEmpty(&o->events_list)) {

ncd/modules/if.c

@@ -74,7 +74,7 @@ static void new_templ (NCDModuleInst *i, int not)
     
     // signal up if needed
     if ((not && !c) || (!not && c)) {
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
     
     return;
@@ -83,7 +83,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_new (NCDModuleInst *i)
@@ -104,7 +104,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/ip_in_network.c

@@ -91,7 +91,7 @@ static void func_new (NCDModuleInst *i)
     o->value = ipaddr_ipv4_addrs_in_network(addr1, addr2, netprefix);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -99,7 +99,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -110,7 +110,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)

ncd/modules/list.c

@@ -101,7 +101,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -109,7 +109,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -123,7 +123,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)
@@ -178,7 +178,7 @@ static void append_func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -186,7 +186,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void append_func_die (void *vo)
@@ -197,7 +197,7 @@ static void append_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void appendv_func_new (NCDModuleInst *i)
@@ -240,7 +240,7 @@ static void appendv_func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -248,7 +248,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void appendv_func_die (void *vo)
@@ -259,7 +259,7 @@ static void appendv_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void length_func_new (NCDModuleInst *i)
@@ -288,7 +288,7 @@ static void length_func_new (NCDModuleInst *i)
     o->length = NCDValue_ListCount(&mo->list);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -296,7 +296,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void length_func_die (void *vo)
@@ -307,7 +307,7 @@ static void length_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int length_func_getvar (void *vo, const char *name, NCDValue *out)
@@ -374,7 +374,7 @@ static void get_func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -382,7 +382,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void get_func_die (void *vo)
@@ -396,7 +396,7 @@ static void get_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int get_func_getvar (void *vo, const char *name, NCDValue *out)
@@ -446,7 +446,7 @@ static void shift_func_new (NCDModuleInst *i)
     NCDValue_Free(&v);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -454,7 +454,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void shift_func_die (void *vo)
@@ -465,7 +465,7 @@ static void shift_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/logical.c

@@ -98,7 +98,7 @@ static void func_new (NCDModuleInst *i, int not, int or)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -106,7 +106,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_new_not (NCDModuleInst *i)
@@ -132,7 +132,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)

ncd/modules/multidepend.c

@@ -120,7 +120,7 @@ static void depend_update (struct depend *o)
         o->provide_collapsing = 1;
         
         // signal down
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+        NCDModuleInst_Backend_Down(o->i);
     } else {
         // insert to provide's list
         LinkedList2_Append(&bp->depends, &o->provide_node);
@@ -132,7 +132,7 @@ static void depend_update (struct depend *o)
         o->provide = bp;
         
         // signal up
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
 }
 
@@ -190,7 +190,7 @@ static void provide_func_new (NCDModuleInst *i)
     // signal up.
     // This comes above the loop which follows, so that effects on related depend statements are
     // computed before this process advances, avoiding problems like failed variable resolutions.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // update depends
     LinkedList2Iterator it;
@@ -207,7 +207,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void provide_free (struct provide *o)
@@ -221,7 +221,7 @@ static void provide_free (struct provide *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void provide_func_die (void *vo)
@@ -301,7 +301,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void depend_free (struct depend *o)
@@ -324,7 +324,7 @@ static void depend_free (struct depend *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void depend_func_die (void *vo)

ncd/modules/net_backend_badvpn.c

@@ -201,7 +201,7 @@ static void func_new (NCDModuleInst *i)
     BTimer_Init(&o->timer, RETRY_TIME, (BTimer_handler)timer_handler, o);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // try starting process
     try_process(o);
@@ -216,7 +216,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o)
@@ -240,7 +240,7 @@ void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/net_backend_rfkill.c

@@ -116,10 +116,10 @@ static void monitor_handler (struct instance *o, struct rfkill_event event)
     o->up = (event.op != RFKILL_OP_DEL && !event.soft && !event.hard);
     
     if (o->up && !was_up) {
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
     else if (!o->up && was_up) {
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+        NCDModuleInst_Backend_Down(o->i);
     }
 }
 
@@ -182,7 +182,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -196,7 +196,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_backend_waitdevice.c

@@ -57,7 +57,7 @@ static void client_handler (struct instance *o, char *devpath, int have_map, BSt
         o->devpath = NULL;
         
         // signal down
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+        NCDModuleInst_Backend_Down(o->i);
     } else {
         const BStringMap *cache_map = NCDUdevManager_Query(o->i->umanager, devpath);
         if (!cache_map) {
@@ -81,7 +81,7 @@ static void client_handler (struct instance *o, char *devpath, int have_map, BSt
             o->devpath = NULL;
             
             // signal down
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+            NCDModuleInst_Backend_Down(o->i);
         }
         
         if (!o->devpath) {
@@ -93,7 +93,7 @@ static void client_handler (struct instance *o, char *devpath, int have_map, BSt
             o->ifindex = ifindex;
             
             // signal up
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+            NCDModuleInst_Backend_Up(o->i);
         }
     }
     
@@ -141,7 +141,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -160,7 +160,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_backend_waitlink.c

@@ -54,10 +54,10 @@ static void monitor_handler (struct instance *o, const char *ifname, int if_flag
     o->up = !!(if_flags & NCDIFCONFIG_FLAG_RUNNING);
     
     if (o->up && !was_up) {
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
     else if (!o->up && was_up) {
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+        NCDModuleInst_Backend_Down(o->i);
     }
 }
 
@@ -97,7 +97,7 @@ static void func_new (NCDModuleInst *i)
     
     // signal up if needed
     if (o->up) {
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
     
     return;
@@ -106,7 +106,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -120,7 +120,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_backend_wpa_supplicant.c

@@ -365,7 +365,7 @@ void process_pipe_handler_send (struct instance *o, uint8_t *data, int data_len)
         }
         
         o->up = 1;
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     }
     else if (data_begins_with((char *)data, data_len, EVENT_STRING_DISCONNECTED)) {
         ModuleLog(o->i, BLOG_INFO, "disconnected event");
@@ -376,7 +376,7 @@ void process_pipe_handler_send (struct instance *o, uint8_t *data, int data_len)
         
         if (o->up) {
             o->up = 0;
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+            NCDModuleInst_Backend_Down(o->i);
         }
     }
 }
@@ -471,7 +471,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o)
@@ -497,7 +497,7 @@ void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/net_dns.c

@@ -258,7 +258,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -269,7 +269,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -289,7 +289,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_iptables.c

@@ -322,7 +322,7 @@ static void lock_job_handler (struct lock_instance *o)
         ASSERT(!o->unlock)
         
         // up
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
         
         // set state locked
         o->state = LOCK_STATE_LOCKED;
@@ -372,7 +372,7 @@ static void func_new (NCDModuleInst *i, command_template_build_cmdline build_cmd
     
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void template_free_func (void *vo, int is_error)
@@ -386,7 +386,7 @@ void template_free_func (void *vo, int is_error)
     if (is_error) {
         NCDModuleInst_Backend_SetError(i);
     }
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void append_func_new (NCDModuleInst *i)
@@ -437,7 +437,7 @@ static void lock_func_new (NCDModuleInst *i)
     
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void lock_func_die (void *vo)
@@ -466,7 +466,7 @@ static void lock_func_die (void *vo)
     free(o);
     
     // dead
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void unlock_func_new (NCDModuleInst *i)
@@ -500,7 +500,7 @@ static void unlock_func_new (NCDModuleInst *i)
     lock->unlock = o;
     
     // up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // release lock
     BEventLockJob_Release(&lock->lock_job);
@@ -513,7 +513,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void unlock_func_die (void *vo)
@@ -544,7 +544,7 @@ static void unlock_free (struct unlock_instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_ipv4_addr.c

@@ -84,7 +84,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -92,7 +92,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -108,7 +108,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_ipv4_dhcp.c

@@ -63,13 +63,13 @@ static void dhcp_handler (struct instance *o, int event)
         case BDHCPCLIENT_EVENT_UP: {
             ASSERT(!o->up)
             o->up = 1;
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+            NCDModuleInst_Backend_Up(o->i);
         } break;
         
         case BDHCPCLIENT_EVENT_DOWN: {
             ASSERT(o->up)
             o->up = 0;
-            NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+            NCDModuleInst_Backend_Down(o->i);
         } break;
         
         case BDHCPCLIENT_EVENT_ERROR: {
@@ -122,7 +122,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void instance_free (struct instance *o)
@@ -135,7 +135,7 @@ static void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/net_ipv4_route.c

@@ -109,7 +109,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -117,7 +117,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -133,7 +133,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_up.c

@@ -74,7 +74,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -82,7 +82,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -98,7 +98,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/net_watch_interfaces.c

@@ -317,7 +317,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void templ_func_free (struct instance *o)
@@ -337,7 +337,7 @@ static void templ_func_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -378,7 +378,7 @@ static void nextevent_func_new (NCDModuleInst *i)
     // signal up.
     // Do it before finishing the event so our process does not advance any further if
     // we would be killed the event provider going down.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // wait for next event
     next_event(mo);
@@ -389,7 +389,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void nextevent_func_die (void *vo)
@@ -400,7 +400,7 @@ static void nextevent_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/print.c

@@ -100,7 +100,7 @@ static void func_new_temp (NCDModuleInst *i, int ln, int rev)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -108,7 +108,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -124,7 +124,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void print_func_new (NCDModuleInst *i)

ncd/modules/process_manager.c

@@ -391,7 +391,7 @@ static void func_new (NCDModuleInst *i)
     o->dying = 0;
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -399,7 +399,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o)
@@ -410,7 +410,7 @@ void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -468,7 +468,7 @@ static void start_func_new (NCDModuleInst *i)
     
     // signal up.
     // Do it before creating the process so that the process starts initializing before our own process continues.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // get method object
     struct instance *mo = i->method_object->inst_user;
@@ -500,7 +500,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void stop_func_new (NCDModuleInst *i)
@@ -530,7 +530,7 @@ static void stop_func_new (NCDModuleInst *i)
     
     // signal up.
     // Do it before stopping the process so that the process starts terminating before our own process continues.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // get method object
     struct instance *mo = i->method_object->inst_user;
@@ -552,7 +552,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void startstop_func_die (void *vo)
@@ -563,7 +563,7 @@ static void startstop_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/regex_match.c

@@ -94,7 +94,7 @@ static void func_new (NCDModuleInst *i)
     regfree(&preg);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -102,7 +102,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -113,7 +113,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)

ncd/modules/run.c

@@ -146,7 +146,7 @@ static void func_new (NCDModuleInst *i)
     
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void template_free_func (void *vo, int is_error)
@@ -163,7 +163,7 @@ void template_free_func (void *vo, int is_error)
     if (is_error) {
         NCDModuleInst_Backend_SetError(i);
     }
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/runonce.c

@@ -143,7 +143,7 @@ static void process_handler (struct instance *o, int normally, uint8_t normally_
     o->state = STATE_FINISHED;
     
     // set up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
 }
 
 static void func_new (NCDModuleInst *i)
@@ -193,7 +193,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void instance_free (struct instance *o)
@@ -203,7 +203,7 @@ static void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/sleep.c

@@ -54,7 +54,7 @@ static void timer_handler (void *vo)
     
     if (!o->dying) {
         // signal up
-        NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+        NCDModuleInst_Backend_Up(o->i);
     } else {
         // die
         instance_free(o);
@@ -109,7 +109,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o)
@@ -122,7 +122,7 @@ void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/strcmp.c

@@ -67,7 +67,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -75,7 +75,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -86,7 +86,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)

ncd/modules/synchronous_process.c

@@ -109,7 +109,7 @@ static void func_new (NCDModuleInst *i)
     
     // signal up.
     // Do it before creating the process so that the process starts initializing before our own process continues.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // copy arguments
     NCDValue args;
@@ -133,7 +133,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o)
@@ -146,7 +146,7 @@ void instance_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)

ncd/modules/sys_evdev.c

@@ -116,7 +116,7 @@ static void device_handler (struct instance *o, int events)
     o->processing = 1;
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
 }
 
 static void device_nextevent (struct instance *o)
@@ -130,7 +130,7 @@ static void device_nextevent (struct instance *o)
     o->processing = 0;
     
     // signal down
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+    NCDModuleInst_Backend_Down(o->i);
 }
 
 static void func_new (NCDModuleInst *i)
@@ -188,7 +188,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o, int is_error)
@@ -210,7 +210,7 @@ void instance_free (struct instance *o, int is_error)
     if (is_error) {
         NCDModuleInst_Backend_SetError(i);
     }
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -331,7 +331,7 @@ static void nextevent_func_new (NCDModuleInst *i)
     // signal up.
     // Do it before finishing the event so our process does not advance any further if
     // we would be killed the event provider going down.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // wait for next event
     device_nextevent(mo);
@@ -342,7 +342,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void nextevent_func_die (void *vo)
@@ -353,7 +353,7 @@ static void nextevent_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/sys_watch_directory.c

@@ -115,7 +115,7 @@ static void next_dir_event (struct instance *o)
     o->processing = 1;
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
 }
 
 static void assert_inotify_event (struct instance *o)
@@ -179,7 +179,7 @@ static void next_inotify_event (struct instance *o)
     skip_inotify_event(o);
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
 }
 
 static void inotify_fd_handler (struct instance *o, int events)
@@ -216,7 +216,7 @@ static void next_event (struct instance *o)
     o->processing = 0;
     
     // signal down
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_DOWN);
+    NCDModuleInst_Backend_Down(o->i);
     
     if (o->dir_handle) {
         next_dir_event(o);
@@ -299,7 +299,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 void instance_free (struct instance *o, int is_error)
@@ -325,7 +325,7 @@ void instance_free (struct instance *o, int is_error)
     if (is_error) {
         NCDModuleInst_Backend_SetError(i);
     }
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -404,7 +404,7 @@ static void nextevent_func_new (NCDModuleInst *i)
     // signal up.
     // Do it before finishing the event so our process does not advance any further if
     // we would be killed the event provider going down.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // wait for next event
     next_event(mo);
@@ -415,7 +415,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void nextevent_func_die (void *vo)
@@ -426,7 +426,7 @@ static void nextevent_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/sys_watch_input.c

@@ -377,7 +377,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void templ_func_free (struct instance *o)
@@ -397,7 +397,7 @@ static void templ_func_free (struct instance *o)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -438,7 +438,7 @@ static void nextevent_func_new (NCDModuleInst *i)
     // signal up.
     // Do it before finishing the event so our process does not advance any further if
     // we would be killed the event provider going down.
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     // wait for next event
     next_event(mo);
@@ -449,7 +449,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void nextevent_func_die (void *vo)
@@ -460,7 +460,7 @@ static void nextevent_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {

ncd/modules/var.c

@@ -75,7 +75,7 @@ static void func_new (NCDModuleInst *i)
     }
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -83,7 +83,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void func_die (void *vo)
@@ -97,7 +97,7 @@ static void func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static int func_getvar (void *vo, const char *name, NCDValue *out)
@@ -149,7 +149,7 @@ static void set_func_new (NCDModuleInst *i)
     mo->value = v;
     
     // signal up
-    NCDModuleInst_Backend_Event(o->i, NCDMODULE_EVENT_UP);
+    NCDModuleInst_Backend_Up(o->i);
     
     return;
     
@@ -157,7 +157,7 @@ fail1:
     free(o);
 fail0:
     NCDModuleInst_Backend_SetError(i);
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static void set_func_die (void *vo)
@@ -168,7 +168,7 @@ static void set_func_die (void *vo)
     // free instance
     free(o);
     
-    NCDModuleInst_Backend_Event(i, NCDMODULE_EVENT_DEAD);
+    NCDModuleInst_Backend_Dead(i);
 }
 
 static const struct NCDModule modules[] = {