denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

charon-tkm: Store context ids as int instead of bool

Browse Source 
This is in preparation of making context ids refcountable.
This commit is contained in:
Adrian-Ken Rueegsegger
2017-09-15 12:16:57 +02:00
committed by Tobias Brunner
parent d35ebfbce1
commit fcde9686f6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon-tkm/src/tkm/tkm_id_manager.c
+8 -5
View File
@@ -43,7 +43,7 @@ struct private_tkm_id_manager_t {
/** /**
* Per-kind array of free context ids * Per-kind array of free context ids
*/ */
bool* ctxids[TKM_CTX_MAX]; int* ctxids[TKM_CTX_MAX];
/** /**
* Per-kind context limits. * Per-kind context limits.
@@ -85,9 +85,9 @@ METHOD(tkm_id_manager_t, acquire_id, int,
this->locks[kind]->write_lock(this->locks[kind]); this->locks[kind]->write_lock(this->locks[kind]);
for (j = 0; j < this->limits[kind]; j++) for (j = 0; j < this->limits[kind]; j++)
{ {
if (!this->ctxids[kind][j]) if (this->ctxids[kind][j] == 0)
{ {
this->ctxids[kind][j] = true; this->ctxids[kind][j] = 1;
id = j + 1; id = j + 1;
break; break;
} }
@@ -117,7 +117,10 @@ METHOD(tkm_id_manager_t, release_id, bool,
} }
this->locks[kind]->write_lock(this->locks[kind]); this->locks[kind]->write_lock(this->locks[kind]);
this->ctxids[kind][idx] = false; if (this->ctxids[kind][idx] > 0)
{
this->ctxids[kind][idx]--;
}
this->locks[kind]->unlock(this->locks[kind]); this->locks[kind]->unlock(this->locks[kind]);
return TRUE; return TRUE;
@@ -155,7 +158,7 @@ tkm_id_manager_t *tkm_id_manager_create(const tkm_limits_t limits)
for (i = 0; i < TKM_CTX_MAX; i++) for (i = 0; i < TKM_CTX_MAX; i++)
{ {
this->limits[i] = limits[i]; this->limits[i] = limits[i];
this->ctxids[i] = calloc(limits[i], sizeof(bool)); this->ctxids[i] = calloc(limits[i], sizeof(int));
this->locks[i] = rwlock_create(RWLOCK_TYPE_DEFAULT); this->locks[i] = rwlock_create(RWLOCK_TYPE_DEFAULT);
DBG2(DBG_LIB, "%N initialized, %llu slot(s)", tkm_context_kind_names, i, DBG2(DBG_LIB, "%N initialized, %llu slot(s)", tkm_context_kind_names, i,
limits[i]); limits[i]);