Changeset 9359 in orxonox.OLD for branches

Timestamp:

Jul 20, 2006, 3:48:54 PM (18 years ago)

Author:

bensch

Message:

splitted sigslot into signal.h and slot.h

Location:

branches/proxy/src/lib/util/sigslot

Files:

• signal.h (moved) (moved from branches/proxy/src/lib/util/sigslot/sigslot.h) (2 diffs)
• slot.h (added)

branches/proxy/src/lib/util/sigslot/signal.h

@@ -102 +102 @@
 #endif
 
+#include "slot.h"
+
 
 namespace sigslot
 {
 
-  class single_threaded
-  {
-    public:
-      single_threaded()
-      {
-        ;
-      }
-
-      virtual ~single_threaded()
-      {
-        ;
-      }
-
-      virtual void lock()
-      {
-        ;
-      }
-
-      virtual void unlock()
-      {
-        ;
-      }
-  };
-
-#ifdef _SIGSLOT_HAS_WIN32_THREADS
-  // The multi threading policies only get compiled in if they are enabled.
-  class multi_threaded_global
-  {
-    public:
-      multi_threaded_global()
-      {
-        static bool isinitialised = false;
-
-        if(!isinitialised)
-        {
-          InitializeCriticalSection(get_critsec());
-          isinitialised = true;
-        }
-      }
-
-      multi_threaded_global(const multi_threaded_global&)
-      {
-        ;
-      }
-
-      virtual ~multi_threaded_global()
-      {
-        ;
-      }
-
-      virtual void lock()
-      {
-        EnterCriticalSection(get_critsec());
-      }
-
-      virtual void unlock()
-      {
-        LeaveCriticalSection(get_critsec());
-      }
-
-    private:
-      CRITICAL_SECTION* get_critsec()
-      {
-        static CRITICAL_SECTION g_critsec;
-        return &g_critsec;
-      }
-  };
-
-  class multi_threaded_local
-  {
-    public:
-      multi_threaded_local()
-      {
-        InitializeCriticalSection(&m_critsec);
-      }
-
-      multi_threaded_local(const multi_threaded_local&)
-      {
-        InitializeCriticalSection(&m_critsec);
-      }
-
-      virtual ~multi_threaded_local()
-      {
-        DeleteCriticalSection(&m_critsec);
-      }
-
-      virtual void lock()
-      {
-        EnterCriticalSection(&m_critsec);
-      }
-
-      virtual void unlock()
-      {
-        LeaveCriticalSection(&m_critsec);
-      }
-
-    private:
-      CRITICAL_SECTION m_critsec;
-  };
-#endif // _SIGSLOT_HAS_WIN32_THREADS
-
-#ifdef _SIGSLOT_HAS_POSIX_THREADS
-  // The multi threading policies only get compiled in if they are enabled.
-  class multi_threaded_global
-  {
-    public:
-      multi_threaded_global()
-      {
-        pthread_mutex_init(get_mutex(), NULL);
-      }
-
-      multi_threaded_global(const multi_threaded_global&)
-      {
-        ;
-      }
-
-      virtual ~multi_threaded_global()
-      {
-        ;
-      }
-
-      virtual void lock()
-      {
-        pthread_mutex_lock(get_mutex());
-      }
-
-      virtual void unlock()
-      {
-        pthread_mutex_unlock(get_mutex());
-      }
-
-    private:
-      pthread_mutex_t* get_mutex()
-      {
-        static pthread_mutex_t g_mutex;
-        return &g_mutex;
-      }
-  };
-
-  class multi_threaded_local
-  {
-    public:
-      multi_threaded_local()
-      {
-        pthread_mutex_init(&m_mutex, NULL);
-      }
-
-      multi_threaded_local(const multi_threaded_local&)
-      {
-        pthread_mutex_init(&m_mutex, NULL);
-      }
-
-      virtual ~multi_threaded_local()
-      {
-        pthread_mutex_destroy(&m_mutex);
-      }
-
-      virtual void lock()
-      {
-        pthread_mutex_lock(&m_mutex);
-      }
-
-      virtual void unlock()
-      {
-        pthread_mutex_unlock(&m_mutex);
-      }
-
-    private:
-      pthread_mutex_t m_mutex;
-  };
-#endif // _SIGSLOT_HAS_POSIX_THREADS
-
-  template<class mt_policy>
-  class lock_block
-  {
-    public:
-      mt_policy *m_mutex;
-
-      lock_block(mt_policy *mtx)
-          : m_mutex(mtx)
-      {
-        m_mutex->lock();
-      }
-
-      ~lock_block()
-      {
-        m_mutex->unlock();
-      }
-  };
-
-  template<class mt_policy>
-  class has_slots;
 
   template<class mt_policy>
@@ -406 +216 @@
 
   template<class mt_policy>
-  class _signal_base : public mt_policy
-  {
-    public:
-      virtual void slot_disconnect(has_slots<mt_policy>* pslot) = 0;
-      virtual void slot_duplicate(const has_slots<mt_policy>* poldslot, has_slots<mt_policy>* pnewslot) = 0;
-  };
-
-  template<class mt_policy = SIGSLOT_DEFAULT_MT_POLICY>
-  class has_slots : public mt_policy
-  {
-    private:
-      typedef std::set<_signal_base<mt_policy> *> sender_set;
-      typedef typename sender_set::const_iterator const_iterator;
-
-    public:
-      has_slots()
-      {
-        ;
-      }
-
-      has_slots(const has_slots& hs)
-          : mt_policy(hs)
-      {
-        lock_block<mt_policy> lock(this);
-        const_iterator it = hs.m_senders.begin();
-        const_iterator itEnd = hs.m_senders.end();
-
-        while(it != itEnd)
-        {
-          (*it)->slot_duplicate(&hs, this);
-          m_senders.insert(*it);
-          ++it;
-        }
-      }
-
-      void signal_connect(_signal_base<mt_policy>* sender)
-      {
-        lock_block<mt_policy> lock(this);
-        m_senders.insert(sender);
-      }
-
-      void signal_disconnect(_signal_base<mt_policy>* sender)
-      {
-        lock_block<mt_policy> lock(this);
-        m_senders.erase(sender);
-      }
-
-      virtual ~has_slots()
-      {
-        disconnect_all();
-      }
-
-      void disconnect_all()
-      {
-        lock_block<mt_policy> lock(this);
-        const_iterator it = m_senders.begin();
-        const_iterator itEnd = m_senders.end();
-
-        while(it != itEnd)
-        {
-          (*it)->slot_disconnect(this);
-          ++it;
-        }
-
-        m_senders.erase(m_senders.begin(), m_senders.end());
-      }
-
-    private:
-      sender_set m_senders;
-  };
-
-  template<class mt_policy>
   class _signal_base0 : public _signal_base<mt_policy>
   {