From 3da18a28f5274be251d5614fd911e246dd85a37f Mon Sep 17 00:00:00 2001 From: David Inglis Date: Tue, 3 Sep 2002 15:08:38 +0000 Subject: [PATCH] added spawner for linux --- core/org.eclipse.cdt.core.linux/.classpath | 15 ++ core/org.eclipse.cdt.core.linux/.project | 38 +++ .../build.properties | 2 + core/org.eclipse.cdt.core.linux/fragment.xml | 20 ++ .../library/Makefile | 12 + .../library/Spawner.h | 45 ++++ .../library/SpawnerInputStream.h | 32 +++ .../library/SpawnerOutputStream.h | 29 +++ .../library/exec0.h | 11 + .../library/exec_unix.c | 145 ++++++++++++ core/org.eclipse.cdt.core.linux/library/io.c | 103 ++++++++ .../library/pfind.c | 74 ++++++ .../library/spawner.c | 219 ++++++++++++++++++ 13 files changed, 745 insertions(+) create mode 100644 core/org.eclipse.cdt.core.linux/.classpath create mode 100644 core/org.eclipse.cdt.core.linux/.project create mode 100644 core/org.eclipse.cdt.core.linux/build.properties create mode 100644 core/org.eclipse.cdt.core.linux/fragment.xml create mode 100644 core/org.eclipse.cdt.core.linux/library/Makefile create mode 100644 core/org.eclipse.cdt.core.linux/library/Spawner.h create mode 100644 core/org.eclipse.cdt.core.linux/library/SpawnerInputStream.h create mode 100644 core/org.eclipse.cdt.core.linux/library/SpawnerOutputStream.h create mode 100644 core/org.eclipse.cdt.core.linux/library/exec0.h create mode 100644 core/org.eclipse.cdt.core.linux/library/exec_unix.c create mode 100644 core/org.eclipse.cdt.core.linux/library/io.c create mode 100644 core/org.eclipse.cdt.core.linux/library/pfind.c create mode 100644 core/org.eclipse.cdt.core.linux/library/spawner.c diff --git a/core/org.eclipse.cdt.core.linux/.classpath b/core/org.eclipse.cdt.core.linux/.classpath new file mode 100644 index 00000000000..782d615590a --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/.classpath @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/core/org.eclipse.cdt.core.linux/.project b/core/org.eclipse.cdt.core.linux/.project new file mode 100644 index 00000000000..5e4ce1e2a66 --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/.project @@ -0,0 +1,38 @@ + + + org.eclipse.cdt.core.linux + + + org.apache.xerces + org.eclipse.cdt.core + org.eclipse.compare + org.eclipse.core.boot + org.eclipse.core.resources + org.eclipse.core.runtime + org.eclipse.debug.core + org.eclipse.debug.ui + org.eclipse.search + org.eclipse.ui + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/core/org.eclipse.cdt.core.linux/build.properties b/core/org.eclipse.cdt.core.linux/build.properties new file mode 100644 index 00000000000..99f473dc81f --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/build.properties @@ -0,0 +1,2 @@ +bin.includes = fragment.xml,\ + os/ diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml new file mode 100644 index 00000000000..0f322b53cca --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/fragment.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/core/org.eclipse.cdt.core.linux/library/Makefile b/core/org.eclipse.cdt.core.linux/library/Makefile new file mode 100644 index 00000000000..ed47c386f71 --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/Makefile @@ -0,0 +1,12 @@ +# makefile for libspawner.so + +LIB_NAME = libspawner.so +LIB_NAME_FULL = libspawner.so.1 +OBJS=spawner.o io.o exec_unix.o +CCFLAGS+=-fpic -D_REENTRANT -I$(JDK_INCLUDES) + +spawner : $(OBJS) + gcc -g -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(OBJS) -lc + +clean : + rm $(OBJS) diff --git a/core/org.eclipse.cdt.core.linux/library/Spawner.h b/core/org.eclipse.cdt.core.linux/library/Spawner.h new file mode 100644 index 00000000000..01ffb3cc1b2 --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/Spawner.h @@ -0,0 +1,45 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_qnx_tools_utils_spawner_Spawner */ + +#ifndef _Included_com_qnx_tools_utils_spawner_Spawner +#define _Included_com_qnx_tools_utils_spawner_Spawner +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: org_eclipse_cdt_utils_spawner_Spawner + * Method: exec0 + * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[I)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec0 + (JNIEnv *, jobject, jobjectArray, jobjectArray, jstring, jintArray); + +/* + * Class: org_eclipse_cdt_utils_spawner_Spawner + * Method: exec0 + * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[I)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_exec1 + (JNIEnv *, jobject, jobjectArray, jobjectArray, jstring); + +/* + * Class: org_eclipse_cdt_utils_spawner_Spawner + * Method: raise + * Signature: (II)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_raise + (JNIEnv *, jobject, jint, jint); + +/* + * Class: org_eclipse_cdt_utils_spawner_Spawner + * Method: waitFor + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_Spawner_waitFor + (JNIEnv *, jobject, jint); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/core/org.eclipse.cdt.core.linux/library/SpawnerInputStream.h b/core/org.eclipse.cdt.core.linux/library/SpawnerInputStream.h new file mode 100644 index 00000000000..3b32d2b2806 --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/SpawnerInputStream.h @@ -0,0 +1,32 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_qnx_tools_utils_spawner_SpawnerInputStream */ + +#ifndef _Included_com_qnx_tools_utils_spawner_SpawnerInputStream +#define _Included_com_qnx_tools_utils_spawner_SpawnerInputStream +#ifdef __cplusplus +extern "C" { +#endif +#undef com_qnx_tools_utils_spawner_SpawnerInputStream_SKIP_BUFFER_SIZE +#define com_qnx_tools_utils_spawner_SpawnerInputStream_SKIP_BUFFER_SIZE 2048L +/* Inaccessible static: skipBuffer */ +/* + * Class: org_elipse_cdt_utils_spawner_SpawnerInputStream + * Method: read0 + * Signature: (I[BI)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_read0 + (JNIEnv *, jobject, jint, jbyteArray, jint); + +/* + * Class: org_eclipse_cdt_utils_spawner_SpawnerInputStream + * Method: close0 + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_close0 + (JNIEnv *, jobject, jint); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/core/org.eclipse.cdt.core.linux/library/SpawnerOutputStream.h b/core/org.eclipse.cdt.core.linux/library/SpawnerOutputStream.h new file mode 100644 index 00000000000..f835947e060 --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/SpawnerOutputStream.h @@ -0,0 +1,29 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_qnx_tools_utils_spawner_SpawnerOutputStream */ + +#ifndef _Included_com_qnx_tools_utils_spawner_SpawnerOutputStream +#define _Included_com_qnx_tools_utils_spawner_SpawnerOutputStream +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream + * Method: write0 + * Signature: (I[BI)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_write0 + (JNIEnv *, jobject, jint, jbyteArray, jint); + +/* + * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream + * Method: close0 + * Signature: (I)I + */ +JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_close0 + (JNIEnv *, jobject, jint); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/core/org.eclipse.cdt.core.linux/library/exec0.h b/core/org.eclipse.cdt.core.linux/library/exec0.h new file mode 100644 index 00000000000..abfadb1fe82 --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/exec0.h @@ -0,0 +1,11 @@ +#include +#include +#include +#include +#include + +extern pid_t exec0(const char *path, char *const argv[], + char *const envp[], const char *dirpath, + int channels[3] ); + +extern int wait0(pid_t pid); diff --git a/core/org.eclipse.cdt.core.linux/library/exec_unix.c b/core/org.eclipse.cdt.core.linux/library/exec_unix.c new file mode 100644 index 00000000000..f483913ff0d --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/exec_unix.c @@ -0,0 +1,145 @@ +#include "exec0.h" +#include +#include +#include +#include +#include +#include +#include + +/* from pfind.c */ +char *pfind( char *name ); + +pid_t +exec0(const char *path, char *const argv[], char *const envp[], + const char *dirpath, int channels[3]) +{ + int pipe0[2], pipe1[2], pipe2[2]; + pid_t childpid; + char *full_path; + + // + // Handle this error case, we need the full path for execve() below. + // + if (path[0] != '/' && path[0] != '.') { + full_path = pfind( path ); + //full_path = pathfind (getenv ("PATH"), path, "rx"); + if (full_path == NULL) { + fprintf( stderr, "Unable to find full path for \"%s\"\n", path ); + return -1; + } + } else { + full_path = path; + } + + // + // Make sure we can create our pipes before forking. + // + if( channels != NULL ) + { + if (pipe(pipe0) < 0 || pipe(pipe1) < 0 || pipe(pipe2) < 0) { + fprintf(stderr, "%s(%d): returning due to error.\n", + __FUNCTION__, __LINE__); + free(full_path); + return -1; + } + } + + childpid = fork(); + + if (childpid < 0) { + fprintf(stderr, "%s(%d): returning due to error: %s\n", + __FUNCTION__, __LINE__, strerror(errno)); + free(full_path); + return -1; + } else if (childpid == 0) { /* child */ + char *ptr; + + chdir(dirpath); + + if( channels != NULL ) + { + /* Close the write end of pipe0 */ + if( close(pipe0[1]) == -1 ) + perror( "close(pipe0[1])" ); + + /* Close the read end of pipe1 */ + if( close(pipe1[0]) == -1 ) + perror( "close(pipe1[0])" ); + + /* Close the read end of pipe2 */ + if( close(pipe2[0]) == -1 ) + perror( "close(pipe2[0]))" ); + + /* redirections */ + dup2(pipe0[0], STDIN_FILENO); /* dup stdin */ + dup2(pipe1[1], STDOUT_FILENO); /* dup stdout */ + dup2(pipe2[1], STDERR_FILENO); /* dup stderr */ + } + + /* Close all the fd's in the child */ + { + int fdlimit = sysconf(_SC_OPEN_MAX); + int fd = 3; + + while (fd < fdlimit) + close(fd++); + } + + if( envp[0] == NULL ) + { + execv( full_path, argv ); + } + else + { + execve( full_path, argv, envp ); + } + + _exit(127); + + } else if (childpid != 0) { /* parent */ + + char b; + + if( channels != NULL ) + { + /* close the read end of pipe1 */ + if( close(pipe0[0]) == -1 ) + perror( "close(pipe0[0])" ); + + /* close the write end of pipe2 */ + if( close(pipe1[1]) == -1 ) + perror( "close(pipe1[1])" ); + + /* close the write end of pipe2 */ + if( close(pipe2[1]) == -1 ) + perror( "close(pipe2[1])" ); + + channels[0] = pipe0[1]; /* Output Stream. */ + channels[1] = pipe1[0]; /* Input Stream. */ + channels[2] = pipe2[0]; /* Input Stream. */ + } + + free(full_path); + return childpid; + } + + free(full_path); + return -1; /*NOT REACHED */ +} + + +int wait0(pid_t pid) +{ + int status; + int val = -1; + + if (pid < 0 || waitpid(pid, &status, 0) < 0) + return -1; + + if (WIFEXITED(status)) { + val = WEXITSTATUS(status); + } + + return val; +} diff --git a/core/org.eclipse.cdt.core.linux/library/io.c b/core/org.eclipse.cdt.core.linux/library/io.c new file mode 100644 index 00000000000..aa98d55429b --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/io.c @@ -0,0 +1,103 @@ +#include +#include +#include +#include +#include + +/* Header for class _org_eclipse_cdt_utils_spawner_SpawnerInputStream */ +/* Header for class _org_eclipse_cdt_utils_spawner_SpawnerOutputStream */ + +/* + * Class: org_eclipse_cdt_utils_spawner_SpawnerInputStream + * Method: read0 + * Signature: (I)I + */ +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_read0(JNIEnv * env, + jobject jobj, + jint jfd, + jbyteArray buf, + jint buf_len) +{ + int fd; + int status; + jbyte *data; + int data_len; + + data = (*env)->GetByteArrayElements(env, buf, 0); + data_len = buf_len; + fd = jfd; + + status = read( fd, data, data_len ); + (*env)->ReleaseByteArrayElements(env, buf, data, 0); + + if (status == 0) { + /* EOF. */ + status = -1; + } else if (status == -1) { + /* Error, toss an exception */ + jclass exception = (*env)->FindClass(env, "java/io/IOException"); + if (exception == NULL) { + /* Give up. */ + return -1; + } + (*env)->ThrowNew(env, exception, "read error"); + } + + return status; +} + + +/* + * Class: org_eclipse_cdt_utils_spawner_SpawnerInputStream + * Method: close0 + * Signature: (I)I + */ +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_SpawnerInputStream_close0(JNIEnv * env, + jobject jobj, + jint fd) +{ + return close(fd); +} + +/* + * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream + * Method: write0 + * Signature: (II)I + */ +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_write0(JNIEnv * env, + jobject jobj, + jint jfd, + jbyteArray buf, + jint buf_len) +{ + int status; + int fd; + jbyte *data; + int data_len; + + data = (*env)->GetByteArrayElements(env, buf, 0); + data_len = buf_len; + fd = jfd; + + status = write(fd, data, data_len); + (*env)->ReleaseByteArrayElements(env, buf, data, 0); + + return status; +} + + +/* + * Class: org_eclipse_cdt_utils_spawner_SpawnerOutputStream + * Method: close0 + * Signature: (I)I + */ +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_SpawnerOutputStream_close0(JNIEnv * env, + jobject jobj, + jint fd) +{ + return close(fd); +} diff --git a/core/org.eclipse.cdt.core.linux/library/pfind.c b/core/org.eclipse.cdt.core.linux/library/pfind.c new file mode 100644 index 00000000000..7d48e79739a --- /dev/null +++ b/core/org.eclipse.cdt.core.linux/library/pfind.c @@ -0,0 +1,74 @@ +/* + * pfind.c - Search for a binary in $PATH. + */ + +#include +#include +#include +#include +#include + +#ifndef PATH_MAX +#define PATH_MAX 1024 +#endif + + +char *pfind( const char *name ) +{ + char *tok; + char *sp; + char *path = getenv( "PATH" ); + char FullPath[PATH_MAX+1]; + + if( name == NULL ) + { + fprintf( stderr, "pfind(): Null argument.\n" ); + return NULL; + } + + if( path == NULL || strlen( path ) <= 0 ) + { + fprintf( stderr, "Unable to get $PATH.\n" ); + return NULL; + } + + // The value return by getenv() is readonly */ + path = strdup( path ); + + tok = strtok_r( path, ":", &sp ); + while( tok != NULL ) + { + //strcpy( FullPath, tok ); + //strcat( FullPath, "/" ); + //strcat( FullPath, name ); + snprintf(FullPath, sizeof(FullPath) - 1, "%s/%s", tok, name); + + if( access( FullPath, X_OK | R_OK ) == 0 ) + { + free( path ); + return strdup(FullPath); + } + + tok = strtok_r( NULL, ":", &sp ); + } + + free( path ); + return NULL; +} + +#ifdef BUILD_WITH_MAIN +int main( int argc, char **argv ) +{ + int i; + char *fullpath; + + for( i=1; i +#include +#include +#include +#include +#include + +#include "exec0.h" +#include + + +#define DEBUGIT 0 + + +/* + * Header for class org_eclipse_cdt_utils_spawner_Spawner + */ + + +#if DEBUGIT +static void print_array(char **c_array) +{ + if (c_array) { + char **p = c_array; + for (; *p; p++) { + if (*p) { + fprintf(stderr, " %s", *p); + } + } + } else { + fprintf(stderr, "null"); + } + fprintf(stderr, "\n"); +} +#endif + + +static char **alloc_c_array(JNIEnv * env, jobjectArray j_array) +{ + int i; + jint c_array_size = (*env)->GetArrayLength(env, j_array); + char **c_array = calloc(c_array_size + 1, sizeof(*c_array)); + + if (c_array == NULL) + return NULL; + + for (i = 0; i < c_array_size; i++) { + jstring j_str = + (jstring) (*env)->GetObjectArrayElement(env, j_array, i); + const char *c_str = (*env)->GetStringUTFChars(env, j_str, NULL); + c_array[i] = (char *) strdup(c_str); + (*env)->ReleaseStringUTFChars(env, j_str, c_str); + (*env)->DeleteLocalRef(env, j_str); + } + + return c_array; +} + + +static void free_c_array(char **c_array) +{ + if (c_array) { + char **p = c_array; + for (; *p; p++) { + if (*p) { + free(*p); + } + } + free(c_array); + } +} + + +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_Spawner_exec1(JNIEnv * env, jobject jobj, + jobjectArray jcmd, + jobjectArray jenv, + jstring jdir) +{ + const char *dirpath = (*env)->GetStringUTFChars(env, jdir, NULL); + char **cmd; + char **envp; + int fd[3]; + pid_t pid = -1; + + cmd = alloc_c_array(env, jcmd); + if (cmd == NULL) + goto bail_out; + + envp = alloc_c_array(env, jenv); + if (envp == NULL) + goto bail_out; + +#if DEBUGIT + fprintf(stderr, "command:"); + print_array(cmd); + fprintf(stderr, "Envp:"); + print_array(envp); + fprintf(stderr, "dirpath: %s\n", dirpath); +#endif + + pid = exec0(cmd[0], cmd, envp, dirpath, NULL); + if (pid < 0) + goto bail_out; + + bail_out: + (*env)->ReleaseStringUTFChars(env, jdir, dirpath); + if (cmd) + free_c_array(cmd); + if (envp) + free_c_array(envp); + return pid; +} + +/* + * Class: org_eclipse_cdt_utils_spawner_Spawner + * Method: exec0 + * Signature: ([Ljava/lang/String;[Ljava/lang/String;Ljava/lang/String;[I)I + */ +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_Spawner_exec0(JNIEnv * env, jobject jobj, + jobjectArray jcmd, + jobjectArray jenv, + jstring jdir, + jintArray jchannels) +{ + jint *channels = (*env)->GetIntArrayElements(env, jchannels, 0); + const char *dirpath = (*env)->GetStringUTFChars(env, jdir, NULL); + char **cmd; + char **envp; + int fd[3]; + pid_t pid = -1; + + if (channels == NULL) + goto bail_out; + + cmd = alloc_c_array(env, jcmd); + if (cmd == NULL) + goto bail_out; + + envp = alloc_c_array(env, jenv); + if (envp == NULL) + goto bail_out; + +#if DEBUGIT + fprintf(stderr, "command:"); + print_array(cmd); + fprintf(stderr, "Envp:"); + print_array(envp); + fprintf(stderr, "dirpath: %s\n", dirpath); +#endif + + pid = exec0(cmd[0], cmd, envp, dirpath, fd); + if (pid < 0) + goto bail_out; + + channels[0] = fd[0]; + channels[1] = fd[1]; + channels[2] = fd[2]; + + bail_out: + (*env)->ReleaseIntArrayElements(env, jchannels, channels, 0); + (*env)->ReleaseStringUTFChars(env, jdir, dirpath); + if (cmd) + free_c_array(cmd); + if (envp) + free_c_array(envp); + return pid; +} + +/* + * Class: org_eclipse_cdt_utils_spawner_Spawner + * Method: raise + * Signature: (II)I + */ +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_Spawner_raise(JNIEnv * env, jobject jobj, + jint pid, jint sig) +{ + int status = -1; + + switch (sig) { + case 0: /* NOOP */ + status = kill(pid, 0); + break; + + case 2: /* INTERRUPT */ + status = kill(pid, SIGINT); + break; + + case 9: /* KILL */ + status = kill(pid, SIGKILL); + break; + + case 15: /* TERM */ + status = kill(pid, SIGTERM); + break; + + default: + status = kill(pid, sig); /* WHAT ?? */ + break; + } + + return status; +} + + + +/* + * Class: org_eclipse_cdt_utils_spawner_Spawner + * Method: waitFor + * Signature: (I)I + */ +JNIEXPORT jint JNICALL +Java_org_eclipse_cdt_utils_spawner_Spawner_waitFor(JNIEnv * env, + jobject jobj, jint pid) +{ + return wait0(pid); +}