Merge pull request #10001 from y-zeng/fling_stream

Use gpr_subprocess in fling_stream_test

test/core/fling/fling_stream_test.c

@@ -31,22 +31,13 @@
  *
  */
 
-#ifndef _POSIX_SOURCE
-#define _POSIX_SOURCE
-#endif
-
-#include <assert.h>
-#include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/host_port.h>
 #include <grpc/support/string_util.h>
+#include <grpc/support/subprocess.h>
 #include "src/core/lib/support/string.h"
 #include "test/core/util/port.h"
 
@@ -57,10 +48,7 @@ int main(int argc, char **argv) {
   int port = grpc_pick_unused_port_or_die();
   char *args[10];
   int status;
-  pid_t svr, cli;
+  gpr_subprocess *svr, *cli;
-  /* seed rng with pid, so we don't end up with the same random numbers as a
-     concurrently running test binary */
-  srand((unsigned)getpid());
   /* figure out where we are */
   if (lslash) {
     memcpy(root, me, (size_t)(lslash - me));
@@ -69,45 +57,38 @@ int main(int argc, char **argv) {
     strcpy(root, ".");
   }
   /* start the server */
-  svr = fork();
+  gpr_asprintf(&args[0], "%s/fling_server%s", root,
-  if (svr == 0) {
+               gpr_subprocess_binary_extension());
-    gpr_asprintf(&args[0], "%s/fling_server", root);
+  args[1] = "--bind";
-    args[1] = "--bind";
+  gpr_join_host_port(&args[2], "::", port);
-    gpr_join_host_port(&args[2], "::", port);
+  args[3] = "--no-secure";
-    args[3] = "--no-secure";
+  svr = gpr_subprocess_create(4, (const char **)args);
-    args[4] = 0;
+  gpr_free(args[0]);
-    execv(args[0], args);
+  gpr_free(args[2]);
 
-    gpr_free(args[0]);
-    gpr_free(args[2]);
-    return 1;
-  }
-  /* wait a little */
-  sleep(2);
   /* start the client */
-  cli = fork();
+  gpr_asprintf(&args[0], "%s/fling_client%s", root,
-  if (cli == 0) {
+               gpr_subprocess_binary_extension());
-    gpr_asprintf(&args[0], "%s/fling_client", root);
+  args[1] = "--target";
-    args[1] = "--target";
+  gpr_join_host_port(&args[2], "127.0.0.1", port);
-    gpr_join_host_port(&args[2], "127.0.0.1", port);
+  args[3] = "--scenario=ping-pong-stream";
-    args[3] = "--scenario=ping-pong-stream";
+  args[4] = "--no-secure";
-    args[4] = "--no-secure";
+  args[5] = 0;
-    args[5] = 0;
+  cli = gpr_subprocess_create(6, (const char **)args);
-    execv(args[0], args);
+  gpr_free(args[0]);
+  gpr_free(args[2]);
 
-    gpr_free(args[0]);
-    gpr_free(args[2]);
-    return 1;
-  }
   /* wait for completion */
   printf("waiting for client\n");
-  if (waitpid(cli, &status, 0) == -1) return 2;
+  if ((status = gpr_subprocess_join(cli))) {
-  if (!WIFEXITED(status)) return 4;
+    gpr_subprocess_destroy(cli);
-  if (WEXITSTATUS(status)) return WEXITSTATUS(status);
+    gpr_subprocess_destroy(svr);
-  printf("waiting for server\n");
+    return status;
-  kill(svr, SIGINT);
+  }
-  if (waitpid(svr, &status, 0) == -1) return 2;
+  gpr_subprocess_destroy(cli);
-  if (!WIFEXITED(status)) return 4;
+
-  if (WEXITSTATUS(status)) return WEXITSTATUS(status);
+  gpr_subprocess_interrupt(svr);
-  return 0;
+  status = gpr_subprocess_join(svr);
+  gpr_subprocess_destroy(svr);
+  return status;
 }