ncd: NCDModule: replace NCDModuleInst_Event with NCDModuleInst_Die and NCDModuleInst_Clean

ncd/NCDModule.c

@@ -186,53 +186,54 @@ void NCDModuleInst_Free (NCDModuleInst *n)
     BPending_Free(&n->init_job);
 }
 
-void NCDModuleInst_Event (NCDModuleInst *n, int event)
+void NCDModuleInst_Die (NCDModuleInst *n)
 {
     DebugObject_Access(&n->d_obj);
-    ASSERT(event == NCDMODULE_TOEVENT_DIE || event == NCDMODULE_TOEVENT_CLEAN)
     
-    if (event == NCDMODULE_TOEVENT_DIE) {
-        switch (n->state) {
-            case STATE_INIT: {
-                n->state = STATE_UNINIT;
-                BPending_Unset(&n->init_job);
-                BPending_Set(&n->uninit_job);
-            } break;
-            
-            case STATE_DOWN_CLEAN:
-            case STATE_DOWN_UNCLEAN: {
-                n->state = STATE_DOWN_DIE;
-                BPending_Set(&n->die_job);
-            } break;
-            
-            case STATE_DOWN_PCLEAN: {
-                n->state = STATE_DOWN_DIE;
-                BPending_Unset(&n->clean_job);
-                BPending_Set(&n->die_job);
-            } break;
-            
-            case STATE_UP: {
-                n->state = STATE_UP_DIE;
-                BPending_Set(&n->die_job);
-            } break;
-            
-            default: ASSERT(0);
-        }
+    switch (n->state) {
+        case STATE_INIT: {
+            n->state = STATE_UNINIT;
+            BPending_Unset(&n->init_job);
+            BPending_Set(&n->uninit_job);
+        } break;
+        
+        case STATE_DOWN_CLEAN:
+        case STATE_DOWN_UNCLEAN: {
+            n->state = STATE_DOWN_DIE;
+            BPending_Set(&n->die_job);
+        } break;
+        
+        case STATE_DOWN_PCLEAN: {
+            n->state = STATE_DOWN_DIE;
+            BPending_Unset(&n->clean_job);
+            BPending_Set(&n->die_job);
+        } break;
+        
+        case STATE_UP: {
+            n->state = STATE_UP_DIE;
+            BPending_Set(&n->die_job);
+        } break;
+        
+        default: ASSERT(0);
     }
-    else if (event == NCDMODULE_TOEVENT_CLEAN) {
-        switch (n->state) {
-            case STATE_INIT:
-            case STATE_DOWN_CLEAN:
-            case STATE_DOWN_PCLEAN: {
-            } break;
-            
-            case STATE_DOWN_UNCLEAN: {
-                n->state = STATE_DOWN_PCLEAN;
-                BPending_Set(&n->clean_job);
-            } break;
-            
-            default: ASSERT(0);
-        }
+}
+
+void NCDModuleInst_Clean (NCDModuleInst *n)
+{
+    DebugObject_Access(&n->d_obj);
+    
+    switch (n->state) {
+        case STATE_INIT:
+        case STATE_DOWN_CLEAN:
+        case STATE_DOWN_PCLEAN: {
+        } break;
+        
+        case STATE_DOWN_UNCLEAN: {
+            n->state = STATE_DOWN_PCLEAN;
+            BPending_Set(&n->clean_job);
+        } break;
+        
+        default: ASSERT(0);
     }
 }
 

ncd/NCDModule.h

@@ -35,9 +35,6 @@
 #define NCDMODULE_EVENT_DOWN 2
 #define NCDMODULE_EVENT_DEAD 3
 
-#define NCDMODULE_TOEVENT_DIE 101
-#define NCDMODULE_TOEVENT_CLEAN 102
-
 struct NCDModuleInst_s;
 struct NCDModuleProcess_s;
 
@@ -110,7 +107,8 @@ void NCDModuleInst_Init (NCDModuleInst *n, const struct NCDModule *m, NCDModuleI
                          NCDModuleInst_func_initprocess func_initprocess,
                          BLog_logfunc logfunc);
 void NCDModuleInst_Free (NCDModuleInst *n);
-void NCDModuleInst_Event (NCDModuleInst *n, int event);
+void NCDModuleInst_Die (NCDModuleInst *n);
+void NCDModuleInst_Clean (NCDModuleInst *n);
 int NCDModuleInst_GetVar (NCDModuleInst *n, const char *name, NCDValue *out) WARN_UNUSED;
 NCDModuleInst * NCDModuleInst_GetObj (NCDModuleInst *n, const char *objname) WARN_UNUSED;
 int NCDModuleInst_HaveError (NCDModuleInst *n);

ncd/ncd.c

@@ -925,7 +925,7 @@ void process_work_job_handler (struct process *p)
             process_statement_log(ps, BLOG_INFO, "killing");
             
             // order it to die
-            NCDModuleInst_Event(&ps->inst, NCDMODULE_TOEVENT_DIE);
+            NCDModuleInst_Die(&ps->inst);
             
             // set statement state DYING
             ps->state = SSTATE_DYING;
@@ -962,7 +962,7 @@ void process_work_job_handler (struct process *p)
             process_statement_log(ps, BLOG_INFO, "killing");
             
             // order it to die
-            NCDModuleInst_Event(&ps->inst, NCDMODULE_TOEVENT_DIE);
+            NCDModuleInst_Die(&ps->inst);
             
             // set statement state DYING
             ps->state = SSTATE_DYING;
@@ -981,7 +981,7 @@ void process_work_job_handler (struct process *p)
         process_statement_log(ps, BLOG_INFO, "clean");
         
         // report clean
-        NCDModuleInst_Event(&ps->inst, NCDMODULE_TOEVENT_CLEAN);
+        NCDModuleInst_Clean(&ps->inst);
         return;
     }