* shared.cc (memory_init): Fix comment. Fix indentation.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7532faa..f7f1f50 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Christopher Faylor  <me.cygwin@cgf.cx>
+
+       * shared.cc (memory_init): Fix comment.  Fix indentation.
+
 2010-03-09  Christopher Faylor  <me+cygwin@cgf.cx>
 
        * shared_info.h (open_shared): Create function wrapper for common use

diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
index 03118da..4a24892 100644 (file)
--- a/winsup/cygwin/shared.cc
+++ b/winsup/cygwin/shared.cc
@@ -417,7 +417,7 @@ memory_init (bool init_cygheap)
       cygheap->user.init ();
     }
 
-  /* Initialize general shared memory */
+  /* Initialize general shared memory under spinlock control */
   for (;;)
     {
       LONG smi = InterlockedExchange (&shared_mem_inited, -1);
@@ -437,16 +437,17 @@ memory_init (bool init_cygheap)
                                                   cygwin_shared_h,
                                                   sizeof (*cygwin_shared),
                                                   SH_CYGWIN_SHARED);
-       if (!smi)
-         {
-           cygwin_shared->initialize ();
-           /* Defer debug output printing the installation root and installation key
-              up to this point.  Debug output except for system_printf requires
-              the global shared memory to exist. */
-           debug_printf ("Installation root: <%W> key: <%S>",
-                         installation_root, &installation_key);
-           smi = 1;
-         }
+      if (!smi)
+       {
+         cygwin_shared->initialize ();
+         /* Defer debug output printing the installation root and installation key
+            up to this point.  Debug output except for system_printf requires
+            the global shared memory to exist. */
+         debug_printf ("Installation root: <%W> key: <%S>",
+                       installation_root, &installation_key);
+         smi = 1;
+       }
+
       InterlockedExchange (&shared_mem_inited, smi);
       break;
     }