database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed LF_BACKOFF calls

Browse Source
This commit is contained in:
Sergey Vojtovich
2017-12-08 21:35:29 +04:00
parent 3945049809
commit 927dd9f355
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -5560,7 +5560,7 @@ public:
MY_MEMORY_ORDER_RELAXED)) MY_MEMORY_ORDER_RELAXED))
{ {
old&= ACQUIRED | RECOVERED; old&= ACQUIRED | RECOVERED;
(void) LF_BACKOFF; (void) LF_BACKOFF();
} }
} }
bool acquire_recovered() bool acquire_recovered()
@ -5573,7 +5573,7 @@ public:
if (!(old & RECOVERED) || (old & ACQUIRED)) if (!(old & RECOVERED) || (old & ACQUIRED))
return false; return false;
old= RECOVERED; old= RECOVERED;
(void) LF_BACKOFF; (void) LF_BACKOFF();
} }
return true; return true;
} }

8
storage/maria/lockman.c
View File

@ -268,7 +268,7 @@ retry:
do { do {
cursor->curr= PTR(*cursor->prev); cursor->curr= PTR(*cursor->prev);
lf_pin(pins, 1, cursor->curr); lf_pin(pins, 1, cursor->curr);
} while(*cursor->prev != (intptr)cursor->curr && LF_BACKOFF); } while(*cursor->prev != (intptr)cursor->curr && LF_BACKOFF());
for (;;) for (;;)
{ {
if (!cursor->curr) if (!cursor->curr)
@ -277,7 +277,7 @@ retry:
cur_link= cursor->curr->link; cur_link= cursor->curr->link;
cursor->next= PTR(cur_link); cursor->next= PTR(cur_link);
lf_pin(pins, 0, cursor->next); lf_pin(pins, 0, cursor->next);
} while (cur_link != cursor->curr->link && LF_BACKOFF); } while (cur_link != cursor->curr->link && LF_BACKOFF());
cur_hashnr= cursor->curr->hashnr; cur_hashnr= cursor->curr->hashnr;
cur_resource= cursor->curr->resource; cur_resource= cursor->curr->resource;
cur_lock= cursor->curr->lock; cur_lock= cursor->curr->lock;
@ -285,7 +285,7 @@ retry:
cur_flags= cursor->curr->flags; cur_flags= cursor->curr->flags;
if (*cursor->prev != (intptr)cursor->curr) if (*cursor->prev != (intptr)cursor->curr)
{ {
(void)LF_BACKOFF; (void)LF_BACKOFF();
goto retry; goto retry;
} }
if (!DELETED(cur_link)) if (!DELETED(cur_link))
@ -362,7 +362,7 @@ retry:
lf_alloc_free(pins, cursor->curr); lf_alloc_free(pins, cursor->curr);
else else
{ {
(void)LF_BACKOFF; (void)LF_BACKOFF();
goto retry; goto retry;
} }
} }