Merge branch 'x86-percpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / tools / perf / util / run-command.c

diff --git a/tools/perf/util/run-command.c b/tools/perf/util/run-command.c
index b2f5e85..2b615ac 100644 (file)
--- a/tools/perf/util/run-command.c
+++ b/tools/perf/util/run-command.c
@@ -65,7 +65,6 @@ int start_command(struct child_process *cmd)
                cmd->err = fderr[0];
        }
 
-#ifndef __MINGW32__
        fflush(NULL);
        cmd->pid = fork();
        if (!cmd->pid) {
@@ -118,71 +117,6 @@ int start_command(struct child_process *cmd)
                }
                exit(127);
        }
-#else
-       int s0 = -1, s1 = -1, s2 = -1;  /* backups of stdin, stdout, stderr */
-       const char **sargv = cmd->argv;
-       char **env = environ;
-
-       if (cmd->no_stdin) {
-               s0 = dup(0);
-               dup_devnull(0);
-       } else if (need_in) {
-               s0 = dup(0);
-               dup2(fdin[0], 0);
-       } else if (cmd->in) {
-               s0 = dup(0);
-               dup2(cmd->in, 0);
-       }
-
-       if (cmd->no_stderr) {
-               s2 = dup(2);
-               dup_devnull(2);
-       } else if (need_err) {
-               s2 = dup(2);
-               dup2(fderr[1], 2);
-       }
-
-       if (cmd->no_stdout) {
-               s1 = dup(1);
-               dup_devnull(1);
-       } else if (cmd->stdout_to_stderr) {
-               s1 = dup(1);
-               dup2(2, 1);
-       } else if (need_out) {
-               s1 = dup(1);
-               dup2(fdout[1], 1);
-       } else if (cmd->out > 1) {
-               s1 = dup(1);
-               dup2(cmd->out, 1);
-       }
-
-       if (cmd->dir)
-               die("chdir in start_command() not implemented");
-       if (cmd->env) {
-               env = copy_environ();
-               for (; *cmd->env; cmd->env++)
-                       env = env_setenv(env, *cmd->env);
-       }
-
-       if (cmd->perf_cmd) {
-               cmd->argv = prepare_perf_cmd(cmd->argv);
-       }
-
-       cmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env);
-
-       if (cmd->env)
-               free_environ(env);
-       if (cmd->perf_cmd)
-               free(cmd->argv);
-
-       cmd->argv = sargv;
-       if (s0 >= 0)
-               dup2(s0, 0), close(s0);
-       if (s1 >= 0)
-               dup2(s1, 1), close(s1);
-       if (s2 >= 0)
-               dup2(s2, 2), close(s2);
-#endif
 
        if (cmd->pid < 0) {
                int err = errno;
@@ -288,14 +222,6 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
        return run_command(&cmd);
 }
 
-#ifdef __MINGW32__
-static __stdcall unsigned run_thread(void *data)
-{
-       struct async *async = data;
-       return async->proc(async->fd_for_proc, async->data);
-}
-#endif
-
 int start_async(struct async *async)
 {
        int pipe_out[2];
@@ -304,7 +230,6 @@ int start_async(struct async *async)
                return error("cannot create pipe: %s", strerror(errno));
        async->out = pipe_out[0];
 
-#ifndef __MINGW32__
        /* Flush stdio before fork() to avoid cloning buffers */
        fflush(NULL);
 
@@ -319,33 +244,17 @@ int start_async(struct async *async)
                exit(!!async->proc(pipe_out[1], async->data));
        }
        close(pipe_out[1]);
-#else
-       async->fd_for_proc = pipe_out[1];
-       async->tid = (HANDLE) _beginthreadex(NULL, 0, run_thread, async, 0, NULL);
-       if (!async->tid) {
-               error("cannot create thread: %s", strerror(errno));
-               close_pair(pipe_out);
-               return -1;
-       }
-#endif
+
        return 0;
 }
 
 int finish_async(struct async *async)
 {
-#ifndef __MINGW32__
        int ret = 0;
 
        if (wait_or_whine(async->pid))
                ret = error("waitpid (async) failed");
-#else
-       DWORD ret = 0;
-       if (WaitForSingleObject(async->tid, INFINITE) != WAIT_OBJECT_0)
-               ret = error("waiting for thread failed: %lu", GetLastError());
-       else if (!GetExitCodeThread(async->tid, &ret))
-               ret = error("cannot get thread exit code: %lu", GetLastError());
-       CloseHandle(async->tid);
-#endif
+
        return ret;
 }
 
@@ -353,7 +262,7 @@ int run_hook(const char *index_file, const char *name, ...)
 {
        struct child_process hook;
        const char **argv = NULL, *env[2];
-       char index[PATH_MAX];
+       char idx[PATH_MAX];
        va_list args;
        int ret;
        size_t i = 0, alloc = 0;
@@ -375,8 +284,8 @@ int run_hook(const char *index_file, const char *name, ...)
        hook.no_stdin = 1;
        hook.stdout_to_stderr = 1;
        if (index_file) {
-               snprintf(index, sizeof(index), "PERF_INDEX_FILE=%s", index_file);
-               env[0] = index;
+               snprintf(idx, sizeof(idx), "PERF_INDEX_FILE=%s", index_file);
+               env[0] = idx;
                env[1] = NULL;
                hook.env = env;
        }