diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2017-12-07 15:03:59 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-08 13:44:45 +0200 |
| commit | b3346c2f41d0f7bd0d919826592b37ae09fa41c8 (patch) | |
| tree | f9bd618332962cf5bbd3207e536d76f3a011e3ad /mysys/lf_hash.c | |
| parent | 07e9ff1fe18999e1acd640ee3b2169c3f506fb35 (diff) | |
| download | mariadb-git-b3346c2f41d0f7bd0d919826592b37ae09fa41c8.tar.gz | |
Restore LF_BACKOFF
Moved InnoDB UT_RELAX_CPU() to server. Restored cross-platform LF_BACKOFF
implementation basing on UT_RELAX_CPU().
Diffstat (limited to 'mysys/lf_hash.c')
| -rw-r--r-- | mysys/lf_hash.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c index 430f1007f30..6b3fa78475d 100644 --- a/mysys/lf_hash.c +++ b/mysys/lf_hash.c @@ -102,7 +102,7 @@ retry: do { /* PTR() isn't necessary below, head is a dummy node */ cursor->curr= (LF_SLIST *)(*cursor->prev); lf_pin(pins, 1, cursor->curr); - } while (*cursor->prev != (intptr)cursor->curr && LF_BACKOFF); + } while (*cursor->prev != (intptr)cursor->curr && LF_BACKOFF()); for (;;) { @@ -117,7 +117,7 @@ retry: link= cursor->curr->link; cursor->next= PTR(link); lf_pin(pins, 0, cursor->next); - } while (link != cursor->curr->link && LF_BACKOFF); + } while (link != cursor->curr->link && LF_BACKOFF()); if (!DELETED(link)) { @@ -145,7 +145,7 @@ retry: and remove this deleted node */ if (my_atomic_casptr((void **) cursor->prev, - (void **) &cursor->curr, cursor->next) && LF_BACKOFF) + (void **) &cursor->curr, cursor->next) && LF_BACKOFF()) lf_alloc_free(pins, cursor->curr); else goto retry; |