hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add temporary fixes to hashtable

Browse Source 
These fixes prevent loops turning into eternal loops when
optimizations have been turned on.

The right remedy is to remove the internal locks from hashtable
and use external locks instead.
This commit is contained in:
Johan Wikman
2017-02-27 13:36:51 +02:00
parent 0a8eaa81df
commit bf4d00d6e3
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/hashtable.c
View File

@ -567,10 +567,11 @@ hashtable_read_lock(HASHTABLE *table)
while (table->writelock) while (table->writelock)
{ {
spinlock_release(&table->spin); spinlock_release(&table->spin);
while (table->writelock) while (atomic_add(&table->writelock, 1) != 0)
{ {
; atomic_add(&table->writelock, -1);
} }
atomic_add(&table->writelock, -1);
spinlock_acquire(&table->spin); spinlock_acquire(&table->spin);
} }
atomic_add(&table->n_readers, 1); atomic_add(&table->n_readers, 1);
@ -614,10 +615,11 @@ hashtable_write_lock(HASHTABLE *table)
spinlock_acquire(&table->spin); spinlock_acquire(&table->spin);
do do
{ {
while (table->n_readers) while (atomic_add(&table->n_readers, 1) != 0)
{ {
; atomic_add(&table->n_readers, -1);
} }
atomic_add(&table->n_readers, -1);
available = atomic_add(&table->writelock, 1); available = atomic_add(&table->writelock, 1);
if (available != 0) if (available != 0)
{ {