Added configurable number of timer procs to start with.

Added "timer_workers = N [use_auto_scaling_profile xxxxx]"
Dropped "auto_scaling_timer_profile"
Added dynamic counting for the timer processes

Author: bogdan-iancu

cfg.lex

@@ -341,7 +341,7 @@ DB_MAX_ASYNC_CONNECTIONS "db_max_async_connections"
 DISABLE_503_TRANSLATION "disable_503_translation"
 AUTO_SCALING_PROFILE "auto_scaling_profile"
 AUTO_SCALING_CYCLE "auto_scaling_cycle"
-AUTO_SCALING_TIMER_PROFILE "auto_scaling_timer_profile"
+TIMER_WORKERS "timer_workers"
 
 MPATH	mpath
 LOADMODULE	loadmodule
@@ -642,8 +642,8 @@ IMPORTFILE      "import_file"
 									return AUTO_SCALING_PROFILE; }
 <INITIAL>{AUTO_SCALING_CYCLE}	{	count(); yylval.strval=yytext;
 									return AUTO_SCALING_CYCLE; }
-<INITIAL>{AUTO_SCALING_TIMER_PROFILE}	{	count(); yylval.strval=yytext;
-									return AUTO_SCALING_TIMER_PROFILE; }
+<INITIAL>{TIMER_WORKERS}	{	count(); yylval.strval=yytext;
+									return TIMER_WORKERS; }
 
 <INITIAL>{MPATH}	   { count(); yylval.strval=yytext; return MPATH; }
 <INITIAL>{LOADMODULE}  { count(); yylval.strval=yytext; return LOADMODULE; }

cfg.y

@@ -400,7 +400,7 @@ static struct multi_str *tmp_mod;
 %token LAUNCH_TOKEN
 %token AUTO_SCALING_PROFILE
 %token AUTO_SCALING_CYCLE
-%token AUTO_SCALING_TIMER_PROFILE
+%token TIMER_WORKERS
 
 
 
@@ -794,6 +794,13 @@ assign_stm: DEBUG EQUAL snumber
 		| CHILDREN EQUAL error { yyerror("number expected"); }
 		| UDP_WORKERS EQUAL NUMBER { udp_workers_no=$3; }
 		| UDP_WORKERS EQUAL error { yyerror("number expected"); }
+		| TIMER_WORKERS EQUAL NUMBER {
+				timer_workers_no=$3;
+		}
+		| TIMER_WORKERS EQUAL NUMBER USE_AUTO_SCALING_PROFILE ID{
+				timer_workers_no=$3;
+				timer_auto_scaling_profile=$5;
+		}
 		| CHECK_VIA EQUAL NUMBER { check_via=$3; }
 		| CHECK_VIA EQUAL error { yyerror("boolean value expected"); }
 		| SHM_HASH_SPLIT_PERCENTAGE EQUAL NUMBER {
@@ -1239,11 +1246,6 @@ assign_stm: DEBUG EQUAL snumber
 		| AUTO_SCALING_CYCLE EQUAL error {
 				yyerror("integer value expected");
 				}
-		| AUTO_SCALING_TIMER_PROFILE EQUAL ID { auto_scaling_timer_profile=$3;}
-		| AUTO_SCALING_TIMER_PROFILE EQUAL error {
-				yyerror("ID value expected");
-				}
-
 		| error EQUAL { yyerror("unknown config variable"); }
 	;
 

pt.c

@@ -72,24 +72,23 @@ int init_multi_proc_support(void)
 	/* UDP based listeners */
 	proc_no += udp_count_processes( &extra );
 	proc_extra_no += extra;
+
 	/* TCP based listeners */
 	proc_no += tcp_count_processes( &extra );
 	proc_extra_no += extra;
-	/* attendent */
-	proc_no++;
 
-	/* info packet UDP receivers */
+	/* Timer related processes */
+	proc_no += timer_count_processes( &extra );
+	proc_extra_no += extra;
 
-	/* timer processes */
-	proc_no += 3 /* timer keeper + timer trigger + dedicated */;
-	proc_extra_no += 0; /* the dedicated proc may turn into multiple */;
+	/* attendent */
+	proc_no++;
 
 	/* count the processes requested by modules */
 	proc_no += count_module_procs(0);
 
 	counted_max_processes = proc_no + proc_extra_no;
 
-
 	/* allocate the PID table to accomodate the maximum possible number of
 	 * process we may have during runtime (covering extra procs created 
 	 * due auto-scaling) */
@@ -351,13 +350,11 @@ int count_init_child_processes(void)
 	/* listening children to be create at startup */
 	ret += udp_count_processes(NULL);
 	ret += tcp_count_processes(NULL);
+	ret += timer_count_processes(NULL) - 2/*for keeper & trigger*/;
 
 	/* attendent */
 	ret++;
 
-	/* dedicated timer */
-	ret++;
-
 	/* count number of module procs going to be initialised */
 	ret += count_module_procs(PROC_FLAG_INITCHILD);
 

timer.c

@@ -72,7 +72,25 @@ static int            timer_pipe[2];
 static struct scaling_profile *s_profile=NULL;
 
 int timer_fd_out = -1 ;
-char *auto_scaling_timer_profile = NULL;
+char *timer_auto_scaling_profile = NULL;
+int timer_workers_no = 1;
+
+
+
+/* counts the number of timer processes to start with; this number may 
+ * change during runtime due auto-scaling */
+int timer_count_processes(unsigned int *extra)
+{
+	if (extra) *extra = 0;
+
+	if (s_profile && extra) {
+		/* how many can be forked over th number of procs to start with ?*/
+		if (s_profile->max_procs > timer_workers_no)
+			*extra = s_profile->max_procs - timer_workers_no;
+	}
+
+	return 2/*keeper & trigger*/ + timer_workers_no /*workers to start with*/;
+}
 
 
 /* ret 0 on success, <0 on error*/
@@ -122,11 +140,11 @@ int init_timer(void)
 	/* make visible the "read" part of the pipe */
 	timer_fd_out = timer_pipe[0];
 
-	if (auto_scaling_timer_profile) {
-		s_profile = get_scaling_profile(auto_scaling_timer_profile);
+	if (timer_auto_scaling_profile) {
+		s_profile = get_scaling_profile(timer_auto_scaling_profile);
 		if ( s_profile==NULL) {
 			LM_ERR("undefined auto-scaling profile <%s> for timers\n",
-				auto_scaling_timer_profile);
+				timer_auto_scaling_profile);
 			return E_UNSPEC;
 		}
 		auto_scaling_enabled = 1;
@@ -762,37 +780,42 @@ static void timer_process_graceful_terminate(int sender, void *param)
 
 int start_timer_extra_processes(int *chd_rank)
 {
-	int p_id;
+	int i, p_id;
 
 	if (auto_scaling_enabled && s_profile &&
 	create_process_group( TYPE_TIMER, NULL, s_profile ,
 	fork_dynamic_timer_process, timer_process_graceful_terminate)!=0)
 		LM_ERR("failed to create group of TIMER processes, "
 			"auto forking will not be possible\n");
 
-	(*chd_rank)++;
-	if ( (p_id=internal_fork( "Timer handler", 0, TYPE_TIMER))<0 ) {
-		LM_CRIT("cannot fork Timer handler process\n");
-		return -1;
-	} else if (p_id==0) {
-		/* new Timer process */
-		/* set a more detailed description */
-			set_proc_attrs("Timer handler");
-			if (timer_proc_reactor_init() < 0 ||
-					init_child(*chd_rank) < 0) {
-				report_failure_status();
-				goto error;
-			}
-
-			report_conditional_status( 1, 0);
-
-			/* launch the reactor */
-			reactor_main_loop( 1/*timeout in sec*/, error , );
-			destroy_worker_reactor();
+	for( i=0 ; i<timer_workers_no ; i++ ) {
+
+		(*chd_rank)++;
+		if ( (p_id=internal_fork( "Timer handler", 0, TYPE_TIMER))<0 ) {
+			LM_CRIT("cannot fork Timer handler process\n");
+			return -1;
+		} else if (p_id==0) {
+			/* new Timer process */
+			/* set a more detailed description */
+				set_proc_attrs("Timer handler");
+				if (timer_proc_reactor_init() < 0 ||
+						init_child(*chd_rank) < 0) {
+					report_failure_status();
+					goto error;
+				}
+
+				report_conditional_status( 1, 0);
+
+				/* launch the reactor */
+				reactor_main_loop( 1/*timeout in sec*/, error , );
+				destroy_worker_reactor();
+
+				exit(-1);
+		}
+		/*parent*/
 
-			exit(-1);
 	}
-	/*parent*/
+
 	return 0;
 
 /* only from child process */

timer.h

@@ -85,7 +85,11 @@ struct os_timer{
 
 extern int timer_fd_out;
 
-extern char *auto_scaling_timer_profile;
+extern char *timer_auto_scaling_profile;
+
+extern int timer_workers_no;
+
+int timer_count_processes(unsigned int *extra);
 
 int init_timer(void);