From patchwork Tue Jun 6 08:54:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abdiel Janulgue X-Patchwork-Id: 9768299 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A78BD6035D for ; Tue, 6 Jun 2017 08:58:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 998D1204C1 for ; Tue, 6 Jun 2017 08:58:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D6022841E; Tue, 6 Jun 2017 08:58:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 18207204C1 for ; Tue, 6 Jun 2017 08:58:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 507186E067; Tue, 6 Jun 2017 08:58:26 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B1C66E067 for ; Tue, 6 Jun 2017 08:58:24 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jun 2017 01:58:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,305,1493708400"; d="scan'208";a="96063834" Received: from skylake-nuc.fi.intel.com ([10.237.72.145]) by orsmga002.jf.intel.com with ESMTP; 06 Jun 2017 01:58:22 -0700 From: Abdiel Janulgue To: intel-gfx@lists.freedesktop.org Date: Tue, 6 Jun 2017 11:54:12 +0300 Message-Id: <1496739254-18898-1-git-send-email-abdiel.janulgue@linux.intel.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [i-g-t PATCH v3 1/3] lib/igt_core: Add igt_system helpers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Support executing external processes with the goal of capturing its standard streams to the igt logging infrastructure in addition to its exit status. v3: Rename igt_exec -> igt_system (Chris). v2: Fix leaks on fd teardown. Make sure redirected process printout when > 64kb still works, like full dmesg. (Petri). Cc: Petri Latvala Signed-off-by: Abdiel Janulgue Reviewed-by: Arkadiusz Hiler --- lib/igt_core.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/igt_core.h | 10 ++++ 2 files changed, 167 insertions(+) diff --git a/lib/igt_core.c b/lib/igt_core.c index 9c3b37f..26f7fc5 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -2099,3 +2099,160 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, return fp; } + +struct output_pipe { + int output_fd; + int save_fd; + int read_fd; + int write_fd; + bool redirected; + enum igt_log_level log_level; +}; + +static bool redirect_output(struct output_pipe *p, int output_fd, + enum igt_log_level level) +{ + int fds[2]; + + if (pipe(fds) == -1) + goto err; + + /* save output */ + if ((p->save_fd = dup(output_fd)) == -1) + goto err; + + /* Redirect output to our buffer */ + if (dup2(fds[1], output_fd) == -1) + goto err; + + p->output_fd = output_fd; + p->read_fd = fds[0]; + p->write_fd = fds[1]; + p->redirected = true; + p->log_level = level; + + return true; +err: + close(fds[0]); + close(fds[1]); + close(p->save_fd); + + return false; +} + +static void unredirect_output(struct output_pipe *p) +{ + if (!p->redirected) + return; + + /* read_fd is closed separately. We still need to read its + * buffered contents after un-redirecting the stream. + */ + close(p->write_fd); + dup2(p->save_fd, p->output_fd); + close(p->save_fd); + p->redirected = false; +} + +/** + * igt_system: + * + * An improved replacement of the system() call. + * + * Executes the shell command specified in @command with the added feature of + * concurrently capturing its stdout and stderr to igt_log and igt_warn + * respectively. + * + * Returns: The exit status of the executed process. -1 for failure. + */ +int igt_system(const char *command) +{ +#define OUT 0 +#define ERR 1 + struct output_pipe op[2]; + int i, status; + struct igt_helper_process process = {}; + char buf[PIPE_BUF]; + + if (!redirect_output(&op[OUT], STDOUT_FILENO, IGT_LOG_INFO)) + goto err; + if (!redirect_output(&op[ERR], STDERR_FILENO, IGT_LOG_WARN)) + goto err; + + igt_fork_helper(&process) { + igt_assert(execl("/bin/sh", "sh", "-c", command, + (char *) NULL) != -1); + } + + for (i = 0; i < ARRAY_SIZE(op); i++) { + struct output_pipe *current = &op[i]; + + /* Unredirect so igt_log() works */ + unredirect_output(current); + memset(buf, 0, sizeof(buf)); + while (read(current->read_fd, buf, sizeof(buf)) > 0) { + igt_log(IGT_LOG_DOMAIN, current->log_level, + "[cmd] %s", buf); + memset(buf, 0, sizeof(buf)); + } + close(current->read_fd); + } + status = igt_wait_helper(&process); + + return WEXITSTATUS(status); +err: + /* Failed to redirect one or both streams. Roll back changes. */ + for (i = 0; i < ARRAY_SIZE(op); i++) { + if (!op[i].redirected) + continue; + close(op[i].read_fd); + unredirect_output(&op[i]); + } + + return -1; +} + +/** + * igt_system_quiet: + * Similar to igt_system(), except redirect output to /dev/null + * + * Returns: The exit status of the executed process. -1 for failure. + */ +int igt_system_quiet(const char *command) +{ + int stderr_fd_copy, stdout_fd_copy, status, nullfd; + + /* redirect */ + if ((nullfd = open("/dev/null", O_WRONLY)) == -1) + goto err; + if ((stdout_fd_copy = dup(STDOUT_FILENO)) == -1) + goto err; + if ((stderr_fd_copy = dup(STDERR_FILENO)) == -1) + goto err; + + if (dup2(nullfd, STDOUT_FILENO) == -1) + goto err; + if (dup2(nullfd, STDERR_FILENO) == -1) + goto err; + + if ((status = system(command)) == -1) + goto err; + + /* restore */ + if (dup2(stdout_fd_copy, STDOUT_FILENO) == -1) + goto err; + if (dup2(stderr_fd_copy, STDERR_FILENO) == -1) + goto err; + + close(stdout_fd_copy); + close(stderr_fd_copy); + close(nullfd); + + return WEXITSTATUS(status); +err: + close(stderr_fd_copy); + close(stdout_fd_copy); + close(nullfd); + + return -1; +} diff --git a/lib/igt_core.h b/lib/igt_core.h index 4a125af..1855c5e 100644 --- a/lib/igt_core.h +++ b/lib/igt_core.h @@ -919,4 +919,14 @@ FILE *__igt_fopen_data(const char* igt_srcdir, const char* igt_datadir, #define igt_fopen_data(filename) \ __igt_fopen_data(IGT_SRCDIR, IGT_DATADIR, filename) +int igt_system(const char *command); +int igt_system_quiet(const char *command); +#define igt_system_cmd(status, format...) \ + do { \ + char *buf = 0; \ + igt_assert(asprintf(&buf, format) != -1); \ + status = igt_system(buf); \ + free(buf); \ + } while (0) + #endif /* IGT_CORE_H */