Miscellaneous 'sendfile' fixes and improved tests.

[bpt/guile.git] / libguile / objprop.c

diff --git a/libguile/objprop.c b/libguile/objprop.c
index 6dd1da6..7b50d71 100644 (file)
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@@ -1,4 +1,4 @@
-/*     Copyright (C) 1995,1996, 2000, 2001, 2003, 2006, 2008 Free Software Foundation, Inc.
+/*     Copyright (C) 1995,1996, 2000, 2001, 2003, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -35,12 +35,21 @@
 /* {Object Properties}
  */
 
+static SCM object_whash;
+static scm_i_pthread_mutex_t whash_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
+
 SCM_DEFINE (scm_object_properties, "object-properties", 1, 0, 0, 
            (SCM obj),
            "Return @var{obj}'s property list.")
 #define FUNC_NAME s_scm_object_properties
 {
-  return scm_hashq_ref (scm_object_whash, obj, SCM_EOL);
+  SCM ret;
+
+  scm_i_pthread_mutex_lock (&whash_mutex);
+  ret = scm_hashq_ref (object_whash, obj, SCM_EOL);
+  scm_i_pthread_mutex_unlock (&whash_mutex);
+
+  return ret;
 }
 #undef FUNC_NAME
 
@@ -50,8 +59,10 @@ SCM_DEFINE (scm_set_object_properties_x, "set-object-properties!", 2, 0, 0,
            "Set @var{obj}'s property list to @var{alist}.")
 #define FUNC_NAME s_scm_set_object_properties_x
 {
-  SCM handle = scm_hashq_create_handle_x (scm_object_whash, obj, alist);
-  SCM_SETCDR (handle, alist);
+  scm_i_pthread_mutex_lock (&whash_mutex);
+  scm_hashq_set_x (object_whash, obj, alist);
+  scm_i_pthread_mutex_unlock (&whash_mutex);
+
   return alist;
 }
 #undef FUNC_NAME
@@ -73,19 +84,18 @@ SCM_DEFINE (scm_set_object_property_x, "set-object-property!", 3, 0, 0,
            "to @var{value}.")
 #define FUNC_NAME s_scm_set_object_property_x
 {
-  SCM h;
+  SCM alist;
   SCM assoc;
-  h = scm_hashq_create_handle_x (scm_object_whash, obj, SCM_EOL);
-  SCM_CRITICAL_SECTION_START;
-  assoc = scm_assq (key, SCM_CDR (h));
+
+  scm_i_pthread_mutex_lock (&whash_mutex);
+  alist = scm_hashq_ref (object_whash, obj, SCM_EOL);
+  assoc = scm_assq (key, alist);
   if (SCM_NIMP (assoc))
     SCM_SETCDR (assoc, value);
   else
-    {
-      assoc = scm_acons (key, value, SCM_CDR (h));
-      SCM_SETCDR (h, assoc);
-    }
-  SCM_CRITICAL_SECTION_END;
+    scm_hashq_set_x (object_whash, obj, scm_acons (key, value, alist));
+  scm_i_pthread_mutex_unlock (&whash_mutex);
+
   return value;
 }
 #undef FUNC_NAME
@@ -94,7 +104,7 @@ SCM_DEFINE (scm_set_object_property_x, "set-object-property!", 3, 0, 0,
 void
 scm_init_objprop ()
 {
-  scm_object_whash = scm_make_weak_key_hash_table (SCM_UNDEFINED);
+  object_whash = scm_make_weak_key_hash_table (SCM_UNDEFINED);
 #include "libguile/objprop.x"
 }