re-add TLSF

[ardour.git] / libs / pbd / pbd / abstract_ui.h

diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h
index dc5620b2ef76354358862d03e8a1fcd594fb1c42..78a337fc40bcf601045120ec21724b4954c5bcdd 100644 (file)
--- a/libs/pbd/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1998-2009 Paul Davis 
+    Copyright (C) 1998-2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 /* We have a special case in libpbd of a template class that gets instantiated
  * as the base class of several classes in other libraries. It is not possible
- * to use LIBFOO_API to mark this visible, because the FOO in each case is 
+ * to use LIBFOO_API to mark this visible, because the FOO in each case is
  * different. So we define this generic visible/export/hidden/import pair
  * of macros to try to deal with this special case. These should NEVER be
  * used anywhere except AbstractUI<T> (or similar cases if they arise.
@@ -46,7 +46,7 @@
 #define ABSTRACT_UI_API LIBPBD_DLL_EXPORT
 #else
 #define ABSTRACT_UI_API LIBPBD_DLL_IMPORT
-#endif 
+#endif
 
 
 class Touchable;
@@ -58,25 +58,24 @@ class ABSTRACT_UI_API AbstractUI : public BaseUI
        AbstractUI (const std::string& name);
        virtual ~AbstractUI() {}
 
-       void register_thread (std::string, pthread_t, std::string, uint32_t num_requests);
+       void register_thread (pthread_t, std::string, uint32_t num_requests);
        void call_slot (EventLoop::InvalidationRecord*, const boost::function<void()>&);
         Glib::Threads::Mutex& slot_invalidation_mutex() { return request_buffer_map_lock; }
 
        Glib::Threads::Mutex request_buffer_map_lock;
 
+       static void* request_buffer_factory (uint32_t num_requests);
+
   protected:
        struct RequestBuffer : public PBD::RingBufferNPT<RequestObject> {
                 bool dead;
-                AbstractUI<RequestObject>& ui;
-                RequestBuffer (uint32_t size, AbstractUI<RequestObject>& uir) 
+                RequestBuffer (uint32_t size)
                         : PBD::RingBufferNPT<RequestObject> (size)
-                        , dead (false) 
-                        , ui (uir) {}
+                       , dead (false) {}
         };
        typedef typename RequestBuffer::rw_vector RequestBufferVector;
 
-#if defined(__MINGW32__) && !defined (__MINGW64__)
-
+#if defined(COMPILER_MINGW) && defined(PTW32_VERSION)
        struct pthread_cmp
        {
                bool operator() (const ptw32_handle_t& thread1, const ptw32_handle_t& thread2)
@@ -93,10 +92,10 @@ class ABSTRACT_UI_API AbstractUI : public BaseUI
 
        RequestBufferMap request_buffers;
         static Glib::Threads::Private<RequestBuffer> per_thread_request_buffer;
-       
+
        Glib::Threads::Mutex               request_list_lock;
        std::list<RequestObject*> request_list;
-       
+
        RequestObject* get_request (RequestType);
        void handle_ui_requests ();
        void send_request (RequestObject *);
@@ -106,5 +105,3 @@ class ABSTRACT_UI_API AbstractUI : public BaseUI
 };
 
 #endif /* __pbd_abstract_ui_h__ */
-
-