mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 13:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9488] Fixed semaphore locking on non-posix systems

Browse source
This commit is contained in:
arrai 2010-02-28 23:39:19 +01:00
parent 9811c0d0e3
commit 5df9eaff8b
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/mangosd/MaNGOSsoap.cpp
View file

@ -129,7 +129,11 @@ int ns1__executeCommand(soap* soap, char* command, char** result)
// wait for callback to complete command // wait for callback to complete command
connection.pendingCommands.acquire(); int acc = connection.pendingCommands.acquire();
if(acc)
{
sLog.outError("MaNGOSsoap: Error while acquiring lock, acc = %i, errno = %u", acc, errno);
}
// alright, command finished // alright, command finished

10
src/mangosd/MaNGOSsoap.h
View file

@ -27,7 +27,7 @@
#include "soapH.h" #include "soapH.h"
#include "soapStub.h" #include "soapStub.h"
#include <ace/SV_Semaphore_Simple.h> #include <ace/Semaphore.h>
#include <ace/Task.h> #include <ace/Task.h>
@ -78,11 +78,9 @@ class SOAPWorkingThread : public ACE_Task<ACE_MT_SYNCH>
class SOAPCommand class SOAPCommand
{ {
public: public:
SOAPCommand() SOAPCommand():
pendingCommands(0, USYNC_THREAD, "pendingCommands")
{ {
ACE_ASSERT (pendingCommands.open("pendingCommands",
ACE_SV_Semaphore_Simple::ACE_CREATE,
0) != -1);
} }
~SOAPCommand() ~SOAPCommand()
@ -94,7 +92,7 @@ class SOAPCommand
m_printBuffer += msg; m_printBuffer += msg;
} }
ACE_SV_Semaphore_Simple pendingCommands; ACE_Semaphore pendingCommands;
void setCommandSuccess(bool val) void setCommandSuccess(bool val)
{ {

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9487" #define REVISION_NR "9488"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__