kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-01 18:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdr: Change the number of container buckets to be similar to the channels container.

Browse Source 
* Fix the temporary cdr candidate containers to use a prime number of
buckets.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@398579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-09-06 21:16:51 +00:00
parent 374c3f4336
commit 83d741f85e
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/cdr.c
View File

@@ -192,6 +192,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
***/ ***/
/* The prime here should be similar in size to the channel container. */
#ifdef LOW_MEMORY
#define NUM_CDR_BUCKETS 61
#else
#define NUM_CDR_BUCKETS 769
#endif
#define DEFAULT_ENABLED "1" #define DEFAULT_ENABLED "1"
#define DEFAULT_BATCHMODE "0" #define DEFAULT_BATCHMODE "0"
#define DEFAULT_UNANSWERED "0" #define DEFAULT_UNANSWERED "0"
@@ -2279,7 +2286,7 @@ static void add_candidate_for_bridge(const char *bridge_id,
*/ */
static struct ao2_container *create_candidates_for_bridge(struct ast_bridge_snapshot *bridge) static struct ao2_container *create_candidates_for_bridge(struct ast_bridge_snapshot *bridge)
{ {
struct ao2_container *candidates = ao2_container_alloc(51, bridge_candidate_hash_fn, bridge_candidate_cmp_fn); struct ao2_container *candidates = ao2_container_alloc(61, bridge_candidate_hash_fn, bridge_candidate_cmp_fn);
char *bridge_id = ast_strdupa(bridge->uniqueid); char *bridge_id = ast_strdupa(bridge->uniqueid);
struct ao2_iterator *it_cdrs; struct ao2_iterator *it_cdrs;
struct cdr_object *cand_cdr_master; struct cdr_object *cand_cdr_master;
@@ -2429,11 +2436,7 @@ static void handle_bridge_pairings(struct cdr_object *cdr, struct ast_bridge_sna
if (!candidates) { if (!candidates) {
return; return;
} }
ao2_callback(candidates, OBJ_NODATA, ao2_callback(candidates, OBJ_NODATA, bridge_candidate_process, cdr);
bridge_candidate_process,
cdr);
return;
} }
/*! \brief Handle entering into a parking bridge /*! \brief Handle entering into a parking bridge
@@ -4029,7 +4032,6 @@ static void cdr_container_print_fn(void *v_obj, void *where, ao2_prnt_fn *prnt)
} }
} }
int ast_cdr_engine_init(void) int ast_cdr_engine_init(void)
{ {
RAII_VAR(struct module_config *, mod_cfg, NULL, ao2_cleanup); RAII_VAR(struct module_config *, mod_cfg, NULL, ao2_cleanup);
@@ -4038,8 +4040,8 @@ int ast_cdr_engine_init(void)
return -1; return -1;
} }
/* The prime here should be the same as the channel container */ active_cdrs_by_channel = ao2_container_alloc(NUM_CDR_BUCKETS,
active_cdrs_by_channel = ao2_container_alloc(51, cdr_object_channel_hash_fn, cdr_object_channel_cmp_fn); cdr_object_channel_hash_fn, cdr_object_channel_cmp_fn);
if (!active_cdrs_by_channel) { if (!active_cdrs_by_channel) {
return -1; return -1;
} }