Commit 1122c1f0 authored by Sergey Vojtovich's avatar Sergey Vojtovich

InnoDB cleanups

- added missing backslash
- removed duplicate definition of UT_LOW_PRIORITY_CPU/UT_RESUME_PRIORITY_CPU
- removed duplicate UT_RESUME_PRIORITY_CPU call
parent 8283d7f7
...@@ -78,19 +78,11 @@ typedef time_t ib_time_t; ...@@ -78,19 +78,11 @@ typedef time_t ib_time_t;
# else # else
# define UT_RELAX_CPU() do { \ # define UT_RELAX_CPU() do { \
volatile int32 volatile_var; \ volatile int32 volatile_var; \
int32 oldval= 0; int32 oldval= 0; \
my_atomic_cas32(&volatile_var, &oldval, 1); \ my_atomic_cas32(&volatile_var, &oldval, 1); \
} while (0) } while (0)
# endif # endif
# if defined(HAVE_HMT_PRIORITY_INSTRUCTION)
# define UT_LOW_PRIORITY_CPU() __asm__ __volatile__ ("or 1,1,1")
# define UT_RESUME_PRIORITY_CPU() __asm__ __volatile__ ("or 2,2,2")
# else
# define UT_LOW_PRIORITY_CPU() ((void)0)
# define UT_RESUME_PRIORITY_CPU() ((void)0)
# endif
#if defined (__GNUC__) #if defined (__GNUC__)
# define UT_COMPILER_BARRIER() __asm__ __volatile__ ("":::"memory") # define UT_COMPILER_BARRIER() __asm__ __volatile__ ("":::"memory")
#elif defined (_MSC_VER) #elif defined (_MSC_VER)
......
...@@ -386,7 +386,6 @@ ut_delay( ...@@ -386,7 +386,6 @@ ut_delay(
UT_COMPILER_BARRIER(); UT_COMPILER_BARRIER();
} }
UT_RESUME_PRIORITY_CPU();
UT_RESUME_PRIORITY_CPU(); UT_RESUME_PRIORITY_CPU();
return(j); return(j);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment