cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

[statistics] Do the syncing to db from within the bsc_hack 

Change the counters_store_db function to be a generic for_each
function taking a function pointer and data. Use that in bsc_hack
to store it to the DB.

This is removing the DB requirement and will allow to handle
the counter values in different ways without making the counter
list public.

I verified that the syncing is still taking place.
This commit is contained in:
Holger Hans Peter Freyther 2009-12-23 05:29:04 +01:00
parent 6fced2fd0a
commit 079353ad1f
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/statistics.h
View File

@ -26,4 +26,6 @@ static inline void counter_reset(struct counter *ctr)
struct counter *counter_alloc(const char *name);
void counter_free(struct counter *ctr);
int counters_for_each(int (*handle_counter)(struct counter *, void *), void *data);
#endif /* _STATISTICS_H */

23
openbsc/src/bsc_hack.c
View File

@ -43,6 +43,11 @@ struct gsm_network *bsc_gsmnet = 0;
static const char *database_name = "hlr.sqlite3";
static const char *config_file = "openbsc.cfg";
/* timer to store statistics */
#define DB_SYNC_INTERVAL 60, 0
static struct timer_list db_sync_timer;
extern int bsc_bootstrap_network(int (*mmc_rev)(struct gsm_network *, int, void *),
const char *cfg_file);
extern int bsc_shutdown_net(struct gsm_network *net);
@ -155,6 +160,19 @@ static void signal_handler(int signal)
}
}
/* timer handling */
static int _db_store_counter(struct counter *counter, void *data)
{
return db_store_counter(counter);
}
static void db_sync_timer_cb(void *data)
{
/* store counters to database and re-schedule */
counters_for_each(_db_store_counter, NULL);
bsc_schedule_timer(&db_sync_timer, DB_SYNC_INTERVAL);
}
int main(int argc, char **argv)
{
int rc;
@ -189,6 +207,11 @@ int main(int argc, char **argv)
}
printf("DB: Database prepared.\n");
/* setup the timer */
db_sync_timer.cb = db_sync_timer_cb;
db_sync_timer.data = NULL;
bsc_schedule_timer(&db_sync_timer, DB_SYNC_INTERVAL);
rc = bsc_bootstrap_network(mncc_recv, config_file);
if (rc < 0)
exit(1);

21
openbsc/src/statistics.c
View File

@ -33,10 +33,6 @@
static LLIST_HEAD(counters);
static struct timer_list db_sync_timer;
#define DB_SYNC_INTERVAL 60, 0
struct counter *counter_alloc(const char *name)
{
struct counter *ctr = talloc_zero(tall_bsc_ctx, struct counter);
@ -56,13 +52,13 @@ void counter_free(struct counter *ctr)
talloc_free(ctr);
}
static int counters_store_db(void)
int counters_for_each(int (*handle_counter)(struct counter *, void *), void *data)
{
struct counter *ctr;
int rc = 0;
llist_for_each_entry(ctr, &counters, list) {
rc = db_store_counter(ctr);
rc = handle_counter(ctr, data);
if (rc < 0)
return rc;
}
@ -70,16 +66,3 @@ static int counters_store_db(void)
return rc;
}
static void db_sync_timer_cb(void *data)
{
/* store counters to database and re-schedule */
counters_store_db();
bsc_schedule_timer(&db_sync_timer, DB_SYNC_INTERVAL);
}
static __attribute__((constructor)) void on_dso_load_stat(void)
{
db_sync_timer.cb = db_sync_timer_cb;
db_sync_timer.data = NULL;
bsc_schedule_timer(&db_sync_timer, DB_SYNC_INTERVAL);
}