Port g_cond_new to use GSlice

Now that nothing inside of GLib is using g_cond_new(), we can implement
it using GSlice.  Since the implementations for POSIX and Windows are
now the same, move it to gthread.c.

diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index 53ee362db059b69770a7104de3f9d1143d2d4c0f..02b944f6d64e015615735a3199e83962ff038dd6 100644 (file)
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.c
@@ -223,29 +223,6 @@ g_cond_timedwait (GCond  *cond,
   return FALSE;
 }
 
-/* {{{1 new/free API */
-
-GCond *
-g_cond_new (void)
-{
-  GCond *cond;
-
-  /* malloc() is temporary until all libglib users are ported away */
-  cond = malloc (sizeof (GCond));
-  if G_UNLIKELY (cond == NULL)
-    g_thread_abort (errno, "malloc");
-  g_cond_init (cond);
-
-  return cond;
-}
-
-void
-g_cond_free (GCond *cond)
-{
-  g_cond_clear (cond);
-  free (cond);
-}
-
 /* {{{1 GPrivate */
 
 #include "glib.h"

diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 91510c5e300fee367ee109c5b176beff0a7754f6..d63864c7c6c1bb2384311b70d254d52bdb14914c 100644 (file)
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -252,28 +252,6 @@ g_cond_timed_wait (GCond    *cond,
     }
 }
 
-/* {{{1 new/free API */
-GCond *
-g_cond_new (void)
-{
-  GCond *cond;
-
-  /* malloc() is temporary until all libglib users are ported away */
-  cond = malloc (sizeof (GCond));
-  if G_UNLIKELY (cond == NULL)
-    g_thread_abort (errno, "malloc");
-  g_cond_init (cond);
-
-  return cond;
-}
-
-void
-g_cond_free (GCond *cond)
-{
-  g_cond_clear (cond);
-  free (cond);
-}
-
 /* {{{1 GPrivate */
 
 #include "glib.h"

diff --git a/glib/gthread.c b/glib/gthread.c
index 62d61165a76684f43b980bf70c17ae7d2b52a3e2..517f2053aa16b61e506a3f8d91cf2bac33505199 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -2591,3 +2591,21 @@ g_mutex_free (GMutex *mutex)
   g_mutex_clear (mutex);
   g_slice_free (GMutex, mutex);
 }
+
+GCond *
+g_cond_new (void)
+{
+  GCond *cond;
+
+  cond = g_slice_new (GCond);
+  g_cond_init (cond);
+
+  return cond;
+}
+
+void
+g_cond_free (GCond *cond)
+{
+  g_cond_clear (cond);
+  g_slice_free (GCond, cond);
+}