Remove the mutex classes in favor of C++0x's std::mutex and std::lock_guard

13 files changed, 412 insertions, 0 deletions

diff --git a/Attic/mutex.h b/Attic/mutex.h
new file mode 100644
index 000000000..a04ff83c9
--- /dev/null
+++ b/Attic/mutex.h
@@ -0,0 +1,56 @@
+/*
+* Mutex
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_MUTEX_H__
+#define BOTAN_MUTEX_H__
+
+#include <botan/exceptn.h>
+
+namespace Botan {
+
+/*
+* Mutex Base Class
+*/
+class BOTAN_DLL Mutex
+   {
+   public:
+      virtual void lock() = 0;
+      virtual void unlock() = 0;
+      virtual ~Mutex() {}
+   };
+
+/*
+* Mutex Factory
+*/
+class BOTAN_DLL Mutex_Factory
+   {
+   public:
+      virtual Mutex* make() = 0;
+      virtual ~Mutex_Factory() {}
+   };
+
+/*
+* Mutex Holding Class
+*/
+class BOTAN_DLL Mutex_Holder
+   {
+   public:
+      Mutex_Holder(Mutex* m) : mux(m)
+         {
+         if(!mux)
+            throw Invalid_Argument("Mutex_Holder: Argument was NULL");
+         mux->lock();
+         }
+
+      ~Mutex_Holder() { mux->unlock(); }
+   private:
+      Mutex* mux;
+   };
+
+}
+
+#endif
diff --git a/Attic/mutex/noop_mutex/info.txt b/Attic/mutex/noop_mutex/info.txt
new file mode 100644
index 000000000..1f49f5e1c
--- /dev/null
+++ b/Attic/mutex/noop_mutex/info.txt
@@ -0,0 +1,10 @@
+realname "No-Op Mutex"
+
+load_on auto
+
+define MUTEX_NOOP
+
+<add>
+mux_noop.cpp
+mux_noop.h
+</add>
diff --git a/Attic/mutex/noop_mutex/mux_noop.cpp b/Attic/mutex/noop_mutex/mux_noop.cpp
new file mode 100644
index 000000000..5c45084fe
--- /dev/null
+++ b/Attic/mutex/noop_mutex/mux_noop.cpp
@@ -0,0 +1,50 @@
+/*
+* No-Op Mutex Factory
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/mux_noop.h>
+
+namespace Botan {
+
+/*
+* No-Op Mutex Factory
+*/
+Mutex* Noop_Mutex_Factory::make()
+   {
+   class Noop_Mutex : public Mutex
+      {
+      public:
+         class Mutex_State_Error : public Internal_Error
+            {
+            public:
+               Mutex_State_Error(const std::string& where) :
+                  Internal_Error("Noop_Mutex::" + where + ": " +
+                                 "Mutex is already " + where + "ed") {}
+            };
+
+         void lock()
+            {
+            if(locked)
+               throw Mutex_State_Error("lock");
+            locked = true;
+            }
+
+         void unlock()
+            {
+            if(!locked)
+               throw Mutex_State_Error("unlock");
+            locked = false;
+            }
+
+         Noop_Mutex() { locked = false; }
+      private:
+         bool locked;
+      };
+
+   return new Noop_Mutex;
+   }
+
+}
diff --git a/Attic/mutex/noop_mutex/mux_noop.h b/Attic/mutex/noop_mutex/mux_noop.h
new file mode 100644
index 000000000..94201cb7c
--- /dev/null
+++ b/Attic/mutex/noop_mutex/mux_noop.h
@@ -0,0 +1,26 @@
+/*
+* No-Op Mutex Factory
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_NOOP_MUTEX_FACTORY_H__
+#define BOTAN_NOOP_MUTEX_FACTORY_H__
+
+#include <botan/mutex.h>
+
+namespace Botan {
+
+/*
+* No-Op Mutex Factory
+*/
+class BOTAN_DLL Noop_Mutex_Factory : public Mutex_Factory
+   {
+   public:
+      Mutex* make();
+   };
+
+}
+
+#endif
diff --git a/Attic/mutex/pthreads/info.txt b/Attic/mutex/pthreads/info.txt
new file mode 100644
index 000000000..88de70de0
--- /dev/null
+++ b/Attic/mutex/pthreads/info.txt
@@ -0,0 +1,29 @@
+realname "Pthread Mutex"
+
+define MUTEX_PTHREAD
+
+load_on auto
+
+<add>
+mux_pthr.cpp
+mux_pthr.h
+</add>
+
+<libs>
+all!qnx,freebsd,openbsd,netbsd -> pthread
+</libs>
+
+<os>
+aix
+cygwin
+darwin
+freebsd
+hpux
+irix
+linux
+netbsd
+openbsd
+qnx
+solaris
+tru64
+</os>
diff --git a/Attic/mutex/pthreads/mux_pthr.cpp b/Attic/mutex/pthreads/mux_pthr.cpp
new file mode 100644
index 000000000..9f1d9816e
--- /dev/null
+++ b/Attic/mutex/pthreads/mux_pthr.cpp
@@ -0,0 +1,58 @@
+/*
+* Pthread Mutex
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/mux_pthr.h>
+#include <botan/exceptn.h>
+
+#ifndef _POSIX_C_SOURCE
+  #define _POSIX_C_SOURCE 199506
+#endif
+
+#include <pthread.h>
+
+namespace Botan {
+
+/*
+* Pthread Mutex Factory
+*/
+Mutex* Pthread_Mutex_Factory::make()
+   {
+
+   class Pthread_Mutex : public Mutex
+      {
+      public:
+         void lock()
+            {
+            if(pthread_mutex_lock(&mutex) != 0)
+               throw Exception("Pthread_Mutex::lock: Error occured");
+            }
+
+         void unlock()
+            {
+            if(pthread_mutex_unlock(&mutex) != 0)
+               throw Exception("Pthread_Mutex::unlock: Error occured");
+            }
+
+         Pthread_Mutex()
+            {
+            if(pthread_mutex_init(&mutex, 0) != 0)
+               throw Exception("Pthread_Mutex: initialization failed");
+            }
+
+         ~Pthread_Mutex()
+            {
+            if(pthread_mutex_destroy(&mutex) != 0)
+               throw Invalid_State("~Pthread_Mutex: mutex is still locked");
+            }
+      private:
+         pthread_mutex_t mutex;
+      };
+
+   return new Pthread_Mutex();
+   }
+
+}
diff --git a/Attic/mutex/pthreads/mux_pthr.h b/Attic/mutex/pthreads/mux_pthr.h
new file mode 100644
index 000000000..118853947
--- /dev/null
+++ b/Attic/mutex/pthreads/mux_pthr.h
@@ -0,0 +1,26 @@
+/*
+* Pthread Mutex
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_MUTEX_PTHREAD_H__
+#define BOTAN_MUTEX_PTHREAD_H__
+
+#include <botan/mutex.h>
+
+namespace Botan {
+
+/*
+* Pthread Mutex Factory
+*/
+class BOTAN_DLL Pthread_Mutex_Factory : public Mutex_Factory
+   {
+   public:
+      Mutex* make();
+   };
+
+}
+
+#endif
diff --git a/Attic/mutex/qt_mutex/info.txt b/Attic/mutex/qt_mutex/info.txt
new file mode 100644
index 000000000..a21108c79
--- /dev/null
+++ b/Attic/mutex/qt_mutex/info.txt
@@ -0,0 +1,18 @@
+realname "Qt Mutex"
+
+define MUTEX_QT
+
+note "You'll probably have to add -I/-L flags to the Makefile to find Qt"
+
+load_on request
+
+<add>
+mux_qt.cpp
+mux_qt.h
+</add>
+
+# I think we want to always use qt-mt, not qt -- not much point in supporting
+# mutexes in a single threaded application, after all.
+<libs>
+all -> qt-mt
+</libs>
diff --git a/Attic/mutex/qt_mutex/mux_qt.cpp b/Attic/mutex/qt_mutex/mux_qt.cpp
new file mode 100644
index 000000000..0f670c8b4
--- /dev/null
+++ b/Attic/mutex/qt_mutex/mux_qt.cpp
@@ -0,0 +1,35 @@
+/*
+* Qt Thread Mutex
+* (C) 2004-2007 Justin Karneges
+*     2004-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/mux_qt.h>
+#include <qmutex.h>
+
+#if !defined(QT_THREAD_SUPPORT)
+   #error Your version of Qt does not support threads or mutexes
+#endif
+
+namespace Botan {
+
+/*
+* Qt Mutex Factory
+*/
+Mutex* Qt_Mutex_Factory::make()
+   {
+   class Qt_Mutex : public Mutex
+      {
+      public:
+         void lock() { mutex.lock(); }
+         void unlock() { mutex.unlock(); }
+      private:
+         QMutex mutex;
+      };
+
+   return new Qt_Mutex();
+   }
+
+}
diff --git a/Attic/mutex/qt_mutex/mux_qt.h b/Attic/mutex/qt_mutex/mux_qt.h
new file mode 100644
index 000000000..5aed77f4b
--- /dev/null
+++ b/Attic/mutex/qt_mutex/mux_qt.h
@@ -0,0 +1,27 @@
+/*
+* Qt Mutex
+* (C) 2004-2007 Justin Karneges
+*     2004-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_MUTEX_QT_H__
+#define BOTAN_MUTEX_QT_H__
+
+#include <botan/mutex.h>
+
+namespace Botan {
+
+/*
+* Qt Mutex
+*/
+class BOTAN_DLL Qt_Mutex_Factory : public Mutex_Factory
+   {
+   public:
+      Mutex* make();
+   };
+
+}
+
+#endif
diff --git a/Attic/mutex/win32_crit_section/info.txt b/Attic/mutex/win32_crit_section/info.txt
new file mode 100644
index 000000000..a2d339c3b
--- /dev/null
+++ b/Attic/mutex/win32_crit_section/info.txt
@@ -0,0 +1,17 @@
+realname "Win32 Mutex"
+
+define MUTEX_WIN32
+modset win32
+
+load_on auto
+
+<add>
+mux_win32.cpp
+mux_win32.h
+</add>
+
+<os>
+cygwin
+windows
+mingw
+</os>
diff --git a/Attic/mutex/win32_crit_section/mux_win32.cpp b/Attic/mutex/win32_crit_section/mux_win32.cpp
new file mode 100644
index 000000000..2a967892b
--- /dev/null
+++ b/Attic/mutex/win32_crit_section/mux_win32.cpp
@@ -0,0 +1,34 @@
+/*
+* Win32 Mutex
+* (C) 2006 Luca Piccarreta
+*     2006-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/mux_win32.h>
+#include <windows.h>
+
+namespace Botan {
+
+/*
+* Win32 Mutex Factory
+*/
+Mutex* Win32_Mutex_Factory::make()
+   {
+   class Win32_Mutex : public Mutex
+      {
+      public:
+         void lock() { EnterCriticalSection(&mutex); }
+         void unlock() { LeaveCriticalSection(&mutex); }
+
+         Win32_Mutex() { InitializeCriticalSection(&mutex); }
+         ~Win32_Mutex() { DeleteCriticalSection(&mutex); }
+      private:
+         CRITICAL_SECTION mutex;
+      };
+
+   return new Win32_Mutex();
+   }
+
+}
diff --git a/Attic/mutex/win32_crit_section/mux_win32.h b/Attic/mutex/win32_crit_section/mux_win32.h
new file mode 100644
index 000000000..a91850e71
--- /dev/null
+++ b/Attic/mutex/win32_crit_section/mux_win32.h
@@ -0,0 +1,26 @@
+/*
+* Win32 Mutex
+* (C) 2006 Luca Piccarreta
+*     2006-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_MUTEX_WIN32_H__
+#define BOTAN_MUTEX_WIN32_H__
+
+#include <botan/mutex.h>
+
+namespace Botan {
+
+/*
+* Win32 Mutex Factory
+*/
+class BOTAN_DLL Win32_Mutex_Factory : public Mutex_Factory
+   {
+   public:
+      Mutex* make();
+   };
+}
+
+#endif