[sr-dev] git:master:ec15b23f: core: main - don't count wtimer secondary process separately
Daniel-Constantin Mierla
miconda at gmail.com
Fri Sep 1 12:02:00 CEST 2017
Module: kamailio
Branch: master
Commit: ec15b23f25ba2502a661157ae69b4dc1db923f66
URL: https://github.com/kamailio/kamailio/commit/ec15b23f25ba2502a661157ae69b4dc1db923f66
Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2017-09-01T12:00:06+02:00
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
---
Modified: src/main.c
---
Diff: https://github.com/kamailio/kamailio/commit/ec15b23f25ba2502a661157ae69b4dc1db923f66.diff
Patch: https://github.com/kamailio/kamailio/commit/ec15b23f25ba2502a661157ae69b4dc1db923f66.patch
---
diff --git a/src/main.c b/src/main.c
index b65b0020ca..56ea58a47d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1327,13 +1327,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
@@ -1436,7 +1435,6 @@ int main_loop(void)
* will be added later.) */
cfg_register_child(
1 /* timer */
- + 1 /* wtimer */
#ifdef USE_SLOW_TIMER
+ 1 /* slow timer */
#endif
@@ -1827,7 +1825,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
More information about the sr-dev
mailing list