* sysdeps/generic/nscd_setup_thread.c: New file.

	* sysdeps/unix/sysv/linux/nscd_setup_thread.c: New file.

diff --git a/ChangeLog b/ChangeLog
index 57ced8e8e56b95c32b8fcdcd9dda3263290cee9f..6c38cb3cfe331d1b3d511158e6630bdfb8cfd3b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
        * nscd/nscd.h: Declare setup_thread.
        * nscd/nscd_helper.c (__nscd_get_map_ref): Avoid the time test if
        nscd_certainly_running is nonzero.
+       * sysdeps/generic/nscd_setup_thread.c: New file.
+       * sysdeps/unix/sysv/linux/nscd_setup_thread.c: New file.
 
 2004-09-08  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
index 02a57787b515c82e86878aa4e922e092c74965c4..7cdeba54859bd07c85030fb6761f77391527499b 100644 (file)
--- a/nscd/nscd-client.h
+++ b/nscd/nscd-client.h
@@ -179,8 +179,8 @@ struct database_pers_head
 {
   int version;
   int header_size;
-  int gc_cycle;
-  int nscd_certainly_running;
+  volatile int gc_cycle;
+  volatile int nscd_certainly_running;
   volatile time_t timestamp;
 
   size_t module;
@@ -233,7 +233,7 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
 extern struct mapped_database *__nscd_get_map_ref (request_type type,
                                                   const char *name,
                                                   struct locked_map_ptr *mapptr,
-                                                  int *gc_cyclep);
+                                                  volatile int *gc_cyclep);
 
 /* Unmap database.  */
 extern void __nscd_unmap (struct mapped_database *mapped);

diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index 01c4c81848e333f2b08e78cd54b8ebeeac4c769c..74983b9762cedaeb1b98abc494daff059d8c8136 100644 (file)
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -212,7 +212,7 @@ get_mapping (request_type type, const char *key,
 
 struct mapped_database *
 __nscd_get_map_ref (request_type type, const char *name,
-                   struct locked_map_ptr *mapptr, int *gc_cyclep)
+                   struct locked_map_ptr *mapptr, volatile int *gc_cyclep)
 {
   struct mapped_database *cur = mapptr->mapped;
   if (cur == NO_MAPPING)