Skip to content

Commit

Permalink
Handle atexit list internaly for unthreaded builds
Browse files Browse the repository at this point in the history
Wrap atexit()s calls on unthreaded builds to handle callback list
internally.

This is needed because on unthreaded builds, asyncs inherits parent's
atexit() list, that gets run as soon as the async exit()s (and again at
the end of async's parent process). That led to remove temporary files
too early.

Also remove a by-atexit-callback guard against this kind of issue in
clone.c, as this patch makes it redundant.

Fixes test 5537 (temporary shallow file vanished before unpack-objects
could open it)

BTW remove an unused variable in shallow.c.

Helped-by: Duy Nguyen <pclouds@gmail.com>
Helped-by: Andreas Schwab <schwab@linux-m68k.org>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Etienne Buira <etienne.buira@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Etienne Buira authored and Junio C Hamano committed Oct 19, 2014
1 parent 0c45d25 commit 0f4b6db
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 10 deletions.
5 changes: 0 additions & 5 deletions builtin/clone.c
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ static void clone_local(const char *src_repo, const char *dest_repo)

static const char *junk_work_tree;
static const char *junk_git_dir;
static pid_t junk_pid;
static enum {
JUNK_LEAVE_NONE,
JUNK_LEAVE_REPO,
Expand All @@ -417,8 +416,6 @@ static void remove_junk(void)
break;
}

if (getpid() != junk_pid)
return;
if (junk_git_dir) {
strbuf_addstr(&sb, junk_git_dir);
remove_dir_recursively(&sb, 0);
Expand Down Expand Up @@ -759,8 +756,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
struct refspec *refspec;
const char *fetch_pattern;

junk_pid = getpid();

packet_trace_identity("clone");
argc = parse_options(argc, argv, prefix, builtin_clone_options,
builtin_clone_usage, 0);
Expand Down
5 changes: 5 additions & 0 deletions git-compat-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,11 @@ int inet_pton(int af, const char *src, void *dst);
const char *inet_ntop(int af, const void *src, char *dst, size_t size);
#endif

#ifdef NO_PTHREADS
#define atexit git_atexit
extern int git_atexit(void (*handler)(void));
#endif

extern void release_pack_memory(size_t);

typedef void (*try_to_free_t)(size_t);
Expand Down
40 changes: 40 additions & 0 deletions run-command.c
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,45 @@ static int async_die_is_recursing(void)
return ret != NULL;
}

#else

static struct {
void (**handlers)(void);
size_t nr;
size_t alloc;
} git_atexit_hdlrs;

static int git_atexit_installed;

static void git_atexit_dispatch()
{
size_t i;

for (i=git_atexit_hdlrs.nr ; i ; i--)
git_atexit_hdlrs.handlers[i-1]();
}

static void git_atexit_clear()
{
free(git_atexit_hdlrs.handlers);
memset(&git_atexit_hdlrs, 0, sizeof(git_atexit_hdlrs));
git_atexit_installed = 0;
}

#undef atexit
int git_atexit(void (*handler)(void))
{
ALLOC_GROW(git_atexit_hdlrs.handlers, git_atexit_hdlrs.nr + 1, git_atexit_hdlrs.alloc);
git_atexit_hdlrs.handlers[git_atexit_hdlrs.nr++] = handler;
if (!git_atexit_installed) {
if (atexit(&git_atexit_dispatch))
return -1;
git_atexit_installed = 1;
}
return 0;
}
#define atexit git_atexit

#endif

int start_async(struct async *async)
Expand Down Expand Up @@ -678,6 +717,7 @@ int start_async(struct async *async)
close(fdin[1]);
if (need_out)
close(fdout[0]);
git_atexit_clear();
exit(!!async->proc(proc_in, proc_out, async->data));
}

Expand Down
7 changes: 2 additions & 5 deletions shallow.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ static void remove_temporary_shallow_on_signal(int signo)

const char *setup_temporary_shallow(const struct sha1_array *extra)
{
static int installed_handler;
struct strbuf sb = STRBUF_INIT;
int fd;

Expand All @@ -237,10 +236,8 @@ const char *setup_temporary_shallow(const struct sha1_array *extra)
strbuf_addstr(&temporary_shallow, git_path("shallow_XXXXXX"));
fd = xmkstemp(temporary_shallow.buf);

if (!installed_handler) {
atexit(remove_temporary_shallow);
sigchain_push_common(remove_temporary_shallow_on_signal);
}
atexit(remove_temporary_shallow);
sigchain_push_common(remove_temporary_shallow_on_signal);

if (write_in_full(fd, sb.buf, sb.len) != sb.len)
die_errno("failed to write to %s",
Expand Down

0 comments on commit 0f4b6db

Please sign in to comment.