aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jim-exec.c108
-rw-r--r--jimiocompat.c44
-rw-r--r--jimiocompat.h20
-rw-r--r--tests/exec2.test2
4 files changed, 107 insertions, 67 deletions
diff --git a/jim-exec.c b/jim-exec.c
index 22bbdb8..74a4d18 100644
--- a/jim-exec.c
+++ b/jim-exec.c
@@ -101,13 +101,13 @@ static char **JimOriginalEnviron(void);
static char **JimSaveEnv(char **env);
static void JimRestoreEnv(char **env);
static int JimCreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv,
- pidtype **pidArrayPtr, int *inPipePtr, int *outPipePtr, int *errFilePtr);
-static void JimDetachPids(struct WaitInfoTable *table, int numPids, const pidtype *pidPtr);
-static int JimCleanupChildren(Jim_Interp *interp, int numPids, pidtype *pidPtr, Jim_Obj *errStrObj);
+ phandle_t **pidArrayPtr, int *inPipePtr, int *outPipePtr, int *errFilePtr);
+static void JimDetachPids(struct WaitInfoTable *table, int numPids, const phandle_t *pidPtr);
+static int JimCleanupChildren(Jim_Interp *interp, int numPids, phandle_t *pidPtr, Jim_Obj *errStrObj);
static int Jim_WaitCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
#if defined(__MINGW32__)
-static pidtype JimStartWinProcess(Jim_Interp *interp, char **argv, char **env, int inputId, int outputId, int errorId);
+static phandle_t JimStartWinProcess(Jim_Interp *interp, char **argv, char **env, int inputId, int outputId, int errorId);
#endif
/*
@@ -230,18 +230,18 @@ static void JimFreeEnv(char **env, char **original_environ)
}
}
-static Jim_Obj *JimMakeErrorCode(Jim_Interp *interp, pidtype pid, int waitStatus, Jim_Obj *errStrObj)
+static Jim_Obj *JimMakeErrorCode(Jim_Interp *interp, long pid, int waitStatus, Jim_Obj *errStrObj)
{
Jim_Obj *errorCode = Jim_NewListObj(interp, NULL, 0);
- if (pid == JIM_BAD_PID || pid == JIM_NO_PID) {
+ if (pid <= 0) {
Jim_ListAppendElement(interp, errorCode, Jim_NewStringObj(interp, "NONE", -1));
- Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, (long)pid));
+ Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, pid));
Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, -1));
}
else if (WIFEXITED(waitStatus)) {
Jim_ListAppendElement(interp, errorCode, Jim_NewStringObj(interp, "CHILDSTATUS", -1));
- Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, (long)pid));
+ Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, pid));
Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, WEXITSTATUS(waitStatus)));
}
else {
@@ -269,7 +269,7 @@ static Jim_Obj *JimMakeErrorCode(Jim_Interp *interp, pidtype pid, int waitStatus
Jim_AppendStrings(interp, errStrObj, "child ", action, " by signal ", Jim_SignalId(WTERMSIG(waitStatus)), "\n", NULL);
}
- Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, (long)pid));
+ Jim_ListAppendElement(interp, errorCode, Jim_NewIntObj(interp, pid));
Jim_ListAppendElement(interp, errorCode, Jim_NewStringObj(interp, signame, -1));
}
return errorCode;
@@ -284,7 +284,7 @@ static Jim_Obj *JimMakeErrorCode(Jim_Interp *interp, pidtype pid, int waitStatus
* Note that $::errorCode is left unchanged for a normal exit.
* Details of any abnormal exit is appended to the errStrObj, unless it is NULL.
*/
-static int JimCheckWaitStatus(Jim_Interp *interp, pidtype pid, int waitStatus, Jim_Obj *errStrObj)
+static int JimCheckWaitStatus(Jim_Interp *interp, long pid, int waitStatus, Jim_Obj *errStrObj)
{
if (WIFEXITED(waitStatus) && WEXITSTATUS(waitStatus) == 0) {
return JIM_OK;
@@ -301,7 +301,7 @@ static int JimCheckWaitStatus(Jim_Interp *interp, pidtype pid, int waitStatus, J
struct WaitInfo
{
- pidtype pid; /* Process id of child. */
+ phandle_t phandle; /* Process handle (pid on Unix) of child. */
int status; /* Status returned when child exited or suspended. */
int flags; /* Various flag bits; see below for definitions. */
};
@@ -351,13 +351,13 @@ static struct WaitInfoTable *JimAllocWaitInfoTable(void)
*
* Returns 0 if OK or -1 if not found.
*/
-static int JimWaitRemove(struct WaitInfoTable *table, pidtype pid)
+static int JimWaitRemove(struct WaitInfoTable *table, phandle_t phandle)
{
int i;
/* Find it in the table */
for (i = 0; i < table->used; i++) {
- if (pid == table->info[i].pid) {
+ if (phandle == table->info[i].phandle) {
if (i != table->used - 1) {
table->info[i] = table->info[table->used - 1];
}
@@ -375,7 +375,7 @@ static int Jim_ExecCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
int outputId; /* File id for output pipe. -1 means command overrode. */
int errorId; /* File id for temporary file containing error output. */
- pidtype *pidPtr;
+ phandle_t *pidPtr;
int numPids, result;
int child_siginfo = 1;
Jim_Obj *childErrObj;
@@ -398,7 +398,7 @@ static int Jim_ExecCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
/* The return value is a list of the pids */
listObj = Jim_NewListObj(interp, NULL, 0);
for (i = 0; i < numPids; i++) {
- Jim_ListAppendElement(interp, listObj, Jim_NewIntObj(interp, (long)pidPtr[i]));
+ Jim_ListAppendElement(interp, listObj, Jim_NewIntObj(interp, JimProcessPid(pidPtr[i])));
}
Jim_SetResult(interp, listObj);
JimDetachPids(table, numPids, pidPtr);
@@ -472,22 +472,21 @@ static int Jim_ExecCmd(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
}
/**
- * Does waitpid() on the given pid, and then removes the
+ * Does waitpid() on the given process, and then removes the
* entry from the wait table.
*
- * Returns the pid if OK and updates *statusPtr with the status,
- * or JIM_BAD_PID if the pid was not in the table.
+ * Returns the pid of the process if OK and updates *statusPtr with the status,
+ * or -1 if the process was not in the table.
*/
-static pidtype JimWaitForProcess(struct WaitInfoTable *table, pidtype pid, int *statusPtr)
+static long JimWaitForProcess(struct WaitInfoTable *table, phandle_t phandle, int *statusPtr)
{
- if (JimWaitRemove(table, pid) == 0) {
+ if (JimWaitRemove(table, phandle) == 0) {
/* wait for it */
- waitpid(pid, statusPtr, 0);
- return pid;
+ return waitpid(phandle, statusPtr, 0);
}
/* Not found */
- return JIM_BAD_PID;
+ return -1;
}
/**
@@ -495,7 +494,7 @@ static pidtype JimWaitForProcess(struct WaitInfoTable *table, pidtype pid, int *
* background and are no longer cared about.
* These children can be cleaned up with JimReapDetachedPids().
*/
-static void JimDetachPids(struct WaitInfoTable *table, int numPids, const pidtype *pidPtr)
+static void JimDetachPids(struct WaitInfoTable *table, int numPids, const phandle_t *pidPtr)
{
int j;
@@ -503,7 +502,7 @@ static void JimDetachPids(struct WaitInfoTable *table, int numPids, const pidtyp
/* Find it in the table */
int i;
for (i = 0; i < table->used; i++) {
- if (pidPtr[j] == table->info[i].pid) {
+ if (pidPtr[j] == table->info[i].phandle) {
table->info[i].flags |= WI_DETACHED;
break;
}
@@ -545,8 +544,8 @@ static void JimReapDetachedPids(struct WaitInfoTable *table)
for (count = table->used; count > 0; waitPtr++, count--) {
if (waitPtr->flags & WI_DETACHED) {
int status;
- pidtype pid = waitpid(waitPtr->pid, &status, WNOHANG);
- if (pid == waitPtr->pid) {
+ long pid = waitpid(waitPtr->phandle, &status, WNOHANG);
+ if (pid > 0) {
/* Process has exited, so remove it from the table */
table->used--;
continue;
@@ -588,8 +587,8 @@ static int Jim_WaitCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
struct WaitInfoTable *table = Jim_CmdPrivData(interp);
int nohang = 0;
- pidtype pid;
- long pidarg;
+ long pid;
+ phandle_t phandle;
int status;
Jim_Obj *errCodeObj;
@@ -606,17 +605,21 @@ static int Jim_WaitCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
Jim_WrongNumArgs(interp, 1, argv, "?-nohang? ?pid?");
return JIM_ERR;
}
- if (Jim_GetLong(interp, argv[nohang + 1], &pidarg) != JIM_OK) {
+ if (Jim_GetLong(interp, argv[nohang + 1], &pid) != JIM_OK) {
return JIM_ERR;
}
- pid = waitpid((pidtype)pidarg, &status, nohang ? WNOHANG : 0);
+ /* On Windows a processId is passed here, but a process handle is needed for waitpid */
+ phandle = JimWaitPid(pid, &status, nohang ? WNOHANG : 0);
+ if (phandle == JIM_BAD_PHANDLE) {
+ pid = -1;
+ }
errCodeObj = JimMakeErrorCode(interp, pid, status, NULL);
- if (pid != JIM_BAD_PID && (WIFEXITED(status) || WIFSIGNALED(status))) {
+ if (phandle != JIM_BAD_PHANDLE && (WIFEXITED(status) || WIFSIGNALED(status))) {
/* The process has finished. Remove it from the wait table if it exists there */
- JimWaitRemove(table, pid);
+ JimWaitRemove(table, phandle);
}
Jim_SetResult(interp, errCodeObj);
return JIM_OK;
@@ -662,10 +665,10 @@ static int Jim_PidCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
*----------------------------------------------------------------------
*/
static int
-JimCreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, pidtype **pidArrayPtr,
+JimCreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, phandle_t **pidArrayPtr,
int *inPipePtr, int *outPipePtr, int *errFilePtr)
{
- pidtype *pidPtr = NULL; /* Points to malloc-ed array holding all
+ phandle_t *pidPtr = NULL; /* Points to malloc-ed array holding all
* the pids of child processes. */
int numPids = 0; /* Actual number of processes that exist
* at *pidPtr right now. */
@@ -721,7 +724,7 @@ JimCreatePipeline(Jim_Interp *interp, int argc, Jim_Obj *const *argv, pidtype **
* current command. */
int lastBar;
int i;
- pidtype pid;
+ phandle_t phandle;
char **save_environ;
#ifndef __MINGW32__
char **child_environ;
@@ -1025,8 +1028,8 @@ badargs:
/* Now fork the child */
#ifdef __MINGW32__
- pid = JimStartWinProcess(interp, &arg_array[firstArg], save_environ, inputId, outputId, errorId);
- if (pid == JIM_BAD_PID) {
+ phandle = JimStartWinProcess(interp, &arg_array[firstArg], save_environ, inputId, outputId, errorId);
+ if (phandle == JIM_BAD_PHANDLE) {
Jim_SetResultFormatted(interp, "couldn't exec \"%s\"", arg_array[firstArg]);
goto error;
}
@@ -1038,12 +1041,12 @@ badargs:
* Make a new process and enter it into the table if the vfork
* is successful.
*/
- pid = vfork();
- if (pid < 0) {
+ phandle = vfork();
+ if (phandle < 0) {
Jim_SetResultErrno(interp, "couldn't fork child process");
goto error;
}
- if (pid == 0) {
+ if (phandle == 0) {
/* Child */
/* Set up stdin, stdout, stderr */
if (inputId != -1 && inputId != fileno(stdin)) {
@@ -1103,11 +1106,11 @@ badargs:
table->info = Jim_Realloc(table->info, table->size * sizeof(*table->info));
}
- table->info[table->used].pid = pid;
+ table->info[table->used].phandle = phandle;
table->info[table->used].flags = 0;
table->used++;
- pidPtr[numPids] = pid;
+ pidPtr[numPids] = phandle;
/* Restore in case of pipe_dup_err */
errorId = origErrorId;
@@ -1175,7 +1178,7 @@ badargs:
}
if (pidPtr != NULL) {
for (i = 0; i < numPids; i++) {
- if (pidPtr[i] != JIM_BAD_PID) {
+ if (pidPtr[i] != JIM_BAD_PHANDLE) {
JimDetachPids(table, 1, &pidPtr[i]);
}
}
@@ -1205,7 +1208,7 @@ badargs:
*----------------------------------------------------------------------
*/
-static int JimCleanupChildren(Jim_Interp *interp, int numPids, pidtype *pidPtr, Jim_Obj *errStrObj)
+static int JimCleanupChildren(Jim_Interp *interp, int numPids, phandle_t *pidPtr, Jim_Obj *errStrObj)
{
struct WaitInfoTable *table = Jim_CmdPrivData(interp);
int result = JIM_OK;
@@ -1214,8 +1217,9 @@ static int JimCleanupChildren(Jim_Interp *interp, int numPids, pidtype *pidPtr,
/* Now check the return status of each child */
for (i = 0; i < numPids; i++) {
int waitStatus = 0;
- if (JimWaitForProcess(table, pidPtr[i], &waitStatus) != JIM_BAD_PID) {
- if (JimCheckWaitStatus(interp, pidPtr[i], waitStatus, errStrObj) != JIM_OK) {
+ long pid = JimWaitForProcess(table, pidPtr[i], &waitStatus);
+ if (pid > 0) {
+ if (JimCheckWaitStatus(interp, pid, waitStatus, errStrObj) != JIM_OK) {
result = JIM_ERR;
}
}
@@ -1358,19 +1362,19 @@ JimWinBuildCommandLine(Jim_Interp *interp, char **argv)
/**
* Note that inputId, etc. are osf_handles.
*/
-static pidtype
+static phandle_t
JimStartWinProcess(Jim_Interp *interp, char **argv, char **env, int inputId, int outputId, int errorId)
{
STARTUPINFO startInfo;
PROCESS_INFORMATION procInfo;
HANDLE hProcess;
char execPath[MAX_PATH];
- pidtype pid = JIM_BAD_PID;
+ phandle_t phandle = INVALID_HANDLE_VALUE;
Jim_Obj *cmdLineObj;
char *winenv;
if (JimWinFindExecutable(argv[0], execPath) < 0) {
- return JIM_BAD_PID;
+ return phandle;
}
argv[0] = execPath;
@@ -1461,7 +1465,7 @@ JimStartWinProcess(Jim_Interp *interp, char **argv, char **env, int inputId, int
WaitForInputIdle(procInfo.hProcess, 5000);
CloseHandle(procInfo.hThread);
- pid = procInfo.hProcess;
+ phandle = procInfo.hProcess;
end:
Jim_FreeNewObj(interp, cmdLineObj);
@@ -1474,7 +1478,7 @@ JimStartWinProcess(Jim_Interp *interp, char **argv, char **env, int inputId, int
if (startInfo.hStdError != INVALID_HANDLE_VALUE) {
CloseHandle(startInfo.hStdError);
}
- return pid;
+ return phandle;
}
#else
diff --git a/jimiocompat.c b/jimiocompat.c
index c8c3f86..665a65a 100644
--- a/jimiocompat.c
+++ b/jimiocompat.c
@@ -90,16 +90,48 @@ int Jim_Errno(void)
return EINVAL;
}
-pidtype waitpid(pidtype pid, int *status, int nohang)
+long JimProcessPid(phandle_t pid)
{
- DWORD ret = WaitForSingleObject(pid, nohang ? 0 : INFINITE);
+ if (pid == INVALID_HANDLE_VALUE) {
+ return -1;
+ }
+ return GetProcessId(pid);
+}
+
+/**
+ * Returns the phandle of the process identified by 'pid' or JIM_BAD_PHANDLE on error.
+ * Note that on success, the handle will no longer be valid.
+ * It can only be used as a token (e.g. to look up the wait table)
+ */
+phandle_t JimWaitPid(long pid, int *status, int nohang)
+{
+ HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, pid);
+ if (h) {
+ long pid = waitpid(h, status, nohang);
+ CloseHandle(h);
+ if (pid > 0) {
+ return h;
+ }
+ }
+ return JIM_BAD_PHANDLE;
+}
+
+/**
+ * Returns the pid of the process if OK or -1 on error.
+ */
+long waitpid(phandle_t phandle, int *status, int nohang)
+{
+ long pid;
+ DWORD ret = WaitForSingleObject(phandle, nohang ? 0 : INFINITE);
if (ret == WAIT_TIMEOUT || ret == WAIT_FAILED) {
/* WAIT_TIMEOUT can only happend with WNOHANG */
- return JIM_BAD_PID;
+ return -1;
}
- GetExitCodeProcess(pid, &ret);
+ GetExitCodeProcess(phandle, &ret);
*status = ret;
- CloseHandle(pid);
+ /* We won't be able to get this after we close the handle */
+ pid = GetProcessId(phandle);
+ CloseHandle(phandle);
return pid;
}
@@ -121,7 +153,7 @@ int Jim_MakeTempFile(Jim_Interp *interp, const char *filename_template, int unli
}
Jim_SetResultString(interp, name, -1);
- return _open_osfhandle((int)handle, _O_RDWR | _O_TEXT);
+ return _open_osfhandle((intptr_t)handle, _O_RDWR | _O_TEXT);
error:
Jim_SetResultErrno(interp, name);
diff --git a/jimiocompat.h b/jimiocompat.h
index 176a5fe..e44e6d5 100644
--- a/jimiocompat.h
+++ b/jimiocompat.h
@@ -41,10 +41,8 @@ int Jim_OpenForRead(const char *filename);
#include <io.h>
#include <process.h>
- typedef HANDLE pidtype;
- #define JIM_BAD_PID INVALID_HANDLE_VALUE
- /* Note that this isn't a separate value on Windows since we don't have os.fork */
- #define JIM_NO_PID INVALID_HANDLE_VALUE
+ typedef HANDLE phandle_t;
+ #define JIM_BAD_PHANDLE INVALID_HANDLE_VALUE
/* These seem to accord with the conventions used by msys/mingw32 */
#define WIFEXITED(STATUS) (((STATUS) & 0xff00) == 0)
@@ -57,7 +55,12 @@ int Jim_OpenForRead(const char *filename);
* Unix-compatible errno
*/
int Jim_Errno(void);
- pidtype waitpid(pidtype pid, int *status, int nohang);
+
+ long waitpid(phandle_t phandle, int *status, int nohang);
+ /* Like waitpid() but takes a pid and returns a phandle */
+ phandle_t JimWaitPid(long processid, int *status, int nohang);
+ /* Return pid for a phandle */
+ long JimProcessPid(phandle_t phandle);
#define HAVE_PIPE
#define pipe(P) _pipe((P), 0, O_NOINHERIT)
@@ -74,10 +77,11 @@ int Jim_OpenForRead(const char *filename);
#include <fcntl.h>
#include <sys/wait.h>
- typedef int pidtype;
+ typedef int phandle_t;
#define Jim_Errno() errno
- #define JIM_BAD_PID -1
- #define JIM_NO_PID 0
+ #define JIM_BAD_PHANDLE -1
+ #define JimProcessPid(PIDTYPE) (PIDTYPE)
+ #define JimWaitPid waitpid
#ifndef HAVE_EXECVPE
#define execvpe(ARG0, ARGV, ENV) execvp(ARG0, ARGV)
diff --git a/tests/exec2.test b/tests/exec2.test
index 6cb00cf..b1af8ab 100644
--- a/tests/exec2.test
+++ b/tests/exec2.test
@@ -100,7 +100,7 @@ test exec2-3.4 "wait for background task" -constraints wait -body {
set pid [exec sleep 0.1 &]
lassign [wait $pid] status newpid exitcode
if {$pid != $newpid} {
- error "Got wrong pid from wait"
+ error "wait $pid returned pid=$newpid"
} else {
list $status $exitcode
}
generated by cgit v1.1 at 2024-07-16 21:21:15 +0000