[gegl] [buffer] Guard some multi threading code in #if #endif
- From: Øyvind Kolås <ok src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gegl] [buffer] Guard some multi threading code in #if #endif
- Date: Fri, 20 Nov 2009 01:54:12 +0000 (UTC)
commit 3bf3d2e1341f05a9db8f4857276701ab4b88263b
Author: �yvind Kolås <pippin gimp org>
Date: Fri Nov 20 01:52:31 2009 +0000
[buffer] Guard some multi threading code in #if #endif
gegl/buffer/gegl-buffer.c | 7 ++++++-
gegl/buffer/gegl-tile-storage.c | 4 ++++
gegl/buffer/gegl-tile-storage.h | 3 ++-
3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/gegl/buffer/gegl-buffer.c b/gegl/buffer/gegl-buffer.c
index dad5669..cc2399d 100644
--- a/gegl/buffer/gegl-buffer.c
+++ b/gegl/buffer/gegl-buffer.c
@@ -1210,20 +1210,25 @@ gboolean gegl_buffer_try_lock (GeglBuffer *buffer)
buffer->lock_count++;
return TRUE;
#else
- return g_mutex_trylock (buffer->tile_storage->mutex);
+ //return g_mutex_trylock (buffer->tile_storage->mutex);
+ return FALSE;
#endif
}
#if 1
gboolean gegl_buffer_lock (GeglBuffer *buffer)
{
+#if ENABLE_MT
if(0)g_mutex_lock (buffer->tile_storage->mutex);
+#endif
return TRUE;
}
gboolean gegl_buffer_unlock (GeglBuffer *buffer)
{
+#if ENABLE_MT
if(0)g_mutex_unlock (buffer->tile_storage->mutex);
+#endif
return TRUE;
}
#endif
diff --git a/gegl/buffer/gegl-tile-storage.c b/gegl/buffer/gegl-tile-storage.c
index badb283..6786ea3 100644
--- a/gegl/buffer/gegl-tile-storage.c
+++ b/gegl/buffer/gegl-tile-storage.c
@@ -273,7 +273,9 @@ gegl_tile_storage_constructor (GType type,
tile_storage,
NULL);
tile_storage->seen_zoom = FALSE;
+#if ENABLE_MT
tile_storage->mutex = g_mutex_new ();
+#endif
return object;
}
@@ -288,7 +290,9 @@ gegl_tile_storage_finalize (GObject *object)
if (self->path)
g_free (self->path);
+#if ENABLE_MT
g_mutex_free (self->mutex);
+#endif
(*G_OBJECT_CLASS (parent_class)->finalize)(object);
}
diff --git a/gegl/buffer/gegl-tile-storage.h b/gegl/buffer/gegl-tile-storage.h
index f20fa86..1020d5b 100644
--- a/gegl/buffer/gegl-tile-storage.h
+++ b/gegl/buffer/gegl-tile-storage.h
@@ -31,8 +31,9 @@
struct _GeglTileStorage
{
GeglTileHandlerChain parent_instance;
-
+#if ENABLE_MT
GMutex *mutex;
+#endif
Babl *format;
gint tile_width;
gint tile_height;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]