Migrate to counted_max_processes

Drop counted_processes and it becamed irrelevant.

Author: bogdan-iancu

db/db_insertq.c

@@ -338,7 +338,7 @@ query_list_t *ql_init(db_con_t *con,db_key_t *cols,int col_no)
 
 	row_q_size = sizeof(db_val_t *) * query_buffer_size;
 	size = sizeof(query_list_t) +
-		counted_processes * sizeof(db_con_t *) +
+		counted_max_processes * sizeof(db_con_t *) +
 		con->table->len + key_size + row_q_size + con->url.len;
 
 	entry = shm_malloc(size);

dprint.c

@@ -138,7 +138,7 @@ void set_global_log_level(int level)
 {
 	int i;
 
-	for (i = 0; i < counted_processes; i++) {
+	for (i = 0; i < counted_max_processes; i++) {
 		__set_proc_default_log_level(i, level);
 		__set_proc_log_level(i, level);
 	}

main.c

@@ -379,7 +379,7 @@ static void kill_all_children(int signum)
 	if (!pt)
 		return;
 
-	for (r = 1; r < counted_processes; r++) {
+	for (r = 1; r < counted_max_processes; r++) {
 		if (pt[r].pid == -1 || (pt[r].flags & OSS_PROC_DOING_DUMP))
 			continue;
 
@@ -439,7 +439,7 @@ static void shutdown_opensips( int status )
 	/* terminate all processes */
 
 	/* first we try to terminate the processes via the IPC channel */
-	for( i=1,n=0 ; i<counted_processes; i++) {
+	for( i=1,n=0 ; i<counted_max_processes; i++) {
 		/* Depending on the processes status, its PID may be:
 		 *   -1 - process not forked yet
 		 *    0 - process forked but not fully configured by core
@@ -1390,7 +1390,7 @@ int main(int argc, char** argv)
 
 	#ifdef PKG_MALLOC
 	/* init stats support for pkg mem */
-	if (init_pkg_stats(counted_processes)!=0) {
+	if (init_pkg_stats(counted_max_processes)!=0) {
 		LM_ERR("failed to init stats for pkg\n");
 		goto error;
 	}

mi/mi_core.c

@@ -255,7 +255,9 @@ static mi_response_t *mi_ps(const mi_params_t *params,
 		return 0;
 	}
 
-	for ( i=0 ; i<counted_processes ; i++ ) {
+	for ( i=0 ; i<counted_max_processes ; i++ ) {
+		if (!is_process_running(i))
+			continue;
 		proc_item = add_mi_object(procs_arr, 0, 0);
 		if (!proc_item)
 			goto error;
@@ -350,7 +352,9 @@ static mi_response_t *w_log_level(const mi_params_t *params,
 		return 0;
 	}
 
-	for (i = 0; i < counted_processes; i++) {
+	for (i = 0; i < counted_max_processes; i++) {
+		if (!is_process_running(i))
+			continue;
 		proc_item = add_mi_object(procs_arr, NULL, 0);
 		if (!proc_item)
 			goto error;

net/net_tcp.c

@@ -1600,7 +1600,7 @@ static void tcp_main_server(void)
 	if (init_worker_reactor("TCP_main", RCT_PRIO_MAX)<0)
 		goto error;
 
-	/* now start watching all the fds*/
+	/* now start watching all the fds */
 
 	/* add all the sockets we listens on for connections */
 	for( n=PROTO_FIRST ; n<PROTO_LAST ; n++ )
@@ -1615,7 +1615,7 @@ static void tcp_main_server(void)
 			}
 	/* add all the unix sockets used for communcation with other opensips
 	 * processes (get fd, new connection a.s.o) */
-	for (n=1; n<counted_processes; n++) {
+	for (n=1; n<counted_max_processes; n++) {
 		/* skip myslef (as process) and -1 socks (disabled)
 		   (we can't have 0, we never close it!) */
 		if (n!=process_no && pt[n].unix_sock>0)

pt.c

@@ -41,9 +41,9 @@
  * alloc'ed in shared mem if possible */
 struct process_table *pt=0;
 
-/* variable keeping the number of created processes READONLY!! */
-unsigned int *counted_processes_p = NULL;
-
+/* The maximum number of processes that will ever exist in OpenSIPS. This is
+ * actually the size of the process table
+ * This is READONLY!! */
 unsigned int counted_max_processes = 0;
 
 
@@ -55,13 +55,6 @@ int init_multi_proc_support(void)
 	unsigned int extra;
 	unsigned int i;
 
-	/* allocate the number of proc variable in shm  */
-	counted_processes_p = shm_malloc(sizeof(unsigned int));
-	if (counted_processes_p==NULL){
-		LM_ERR("out of memory\n");
-		return -1;
-	}
-
 	proc_no = 0;
 	proc_extra_no = 0;
 
@@ -83,9 +76,6 @@ int init_multi_proc_support(void)
 	/* count the processes requested by modules */
 	proc_no += count_module_procs(0);
 
-	/* for the beginning, count only the processes we are starting with */
-	*counted_processes_p = proc_no;
-
 	counted_max_processes = proc_no + proc_extra_no;
 
 
@@ -417,7 +407,7 @@ void check_and_adjust_number_of_workers(void)
 		procs_no = 0;
 
 		/* find the processes belonging to this group */
-		for ( i=0 ; i<counted_processes ; i++) {
+		for ( i=0 ; i<counted_max_processes ; i++) {
 
 			if (pt[i].type != pg->type || pg->si_filter!=pt[i].pg_filter)
 				continue;

pt.h

@@ -79,7 +79,6 @@ typedef int (*forked_proc_func)(int i);
 
 extern struct process_table *pt;
 extern int process_no;
-extern unsigned int *counted_processes_p;
 extern unsigned int counted_max_processes;
 
 int   init_multi_proc_support();
@@ -93,7 +92,8 @@ int   count_init_child_processes(void);
 #define OSS_PROC_DYNAMIC       (1<<4) /* proc was created at runtime */
 #define OSS_PROC_IS_RUNNING    (1<<5) /* proc is running */
 
-#define counted_processes (counted_processes_p?*counted_processes_p:0)
+#define is_process_running(_idx) \
+	( (pt[_idx].flags&OSS_PROC_IS_RUNNING)?1:0 )
 
 pid_t internal_fork(char *proc_desc, unsigned int flags,
 		enum process_type type);
@@ -110,7 +110,7 @@ inline static int get_process_ID_by_PID(pid_t pid)
 {
 	int i;
 
-	for( i=0 ; i<counted_processes ; i++ )
+	for( i=0 ; i<counted_max_processes ; i++ )
 		if (pt[i].pid==pid)
 			return i;
 

pt_load.c

@@ -245,8 +245,9 @@ unsigned int pt_get_rt_load(int _)
 	gettimeofday( &tv, NULL);
 	usec_now = ((utime_t)(tv.tv_sec)) * 1000000 + tv.tv_usec;
 
-	for( n=0 ; n<counted_processes; n++)
-		if ( (pt[n].flags&(OSS_PROC_NO_LOAD|OSS_PROC_IS_EXTRA))==0 ) {
+	for( n=0 ; n<counted_max_processes; n++)
+		if ( is_process_running(n) &&
+		(pt[n].flags&(OSS_PROC_NO_LOAD|OSS_PROC_IS_EXTRA))==0 ) {
 			SUM_UP_LOAD( usec_now, n, ST, 1);
 			summed_procs++;
 		}
@@ -266,8 +267,9 @@ unsigned int pt_get_1m_load(int _)
 	gettimeofday( &tv, NULL);
 	usec_now = ((utime_t)(tv.tv_sec)) * 1000000 + tv.tv_usec;
 
-	for( n=0 ; n<counted_processes; n++)
-		if ( (pt[n].flags&(OSS_PROC_NO_LOAD|OSS_PROC_IS_EXTRA))==0 ) {
+	for( n=0 ; n<counted_max_processes; n++)
+		if ( is_process_running(n) &&
+		(pt[n].flags&(OSS_PROC_NO_LOAD|OSS_PROC_IS_EXTRA))==0 ) {
 			SUM_UP_LOAD( usec_now, n, LT, LT_1m_RATIO);
 			summed_procs++;
 		}
@@ -287,8 +289,9 @@ unsigned int pt_get_10m_load(int _)
 	gettimeofday( &tv, NULL);
 	usec_now = ((utime_t)(tv.tv_sec)) * 1000000 + tv.tv_usec;
 
-	for( n=0 ; n<counted_processes; n++)
-		if ( (pt[n].flags&(OSS_PROC_NO_LOAD|OSS_PROC_IS_EXTRA))==0 ) {
+	for( n=0 ; n<counted_max_processes; n++)
+		if ( is_process_running(n) &&
+		(pt[n].flags&(OSS_PROC_NO_LOAD|OSS_PROC_IS_EXTRA))==0 ) {
 			SUM_UP_LOAD( usec_now, n, LT, 1);
 			summed_procs++;
 		}
@@ -308,8 +311,8 @@ unsigned int pt_get_rt_loadall(int _)
 	gettimeofday( &tv, NULL);
 	usec_now = ((utime_t)(tv.tv_sec)) * 1000000 + tv.tv_usec;
 
-	for( n=0 ; n<counted_processes; n++) {
-		if ( (pt[n].flags&OSS_PROC_NO_LOAD)==0 )
+	for( n=0 ; n<counted_max_processes; n++) {
+		if ( is_process_running(n) && (pt[n].flags&OSS_PROC_NO_LOAD)==0 )
 			SUM_UP_LOAD( usec_now, n, ST, 1);
 			summed_procs++;
 		}
@@ -329,8 +332,8 @@ unsigned int pt_get_1m_loadall(int _)
 	gettimeofday( &tv, NULL);
 	usec_now = ((utime_t)(tv.tv_sec)) * 1000000 + tv.tv_usec;
 
-	for( n=0 ; n<counted_processes; n++)
-		if ( (pt[n].flags&OSS_PROC_NO_LOAD)==0 ) {
+	for( n=0 ; n<counted_max_processes; n++)
+		if ( is_process_running(n) && (pt[n].flags&OSS_PROC_NO_LOAD)==0 ) {
 			SUM_UP_LOAD( usec_now, n, LT, LT_1m_RATIO);
 			summed_procs++;
 		}
@@ -350,8 +353,8 @@ unsigned int pt_get_10m_loadall(int _)
 	gettimeofday( &tv, NULL);
 	usec_now = ((utime_t)(tv.tv_sec)) * 1000000 + tv.tv_usec;
 
-	for( n=0 ; n<counted_processes; n++)
-		if ( (pt[n].flags&OSS_PROC_NO_LOAD)==0 ) {
+	for( n=0 ; n<counted_max_processes; n++)
+		if ( is_process_running(n) && (pt[n].flags&OSS_PROC_NO_LOAD)==0 ) {
 			SUM_UP_LOAD( usec_now, n, LT, 1);
 			summed_procs++;
 		}