Index: /trunk/src/kmk/w32/winchildren.c =================================================================== --- /trunk/src/kmk/w32/winchildren.c (revision 3196) +++ /trunk/src/kmk/w32/winchildren.c (revision 3197) @@ -101,4 +101,5 @@ #include "nt/nt_child_inject_standard_handles.h" +#include "console.h" #ifndef KMK_BUILTIN_STANDALONE @@ -111,4 +112,6 @@ *********************************************************************************************************************************/ #define MKWINCHILD_MAX_PATH 1024 + +#define MKWINCHILD_DO_SET_PROCESSOR_GROUP /** Checks the UTF-16 environment variable pointed to is the PATH. */ @@ -125,4 +128,9 @@ * Structures and Typedefs * *********************************************************************************************************************************/ +/** Pointer to a childcare worker thread. */ +typedef struct WINCHILDCAREWORKER *PWINCHILDCAREWORKER; +/** Pointer to a windows child process. */ +typedef struct WINCHILD *PWINCHILD; + /** * Child process type. @@ -148,6 +156,4 @@ -/** Pointer to a windows child process. */ -typedef struct WINCHILD *PWINCHILD; /** * Windows child process. @@ -175,4 +181,6 @@ * annoying source name output. */ BOOL fProbableClExe; + /** The worker executing this child. */ + PWINCHILDCAREWORKER pWorker; /** Type specific data. */ @@ -334,6 +342,4 @@ long volatile fIdle; } WINCHILDCAREWORKER; -/** Pointer to a childcare worker thread. */ -typedef WINCHILDCAREWORKER *PWINCHILDCAREWORKER; /** WINCHILD::uMagic value. */ #define WINCHILDCAREWORKER_MAGIC 0xdad0dad0U @@ -616,4 +622,88 @@ /** + * Output error message while running on a worker thread. + * + * @returns -1 + * @param pWorker The calling worker. Mainly for getting the + * current child and its stderr output unit. Pass + * NULL if the output should go thru the child + * stderr buffering. + * @param iType The error type: + * - 0: more of a info directly to stdout, + * - 1: child related error, + * - 2: child related error for immedate release. + * @param pszFormat The message format string. + * @param ... Argument for the message. + */ +static int MkWinChildError(PWINCHILDCAREWORKER pWorker, int iType, const char *pszFormat, ...) +{ + /* + * Format the message into stack buffer. + */ + char szMsg[4096]; + int cchMsg; + int cchPrefix; + va_list va; + + /* Compose the prefix, being paranoid about it not exceeding the buffer in any way. */ + const char *pszInfix = iType == 0 ? "info: " : "error: "; + const char *pszProgram = program; + if (strlen(pszProgram) > 80) + { +#ifdef KMK + pszProgram = "kmk"; +#else + pszProgram = "gnumake"; +#endif + } + if (makelevel == 0) + cchPrefix = snprintf(szMsg, sizeof(szMsg) / 2, "%s: %s", pszProgram, pszInfix); + else + cchPrefix = snprintf(szMsg, sizeof(szMsg) / 2, "%s[%u]: %s", pszProgram, makelevel, pszInfix); + assert(cchPrefix < sizeof(szMsg) / 2 && cchPrefix > 0); + + /* Format the user specified message. */ + va_start(va, pszFormat); + cchMsg = vsnprintf(&szMsg[cchPrefix], sizeof(szMsg) - 2 - cchPrefix, pszFormat, va); + va_end(va); + szMsg[sizeof(szMsg) - 2] = '\0'; + cchMsg = strlen(szMsg); + + /* Make sure there's a newline at the end of it (we reserved space for that). */ + if (cchMsg <= 0 || szMsg[cchMsg - 1] != '\n') + { + szMsg[cchMsg++] = '\n'; + szMsg[cchMsg] = '\0'; + } + +#ifdef CONFIG_WITH_OUTPUT_IN_MEMORY + /* + * Try use the stderr of the current child of the worker. + */ + if ( iType != 0 + && iType != 3 + && pWorker) + { + PWINCHILD pChild = pWorker->pCurChild; + if (pChild) + { + struct child *pMkChild = pChild->pMkChild; + if (pMkChild) + { + output_write_text(&pMkChild->output, 1 /*is_err*/, szMsg, cchMsg); + return -1; + } + } + } +#endif + + /* + * Fallback to writing directly to stderr. + */ + maybe_con_fwrite(szMsg, cchMsg, 1, iType == 0 ? stdout : stderr); + return -1; +} + +/** * Duplicates the given UTF-16 string. * @@ -816,5 +906,5 @@ else { - fprintf(stderr, "warning: GetOverlappedResult failed: %u\n", GetLastError()); + MkWinChildError(pChild->pWorker, 2, "GetOverlappedResult failed: %u\n", GetLastError()); pPipe->fReadPending = FALSE; if (fDraining) @@ -844,6 +934,6 @@ pPipe->fReadPending = TRUE; else - fprintf(stderr, "warning: ReadFile failed on standard %s: %u\n", - pPipe->iWhich == 1 ? "output" : "error", GetLastError()); + MkWinChildError(pChild->pWorker, 2, "ReadFile failed on standard %s: %u\n", + pPipe->iWhich == 1 ? "output" : "error", GetLastError()); return; } @@ -956,9 +1046,9 @@ || !pChild->pMkChild->file || !pChild->pMkChild->file->name) - printf("Pid %u ('%s') still running after %u seconds\n", - GetProcessId(hProcess), pwszJob, (msNow - msStart) / 1000); + MkWinChildError(NULL, 0, "Pid %u ('%s') still running after %u seconds\n", + GetProcessId(hProcess), pwszJob, (msNow - msStart) / 1000); else - printf("Target '%s' (pid %u) still running after %u seconds\n", - pChild->pMkChild->file->name, GetProcessId(hProcess), (msNow - msStart) / 1000); + MkWinChildError(NULL, 0, "Target '%s' (pid %u) still running after %u seconds\n", + pChild->pMkChild->file->name, GetProcessId(hProcess), (msNow - msStart) / 1000); } @@ -1094,5 +1184,5 @@ else { - fprintf(stderr, "CreateProcess(%ls) failed: %u\n", pwszImageName, dwErr); + MkWinChildError(pWorker, 1, "CreateProcess(%ls) failed: %u\n", pwszImageName, dwErr); return (int)dwErr; } @@ -1125,5 +1215,5 @@ dwErr = nt_child_inject_standard_handles(ProcInfo.hProcess, pafReplace, pahChild, szErrMsg, sizeof(szErrMsg)); if (dwErr != 0) - fprintf(stderr, "%s\n", szErrMsg); + MkWinChildError(pWorker, 1, "%s\n", szErrMsg); } @@ -1131,10 +1221,12 @@ * Assign processor group (ignore failure). */ +#ifdef MKWINCHILD_DO_SET_PROCESSOR_GROUP if (g_cProcessorGroups > 1) { - GROUP_AFFINITY Affinity = { ~(ULONG_PTR)0, pWorker->iProcessorGroup, { 0, 0, 0 } }; + GROUP_AFFINITY Affinity = { 0, pWorker->iProcessorGroup, { 0, 0, 0 } }; fRet = g_pfnSetThreadGroupAffinity(ProcInfo.hThread, &Affinity, NULL); assert(fRet); } +#endif #ifdef KMK @@ -1164,5 +1256,5 @@ { dwErr = GetLastError(); - fprintf(stderr, "ResumeThread failed on child process: %u\n", dwErr); + MkWinChildError(pWorker, 1, "ResumeThread failed on child process: %u\n", dwErr); } } @@ -1185,8 +1277,10 @@ * * @returns 0 on success, non-zero on failure. + * @param pWorker The childcare worker. * @param papszArgs The argument vector to convert. * @param ppwszCommandLine Where to return the command line. */ -static int mkWinChildcareWorkerConvertQuotedArgvToCommandline(char **papszArgs, WCHAR **ppwszCommandLine) +static int mkWinChildcareWorkerConvertQuotedArgvToCommandline(PWINCHILDCAREWORKER pWorker, char **papszArgs, + WCHAR **ppwszCommandLine) { WCHAR *pwszCmdLine; @@ -1207,5 +1301,5 @@ { DWORD dwErr = GetLastError(); - fprintf(stderr, _("MultiByteToWideChar failed to convert argv[%u] (%s): %u\n"), i, pszSrc, dwErr); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert argv[%u] (%s): %u\n"), i, pszSrc, dwErr); return dwErr; } @@ -1231,5 +1325,5 @@ { DWORD dwErr = GetLastError(); - fprintf(stderr, _("MultiByteToWideChar failed to convert argv[%u] (%s): %u\n"), i, pszSrc, dwErr); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert argv[%u] (%s): %u\n"), i, pszSrc, dwErr); free(pwszCmdLine); return dwErr; @@ -1253,5 +1347,9 @@ #define MKWCCWCMD_F_HAVE_KASH_C 8 /**< kmk_ash -c "..." */ -static int mkWinChildcareWorkerConvertCommandline(char **papszArgs, unsigned fFlags, WCHAR **ppwszCommandLine) +/* + * @param pWorker The childcare worker if on one, otherwise NULL. + */ +static int mkWinChildcareWorkerConvertCommandline(PWINCHILDCAREWORKER pWorker, char **papszArgs, unsigned fFlags, + WCHAR **ppwszCommandLine) { struct ARGINFO @@ -1310,5 +1408,5 @@ { DWORD dwErr = GetLastError(); - fprintf(stderr, _("MultiByteToWideChar failed to convert argv[%u] (%s): %u\n"), i, pszSrc, dwErr); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert argv[%u] (%s): %u\n"), i, pszSrc, dwErr); return dwErr; } @@ -1479,7 +1577,8 @@ } -static int mkWinChildcareWorkerConvertCommandlineWithShell(const WCHAR *pwszShell, char **papszArgs, WCHAR **ppwszCommandLine) -{ - fprintf(stderr, "%s: not found!\n", papszArgs[0]); +static int mkWinChildcareWorkerConvertCommandlineWithShell(PWINCHILDCAREWORKER pWorker, const WCHAR *pwszShell, char **papszArgs, + WCHAR **ppwszCommandLine) +{ + MkWinChildError(pWorker, 1, "%s: not found!\n", papszArgs[0]); //__debugbreak(); return ERROR_FILE_NOT_FOUND; @@ -1573,4 +1672,5 @@ * * @returns 0 on success, windows error code on failure. + * @param pWorker The childcare worker. * @param pszArg0 The first argument. * @param pwszSearchPath In case mkWinChildcareWorkerConvertEnvironment @@ -1584,6 +1684,7 @@ * @param pfProbableClExe Where to return an indicator of probably CL.EXE. */ -static int mkWinChildcareWorkerFindImage(char const *pszArg0, WCHAR *pwszSearchPath, WCHAR const *pwszzEnv, - const char *pszShell, WCHAR **ppwszImagePath, BOOL *pfNeedShell, BOOL *pfProbableClExe) +static int mkWinChildcareWorkerFindImage(PWINCHILDCAREWORKER pWorker, char const *pszArg0, WCHAR *pwszSearchPath, + WCHAR const *pwszzEnv, const char *pszShell, + WCHAR **ppwszImagePath, BOOL *pfNeedShell, BOOL *pfProbableClExe) { /** @todo Slap a cache on this code. We usually end up executing the same @@ -1881,9 +1982,9 @@ return mkWinChildDuplicateUtf16String(wszPathBuf, cwc, ppwszImagePath); dwErr = GetLastError(); - fprintf(stderr, _("MultiByteToWideChar failed to convert shell (%s): %u\n"), pszShell, dwErr); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert shell (%s): %u\n"), pszShell, dwErr); } else { - fprintf(stderr, "%s: not found!\n", pszArg0); + MkWinChildError(pWorker, 1, "%s: not found!\n", pszArg0); dwErr = ERROR_FILE_NOT_FOUND; } @@ -1892,5 +1993,5 @@ { dwErr = GetLastError(); - fprintf(stderr, _("MultiByteToWideChar failed to convert argv[0] (%s): %u\n"), pszArg0, dwErr); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert argv[0] (%s): %u\n"), pszArg0, dwErr); } return dwErr == ERROR_INSUFFICIENT_BUFFER ? ERROR_FILENAME_EXCED_RANGE : dwErr; @@ -1901,4 +2002,5 @@ * * @returns 0 on success, windows error code on failure. + * @param pWorker The childcare worker if on one, otherwise NULL. * @param papszEnv The environment vector to convert. * @param cbEnvStrings The size of the environment strings, iff they are @@ -1911,5 +2013,5 @@ * mkWinChildcareWorkerFindImage() search when needed. */ -static int mkWinChildcareWorkerConvertEnvironment(char **papszEnv, size_t cbEnvStrings, +static int mkWinChildcareWorkerConvertEnvironment(PWINCHILDCAREWORKER pWorker, char **papszEnv, size_t cbEnvStrings, WCHAR **ppwszEnv, WCHAR const **ppwszSearchPath) { @@ -1953,5 +2055,5 @@ dwErr = GetLastError(); } - fprintf(stderr, _("MultiByteToWideChar failed to convert environment block: %u\n"), dwErr); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert environment block: %u\n"), dwErr); } /* @@ -2031,6 +2133,6 @@ if (cwcRc <= 0) { - fprintf(stderr, _("MultiByteToWideChar failed to convert environment string #%u (%s): %u\n"), - iVar, pszSrc, dwErr); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert environment string #%u (%s): %u\n"), + iVar, pszSrc, dwErr); free(pwszzDst); return dwErr; @@ -2077,5 +2179,5 @@ * search for the executable. */ - rc = mkWinChildcareWorkerConvertEnvironment(pChild->u.Process.papszEnv ? pChild->u.Process.papszEnv : environ, + rc = mkWinChildcareWorkerConvertEnvironment(pWorker, pChild->u.Process.papszEnv ? pChild->u.Process.papszEnv : environ, pChild->u.Process.cbEnvStrings, &pwszzEnvironment, &pwszSearchPath); @@ -2085,12 +2187,13 @@ */ if (rc == 0) - rc = mkWinChildcareWorkerFindImage(pChild->u.Process.papszArgs[0], pwszSearchPath, pwszzEnvironment, + rc = mkWinChildcareWorkerFindImage(pWorker, pChild->u.Process.papszArgs[0], pwszSearchPath, pwszzEnvironment, pChild->u.Process.pszShell, &pwszImageName, &fNeedShell, &pChild->fProbableClExe); if (rc == 0) { if (!fNeedShell) - rc = mkWinChildcareWorkerConvertCommandline(pChild->u.Process.papszArgs, 0 /*fFlags*/, &pwszCommandLine); + rc = mkWinChildcareWorkerConvertCommandline(pWorker, pChild->u.Process.papszArgs, 0 /*fFlags*/, &pwszCommandLine); else - rc = mkWinChildcareWorkerConvertCommandlineWithShell(pwszImageName, pChild->u.Process.papszArgs, &pwszCommandLine); + rc = mkWinChildcareWorkerConvertCommandlineWithShell(pWorker, pwszImageName, pChild->u.Process.papszArgs, + &pwszCommandLine); /* @@ -2184,15 +2287,15 @@ return; } - fprintf(stderr, "kmk_builtin_append: close failed on '%s': %u (%s)\n", - pChild->u.Append.pszFilename, errno, strerror(errno)); + MkWinChildError(pWorker, 1, "kmk_builtin_append: close failed on '%s': %u (%s)\n", + pChild->u.Append.pszFilename, errno, strerror(errno)); } else - fprintf(stderr, "kmk_builtin_append: error writing %lu bytes to on '%s': %u (%s)\n", - pChild->u.Append.cbAppend, pChild->u.Append.pszFilename, errno, strerror(errno)); + MkWinChildError(pWorker, 1, "kmk_builtin_append: error writing %lu bytes to on '%s': %u (%s)\n", + pChild->u.Append.cbAppend, pChild->u.Append.pszFilename, errno, strerror(errno)); close(fd); } else - fprintf(stderr, "kmk_builtin_append: error opening '%s': %u (%s)\n", - pChild->u.Append.pszFilename, errno, strerror(errno)); + MkWinChildError(pWorker, 1, "kmk_builtin_append: error opening '%s': %u (%s)\n", + pChild->u.Append.pszFilename, errno, strerror(errno)); pChild->iExitCode = 1; } @@ -2251,13 +2354,27 @@ assert(pWorker->uMagic == WINCHILDCAREWORKER_MAGIC); +#ifdef MKWINCHILD_DO_SET_PROCESSOR_GROUP /* * Adjust process group if necessary. + * + * Note! It seems that setting the mask to zero means that we select all + * active processors. Couldn't find any alternative API for getting + * the correct active processor mask. */ if (g_cProcessorGroups > 1) { - GROUP_AFFINITY Affinity = { ~(ULONG_PTR)0, pWorker->iProcessorGroup, { 0, 0, 0 } }; + GROUP_AFFINITY Affinity = { 0 /* == all active apparently */ , pWorker->iProcessorGroup, { 0, 0, 0 } }; BOOL fRet = g_pfnSetThreadGroupAffinity(GetCurrentThread(), &Affinity, NULL); assert(fRet); (void)fRet; - } +# ifndef NDEBUG + { + GROUP_AFFINITY ActualAffinity = { 0xbeefbeefU, 0xbeef, { 0xbeef, 0xbeef, 0xbeef } }; + fRet = GetThreadGroupAffinity(GetCurrentThread(), &ActualAffinity); + assert(fRet); (void)fRet; + assert(ActualAffinity.Group == pWorker->iProcessorGroup); + } +# endif + } +#endif /* @@ -2304,4 +2421,5 @@ PWINCHILD pTailExpect; + pChild->pWorker = pWorker; pWorker->pCurChild = pChild; switch (pChild->enmType) @@ -2328,4 +2446,5 @@ } pWorker->pCurChild = NULL; + pChild->pWorker = NULL; /* @@ -2347,5 +2466,6 @@ if (SetEvent(g_hEvtWaitChildren)) break; - fprintf(stderr, "SetEvent(g_hEvtWaitChildren=%p) failed: %u\n", g_hEvtWaitChildren, GetLastError()); + MkWinChildError(pWorker, 1, "SetEvent(g_hEvtWaitChildren=%p) failed: %u\n", + g_hEvtWaitChildren, GetLastError()); break; } @@ -2524,17 +2644,17 @@ /* Bail out! */ - fprintf(stderr, "warning! _beginthreadex failed: %u (%s)\n", errno, strerror(errno)); + ONS (error, NILF, "_beginthreadex failed: %u (%s)\n", errno, strerror(errno)); mkWinChildcareDeleteWorkerPipe(&pWorker->StdErr); } else - fprintf(stderr, "warning! Failed to create stderr pipe: %u\n", GetLastError()); + ON (error, NILF, "Failed to create stderr pipe: %u\n", GetLastError()); mkWinChildcareDeleteWorkerPipe(&pWorker->StdOut); } else - fprintf(stderr, "warning! Failed to create stdout pipe: %u\n", GetLastError()); + ON (error, NILF, "Failed to create stdout pipe: %u\n", GetLastError()); CloseHandle(pWorker->hEvtIdle); } else - fprintf(stderr, "warning! CreateEvent failed: %u\n", GetLastError()); + ON (error, NILF, "CreateEvent failed: %u\n", GetLastError()); pWorker->uMagic = ~WINCHILDCAREWORKER_MAGIC; free(pWorker); @@ -3061,5 +3181,5 @@ { rc = GetLastError(); - fprintf(stderr, _("MultiByteToWideChar failed to convert CWD (%s): %u\n"), pszCwd, (unsigned)rc); + MkWinChildError(pWorker, 1, _("MultiByteToWideChar failed to convert CWD (%s): %u\n"), pszCwd, (unsigned)rc); return rc; } @@ -3070,5 +3190,5 @@ * have to traverse it twice to find the PATH. */ - rc = mkWinChildcareWorkerConvertEnvironment(papszEnvVars ? papszEnvVars : environ, 0/*cbEnvStrings*/, + rc = mkWinChildcareWorkerConvertEnvironment(pWorker, papszEnvVars ? papszEnvVars : environ, 0/*cbEnvStrings*/, &pwszzEnvironment, &pwszSearchPath); /* @@ -3077,5 +3197,5 @@ */ if (rc == 0) - rc = mkWinChildcareWorkerFindImage(pszExecutable, pwszSearchPath, pwszzEnvironment, NULL /*pszShell*/, + rc = mkWinChildcareWorkerFindImage(pWorker, pszExecutable, pwszSearchPath, pwszzEnvironment, NULL /*pszShell*/, &pwszImageName, &fNeedShell, &pChild->fProbableClExe); if (rc == 0) @@ -3083,7 +3203,7 @@ assert(!fNeedShell); if (!fQuotedArgv) - rc = mkWinChildcareWorkerConvertCommandline(papszArgs, 0 /*fFlags*/, &pwszCommandLine); + rc = mkWinChildcareWorkerConvertCommandline(pWorker, papszArgs, 0 /*fFlags*/, &pwszCommandLine); else - rc = mkWinChildcareWorkerConvertQuotedArgvToCommandline(papszArgs, &pwszCommandLine); + rc = mkWinChildcareWorkerConvertQuotedArgvToCommandline(pWorker, papszArgs, &pwszCommandLine); /* @@ -3281,9 +3401,9 @@ * Create the command line and environment. */ - rc = mkWinChildcareWorkerConvertCommandline(papszArgs, 0 /*fFlags*/, &pwszCommandLine); + rc = mkWinChildcareWorkerConvertCommandline(NULL, papszArgs, 0 /*fFlags*/, &pwszCommandLine); if (rc != 0) ON(fatal, NILF, _("MkWinChildReExecMake: mkWinChildcareWorkerConvertCommandline failed: %u\n"), rc); - rc = mkWinChildcareWorkerConvertEnvironment(papszEnv ? papszEnv : environ, 0 /*cbEnvStrings*/, + rc = mkWinChildcareWorkerConvertEnvironment(NULL, papszEnv ? papszEnv : environ, 0 /*cbEnvStrings*/, &pwszzEnvironment, &pwszPathIgnored); if (rc != 0)