From 253036c36ccc8c2b91b0c30b130052784b3ee4ff Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 14 Jan 2011 18:00:02 -0700 Subject: [PATCH] o committing merge of r3.14 trunk change o fixed spelling and other cosmetic changes --- src/libCom/osi/os/WIN32/osdThread.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/libCom/osi/os/WIN32/osdThread.c b/src/libCom/osi/os/WIN32/osdThread.c index 8c3b54792..ff8b350ec 100644 --- a/src/libCom/osi/os/WIN32/osdThread.c +++ b/src/libCom/osi/os/WIN32/osdThread.c @@ -124,7 +124,7 @@ BOOL WINAPI DllMain ( #if _WIN32_WINNT >= 0x0501 /* * Only in WXP - * Thats a shame becaus ethis is probably much faster + * Thats a shame because this is probably much faster */ success = GetModuleHandleEx ( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, @@ -268,7 +268,8 @@ static void threadCleanupWIN32 ( void ) return; } - while ( ( pParm = ( win32ThreadParam * ) ellFirst ( & pGbl->threadList ) ) ) { + while ( ( pParm = ( win32ThreadParam * ) + ellFirst ( & pGbl->threadList ) ) ) { epicsParmCleanupWIN32 ( pParm ); } @@ -446,7 +447,8 @@ epicsShareFunc epicsThreadBooleanStatus epicsShareAPI epicsThreadHighestPriority /* * epicsThreadGetStackSize () */ -epicsShareFunc unsigned int epicsShareAPI epicsThreadGetStackSize ( epicsThreadStackSizeClass stackSizeClass ) +epicsShareFunc unsigned int epicsShareAPI + epicsThreadGetStackSize ( epicsThreadStackSizeClass stackSizeClass ) { static const unsigned stackSizeTable[epicsThreadStackBig+1] = {4000, 6000, 11000}; @@ -955,10 +957,17 @@ static void epicsThreadShowPrivate ( epicsThreadId id, unsigned level ) (void *) pParm, idForFormat, pParm->epicsPriority, epics_GetThreadPriorityAsString ( pParm->handle ), epicsThreadIsSuspended ( id ) ? "suspend" : "ok" ); + if ( level ) { + fprintf (epicsGetStdout(), " %-8p %-8p ", + (void *) pParm->handle, (void *) pParm->parm ); + } } else { fprintf (epicsGetStdout(), "NAME EPICS-ID WIN32-ID EPICS-PRI WIN32-PRI STATE " ); + if ( level ) { + fprintf (epicsGetStdout(), " HANDLE FUNCTION PARAMETER" ); + } } fprintf (epicsGetStdout(),"\n" ); }