Browse code

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 authored on 01/09/2017 10:00:06
Showing 1 changed files
... ...
@@ -1324,13 +1324,12 @@ int main_loop(void)
1324 1324
 			LM_CRIT("could not initialize shared configuration\n");
1325 1325
 			goto error;
1326 1326
 		}
1327
-	
1327
+
1328 1328
 		/* Register the children that will keep updating their
1329 1329
 		 * local configuration */
1330 1330
 		cfg_register_child(
1331 1331
 				1   /* main = udp listener */
1332 1332
 				+ 1 /* timer */
1333
-				+ 1 /* wtimer */
1334 1333
 #ifdef USE_SLOW_TIMER
1335 1334
 				+ 1 /* slow timer */
1336 1335
 #endif
... ...
@@ -1433,7 +1432,6 @@ int main_loop(void)
1433 1432
 		 * will be added later.) */
1434 1433
 		cfg_register_child(
1435 1434
 				1   /* timer */
1436
-				+ 1   /* wtimer */
1437 1435
 #ifdef USE_SLOW_TIMER
1438 1436
 				+ 1 /* slow timer */
1439 1437
 #endif
... ...
@@ -1824,7 +1822,6 @@ static int calc_proc_no(void)
1824 1822
 #ifdef USE_SLOW_TIMER
1825 1823
 		+ 1 /* slow timer process */
1826 1824
 #endif
1827
-		+ 1 /* wtimer process */
1828 1825
 #ifdef USE_TCP
1829 1826
 		+((!tcp_disable)?( 1/* tcp main */ + tcp_listeners ):0)
1830 1827
 #endif