drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Makefile.in (new-cygwin1.dll): Reorganize library order. 

* dcrt0.cc (do_exit): Move thread stuff after vfork stuff or threads are
terminated during vfork.
* sigproc.cc (proc_terminate): Grab proc lock prior to signalling subproc
thread exit to avoid an extra "wait-for-thread-to-exit".
This commit is contained in:
Christopher Faylor 2002-10-10 05:23:23 +00:00
parent c4ec64d76b
commit 2a3bf3e2ce
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,12 @@
2002-10-10 Christopher Faylor <cgf@redhat.com>
* Makefile.in (new-cygwin1.dll): Reorganize library order.
* dcrt0.cc (do_exit): Move thread stuff after vfork stuff or threads
are terminated during vfork.
* sigproc.cc (proc_terminate): Grab proc lock prior to signalling
subproc thread exit to avoid an extra "wait-for-thread-to-exit".
2002-10-09 Christopher Faylor <cgf@redhat.com> 2002-10-09 Christopher Faylor <cgf@redhat.com>
* cygthread.cc (cygthread::stub): Don't create an event for "cygself" * cygthread.cc (cygthread::stub): Don't create an event for "cygself"
@ -127,7 +136,7 @@
(pthread_mutex::nativeMutex::init): Implement. (pthread_mutex::nativeMutex::init): Implement.
(pthread_mutex::nativeMutex::lock): Ditto. (pthread_mutex::nativeMutex::lock): Ditto.
(pthread_mutex::nativeMutex::unlock): Ditto. (pthread_mutex::nativeMutex::unlock): Ditto.
(pthread_mutex::init): Use the wrapper lock and unlockcalls. (pthread_mutex::init): Use the wrapper lock and unlockcalls.
* thread.h (pthread_mutex): Move mutexInitializationLock into a * thread.h (pthread_mutex): Move mutexInitializationLock into a
nativeMutex wrapper class. nativeMutex wrapper class.
@ -166,7 +175,7 @@
* pthread.cc (pthread_mutex_init): Use new pthread_mutex::init. * pthread.cc (pthread_mutex_init): Use new pthread_mutex::init.
* thread.cc: Change __pthread_mutex_init to pthread_mutex::init * thread.cc: Change __pthread_mutex_init to pthread_mutex::init
throughout. throughout.
(MTinterface::Init): Initialise pthread_mutex support. (MTinterface::Init): Initialise pthread_mutex support.
(pthread_mutex::mutexInitializationLock): Instantiate. (pthread_mutex::mutexInitializationLock): Instantiate.
(pthread_mutex::initMutex): New method. (pthread_mutex::initMutex): New method.
(__pthread_cond_dowait): Don't dereference untrusted pointers. (__pthread_cond_dowait): Don't dereference untrusted pointers.

4
winsup/cygwin/Makefile.in
View File

@ -257,8 +257,8 @@ maintainer-clean realclean: clean
new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp
$(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \ $(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \
-e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \
$(MALLOC_OBJ) $(LIBM) $(LIBC) \ $(MALLOC_OBJ) $(LIBM) -lstdc++ $(LIBC) \
-lstdc++ -lgcc $(DLL_IMPORTS) -lgcc $(DLL_IMPORTS)
# Rule to build libcygwin.a # Rule to build libcygwin.a
$(LIB_NAME): rmsym newsym new-$(DLL_NAME) $(LIBCOS) $(LIB_NAME): rmsym newsym new-$(DLL_NAME) $(LIBCOS)

12
winsup/cygwin/dcrt0.cc
View File

@ -959,6 +959,12 @@ do_exit (int status)
UINT n = (UINT) status; UINT n = (UINT) status;
static int NO_COPY exit_state = 0; static int NO_COPY exit_state = 0;
syscall_printf ("do_exit (%d)", n);
vfork_save *vf = vfork_storage.val ();
if (vf != NULL && vf->pid < 0)
vf->restore_exit (status);
if (!DisableThreadLibraryCalls (cygwin_hmodule)) if (!DisableThreadLibraryCalls (cygwin_hmodule))
system_printf ("DisableThreadLibraryCalls (%p) failed, %E", system_printf ("DisableThreadLibraryCalls (%p) failed, %E",
cygwin_hmodule); cygwin_hmodule);
@ -969,12 +975,6 @@ do_exit (int status)
cygthread::terminate (); cygthread::terminate ();
} }
syscall_printf ("do_exit (%d)", n);
vfork_save *vf = vfork_storage.val ();
if (vf != NULL && vf->pid < 0)
vf->restore_exit (status);
if (exit_state < ES_SIGNAL) if (exit_state < ES_SIGNAL)
{ {
exit_state = ES_SIGNAL; exit_state = ES_SIGNAL;

2
winsup/cygwin/sigproc.cc
View File

@ -457,10 +457,10 @@ proc_terminate (void)
if (hwait_subproc) if (hwait_subproc)
{ {
proc_loop_wait = 0; // Tell wait_subproc thread to exit proc_loop_wait = 0; // Tell wait_subproc thread to exit
sync_proc_subproc->acquire (WPSP);
wake_wait_subproc (); // Wake wait_subproc loop wake_wait_subproc (); // Wake wait_subproc loop
hwait_subproc = NULL; hwait_subproc = NULL;
sync_proc_subproc->acquire (WPSP);
(void) proc_subproc (PROC_CLEARWAIT, 1); (void) proc_subproc (PROC_CLEARWAIT, 1);
/* Clean out zombie processes from the pid list. */ /* Clean out zombie processes from the pid list. */