Proxmox-Port/libqb
1
0
Fork 0
mirror of https://salsa.debian.org/ha-team/libqb synced 2026-08-12 22:17:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LOG: Now the array is self locking we can make the lookup array dynamic

Browse Source 
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
This commit is contained in:
Angus Salkeld 2012-03-09 12:10:13 +11:00
parent 4df255d919
commit 9294ebfa57
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/log_dcs.c
View File

@ -78,7 +78,8 @@ _log_dcs_new_cs(const char *function,
int32_t call_register = QB_FALSE;
if (qb_array_index(callsite_arr, callsite_arr_next, (void **)&cs) < 0) {
rc = qb_array_grow(callsite_arr, callsite_arr_next + 255);
rc = qb_array_grow(callsite_arr,
callsite_arr_next + callsite_elems_per_bin / 2);
assert(rc == 0);
rc = qb_array_index(callsite_arr, callsite_arr_next,
(void **)&cs);
@ -127,7 +128,8 @@ qb_log_dcs_get(int32_t * newly_created,
* try the fastest access first (no locking needed)
*/
rc = qb_array_index(lookup_arr, lineno, (void **)&csl_head);
if (rc == 0 && csl_head->cs &&
assert(rc == 0);
if (csl_head->cs &&
format == csl_head->cs->format &&
priority == csl_head->cs->priority &&
strcmp(safe_filename, csl_head->cs->filename) == 0) {
@ -137,12 +139,6 @@ qb_log_dcs_get(int32_t * newly_created,
* so we will either have to create it or go through a list, so lock it.
*/
(void)qb_thread_lock(arr_next_lock);
if (rc < 0) {
rc = qb_array_grow(lookup_arr, lineno + 255);
assert(rc == 0);
rc = qb_array_index(lookup_arr, lineno, (void **)&csl_head);
assert(rc == 0);
}
if (csl_head->cs == NULL) {
csl_head->cs = _log_dcs_new_cs(safe_function, safe_filename, format,
priority, lineno, tags);
@ -183,7 +179,12 @@ cleanup:
void
qb_log_dcs_init(void)
{
lookup_arr = qb_array_create(16, sizeof(struct callsite_list));
lookup_arr = qb_array_create_2(16, sizeof(struct callsite_list), 1);
/*
* this needs to be a non-auto-growing array, as we want to know when
* a new bin gets created so we can call qb_log_callsites_register().
*/
callsite_arr = qb_array_create(16, sizeof(struct qb_log_callsite));
arr_next_lock = qb_thread_lock_create(QB_THREAD_LOCK_SHORT);