diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/shared.cc | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 27b48aacb..6cf5997e2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2005-04-22 Christopher Faylor <cgf@timesys.com> + * shared.cc (user_shared_initialize): Implement locking similar to + shared_info when initializing shared region. + +2005-04-22 Christopher Faylor <cgf@timesys.com> + * fhandler.h (dev_console::set_color): Define new function. (dev_console::set_default_attr): Ditto, moved from fhandler_console. (dev_console::fillin_info): Ditto. Accommodate this change throughout diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 48caefff0..8798b2c4c 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -172,8 +172,9 @@ user_shared_initialize (bool reinit) ProtectHandleINH (cygwin_user_h); debug_printf ("user shared version %x", user_shared->version); + DWORD sversion = (DWORD) InterlockedExchange ((LONG *) &user_shared->version, USER_VERSION_MAGIC); /* Initialize the Cygwin per-user shared, if necessary */ - if (!user_shared->version) + if (!sversion) { user_shared->version = USER_VERSION_MAGIC; debug_printf ("initializing user shared"); @@ -189,6 +190,9 @@ user_shared_initialize (bool reinit) multiple_cygwin_problem ("user shared memory version", user_shared->version, USER_VERSION_MAGIC); else if (user_shared->cb != sizeof (*user_shared)) multiple_cygwin_problem ("user shared memory size", user_shared->cb, sizeof (*user_shared)); + else + while (!user_shared->cb) + low_priority_sleep (0); // Should be hit only very very rarely } void |