Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

boot: replay in subprocess #654

Merged
merged 14 commits into from
Jun 24, 2024
Merged

boot: replay in subprocess #654

Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0602d1d
play: replay in a subprocess
matthew-levan May 24, 2024
53223be
Revert "Revert "vere: add --serf-bin option to provide path to serf""
matthew-levan May 24, 2024
206e03c
play: use `u3_Host` strings
matthew-levan May 24, 2024
837799b
play: use `u3_Host.wrk_c`
matthew-levan May 24, 2024
798aa3f
play: remove print
matthew-levan May 24, 2024
b0de3aa
play: add args to `_cw_play_fork`
matthew-levan May 26, 2024
8dd2899
play: produce args better
matthew-levan May 28, 2024
da773cf
play: serf commits sudoku when king dies
matthew-levan May 30, 2024
5f41711
play: flip loob
matthew-levan May 30, 2024
585fad2
mars: remove printf
matthew-levan May 30, 2024
5212f9a
play: handle termination cases
matthew-levan Jun 5, 2024
df4624e
Merge branch 'develop' into msl/replay-in-subprocess
pkova Jun 24, 2024
34809cd
remove `pkg/.DS_Store`
matthew-levan Jun 24, 2024
a819801
Merge branch 'msl/replay-in-subprocess' of https://github.com/urbit/v…
matthew-levan Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 38 additions & 8 deletions pkg/vere/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "db/lmdb.h"
#include "getopt.h"
#include "libgen.h"
#include "spawn.h"

#include "ca_bundle.h"
#include "pace.h"
Expand Down Expand Up @@ -291,12 +292,13 @@ _main_getopt(c3_i argc, c3_c** argv)
{ "prop-url", required_argument, NULL, 2 },
{ "prop-name", required_argument, NULL, 3 },
//
{ "urth-loom", required_argument, NULL, 5 },
{ "no-demand", no_argument, NULL, 6 },
{ "swap", no_argument, NULL, 7 },
{ "swap-to", required_argument, NULL, 8 },
{ "toss", required_argument, NULL, 9 },
{ "urth-loom", required_argument, NULL, 5 },
{ "no-demand", no_argument, NULL, 6 },
{ "swap", no_argument, NULL, 7 },
{ "swap-to", required_argument, NULL, 8 },
{ "toss", required_argument, NULL, 9 },
{ "behn-allow-blocked", no_argument, NULL, 10 },
{ "serf-bin", required_argument, NULL, 11 },
//
{ NULL, 0, NULL, 0 },
};
Expand Down Expand Up @@ -340,6 +342,10 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.beb = c3y;
break;
}
case 11: { // serf-bin
u3_Host.wrk_c = strdup(optarg);
break;
}
// special args
//
case c3__loom: {
Expand Down Expand Up @@ -2315,6 +2321,28 @@ _cw_play_impl(c3_d eve_d, c3_d sap_d, c3_o mel_o, c3_o sof_o, c3_o ful_o)
return pay_d;
}

/* _cw_play_fork(): spawn a subprocess for event replay.
*/
static c3_i
_cw_play_fork()
{
pid_t pid;
c3_i sat_i;
c3_c *argv[] = { u3_Host.wrk_c, "play", u3_Host.dir_c }; // XX parameterize args
matthew-levan marked this conversation as resolved.
Show resolved Hide resolved

if ( 0 != posix_spawn(&pid, u3_Host.wrk_c, 0, 0, argv, 0) ) {
fprintf(stderr, "play: posix_spawn: %d\r\n", errno);
return 1;
}

if ( -1 == waitpid(pid, &sat_i, 0) ) {
fprintf(stderr, "play: waitpid: %d\r\n", errno);
return 1;
}

return WEXITSTATUS(sat_i);
}

/* _cw_play(): replay events, but better.
*/
static void
Expand Down Expand Up @@ -2966,8 +2994,6 @@ main(c3_i argc,

_main_self_path();

// XX add argument
//
if ( !u3_Host.wrk_c ) {
u3_Host.wrk_c = bin_c;
}
Expand Down Expand Up @@ -3110,7 +3136,11 @@ main(c3_i argc,
// we need the current snapshot's latest event number to
// validate whether we can execute disk migration
if ( u3_Host.ops_u.nuu == c3n ) {
_cw_play_impl(0, 0, c3n, c3n, c3n);
c3_i sat_i = _cw_play_fork();
if ( sat_i ) {
fprintf(stderr, "play: replay failed: %d\r\n", sat_i);
exit(sat_i);
}
// XX unmap loom, else parts of the snapshot could be left in memory
}

Expand Down
Loading