diff options
author | Christopher Faylor <me@cgf.cx> | 2013-12-18 04:28:46 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2013-12-18 04:28:46 +0000 |
commit | e9da9dfb94b580edb617562c7681b9646fbc7255 (patch) | |
tree | e571e52aca63c402cb2b11940a706fc1dee7ed1a | |
parent | 13621d2ef873ae1d7203592798803d378a2d3fa4 (diff) | |
download | newlib-e9da9dfb94b580edb617562c7681b9646fbc7255.zip newlib-e9da9dfb94b580edb617562c7681b9646fbc7255.tar.gz newlib-e9da9dfb94b580edb617562c7681b9646fbc7255.tar.bz2 |
* autoload.cc (timeBeginPeriod): Autoload.
* dcrt0.cc (dll_crt0_1): Use timeBeginPeriod to set default resolution to 1 ms.
* pinfo.cc (pinfo::thisproc): Set ppid for redirected _pinfo blocks too.
(pinfo::init): Avoid using VirtualQuery. Just rely on the assumption that
procinfo will be populated.
* pinfo.h (_pinfo::ppid): Move into redirected block.
-rw-r--r-- | winsup/cygwin/ChangeLog | 10 | ||||
-rw-r--r-- | winsup/cygwin/autoload.cc | 1 | ||||
-rw-r--r-- | winsup/cygwin/dcrt0.cc | 1 | ||||
-rw-r--r-- | winsup/cygwin/pinfo.cc | 12 | ||||
-rw-r--r-- | winsup/cygwin/pinfo.h | 5 |
5 files changed, 18 insertions, 11 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 8c973f9..19b7a5e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,15 @@ 2013-12-17 Christopher Faylor <me.cygwin2013@cgf.cx> + * autoload.cc (timeBeginPeriod): Autoload. + * dcrt0.cc (dll_crt0_1): Use timeBeginPeriod to set default resolution + to 1 ms. + * pinfo.cc (pinfo::thisproc): Set ppid for redirected _pinfo blocks too. + (pinfo::init): Avoid using VirtualQuery. Just rely on the assumption that + procinfo will be populated. + * pinfo.h (_pinfo::ppid): Move into redirected block. + +2013-12-17 Christopher Faylor <me.cygwin2013@cgf.cx> + * external.cc (fillout_pinfo): Remove nonsensical loop. * fork.cc (frok::parent): When initializing pinfo for child new PID_NEW flag + actual defined constant rather than raw number. Don't set diff --git a/winsup/cygwin/autoload.cc b/winsup/cygwin/autoload.cc index 0199cc5..8a98b5b 100644 --- a/winsup/cygwin/autoload.cc +++ b/winsup/cygwin/autoload.cc @@ -643,6 +643,7 @@ LoadDLLfunc (SetParent, 8, user32) LoadDLLfunc (SetProcessWindowStation, 4, user32) LoadDLLfunc (SetThreadDesktop, 4, user32) +LoadDLLfunc (timeBeginPeriod, 4, winmm) LoadDLLfuncEx3 (waveInAddBuffer, 12, winmm, 1, 0, 1) LoadDLLfuncEx3 (waveInClose, 4, winmm, 1, 0, 1) LoadDLLfuncEx3 (waveInGetNumDevs, 0, winmm, 1, 0, 1) diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index d348d9b..3d430a9 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -836,6 +836,7 @@ dll_crt0_1 (void *) { extern void initial_setlocale (); + timeBeginPeriod (1); _my_tls.incyg++; /* Inherit "parent" exec'ed process sigmask */ if (spawn_info && !in_forkee) diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 8f9986f..a22a9d7 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -77,6 +77,7 @@ pinfo::thisproc (HANDLE h) myself_identity.init (cygwin_pid (procinfo->dwProcessId), PID_EXECED, NULL); procinfo->exec_sendsig = NULL; procinfo->exec_dwProcessId = 0; + myself_identity->ppid = procinfo->pid; } } @@ -317,14 +318,9 @@ pinfo::init (pid_t n, DWORD flag, HANDLE h0) If the block has been allocated with PINFO_REDIR_SIZE but not yet updated with a PID_EXECED state then we'll retry. */ if (!created && !(flag & PID_NEW)) - { - MEMORY_BASIC_INFORMATION mbi; - for (int i = 0; i < 1000 && !procinfo->ppid; i++) - Sleep (0); - if (procinfo->exists () && VirtualQuery (procinfo, &mbi, sizeof (mbi)) - && mbi.RegionSize < sizeof (_pinfo)) - goto loop; - } + /* If not populated, wait 2 seconds for procinfo to become populated */ + for (int i = 0; i < 2000 && !procinfo->ppid; i++) + Sleep (1); if (!created && createit && (procinfo->process_state & PID_REAPED)) { diff --git a/winsup/cygwin/pinfo.h b/winsup/cygwin/pinfo.h index 0a13c4b..1d6a72c 100644 --- a/winsup/cygwin/pinfo.h +++ b/winsup/cygwin/pinfo.h @@ -50,6 +50,8 @@ public: constants in <sys/cygwin.h>. */ DWORD process_state; + pid_t ppid; /* Parent process id. */ + DWORD exitcode; /* set when process exits */ #define PINFO_REDIR_SIZE ((char *) &myself.procinfo->exitcode - (char *) myself.procinfo) @@ -57,9 +59,6 @@ public: /* > 0 if started by a cygwin process */ DWORD cygstarted; - /* Parent process id. */ - pid_t ppid; - /* dwProcessId contains the processid used for sending signals. It will be reset in a child process when it is capable of receiving signals. */ |