xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #4478 from taosdata/bugfix/td-2373 

[TD-2373]<fix>: data race in removeFromWheel
This commit is contained in:
haojun Liao 2020-12-11 18:39:09 +08:00 committed by GitHub
parent 297ec49aa3 c90ea80143
commit 0a779c7467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/util/src/ttimer.c
View File

@ -225,10 +225,11 @@ static void addToWheel(tmr_obj_t* timer, uint32_t delay) {
} }
static bool removeFromWheel(tmr_obj_t* timer) { static bool removeFromWheel(tmr_obj_t* timer) {
if (timer->wheel >= tListLen(wheels)) { uint8_t wheelIdx = timer->wheel;
if (wheelIdx >= tListLen(wheels)) {
return false; return false;
} }
time_wheel_t* wheel = wheels + timer->wheel; time_wheel_t* wheel = wheels + wheelIdx;
bool removed = false; bool removed = false;
pthread_mutex_lock(&wheel->mutex); pthread_mutex_lock(&wheel->mutex);