hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed NOSHM and WITH_THREADNAMES flags, added NOCRASHCHECK flag.

Browse source
This commit is contained in:
Thulinma 2015-07-01 16:59:26 +02:00
parent f463606152
commit b93841f659
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CMakeLists.txt
View file

@ -64,17 +64,24 @@ endif()
######################################## ########################################
# Build Variables - Shared Memory # # Build Variables - Shared Memory #
######################################## ########################################
if (NOT DEFINED ${NOSHM} ) if (NOT DEFINED NOSHM )
add_definitions(-DSHM_ENABLED=1) add_definitions(-DSHM_ENABLED=1)
endif() endif()
######################################## ########################################
# Build Variables - Thread Names # # Build Variables - Thread Names #
######################################## ########################################
if (DEFINED ${WITH_THREADNAMES} ) if (DEFINED WITH_THREADNAMES )
add_definitions(-DWITH_THREADNAMES=1) add_definitions(-DWITH_THREADNAMES=1)
endif() endif()
########################################
# Build Variables - No Crash Check #
########################################
if (DEFINED NOCRASHCHECK )
add_definitions(-DNOCRASHCHECK=1)
endif()
######################################## ########################################
# Build Variables - Prepare for Build # # Build Variables - Prepare for Build #
######################################## ########################################

2
lib/shared_memory.cpp
View file

@ -772,6 +772,7 @@ namespace IPC {
DEBUG_MSG(DLVL_WARN, "Client %u disconnect timed out", id); DEBUG_MSG(DLVL_WARN, "Client %u disconnect timed out", id);
break; break;
default: default:
#ifndef NOCRASHCHECK
if(*counter > 10 && *counter < 126 ){ if(*counter > 10 && *counter < 126 ){
if(*counter < 30){ if(*counter < 30){
if (*counter > 15){ if (*counter > 15){
@ -783,6 +784,7 @@ namespace IPC {
Util::Procs::Murder(tmpPID); //improved kill Util::Procs::Murder(tmpPID); //improved kill
} }
} }
#endif
break; break;
} }
if (*counter == 127 || *counter == 126 || *counter == 255 || *counter == 254) { if (*counter == 127 || *counter == 126 || *counter == 255 || *counter == 254) {