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

mscsplit: talloc_ctx_init(): decouple from global tall_bsc_ctx 

Decouple the talloc context allocations from global tall_bsc_ctx pointer.

It appears that talloc_ctx_init() was intended for general use, since it is
located in libcommon. It is currently used only by osmo-nitb; but the upcoming
osmo-cscn will use it as well.

Instead of defining in osmo-nitb main file, add definition in gsm_data.h.

Change-Id: I168106599b788f586be0ff0af4699b9746c1b103
This commit is contained in:
Neels Hofmeyr 2016-05-11 13:53:47 +02:00
parent 77c8d5ffb5
commit c13e687742
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -394,6 +394,8 @@ struct gsm_sms {
char text[SMS_TEXT_SIZE];
};
extern void talloc_ctx_init(void *ctx_root);
struct gsm_network *gsm_network_init(void *ctx,
uint16_t country_code,
uint16_t network_code,

33
openbsc/src/libcommon/talloc_ctx.c
View File

@ -36,22 +36,21 @@ extern void *tall_map_ctx;
extern void *tall_upq_ctx;
extern void *tall_ctr_ctx;
void talloc_ctx_init(void)
void talloc_ctx_init(void *ctx_root)
{
tall_msgb_ctx = talloc_named_const(tall_bsc_ctx, 0, "msgb");
tall_fle_ctx = talloc_named_const(tall_bsc_ctx, 0,
"bs11_file_list_entry");
tall_locop_ctx = talloc_named_const(tall_bsc_ctx, 0, "loc_updating_oper");
tall_authciphop_ctx = talloc_named_const(tall_bsc_ctx, 0, "auth_ciph_oper");
tall_gsms_ctx = talloc_named_const(tall_bsc_ctx, 0, "sms");
tall_subscr_ctx = talloc_named_const(tall_bsc_ctx, 0, "subscriber");
tall_sub_req_ctx = talloc_named_const(tall_bsc_ctx, 0, "subscr_request");
tall_call_ctx = talloc_named_const(tall_bsc_ctx, 0, "gsm_call");
tall_paging_ctx = talloc_named_const(tall_bsc_ctx, 0, "paging_request");
tall_sigh_ctx = talloc_named_const(tall_bsc_ctx, 0, "signal_handler");
tall_tqe_ctx = talloc_named_const(tall_bsc_ctx, 0, "subch_txq_entry");
tall_trans_ctx = talloc_named_const(tall_bsc_ctx, 0, "transaction");
tall_map_ctx = talloc_named_const(tall_bsc_ctx, 0, "trau_map_entry");
tall_upq_ctx = talloc_named_const(tall_bsc_ctx, 0, "trau_upq_entry");
tall_ctr_ctx = talloc_named_const(tall_bsc_ctx, 0, "counter");
tall_msgb_ctx = talloc_named_const(ctx_root, 0, "msgb");
tall_fle_ctx = talloc_named_const(ctx_root, 0, "bs11_file_list_entry");
tall_locop_ctx = talloc_named_const(ctx_root, 0, "loc_updating_oper");
tall_authciphop_ctx = talloc_named_const(ctx_root, 0, "auth_ciph_oper");
tall_gsms_ctx = talloc_named_const(ctx_root, 0, "sms");
tall_subscr_ctx = talloc_named_const(ctx_root, 0, "subscriber");
tall_sub_req_ctx = talloc_named_const(ctx_root, 0, "subscr_request");
tall_call_ctx = talloc_named_const(ctx_root, 0, "gsm_call");
tall_paging_ctx = talloc_named_const(ctx_root, 0, "paging_request");
tall_sigh_ctx = talloc_named_const(ctx_root, 0, "signal_handler");
tall_tqe_ctx = talloc_named_const(ctx_root, 0, "subch_txq_entry");
tall_trans_ctx = talloc_named_const(ctx_root, 0, "transaction");
tall_map_ctx = talloc_named_const(ctx_root, 0, "trau_map_entry");
tall_upq_ctx = talloc_named_const(ctx_root, 0, "trau_upq_entry");
tall_ctr_ctx = talloc_named_const(ctx_root, 0, "counter");
}

4
openbsc/src/osmo-nitb/bsc_hack.c
View File

@ -243,8 +243,6 @@ static void subscr_expire_cb(void *data)
osmo_timer_schedule(&bsc_gsmnet->subscr_expire_timer, EXPIRE_INTERVAL);
}
void talloc_ctx_init(void);
extern int bsc_vty_go_parent(struct vty *vty);
static struct vty_app_info vty_info = {
@ -261,7 +259,7 @@ int main(int argc, char **argv)
vty_info.copyright = openbsc_copyright;
tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc");
talloc_ctx_init();
talloc_ctx_init(tall_bsc_ctx);
on_dso_load_token();
on_dso_load_rrlp();
on_dso_load_ho_dec();