Skip to content

Commit

Permalink
Revert "dialog: Fix broken stats after a restart+reload"
Browse files Browse the repository at this point in the history
This reverts commit aa2f534.
  • Loading branch information
razvancrainea committed Aug 22, 2019
1 parent cf48b8f commit 21c013e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
7 changes: 7 additions & 0 deletions modules/dialog/dialog.c
Expand Up @@ -94,6 +94,8 @@ 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;
Expand Down Expand Up @@ -912,6 +914,11 @@ static int mod_init(void)

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)) ||
Expand Down
8 changes: 8 additions & 0 deletions modules/dialog/dlg_db_handler.c
Expand Up @@ -77,6 +77,8 @@ int dlg_db_mode = DB_MODE_NONE;
static db_con_t* dialog_db_handle = 0; /* database connection handle */
static db_func_t dialog_dbf;

extern int active_dlgs_cnt;
extern int early_dlgs_cnt;
extern int dlg_bulk_del_no;

static inline void set_final_update_cols(db_val_t *, struct dlg_cell *, int);
Expand Down Expand Up @@ -603,6 +605,12 @@ static int load_dialog_info_from_db(int dlg_hash_size)
dlg->start_ts = VAL_INT(values+6);

dlg->state = VAL_INT(values+7);
if (dlg->state==DLG_STATE_CONFIRMED_NA ||
dlg->state==DLG_STATE_CONFIRMED) {
active_dlgs_cnt++;
} else if (dlg->state==DLG_STATE_EARLY) {
early_dlgs_cnt++;
}

GET_STR_VALUE(cseq1, values, 9 , 1, 1);
GET_STR_VALUE(cseq2, values, 10 , 1, 1);
Expand Down
3 changes: 3 additions & 0 deletions modules/dialog/dlg_replication.c
Expand Up @@ -34,6 +34,9 @@
#include "../../resolve.h"
#include "../../forward.h"

extern int active_dlgs_cnt;
extern int early_dlgs_cnt;

extern stat_var *processed_dlgs;

extern stat_var *create_sent;
Expand Down

0 comments on commit 21c013e

Please sign in to comment.