Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bugreport:5989 map-server crashes.

Browse Source 
Bug in Detail:
 - Uninitialized Critical Section used in Condition Variables.. 
 - Possible Stack Overflow in async allocator Thread when build as Release 

Fixed by: 
 - Initialize Critical Section for Condition Var's waiter count lock properly
 - Increased Stack Size of Async. Allocator Thread to 1MB (previously 512KB)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16269 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
blacksirius 2012-06-11 21:51:09 +00:00
parent f6f8f640c5
commit 04bc22ca40
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/mempool.c
View File

@ -156,7 +156,7 @@ void mempool_init(){
l_async_lock = ramutex_create(); l_async_lock = ramutex_create();
l_async_cond = racond_create(); l_async_cond = racond_create();
l_async_thread = rathread_createEx(mempool_async_allocator, NULL, 512*1024, RAT_PRIO_NORMAL); l_async_thread = rathread_createEx(mempool_async_allocator, NULL, 1024*1024, RAT_PRIO_NORMAL);
if(l_async_thread == NULL){ if(l_async_thread == NULL){
ShowFatalError("mempool_init: cannot spawn Async Allocator Thread.\n"); ShowFatalError("mempool_init: cannot spawn Async Allocator Thread.\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

3
src/common/mutex.c
View File

@ -133,6 +133,7 @@ racond racond_create(){
c->nWaiters = 0; c->nWaiters = 0;
c->events[ EVENT_COND_SIGNAL ] = CreateEvent( NULL, FALSE, FALSE, NULL ); c->events[ EVENT_COND_SIGNAL ] = CreateEvent( NULL, FALSE, FALSE, NULL );
c->events[ EVENT_COND_BROADCAST ] = CreateEvent( NULL, TRUE, FALSE, NULL ); c->events[ EVENT_COND_BROADCAST ] = CreateEvent( NULL, TRUE, FALSE, NULL );
InitializeCriticalSection( &c->waiters_lock );
#else #else
pthread_cond_init(&c->hCond, NULL); pthread_cond_init(&c->hCond, NULL);
#endif #endif
@ -145,7 +146,7 @@ void racond_destroy( racond c ){
#ifdef WIN32 #ifdef WIN32
CloseHandle( c->events[ EVENT_COND_SIGNAL ] ); CloseHandle( c->events[ EVENT_COND_SIGNAL ] );
CloseHandle( c->events[ EVENT_COND_BROADCAST ] ); CloseHandle( c->events[ EVENT_COND_BROADCAST ] );
InitializeCriticalSection( &c->waiters_lock ); DeleteCriticalSection( &c->waiters_lock );
#else #else
pthread_cond_destroy(&c->hCond); pthread_cond_destroy(&c->hCond);
#endif #endif