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

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/input/input_dtsc.cpp
#	src/output/output.cpp
This commit is contained in:
Thulinma 2016-07-28 20:50:29 +02:00
commit 2294fbd365
7 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/dtscmeta.cpp
View file

@ -120,7 +120,7 @@ namespace DTSC {
while (src.connected()){
if (!toReceive && src.Received().available(8)){
if (src.Received().copy(2) != "DT"){
INFO_MSG("Invalid DTSC Packet header encountered (%s)", src.Received().copy(4).c_str());
WARN_MSG("Invalid DTSC Packet header encountered (%s)", src.Received().copy(4).c_str());
break;
}
toReceive = Bit::btohl(src.Received().copy(8).data() + 4);
@ -131,10 +131,11 @@ namespace DTSC {
return;
}
if(!src.spool()){
if (sleepCount++ > 60){
if (sleepCount++ > 50){
WARN_MSG("Waiting for packet on connection timed out");
return;
}
Util::sleep(100);
Util::wait(100);
}
}
}

4
lib/shared_memory.cpp
View file

@ -766,6 +766,10 @@ namespace IPC {
DEBUG_MSG(DLVL_FAIL, "Creating semaphore failed: %s", strerror(errno));
return;
}
if (!mySemaphore.tryWaitOneSecond()){
WARN_MSG("Force unlocking sharedServer semaphore to prevent deadlock");
}
mySemaphore.post();
semGuard tmpGuard(&mySemaphore);
newPage();
}