diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-24 20:56:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-24 20:56:55 +0200 |
| commit | 639baee61bdfefe124414db6b12d40061a086e5b (patch) | |
| tree | 4ed7af579f6b5e0a05d3f7783382460d384c7e2b /mysys | |
| parent | 31a1934c9cc0c4781b4a8c30f60252b02a873a2a (diff) | |
| download | mariadb-git-639baee61bdfefe124414db6b12d40061a086e5b.tar.gz | |
cleanup: remove LF_REQUIRE_PINS, use compile_time_assert() instead of reimplementing it
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/lf_alloc-pin.c | 2 | ||||
| -rw-r--r-- | mysys/lf_hash.c | 2 | ||||
| -rw-r--r-- | mysys/waiting_threads.c | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c index 6ab6ba3aae0..88d5382947f 100644 --- a/mysys/lf_alloc-pin.c +++ b/mysys/lf_alloc-pin.c @@ -412,8 +412,6 @@ found: /* lock-free memory allocator for fixed-size objects */ -LF_REQUIRE_PINS(1) - /* callback for _lf_pinbox_real_free to free a list of unpinned objects - add it back to the allocator stack diff --git a/mysys/lf_hash.c b/mysys/lf_hash.c index 38b212c65f0..aa96ca94198 100644 --- a/mysys/lf_hash.c +++ b/mysys/lf_hash.c @@ -27,8 +27,6 @@ #include <my_bit.h> #include <lf.h> -LF_REQUIRE_PINS(3) - /* An element of the list */ typedef struct { intptr volatile link; /* a pointer to the next element in a listand a flag */ diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c index caeba9cfa12..56125f8951e 100644 --- a/mysys/waiting_threads.c +++ b/mysys/waiting_threads.c @@ -604,8 +604,6 @@ static int deadlock_search(struct deadlock_arg *arg, WT_THD *blocker, DBUG_PRINT("wt", ("enter: thd=%s, blocker=%s, depth=%u", arg->thd->name, blocker->name, depth)); - LF_REQUIRE_PINS(1); - arg->last_locked_rc= 0; if (depth > arg->max_depth) @@ -923,8 +921,6 @@ int wt_thd_will_wait_for(WT_THD *thd, WT_THD *blocker, WT_RESOURCE *rc; DBUG_ENTER("wt_thd_will_wait_for"); - LF_REQUIRE_PINS(3); - DBUG_PRINT("wt", ("enter: thd=%s, blocker=%s, resid=%lu", thd->name, blocker->name, (ulong)resid->value)); |