diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-11-24 21:38:17 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-11-24 21:38:17 +0000 |
| commit | e553226cfadf92a3f394a4dc40b6471d62070173 (patch) | |
| tree | b1881dd34dc2c15494df31f9e7b73a318cbe6d79 | |
| parent | ef8bff85be3057385b34a4c0f8ba2b274041ffcc (diff) | |
| download | cygnal-e553226cfadf92a3f394a4dc40b6471d62070173.tar.gz cygnal-e553226cfadf92a3f394a4dc40b6471d62070173.tar.bz2 cygnal-e553226cfadf92a3f394a4dc40b6471d62070173.zip | |
missed this in previous checkin
| -rw-r--r-- | winsup/cygwin/ChangeLog | 2 | ||||
| -rw-r--r-- | winsup/cygwin/cygthread.cc | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ff5054f95..32066c4ec 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,6 +1,6 @@ 2011-11-24 Christopher Faylor <me.cygwin2011@cgf.cx> - * cygthread.h (cygthread::name): Default name to "main" if we are early + * cygthread.cc (cygthread::name): Default name to "main" if we are early in the process of setting up the DLL and no name is known. * dcrt0.cc (initial_env): Remove CYGWIN_SLEEP stuff. (get_cygwin_startup_info): Activate strace here as appropriate. diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc index f57cdcec8..2bb8e412f 100644 --- a/winsup/cygwin/cygthread.cc +++ b/winsup/cygwin/cygthread.cc @@ -258,12 +258,15 @@ cygthread::name (DWORD tid) break; } - if (!res) + if (res) + /* ok */; + else if (!_main_tls) + res = "main"; + else { __small_sprintf (_my_tls.locals.unknown_thread_name, "unknown (%p)", tid); res = _my_tls.locals.unknown_thread_name; } - return res; } |