From c967698b2de6a0c588dbf0cebc493dbb03989333 Mon Sep 17 00:00:00 2001
From: Cengiz Can <cengizc@gmail.com>
Date: Tue, 2 Jun 2015 01:26:57 +0300
Subject: Skip unknown cflag for Apple clang & remove cSemaphore

---
 src/Globals.h                |   1 -
 src/OSSupport/CMakeLists.txt |   2 -
 src/OSSupport/Event.cpp      |   4 +-
 src/OSSupport/Semaphore.cpp  | 107 -------------------------------------------
 src/OSSupport/Semaphore.h    |  17 -------
 5 files changed, 2 insertions(+), 129 deletions(-)
 delete mode 100644 src/OSSupport/Semaphore.cpp
 delete mode 100644 src/OSSupport/Semaphore.h

(limited to 'src')

diff --git a/src/Globals.h b/src/Globals.h
index 27d944fcc..e7b7fdcac 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -265,7 +265,6 @@ template class SizeChecker<UInt8,  1>;
 	// Common headers (part 1, without macros):
 	#include "StringUtils.h"
 	#include "OSSupport/CriticalSection.h"
-	#include "OSSupport/Semaphore.h"
 	#include "OSSupport/Event.h"
 	#include "OSSupport/File.h"
 	#include "Logger.h"
diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt
index d1db0373d..df47394ae 100644
--- a/src/OSSupport/CMakeLists.txt
+++ b/src/OSSupport/CMakeLists.txt
@@ -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
diff --git a/src/OSSupport/Event.cpp b/src/OSSupport/Event.cpp
index 760e536a1..38144ead3 100644
--- a/src/OSSupport/Event.cpp
+++ b/src/OSSupport/Event.cpp
@@ -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
 
diff --git a/src/OSSupport/Semaphore.cpp b/src/OSSupport/Semaphore.cpp
deleted file mode 100644
index 6a2d57901..000000000
--- a/src/OSSupport/Semaphore.cpp
+++ /dev/null
@@ -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
-}
-
-
-
-
diff --git a/src/OSSupport/Semaphore.h b/src/OSSupport/Semaphore.h
deleted file mode 100644
index 57fa4bdb2..000000000
--- a/src/OSSupport/Semaphore.h
+++ /dev/null
@@ -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
-};
-- 
cgit v1.2.3