undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trace2:data: add trace2 transport child classification

Browse Source 
Add trace2 child classification for transport processes.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler 2019-02-22 14:25:05 -08:00 committed by Junio C Hamano
parent 0671b4d193
commit abd81a3d79
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
connect.c
View File

@ -1248,6 +1248,7 @@ struct child_process *git_connect(int fd[2], const char *url,
conn = NULL; conn = NULL;
} else if (protocol == PROTO_GIT) { } else if (protocol == PROTO_GIT) {
conn = git_connect_git(fd, hostandport, path, prog, version, flags); conn = git_connect_git(fd, hostandport, path, prog, version, flags);
conn->trace2_child_class = "transport/git";
} else { } else {
struct strbuf cmd = STRBUF_INIT; struct strbuf cmd = STRBUF_INIT;
const char *const *var; const char *const *var;
@ -1290,9 +1291,11 @@ struct child_process *git_connect(int fd[2], const char *url,
strbuf_release(&cmd); strbuf_release(&cmd);
return NULL; return NULL;
} }
conn->trace2_child_class = "transport/ssh";
fill_ssh_args(conn, ssh_host, port, version, flags); fill_ssh_args(conn, ssh_host, port, version, flags);
} else { } else {
transport_check_allowed("file"); transport_check_allowed("file");
conn->trace2_child_class = "transport/file";
if (version > 0) { if (version > 0) {
argv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT "=version=%d", argv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
version); version);

2
transport-helper.c
View File

@ -127,6 +127,8 @@ static struct child_process *get_helper(struct transport *transport)
argv_array_pushf(&helper->env_array, "%s=%s", argv_array_pushf(&helper->env_array, "%s=%s",
GIT_DIR_ENVIRONMENT, get_git_dir()); GIT_DIR_ENVIRONMENT, get_git_dir());
helper->trace2_child_class = helper->args.argv[0]; /* "remote-<name>" */
code = start_command(helper); code = start_command(helper);
if (code < 0 && errno == ENOENT) if (code < 0 && errno == ENOENT)
die(_("unable to find remote helper for '%s'"), data->name); die(_("unable to find remote helper for '%s'"), data->name);