Przeglądaj źródła

core: main - don't count wtimer secondary process separately

- it is registered via sr_wtimer_init()
- fixes the extra empty entry in process table reported by Juha Heinanen

(cherry picked from commit ec15b23f25ba2502a661157ae69b4dc1db923f66)
Daniel-Constantin Mierla 8 lat temu
rodzic
commit
1dd66b7ca9
1 zmienionych plików z 1 dodań i 4 usunięć
  1. 1 4
      src/main.c

+ 1 - 4
src/main.c

@@ -1324,13 +1324,12 @@ int main_loop(void)
 			LM_CRIT("could not initialize shared configuration\n");
 			goto error;
 		}
-	
+
 		/* Register the children that will keep updating their
 		 * local configuration */
 		cfg_register_child(
 				1   /* main = udp listener */
 				+ 1 /* timer */
-				+ 1 /* wtimer */
 #ifdef USE_SLOW_TIMER
 				+ 1 /* slow timer */
 #endif
@@ -1433,7 +1432,6 @@ int main_loop(void)
 		 * will be added later.) */
 		cfg_register_child(
 				1   /* timer */
-				+ 1   /* wtimer */
 #ifdef USE_SLOW_TIMER
 				+ 1 /* slow timer */
 #endif
@@ -1824,7 +1822,6 @@ static int calc_proc_no(void)
 #ifdef USE_SLOW_TIMER
 		+ 1 /* slow timer process */
 #endif
-		+ 1 /* wtimer process */
 #ifdef USE_TCP
 		+((!tcp_disable)?( 1/* tcp main */ + tcp_listeners ):0)
 #endif