JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* shared_info.h (open_shared): Create function wrapper for common use case.

Browse Source 
(open_shared): Change fifth argument to a pointer rather than a reference.
* fhandler_console.cc (fhandler_console::get_tty_stuff): Eliminate use of dummy
variable and call open_shared with constant.
* fhandler_process.cc (format_process_mounts): Ditto.
* pinfo.cc (pinfo::init): Pass pointer to shloc.
* shared.cc (shared_mem_inited): New variable.
(open_shared): Crate function wrapper for common use case.
(open_shared): Accommodate change to fifth argument to a pointer.
(shared_info::initialize): Remove spinlock test.  Simplify function.  Move
get_session_parent_dir call back here.
(memory_init): Protect global shared settings with shared_mem_inited spinlock.
Move get_session_parent_dir call to shared_info::initialize.
This commit is contained in:
Christopher Faylor 2010-03-09 21:26:55 +00:00
parent fab7d5988a
commit bd3b3783f8
6 changed files with 85 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,21 @@
2010-03-09 Christopher Faylor <me+cygwin@cgf.cx>
* shared_info.h (open_shared): Create function wrapper for common use
case.
(open_shared): Change fifth argument to a pointer rather than a
reference.
* fhandler_console.cc (fhandler_console::get_tty_stuff): Eliminate use
of dummy variable and call open_shared with constant.
* fhandler_process.cc (format_process_mounts): Ditto.
* pinfo.cc (pinfo::init): Pass pointer to shloc.
* shared.cc (shared_mem_inited): New variable.
(open_shared): Crate function wrapper for common use case.
(open_shared): Accommodate change to fifth argument to a pointer.
(shared_info::initialize): Remove spinlock test. Simplify function.
Move get_session_parent_dir call back here.
(memory_init): Protect global shared settings with shared_mem_inited
spinlock. Move get_session_parent_dir call to shared_info::initialize.
2010-03-09 Christopher Faylor <me.cygwin@cgf.cx> 2010-03-09 Christopher Faylor <me.cygwin@cgf.cx>
* shared.cc (inst_root_inited): Delete. * shared.cc (inst_root_inited): Delete.

3
winsup/cygwin/fhandler_console.cc
View File

@ -83,11 +83,10 @@ fhandler_console::get_tty_stuff (int flags = 0)
if (dev_state) if (dev_state)
return &shared_console_info->tty_min_state; return &shared_console_info->tty_min_state;
shared_locations sh_shared_console = SH_SHARED_CONSOLE;
shared_console_info = shared_console_info =
(console_state *) open_shared (NULL, 0, cygheap->console_h, (console_state *) open_shared (NULL, 0, cygheap->console_h,
sizeof (*shared_console_info), sizeof (*shared_console_info),
sh_shared_console); SH_SHARED_CONSOLE);
dev_state = &shared_console_info->dev_state; dev_state = &shared_console_info->dev_state;
ProtectHandleINH (cygheap->console_h); ProtectHandleINH (cygheap->console_h);

3
winsup/cygwin/fhandler_process.cc
View File

@ -897,7 +897,6 @@ format_process_mounts (void *data, char *&destbuf)
if (p->pid != myself->pid) if (p->pid != myself->pid)
{ {
WCHAR sid_string[UNLEN + 1] = L""; /* Large enough for SID */ WCHAR sid_string[UNLEN + 1] = L""; /* Large enough for SID */
shared_locations sl = SH_JUSTOPEN;
cygsid p_sid; cygsid p_sid;
@ -905,7 +904,7 @@ format_process_mounts (void *data, char *&destbuf)
return 0; return 0;
p_sid.string (sid_string); p_sid.string (sid_string);
u_shared = (user_info *) open_shared (sid_string, USER_VERSION, u_hdl, u_shared = (user_info *) open_shared (sid_string, USER_VERSION, u_hdl,
sizeof (user_info), sl, sizeof (user_info), SH_JUSTOPEN,
&sec_none_nih); &sec_none_nih);
if (!u_shared) if (!u_shared)
return 0; return 0;

2
winsup/cygwin/pinfo.cc
View File

@ -236,7 +236,7 @@ pinfo::init (pid_t n, DWORD flag, HANDLE h0)
else else
mapsize = sizeof (_pinfo); mapsize = sizeof (_pinfo);
procinfo = (_pinfo *) open_shared (L"cygpid", n, h0, mapsize, shloc, procinfo = (_pinfo *) open_shared (L"cygpid", n, h0, mapsize, &shloc,
sec_attribs, access); sec_attribs, access);
if (!h0) if (!h0)
{ {

96
winsup/cygwin/shared.cc
View File

@ -37,6 +37,7 @@ HANDLE NO_COPY cygwin_user_h;
WCHAR installation_root[PATH_MAX] __attribute__((section (".cygwin_dll_common"), shared)); WCHAR installation_root[PATH_MAX] __attribute__((section (".cygwin_dll_common"), shared));
UNICODE_STRING installation_key __attribute__((section (".cygwin_dll_common"), shared)); UNICODE_STRING installation_key __attribute__((section (".cygwin_dll_common"), shared));
WCHAR installation_key_buf[18] __attribute__((section (".cygwin_dll_common"), shared)); WCHAR installation_key_buf[18] __attribute__((section (".cygwin_dll_common"), shared));
static LONG shared_mem_inited __attribute__((section (".cygwin_dll_common"), shared));
/* Use absolute path of cygwin1.dll to derive the Win32 dir which /* Use absolute path of cygwin1.dll to derive the Win32 dir which
is our installation_root. Note that we can't handle Cygwin installation is our installation_root. Note that we can't handle Cygwin installation
@ -114,7 +115,6 @@ init_installation_root ()
installation_key.Length = 0; installation_key.Length = 0;
installation_key.Buffer[0] = L'\0'; installation_key.Buffer[0] = L'\0';
} }
} }
/* This function returns a handle to the top-level directory in the global /* This function returns a handle to the top-level directory in the global
@ -216,16 +216,23 @@ static ptrdiff_t offsets[] =
void * __stdcall void * __stdcall
open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size, open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
shared_locations& m, PSECURITY_ATTRIBUTES psa, DWORD access) shared_locations m, PSECURITY_ATTRIBUTES psa, DWORD access)
{
return open_shared (name, n, shared_h, size, &m, psa, access);
}
void * __stdcall
open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
shared_locations *m, PSECURITY_ATTRIBUTES psa, DWORD access)
{ {
void *shared; void *shared;
void *addr; void *addr;
if (m == SH_JUSTCREATE || m == SH_JUSTOPEN) if (*m == SH_JUSTCREATE || *m == SH_JUSTOPEN)
addr = NULL; addr = NULL;
else else
{ {
addr = off_addr (m); addr = off_addr (*m);
VirtualFree (addr, 0, MEM_RELEASE); VirtualFree (addr, 0, MEM_RELEASE);
} }
@ -233,23 +240,23 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
WCHAR *mapname = NULL; WCHAR *mapname = NULL;
if (shared_h) if (shared_h)
m = SH_JUSTOPEN; *m = SH_JUSTOPEN;
else else
{ {
if (name) if (name)
mapname = shared_name (map_buf, name, n); mapname = shared_name (map_buf, name, n);
if (m == SH_JUSTOPEN) if (*m == SH_JUSTOPEN)
shared_h = OpenFileMappingW (access, FALSE, mapname); shared_h = OpenFileMappingW (access, FALSE, mapname);
else else
{ {
shared_h = CreateFileMappingW (INVALID_HANDLE_VALUE, psa, shared_h = CreateFileMappingW (INVALID_HANDLE_VALUE, psa,
PAGE_READWRITE, 0, size, mapname); PAGE_READWRITE, 0, size, mapname);
if (GetLastError () == ERROR_ALREADY_EXISTS) if (GetLastError () == ERROR_ALREADY_EXISTS)
m = SH_JUSTOPEN; *m = SH_JUSTOPEN;
} }
if (shared_h) if (shared_h)
/* ok! */; /* ok! */;
else if (m != SH_JUSTOPEN) else if (*m != SH_JUSTOPEN)
api_fatal ("CreateFileMapping %W, %E. Terminating.", mapname); api_fatal ("CreateFileMapping %W, %E. Terminating.", mapname);
else else
return NULL; return NULL;
@ -272,7 +279,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size,
if (!shared) if (!shared)
api_fatal ("MapViewOfFileEx '%W'(%p), %E. Terminating.", mapname, shared_h); api_fatal ("MapViewOfFileEx '%W'(%p), %E. Terminating.", mapname, shared_h);
if (m == SH_CYGWIN_SHARED && offsets[0]) if (*m == SH_CYGWIN_SHARED && offsets[0])
{ {
ptrdiff_t delta = (caddr_t) shared - (caddr_t) off_addr (0); ptrdiff_t delta = (caddr_t) shared - (caddr_t) off_addr (0);
offsets[0] = (caddr_t) shared - (caddr_t) cygwin_hmodule; offsets[0] = (caddr_t) shared - (caddr_t) cygwin_hmodule;
@ -337,10 +344,9 @@ user_shared_create (bool reinit)
if (!cygwin_user_h) if (!cygwin_user_h)
cygheap->user.get_windows_id (name); cygheap->user.get_windows_id (name);
shared_locations sh_user_shared = SH_USER_SHARED;
user_shared = (user_info *) open_shared (name, USER_VERSION, user_shared = (user_info *) open_shared (name, USER_VERSION,
cygwin_user_h, sizeof (user_info), cygwin_user_h, sizeof (user_info),
sh_user_shared, &sec_none); SH_USER_SHARED, &sec_none);
debug_printf ("opening user shared for '%W' at %p", name, user_shared); debug_printf ("opening user shared for '%W' at %p", name, user_shared);
ProtectHandleINH (cygwin_user_h); ProtectHandleINH (cygwin_user_h);
debug_printf ("user shared version %x", user_shared->version); debug_printf ("user shared version %x", user_shared->version);
@ -382,26 +388,16 @@ shared_info::initialize ()
DWORD sversion = (DWORD) InterlockedExchange ((LONG *) &version, SHARED_VERSION_MAGIC); DWORD sversion = (DWORD) InterlockedExchange ((LONG *) &version, SHARED_VERSION_MAGIC);
if (!sversion) if (!sversion)
{ {
/* Initialize installation root dir. This is put here just to piggyback on the cb = sizeof (*this);
shared memory spinlock. The installation root does not live in shared_info get_session_parent_dir (); /* Create session dir if first process. */
shared memory. */ init_obcaseinsensitive (); /* Initialize obcaseinsensitive */
init_installation_root (); tty.init (); /* Initialize tty table */
init_obcaseinsensitive ();/* Initialize obcaseinsensitive. */ mt.initialize (); /* Initialize shared tape information */
tty.init (); /* Initialize tty table. */
mt.initialize (); /* Initialize shared tape information. */
debug_printf ("Installation root: <%W> key: <%S>",
installation_root, &installation_key);
cb = sizeof (*this); /* Do last, after all shared memory initialization */
} }
else else if (sversion != SHARED_VERSION_MAGIC)
{ {
if (sversion != SHARED_VERSION_MAGIC) InterlockedExchange ((LONG *) &version, sversion);
{ multiple_cygwin_problem ("system shared memory version", sversion, SHARED_VERSION_MAGIC);
InterlockedExchange ((LONG *) &version, sversion);
multiple_cygwin_problem ("system shared memory version", sversion, SHARED_VERSION_MAGIC);
}
while (!cb)
low_priority_sleep (0); // Should be hit only very very rarely
} }
if (cb != SHARED_INFO_CB) if (cb != SHARED_INFO_CB)
@ -422,15 +418,39 @@ memory_init (bool init_cygheap)
} }
/* Initialize general shared memory */ /* Initialize general shared memory */
shared_locations sh_cygwin_shared; for (;;)
cygwin_shared = (shared_info *) open_shared (L"shared", {
CYGWIN_VERSION_SHARED_DATA, LONG smi = InterlockedExchange (&shared_mem_inited, -1);
cygwin_shared_h, if (smi < 0)
sizeof (*cygwin_shared), {
sh_cygwin_shared = SH_CYGWIN_SHARED); low_priority_sleep (0);
cygwin_shared->initialize (); continue;
}
if (!smi)
/* Initialize installation root dir */
init_installation_root ();
/* Installation root dir has been globally initialized */
cygwin_shared = (shared_info *) open_shared (L"shared",
CYGWIN_VERSION_SHARED_DATA,
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;
}
InterlockedExchange (&shared_mem_inited, smi);
break;
}
heap_init (); heap_init ();
get_session_parent_dir (); /* Create session dir if first process. */
user_shared_create (false); user_shared_create (false);
} }

10
winsup/cygwin/shared_info.h
View File

@ -97,10 +97,12 @@ HANDLE get_shared_parent_dir ();
HANDLE get_session_parent_dir (); HANDLE get_session_parent_dir ();
char *__stdcall shared_name (char *, const char *, int); char *__stdcall shared_name (char *, const char *, int);
WCHAR *__stdcall shared_name (WCHAR *, const WCHAR *, int); WCHAR *__stdcall shared_name (WCHAR *, const WCHAR *, int);
void *__stdcall open_shared (const WCHAR *name, int n, HANDLE &shared_h, void *__stdcall open_shared (const WCHAR *, int, HANDLE&, DWORD,
DWORD size, shared_locations&, shared_locations, PSECURITY_ATTRIBUTES = &sec_all,
PSECURITY_ATTRIBUTES psa = &sec_all, DWORD = FILE_MAP_READ | FILE_MAP_WRITE);
DWORD access = FILE_MAP_READ | FILE_MAP_WRITE); void *__stdcall open_shared (const WCHAR *, int, HANDLE&, DWORD,
shared_locations *, PSECURITY_ATTRIBUTES = &sec_all,
DWORD = FILE_MAP_READ | FILE_MAP_WRITE);
extern void user_shared_create (bool reinit); extern void user_shared_create (bool reinit);
extern void user_shared_initialize (); extern void user_shared_initialize ();
extern void init_installation_root (); extern void init_installation_root ();