From 29d52c8a27ec621dea1c8229c26b60fe12bc3e16 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 23 Dec 2003 16:26:31 +0000 Subject: * exceptions.cc (set_signal_mask): Redefine to not pass by address. Report calculated mask in debugging output. * sigproc.h (set_signal_mask): Reflect above change in declaration. * path.cc (mount_item::build_win32): Take path apart before feeding it to fnmunge. Throughout, change use of _reent_winsup()-> to _my_tls.locals. instead. Throughout, remove obsolete MT_SAFE/_CYG_THREAD_FAILSAFE considerations. Througout, add cygtls.h include. * Makefile.in (DLL_OFILES): Add cygtls.o. Add some more objects to the -fomit-frame-pointer list. * acconfig.h: Remove obsolete settings. * config.h.in: Ditto. * bsdlib.cc: Add cygtls.h include. * configure.in: Remove --enable-extra-threadsafe-checking. * configure: Regenerate. * cygtls.h (_local_storage): New struct renamed from _winsup_t (sic). (_threadinfo:local_clib): Add new field. (_threadinfo::locals): Ditto. (_threadinfo::init_thread): Accept second _reent * argument. (_threadinfo::call): Define as regparm. (CYGTLS_PADSIZE): Remove unnecessary slop. (_getreent): Define as a macro. * thread.h: Remove _CYG_THREAD_FAILSAFE and MT_SAFE stuff. (_winsup_t): Move to cygtls.h. (ResourceLocks::ResourceLocks): Eliminate empty constructor. (MTinterface::reents): Eliminate. (MTinterface::thread_self_key): Eliminate. (MTinterface::MTinterface): Eliminate. * dcrt0.cc: Include stdio.h for _impure_ptr initialization. (do_global_ctors): Remove run_ctors_p (sic) considerations. Don't call atexit here. (__main): Initialize destructors for user here. (dll_crt0_1): Accept a dummy argument. Don't call init_thread here. Don't set _impure_ptr here. Call do_global_ctors after more things have been initialized. (_dll_crt0): Define zeros buffer as max of needed size of CYGTLS_PADSIZE so that it can be used for two purposes while minimizing stack usage. Initialize _impure_ptr specifically, for speed. Call dll_crt0_1 with buffer argument. (cygwin_dll_init): Call dll_crt0_1 with dummy argument. * dtable.cc (dtable::find_unused_handle): Remove call to AssertResourceOwner. * exceptions.cc: Move _threadinfo stuff to new file. * cygtls.cc: New file. * gentls_offsets: Accommodate increasing complexity of cygtls.h. * hires.h (hires_base::~hires_base): Remove. * init.cc (dll_entry): Remove setting of reents. * thread.cc: Remove syslog.h include. (__getreent): Simplify to use _my_tls. (_reent_winsup): Delete. (AssertResourceOwner): Delete. (MTinterface::Init): Remove setting of _clib and _winsup, with all that entails. (MTinterface::fixup_after_fork): Ditto. (pthread::thread_init_wrapper): Ditto. Also remove call to set_tls_self_pointer. (pthread::set_tls_self_pointer): Eliminate. (pthread::get_tls_self_pointer): Just return _my_tls.tid; (__reent_t::init_clib): Eliminate. * tlsoffsets.h: Regenerate. --- winsup/cygwin/syslog.cc | 66 ++++++++++++++++++------------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) (limited to 'winsup/cygwin/syslog.cc') diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc index c0a34ca02..c053c224c 100644 --- a/winsup/cygwin/syslog.cc +++ b/winsup/cygwin/syslog.cc @@ -21,6 +21,7 @@ details. */ #include "cygerrno.h" #include "cygheap.h" #include "thread.h" +#include "cygtls.h" /* FIXME: These should probably be in the registry. */ /* FIXME: The Win95 path should be whatever slash is */ @@ -38,50 +39,31 @@ get_win95_event_log_path () return WIN95_EVENT_LOG_PATH; } -/* FIXME: For MT safe code these will need to be replaced */ - -#ifdef _MT_SAFE -#define process_ident _reent_winsup ()->_process_ident -#define process_logopt _reent_winsup ()->_process_logopt -#define process_facility _reent_winsup ()->_process_facility - /* Default priority logmask */ -#define process_logmask _reent_winsup ()->_process_logmask -#else -static char *process_ident = 0; -static int process_logopt = 0; -static int process_facility = 0; - -/* Default priority logmask */ -static int process_logmask = LOG_UPTO (LOG_DEBUG); -#endif - -/* - * openlog: save the passed args. Don't open the - * system log (NT) or log file (95) yet. - */ +/* openlog: save the passed args. Don't open the + system log (NT) or log file (95) yet. */ extern "C" void openlog (const char *ident, int logopt, int facility) { debug_printf ("openlog called with (%s, %d, %d)", ident ? ident : "", logopt, facility); - if (process_ident != NULL) + if (_my_tls.locals.process_ident != NULL) { - free (process_ident); - process_ident = 0; + free (_my_tls.locals.process_ident); + _my_tls.locals.process_ident = 0; } if (ident) { - process_ident = (char *) malloc (strlen (ident) + 1); - if (process_ident == NULL) + _my_tls.locals.process_ident = (char *) malloc (strlen (ident) + 1); + if (_my_tls.locals.process_ident == NULL) { - debug_printf ("failed to allocate memory for process_ident"); + debug_printf ("failed to allocate memory for _my_tls.locals.process_ident"); return; } - strcpy (process_ident, ident); + strcpy (_my_tls.locals.process_ident, ident); } - process_logopt = logopt; - process_facility = facility; + _my_tls.locals.process_logopt = logopt; + _my_tls.locals.process_facility = facility; } /* setlogmask: set the log priority mask and return previous mask. @@ -90,16 +72,16 @@ int setlogmask (int maskpri) { if (maskpri == 0) - return process_logmask; + return _my_tls.locals.process_logmask; - int old_mask = process_logmask; - process_logmask = maskpri & LOG_PRIMASK; + int old_mask = _my_tls.locals.process_logmask; + _my_tls.locals.process_logmask = maskpri & LOG_PRIMASK; return old_mask; } -/* Private class used to handle formatting of syslog message */ -/* It is named pass_handler because it does a two-pass handling of log +/* Private class used to handle formatting of syslog message + It is named pass_handler because it does a two-pass handling of log strings. The first pass counts the length of the string, and the second one builds the string. */ @@ -211,10 +193,10 @@ vsyslog (int priority, const char *message, va_list ap) { debug_printf ("%x %s", priority, message); /* If the priority fails the current mask, reject */ - if (((priority & LOG_PRIMASK) & process_logmask) == 0) + if (((priority & LOG_PRIMASK) & _my_tls.locals.process_logmask) == 0) { debug_printf ("failing message %x due to priority mask %x", - priority, process_logmask); + priority, _my_tls.locals.process_logmask); return; } @@ -290,12 +272,12 @@ vsyslog (int priority, const char *message, va_list ap) pass.set_message ((char *) alloca (n)); /* Deal with ident_string */ - if (process_ident != NULL) + if (_my_tls.locals.process_ident != NULL) { - if (pass.print ("%s : ", process_ident) == -1) + if (pass.print ("%s : ", _my_tls.locals.process_ident) == -1) return; } - if (process_logopt & LOG_PID) + if (_my_tls.locals.process_logopt & LOG_PID) { if (pass.print ("PID %u : ", getpid ()) == -1) return; @@ -353,8 +335,8 @@ vsyslog (int priority, const char *message, va_list ap) if (wincap.has_eventlog ()) { /* For NT, open the event log and send the message */ - HANDLE hEventSrc = RegisterEventSourceA (NULL, (process_ident != NULL) ? - process_ident : CYGWIN_LOG_NAME); + HANDLE hEventSrc = RegisterEventSourceA (NULL, (_my_tls.locals.process_ident != NULL) ? + _my_tls.locals.process_ident : CYGWIN_LOG_NAME); if (hEventSrc == NULL) { debug_printf ("RegisterEventSourceA failed with %E"); -- cgit v1.2.3