* 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.
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

View File

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