Revert "trace2: (V3) create new combined trace facility"

This reverts commit c849c28.

Author: jeffhostetler

Makefile

@@ -1000,16 +1000,6 @@ LIB_OBJS += tempfile.o
 LIB_OBJS += thread-utils.o
 LIB_OBJS += tmp-objdir.o
 LIB_OBJS += trace.o
-LIB_OBJS += trace2.o
-LIB_OBJS += trace2/tr2_cfg.o
-LIB_OBJS += trace2/tr2_dst.o
-LIB_OBJS += trace2/tr2_sid.o
-LIB_OBJS += trace2/tr2_tbuf.o
-LIB_OBJS += trace2/tr2_tgt_event.o
-LIB_OBJS += trace2/tr2_tgt_normal.o
-LIB_OBJS += trace2/tr2_tgt_perf.o
-LIB_OBJS += trace2/tr2_tls.o
-LIB_OBJS += trace2/tr2_verb.o
 LIB_OBJS += trailer.o
 LIB_OBJS += transport.o
 LIB_OBJS += transport-helper.o

cache.h

@@ -9,7 +9,6 @@
 #include "gettext.h"
 #include "convert.h"
 #include "trace.h"
-#include "trace2.h"
 #include "string-list.h"
 #include "pack-revindex.h"
 #include "hash.h"

common-main.c

@@ -25,18 +25,12 @@ static void restore_sigpipe_to_default(void)
 
 int main(int argc, const char **argv)
 {
-	int result;
-
 	/*
 	 * Always open file descriptors 0/1/2 to avoid clobbering files
 	 * in die().  It also avoids messing up when the pipes are dup'ed
 	 * onto stdin/stdout/stderr in the child processes we spawn.
 	 */
 	sanitize_stdfds();
-	restore_sigpipe_to_default();
-
-	trace2_initialize();
-	trace2_cmd_start(argv);
 
 	git_resolve_executable_dir(argv[0]);
 
@@ -46,9 +40,7 @@ int main(int argc, const char **argv)
 
 	attr_start();
 
-	result = cmd_main(argc, argv);
-
-	trace2_cmd_exit(result);
+	restore_sigpipe_to_default();
 
-	return result;
+	return cmd_main(argc, argv);
 }

compat/mingw.c

@@ -1945,7 +1945,6 @@ static int try_shell_exec(const char *cmd, char *const *argv)
 		return 0;
 	prog = path_lookup(interpr, 1);
 	if (prog) {
-		int exec_id;
 		int argc = 0;
 #ifndef _MSC_VER
 		const
@@ -1955,16 +1954,13 @@ static int try_shell_exec(const char *cmd, char *const *argv)
 		ALLOC_ARRAY(argv2, argc + 1);
 		argv2[0] = (char *)cmd;	/* full path to the script file */
 		memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc);
-		exec_id = trace2_exec(prog, argv2);
 		pid = mingw_spawnv(prog, argv2, interpr);
 		if (pid >= 0) {
 			int status;
 			if (waitpid(pid, &status, 0) < 0)
 				status = 255;
-			trace2_exec_result(exec_id, status);
 			exit(status);
 		}
-		trace2_exec_result(exec_id, -1);
 		pid = 1;	/* indicate that we tried but failed */
 		free(prog);
 		free(argv2);
@@ -1977,17 +1973,12 @@ int mingw_execv(const char *cmd, char *const *argv)
 	/* check if git_command is a shell script */
 	if (!try_shell_exec(cmd, argv)) {
 		int pid, status;
-		int exec_id;
 
-		exec_id = trace2_exec(cmd, (const char **)argv);
 		pid = mingw_spawnv(cmd, (const char **)argv, NULL);
-		if (pid < 0) {
-			trace2_exec_result(exec_id, -1);
+		if (pid < 0)
 			return -1;
-		}
 		if (waitpid(pid, &status, 0) < 0)
 			status = 255;
-		trace2_exec_result(exec_id, status);
 		exit(status);
 	}
 	return -1;

compat/mingw.h

@@ -165,7 +165,8 @@ static inline int fcntl(int fd, int cmd, ...)
 	errno = EINVAL;
 	return -1;
 }
-
+/* bash cannot reliably detect negative return codes as failure */
+#define exit(code) exit((code) & 0xff)
 #define sigemptyset(x) (void)0
 static inline int sigaddset(sigset_t *set, int signum)
 { return 0; }

config.c

@@ -2709,8 +2709,6 @@ int git_config_set_gently(const char *key, const char *value)
 void git_config_set(const char *key, const char *value)
 {
 	git_config_set_multivar(key, value, NULL, 0);
-
-	trace2_cmd_set_config(key, value);
 }
 
 /*

exec-cmd.c

@@ -209,8 +209,6 @@ static int git_get_exec_path(struct strbuf *buf, const char *argv0)
 		return -1;
 	}
 
-	trace2_cmd_path(buf->buf);
-
 	return 0;
 }
 

git-compat-util.h

@@ -1291,13 +1291,6 @@ struct fscache;
 
 extern int cmd_main(int, const char **);
 
-/*
- * Intercept all calls to exit() and route them to trace2 to
- * optionally emit a message before calling the real exit().
- */
-int trace2_cmd_exit_fl(const char *file, int line, int code);
-#define exit(code) exit(trace2_cmd_exit_fl(__FILE__, __LINE__, (code)))
-
 /*
  * You can mark a stack variable with UNLEAK(var) to avoid it being
  * reported as a leak by tools like LSAN or valgrind. The argument

git.c

@@ -149,20 +149,16 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 				git_set_exec_path(cmd + 1);
 			else {
 				puts(git_exec_path());
-				trace2_cmd_verb("_query_");
 				exit(0);
 			}
 		} else if (!strcmp(cmd, "--html-path")) {
 			puts(system_path(GIT_HTML_PATH));
-			trace2_cmd_verb("_query_");
 			exit(0);
 		} else if (!strcmp(cmd, "--man-path")) {
 			puts(system_path(GIT_MAN_PATH));
-			trace2_cmd_verb("_query_");
 			exit(0);
 		} else if (!strcmp(cmd, "--info-path")) {
 			puts(system_path(GIT_INFO_PATH));
-			trace2_cmd_verb("_query_");
 			exit(0);
 		} else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) {
 			use_pager = 1;
@@ -291,7 +287,6 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 			(*argv)++;
 			(*argc)--;
 		} else if (skip_prefix(cmd, "--list-cmds=", &cmd)) {
-			trace2_cmd_verb("_query_");
 			if (!strcmp(cmd, "parseopt")) {
 				struct string_list list = STRING_LIST_INIT_DUP;
 				int i;
@@ -339,14 +334,9 @@ static int handle_alias(int *argcp, const char ***argv)
 			commit_pager_choice();
 
 			child.use_shell = 1;
-			child.trace2_child_class = "shell_alias";
 			argv_array_push(&child.args, alias_string + 1);
 			argv_array_pushv(&child.args, (*argv) + 1);
 
-			trace2_cmd_alias(alias_command, child.args.argv);
-			trace2_cmd_list_config();
-			trace2_cmd_verb("_run_shell_alias_");
-
 			ret = run_command(&child);
 			if (ret >= 0)   /* normal exit */
 				exit(ret);
@@ -381,9 +371,6 @@ static int handle_alias(int *argcp, const char ***argv)
 		/* insert after command name */
 		memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);
 
-		trace2_cmd_alias(alias_command, new_argv);
-		trace2_cmd_list_config();
-
 		*argv = new_argv;
 		*argcp += count - 1;
 
@@ -496,8 +483,6 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 		die("pre-command hook aborted command");
 
 	trace_argv_printf(argv, "trace: built-in: git");
-	trace2_cmd_verb(p->cmd);
-	trace2_cmd_list_config();
 
 	validate_cache_entries(&the_index);
 	exit_code = status = p->fn(argc, argv, prefix);
@@ -755,15 +740,10 @@ static void execv_dashed_external(const char **argv)
 	cmd.clean_on_exit = 1;
 	cmd.wait_after_clean = 1;
 	cmd.silent_exec_failure = 1;
-	cmd.trace2_child_class = "dashed";
 
 	if (run_pre_command_hook(cmd.args.argv))
 		die("pre-command hook aborted command");
 
-	/*
-	 * The code in run_command() logs trace2 child_start/child_exit
-	 * events, so we do not need to report exec/exec_result events here.
-	 */
 	trace_argv_printf(cmd.args.argv, "trace: exec:");
 
 	/*
@@ -773,20 +753,10 @@ static void execv_dashed_external(const char **argv)
 	 * the program.
 	 */
 	exit_code = status = run_command(&cmd);
-
-	/*
-	 * If the child process ran and we are now going to exit, emit a
-	 * generic string as our trace2 command verb to indicate that we
-	 * launched a dashed command.
-	 */
-	if (status >= 0) {
-		trace2_cmd_verb("_run_dashed_");
+	if (status >= 0)
 		exit(status);
-	}
-	else if (errno != ENOENT) {
-		trace2_cmd_verb("_run_dashed_");
+	else if (errno != ENOENT)
 		exit(128);
-	}
 
 	run_post_command_hook();
 }
@@ -813,15 +783,6 @@ static int run_argv(int *argcp, const char ***argv)
 			struct argv_array args = ARGV_ARRAY_INIT;
 			int i;
 
-			/*
-			 * The current process is committed to launching a
-			 * child process to run the command named in (**argv)
-			 * and exiting.  Log a generic string as the trace2
-			 * command verb to indicate this.  Note that the child
-			 * process will log the actual verb when it runs.
-			 */
-			trace2_cmd_verb("_run_git_alias_");
-
 			if (get_super_prefix())
 				die("%s doesn't support --super-prefix", **argv);
 
@@ -837,8 +798,8 @@ static int run_argv(int *argcp, const char ***argv)
 			 * if we fail because the command is not found, it is
 			 * OK to return. Otherwise, we just pass along the status code.
 			 */
-			i = run_command_v_opt_tr2(args.argv, RUN_SILENT_EXEC_FAILURE |
-						  RUN_CLEAN_ON_EXIT, "git_alias");
+			i = run_command_v_opt(args.argv, RUN_SILENT_EXEC_FAILURE |
+					      RUN_CLEAN_ON_EXIT);
 			if (i >= 0 || errno != ENOENT)
 				exit(i);
 			die("could not execute builtin %s", **argv);

remote-curl.c

@@ -1340,13 +1340,6 @@ int cmd_main(int argc, const char **argv)
 	string_list_init(&options.deepen_not, 1);
 	string_list_init(&options.push_options, 1);
 
-	/*
-	 * Just report "remote-curl" here (folding all the various aliases
-	 * ("git-remote-http", "git-remote-https", and etc.) here since they
-	 * are all just copies of the same actual executable.
-	 */
-	trace2_cmd_verb("remote-curl");
-
 	remote = remote_get(argv[1]);
 
 	if (argc > 2) {