AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2026-02-11 13:10:08 +03:00
Code Releases Activity

Fix race condition in thread counter

Browse Source 
To prevent data races caused by concurrent access from multiple threads,
replace UINT with COUNTER.
This commit is contained in:
synqa
2026-02-01 01:20:24 +09:00
parent 68e9f0b593
commit d7d3ec8cac
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mayaqua/Kernel.c
View File

@ -63,7 +63,7 @@ static int ydays[] =
0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
}; };
static UINT current_num_thread = 0; static COUNTER *current_num_thread = NULL;
static UINT cached_number_of_cpus = 0; static UINT cached_number_of_cpus = 0;
@ -776,6 +776,7 @@ void InitThreading()
{ {
thread_pool = NewSk(); thread_pool = NewSk();
thread_count = NewCounter(); thread_count = NewCounter();
current_num_thread = NewCounter();
} }
// Release of thread pool // Release of thread pool
@ -821,6 +822,9 @@ void FreeThreading()
DeleteCounter(thread_count); DeleteCounter(thread_count);
thread_count = NULL; thread_count = NULL;
DeleteCounter(current_num_thread);
current_num_thread = NULL;
} }
// Thread pool procedure // Thread pool procedure
@ -1028,9 +1032,9 @@ THREAD *NewThreadNamed(THREAD_PROC *thread_proc, void *param, char *name)
Wait(pd->InitFinishEvent, INFINITE); Wait(pd->InitFinishEvent, INFINITE);
current_num_thread++; Inc(current_num_thread);
// Debug("current_num_thread = %u\n", current_num_thread); // Debug("current_num_thread = %u\n", Count(current_num_thread));
return ret; return ret;
} }
@ -1055,8 +1059,8 @@ void CleanupThread(THREAD *t)
Free(t); Free(t);
current_num_thread--; Dec(current_num_thread);
//Debug("current_num_thread = %u\n", current_num_thread); //Debug("current_num_thread = %u\n", Count(current_num_thread));
} }
// Release thread (pool) // Release thread (pool)