gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TSAN errors in fastlock

Browse Source 
Former-commit-id: 2e159e6ea3fa8bb26c2f471f1493ab6593b85cff
This commit is contained in:
John Sully 2020-09-21 03:26:50 +00:00
parent c3a0665f2a
commit 7b0a5d1e40
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fastlock.cpp
View File

@ -343,7 +343,9 @@ extern "C" void fastlock_lock(struct fastlock *lock)
unsigned myticket = __atomic_fetch_add(&lock->m_ticket.m_avail, 1, __ATOMIC_RELEASE); unsigned myticket = __atomic_fetch_add(&lock->m_ticket.m_avail, 1, __ATOMIC_RELEASE);
unsigned cloops = 0; unsigned cloops = 0;
ticket ticketT; ticket ticketT;
unsigned loopLimit = g_fHighCpuPressure ? 0x10000 : 0x100000; int fHighPressure;
__atomic_load(&g_fHighCpuPressure, &fHighPressure, __ATOMIC_RELAXED);
unsigned loopLimit = fHighPressure ? 0x10000 : 0x100000;
for (;;) for (;;)
{ {
@ -478,16 +480,19 @@ void fastlock_auto_adjust_waits()
{ {
#ifdef __linux__ #ifdef __linux__
struct sysinfo sysinf; struct sysinfo sysinf;
auto fHighPressurePrev = g_fHighCpuPressure; int fHighPressurePrev, fHighPressureNew;
__atomic_load(&g_fHighCpuPressure, &fHighPressurePrev, __ATOMIC_RELAXED);
fHighPressureNew = fHighPressurePrev;
memset(&sysinf, 0, sizeof sysinf); memset(&sysinf, 0, sizeof sysinf);
if (!sysinfo(&sysinf)) { if (!sysinfo(&sysinf)) {
auto avgCoreLoad = sysinf.loads[0] / get_nprocs(); auto avgCoreLoad = sysinf.loads[0] / get_nprocs();
g_fHighCpuPressure = (avgCoreLoad > ((1 << SI_LOAD_SHIFT) * 0.9)); int fHighPressureNew = (avgCoreLoad > ((1 << SI_LOAD_SHIFT) * 0.9));
if (g_fHighCpuPressure) __atomic_store(&g_fHighCpuPressure, &fHighPressureNew, __ATOMIC_RELEASE);
if (fHighPressureNew)
serverLog(!fHighPressurePrev ? 3 /*LL_WARNING*/ : 1 /* LL_VERBOSE */, "NOTICE: Detuning locks due to high load per core: %.2f%%", avgCoreLoad / (double)(1 << SI_LOAD_SHIFT)*100.0); serverLog(!fHighPressurePrev ? 3 /*LL_WARNING*/ : 1 /* LL_VERBOSE */, "NOTICE: Detuning locks due to high load per core: %.2f%%", avgCoreLoad / (double)(1 << SI_LOAD_SHIFT)*100.0);
} }
if (!g_fHighCpuPressure && fHighPressurePrev) { if (!fHighPressureNew && fHighPressurePrev) {
serverLog(3 /*LL_WARNING*/, "NOTICE: CPU pressure reduced"); serverLog(3 /*LL_WARNING*/, "NOTICE: CPU pressure reduced");
} }
#else #else