WebSVN – DevTools – Diff – /core_devl/trunk/UTILS/timeout/src/timeout_win32.cpp

 /*
 **  Globals
 */
-HANDLE hJobObject;
+HANDLE          hJobObject;             // Job to contain the child process
-DWORD dwThreadIdTimer;
-HANDLE hThreadTimer;
-DWORD   dwChildExitCode;
+DWORD           dwChildExitCode;        // Child process exit code
-unsigned int timeOut = 10;                   // Seconds
+unsigned int    timeOut = 10;           // Seconds
 /*
 **  Prototypes (forward declarations)
 */
 VOID ErrorExit(LPTSTR);
 void ErrorExitMsg(UINT ecode, LPTSTR lpszFunction) ;
-DWORD WINAPI ThreadTimer( LPVOID lpParam );
 BOOL WINAPI KillJob(DWORD dwCtrlType);
 unsigned int parseDuration(const char* str);
 /*----------------------------------------------------------------------------
 ** FUNCTION           : main
 **
-** DESCRIPTION        : Mainentry point
+** DESCRIPTION        : Main entry point
+**                      timeout [-time:nnn] program ......
 **
 **
 ** INPUTS             : argc            - Number of args
 **                      argv            - Address of args
 **
-** RETURNS            :
+** RETURNS            : 0   - Program exited OK
+**                      ... - Program exit code
+**                      124 - Timeout
+**                      125 - Internal error
+**                      126 - Could not find program
+**                      127 - Could not create Job
 **
 ----------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
+{
     if ( !SetConsoleCtrlHandler( KillJob, TRUE)) {
         ErrorExitMsg(EXIT_CANCELED, "SetConsoleCtrlHandler");
+    }
     /*
-    **  Now create the child process.
+    **  Create the child process.
     */
     SetEnvironmentVariable( "GBE_JOBDEBUG", "CreateChild" );
     PROCESS_INFORMATION piProcInfo;
     /*
         TerminateProcess(piProcInfo.hProcess, 101);
         ErrorExitMsg(EXIT_ENOENT, "AssignProcessToJobObject");
     };
     /*
-    **  Create a thread to timeout the main process
-    */
-    SetEnvironmentVariable( "GBE_JOBDEBUG", "CreateThread" );
-    hThreadTimer = CreateThread(
-        NULL,                        // default security attributes
-,                           // use default stack size
-        ThreadTimer,                 // thread function
-        NULL,                        // argument to thread function
-,                           // use default creation flags
-        &dwThreadIdTimer);           // returns the thread identifier
-    if (hThreadTimer == NULL)
-        ErrorExitMsg(EXIT_CANCELED, "Create Timer Thread");
-    /*
     **  Start(Resume) the master thread for the comamnd
     **  What for the process to complete
     */
     SetEnvironmentVariable( "GBE_JOBDEBUG", "ResumeChild" );
     if (ResumeThread (piProcInfo.hThread) == -1 ){
          ErrorExitMsg(EXIT_ENOENT, "ResumeThread - did not resume");
+    }
-    SetEnvironmentVariable( "GBE_JOBDEBUG", "WaitChild" );
-    WaitForSingleObject( piProcInfo.hProcess, INFINITE );
     /*
-    ** When the one process I started terminates, then kill the entire JOB
+    ** Body of the wating process
     */
-    SetEnvironmentVariable( "GBE_JOBDEBUG", "ChildDone" );
+    SetEnvironmentVariable( "GBE_JOBDEBUG", "WaitChild" );
+    {
+        char lBuf[30];
+        unsigned int secs;
+        DWORD dwWaitResult;
+        bool  bChildDone = false;
+        _snprintf(lBuf, sizeof(lBuf), "%u", timeOut);
+        SetEnvironmentVariable( "GBE_JOBLIMIT", lBuf );
+        /*
+        ** Wait for the Job to complete, one second at a time
+        ** This allows us to indicate progress via an EnvVar
+        */
+        for (secs = timeOut; secs > 0; secs--)
+        {
+            /*
+            ** Update ENV with time remaining
+            ** Simply for diagnostic purposes
+            */
+            _snprintf(lBuf, sizeof(lBuf), "%u", secs);
+            SetEnvironmentVariable( "GBE_JOBTIME", lBuf );
+            /*
+            **  Wait one second
+            */
+            dwWaitResult  = WaitForSingleObject( piProcInfo.hProcess, 1000 );
+            switch (dwWaitResult)
+            {
+                /*
+                **  Event object was signaled
+                **      The process has completed
+                */
+                case WAIT_OBJECT_0:
+                    SetEnvironmentVariable( "GBE_JOBDEBUG", "ChildDone" );
-    TerminateThread(hThreadTimer, 0);
+                    bChildDone = true;
+                    break;
+                /*
+                **  Timeout
+                **      Update EnvVar and do again
+                */
+                case WAIT_TIMEOUT:
+                    break;
+                /*
+                **  An error occurred
+                */
+                default:
+                    ErrorExitMsg(EXIT_CANCELED, "WaitForSingleObject");
+                    break;
+            }
+        }
+        /*
+        ** Timer loop complete
+        ** May be a timeout or the Child has completed
+        */
+        if (!bChildDone)
+        {
+            /*
+            ** Timeout
+            **  Terminate the Job
+            */
+            fprintf(stderr, "Process exceeded time limit (%u Secs)\n", timeOut);
+            fflush(stderr) ;
+            SetEnvironmentVariable( "GBE_JOBDEBUG", "TimeOut" );
+            TerminateJobObject(hJobObject, EXIT_TIMEDOUT);
+        }
+    }
+    SetEnvironmentVariable( "GBE_JOBDEBUG", "TimerDone" );
     TerminateJobObject(hJobObject, 100);
     /*
     **  Determine the exist status of the child process
     */
+    SetEnvironmentVariable( "GBE_JOBDEBUG", "GetChildExitCode" );
     if (!GetExitCodeProcess( piProcInfo.hProcess, &dwChildExitCode ))
         ErrorExit("Error getting child exist code");
     /*
     **  Exit with the childs exit code
+    **      Have tried to use ExitProcess, but it hangs from time to time
     */
     SetEnvironmentVariable( "GBE_JOBDEBUG", "Exit" );
     ExitProcess(dwChildExitCode);
     /*
     ** Should not happen
     */
     SetEnvironmentVariable( "GBE_JOBDEBUG", "ExitReturn" );
-    return EXIT_FAILURE;
+    return EXIT_CANCELED;
+}
 /*----------------------------------------------------------------------------
 ** FUNCTION           : apply_time_suffix
 **
 **
 ----------------------------------------------------------------------------*/
 VOID ErrorExit (LPTSTR lpszMessage)
+{
+   SetEnvironmentVariable( "GBE_JOBDEBUG", lpszMessage );
    fprintf(stderr, "%s\n", lpszMessage);
    fflush(stderr) ;
    ExitProcess(EXIT_CANCELED);
+}
 void ErrorExitMsg(UINT ecode, LPTSTR lpszFunction)
+{
     // Retrieve the system error message for the last-error code
     LPVOID lpMsgBuf;
     DWORD dw = GetLastError();
+    char msgBuf[300];
     FormatMessage(
         FORMAT_MESSAGE_ALLOCATE_BUFFER |
         FORMAT_MESSAGE_FROM_SYSTEM |
         FORMAT_MESSAGE_IGNORE_INSERTS,
         (LPTSTR) &lpMsgBuf,
 , NULL );
     // Display the error message and exit the process
-    fprintf(stderr, "%s failed with error %d: %s\n", lpszFunction, dw, lpMsgBuf);
+    _snprintf(msgBuf, sizeof(msgBuf),  "%s failed with error %d: %s\n", lpszFunction, dw, lpMsgBuf);
+    SetEnvironmentVariable( "GBE_JOBDEBUG", msgBuf );
+    fprintf(stderr, msgBuf);
     fflush(stderr) ;
     LocalFree(lpMsgBuf);
     ExitProcess(ecode);
+}

Subversion Repositories DevTools

(root)/core_devl/trunk/UTILS/timeout/src/timeout_win32.cpp – Rev 5742 → 5847