record: Get rid of UFTRACE_PIPE env variable

As it doesn't carry any info now, we can simply omit it. Signed-off-by: Namhyung Kim <namhyung@gmail.com>
namhyung · Mar 29, 2019 · fa06454 · fa06454
1 parent a3e6883
commit fa06454
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/cmds/record.c b/cmds/record.c
@@ -274,7 +274,6 @@ static void setup_child_environ(struct opts *opts, int argc, char *argv[])
 		setenv("UFTRACE_LOGFD", buf, 1);
 	}
 
-	setenv("UFTRACE_PIPE", "-1", 1);
 	setenv("UFTRACE_SHMEM", "1", 1);
 
 	if (debug) {

diff --git a/libmcount/mcount.c b/libmcount/mcount.c
@@ -1678,20 +1678,19 @@ static __used void mcount_startup(void)
 	if (pipefd_str) {
 		pfd = strtol(pipefd_str, NULL, 0);
 
-		if (pfd < 0) {
-			char *channel = NULL;
-
-			xasprintf(&channel, "%s/%s", dirname, ".channel");
-			pfd = open(channel, O_WRONLY);
-			free(channel);
-		}
-
 		/* minimal sanity check */
 		if (fstat(pfd, &statbuf) < 0 || !S_ISFIFO(statbuf.st_mode)) {
 			pr_dbg("ignore invalid pipe fd: %d\n", pfd);
 			pfd = -1;
 		}
 	}
+	else {
+		char *channel = NULL;
+
+		xasprintf(&channel, "%s/%s", dirname, ".channel");
+		pfd = open(channel, O_WRONLY);
+		free(channel);
+	}
 
 	if (getenv("UFTRACE_LIST_EVENT")) {
 		mcount_list_events();