dialog: Fix broken stats after a restart+reload

    * the "active_dialogs" and "early_dialogs" stats were broken along
      with the data reloading move to child_init()

    * the global helper counters, "active_dlgs_cnt" and "early_dlgs_cnt"
      are no longer needed

(cherry picked from commit aa2f534)

modules/dialog/dialog.c

@@ -94,8 +94,6 @@ int race_condition_timeout = 5; /* seconds until call termination is triggered,
 
 /* statistic variables */
 int dlg_enable_stats = 1;
-int active_dlgs_cnt = 0;
-int early_dlgs_cnt = 0;
 int db_flush_vp = 0;
 stat_var *active_dlgs = 0;
 stat_var *processed_dlgs = 0;
@@ -918,11 +916,6 @@ static void rpc_load_dlg_db(int sender, void *param)
 
 static int child_init(int rank)
 {
-	if (rank==1) {
-		if_update_stat(dlg_enable_stats, active_dlgs, active_dlgs_cnt);
-		if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt);
-	}
-
 	if (
 	(dlg_db_mode==DB_MODE_REALTIME && (rank>=PROC_MAIN||rank==PROC_MODULE)) ||
 	(dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN||rank==PROC_MODULE)) ||

modules/dialog/dlg_db_handler.c

@@ -78,8 +78,6 @@ static db_con_t* dialog_db_handle    = 0; /* database connection handle */
 static db_func_t dialog_dbf;
 
 extern int dlg_enable_stats;
-extern int active_dlgs_cnt;
-extern int early_dlgs_cnt;
 extern stat_var *active_dlgs;
 extern stat_var *early_dlgs;
 extern int dlg_bulk_del_no;
@@ -598,9 +596,9 @@ static int load_dialog_info_from_db(int dlg_hash_size)
 			dlg->state 		= VAL_INT(values+7);
 			if (dlg->state==DLG_STATE_CONFIRMED_NA ||
 			dlg->state==DLG_STATE_CONFIRMED) {
-				active_dlgs_cnt++;
+				if_update_stat(dlg_enable_stats, active_dlgs, 1);
 			} else if (dlg->state==DLG_STATE_EARLY) {
-				early_dlgs_cnt++;
+				if_update_stat(dlg_enable_stats, early_dlgs, 1);
 			}
 
 			GET_STR_VALUE(cseq1, values, 9 , 1, 1);

modules/dialog/dlg_replication.c

@@ -34,9 +34,6 @@
 #include "../../resolve.h"
 #include "../../forward.h"
 
-extern int active_dlgs_cnt;
-extern int early_dlgs_cnt;
-
 extern int dlg_enable_stats;
 
 extern stat_var *active_dlgs;
@@ -255,10 +252,6 @@ int dlg_replicated_create(bin_packet_t *packet, struct dlg_cell *cell,
 		goto error;
 	}
 
-	if (dlg->state == DLG_STATE_CONFIRMED_NA ||
-		dlg->state == DLG_STATE_CONFIRMED)
-		active_dlgs_cnt++;
-
 	/* reference the dialog as kept in the timer list */
 	ref_dlg_unsafe(dlg, 1);