ソースを参照

NCDModule: remove unused NCDMODULE_EVENT_DYING

ambrop7 15 年 前
コミット
fc7585e101
3 ファイル変更1 行追加20 行削除
  1. 1 5
      ncd/NCDModule.c
  2. 0 1
      ncd/NCDModule.h
  3. 0 14
      ncd/ncd.c

+ 1 - 5
ncd/NCDModule.c

@@ -154,10 +154,9 @@ int NCDModuleInst_GetVar (NCDModuleInst *n, const char *name, NCDValue *out)
 
 
 void NCDModuleInst_Backend_Event (NCDModuleInst *n, int event)
 void NCDModuleInst_Backend_Event (NCDModuleInst *n, int event)
 {
 {
-    ASSERT(event == NCDMODULE_EVENT_UP || event == NCDMODULE_EVENT_DOWN || event == NCDMODULE_EVENT_DYING)
+    ASSERT(event == NCDMODULE_EVENT_UP || event == NCDMODULE_EVENT_DOWN)
     ASSERT(!(event == NCDMODULE_EVENT_UP) || n->state == STATE_DOWN)
     ASSERT(!(event == NCDMODULE_EVENT_UP) || n->state == STATE_DOWN)
     ASSERT(!(event == NCDMODULE_EVENT_DOWN) || n->state == STATE_UP)
     ASSERT(!(event == NCDMODULE_EVENT_DOWN) || n->state == STATE_UP)
-    ASSERT(!(event == NCDMODULE_EVENT_DYING) || (n->state == STATE_DOWN || n->state == STATE_UP))
     ASSERT(!BPending_IsSet(&n->event_job))
     ASSERT(!BPending_IsSet(&n->event_job))
     ASSERT(!BPending_IsSet(&n->toevent_job))
     ASSERT(!BPending_IsSet(&n->toevent_job))
     
     
@@ -168,9 +167,6 @@ void NCDModuleInst_Backend_Event (NCDModuleInst *n, int event)
         case NCDMODULE_EVENT_DOWN:
         case NCDMODULE_EVENT_DOWN:
             n->state = STATE_DOWN;
             n->state = STATE_DOWN;
             break;
             break;
-        case NCDMODULE_EVENT_DYING:
-            n->state = STATE_DYING;
-            break;
         default:
         default:
             ASSERT(0);
             ASSERT(0);
     }
     }

+ 0 - 1
ncd/NCDModule.h

@@ -35,7 +35,6 @@
 
 
 #define NCDMODULE_EVENT_UP 1
 #define NCDMODULE_EVENT_UP 1
 #define NCDMODULE_EVENT_DOWN 2
 #define NCDMODULE_EVENT_DOWN 2
-#define NCDMODULE_EVENT_DYING 3
 
 
 #define NCDMODULE_TOEVENT_DIE 101
 #define NCDMODULE_TOEVENT_DIE 101
 #define NCDMODULE_TOEVENT_CLEAN 102
 #define NCDMODULE_TOEVENT_CLEAN 102

+ 0 - 14
ncd/ncd.c

@@ -1073,20 +1073,6 @@ void process_statement_instance_handler_event (struct process_statement *ps, int
                 p->ap = ps->i + 1;
                 p->ap = ps->i + 1;
             }
             }
         } break;
         } break;
-        
-        case NCDMODULE_EVENT_DYING: {
-            ASSERT(ps->state == SSTATE_CHILD || ps->state == SSTATE_ADULT)
-            
-            process_statement_log(ps, BLOG_INFO, "dying");
-            
-            // set state DYING
-            ps->state = SSTATE_DYING;
-            
-            // update AP
-            if (p->ap > ps->i) {
-                p->ap = ps->i;
-            }
-        } break;
     }
     }
     
     
     process_work(p);
     process_work(p);