mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
Merge branch 'jn/fast-import-ondemand-checkpoint'
* jn/fast-import-ondemand-checkpoint: fast-import: treat SIGUSR1 as a request to access objects early
This commit is contained in:
commit
f73c3e9704
|
@ -1233,6 +1233,13 @@ and lazy loading of subtrees, allows fast-import to efficiently import
|
||||||
projects with 2,000+ branches and 45,114+ files in a very limited
|
projects with 2,000+ branches and 45,114+ files in a very limited
|
||||||
memory footprint (less than 2.7 MiB per active branch).
|
memory footprint (less than 2.7 MiB per active branch).
|
||||||
|
|
||||||
|
Signals
|
||||||
|
-------
|
||||||
|
Sending *SIGUSR1* to the 'git fast-import' process ends the current
|
||||||
|
packfile early, simulating a `checkpoint` command. The impatient
|
||||||
|
operator can use this facility to peek at the objects and refs from an
|
||||||
|
import in progress, at the cost of some added running time and worse
|
||||||
|
compression.
|
||||||
|
|
||||||
Author
|
Author
|
||||||
------
|
------
|
||||||
|
|
|
@ -362,6 +362,9 @@ static uintmax_t next_mark;
|
||||||
static struct strbuf new_data = STRBUF_INIT;
|
static struct strbuf new_data = STRBUF_INIT;
|
||||||
static int seen_data_command;
|
static int seen_data_command;
|
||||||
|
|
||||||
|
/* Signal handling */
|
||||||
|
static volatile sig_atomic_t checkpoint_requested;
|
||||||
|
|
||||||
static void parse_argv(void);
|
static void parse_argv(void);
|
||||||
|
|
||||||
static void write_branch_report(FILE *rpt, struct branch *b)
|
static void write_branch_report(FILE *rpt, struct branch *b)
|
||||||
|
@ -501,6 +504,32 @@ static NORETURN void die_nicely(const char *err, va_list params)
|
||||||
exit(128);
|
exit(128);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef SIGUSR1 /* Windows, for example */
|
||||||
|
|
||||||
|
static void set_checkpoint_signal(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
static void checkpoint_signal(int signo)
|
||||||
|
{
|
||||||
|
checkpoint_requested = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void set_checkpoint_signal(void)
|
||||||
|
{
|
||||||
|
struct sigaction sa;
|
||||||
|
|
||||||
|
memset(&sa, 0, sizeof(sa));
|
||||||
|
sa.sa_handler = checkpoint_signal;
|
||||||
|
sigemptyset(&sa.sa_mask);
|
||||||
|
sa.sa_flags = SA_RESTART;
|
||||||
|
sigaction(SIGUSR1, &sa, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
static void alloc_objects(unsigned int cnt)
|
static void alloc_objects(unsigned int cnt)
|
||||||
{
|
{
|
||||||
struct object_entry_pool *b;
|
struct object_entry_pool *b;
|
||||||
|
@ -2715,14 +2744,20 @@ static void parse_reset_branch(void)
|
||||||
unread_command_buf = 1;
|
unread_command_buf = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void parse_checkpoint(void)
|
static void checkpoint(void)
|
||||||
{
|
{
|
||||||
|
checkpoint_requested = 0;
|
||||||
if (object_count) {
|
if (object_count) {
|
||||||
cycle_packfile();
|
cycle_packfile();
|
||||||
dump_branches();
|
dump_branches();
|
||||||
dump_tags();
|
dump_tags();
|
||||||
dump_marks();
|
dump_marks();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void parse_checkpoint(void)
|
||||||
|
{
|
||||||
|
checkpoint_requested = 1;
|
||||||
skip_optional_lf();
|
skip_optional_lf();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2979,6 +3014,7 @@ int main(int argc, const char **argv)
|
||||||
prepare_packed_git();
|
prepare_packed_git();
|
||||||
start_packfile();
|
start_packfile();
|
||||||
set_die_routine(die_nicely);
|
set_die_routine(die_nicely);
|
||||||
|
set_checkpoint_signal();
|
||||||
while (read_next_command() != EOF) {
|
while (read_next_command() != EOF) {
|
||||||
if (!strcmp("blob", command_buf.buf))
|
if (!strcmp("blob", command_buf.buf))
|
||||||
parse_new_blob();
|
parse_new_blob();
|
||||||
|
@ -3000,6 +3036,9 @@ int main(int argc, const char **argv)
|
||||||
/* ignore non-git options*/;
|
/* ignore non-git options*/;
|
||||||
else
|
else
|
||||||
die("Unsupported command: %s", command_buf.buf);
|
die("Unsupported command: %s", command_buf.buf);
|
||||||
|
|
||||||
|
if (checkpoint_requested)
|
||||||
|
checkpoint();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* argv hasn't been parsed yet, do so */
|
/* argv hasn't been parsed yet, do so */
|
||||||
|
|
Loading…
Reference in a new issue