Changeset 4828Tweet

Timestamp:

07/11/12 17:31:23 (11 months ago)

Author:

wisk

Message:

fix tmp file creation on win32, start to implement handling of win32 exception with GetExitCodeProcess?

Location:

zzuf/trunk/src

Files:

• myfork.c (modified) (1 diff)
• opts.h (modified) (2 diffs)
• zzuf.c (modified) (5 diffs)

zzuf/trunk/src/myfork.c

@@ -354 +354 @@
     free(cmdline);
 
+    child->process_handle = pinfo.hProcess;
+    child->pid            = pinfo.dwProcessId;
+
     if (!ret)
     {

zzuf/trunk/src/opts.h

@@ -14 +14 @@
  *  opts.h: configuration handling
  */
+
+#ifdef _WIN32
+#   include <Windows.h>
+#endif
 
 struct opts
@@ -55 +59 @@
 
         pid_t pid;
+#ifdef _WIN32
+        HANDLE process_handle;
+#endif
         int fd[3]; /* 0 is debug, 1 is stderr, 2 is stdout */
         int bytes, seed;

zzuf/trunk/src/zzuf.c

@@ -115 +115 @@
 #if defined _WIN32
 #   include <Windows.h>
+#   include <fcntl.h> /* _O_RDWR */
+#   include <io.h> /* _open */
 static CRITICAL_SECTION _zz_pipe_cs;
 #endif
@@ -714 +716 @@
                 continue;
 
+#ifdef _WIN32
+#
+            sprintf(tmpname, "%s/zzuf.$i.XXXXXX", tmpdir, GetCurrentProcessId());
+            fdout = _open(mktemp(tmpname), _O_RDWR, 0600);
+#else
             sprintf(tmpname, "%s/zzuf.%i.XXXXXX", tmpdir, (int)getpid());
-#ifdef _WIN32
-            fdout = mktemp(tmpname);
-#else
             fdout = mkstemp(tmpname);
 #endif
@@ -890 +894 @@
                 fprintf(stderr, "exit %i\n", WEXITSTATUS(status));
         }
+#elif defined _WIN32
+        {
+            DWORD exit_code;
+            if (GetExitCodeProcess(opts->child[i].process_handle, &exit_code))
+            {
+                if (exit_code == STILL_ACTIVE) continue; /* The process is still active, we don't do anything */
+
+                /* 
+                 * The main problem with GetExitCodeProcess is it returns either returned parameter value of
+                 * ExitProcess/TerminateProcess, or the unhandled exception (which is what we're looking for)
+                 */
+                switch (exit_code)
+                {
+                case EXCEPTION_ACCESS_VIOLATION: fprintf(stderr, "child(%d) unhandled exception: Access Violation", opts->child[i].pid); break;
+                default: break;
+                }
+            }
+
+            if (opts->child[i].status != STATUS_RUNNING)
+            {
+                TerminateProcess(opts->child[i].process_handle, 0);
+            }
+        }
 #else
         /* waitpid() is not available. Don't kill the process. */
@@ -986 +1013 @@
     {
         struct child_overlapped * co;
-        HANDLE h;
-
-        if(opts->child[i].status != STATUS_RUNNING)
+        HANDLE h = (opts->child[i].fd[j] == -1) ? INVALID_HANDLE_VALUE : (HANDLE)_get_osfhandle(opts->child[i].fd[j]);
+
+        if(opts->child[i].status != STATUS_RUNNING
+        || opts->child[i].fd[j] == -1
+        || h == INVALID_HANDLE_VALUE)
+        {
+            fd_number--;
             continue;
+        }
 
         co = malloc(sizeof(*co));
@@ -998 +1030 @@
         co->opts     = opts;
 
-        h = (HANDLE)_get_osfhandle(opts->child[i].fd[j]);
-
-        /* FIXME: handle error */
-        ReadFileEx(h, co->buf, sizeof(co->buf), (LPOVERLAPPED)co, read_child);
+        if(!ReadFileEx(h, co->buf, sizeof(co->buf), (LPOVERLAPPED)co, read_child))
+        {
+            /* End of file reached */
+            close(opts->child[i].fd[j]);
+            opts->child[i].fd[j] = -1;
+
+            if(opts->child[i].fd[0] == -1
+                && opts->child[i].fd[1] == -1
+                && opts->child[i].fd[2] == -1)
+                opts->child[i].status = STATUS_EOF;
+        }
         cur_child_handle++;
     }
 
+    if (fd_number == 0) return;
+
     /* FIXME: handle error */
-    WaitForMultipleObjectsEx(fd_number, children_handle, FALSE, INFINITE, TRUE);
+    WaitForMultipleObjectsEx(fd_number, children_handle, FALSE, 1000, TRUE);
 }