From fc66f768e044e40b0b531f324c8c472028c96c48 Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 15 Apr 2020 16:34:38 -0400 Subject: [PATCH] Fix TSAN race Former-commit-id: f00d28fdabe858bd621a1bd98e40493aca5aba1e --- src/object.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/object.cpp b/src/object.cpp index 8ef69a0eb..77fc1c732 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -32,6 +32,7 @@ #include "cron.h" #include #include +#include #ifdef __CYGWIN__ #define strtold(a,b) ((long double)strtod((a),(b))) @@ -1033,6 +1034,8 @@ struct redisMemOverhead *getMemoryOverheadData(void) { while((ln = listNext(&li))) { size_t mem_curr = 0; client *c = (client*)listNodeValue(ln); + std::unique_lock ul(c->lock); + int type = getClientType(c); mem_curr += getClientOutputBufferMemoryUsage(c); mem_curr += sdsAllocSize(c->querybuf);