[01/24] util: Add a utility to stream data through an external process

Submitted by apinheiro on June 20, 2018, 12:40 p.m.

Details

Message ID 20180620124059.25917-2-apinheiro@igalia.com
State New
Headers show
Series "ARB_gl_spirv: support for loading SPIR-V binaries, plus first set of tests" ( rev: 2 ) in Piglit

Not browsing as part of any series.

Commit Message

apinheiro June 20, 2018, 12:40 p.m.
From: Neil Roberts <nroberts@igalia.com>

The data is given as a buffer which is streamed through the standard
in of the child process. The standard output is captured into a
buffer.
---
 tests/util/CMakeLists.txt      |   1 +
 tests/util/piglit-subprocess.c | 207 +++++++++++++++++++++++++++++++++++++++++
 tests/util/piglit-subprocess.h |  44 +++++++++
 3 files changed, 252 insertions(+)
 create mode 100644 tests/util/piglit-subprocess.c
 create mode 100644 tests/util/piglit-subprocess.h

Patch hide | download patch | download mbox

diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 3fa67d7f6..e083761d1 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -35,6 +35,7 @@  set(UTIL_INCLUDES
 set(UTIL_SOURCES
 	piglit-log.c
 	piglit-util.c
+	piglit-subprocess.c
 	)
 
 set(UTIL_GL_INCLUDES
diff --git a/tests/util/piglit-subprocess.c b/tests/util/piglit-subprocess.c
new file mode 100644
index 000000000..4e9ee1a14
--- /dev/null
+++ b/tests/util/piglit-subprocess.c
@@ -0,0 +1,207 @@ 
+/*
+ * Copyright © 2018 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "piglit-subprocess.h"
+
+#include <stdio.h>
+
+#ifndef _WIN32
+
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <poll.h>
+#include <limits.h>
+
+static bool
+stream_data(pid_t pid,
+	    int to_child,
+	    int from_child,
+	    size_t input_size,
+	    const uint8_t *input,
+	    size_t *output_size,
+	    uint8_t **output)
+{
+	bool ret = true;
+	size_t buf_size = 128;
+
+	*output = malloc(buf_size);
+	*output_size = 0;
+
+	while (true) {
+		int n_pollfds = 0;
+		struct pollfd pollfds[2];
+
+		if (to_child != -1) {
+			pollfds[n_pollfds].fd = to_child;
+			pollfds[n_pollfds].events = POLLOUT;
+			pollfds[n_pollfds].revents = 0;
+			n_pollfds++;
+		}
+
+		pollfds[n_pollfds].fd = from_child;
+		pollfds[n_pollfds].events = POLLIN;
+		pollfds[n_pollfds].revents = 0;
+		n_pollfds++;
+
+		int res = poll(pollfds, n_pollfds, INT_MAX);
+
+		if (res < 0) {
+			if (errno == EINTR)
+				continue;
+			fprintf(stderr, "poll: %s\n", strerror(errno));
+			ret = false;
+			goto done;
+		}
+
+		for (int i = 0; i < n_pollfds; i++) {
+			if (pollfds[i].revents &
+			    ~(POLLIN | POLLOUT | POLLHUP)) {
+				ret = false;
+				goto done;
+			}
+
+			if (pollfds[i].fd == from_child &&
+			    pollfds[i].revents) {
+				if (buf_size - *output_size < 128) {
+					buf_size *=2;
+					*output = realloc(*output, buf_size);
+				}
+				res = read(from_child,
+					   *output + *output_size,
+					   buf_size - *output_size);
+				if (res < 0) {
+					if (errno != EINTR) {
+						ret = false;
+						goto done;
+					}
+				} else if (res == 0) {
+					if (to_child != -1)
+						ret = false;
+					goto done;
+				} else {
+					*output_size += res;
+				}
+			} else if (pollfds[i].fd == to_child &&
+				   pollfds[i].revents) {
+				res = write(to_child, input, input_size);
+				if (res < 0) {
+					ret = false;
+					goto done;
+				}
+				input += res;
+				input_size -= res;
+
+				if (input_size <= 0) {
+					close(to_child);
+					to_child = -1;
+				}
+			}
+		}
+	}
+
+	done:
+	if (to_child != -1)
+		close(to_child);
+	close(from_child);
+
+	if (!ret)
+		free(*output);
+
+	return ret;
+}
+
+bool
+piglit_subprocess(char * const *arguments,
+		  size_t input_size,
+		  const uint8_t *input,
+		  size_t *output_size,
+		  uint8_t **output)
+{
+	pid_t pid;
+	int stdin_pipe[2];
+	int stdout_pipe[2];
+
+	if (pipe(stdin_pipe) == -1) {
+		fprintf(stderr, "pipe: %s\n", strerror(errno));
+		return false;
+	}
+	if (pipe(stdout_pipe) == -1) {
+		fprintf(stderr, "pipe: %s\n", strerror(errno));
+		close(stdin_pipe[0]);
+		close(stdin_pipe[1]);
+		return false;
+	}
+
+	pid = fork();
+
+	if (pid < 0) {
+		fprintf(stderr, "fork failed: %s\n", strerror(errno));
+		return false;
+	} else if (pid == 0) {
+		dup2(stdin_pipe[0], STDIN_FILENO);
+		dup2(stdout_pipe[1], STDOUT_FILENO);
+		for (int i = 3; i < 256; i++)
+			close(i);
+		execvp(arguments[0], arguments);
+		fprintf(stderr, "%s: %s\n", arguments[0], strerror(errno));
+		exit(EXIT_FAILURE);
+	} else {
+		close(stdin_pipe[0]);
+		close(stdout_pipe[1]);
+
+		bool ret = stream_data(pid,
+				       stdin_pipe[1],
+				       stdout_pipe[0],
+				       input_size, input,
+				       output_size, output);
+
+		int status;
+		while (waitpid(pid, &status, 0 /* options */) == -1);
+
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+			if (ret)
+				free(*output);
+			return false;
+		}
+
+		return ret;
+	}
+}
+
+#else /* _WIN32 */
+
+bool
+piglit_subprocess(char * const *arguments,
+		  size_t input_size,
+		  const uint8_t *input,
+		  size_t *output_size,
+		  uint8_t **output)
+{
+	fprintf(stderr, "piglit_subprocess is not implemented on Windows\n");
+	return false;
+}
+
+#endif /* _WIN32 */
diff --git a/tests/util/piglit-subprocess.h b/tests/util/piglit-subprocess.h
new file mode 100644
index 000000000..1240bf1c1
--- /dev/null
+++ b/tests/util/piglit-subprocess.h
@@ -0,0 +1,44 @@ 
+/*
+ * Copyright © 2018 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __PIGLIT_SUBPROCESS_H__
+#define __PIGLIT_SUBPROCESS_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <piglit-util.h>
+
+bool
+piglit_subprocess(char * const *arguments,
+		  size_t input_size,
+		  const uint8_t *input,
+		  size_t *output_size,
+		  uint8_t **output);
+
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
+#endif /* __PIGLIT_SUBPROCESS_H__ */