summaryrefslogtreecommitdiff
path: root/builtin/gc.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-30 19:10:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-10-30 19:10:27 (GMT)
commit414b7033b16f23b724ea81d71c4b74ef42edad17 (patch)
tree31ad340d06db608b6420cf71495b96984e5acada /builtin/gc.c
parent779503c5eb5fe822409cdf7c064a818bdc650f02 (diff)
parent4c5baf0273ae3382dbaca81fee0331cada5899ea (diff)
downloadgit-414b7033b16f23b724ea81d71c4b74ef42edad17.zip
git-414b7033b16f23b724ea81d71c4b74ef42edad17.tar.gz
git-414b7033b16f23b724ea81d71c4b74ef42edad17.tar.bz2
Merge branch 'nd/gc-lock-against-each-other'
* nd/gc-lock-against-each-other: gc: remove gc.pid file at end of execution
Diffstat (limited to 'builtin/gc.c')
-rw-r--r--builtin/gc.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/builtin/gc.c b/builtin/gc.c
index 891a2c2..c14190f 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -14,6 +14,7 @@
#include "cache.h"
#include "parse-options.h"
#include "run-command.h"
+#include "sigchain.h"
#include "argv-array.h"
#define FAILED_RUN "failed to run %s"
@@ -35,6 +36,21 @@ static struct argv_array repack = ARGV_ARRAY_INIT;
static struct argv_array prune = ARGV_ARRAY_INIT;
static struct argv_array rerere = ARGV_ARRAY_INIT;
+static char *pidfile;
+
+static void remove_pidfile(void)
+{
+ if (pidfile)
+ unlink(pidfile);
+}
+
+static void remove_pidfile_on_signal(int signo)
+{
+ remove_pidfile();
+ sigchain_pop(signo);
+ raise(signo);
+}
+
static int gc_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "gc.packrefs")) {
@@ -179,6 +195,10 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
FILE *fp;
int fd, should_exit;
+ if (pidfile)
+ /* already locked */
+ return NULL;
+
if (gethostname(my_host, sizeof(my_host)))
strcpy(my_host, "unknown");
@@ -219,6 +239,10 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
strbuf_release(&sb);
commit_lock_file(&lock);
+ pidfile = git_pathdup("gc.pid");
+ sigchain_push_common(remove_pidfile_on_signal);
+ atexit(remove_pidfile);
+
return NULL;
}