[libgda] Misc.



commit cacf46fd09145643816ea48a96c74a0e9357ba9e
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun May 18 23:39:01 2014 +0200

    Misc.

 doc/C/libgda-sections.txt          |    1 -
 libgda/thread-wrapper/background.c |   23 ++++++++++++++++++++---
 libgda/thread-wrapper/gda-worker.c |    2 +-
 3 files changed, 21 insertions(+), 5 deletions(-)
---
diff --git a/doc/C/libgda-sections.txt b/doc/C/libgda-sections.txt
index 424ef9d..8f287b5 100644
--- a/doc/C/libgda-sections.txt
+++ b/doc/C/libgda-sections.txt
@@ -1916,7 +1916,6 @@ gda_worker_new
 gda_worker_new_unique
 gda_worker_ref
 gda_worker_unref
-gda_worker_unref_timed
 gda_worker_kill
 <SUBSECTION>
 GdaWorkerFunc
diff --git a/libgda/thread-wrapper/background.c b/libgda/thread-wrapper/background.c
index 5791918..99868cc 100644
--- a/libgda/thread-wrapper/background.c
+++ b/libgda/thread-wrapper/background.c
@@ -31,7 +31,10 @@
 #define SPARE_WORKER_DELAY_MS 2000
 #define SPARE_ITS_DELAY_MS 2000
 #define MAKE_STATS
-#undef MAKE_STATS
+//#undef MAKE_STATS
+
+#define DEBUG_BG
+#undef DEBUG_BG
 
 #ifdef MAKE_STATS
   #ifndef G_OS_WIN32
@@ -75,7 +78,9 @@ static void
 WorkerSpareData_free (WorkerSpareData *data)
 {
        if (data->worker) {
+#ifdef DEBUG_BG
                g_print ("[_gda_worker_bg_unref(%p)]\n", data->worker);
+#endif
                _gda_worker_bg_unref (data->worker);
        }
        g_slice_free (WorkerSpareData, data);
@@ -94,7 +99,9 @@ static void
 ItsSpareData_free (ItsSpareData *data)
 {
        if (data->its) {
+#ifdef DEBUG_BG
                g_print ("[_its_bg_unref(%p)]\n", data->its);
+#endif
                _itsignaler_bg_unref (data->its);
        }
        g_slice_free (ItsSpareData, data);
@@ -220,19 +227,25 @@ background_main (gpointer data)
                        case JOB_SPARE_WORKER:
                                g_mutex_lock (&bg_mutex);
                                g_array_append_val (spare_workers, job->u.u2);
+#ifdef DEBUG_BG
                                g_print ("[Cached GdaWorker %p]\n", job->u.u2->worker);
+#endif
                                g_mutex_unlock (&bg_mutex);
                                break;
                        case JOB_SPARE_ITS:
                                g_mutex_lock (&bg_mutex);
                                g_array_append_val (spare_its, job->u.u3);
+#ifdef DEBUG_BG
                                g_print ("[Cached ITS %p]\n", job->u.u3->its);
+#endif
                                g_mutex_unlock (&bg_mutex);
                                break;
                        case JOB_JOIN_THREAD: {
                                JoinThreadData *data;
                                data = job->u.u1;
+#ifdef DEBUG_BG
                                g_print ("[g_thread_join(%p)]\n", data->thread);
+#endif
 
                                bg_update_stats (BG_JOINED_THREADS);
 
@@ -273,12 +286,12 @@ _bg_start (void)
 
        if (!th_started) {
                GThread *th;
-               th = g_thread_new ("background", background_main, NULL);
+               th = g_thread_new ("gdaBackground", background_main, NULL);
                if (th) {
                        th_started = TRUE;
                }
                else
-                       g_print ("Failed to start BACKGROUND thread\n");
+                       g_warning ("Failed to start Gda's background thread\n");
        }
 
        g_mutex_unlock (&bg_mutex);
@@ -357,7 +370,9 @@ bg_get_spare_gda_worker (void)
                WorkerSpareData_free (data);
 
                g_array_remove_index (spare_workers, 0);
+#ifdef DEBUG_BG
                g_print ("[Fetched cached GdaWorker %p]\n", worker);
+#endif
 
                bg_update_stats (BG_REUSED_WORKER_FROM_CACHE);
        }
@@ -420,7 +435,9 @@ bg_get_spare_its (void)
                ItsSpareData_free (data);
 
                g_array_remove_index (spare_its, 0);
+#ifdef DEBUG_BG
                g_print ("[Fetched cached ITS %p]\n", its);
+#endif
 
                bg_update_stats (BG_REUSED_ITS_FROM_CACHE);
        }
diff --git a/libgda/thread-wrapper/gda-worker.c b/libgda/thread-wrapper/gda-worker.c
index a05a620..3dac56b 100644
--- a/libgda/thread-wrapper/gda-worker.c
+++ b/libgda/thread-wrapper/gda-worker.c
@@ -264,7 +264,7 @@ gda_worker_new (void)
        g_rec_mutex_init (& worker->rmutex);
 
        gchar *str;
-       str = g_strdup_printf ("ForWkr%p", worker);
+       str = g_strdup_printf ("gdaForWkr%p", worker);
        worker->worker_thread = g_thread_try_new (str, (GThreadFunc) worker_thread_main, worker, NULL);
        g_free (str);
        if (!worker->worker_thread) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]