From 322c131f9f8ec512b0b319aa383d70f8c8e60fbd Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 5 Apr 2005 04:31:00 +0000 Subject: * sync.h (muto::operator int): New operator. (locker): Remove unused class. (new_muto): Delete. (new_muto1): Ditto. (new_muto_name): Ditto. * cygheap.cc (cygheap_setup_for_child): Reflect use of static storage for muto rather than pointer. (_csbrk): Ditto. (_cmalloc): Ditto. (_cmalloc): Ditto. (_cfree): Ditto. * cygheap.h (cwdstuff::cwd_lock): Ditto. (cwdstuff::get_drive): Ditto. * cygmalloc.h (__malloc_lock): Ditto. (__malloc_unlock): Ditto. * cygtls.cc (sentry::lock): Ditto. (sentry::sentry): Ditto. (~sentry): Ditto. (_cygtls::init): Ditto. * dcrt0.cc: Ditto. (cygwin_atexit): Ditto. (cygwin_exit): Ditto. * debug.cc (lock_debug::locker): Ditto. (lock_debug::lock_debug): Ditto. (lock_debug::unlock): Ditto. (debug_init): Ditto. * dtable.cc (dtable::init_lock): Ditto. * dtable.h (dtable::lock_cs): Ditto. (dtable::lock): Ditto. (dtable::unlock): Ditto. * exceptions.cc (mask_sync): Ditto. (sighold): Ditto. (set_process_mask_delta): Ditto. (set_signal_mask): Ditto. (events_init): Ditto. * grp.cc (pwdgrp::pwdgrp): Ditto. * malloc_wrapper.cc (mallock): Ditto. (malloc_init): Ditto. * path.cc (cwdstuff::cwd_lock): Ditto. (cwdstuff::get_hash): Ditto. (cwdstuff::get_hash): Ditto. (cwdstuff::init): Ditto. (cwdstuff::set): Ditto. (cwdstuff::get): Ditto. * pwdgrp.h (pwdgrp::pglock): Ditto. (pwdgrp::refresh): Ditto. * sigproc.cc (sync_proc_subproc): Ditto. (get_proc_lock): Ditto. (proc_subproc): Ditto. (_cygtls::remove_wq): Ditto. (proc_terminate): Ditto. (sigproc_init): Ditto. * timer.cc (lock_timer_tracker::protect): Ditto. (lock_timer_tracker::lock_timer_tracker): Ditto. (lock_timer_tracker::~lock_timer_tracker): Ditto. * wininfo.cc (wininfo::_lock;): Ditto. (wininfo::winthread): Ditto. (operator HWND): Ditto. (wininfo::lock): Ditto. (wininfo::release): Ditto. * wininfo.h (wininfo::_lock;): Ditto. --- winsup/cygwin/sigproc.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'winsup/cygwin/sigproc.cc') diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index e17c744dd..564a805b0 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -70,7 +70,7 @@ Static char cprocs[(NPROCS + 1) * sizeof (pinfo)];// All my children info // constructor operation at DLL startup Static waitq waitq_head = {0, 0, 0, 0, 0, 0, 0};// Start of queue for wait'ing threads -muto NO_COPY *sync_proc_subproc = NULL; // Control access to subproc stuff +muto NO_COPY sync_proc_subproc; // Control access to subproc stuff DWORD NO_COPY sigtid = 0; // ID of the signal thread @@ -150,7 +150,7 @@ get_proc_lock (DWORD what, DWORD val) sigproc_printf ("sync_proc_subproc is NULL (1)"); return false; } - if (sync_proc_subproc->acquire (WPSP)) + if (sync_proc_subproc.acquire (WPSP)) { lastwhat = what; return true; @@ -351,7 +351,7 @@ proc_subproc (DWORD what, DWORD val) } out: - sync_proc_subproc->release (); // Release the lock + sync_proc_subproc.release (); // Release the lock out1: sigproc_printf ("returning %d", rc); return rc; @@ -363,7 +363,7 @@ out1: void _cygtls::remove_wq (DWORD wait) { - if (sync_proc_subproc && sync_proc_subproc->acquire (wait)) + if (sync_proc_subproc && sync_proc_subproc.acquire (wait)) { for (waitq *w = &waitq_head; w->next != NULL; w = w->next) if (w->next == &wq) @@ -372,7 +372,7 @@ _cygtls::remove_wq (DWORD wait) w->next = wq.next; break; } - sync_proc_subproc->release (); + sync_proc_subproc.release (); } } @@ -389,7 +389,7 @@ proc_terminate (void) /* Signal processing is assumed to be blocked in this routine. */ if (nprocs) { - sync_proc_subproc->acquire (WPSP); + sync_proc_subproc.acquire (WPSP); (void) proc_subproc (PROC_CLEARWAIT, 1); @@ -406,7 +406,7 @@ proc_terminate (void) procs[i].release (); } nprocs = 0; - sync_proc_subproc->release (); + sync_proc_subproc.release (); } sigproc_printf ("leaving"); } @@ -488,7 +488,7 @@ sigproc_init () /* sync_proc_subproc is used by proc_subproc. It serialises * access to the children and proc arrays. */ - new_muto (sync_proc_subproc); + sync_proc_subproc.init ("sync_proc_subproc"); create_signal_arrived (); -- cgit v1.2.3