development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/async-pkt-line'

Browse source 
The debugging infrastructure for pkt-line based communication has
been improved to mark the side-band communication specifically.

* jk/async-pkt-line:
  pkt-line: show packets in async processes as "sideband"
  run-command: provide in_async query function
This commit is contained in:
Junio C Hamano 2015-10-05 12:30:09 -07:00
parent db9789ab4e fd89433dd0
commit 88bad58d38
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkt-line.c
View file

@ -1,5 +1,6 @@
#include "cache.h" #include "cache.h"
#include "pkt-line.h" #include "pkt-line.h"
#include "run-command.h"
char packet_buffer[LARGE_PACKET_MAX]; char packet_buffer[LARGE_PACKET_MAX];
static const char *packet_trace_prefix = "git"; static const char *packet_trace_prefix = "git";
@ -11,6 +12,11 @@ void packet_trace_identity(const char *prog)
packet_trace_prefix = xstrdup(prog); packet_trace_prefix = xstrdup(prog);
} }
static const char *get_trace_prefix(void)
{
return in_async() ? "sideband" : packet_trace_prefix;
}
static int packet_trace_pack(const char *buf, unsigned int len, int sideband) static int packet_trace_pack(const char *buf, unsigned int len, int sideband)
{ {
if (!sideband) { if (!sideband) {
@ -57,7 +63,7 @@ static void packet_trace(const char *buf, unsigned int len, int write)
strbuf_init(&out, len+32); strbuf_init(&out, len+32);
strbuf_addf(&out, "packet: %12s%c ", strbuf_addf(&out, "packet: %12s%c ",
packet_trace_prefix, write ? '>' : '<'); get_trace_prefix(), write ? '>' : '<');
/* XXX we should really handle printable utf8 */ /* XXX we should really handle printable utf8 */
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {

16
run-command.c
View file

@ -595,7 +595,7 @@ static NORETURN void die_async(const char *err, va_list params)
{ {
vreportf("fatal: ", err, params); vreportf("fatal: ", err, params);
if (!pthread_equal(main_thread, pthread_self())) { if (in_async()) {
struct async *async = pthread_getspecific(async_key); struct async *async = pthread_getspecific(async_key);
if (async->proc_in >= 0) if (async->proc_in >= 0)
close(async->proc_in); close(async->proc_in);
@ -614,6 +614,13 @@ static int async_die_is_recursing(void)
return ret != NULL; return ret != NULL;
} }
int in_async(void)
{
if (!main_thread_set)
return 0; /* no asyncs started yet */
return !pthread_equal(main_thread, pthread_self());
}
#else #else
static struct { static struct {
@ -653,6 +660,12 @@ int git_atexit(void (*handler)(void))
} }
#define atexit git_atexit #define atexit git_atexit
static int process_is_async;
int in_async(void)
{
return process_is_async;
}
#endif #endif
int start_async(struct async *async) int start_async(struct async *async)
@ -712,6 +725,7 @@ int start_async(struct async *async)
if (need_out) if (need_out)
close(fdout[0]); close(fdout[0]);
git_atexit_clear(); git_atexit_clear();
process_is_async = 1;
exit(!!async->proc(proc_in, proc_out, async->data)); exit(!!async->proc(proc_in, proc_out, async->data));
} }

1
run-command.h
View file

@ -118,5 +118,6 @@ struct async {
int start_async(struct async *async); int start_async(struct async *async);
int finish_async(struct async *async); int finish_async(struct async *async);
int in_async(void);
#endif #endif