some fixes

paul.moran · paul.moran · commit e2af4af38e43 · 2017-04-04T08:40:29.000+01:00
diff --git a/fluidsynth/src/platform_abstraction.cpp b/fluidsynth/src/platform_abstraction.cpp
@@ -55,17 +55,17 @@ extern "C"
 
     void do_mutex_free(void* ptr)
     {
-
+		delete reinterpret_cast<std::mutex*>(ptr);
     }
 
     void do_mutex_lock(void* ptr)
     {
-
+		reinterpret_cast<std::mutex*>(ptr)->lock();
     }
 
     void do_mutex_unlock(void* ptr)
     {
-
+		reinterpret_cast<std::mutex*>(ptr)->unlock();
     }
 
     // ==============================================
@@ -151,12 +151,6 @@ extern "C"
         return v;
     }
 
-    void* do_thread_self()
-    {
-      // return std::this_thread
-        return 0;
-    }
-
     int flud_atomic_int_get(int* ptr)
     {
         return *ptr;
@@ -167,13 +161,9 @@ extern "C"
     * @param thread Thread to join
     * @return FLUID_OK
     */
-    int
-        fluid_thread_join(void* thread)
+    int fluid_thread_join(void* thread)
     {
-        // TODO FIX ME
-
         reinterpret_cast<std::thread*>(thread)->join();
-        //  g_thread_join (thread);
 
         //return FLUID_OK;
         return 0;
@@ -190,7 +180,6 @@ extern "C"
         std::this_thread::sleep_for(std::chrono::milliseconds(v));
     }
 
-
     void fluid_get_current_time(struct fluid_time* ptr)
     {
         // TODO FIX ME
@@ -209,10 +198,7 @@ extern "C"
 
     void* new_fluid_thread(const char *name, fluid_thread_func_t func, void *data, int prio_level, int detach)
     {
-        // TODO FIX ME
-
         std::thread* t = new std::thread(func, data);
-        
         if (detach)
         {
             t->detach();
@@ -276,13 +262,8 @@ extern "C"
     * Frees data associated with a thread (does not actually stop thread).
     * @param thread Thread to free
     */
-    void
-        delete_fluid_thread(void* thread)
+    void delete_fluid_thread(void* thread)
     {
-        // TODO FIX ME
-
-        /* Threads free themselves when they quit, nothing to do */
-
         delete reinterpret_cast<std::thread*>(thread);
     }
 }
diff --git a/fluidsynth/src/synth/fluid_synth.c b/fluidsynth/src/synth/fluid_synth.c
@@ -2808,10 +2808,6 @@ fluid_synth_render_blocks(fluid_synth_t* synth, int blockcount)
 {
   int i;
   fluid_profile_ref_var (prof_ref);
-
-  /* Assign ID of synthesis thread */
-//  synth->synth_thread_id = fluid_thread_get_id ();
-
   fluid_check_fpe("??? Just starting up ???");
   
   fluid_rvoice_eventhandler_dispatch_all(synth->eventhandler);
diff --git a/fluidsynth/src/utils/fluid_sys.h b/fluidsynth/src/utils/fluid_sys.h
@@ -121,7 +121,6 @@ int do_atomic_int_add(volatile int* i, volatile int v);
 int do_atomic_int_get(volatile void* ptr);
 void do_atomic_int_set(volatile void* ptr, volatile int v);
 int do_atomic_int_exchange_and_add(volatile void* ptr, int v);
-void* do_thread_self();
 int flud_atomic_int_get(int* ptr);
 
 // TODO FIX ME
@@ -211,9 +210,9 @@ typedef void* fluid_mutex_t;
 
 /* Recursive lock capable mutex */
 typedef void* fluid_rec_mutex_t;
-#define fluid_rec_mutex_destroy(_m)   do_static_rec_mutex_free(&(_m))
-#define fluid_rec_mutex_lock(_m)      do_static_rec_mutex_lock(&(_m))
-#define fluid_rec_mutex_unlock(_m)    do_static_rec_mutex_unlock(&(_m))
+#define fluid_rec_mutex_destroy(_m)   do_static_rec_mutex_free(_m)
+#define fluid_rec_mutex_lock(_m)      do_static_rec_mutex_lock(_m)
+#define fluid_rec_mutex_unlock(_m)    do_static_rec_mutex_unlock(_m)
 
 #define fluid_rec_mutex_init(_m)      G_STMT_START { \
   if (!do_thread_supported ()) do_thread_init (NULL); \
@@ -298,7 +297,6 @@ typedef void (*fluid_thread_func_t)(void* data);
 
 #define FLUID_THREAD_ID_NULL            NULL                    /* A NULL "ID" value */
 #define fluid_thread_id_t               void *               /* Data type for a thread ID */
-#define fluid_thread_get_id()           do_thread_self()         /* Get unique "ID" for current thread */
 
 fluid_thread_t* new_fluid_thread(const char *name, fluid_thread_func_t func, void *data,
                                  int prio_level, int detach);

Original file line number	Diff line number	Diff line change
`@@ -55,17 +55,17 @@ extern "C"`
`55`	`55`
`56`	`56`	`void do_mutex_free(void* ptr)`
`57`	`57`	`{`
`58`		`-`
	`58`	`+ delete reinterpret_cast<std::mutex*>(ptr);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`void do_mutex_lock(void* ptr)`
`62`	`62`	`{`
`63`		`-`
	`63`	`+ reinterpret_cast<std::mutex*>(ptr)->lock();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`void do_mutex_unlock(void* ptr)`
`67`	`67`	`{`
`68`		`-`
	`68`	`+ reinterpret_cast<std::mutex*>(ptr)->unlock();`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// ==============================================`
`@@ -151,12 +151,6 @@ extern "C"`
`151`	`151`	`return v;`
`152`	`152`	`}`
`153`	`153`
`154`		`- void* do_thread_self()`
`155`		`- {`
`156`		`- // return std::this_thread`
`157`		`- return 0;`
`158`		`- }`
`159`		`-`
`160`	`154`	`int flud_atomic_int_get(int* ptr)`
`161`	`155`	`{`
`162`	`156`	`return *ptr;`
`@@ -167,13 +161,9 @@ extern "C"`
`167`	`161`	`* @param thread Thread to join`
`168`	`162`	`* @return FLUID_OK`
`169`	`163`	`*/`
`170`		`- int`
`171`		`- fluid_thread_join(void* thread)`
	`164`	`+ int fluid_thread_join(void* thread)`
`172`	`165`	`{`
`173`		`- // TODO FIX ME`
`174`		`-`
`175`	`166`	`reinterpret_cast<std::thread*>(thread)->join();`
`176`		`- // g_thread_join (thread);`
`177`	`167`
`178`	`168`	`//return FLUID_OK;`
`179`	`169`	`return 0;`
`@@ -190,7 +180,6 @@ extern "C"`
`190`	`180`	`std::this_thread::sleep_for(std::chrono::milliseconds(v));`
`191`	`181`	`}`
`192`	`182`
`193`		`-`
`194`	`183`	`void fluid_get_current_time(struct fluid_time* ptr)`
`195`	`184`	`{`
`196`	`185`	`// TODO FIX ME`
`@@ -209,10 +198,7 @@ extern "C"`
`209`	`198`
`210`	`199`	`void* new_fluid_thread(const char name, fluid_thread_func_t func, void data, int prio_level, int detach)`
`211`	`200`	`{`
`212`		`- // TODO FIX ME`
`213`		`-`
`214`	`201`	`std::thread* t = new std::thread(func, data);`
`215`		`-`
`216`	`202`	`if (detach)`
`217`	`203`	`{`
`218`	`204`	`t->detach();`
`@@ -276,13 +262,8 @@ extern "C"`
`276`	`262`	`* Frees data associated with a thread (does not actually stop thread).`
`277`	`263`	`* @param thread Thread to free`
`278`	`264`	`*/`
`279`		`- void`
`280`		`- delete_fluid_thread(void* thread)`
	`265`	`+ void delete_fluid_thread(void* thread)`
`281`	`266`	`{`
`282`		`- // TODO FIX ME`
`283`		`-`
`284`		`- /* Threads free themselves when they quit, nothing to do */`
`285`		`-`
`286`	`267`	`delete reinterpret_cast<std::thread*>(thread);`
`287`	`268`	`}`
`288`	`269`	`}`