mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

Merge branch 'wpk/perfwork-5-isc-result-rwlock' into 'master'

Browse Source 
Perfwork 5/6 - Use isc_rwlock for isc_result tables

See merge request isc-projects/bind9!3069
This commit is contained in:
Witold Krecicki
2020-02-27 09:48:11 +00:00
parent d434ec89ce 00f2146265
commit ebfb0f7392
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/isc/result.c
View File

@@ -15,9 +15,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <isc/lib.h> #include <isc/lib.h>
#include <isc/mutex.h>
#include <isc/once.h> #include <isc/once.h>
#include <isc/resultclass.h> #include <isc/resultclass.h>
#include <isc/rwlock.h>
#include <isc/util.h> #include <isc/util.h>
typedef struct resulttable { typedef struct resulttable {
@@ -182,7 +182,7 @@ static const char *identifier[ISC_R_NRESULTS] = {
static isc_once_t once = ISC_ONCE_INIT; static isc_once_t once = ISC_ONCE_INIT;
static resulttable_list_t description_tables; static resulttable_list_t description_tables;
static resulttable_list_t identifier_tables; static resulttable_list_t identifier_tables;
static isc_mutex_t lock; static isc_rwlock_t lock;
static isc_result_t static isc_result_t
register_table(resulttable_list_t *tables, unsigned int base, register_table(resulttable_list_t *tables, unsigned int base,
@@ -207,11 +207,11 @@ register_table(resulttable_list_t *tables, unsigned int base,
table->set = set; table->set = set;
ISC_LINK_INIT(table, link); ISC_LINK_INIT(table, link);
LOCK(&lock); RWLOCK(&lock, isc_rwlocktype_write);
ISC_LIST_APPEND(*tables, table, link); ISC_LIST_APPEND(*tables, table, link);
UNLOCK(&lock); RWUNLOCK(&lock, isc_rwlocktype_write);
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
@@ -220,7 +220,7 @@ static void
initialize_action(void) { initialize_action(void) {
isc_result_t result; isc_result_t result;
isc_mutex_init(&lock); isc_rwlock_init(&lock, 0, 0);
ISC_LIST_INIT(description_tables); ISC_LIST_INIT(description_tables);
ISC_LIST_INIT(identifier_tables); ISC_LIST_INIT(identifier_tables);
@@ -254,7 +254,7 @@ isc_result_tomany_helper(resulttable_list_t *tables, isc_result_t result) {
initialize(); initialize();
LOCK(&lock); RWLOCK(&lock, isc_rwlocktype_read);
text = NULL; text = NULL;
for (table = ISC_LIST_HEAD(*tables); table != NULL; for (table = ISC_LIST_HEAD(*tables); table != NULL;
@@ -270,7 +270,7 @@ isc_result_tomany_helper(resulttable_list_t *tables, isc_result_t result) {
text = "(result code text not available)"; text = "(result code text not available)";
} }
UNLOCK(&lock); RWUNLOCK(&lock, isc_rwlocktype_read);
return (text); return (text);
} }