ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-24 10:33:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge remote-tracking branch 'urbit/master' into master"

Browse Source 
This reverts commit d52d2835b96f89e7ebbe5392c99f1483d165ee0b, reversing
changes made to 58838ea246e52c064719edc56e29b6a1ba713fdf.

Conflicts:
	Makefile
This commit is contained in:
Steve Dee 2014-02-24 11:27:57 -08:00
parent b6c1a67a4b
commit de5048e895
17 changed files with 1285 additions and 1942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "outside/c-capnproto"]
path = outside/c-capnproto
url = https://github.com/urbit/c-capnproto

6
Makefile
View File

@ -533,10 +533,8 @@ V_OFILES=\
v/http.o \
v/loop.o \
v/main.o \
v/raft.o \
v/reck.o \
v/save.o \
v/sist.o \
v/time.o \
v/term.o \
v/unix.o \
@ -556,9 +554,9 @@ $(LIBUV):
$(V_OFILES) f/loom.o f/trac.o: include/v/vere.h
$(BIN)/vere: $(VERE_OFILES) $(LIBUV) $(CAPN)
$(BIN)/vere: $(VERE_OFILES) $(LIBUV)
mkdir -p $(BIN)
$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(CAPN) $(LIBS)
$(CLD) $(CLDOSFLAGS) -o $(BIN)/vere $(VERE_OFILES) $(LIBUV) $(LIBS)
tags:
ctags -R -f .tags --exclude=root

1
include/c/motes.h
View File

@ -701,7 +701,6 @@
# define c3__ord c3_s3('o','r','d')
# define c3__orth c3_s4('o','r','t','h')
# define c3__outd c3_s4('o','u','t','d')
# define c3__ov c3_s2('o','v')
# define c3__over c3_s4('o','v','e','r')
# define c3__pair c3_s4('p','a','i','r')
# define c3__palm c3_s4('p','a','l','m')

6
include/f/arvo.h
View File

@ -9,10 +9,7 @@
struct _u2_reck;
typedef struct _u2_cart {
u2_noun vir; // effects of ovum
u2_bean did; // cart considered for commit?
u2_bean cit; // cart committed?
c3_w ent_w; // entry in raft queue?
u2_noun egg; // ovum itself
void (*clr_f) // ovum processing failed
(struct _u2_reck *rec_u, // system
u2_noun, // egg itself
@ -36,7 +33,6 @@
u2_noun own; // owner list
u2_noun roe; // temporary unsaved events
u2_noun vir; // pending actions
u2_noun key; // log key, or 0
u2_noun ken; // kernel formula (for now)

2
include/f/coal.h
View File

@ -121,7 +121,7 @@
# define u2_cr_mean u2_mean
# define u2_cr_mug(a) u2_mug(a)
# define u2_cr_mug_string(a) u2_mug_string(a)
# define u2_cr_mug_words(a, b) u2_mug_words(a, b)
# define u2_cr_mug_words(a) u2_mug_words(a)
# define u2_cr_mug_cell(a, b) u2_mug_cell(a, b)
# define u2_cr_mug_trel(a, b, c) u2_mug_cell(a, b, c)
# define u2_cr_mug_qual(a, b, c, d) u2_mug_qual(a, b, c, d)

113
include/p/raft.capnp.h
View File

@ -1,113 +0,0 @@
#ifndef CAPN_A727C25CC7018F2
#define CAPN_A727C25CC7018F2
/* AUTO GENERATED - DO NOT EDIT */
#include <capn.h>
#if CAPN_VERSION != 1
#error "version mismatch between capn.h and generated code"
#endif
#ifdef __cplusplus
extern "C" {
#endif
struct Raft;
struct Raft_Comd;
struct Raft_Rent;
struct Raft_Rest;
struct Raft_Rasp;
typedef struct {capn_ptr p;} Raft_ptr;
typedef struct {capn_ptr p;} Raft_Comd_ptr;
typedef struct {capn_ptr p;} Raft_Rent_ptr;
typedef struct {capn_ptr p;} Raft_Rest_ptr;
typedef struct {capn_ptr p;} Raft_Rasp_ptr;
typedef struct {capn_ptr p;} Raft_list;
typedef struct {capn_ptr p;} Raft_Comd_list;
typedef struct {capn_ptr p;} Raft_Rent_list;
typedef struct {capn_ptr p;} Raft_Rest_list;
typedef struct {capn_ptr p;} Raft_Rasp_list;
enum Raft_Comd_Type {
Raft_Comd_Type_nop = 0,
Raft_Comd_Type_ova = 1
};
struct Raft {
};
struct Raft_Comd {
enum Raft_Comd_Type typ;
capn_data bob;
};
struct Raft_Rent {
uint32_t tem;
Raft_Comd_ptr cmd;
};
enum Raft_Rest_which {
Raft_Rest_revo = 0,
Raft_Rest_apen = 1
};
struct Raft_Rest {
uint32_t tem;
capn_text cid;
uint64_t lai;
uint32_t lat;
enum Raft_Rest_which which;
union {
struct {
Raft_Rent_list ent;
uint64_t cit;
} apen;
};
};
struct Raft_Rasp {
uint64_t tem;
unsigned suc : 1;
};
Raft_ptr new_Raft(struct capn_segment*);
Raft_Comd_ptr new_Raft_Comd(struct capn_segment*);
Raft_Rent_ptr new_Raft_Rent(struct capn_segment*);
Raft_Rest_ptr new_Raft_Rest(struct capn_segment*);
Raft_Rasp_ptr new_Raft_Rasp(struct capn_segment*);
Raft_list new_Raft_list(struct capn_segment*, int len);
Raft_Comd_list new_Raft_Comd_list(struct capn_segment*, int len);
Raft_Rent_list new_Raft_Rent_list(struct capn_segment*, int len);
Raft_Rest_list new_Raft_Rest_list(struct capn_segment*, int len);
Raft_Rasp_list new_Raft_Rasp_list(struct capn_segment*, int len);
void read_Raft(struct Raft*, Raft_ptr);
void read_Raft_Comd(struct Raft_Comd*, Raft_Comd_ptr);
void read_Raft_Rent(struct Raft_Rent*, Raft_Rent_ptr);
void read_Raft_Rest(struct Raft_Rest*, Raft_Rest_ptr);
void read_Raft_Rasp(struct Raft_Rasp*, Raft_Rasp_ptr);
void write_Raft(const struct Raft*, Raft_ptr);
void write_Raft_Comd(const struct Raft_Comd*, Raft_Comd_ptr);
void write_Raft_Rent(const struct Raft_Rent*, Raft_Rent_ptr);
void write_Raft_Rest(const struct Raft_Rest*, Raft_Rest_ptr);
void write_Raft_Rasp(const struct Raft_Rasp*, Raft_Rasp_ptr);
void get_Raft(struct Raft*, Raft_list, int i);
void get_Raft_Comd(struct Raft_Comd*, Raft_Comd_list, int i);
void get_Raft_Rent(struct Raft_Rent*, Raft_Rent_list, int i);
void get_Raft_Rest(struct Raft_Rest*, Raft_Rest_list, int i);
void get_Raft_Rasp(struct Raft_Rasp*, Raft_Rasp_list, int i);
void set_Raft(const struct Raft*, Raft_list, int i);
void set_Raft_Comd(const struct Raft_Comd*, Raft_Comd_list, int i);
void set_Raft_Rent(const struct Raft_Rent*, Raft_Rent_list, int i);
void set_Raft_Rest(const struct Raft_Rest*, Raft_Rest_list, int i);
void set_Raft_Rasp(const struct Raft_Rasp*, Raft_Rasp_list, int i);
#ifdef __cplusplus
}
#endif
#endif

99
include/v/vere.h
View File

@ -382,42 +382,7 @@
struct _u2_utty* nex_u; // next in host list
} u2_utty;
/* u2_raty: raft server type.
*/
typedef enum {
u2_raty_none,
u2_raty_foll,
u2_raty_cand,
u2_raty_lead
} u2_raty;
/* u2_raft: raft state.
*/
typedef struct {
uv_tcp_t wax_u;
uv_timer_t tim_u;
u2_ulog lug_u; // event log
c3_w ent_w;
u2_raty typ_e;
} u2_raft;
/* u2_rnam: raft peer name.
*/
typedef struct _u2_rnam {
c3_c* str_c;
c3_c* nam_c;
c3_s por_s;
struct _u2_rnam* nex_u;
} u2_rnam;
/* u2_ropt: raft options.
*/
typedef struct {
u2_rnam* nam_u;
c3_s por_s;
} u2_ropt;
/* u2_opts:
/* u2_opts:
*/
typedef struct _u2_opts {
c3_c* cpu_c;
@ -427,7 +392,6 @@
c3_w kno_w;
c3_w fuz_w;
c3_s por_s;
u2_ropt rop_u;
u2_bean abo;
u2_bean bat;
u2_bean gab;
@ -455,6 +419,7 @@
u2_cttp* ctp_u; // http connections
u2_utty* uty_u; // all terminals
u2_utty* tem_u; // main terminal (1)
u2_ulog lug_u; // event log
u2_ames sam_u; // packet interface
u2_save sav_u; // autosave
u2_opts ops_u; // commandline options
@ -466,7 +431,6 @@
} u2_host; // host == computer == process
# define u2L u2_Host.lup_u // global event loop
# define u2R (&(u2_Raft))
/* u2_funk: standard system function.
*/
@ -476,7 +440,6 @@
**/
c3_global u2_host u2_Host;
c3_global u2_wire u2_Wire;
c3_global u2_raft u2_Raft;
c3_global c3_c* u2_Local;
c3_global c3_c* u2_System;
@ -676,11 +639,6 @@
u2_bean
u2_reck_launch(u2_reck* rec_u);
/* u2_reck_nick(): transform enveloped packets, [vir cor].
*/
u2_noun
u2_reck_nick(u2_reck* rec_u, u2_noun vir, u2_noun cor);
/* u2_reck_peek(): query the reck namespace (protected).
*/
u2_noun
@ -691,11 +649,6 @@
u2_noun
u2_reck_keep(u2_reck* rec_u, u2_noun hap);
/* u2_reck_pike(): poke with floating core.
*/
u2_noun
u2_reck_pike(u2_reck* rec_u, u2_noun ovo, u2_noun cor);
/* u2_reck_poke(): insert and apply an input ovum (protected).
*/
u2_noun
@ -756,11 +709,6 @@
void
u2_lo_loop(u2_reck* rec_u);
/* u2_lo_exit(): shut down io across pier.
*/
void
u2_lo_exit(void);
/* u2_lo_show(): print typeless noun.
*/
void
@ -787,13 +735,6 @@
void
u2_lo_sway(c3_l tab_l, u2_noun tax);
/* u2_lo_soft(): standard soft wrapper. Unifies unix and nock errors.
**
** Produces [%$ result] or %error (list tank)].
*/
u2_noun
u2_lo_soft(u2_reck* rec_u, c3_w sec_w, u2_funk fun_f, u2_noun arg);
/* u2_lo_grab(): garbage-collect the world, plus roots; end with u2_none
*/
void
@ -1033,39 +974,3 @@
*/
void
u2_http_io_poll(void);
/** Raft log syncing.
**/
/* u2_raft_readopt(): parse command line options.
*/
u2_bean
u2_raft_readopt(u2_ropt* rop_u, const c3_c* arg_c);
/* u2_raft_io_init(): initialize raft I/O.
*/
void
u2_raft_io_init(void);
/* u2_raft_work(): poke, kick, and push pending events.
*/
void
u2_raft_work(u2_reck* rec_u);
/** Disk persistence.
**/
/* u2_sist_boot(): restore or create pier from disk.
*/
void
u2_sist_boot(void);
/* u2_sist_pack(): write a log entry to disk.
**
** XX Synchronous.
**
** typ_w is a mote describing the entry type: %ov for Arvo
** logs, %ra for Raft events.
**
** Returns the entry's sequence number.
*/
c3_w
u2_sist_pack(u2_reck* rec_u, c3_w typ_w, c3_w* bob_w, c3_w len_w);

1
outside/c-capnproto

@ -1 +0,0 @@
Subproject commit 89f1ac3953ae934d7fc34013251dee19fa88add6

38
p/raft.capnp
View File

@ -1,38 +0,0 @@
@0xa727c25c0c7018f2;
struct Raft {
struct Comd { # state machine command
typ @0 :Type;
bob @1 :Data;
enum Type {
nop @0; # no-op
ova @1; # arvo event
#xek @2; # checkpoint
}
}
struct Rent { # log entry
tem @0 :UInt32; # term
cmd @1 :Comd; # command
}
struct Rest { # Raft RPC request
tem @0 :UInt32; # sender term
cid @1 :Text; # sender name
lai @2 :UInt64; # last log index
lat @3 :UInt32; # last log term
union {
revo @4 :Void; # RequestVote
apen :group { # AppendEntries
ent @5 :List(Rent); # log entries
cit @6 :UInt64; # leader commitIndex
}
}
}
struct Rasp { # Raft RPC response
tem @0 :UInt64; # leader's term
suc @1 :Bool; # success
}
}

176
p/raft.capnp.c
View File

@ -1,176 +0,0 @@
#include "p/raft.capnp.h"
/* AUTO GENERATED - DO NOT EDIT */
static const capn_text capn_val0 = {0,""};
Raft_ptr new_Raft(struct capn_segment *s) {
Raft_ptr p;
p.p = capn_new_struct(s, 0, 0);
return p;
}
Raft_list new_Raft_list(struct capn_segment *s, int len) {
Raft_list p;
p.p = capn_new_list(s, len, 0, 0);
return p;
}
void read_Raft(struct Raft *s, Raft_ptr p) {
capn_resolve(&p.p);
}
void write_Raft(const struct Raft *s, Raft_ptr p) {
capn_resolve(&p.p);
}
void get_Raft(struct Raft *s, Raft_list l, int i) {
Raft_ptr p;
p.p = capn_getp(l.p, i, 0);
read_Raft(s, p);
}
void set_Raft(const struct Raft *s, Raft_list l, int i) {
Raft_ptr p;
p.p = capn_getp(l.p, i, 0);
write_Raft(s, p);
}
Raft_Comd_ptr new_Raft_Comd(struct capn_segment *s) {
Raft_Comd_ptr p;
p.p = capn_new_struct(s, 8, 1);
return p;
}
Raft_Comd_list new_Raft_Comd_list(struct capn_segment *s, int len) {
Raft_Comd_list p;
p.p = capn_new_list(s, len, 8, 1);
return p;
}
void read_Raft_Comd(struct Raft_Comd *s, Raft_Comd_ptr p) {
capn_resolve(&p.p);
s->typ = (enum Raft_Comd_Type) capn_read16(p.p, 0);
s->bob = capn_get_data(p.p, 0);
}
void write_Raft_Comd(const struct Raft_Comd *s, Raft_Comd_ptr p) {
capn_resolve(&p.p);
capn_write16(p.p, 0, (uint16_t) s->typ);
capn_setp(p.p, 0, s->bob.p);
}
void get_Raft_Comd(struct Raft_Comd *s, Raft_Comd_list l, int i) {
Raft_Comd_ptr p;
p.p = capn_getp(l.p, i, 0);
read_Raft_Comd(s, p);
}
void set_Raft_Comd(const struct Raft_Comd *s, Raft_Comd_list l, int i) {
Raft_Comd_ptr p;
p.p = capn_getp(l.p, i, 0);
write_Raft_Comd(s, p);
}
Raft_Rent_ptr new_Raft_Rent(struct capn_segment *s) {
Raft_Rent_ptr p;
p.p = capn_new_struct(s, 8, 1);
return p;
}
Raft_Rent_list new_Raft_Rent_list(struct capn_segment *s, int len) {
Raft_Rent_list p;
p.p = capn_new_list(s, len, 8, 1);
return p;
}
void read_Raft_Rent(struct Raft_Rent *s, Raft_Rent_ptr p) {
capn_resolve(&p.p);
s->tem = capn_read32(p.p, 0);
s->cmd.p = capn_getp(p.p, 0, 0);
}
void write_Raft_Rent(const struct Raft_Rent *s, Raft_Rent_ptr p) {
capn_resolve(&p.p);
capn_write32(p.p, 0, s->tem);
capn_setp(p.p, 0, s->cmd.p);
}
void get_Raft_Rent(struct Raft_Rent *s, Raft_Rent_list l, int i) {
Raft_Rent_ptr p;
p.p = capn_getp(l.p, i, 0);
read_Raft_Rent(s, p);
}
void set_Raft_Rent(const struct Raft_Rent *s, Raft_Rent_list l, int i) {
Raft_Rent_ptr p;
p.p = capn_getp(l.p, i, 0);
write_Raft_Rent(s, p);
}
Raft_Rest_ptr new_Raft_Rest(struct capn_segment *s) {
Raft_Rest_ptr p;
p.p = capn_new_struct(s, 32, 2);
return p;
}
Raft_Rest_list new_Raft_Rest_list(struct capn_segment *s, int len) {
Raft_Rest_list p;
p.p = capn_new_list(s, len, 32, 2);
return p;
}
void read_Raft_Rest(struct Raft_Rest *s, Raft_Rest_ptr p) {
capn_resolve(&p.p);
s->tem = capn_read32(p.p, 0);
s->cid = capn_get_text(p.p, 0, capn_val0);
s->lai = capn_read64(p.p, 8);
s->lat = capn_read32(p.p, 4);
s->which = (enum Raft_Rest_which) capn_read16(p.p, 16);
switch (s->which) {
case Raft_Rest_apen:
s->apen.ent.p = capn_getp(p.p, 1, 0);
s->apen.cit = capn_read64(p.p, 24);
break;
default:
break;
}
}
void write_Raft_Rest(const struct Raft_Rest *s, Raft_Rest_ptr p) {
capn_resolve(&p.p);
capn_write32(p.p, 0, s->tem);
capn_set_text(p.p, 0, s->cid);
capn_write64(p.p, 8, s->lai);
capn_write32(p.p, 4, s->lat);
capn_write16(p.p, 16, s->which);
switch (s->which) {
case Raft_Rest_apen:
capn_setp(p.p, 1, s->apen.ent.p);
capn_write64(p.p, 24, s->apen.cit);
break;
default:
break;
}
}
void get_Raft_Rest(struct Raft_Rest *s, Raft_Rest_list l, int i) {
Raft_Rest_ptr p;
p.p = capn_getp(l.p, i, 0);
read_Raft_Rest(s, p);
}
void set_Raft_Rest(const struct Raft_Rest *s, Raft_Rest_list l, int i) {
Raft_Rest_ptr p;
p.p = capn_getp(l.p, i, 0);
write_Raft_Rest(s, p);
}
Raft_Rasp_ptr new_Raft_Rasp(struct capn_segment *s) {
Raft_Rasp_ptr p;
p.p = capn_new_struct(s, 16, 0);
return p;
}
Raft_Rasp_list new_Raft_Rasp_list(struct capn_segment *s, int len) {
Raft_Rasp_list p;
p.p = capn_new_list(s, len, 16, 0);
return p;
}
void read_Raft_Rasp(struct Raft_Rasp *s, Raft_Rasp_ptr p) {
capn_resolve(&p.p);
s->tem = capn_read64(p.p, 0);
s->suc = (capn_read8(p.p, 8) & 1) != 0;
}
void write_Raft_Rasp(const struct Raft_Rasp *s, Raft_Rasp_ptr p) {
capn_resolve(&p.p);
capn_write64(p.p, 0, s->tem);
capn_write1(p.p, 64, s->suc != 0);
}
void get_Raft_Rasp(struct Raft_Rasp *s, Raft_Rasp_list l, int i) {
Raft_Rasp_ptr p;
p.p = capn_getp(l.p, i, 0);
read_Raft_Rasp(s, p);
}
void set_Raft_Rasp(const struct Raft_Rasp *s, Raft_Rasp_list l, int i) {
Raft_Rasp_ptr p;
p.p = capn_getp(l.p, i, 0);
write_Raft_Rasp(s, p);
}

3
v/ames.c
View File

@ -279,7 +279,10 @@ u2_ames_io_init()
u2_ames* sam_u = &u2_Host.sam_u;
c3_s por_s;
srand(time(0)); // don't panic, only for fuzz testing
por_s = u2_Host.ops_u.por_s;
if ( 0 != u2_Host.ops_u.imp_c ) {
u2_noun imp = u2_ci_string(u2_Host.ops_u.imp_c);
u2_noun num = u2_dc("slaw", 'p', imp);

2
v/batz.c
View File

@ -22,6 +22,8 @@
#include "f/coal.h"
#include "v/vere.h"
#define u2R ((u2_reck *) &u2_Host.arv_u) // new school
/* u2_batz_io_init(): initialize batz timer.
*/
void

1260
v/loop.c
View File

File diff suppressed because it is too large Load Diff

58
v/main.c
View File

@ -37,20 +37,6 @@
0
};
/* _main_readw(): parse a word from a string.
*/
static u2_bean
_main_readw(const c3_c* str_c, c3_w max_w, c3_w* out_w)
{
c3_w par_w = atol(str_c);
if ( par_w > 0 && par_w < max_w ) {
*out_w = par_w;
return u2_yes;
}
else return u2_no;
}
/* _main_getopt(): extract option map from command line.
*/
static u2_bean
@ -69,17 +55,22 @@ _main_getopt(c3_i argc, c3_c** argv)
u2_Host.ops_u.nuu = u2_no;
u2_Host.ops_u.vno = u2_no;
u2_Host.ops_u.kno_w = DefaultKernel;
u2_Host.ops_u.fuz_w = 0;
u2_Host.ops_u.por_s = 0;
while ( (ch_i = getopt(argc, argv, "I:f:h:k:l:n:p:r:Labcdgqv")) != -1 ) {
while ( (ch_i = getopt(argc, argv, "I:f:h:k:n:p:Labcdgqv")) != -1 ) {
switch ( ch_i ) {
case 'I': {
u2_Host.ops_u.imp_c = strdup(optarg);
break;
}
case 'f': {
if ( u2_no == _main_readw(optarg, 100, &u2_Host.ops_u.fuz_w) ) {
return u2_no;
c3_w arg_w = atoi(optarg);
if ( (arg_w > 0) && (arg_w < 100) ) {
u2_Host.ops_u.fuz_w = arg_w;
}
else return u2_no;
break;
}
case 'h': {
@ -87,17 +78,12 @@ _main_getopt(c3_i argc, c3_c** argv)
break;
}
case 'k': {
if ( u2_no == _main_readw(optarg, 256, &u2_Host.ops_u.kno_w) ) {
return u2_no;
}
break;
}
case 'l': {
c3_w arg_w;
c3_w arg_w = atoi(optarg);
if ( u2_yes == _main_readw(optarg, 65536, &arg_w) ) {
u2_Host.ops_u.rop_u.por_s = arg_w;
} else return u2_no;
if ( (arg_w > 0) && (arg_w < 256) ) {
u2_Host.ops_u.kno_w = arg_w;
}
else return u2_no;
break;
}
case 'n': {
@ -105,20 +91,14 @@ _main_getopt(c3_i argc, c3_c** argv)
break;
}
case 'p': {
c3_w arg_w;
c3_w arg_w = atoi(optarg);
if ( u2_yes == _main_readw(optarg, 65536, &arg_w) ) {
if ( (arg_w > 0) && (arg_w < 65536) ) {
u2_Host.ops_u.por_s = arg_w;
}
else return u2_no;
break;
}
case 'r': {
if ( u2_no == u2_raft_readopt(&u2_Host.ops_u.rop_u, optarg) ) {
return u2_no;
}
break;
}
case 'L': { u2_Host.ops_u.loh = u2_yes; break; }
case 'a': { u2_Host.ops_u.abo = u2_yes; break; }
case 'b': { u2_Host.ops_u.bat = u2_yes; break; }
@ -134,11 +114,6 @@ _main_getopt(c3_i argc, c3_c** argv)
}
}
if ( (u2_Host.ops_u.rop_u.por_s == 0 && u2_Host.ops_u.rop_u.nam_u != 0) ) {
fprintf(stderr, "The -r flag requires -l.\n");
return u2_no;
}
if ( u2_yes == u2_Host.ops_u.bat ) {
u2_Host.ops_u.dem = u2_yes;
u2_Host.ops_u.nuu = u2_yes;
@ -283,9 +258,6 @@ main(c3_i argc,
printf("Starting daemon\n");
}
// Seed prng. Don't panic -- just for fuzz testing and election timeouts.
srand(getpid());
// Instantiate process globals.
{
u2_wr_check_init(u2_Host.ops_u.cpu_c);

488
v/raft.c
View File

@ -1,488 +0,0 @@
/* v/raft.c
**
** This file is in the public domain.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "all.h"
#include "v/vere.h"
/* _raft_readname(): parse a raft host:port peer name.
*/
static u2_bean
_raft_readname(u2_ropt* rop_u, const c3_c* str_c, c3_w siz_w)
{
u2_rnam* nam_u = malloc(sizeof(*nam_u));
c3_c* col_c;
c3_w por_w;
c3_w nam_w;
nam_u->str_c = malloc(siz_w + 1);
strncpy(nam_u->str_c, str_c, siz_w);
nam_u->str_c[siz_w] = '\0';
//fprintf(stderr, "raft: peer %s\n", nam_u->str_c);
if ( 0 == (col_c = strchr(nam_u->str_c, ':')) ) {
fprintf(stderr, "raft: invalid name %s\n", str_c);
return u2_no;
}
else {
nam_w = col_c - nam_u->str_c;
nam_u->nam_c = malloc(nam_w + 1);
strncpy(nam_u->nam_c, nam_u->str_c, nam_w);
nam_u->nam_c[nam_w] = '\0';
por_w = atol(col_c + 1);
if ( !(por_w > 0 && por_w < 65536) ) {
fprintf(stderr, "raft: invalid port '%s'\n", col_c + 1);
return u2_no;
}
else nam_u->por_s = por_w;
//fprintf(stderr, "raft: peer %s:%d\n", nam_u->nam_c, nam_u->por_s);
nam_u->nex_u = rop_u->nam_u;
rop_u->nam_u = nam_u;
return u2_yes;
}
}
u2_bean
u2_raft_readopt(u2_ropt* rop_u, const c3_c* arg_c)
{
c3_c* com_c;
while ( 0 != (com_c = strchr(arg_c, ',')) ) {
if ( u2_no == _raft_readname(rop_u, arg_c, com_c - arg_c) ) {
return u2_no;
} else arg_c = com_c + 1;
}
return _raft_readname(rop_u, arg_c, strlen(arg_c));
}
/* _raft_election_rand(): pseudorandom component of election timeout.
*/
static c3_w
_raft_election_rand()
{
return ((float) rand() / RAND_MAX) * 150;
}
static void
_raft_listen_cb(uv_stream_t* wax_u, c3_i sas_i)
{
}
static void
_raft_time_cb(uv_timer_t* tim_u, c3_i sas_i)
{
//u2_raft* raf_u = tim_u->data;
//uL(fprintf(uH, "raft: time\n"));
}
/* _raft_foll_init(): begin, follower mode.
*/
static void
_raft_foll_init(u2_raft* raf_u)
{
uL(fprintf(uH, "raft: starting follower\n"));
raf_u->typ_e = u2_raty_foll;
if ( 0 != uv_tcp_init(u2L, &raf_u->wax_u) ) {
uL(fprintf(uH, "raft: init: %s\n", uv_strerror(uv_last_error(u2L))));
c3_assert(0);
}
// Bind the listener.
{
struct sockaddr_in add_u;
memset(&add_u, 0, sizeof(add_u));
add_u.sin_family = AF_INET;
add_u.sin_addr.s_addr = htonl(INADDR_ANY);
add_u.sin_port = htons(u2_Host.ops_u.rop_u.por_s);
if ( 0 != uv_tcp_bind(&raf_u->wax_u, add_u) ) {
uL(fprintf(uH, "raft: bind: %s\n", uv_strerror(uv_last_error(u2L))));
c3_assert(0);
}
else {
if ( 0 != uv_listen((uv_stream_t*)&raf_u->wax_u, 16, _raft_listen_cb) ) {
uL(fprintf(uH, "raft: listen: %s\n", uv_strerror(uv_last_error(u2L))));
c3_assert(0);
}
else {
uL(fprintf(uH, "raft: on TCP %d\n", u2_Host.ops_u.rop_u.por_s));
}
}
}
// Start the initial election timeout.
uv_timer_start(&raf_u->tim_u, _raft_time_cb, _raft_election_rand(), 0);
}
/* _raft_lone_init(): begin, single-instance mode.
*/
static void
_raft_lone_init(u2_raft* raf_u)
{
uL(fprintf(uH, "raft: single-instance mode\n"));
raf_u->typ_e = u2_raty_lead;
}
void
u2_raft_io_init()
{
u2_raft* raf_u = u2R;
uv_timer_init(u2L, &raf_u->tim_u);
raf_u->tim_u.data = raf_u;
if ( 0 == u2_Host.ops_u.rop_u.por_s ) {
_raft_lone_init(raf_u);
}
else {
_raft_foll_init(raf_u);
}
}
/* _raft_sure(): apply and save an input ovum and its result.
*/
static void
_raft_sure(u2_reck* rec_u, u2_noun ovo, u2_noun vir, u2_noun cor)
{
// Whatever worked, save it. (XX - should be concurrent with execute.)
// We'd like more events that don't change the state but need work here.
{
u2_mug(cor);
u2_mug(rec_u->roc);
if ( u2_no == u2_sing(cor, rec_u->roc) ) {
rec_u->roe = u2nc(u2nc(u2_nul, ovo), rec_u->roe);
u2z(rec_u->roc);
rec_u->roc = cor;
}
else {
u2z(ovo);
rec_u->roe = u2nc(u2_nul, rec_u->roe);
u2z(cor);
}
}
rec_u->vir = u2nc(vir, rec_u->vir);
}
/* _raft_lame(): handle an application failure.
*/
static void
_raft_lame(u2_reck* rec_u, u2_noun ovo, u2_noun why, u2_noun tan)
{
u2_noun bov, gon;
#if 1
{
c3_c* oik_c = u2_cr_string(u2h(u2t(ovo)));
// uL(fprintf(uH, "lame: %s\n", oik_c));
free(oik_c);
}
#endif
// Formal error in a network packet generates a hole card.
//
// There should be a separate path for crypto failures,
// to prevent timing attacks, but isn't right now. To deal
// with a crypto failure, just drop the packet.
//
if ( (c3__exit == why) && (c3__hear == u2h(u2t(ovo))) ) {
u2_lo_punt(2, u2_ckb_flop(u2k(tan)));
bov = u2nc(u2k(u2h(ovo)), u2nc(c3__hole, u2k(u2t(u2t(ovo)))));
u2z(why);
}
else {
bov = u2nc(u2k(u2h(ovo)), u2nt(c3__crud, why, u2k(tan)));
u2_hevn_at(lad) = u2_nul;
}
// u2_lo_show("data", u2k(u2t(u2t(ovo))));
u2z(ovo);
gon = u2_lo_soft(rec_u, 0, u2_reck_poke, u2k(bov));
if ( u2_blip == u2h(gon) ) {
_raft_sure(rec_u, bov, u2k(u2h(u2t(gon))), u2k(u2t(u2t(gon))));
u2z(gon);
}
else {
u2z(gon);
{
u2_noun vab = u2nc(u2k(u2h(bov)),
u2nc(c3__warn, u2_ci_tape("crude crash!")));
u2_noun nog = u2_lo_soft(rec_u, 0, u2_reck_poke, u2k(vab));
if ( u2_blip == u2h(nog) ) {
_raft_sure(rec_u, vab, u2k(u2h(u2t(nog))), u2k(u2t(u2t(nog))));
u2z(nog);
}
else {
u2z(nog);
u2z(vab);
uL(fprintf(uH, "crude: all delivery failed!\n"));
}
}
}
}
/* _raft_punk(): insert and apply an input ovum (unprotected).
*/
static void
_raft_punk(u2_reck* rec_u, u2_noun ovo)
{
// c3_c* txt_c = u2_cr_string(u2h(u2t(ovo)));
c3_w sec_w;
// static c3_w num_w;
u2_noun gon;
// uL(fprintf(uH, "punk: %s: %d\n", u2_cr_string(u2h(u2t(ovo))), num_w++));
// XX this is wrong - the timer should be on the original hose.
//
if ( (c3__term == u2h(u2t(u2h(ovo)))) ||
(c3__batz == u2h(u2t(u2h(ovo)))) ) {
sec_w = 0;
} else sec_w = 60;
// Control alarm loops.
//
if ( c3__wake != u2h(u2t(ovo)) ) {
u2_Host.beh_u.run_w = 0;
}
gon = u2_lo_soft(rec_u, sec_w, u2_reck_poke, u2k(ovo));
if ( u2_blip != u2h(gon) ) {
u2_noun why = u2k(u2h(gon));
u2_noun tan = u2k(u2t(gon));
u2z(gon);
_raft_lame(rec_u, ovo, why, tan);
}
else {
u2_noun vir = u2k(u2h(u2t(gon)));
u2_noun cor = u2k(u2t(u2t(gon)));
u2_noun nug;
u2z(gon);
nug = u2_reck_nick(rec_u, vir, cor);
if ( u2_blip != u2h(nug) ) {
u2_noun why = u2k(u2h(nug));
u2_noun tan = u2k(u2t(nug));
u2z(nug);
_raft_lame(rec_u, ovo, why, tan);
}
else {
vir = u2k(u2h(u2t(nug)));
cor = u2k(u2t(u2t(nug)));
u2z(nug);
_raft_sure(rec_u, ovo, vir, cor);
}
}
// uL(fprintf(uH, "punk oot %s\n", txt_c));
}
static void
_raft_comm(u2_reck* rec_u, c3_w bid_w)
{
u2_cart* egg_u;
u2_lo_open();
egg_u = rec_u->ova.egg_u;
while ( egg_u ) {
if ( egg_u->ent_w <= bid_w ) {
egg_u->did = u2_yes;
egg_u->cit = u2_yes;
} else break;
egg_u = egg_u->nex_u;
}
u2_lo_shut(u2_no);
}
static void
_raft_comm_cb(uv_timer_t* tim_u, c3_i sas_i)
{
u2_raft* raf_u = tim_u->data;
_raft_comm(u2A, raf_u->ent_w);
}
static c3_w
_raft_push(u2_raft* raf_u, c3_w* bob_w, c3_w len_w)
{
c3_assert(raf_u->typ_e == u2_raty_lead);
if ( 0 == u2_Host.ops_u.rop_u.por_s ) {
if ( 0 != bob_w ) {
c3_assert(0 < len_w);
raf_u->ent_w = u2_sist_pack(u2A, c3__ov, bob_w, len_w);
}
else c3_assert(0 == len_w);
if ( !uv_is_active((uv_handle_t*)&raf_u->tim_u) ) {
uv_timer_start(&raf_u->tim_u, _raft_comm_cb, 0, 0);
}
return raf_u->ent_w;
}
else {
uL(fprintf(uH, "raft: multi-instance push\n"));
c3_assert(0);
}
}
/* u2_raft_work(): work in rec_u.
*/
void
u2_raft_work(u2_reck* rec_u)
{
if ( u2R->typ_e != u2_raty_lead ) {
uL(fprintf(uH, "working while not leader?!\n"));
c3_assert(rec_u->ova.egg_u == 0);
c3_assert(rec_u->roe == 0);
}
else {
u2_cart* egg_u;
u2_noun ova;
u2_noun vir;
u2_noun nex;
// Apply effects from just-committed events, and delete finished events.
//
while ( rec_u->ova.egg_u ) {
egg_u = rec_u->ova.egg_u;
if ( u2_yes == egg_u->did ) {
vir = egg_u->vir;
if ( egg_u == rec_u->ova.geg_u ) {
c3_assert(egg_u->nex_u == 0);
rec_u->ova.geg_u = rec_u->ova.egg_u = 0;
free(egg_u);
}
else {
c3_assert(egg_u->nex_u != 0);
rec_u->ova.egg_u = egg_u->nex_u;
free(egg_u);
}
if ( u2_yes == egg_u->cit ) {
while ( u2_nul != vir ) {
u2_noun ovo = u2k(u2h(vir));
nex = u2k(u2t(vir));
u2z(vir); vir = nex;
u2_reck_kick(rec_u, ovo);
}
}
else {
// We poked an event, but Raft failed to persist it.
// TODO: gracefully recover.
uL(fprintf(uH, "vere: event executed but not persisted\n"));
c3_assert(0);
}
}
else break;
}
// Poke pending events, leaving the poked events and errors on rec_u->roe.
//
{
if ( 0 == u2R->lug_u.len_d ) {
return;
}
ova = u2_ckb_flop(rec_u->roe);
rec_u->roe = u2_nul;
c3_assert(rec_u->vir == u2_nul);
while ( u2_nul != ova ) {
_raft_punk(rec_u, u2k(u2t(u2h(ova))));
nex = u2k(u2t(ova));
u2z(ova); ova = nex;
}
}
// Cartify, jam, and encrypt this batch of events. Take a number, Raft will
// be with you shortly.
{
c3_w bid_w;
c3_w len_w;
c3_w* bob_w;
u2_noun ron;
u2_noun ovo;
ova = u2_ckb_flop(rec_u->roe);
vir = u2_ckb_flop(rec_u->vir);
rec_u->roe = u2_nul;
rec_u->vir = u2_nul;
while ( u2_nul != ova ) {
c3_assert(u2_nul != vir);
egg_u = malloc(sizeof(*egg_u));
egg_u->nex_u = 0;
egg_u->cit = u2_no;
egg_u->did = u2_no;
ovo = u2k(u2h(ova));
nex = u2k(u2t(ova));
u2z(ova); ova = nex;
egg_u->vir = u2k(u2h(vir));
nex = u2k(u2t(vir));
u2z(vir); vir = nex;
if ( u2_nul != ovo ) {
u2_noun egg = u2k(u2t(ovo));
ron = u2_cke_jam(u2nc(u2k(rec_u->now), egg));
u2z(ovo);
c3_assert(rec_u->key);
ron = u2_dc("en:crya", u2k(rec_u->key), ron);
len_w = u2_cr_met(5, ron);
bob_w = malloc(len_w * 4L);
u2_cr_words(0, len_w, bob_w, ron);
u2z(ron);
bid_w = _raft_push(u2R, bob_w, len_w);
egg_u->ent_w = bid_w;
}
else {
egg_u->ent_w = u2R->ent_w; // XX
}
if ( 0 == rec_u->ova.geg_u ) {
c3_assert(0 == rec_u->ova.egg_u);
rec_u->ova.geg_u = rec_u->ova.egg_u = egg_u;
}
else {
c3_assert(0 == rec_u->ova.geg_u->nex_u);
rec_u->ova.geg_u->nex_u = egg_u;
rec_u->ova.geg_u = egg_u;
}
}
}
}
}

105
v/reck.c
View File

@ -21,93 +21,6 @@
#include "f/coal.h"
#include "v/vere.h"
/* _reck_mung(): formula wrapper with gate and sample.
*/
static u2_noun
_reck_mung_in(u2_reck* rec_u, u2_noun gam)
{
u2_noun pro = u2_cn_mung(u2k(u2h(gam)), u2k(u2t(gam)));
u2z(gam); return pro;
}
static u2_noun
_reck_mung(u2_reck* rec_u, c3_w sec_w, u2_noun gat, u2_noun sam)
{
u2_noun gam = u2nc(gat, sam);
return u2_lo_soft(rec_u, 0, _reck_mung_in, gam);
}
/* u2_reck_pike(): poke with floating core.
*/
u2_noun
u2_reck_pike(u2_reck* rec_u, u2_noun ovo, u2_noun cor)
{
u2_noun fun = u2_cn_nock(cor, u2k(u2_cx_at(42, cor)));
u2_noun sam = u2nc(u2k(rec_u->now), ovo);
return _reck_mung(rec_u, 0, fun, sam);
}
/* u2_reck_nick(): transform enveloped packets, [vir cor].
*/
u2_noun
u2_reck_nick(u2_reck* rec_u, u2_noun vir, u2_noun cor)
{
if ( u2_nul == vir ) {
return u2nt(u2_blip, vir, cor);
}
else {
u2_noun i_vir = u2h(vir);
u2_noun pi_vir, qi_vir;
u2_noun vix;
if ( (u2_yes == u2_cr_cell((i_vir=u2h(vir)), &pi_vir, &qi_vir)) &&
(u2_yes == u2du(qi_vir)) &&
(c3__hear == u2h(qi_vir)) )
{
u2_noun gon;
gon = u2_reck_pike(rec_u, u2k(i_vir), cor);
if ( u2_blip != u2h(gon) ) {
u2z(vir);
return gon;
}
else {
u2_noun viz;
vix = u2k(u2h(u2t(gon)));
cor = u2k(u2t(u2t(gon)));
u2z(gon);
viz = u2_ckb_weld(vix, u2k(u2t(vir)));
u2z(vir);
return u2_reck_nick(rec_u, viz, cor);
}
}
else {
u2_noun nez = u2_reck_nick(rec_u, u2k(u2t(vir)), cor);
if ( u2_blip != u2h(nez) ) {
u2z(vir);
return nez;
} else {
u2_noun viz;
viz = u2nc(u2k(i_vir), u2k(u2h(u2t(nez))));
cor = u2k(u2t(u2t(nez)));
u2z(vir);
u2z(nez);
return u2nt(u2_blip, viz, cor);
}
}
}
}
/* _reck_spat(): spat with toy.
*/
static u2_noun
@ -982,8 +895,22 @@ u2_reck_plan(u2_reck* rec_u,
u2_noun pax,
u2_noun fav)
{
u2_noun egg = u2nc(pax, fav);
rec_u->roe = u2nc(u2nc(u2_nul, egg), rec_u->roe);
u2_cart* egg_u = malloc(sizeof(u2_cart));
egg_u->egg = u2nc(pax, fav);
egg_u->clr_f = 0;
egg_u->nex_u = 0;
if ( !rec_u->ova.egg_u ) {
c3_assert(0 == rec_u->ova.geg_u);
rec_u->ova.egg_u = rec_u->ova.geg_u = egg_u;
} else {
c3_assert(0 == rec_u->ova.geg_u->nex_u);
rec_u->ova.geg_u->nex_u = egg_u;
rec_u->ova.geg_u = egg_u;
}
}
/* u2_reck_plow(): queue multiple ova (external).

866
v/sist.c
View File

@ -1,866 +0,0 @@
/* v/sist.c
**
** This file is in the public domain.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "all.h"
#include "v/vere.h"
#if defined(U2_OS_linux)
#include <stdio_ext.h>
#define fpurge(fd) __fpurge(fd)
#define DEVRANDOM "/dev/urandom"
#else
#define DEVRANDOM "/dev/random"
#endif
/* u2_sist_pack(): write a blob to disk, retaining.
*/
c3_w
u2_sist_pack(u2_reck* rec_u, c3_w typ_w, c3_w* bob_w, c3_w len_w)
{
u2_ulog* lug_u = &u2R->lug_u;
c3_d tar_d;
u2_ular lar_u;
tar_d = lug_u->len_d + len_w;
lar_u.syn_w = u2_cr_mug((c3_w)tar_d);
lar_u.mug_w = u2_cr_mug_words(bob_w, len_w);
//lar_u.tem_w = u2R->tem_w; // TODO uncomment
lar_u.ent_w = rec_u->ent_w;
rec_u->ent_w++;
lar_u.len_w = len_w;
if ( -1 == lseek64(lug_u->fid_i, 4ULL * tar_d, SEEK_SET) ) {
perror("lseek");
uL(fprintf(uH, "sist_pack: seek failed\n"));
c3_assert(0);
}
if ( sizeof(lar_u) != write(lug_u->fid_i, &lar_u, sizeof(lar_u)) ) {
perror("write");
uL(fprintf(uH, "sist_pack: write failed\n"));
c3_assert(0);
}
if ( -1 == lseek64(lug_u->fid_i, 4ULL * lug_u->len_d, SEEK_SET) ) {
perror("lseek");
uL(fprintf(uH, "sist_pack: seek failed\n"));
c3_assert(0);
}
#if 0
uL(fprintf(uH, "sist_pack: write %llu, %llu: lar ent %d, len %d, mug %x\n",
lug_u->len_d,
tar_d,
lar_u.ent_w,
lar_u.len_w,
lar_u.mug_w));
#endif
if ( (4 * len_w) != write(lug_u->fid_i, bob_w, (4 * len_w)) ) {
perror("write");
uL(fprintf(uH, "sist_pack: write failed\n"));
c3_assert(0);
}
lug_u->len_d += (c3_d)(lar_u.len_w + c3_wiseof(lar_u));
return rec_u->ent_w;
}
/* _sist_suck(): past failure.
*/
static void
_sist_suck(u2_reck* rec_u, u2_noun ovo, u2_noun gon)
{
uL(fprintf(uH, "sing: ovum failed!\n"));
{
c3_c* hed_c = u2_cr_string(u2h(u2t(ovo)));
uL(fprintf(uH, "fail %s\n", hed_c));
free(hed_c);
}
u2_lo_punt(2, u2_ckb_flop(u2k(u2t(gon))));
u2_loom_exit();
u2_lo_exit();
exit(1);
}
/* _sist_sing(): replay ovum from the past, time already set.
*/
static void
_sist_sing(u2_reck* rec_u, u2_noun ovo)
{
u2_noun gon = u2_lo_soft(rec_u, 0, u2_reck_poke, u2k(ovo));
if ( u2_blip != u2h(gon) ) {
_sist_suck(rec_u, ovo, gon);
}
else {
u2_noun vir = u2k(u2h(u2t(gon)));
u2_noun cor = u2k(u2t(u2t(gon)));
u2_noun nug;
u2z(gon);
nug = u2_reck_nick(rec_u, vir, cor);
if ( u2_blip != u2h(nug) ) {
_sist_suck(rec_u, ovo, nug);
}
else {
vir = u2h(u2t(nug));
cor = u2k(u2t(u2t(nug)));
while ( u2_nul != vir ) {
u2_noun fex = u2h(vir);
u2_noun fav = u2t(fex);
if ( (c3__init == u2h(fav)) || (c3__inuk == u2h(fav)) ) {
rec_u->own = u2nc(u2k(u2t(fav)), rec_u->own);
}
vir = u2t(vir);
}
u2z(nug);
u2z(rec_u->roc);
rec_u->roc = cor;
}
u2z(ovo);
}
}
/* _sist_home(): create ship directory.
*/
static void
_sist_home(u2_reck* rec_u)
{
c3_c ful_c[2048];
// Create subdirectories.
//
{
mkdir(u2_Host.cpu_c, 0700);
snprintf(ful_c, 2048, "%s/get", u2_Host.cpu_c);
if ( 0 != mkdir(ful_c, 0700) ) {
perror(ful_c);
u2_lo_bail(rec_u);
}
snprintf(ful_c, 2048, "%s/put", u2_Host.cpu_c);
if ( 0 != mkdir(ful_c, 0700) ) {
perror(ful_c);
u2_lo_bail(rec_u);
}
}
// Copy urbit.pill.
//
{
snprintf(ful_c, 2048, "cp %s/urbit.pill %s",
u2_Host.ops_u.hom_c, u2_Host.cpu_c);
if ( 0 != system(ful_c) ) {
uL(fprintf(uH, "could not %s\n", ful_c));
u2_lo_bail(rec_u);
}
}
}
/* _sist_cask(): ask for a passcode.
*/
static u2_noun
_sist_cask(u2_reck* rec_u, c3_c* dir_c, u2_bean nun)
{
c3_c paw_c[60];
u2_noun key;
uH;
while ( 1 ) {
printf("passcode for %s%s? ~", dir_c, (u2_yes == nun) ? " [none]" : "");
paw_c[0] = 0;
fpurge(stdin);
fgets(paw_c, 59, stdin);
if ( '\n' == paw_c[0] ) {
if ( u2_yes == nun ) {
key = 0; break;
}
else {
continue;
}
}
else {
c3_c* say_c = malloc(strlen(paw_c) + 2);
u2_noun say;
say_c[0] = '~';
say_c[1] = 0;
strncat(say_c, paw_c, strlen(paw_c) - 1);
say = u2_do("slay", u2_ci_string(say_c));
if ( (u2_nul == say) ||
(u2_blip != u2h(u2t(say))) ||
('p' != u2h(u2t(u2t(say)))) )
{
printf("invalid passcode\n");
continue;
}
key = u2k(u2t(u2t(u2t(say))));
u2z(say);
break;
}
}
uL(0);
return key;
}
/* _sist_text(): ask for a name string.
*/
static u2_noun
_sist_text(u2_reck* rec_u, c3_c* pom_c)
{
c3_c paw_c[60];
u2_noun say;
uH;
while ( 1 ) {
printf("%s: ", pom_c);
paw_c[0] = 0;
fpurge(stdin);
fgets(paw_c, 59, stdin);
if ( '\n' == paw_c[0] ) {
continue;
}
else {
c3_w len_w = strlen(paw_c);
if ( paw_c[len_w - 1] == '\n' ) {
paw_c[len_w-1] = 0;
}
say = u2_ci_string(paw_c);
break;
}
}
uL(0);
return say;
}
#if 0
/* _sist_bask(): ask a yes or no question.
*/
static u2_bean
_sist_bask(c3_c* pop_c, u2_bean may)
{
u2_bean yam;
uH;
while ( 1 ) {
c3_c ans_c[3];
printf("%s [y/n]? ", pop_c);
ans_c[0] = 0;
fpurge(stdin);
fgets(ans_c, 2, stdin);
if ( (ans_c[0] != 'y') && (ans_c[0] != 'n') ) {
continue;
} else {
yam = (ans_c[0] != 'n') ? u2_yes : u2_no;
break;
}
}
uL(0);
return yam;
}
#endif
/* _sist_rand(): fill a 256-bit (8-word) buffer.
*/
static void
_sist_rand(u2_reck* rec_u, c3_w* rad_w)
{
c3_i fid_i = open(DEVRANDOM, O_RDONLY);
if ( 32 != read(fid_i, (c3_y*) rad_w, 32) ) {
c3_assert(!"lo_rand");
}
close(fid_i);
}
/* _sist_fast(): offer to save passcode by mug in home directory.
*/
static void
_sist_fast(u2_reck* rec_u, u2_noun pas, c3_l key_l)
{
c3_c ful_c[2048];
c3_c* hom_c = getenv("HOME");
u2_noun gum = u2_dc("scot", 'p', key_l);
c3_c* gum_c = u2_cr_string(gum);
u2_noun yek = u2_dc("scot", 'p', pas);
c3_c* yek_c = u2_cr_string(yek);
printf("saving passcode in %s/.urbit/%s.txt\r\n", hom_c, gum_c);
printf("(for real security, write it down and delete the file...)\r\n");
{
c3_i fid_i;
snprintf(ful_c, 2048, "%s/.urbit", hom_c);
mkdir(ful_c, 0700);
snprintf(ful_c, 2048, "%s/.urbit/%s.txt", hom_c, gum_c);
if ( (fid_i = open(ful_c, O_CREAT | O_TRUNC | O_WRONLY, 0600)) < 0 ) {
uL(fprintf(uH, "fast: could not save %s\n", ful_c));
u2_lo_bail(rec_u);
}
write(fid_i, yek_c, strlen(yek_c));
close(fid_i);
}
free(gum_c);
u2z(gum);
free(yek_c);
u2z(yek);
}
/* _sist_staf(): try to load passcode by mug from home directory.
*/
static u2_noun
_sist_staf(u2_reck* rec_u, c3_l key_l)
{
c3_c ful_c[2048];
c3_c* hom_c = getenv("HOME");
u2_noun gum = u2_dc("scot", 'p', key_l);
c3_c* gum_c = u2_cr_string(gum);
u2_noun txt;
snprintf(ful_c, 2048, "%s/.urbit/%s.txt", hom_c, gum_c);
free(gum_c);
u2z(gum);
txt = u2_walk_safe(ful_c);
if ( 0 == txt ) {
uL(fprintf(uH, "staf: no passcode %s\n", ful_c));
return 0;
}
else {
// c3_c* txt_c = u2_cr_string(txt);
u2_noun say = u2_do("slay", txt);
u2_noun pas;
if ( (u2_nul == say) ||
(u2_blip != u2h(u2t(say))) ||
('p' != u2h(u2t(u2t(say)))) )
{
uL(fprintf(uH, "staf: %s is corrupt\n", ful_c));
u2z(say);
return 0;
}
uL(fprintf(uH, "loaded passcode from %s\n", ful_c));
pas = u2k(u2t(u2t(u2t(say))));
u2z(say);
return pas;
}
}
/* _sist_fatt(): stretch a 64-bit passcode to make a 128-bit key.
*/
static u2_noun
_sist_fatt(c3_l sal_l, u2_noun pas)
{
c3_w i_w;
u2_noun key = pas;
// XX use scrypt() - this is a stupid iterated hash
//
for ( i_w = 0; i_w < 32768; i_w++ ) {
key = u2_dc("shaf", sal_l, key);
}
return key;
}
/* _sist_zest(): create a new, empty record.
*/
static void
_sist_zest(u2_reck* rec_u)
{
struct stat buf_b;
c3_i fid_i;
c3_c ful_c[8193];
c3_l sal_l;
// Create the ship directory.
//
_sist_home(rec_u);
// Create the record file.
{
snprintf(ful_c, 2048, "%s/egz.hope", u2_Host.cpu_c);
if ( ((fid_i = open(ful_c, O_CREAT | O_WRONLY | O_EXCL, 0600)) < 0) ||
(fstat(fid_i, &buf_b) < 0) )
{
uL(fprintf(uH, "can't create record (%s)\n", ful_c));
u2_lo_bail(rec_u);
}
u2R->lug_u.fid_i = fid_i;
}
// Generate a 31-bit salt.
//
{
c3_w rad_w[8];
_sist_rand(rec_u, rad_w);
sal_l = (0x7fffffff & rad_w[0]);
}
// Create and save a passcode.
//
{
c3_w rad_w[8];
u2_noun pas;
_sist_rand(rec_u, rad_w);
pas = u2_ci_words(2, rad_w);
rec_u->key = _sist_fatt(sal_l, u2k(pas));
_sist_fast(rec_u, pas, u2_mug(rec_u->key));
}
// Write the header.
{
u2_uled led_u;
led_u.mag_l = u2_mug('f');
led_u.kno_w = rec_u->kno_w;
if ( 0 == rec_u->key ) {
led_u.key_l = 0;
} else {
led_u.key_l = u2_mug(rec_u->key);
c3_assert(!(led_u.key_l >> 31));
}
led_u.sal_l = sal_l;
led_u.sev_l = rec_u->sev_l;
led_u.tno_l = 1;
if ( sizeof(led_u) != write(fid_i, &led_u, sizeof(led_u)) ) {
uL(fprintf(uH, "can't write record (%s)\n", ful_c));
u2_lo_bail(rec_u);
}
u2R->lug_u.len_d = c3_wiseof(led_u);
}
// Work through the boot events.
u2_raft_work(rec_u);
}
/* _sist_make(): boot from scratch.
*/
static void
_sist_make(u2_reck* rec_u, u2_noun fav)
{
// Authenticate and initialize terminal.
//
u2_term_ef_bake(fav);
// Work through start sequence.
//
u2_raft_work(rec_u);
// Further server configuration.
//
{
u2_http_ef_bake();
}
// Work some more.
//
u2_raft_work(rec_u);
// Create the ship directory.
//
_sist_zest(rec_u);
}
/* _sist_rest(): restore from record, or exit.
*/
static void
_sist_rest(u2_reck* rec_u)
{
struct stat buf_b;
c3_i fid_i;
c3_c ful_c[2048];
c3_w old_w = rec_u->ent_w;
c3_w las_w = 0;
u2_noun roe = u2_nul;
u2_noun sev_l, tno_l, key_l, sal_l;
if ( 0 != rec_u->ent_w ) {
u2_noun ent = u2_dc("scot", c3__ud, rec_u->ent_w);
c3_c* ent_c = u2_cr_string(ent);
uL(fprintf(uH, "rest: checkpoint to event %s\n", ent_c));
free(ent_c);
}
// Open the fscking file. Does it even exist?
{
snprintf(ful_c, 2048, "%s/egz.hope", u2_Host.cpu_c);
if ( ((fid_i = open(ful_c, O_RDWR)) < 0) ||
(fstat(fid_i, &buf_b) < 0) )
{
uL(fprintf(uH, "rest: can't open record (%s)\n", ful_c));
u2_lo_bail(rec_u);
return;
}
u2R->lug_u.fid_i = fid_i;
u2R->lug_u.len_d = ((buf_b.st_size + 3ULL) >> 2ULL);
}
// Check the fscking header. It's probably corrupt.
{
u2_uled led_u;
if ( sizeof(led_u) != read(fid_i, &led_u, sizeof(led_u)) ) {
uL(fprintf(uH, "record (%s) is corrupt (a)\n", ful_c));
u2_lo_bail(rec_u);
}
if ( u2_mug('f') != led_u.mag_l ) {
uL(fprintf(uH, "record (%s) is obsolete (or corrupt)\n", ful_c));
u2_lo_bail(rec_u);
}
if ( led_u.kno_w != rec_u->kno_w ) {
// XX perhaps we should actually do something here
//
uL(fprintf(uH, "rest: (not) translating events (old %d, now %d)\n",
led_u.kno_w,
rec_u->kno_w));
}
sev_l = led_u.sev_l;
sal_l = led_u.sal_l;
key_l = led_u.key_l;
tno_l = led_u.tno_l;
{
u2_noun old = u2_dc("scot", c3__uv, sev_l);
u2_noun nuu = u2_dc("scot", c3__uv, rec_u->sev_l);
c3_c* old_c = u2_cr_string(old);
c3_c* nuu_c = u2_cr_string(nuu);
uL(fprintf(uH, "rest: old %s, new %s\n", old_c, nuu_c));
free(old_c); free(nuu_c);
u2z(old); u2z(nuu);
}
c3_assert(sev_l != rec_u->sev_l); // 1 in 2 billion, just retry
}
// Oh, and let's hope you didn't forget the fscking passcode.
{
if ( 0 != key_l ) {
u2_noun pas = _sist_staf(rec_u, key_l);
u2_noun key;
while ( 1 ) {
pas = pas ? pas : _sist_cask(rec_u, u2_Host.cpu_c, u2_no);
key = _sist_fatt(sal_l, pas);
if ( u2_mug(key) != key_l ) {
uL(fprintf(uH, "incorrect passcode\n"));
u2z(key);
pas = 0;
}
else {
u2z(rec_u->key);
rec_u->key = key;
break;
}
}
}
}
// Read in the fscking events. These are probably corrupt as well.
{
c3_w ent_w;
c3_d end_d;
end_d = u2R->lug_u.len_d;
ent_w = 0;
if ( -1 == lseek64(fid_i, 4ULL * end_d, SEEK_SET) ) {
fprintf(stderr, "end_d %llx\n", end_d);
perror("lseek");
uL(fprintf(uH, "record (%s) is corrupt (c)\n", ful_c));
u2_lo_bail(rec_u);
}
while ( end_d != c3_wiseof(u2_uled) ) {
c3_d tar_d = (end_d - (c3_d)c3_wiseof(u2_ular));
u2_ular lar_u;
c3_w* img_w;
u2_noun ron;
// uL(fprintf(uH, "rest: reading event at %llx\n", end_d));
if ( -1 == lseek64(fid_i, 4ULL * tar_d, SEEK_SET) ) {
uL(fprintf(uH, "record (%s) is corrupt (d)\n", ful_c));
u2_lo_bail(rec_u);
}
if ( sizeof(u2_ular) != read(fid_i, &lar_u, sizeof(u2_ular)) ) {
uL(fprintf(uH, "record (%s) is corrupt (e)\n", ful_c));
u2_lo_bail(rec_u);
}
if ( lar_u.syn_w != u2_mug((c3_w)tar_d) ) {
uL(fprintf(uH, "record (%s) is corrupt (f)\n", ful_c));
u2_lo_bail(rec_u);
}
#if 0
uL(fprintf(uH, "log: read: at %d, %d: lar ent %d, len %d, mug %x\n",
(tar_w - lar_u.len_w),
tar_w,
lar_u.ent_w,
lar_u.len_w,
lar_u.mug_w));
#endif
img_w = malloc(4 * lar_u.len_w);
if ( end_d == u2R->lug_u.len_d ) {
ent_w = las_w = lar_u.ent_w;
}
else {
if ( lar_u.ent_w != (ent_w - 1) ) {
uL(fprintf(uH, "record (%s) is corrupt (g)\n", ful_c));
uL(fprintf(uH, "lar_u.ent_w %x, ent_w %x\n", lar_u.ent_w, ent_w));
u2_lo_bail(rec_u);
}
ent_w -= 1;
}
end_d = (tar_d - (c3_d)lar_u.len_w);
if ( ent_w < old_w ) {
free(img_w);
break;
}
if ( -1 == lseek64(fid_i, 4ULL * end_d, SEEK_SET) ) {
uL(fprintf(uH, "record (%s) is corrupt (h)\n", ful_c));
u2_lo_bail(rec_u);
}
if ( (4 * lar_u.len_w) != read(fid_i, img_w, (4 * lar_u.len_w)) ) {
uL(fprintf(uH, "record (%s) is corrupt (i)\n", ful_c));
u2_lo_bail(rec_u);
}
ron = u2_ci_words(lar_u.len_w, img_w);
free(img_w);
if ( lar_u.mug_w != u2_cr_mug(ron) )
{
uL(fprintf(uH, "record (%s) is corrupt (j)\n", ful_c));
u2_lo_bail(rec_u);
}
if ( rec_u->key ) {
u2_noun dep;
dep = u2_dc("de:crya", u2k(rec_u->key), ron);
if ( u2_no == u2du(dep) ) {
uL(fprintf(uH, "record (%s) is corrupt (k)\n", ful_c));
u2_lo_bail(rec_u);
}
else {
ron = u2k(u2t(dep));
u2z(dep);
}
}
roe = u2nc(u2_cke_cue(ron), roe);
}
rec_u->ent_w = c3_max(las_w + 1, old_w);
}
if ( u2_nul == roe ) {
// Nothing in the log that was not also in the checkpoint.
//
c3_assert(rec_u->ent_w == old_w);
c3_assert((las_w + 1) == old_w);
}
else {
u2_noun rou = roe;
c3_w xno_w;
// Execute the fscking things. This is pretty much certain to crash.
//
uL(fprintf(uH, "rest: replaying through event %d\n", las_w));
fprintf(uH, "---------------- playback starting----------------\n");
xno_w = 0;
while ( u2_nul != roe ) {
u2_noun i_roe = u2h(roe);
u2_noun t_roe = u2t(roe);
u2_noun now = u2h(i_roe);
u2_noun ovo = u2t(i_roe);
u2_reck_wind(rec_u, u2k(now));
if ( (u2_yes == u2_Host.ops_u.vno) &&
(c3__veer == u2h(u2t(ovo))) ) {
uL(fprintf(uH, "replay: skipped veer\n"));
}
else {
_sist_sing(rec_u, u2k(ovo));
}
fputc('.', stderr);
// uL(fprintf(uH, "playback: sing: %d\n", xno_w));
roe = t_roe;
xno_w++;
if ( 0 == (xno_w % 1000) ) {
uL(fprintf(uH, "{%d}\n", xno_w));
u2_lo_grab("rest", rou, u2_none);
}
}
u2z(rou);
}
uL(fprintf(stderr, "\n---------------- playback complete----------------\n"));
#if 0
// If you see this error, your record is totally fscking broken!
// Which probably serves you right. Please consult a consultant.
{
if ( u2_nul == rec_u->own ) {
uL(fprintf(uH, "record did not install a master!\n"));
u2_lo_bail(rec_u);
}
rec_u->our = u2k(u2h(rec_u->own));
rec_u->pod = u2_dc("scot", 'p', u2k(rec_u->our)));
}
// Now, who the fsck are you? No, really.
{
u2_noun who;
c3_c* fil_c;
c3_c* who_c;
if ( (fil_c = strrchr(u2_Host.cpu_c, '/')) ) {
fil_c++;
} else fil_c = u2_Host.cpu_c;
who = u2_dc("scot", 'p', u2k(rec_u->our)));
who_c = u2_cr_string(who);
u2z(who);
if ( strncmp(fil_c, who_c + 1, strlen(fil_c)) ) {
uL(fprintf(uH, "record master (%s) does not match filename!\n", who_c));
u2_lo_bail(rec_u);
}
free(who_c);
}
#endif
// Rewrite the header. Will probably corrupt the record.
{
u2_uled led_u;
led_u.mag_l = u2_mug('f');
led_u.sal_l = sal_l;
led_u.sev_l = rec_u->sev_l;
led_u.key_l = rec_u->key ? u2_mug(rec_u->key) : 0;
led_u.kno_w = rec_u->kno_w; // may need actual translation!
led_u.tno_l = 1;
if ( (-1 == lseek64(fid_i, 0, SEEK_SET)) ||
(sizeof(led_u) != write(fid_i, &led_u, sizeof(led_u))) )
{
uL(fprintf(uH, "record (%s) failed to rewrite\n", ful_c));
u2_lo_bail(rec_u);
}
}
// Hey, fscker! It worked.
{
u2_term_ef_boil(tno_l);
}
}
/* _sist_zen(): get OS entropy.
*/
static u2_noun
_sist_zen(u2_reck* rec_u)
{
c3_w rad_w[8];
_sist_rand(rec_u, rad_w);
return u2_ci_words(8, rad_w);
}
/* u2_sist_boot(): restore or create.
*/
void
u2_sist_boot(void)
{
uL(fprintf(uH, "raft: booting\n"));
if ( u2_yes == u2_Host.ops_u.nuu ) {
u2_noun pig = u2_none;
if ( 0 == u2_Host.ops_u.imp_c ) {
c3_c get_c[2049];
snprintf(get_c, 2048, "%s/get", u2_Host.cpu_c);
if ( 0 == access(get_c, 0) ) {
uL(fprintf(uH, "pier: already built\n"));
u2_lo_bail(u2A);
}
u2_noun ten = _sist_zen(u2A);
uL(fprintf(uH, "generating 2048-bit RSA pair...\n"));
pig = u2nq(c3__make, u2_nul, 11, ten);
}
else {
u2_noun imp = u2_ci_string(u2_Host.ops_u.imp_c);
u2_noun whu = u2_dc("slaw", 'p', u2k(imp));
if ( (u2_nul == whu) ) {
fprintf(stderr, "czar: incorrect format\r\n");
u2_lo_bail(u2A);
}
else {
u2_noun gen = _sist_text(u2A, "generator");
u2_noun gun = u2_dc("slaw", c3__uw, gen);
if ( u2_nul == gun ) {
fprintf(stderr, "czar: incorrect format\r\n");
u2_lo_bail(u2A);
}
pig = u2nt(c3__sith, u2k(u2t(whu)), u2k(u2t(gun)));
u2z(whu); u2z(gun);
}
u2z(imp);
}
_sist_make(u2A, pig);
}
else {
_sist_rest(u2A);
}
}