flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Skip unknown cflag for Apple clang & remove cSemaphore

Browse Source
This commit is contained in:
Cengiz Can
2015-06-04 11:48:56 +03:00
parent d871c47505
commit c967698b2d
8 changed files with 12 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/OSSupport/CMakeLists.txt
-2
View File
@@ -15,7 +15,6 @@ SET (SRCS
IsThread.cpp
NetworkInterfaceEnum.cpp
NetworkSingleton.cpp
Semaphore.cpp
ServerHandleImpl.cpp
StackTrace.cpp
TCPLinkImpl.cpp
@@ -34,7 +33,6 @@ SET (HDRS
Network.h
NetworkSingleton.h
Queue.h
Semaphore.h
ServerHandleImpl.h
StackTrace.h
TCPLinkImpl.h
src/OSSupport/Event.cpp
+2 -2
View File
@@ -1,8 +1,8 @@
// Event.cpp
// Implements the cEvent object representing an OS-specific synchronization primitive that can be waited-for
// Implemented as an Event on Win and as a 1-semaphore on *nix
// Interfaces to the cEvent object representing a synchronization primitive that can be waited-for
// Implemented using C++11 condition variable and mutex
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
src/OSSupport/Semaphore.cpp
-107
View File
@@ -1,107 +0,0 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
cSemaphore::cSemaphore( unsigned int a_MaxCount, unsigned int a_InitialCount /* = 0 */)
#ifndef _WIN32
: m_bNamed( false)
#endif
{
#ifndef _WIN32
(void)a_MaxCount;
m_Handle = new sem_t;
if (sem_init( (sem_t*)m_Handle, 0, 0))
{
LOG("WARNING cSemaphore: Could not create unnamed semaphore, fallback to named.");
delete (sem_t*)m_Handle; // named semaphores return their own address
m_bNamed = true;
AString Name;
Printf(Name, "cSemaphore%p", this);
m_Handle = sem_open(Name.c_str(), O_CREAT, 777, a_InitialCount);
if (m_Handle == SEM_FAILED)
{
LOG("ERROR: Could not create Semaphore. (%i)", errno);
}
else
{
if (sem_unlink(Name.c_str()) != 0)
{
LOG("ERROR: Could not unlink cSemaphore. (%i)", errno);
}
}
}
#else
m_Handle = CreateSemaphore(
nullptr, // security attribute
a_InitialCount, // initial count
a_MaxCount, // maximum count
0 // name (optional)
);
#endif
}
cSemaphore::~cSemaphore()
{
#ifdef _WIN32
CloseHandle( m_Handle);
#else
if (m_bNamed)
{
if (sem_close( (sem_t*)m_Handle) != 0)
{
LOG("ERROR: Could not close cSemaphore. (%i)", errno);
}
}
else
{
sem_destroy( (sem_t*)m_Handle);
delete (sem_t*)m_Handle;
}
m_Handle = 0;
#endif
}
void cSemaphore::Wait()
{
#ifndef _WIN32
if (sem_wait( (sem_t*)m_Handle) != 0)
{
LOG("ERROR: Could not wait for cSemaphore. (%i)", errno);
}
#else
WaitForSingleObject( m_Handle, INFINITE);
#endif
}
void cSemaphore::Signal()
{
#ifndef _WIN32
if (sem_post( (sem_t*)m_Handle) != 0)
{
LOG("ERROR: Could not signal cSemaphore. (%i)", errno);
}
#else
ReleaseSemaphore( m_Handle, 1, nullptr);
#endif
}
src/OSSupport/Semaphore.h
-17
View File
@@ -1,17 +0,0 @@
#pragma once
class cSemaphore
{
public:
cSemaphore( unsigned int a_MaxCount, unsigned int a_InitialCount = 0);
~cSemaphore();
void Wait();
void Signal();
private:
void * m_Handle; // HANDLE pointer
#ifndef _WIN32
bool m_bNamed;
#endif
};