Added windows implementation of CondVar and Mutex

Author: AlexMog

CMakeLists.txt

@@ -7,9 +7,11 @@ set(CMAKE_BUILD_TYPE Release)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_library(mognetwork SHARED
-  src/CondVar.cpp
+  src/UnixCondVar.cpp
+  src/WinCondVar.cpp
   src/IpAddress.cpp
-  src/Mutex.cpp
+  src/WinMutex.cpp
+  src/UnixMutex.cpp
   src/Packet.cpp
   src/Selector.cpp
   src/Socket.cpp

Makefile.old

@@ -5,7 +5,7 @@
 ## Login   <[email protected]>
 ## 
 ## Started on  Fri Jun  6 11:16:50 2014 Moghrabi Alexandre
-## Last update Tue Dec  2 16:53:00 2014 Moghrabi Alexandre
+## Last update Sat Dec  6 06:28:18 2014 Moghrabi Alexandre
 ##
 
 NAME=	mognetwork
@@ -24,7 +24,8 @@ INCDIR= ./include/
 
 SRC=	$(SRCDIR)CondVar.cpp		\
 	$(SRCDIR)IpAddress.cpp		\
-	$(SRCDIR)Mutex.cpp		\
+	$(SRCDIR)WinMutex.cpp		\
+	$(SRCDIR)UnixMutex.cpp		\
 	$(SRCDIR)Selector.cpp		\
 	$(SRCDIR)Socket.cpp		\
 	$(SRCDIR)TcpASIODatas.cpp	\

include/mognetwork/CondVar.hh

@@ -5,7 +5,7 @@
 // Login   <[email protected]>
 // 
 // Started on  Tue Nov 11 19:43:06 2014 Moghrabi Alexandre
-// Last update Tue Nov 18 13:11:35 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 06:47:20 2014 Moghrabi Alexandre
 //
 
 /*!
@@ -18,7 +18,11 @@
 #ifndef MOGNETWORK_CONDVAR_HH
 # define MOGNETWORK_CONDVAR_HH
 
+#ifndef OS_WINDOWS
 # include <pthread.h>
+#else
+# include <windows.h>
+#endif // !OS_WINDOWS
 # include "Mutex.hh"
 
 namespace mognetwork
@@ -27,7 +31,10 @@ namespace mognetwork
    * \class CondVar
    * \brief Encapsulation des variables conditionnelles
    */
-  class CondVar : public Mutex
+  class CondVar
+#ifndef OS_WINDOWS
+    : public Mutex
+#endif
   {
   public:
     /*!
@@ -56,7 +63,12 @@ namespace mognetwork
     void timedwait(const struct timespec* abstime);
 
   protected:
+#ifndef OS_WINDOWS
     pthread_cond_t m_cond; /*!< Variable conditionnelle */
+#else
+    CONDITION_VARIABLE m_cond;
+    PSRWLOCK m_lock;
+#endif // !OS_WINDOWS
   };
 } // namespace mognetwork
 

include/mognetwork/Mutex.hh

@@ -5,7 +5,7 @@
 // Login   <[email protected]>
 // 
 // Started on  Tue Nov 11 19:30:25 2014 Moghrabi Alexandre
-// Last update Tue Nov 18 13:10:38 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 06:19:34 2014 Moghrabi Alexandre
 //
 
 /*!
@@ -18,7 +18,11 @@
 #ifndef MOGNETWORK_MUTEX_HH
 # define MOGNETWORK_MUTEX_HH
 
+#ifndef OS_WINDOWS
 # include <pthread.h>
+#else
+# include <windows.h>
+#endif
 
 namespace mognetwork
 {
@@ -51,7 +55,11 @@ namespace mognetwork
     int trylock();
 
   protected:
+#ifndef OS_WINDOWS
     pthread_mutex_t m_mutex; /*!< données de la mutex */
+#else
+    HANDLE m_mutex;
+#endif
   };
 } // namespace mognetwork
 

src/TcpSocket.cpp

@@ -5,7 +5,7 @@
 // Login   <[email protected]>
 // 
 // Started on  Thu Jun  5 20:09:34 2014 mognetworkhrabi Alexandre
-// Last update Tue Dec  2 16:26:14 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 05:26:38 2014 Moghrabi Alexandre
 //
 
 #include <sys/types.h>

src/CondVar.cpp renamed to src/UnixCondVar.cpp

@@ -5,12 +5,14 @@
 // Login   <[email protected]>
 // 
 // Started on  Tue Nov 11 19:48:17 2014 Moghrabi Alexandre
-// Last update Tue Nov 25 16:50:49 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 06:38:54 2014 Moghrabi Alexandre
 //
 
 #include "mognetwork/ThreadException.hh"
 #include "mognetwork/CondVar.hh"
 
+#ifndef OS_WINDOWS
+
 namespace mognetwork
 {
   CondVar::CondVar()
@@ -49,3 +51,5 @@ namespace mognetwork
       throw ThreadException("pthread_cond_timedwait error.", __LINE__, __FILE__);
   }
 } // namespace mognetwork
+
+#endif // OS_WINDOWS

src/Mutex.cpp renamed to src/UnixMutex.cpp

@@ -5,12 +5,14 @@
 // Login   <[email protected]>
 // 
 // Started on  Tue Nov 11 19:36:19 2014 Moghrabi Alexandre
-// Last update Tue Nov 25 16:50:37 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 06:18:06 2014 Moghrabi Alexandre
 //
 
 #include "mognetwork/ThreadException.hh"
 #include "mognetwork/Mutex.hh"
 
+#ifndef OS_WINDOWS
+
 namespace mognetwork
 {
   Mutex::Mutex()
@@ -42,3 +44,5 @@ namespace mognetwork
     return pthread_mutex_trylock(&m_mutex);
   }
 } // namepsace mognetwork
+
+#endif // !OS_WINDOWS

src/UnixThread.cpp

@@ -5,12 +5,12 @@
 // Login   <[email protected]>
 // 
 // Started on  Tue Nov 11 17:37:30 2014 Moghrabi Alexandre
-// Last update Sun Nov 30 16:55:36 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 06:17:23 2014 Moghrabi Alexandre
 //
 
 #include "mognetwork/OS.hh"
 
-#if defined(OS_LINUX)
+#ifndef OS_WINDOWS
 
 #include <iostream>
 #include "mognetwork/Thread.hh"

src/WinCondVar.cpp

@@ -0,0 +1,51 @@
+//
+// CondVar.cpp for LibNet in /home/alexmog/projets/LibNet/src
+// 
+// Made by Moghrabi Alexandre
+// Login   <[email protected]>
+// 
+// Started on  Tue Nov 11 19:48:17 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 06:53:09 2014 Moghrabi Alexandre
+//
+
+#include "mognetwork/ThreadException.hh"
+#include "mognetwork/CondVar.hh"
+
+#if defined OS_WINDOWS
+
+namespace mognetwork
+{
+  CondVar::CondVar()
+  {
+    InitializeConditionVariable(&m_cond);
+    InitializeSRWLock(&m_lock);
+  }
+
+  CondVar::~CondVar()
+  {
+    WakeAllConditionVariable(&m_cond);
+  }
+
+  void CondVar::wait()
+  {
+    if (CONDITION_VARIABLE_LOCKMODE_SHARED(&m_cond, &m_lock, INFINITE, CONDITION_VARIABLE_LOCKMODE_SHARED) == 0)
+      throw ThreadException("pthread_cond_wait error.", __LINE__, __FILE__);
+  }
+
+  void CondVar::signal()
+  {
+    WakeConditionVariable(&m_cond);
+  }
+
+  void CondVar::broadcast()
+  {
+    WakeAllConditionVariable(&m_cond);
+  }
+
+  void CondVar::timedwait(const struct timespec* abstime)
+  {
+    (void)abstime;
+  }
+} // namespace mognetwork
+
+#endif // OS_WINDOWS

src/WinMutex.cpp

@@ -0,0 +1,49 @@
+//
+// Mutex.cpp for Mutex in /home/alexmog/projets/LibNet/src
+// 
+// Made by Moghrabi Alexandre
+// Login   <[email protected]>
+// 
+// Started on  Tue Nov 11 19:36:19 2014 Moghrabi Alexandre
+// Last update Sat Dec  6 06:27:07 2014 Moghrabi Alexandre
+//
+
+#include "mognetwork/ThreadException.hh"
+#include "mognetwork/Mutex.hh"
+
+#if defined(OS_WINDOWS)
+
+namespace mognetwork
+{
+  Mutex::Mutex()
+  {
+    if ((m_mutex = CreateMutex(NULL, FALSE, NULL)) == NULL)
+      throw ThreadException("pthread_mutex_init error", __LINE__, __FILE__);
+  }
+
+  Mutex::~Mutex()
+  {
+    CloseHandle(m_mutex);
+  }
+
+  void Mutex::lock()
+  {
+    if (WaitForSingleObject(m_mutex, INFINITE) == WAIT_FAILED)
+      throw ThreadException("pthread_mutex_lock error", __LINE__, __FILE__);
+  }
+
+  void Mutex::unlock()
+  {
+    if (!ReleaseMutex(m_mutex))
+      throw ThreadException("pthread_mutex_unlock error", __LINE__, __FILE__);
+  }
+
+  int Mutex::trylock()
+  {
+    if (WaitForSingleObject(m_mutex, 0) == WAIT_FAILED)
+      throw ThreadException("pthread_mutex_lock error", __LINE__, __FILE__);
+    return (0);
+  }
+} // namepsace mognetwork
+
+#endif // !OS_WINDOWS