Re: [cp-patches] [generics] Patch: FYI: ProcessBuilder

[Robert Schuster]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi.

Tom Tromey wrote:
> I'm checking this in on the generics branch.
> 
> This implements ProcessBuilder.  The C code hasn't been tested yet,
> fyi.
> 
> Tom
> 
> 2005-05-04  Tom Tromey  <address@hidden>
> 
>       * native/jni/java-lang/java_lang_VMProcess.c
>       (Java_java_lang_VMProcess_nativeSpawn): Added 'redirect'
>       argument.  Use defines instead of contents.
>       * vm/reference/java/lang/VMProcess.java (redirect): New field.
>       (spawn): Updated.
>       (setProcessInfo): Updated.
>       (VMProcess): Added 'redirect' argument.
>       (nativeSpawn): Likewise.
>       (exec): New overload.
>       * java/lang/ProcessBuilder.java: New file.
> 
> Index: native/jni/java-lang/java_lang_VMProcess.c
> ===================================================================
> RCS file: 
> /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMProcess.c,v
> retrieving revision 1.2.2.3
> diff -u -r1.2.2.3 java_lang_VMProcess.c
> --- native/jni/java-lang/java_lang_VMProcess.c        18 Apr 2005 01:37:42 
> -0000      1.2.2.3
> +++ native/jni/java-lang/java_lang_VMProcess.c        4 May 2005 21:49:54 
> -0000
> @@ -1,5 +1,5 @@
>  /* java_lang_VMProcess.c -- native code for java.lang.VMProcess
> -   Copyright (C) 1998, 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
> +   Copyright (C) 1998, 1999, 2000, 2002, 2004, 2005 Free Software 
> Foundation, Inc.
>  
>  This file is part of GNU Classpath.
>  
> @@ -135,7 +135,8 @@
>  JNIEXPORT void JNICALL
>  Java_java_lang_VMProcess_nativeSpawn (JNIEnv * env, jobject this,
>                                     jobjectArray cmdArray,
> -                                   jobjectArray envArray, jobject dirFile)
> +                                   jobjectArray envArray, jobject dirFile,
> +                                   jboolean redirect)
>  {
>    int fds[3][2] = { {-1, -1}, {-1, -1}, {-1, -1} };
>    jobject streams[3] = { NULL, NULL, NULL };
> @@ -151,6 +152,7 @@
>    jmethodID method;
>    jclass clazz;
>    int i;
> +  int pipe_count = redirect ? 2 : 3;
>  
>    /* Check for null */
>    if (cmdArray == NULL)
> @@ -218,7 +220,7 @@
>      }
>  
>    /* Create inter-process pipes */
> -  for (i = 0; i < 3; i++)
> +  for (i = 0; i < pipe_count; i++)
>      {
>        if (pipe (fds[i]) == -1)
>       {
> @@ -232,7 +234,8 @@
>    /* Set close-on-exec flag for parent's ends of pipes */
>    (void) fcntl (fds[0][1], F_SETFD, 1);
>    (void) fcntl (fds[1][0], F_SETFD, 1);
> -  (void) fcntl (fds[2][0], F_SETFD, 1);
> +  if (pipe_count == 3)
> +    (void) fcntl (fds[2][0], F_SETFD, 1);
>  
>    /* Fork into parent and child processes */
>    if ((pid = fork ()) == (pid_t) - 1)
> @@ -267,7 +270,16 @@
>           }
>         close (fds[1][1]);
>       }
> -      if (fds[2][1] != 2)
> +      if (pipe_count == 3)
> +     {
> +       /* Duplicate stdout to stderr.  */
> +       if (dup2 (1, 2) == -1)
> +         {
> +           fprintf (stderr, "dup2: %s", strerror (errno));
> +           exit (127);
> +         }
> +     }
> +      else if (fds[2][1] != 2)
>       {
>         if (dup2 (fds[2][1], 2) == -1)
>           {
> @@ -308,11 +320,12 @@
>    method = (*env)->GetMethodID (env, clazz, "<init>", "(II)V");
>    if ((*env)->ExceptionOccurred (env))
>      goto done;
> -  for (i = 0; i < 3; i++)
> +  for (i = 0; i < pipe_count; i++)
>      {
> -      /* Mode is WRITE (2) for in and READ (1) for out and err. */
>        const int fd = fds[i][i == 0];
> -      const int mode = (i == 0) ? 2 : 1;
> +      const int mode = ((i == 0)
> +                     ? gnu_java_nio_channels_FileChannelImpl_WRITE
> +                     : gnu_java_nio_channels_FileChannelImpl_READ);
>        jclass sclazz;
>        jmethodID smethod;
I think the above declarations and definitions have to moved to the
beginning of the function.


>  
> @@ -320,7 +333,7 @@
>        if ((*env)->ExceptionOccurred (env))
>       goto done;
>  
> -      if (mode == 2)
> +      if (mode == gnu_java_nio_channels_FileChannelImpl_WRITE)
>       sclazz = (*env)->FindClass (env, "java/io/FileOutputStream");
>        else
>       sclazz = (*env)->FindClass (env, "java/io/FileInputStream");
> @@ -360,7 +373,7 @@
>     */
>  
>    /* Close child's ends of pipes */
> -  for (i = 0; i < 3; i++)
> +  for (i = 0; i < pipe_count; i++)
>      {
>        const int fd = fds[i][i != 0];
>  
> @@ -374,7 +387,7 @@
>     * was created for a file descriptor, we don't close it because it
>     * will get closed when the Stream object is finalized.
>     */
> -  for (i = 0; i < 3; i++)
> +  for (i = 0; i < pipe_count; i++)
>      {
>        const int fd = fds[i][i == 0];
>  

cu
Robert
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFCehFjG9cfwmwwEtoRAi31AJ4hs9KeM2inQ4BFUp6+rfQmMsUQywCfWwYk
rEx4B6Ld21BRoHcQb6W5HyY=
=CfYc
-----END PGP SIGNATURE-----