Bug 556186 – gpoll.h breaks gmain.h inclusion
[platform/upstream/glib.git] / glib / gthreadpool.c
index 1ccc73b..2059a99 100644 (file)
@@ -29,8 +29,8 @@
 #include "glib.h"
 #include "galias.h"
 
-#define DEBUG_MSG(x)
-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");  */
+#define DEBUG_MSG(x)  
+/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");    */
 
 typedef struct _GRealThreadPool GRealThreadPool;
 
@@ -38,6 +38,7 @@ struct _GRealThreadPool
 {
   GThreadPool pool;
   GAsyncQueue* queue;
+  GCond* cond;
   gint max_threads;
   gint num_threads;
   gboolean running;
@@ -54,23 +55,21 @@ static const gpointer wakeup_thread_marker = (gpointer) &g_thread_pool_new;
 static gint wakeup_thread_serial = 0;
 
 /* Here all unused threads are waiting  */
-static GAsyncQueue *unused_thread_queue;
+static GAsyncQueue *unused_thread_queue = NULL;
 static gint unused_threads = 0;
 static gint max_unused_threads = 0;
+static gint kill_unused_threads = 0;
 static guint max_idle_time = 0;
 
-static GMutex *inform_mutex = NULL;
-static GCond *inform_cond = NULL;
-
-
-static void     g_thread_pool_queue_push_unlocked (GRealThreadPool  *pool,
-                                                  gpointer          data);
-static void     g_thread_pool_free_internal       (GRealThreadPool  *pool);
-static gpointer g_thread_pool_thread_proxy        (gpointer          data);
-static void     g_thread_pool_start_thread        (GRealThreadPool  *pool,
-                                                  GError          **error);
-static void     g_thread_pool_wakeup_and_stop_all (GRealThreadPool  *pool);
-
+static void             g_thread_pool_queue_push_unlocked (GRealThreadPool  *pool,
+                                                          gpointer          data);
+static void             g_thread_pool_free_internal       (GRealThreadPool  *pool);
+static gpointer         g_thread_pool_thread_proxy        (gpointer          data);
+static void             g_thread_pool_start_thread        (GRealThreadPool  *pool,
+                                                          GError          **error);
+static void             g_thread_pool_wakeup_and_stop_all (GRealThreadPool  *pool);
+static GRealThreadPool* g_thread_pool_wait_for_new_pool   (void);
+static gpointer         g_thread_pool_wait_for_new_task   (GRealThreadPool  *pool);
 
 static void
 g_thread_pool_queue_push_unlocked (GRealThreadPool *pool,
@@ -85,73 +84,181 @@ g_thread_pool_queue_push_unlocked (GRealThreadPool *pool,
     g_async_queue_push_unlocked (pool->queue, data);
 }
 
-static gpointer 
-g_thread_pool_thread_proxy (gpointer data)
+static GRealThreadPool*
+g_thread_pool_wait_for_new_pool (void)
 {
-  GRealThreadPool *pool = data;
-  guint last_wakeup_thread_serial = 0;
+  GRealThreadPool *pool;
+  gint local_wakeup_thread_serial;
+  guint local_max_unused_threads;
+  gint local_max_idle_time;
+  gint last_wakeup_thread_serial;
+  gboolean have_relayed_thread_marker = FALSE;
 
-  DEBUG_MSG (("thread %p started for pool %p.", 
-             g_thread_self (), pool));
+  local_max_unused_threads = g_atomic_int_get (&max_unused_threads);
+  local_max_idle_time = g_atomic_int_get (&max_idle_time);
+  last_wakeup_thread_serial = g_atomic_int_get (&wakeup_thread_serial);
 
-  g_async_queue_lock (pool->queue);
-  while (TRUE)
+  g_atomic_int_inc (&unused_threads);
+
+  do
     {
-      gpointer task = NULL; 
+      if (g_atomic_int_get (&unused_threads) >= local_max_unused_threads)
+       {
+         /* If this is a superfluous thread, stop it. */
+         pool = NULL;
+       }
+      else if (local_max_idle_time > 0)
+       {
+         /* If a maximal idle time is given, wait for the given time. */
+         GTimeVal end_time;
+
+         g_get_current_time (&end_time);
+         g_time_val_add (&end_time, local_max_idle_time * 1000);
+
+         DEBUG_MSG (("thread %p waiting in global pool for %f seconds.",
+                     g_thread_self (), local_max_idle_time / 1000.0));
 
-      if (pool->running || (!pool->immediate && 
-                           g_async_queue_length_unlocked (pool->queue) > 0))
+         pool = g_async_queue_timed_pop (unused_thread_queue, &end_time);
+       }
+      else
        {
-         /* This thread pool is still active. */
-         if (pool->num_threads > pool->max_threads && 
-             pool->max_threads != -1)
-           {
-             /* This is a superfluous thread, so it goes to the
-              * global pool. */
-             DEBUG_MSG (("superfluous thread %p in pool %p.", 
-                         g_thread_self (), pool));
-           }
-         else if (pool->pool.exclusive)
+         /* If no maximal idle time is given, wait indefinitely. */
+         DEBUG_MSG (("thread %p waiting in global pool.",
+                     g_thread_self ()));
+         pool = g_async_queue_pop (unused_thread_queue);
+       }
+
+      if (pool == wakeup_thread_marker)
+       {
+         local_wakeup_thread_serial = g_atomic_int_get (&wakeup_thread_serial);
+         if (last_wakeup_thread_serial == local_wakeup_thread_serial)
            {
-             /* Exclusive threads stay attached to the pool. */
-             task = g_async_queue_pop_unlocked (pool->queue);
-             DEBUG_MSG (("thread %p in exclusive pool %p waits for task "
-                         "(%d running, %d unprocessed).", 
-                         g_thread_self (), pool, pool->num_threads,
-                         g_async_queue_length_unlocked (pool->queue)));
+             if (!have_relayed_thread_marker)
+             {
+               /* If this wakeup marker has been received for
+                * the second time, relay it. 
+                */
+               DEBUG_MSG (("thread %p relaying wakeup message to "
+                           "waiting thread with lower serial.",
+                           g_thread_self ()));
+
+               g_async_queue_push (unused_thread_queue, wakeup_thread_marker);
+               have_relayed_thread_marker = TRUE;
+
+               /* If a wakeup marker has been relayed, this thread
+                * will get out of the way for 100 microseconds to
+                * avoid receiving this marker again. */
+               g_usleep (100);
+             }
            }
          else
            {
-             /* A thread will wait for new tasks for at most 1/2
-              * second before going to the global pool. */
-             GTimeVal end_time;
-             g_get_current_time (&end_time);
-             g_time_val_add (&end_time, G_USEC_PER_SEC / 2); /* 1/2 second */
-             DEBUG_MSG (("thread %p in pool %p waits 1/2 second for task "
-                         "(%d running, %d unprocessed).", 
-                         g_thread_self (), pool, pool->num_threads,
-                         g_async_queue_length_unlocked (pool->queue)));
-             task = g_async_queue_timed_pop_unlocked (pool->queue, &end_time);
+             if (g_atomic_int_exchange_and_add (&kill_unused_threads, -1) > 0)
+               {
+                 pool = NULL;
+                 break;
+               }
+
+             DEBUG_MSG (("thread %p updating to new limits.",
+                         g_thread_self ()));
+
+             local_max_unused_threads = g_atomic_int_get (&max_unused_threads);
+             local_max_idle_time = g_atomic_int_get (&max_idle_time);
+             last_wakeup_thread_serial = local_wakeup_thread_serial;
+
+             have_relayed_thread_marker = FALSE;
            }
        }
+    }
+  while (pool == wakeup_thread_marker);
+
+  g_atomic_int_add (&unused_threads, -1);
+
+  return pool;
+}
+
+static gpointer
+g_thread_pool_wait_for_new_task (GRealThreadPool *pool)
+{
+  gpointer task = NULL;
+
+  if (pool->running || (!pool->immediate &&
+                       g_async_queue_length_unlocked (pool->queue) > 0))
+    {
+      /* This thread pool is still active. */
+      if (pool->num_threads > pool->max_threads && pool->max_threads != -1)
+       {
+         /* This is a superfluous thread, so it goes to the global pool. */
+         DEBUG_MSG (("superfluous thread %p in pool %p.",
+                     g_thread_self (), pool));
+       }
+      else if (pool->pool.exclusive)
+       {
+         /* Exclusive threads stay attached to the pool. */
+         task = g_async_queue_pop_unlocked (pool->queue);
+
+         DEBUG_MSG (("thread %p in exclusive pool %p waits for task "
+                     "(%d running, %d unprocessed).",
+                     g_thread_self (), pool, pool->num_threads,
+                     g_async_queue_length_unlocked (pool->queue)));
+       }
       else
        {
-         /* This thread pool should is inactive, it will no longer
-          * process tasks. */
-         DEBUG_MSG (("pool %p not active, thread %p will go to global pool "
-                     "(running: %s, immediate: %s, len: %d).", 
-                     pool, g_thread_self (), 
-                     pool->running ? "true" : "false", 
-                     pool->immediate ? "true" : "false",
+         /* A thread will wait for new tasks for at most 1/2
+          * second before going to the global pool.
+          */
+         GTimeVal end_time;
+
+         g_get_current_time (&end_time);
+         g_time_val_add (&end_time, G_USEC_PER_SEC / 2);       /* 1/2 second */
+
+         DEBUG_MSG (("thread %p in pool %p waits for up to a 1/2 second for task "
+                     "(%d running, %d unprocessed).",
+                     g_thread_self (), pool, pool->num_threads,
                      g_async_queue_length_unlocked (pool->queue)));
+
+         task = g_async_queue_timed_pop_unlocked (pool->queue, &end_time);
        }
-      
+    }
+  else
+    {
+      /* This thread pool is inactive, it will no longer process tasks. */
+      DEBUG_MSG (("pool %p not active, thread %p will go to global pool "
+                 "(running: %s, immediate: %s, len: %d).",
+                 pool, g_thread_self (),
+                 pool->running ? "true" : "false",
+                 pool->immediate ? "true" : "false",
+                 g_async_queue_length_unlocked (pool->queue)));
+    }
+
+  return task;
+}
+
+
+static gpointer 
+g_thread_pool_thread_proxy (gpointer data)
+{
+  GRealThreadPool *pool;
+
+  pool = data;
+
+  DEBUG_MSG (("thread %p started for pool %p.", 
+             g_thread_self (), pool));
+
+  g_async_queue_lock (pool->queue);
+
+  while (TRUE)
+    {
+      gpointer task;
+
+      task = g_thread_pool_wait_for_new_task (pool);
       if (task)
        {
          if (pool->running || !pool->immediate)
            {
              /* A task was received and the thread pool is active, so
-              * execute the function. */
+              * execute the function. 
+              */
              g_async_queue_unlock (pool->queue);
              DEBUG_MSG (("thread %p in pool %p calling func.", 
                          g_thread_self (), pool));
@@ -162,7 +269,8 @@ g_thread_pool_thread_proxy (gpointer data)
       else
        {
          /* No task was received, so this thread goes to the global
-          * pool. */
+          * pool. 
+          */
          gboolean free_pool = FALSE;
  
          DEBUG_MSG (("thread %p leaving pool %p for global pool.", 
@@ -178,7 +286,8 @@ g_thread_pool_thread_proxy (gpointer data)
                      /* If the pool is not running and no other
                       * thread is waiting for this thread pool to
                       * finish and this is the last thread of this
-                      * pool, free the pool. */
+                      * pool, free the pool.
+                      */
                      free_pool = TRUE;
                    }           
                  else 
@@ -187,7 +296,8 @@ g_thread_pool_thread_proxy (gpointer data)
                       * thread is waiting for this thread pool to
                       * finish and this is not the last thread of
                       * this pool and there are no tasks left in the
-                      * queue, wakeup the remaining threads. */
+                      * queue, wakeup the remaining threads. 
+                      */
                      if (g_async_queue_length_unlocked (pool->queue) == 
                          - pool->num_threads)
                        g_thread_pool_wakeup_and_stop_all (pool);
@@ -200,96 +310,20 @@ g_thread_pool_thread_proxy (gpointer data)
                   * waiting for this thread pool to finish and there
                   * are either no tasks left or the pool shall stop
                   * immediatly, inform the waiting thread of a change
-                  * of the thread pool state. */
-                 g_cond_broadcast (inform_cond);
+                  * of the thread pool state. 
+                  */
+                 g_cond_broadcast (pool->cond);
                }
            }
+
          g_async_queue_unlock (pool->queue);
 
          if (free_pool)
            g_thread_pool_free_internal (pool);
-         
-         g_async_queue_lock (unused_thread_queue);
-         unused_threads++;
 
-         do
-           {
-             
-             if ((unused_threads >= max_unused_threads &&
-                  max_unused_threads != -1))
-               {
-                 /* If this is a superflous thread, stop it. */
-                 unused_threads--;
-                 g_async_queue_unlock (unused_thread_queue);
-                 DEBUG_MSG (("stopping thread %p.", g_thread_self ()));
-                 return NULL;      
-               }
-             
-             if (max_idle_time > 0)
-               {
-                 /* If a maximal idle time is given, wait for the
-                  * given time. */
-                 GTimeVal end_time;
-                 g_get_current_time (&end_time);
-                 g_time_val_add (&end_time, max_idle_time * 1000);
-                 
-                 DEBUG_MSG (("thread %p waiting in global pool for "
-                             "%f seconds.",
-                             g_thread_self (), max_idle_time / 1000.0));
-                 
-                 pool = g_async_queue_timed_pop_unlocked (unused_thread_queue,
-                                                          &end_time);
-                 if (!pool)
-                   {
-                     /* If no new task was received in the given
-                      * time, stop this thread. */
-                     unused_threads--;
-                     g_async_queue_unlock (unused_thread_queue);
-                     DEBUG_MSG (("stopping thread %p after max-idle-time.", 
-                                 g_thread_self ()));
-                     /* Stop this thread */
-                     return NULL;      
-                   }
-               }
-             else
-               {
-                 /* If no maximal idle time is given, wait
-                  * indefinitly. */
-                 DEBUG_MSG (("thread %p waiting in global pool.", 
-                             g_thread_self ()));
-                 pool = g_async_queue_pop_unlocked (unused_thread_queue);
-               }
-             
-             if (pool == wakeup_thread_marker)
-               {
-                 if (last_wakeup_thread_serial == wakeup_thread_serial)
-                   {
-                     /* If this wakeup marker has been received for
-                      * the second time, relay it. */
-                     DEBUG_MSG (("thread %p relaying wakeup message to "
-                                 "waiting thread with lower serial.", 
-                                 g_thread_self ()));
-                     g_async_queue_push_unlocked (unused_thread_queue, 
-                                                  wakeup_thread_marker);
-                   }
-                 else
-                   {
-                     last_wakeup_thread_serial = wakeup_thread_serial;
-                   }
-       
-                 /* If a wakeup marker has been received, this thread
-                  * will get out of the way for 100 microseconds to
-                  * avoid receiving this marker again. */
-                 g_async_queue_unlock (unused_thread_queue);
-                 g_usleep (100);
-                 g_async_queue_lock (unused_thread_queue);
-               }
+         if ((pool = g_thread_pool_wait_for_new_pool ()) == NULL) 
+           break;
 
-           } while (pool == wakeup_thread_marker);
-           
-         unused_threads--;
-         g_async_queue_unlock (unused_thread_queue);
-             
          g_async_queue_lock (pool->queue);
          
          DEBUG_MSG (("thread %p entering pool %p from global pool.", 
@@ -297,9 +331,11 @@ g_thread_pool_thread_proxy (gpointer data)
 
          /* pool->num_threads++ is not done here, but in
            * g_thread_pool_start_thread to make the new started thread
-           * known to the pool, before itself can do it. */
+           * known to the pool, before itself can do it. 
+          */
        }
     }
+
   return NULL;
 }
 
@@ -337,7 +373,8 @@ g_thread_pool_start_thread (GRealThreadPool  *pool,
     }
 
   /* See comment in g_thread_pool_thread_proxy as to why this is done
-   * here and not there */
+   * here and not there
+   */
   pool->num_threads++;
 }
 
@@ -397,6 +434,7 @@ g_thread_pool_new (GFunc            func,
   retval->pool.user_data = user_data;
   retval->pool.exclusive = exclusive;
   retval->queue = g_async_queue_new ();
+  retval->cond = NULL;
   retval->max_threads = max_threads;
   retval->num_threads = 0;
   retval->running = TRUE;
@@ -404,14 +442,8 @@ g_thread_pool_new (GFunc            func,
   retval->sort_user_data = NULL;
 
   G_LOCK (init);
-  
-  if (!inform_mutex)
-    {
-      inform_mutex = g_mutex_new ();
-      inform_cond = g_cond_new ();
+  if (!unused_thread_queue)
       unused_thread_queue = g_async_queue_new ();
-    }
-
   G_UNLOCK (init);
 
   if (retval->pool.exclusive)
@@ -454,21 +486,18 @@ g_thread_pool_new (GFunc            func,
  * to do.  
  **/
 void 
-g_thread_pool_push (GThreadPool     *pool,
-                   gpointer         data,
-                   GError         **error)
+g_thread_pool_push (GThreadPool  *pool,
+                   gpointer      data,
+                   GError      **error)
 {
-  GRealThreadPool *real = (GRealThreadPool*) pool;
+  GRealThreadPool *real;
+
+  real = (GRealThreadPool*) pool;
 
   g_return_if_fail (real);
+  g_return_if_fail (real->running);
 
   g_async_queue_lock (real->queue);
-  
-  if (!real->running)
-    {
-      g_async_queue_unlock (real->queue);
-      g_return_if_fail (real->running);
-    }
 
   if (g_async_queue_length_unlocked (real->queue) >= 0)
     /* No thread is waiting in the queue */
@@ -502,13 +531,15 @@ g_thread_pool_push (GThreadPool     *pool,
  * created. 
  **/
 void
-g_thread_pool_set_max_threads (GThreadPool     *pool,
-                              gint             max_threads,
-                              GError         **error)
+g_thread_pool_set_max_threads (GThreadPool  *pool,
+                              gint          max_threads,
+                              GError      **error)
 {
-  GRealThreadPool *real = (GRealThreadPool*) pool;
+  GRealThreadPool *real;
   gint to_start;
 
+  real = (GRealThreadPool*) pool;
+
   g_return_if_fail (real);
   g_return_if_fail (real->running);
   g_return_if_fail (!real->pool.exclusive || max_threads != -1);
@@ -526,6 +557,7 @@ g_thread_pool_set_max_threads (GThreadPool     *pool,
   for ( ; to_start > 0; to_start--)
     {
       GError *local_error = NULL;
+
       g_thread_pool_start_thread (real, &local_error);
       if (local_error)
        {
@@ -546,18 +578,18 @@ g_thread_pool_set_max_threads (GThreadPool     *pool,
  * Return value: the maximal number of threads
  **/
 gint
-g_thread_pool_get_max_threads (GThreadPool     *pool)
+g_thread_pool_get_max_threads (GThreadPool *pool)
 {
-  GRealThreadPool *real = (GRealThreadPool*) pool;
+  GRealThreadPool *real;
   gint retval;
 
+  real = (GRealThreadPool*) pool;
+
   g_return_val_if_fail (real, 0);
   g_return_val_if_fail (real->running, 0);
 
   g_async_queue_lock (real->queue);
-
   retval = real->max_threads;
-    
   g_async_queue_unlock (real->queue);
 
   return retval;
@@ -572,18 +604,18 @@ g_thread_pool_get_max_threads (GThreadPool     *pool)
  * Return value: the number of threads currently running
  **/
 guint
-g_thread_pool_get_num_threads (GThreadPool     *pool)
+g_thread_pool_get_num_threads (GThreadPool *pool)
 {
-  GRealThreadPool *real = (GRealThreadPool*) pool;
+  GRealThreadPool *real;
   guint retval;
 
+  real = (GRealThreadPool*) pool;
+
   g_return_val_if_fail (real, 0);
   g_return_val_if_fail (real->running, 0);
 
   g_async_queue_lock (real->queue);
-
   retval = real->num_threads;
-    
   g_async_queue_unlock (real->queue);
 
   return retval;
@@ -598,11 +630,13 @@ g_thread_pool_get_num_threads (GThreadPool     *pool)
  * Return value: the number of unprocessed tasks
  **/
 guint
-g_thread_pool_unprocessed (GThreadPool     *pool)
+g_thread_pool_unprocessed (GThreadPool *pool)
 {
-  GRealThreadPool *real = (GRealThreadPool*) pool;
+  GRealThreadPool *real;
   gint unprocessed;
 
+  real = (GRealThreadPool*) pool;
+
   g_return_val_if_fail (real, 0);
   g_return_val_if_fail (real->running, 0);
 
@@ -615,7 +649,7 @@ g_thread_pool_unprocessed (GThreadPool     *pool)
  * g_thread_pool_free:
  * @pool: a #GThreadPool
  * @immediate: should @pool shut down immediately?
- * @wait: should the function wait for all tasks to be finished?
+ * @wait_: should the function wait for all tasks to be finished?
  *
  * Frees all resources allocated for @pool.
  *
@@ -625,52 +659,54 @@ g_thread_pool_unprocessed (GThreadPool     *pool)
  * interrupted, while processing a task. Instead at least all still
  * running threads can finish their tasks before the @pool is freed.
  *
- * If @wait is %TRUE, the functions does not return before all tasks
+ * If @wait_ is %TRUE, the functions does not return before all tasks
  * to be processed (dependent on @immediate, whether all or only the
  * currently running) are ready. Otherwise the function returns immediately.
  *
  * After calling this function @pool must not be used anymore. 
  **/
 void
-g_thread_pool_free (GThreadPool     *pool,
-                   gboolean         immediate,
-                   gboolean         wait)
+g_thread_pool_free (GThreadPool *pool,
+                   gboolean     immediate,
+                   gboolean     wait_)
 {
-  GRealThreadPool *real = (GRealThreadPool*) pool;
+  GRealThreadPool *real;
+
+  real = (GRealThreadPool*) pool;
 
   g_return_if_fail (real);
   g_return_if_fail (real->running);
-  /* It there's no thread allowed here, there is not much sense in
-   * not stopping this pool immediately, when it's not empty */
-  g_return_if_fail (immediate || real->max_threads != 0 || 
+
+  /* If there's no thread allowed here, there is not much sense in
+   * not stopping this pool immediately, when it's not empty 
+   */
+  g_return_if_fail (immediate || 
+                   real->max_threads != 0 || 
                    g_async_queue_length (real->queue) == 0);
 
   g_async_queue_lock (real->queue);
 
   real->running = FALSE;
   real->immediate = immediate;
-  real->waiting = wait;
+  real->waiting = wait_;
 
-  if (wait)
+  if (wait_)
     {
-      g_mutex_lock (inform_mutex);
+      real->cond = g_cond_new ();
+
       while (g_async_queue_length_unlocked (real->queue) != -real->num_threads &&
             !(immediate && real->num_threads == 0))
-       {
-         g_async_queue_unlock (real->queue); 
-         g_cond_wait (inform_cond, inform_mutex); 
-         g_async_queue_lock (real->queue); 
-       }
-      g_mutex_unlock (inform_mutex); 
+       g_cond_wait (real->cond, _g_async_queue_get_mutex (real->queue));
     }
 
-  if (immediate ||
-      g_async_queue_length_unlocked (real->queue) == -real->num_threads)
+  if (immediate || g_async_queue_length_unlocked (real->queue) == -real->num_threads)
     {
       /* No thread is currently doing something (and nothing is left
-       * to process in the queue) */
-      if (real->num_threads == 0) /* No threads left, we clean up */
+       * to process in the queue) 
+       */
+      if (real->num_threads == 0) 
        {
+         /* No threads left, we clean up */
          g_async_queue_unlock (real->queue);
          g_thread_pool_free_internal (real);
          return;
@@ -679,7 +715,8 @@ g_thread_pool_free (GThreadPool     *pool,
       g_thread_pool_wakeup_and_stop_all (real);
     }
   
-  real->waiting = FALSE; /* The last thread should cleanup the pool */
+  /* The last thread should cleanup the pool */
+  real->waiting = FALSE; 
   g_async_queue_unlock (real->queue);
 }
 
@@ -687,11 +724,14 @@ static void
 g_thread_pool_free_internal (GRealThreadPool* pool)
 {
   g_return_if_fail (pool);
-  g_return_if_fail (!pool->running);
+  g_return_if_fail (pool->running == FALSE);
   g_return_if_fail (pool->num_threads == 0);
 
   g_async_queue_unref (pool->queue);
 
+  if (pool->cond)
+    g_cond_free (pool->cond);
+
   g_free (pool);
 }
 
@@ -701,12 +741,11 @@ g_thread_pool_wakeup_and_stop_all (GRealThreadPool* pool)
   guint i;
   
   g_return_if_fail (pool);
-  g_return_if_fail (!pool->running);
+  g_return_if_fail (pool->running == FALSE);
   g_return_if_fail (pool->num_threads != 0);
-  g_return_if_fail (g_async_queue_length_unlocked (pool->queue) == 
-                   -pool->num_threads);
 
   pool->immediate = TRUE; 
+
   for (i = 0; i < pool->num_threads; i++)
     g_thread_pool_queue_push_unlocked (pool, GUINT_TO_POINTER (1));
 }
@@ -724,21 +763,28 @@ g_thread_pool_set_max_unused_threads (gint max_threads)
 {
   g_return_if_fail (max_threads >= -1);  
 
-  g_async_queue_lock (unused_thread_queue);
-  
-  max_unused_threads = max_threads;
+  g_atomic_int_set (&max_unused_threads, max_threads);
 
-  if (max_unused_threads < unused_threads && max_unused_threads != -1)
+  if (max_threads != -1)
     {
-      guint i;
-      wakeup_thread_serial++;
+      max_threads -= g_atomic_int_get (&unused_threads);
+      if (max_threads < 0)
+       {
+         g_atomic_int_set (&kill_unused_threads, -max_threads);
+         g_atomic_int_inc (&wakeup_thread_serial);
+
+         g_async_queue_lock (unused_thread_queue);
+
+         do
+           {
+             g_async_queue_push_unlocked (unused_thread_queue,
+                                          wakeup_thread_marker);
+           }
+         while (++max_threads);
 
-      for (i = unused_threads - max_unused_threads; i > 0; i--)
-       g_async_queue_push_unlocked (unused_thread_queue, 
-                                    wakeup_thread_marker);
+         g_async_queue_unlock (unused_thread_queue);
+       }
     }
-    
-  g_async_queue_unlock (unused_thread_queue);
 }
 
 /**
@@ -751,13 +797,7 @@ g_thread_pool_set_max_unused_threads (gint max_threads)
 gint
 g_thread_pool_get_max_unused_threads (void)
 {
-  gint retval;
-  
-  g_async_queue_lock (unused_thread_queue);
-  retval = max_unused_threads;
-  g_async_queue_unlock (unused_thread_queue);
-
-  return retval;
+  return g_atomic_int_get (&max_unused_threads);
 }
 
 /**
@@ -770,13 +810,7 @@ g_thread_pool_get_max_unused_threads (void)
 guint 
 g_thread_pool_get_num_unused_threads (void)
 {
-  guint retval;
-  
-  g_async_queue_lock (unused_thread_queue);
-  retval = unused_threads;
-  g_async_queue_unlock (unused_thread_queue);
-
-  return retval;
+  return g_atomic_int_get (&unused_threads);
 }
 
 /**
@@ -789,7 +823,10 @@ g_thread_pool_get_num_unused_threads (void)
 void
 g_thread_pool_stop_unused_threads (void)
 { 
-  guint oldval = g_thread_pool_get_max_unused_threads ();
+  guint oldval;
+
+  oldval = g_thread_pool_get_max_unused_threads ();
+
   g_thread_pool_set_max_unused_threads (0);
   g_thread_pool_set_max_unused_threads (oldval);
 }
@@ -809,6 +846,12 @@ g_thread_pool_stop_unused_threads (void)
  * tasks to be processed by a priority determined by @func, and not
  * just in the order in which they were added to the pool.
  *
+ * Note, if the maximum number of threads is more than 1, the order
+ * that threads are executed can not be guranteed 100%. Threads are
+ * scheduled by the operating system and are executed at random. It
+ * cannot be assumed that threads are executed in the order they are
+ * created. 
+ *
  * Since: 2.10
  **/
 void 
@@ -816,7 +859,9 @@ g_thread_pool_set_sort_function (GThreadPool      *pool,
                                 GCompareDataFunc  func,
                                 gpointer          user_data)
 { 
-  GRealThreadPool *real = (GRealThreadPool*) pool;
+  GRealThreadPool *real;
+
+  real = (GRealThreadPool*) pool;
 
   g_return_if_fail (real);
   g_return_if_fail (real->running);
@@ -857,14 +902,23 @@ g_thread_pool_set_max_idle_time (guint interval)
 { 
   guint i;
 
-  g_async_queue_lock (unused_thread_queue);
-  max_idle_time = interval;    
-  wakeup_thread_serial++;
+  g_atomic_int_set (&max_idle_time, interval);
 
-  for (i = 0; i < unused_threads; i++)
-    g_async_queue_push_unlocked (unused_thread_queue, wakeup_thread_marker);
+  i = g_atomic_int_get (&unused_threads);
+  if (i > 0)
+    {
+      g_atomic_int_inc (&wakeup_thread_serial);
+      g_async_queue_lock (unused_thread_queue);
 
-  g_async_queue_unlock (unused_thread_queue);
+      do
+       {
+         g_async_queue_push_unlocked (unused_thread_queue,
+                                      wakeup_thread_marker);
+       }
+      while (--i);
+
+      g_async_queue_unlock (unused_thread_queue);
+    }
 }
 
 /**
@@ -884,13 +938,7 @@ g_thread_pool_set_max_idle_time (guint interval)
 guint
 g_thread_pool_get_max_idle_time (void)
 { 
-  guint retval;
-
-  g_async_queue_lock (unused_thread_queue);
-  retval = max_idle_time;
-  g_async_queue_unlock (unused_thread_queue);
-
-  return retval;
+  return g_atomic_int_get (&max_idle_time);
 }
 
 #define __G_THREADPOOL_C__