ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-04 13:19:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'urbit/master' into newbreach

Browse Source 
take their urbit.pill

Conflicts:
	Makefile
	urb/urbit.pill
	v/sist.c
This commit is contained in:
~hatteb-mitlyd 2014-04-18 10:24:59 -07:00
commit e67816ef87
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
f/loom.c
View File

@ -1733,6 +1733,7 @@ u2_chop(c3_g met_g,
u2_atom src)
{
c3_w i_w;
c3_w len_w = (u2_fly_is_cat(src) ? 1 : *u2_at_pug_len(src));
c3_assert(u2_none != src);
c3_assert(u2_fly_is_atom(src));
@ -1752,7 +1753,7 @@ u2_chop(c3_g met_g,
c3_g rat_g = (bat_w & 31);
c3_w hop_w;
hop_w = u2_atom_word(src, waf_w);
hop_w = (waf_w >= len_w) ? 0 : u2_atom_word(src, waf_w);
hop_w = (hop_w >> raf_g) & mek_w;
*u2_at_ray(dst_r + wat_w) ^= (hop_w << rat_g);
@ -1762,7 +1763,6 @@ u2_chop(c3_g met_g,
}
}
else {
c3_w len_w = (u2_fly_is_cat(src) ? 1 : *u2_at_pug_len(src));
c3_g hut_g = (met_g - 5);
c3_w san_w = (1 << hut_g);
c3_w j_w;

18
v/http.c
View File

@ -808,6 +808,7 @@ _http_request_to_noun(u2_hreq* req_u)
switch ( req_u->met_e ) {
default: fprintf(stderr, "strange request\r\n"); return u2_none;
case u2_hmet_put: { med = c3__put; break; }
case u2_hmet_get: { med = c3__get; break; }
case u2_hmet_post: { med = c3__post; break; }
}
@ -929,17 +930,28 @@ _http_respond(u2_hrep* rep_u)
u2_hreq* req_u;
if ( !(htp_u = _http_serv_find(rep_u->sev_l)) ) {
// uL(fprintf(uH, "http: server not found: %d\r\n", rep_u->sev_l));
uL(fprintf(uH, "http: server not found: %x\r\n", rep_u->sev_l));
return;
}
if ( !(hon_u = _http_conn_find(htp_u, rep_u->coq_l)) ) {
uL(fprintf(uH, "http: connection not found: %d\r\n", rep_u->coq_l));
uL(fprintf(uH, "http: connection not found: %x/%d\r\n",
rep_u->sev_l,
rep_u->coq_l));
return;
}
if ( !(req_u = _http_req_find(hon_u, rep_u->seq_l)) ) {
uL(fprintf(uH, "http: request not found: %d\r\n", rep_u->seq_l));
uL(fprintf(uH, "http: request not found: %x/%d/%d\r\n",
rep_u->sev_l,
rep_u->coq_l,
rep_u->seq_l));
return;
}
#if 0
uL(fprintf(uH, "http: responding: %x/%d/%d\r\n",
rep_u->sev_l,
rep_u->coq_l,
rep_u->seq_l));
#endif
_http_respond_request(req_u, rep_u);
_http_flush(hon_u);

9
v/sist.c
View File

@ -1002,7 +1002,14 @@ _sist_rest(u2_reck* rec_u)
// Nothing in the log that was not also in the checkpoint.
//
c3_assert(rec_u->ent_d == old_d);
c3_assert((las_d + 1ULL) == old_d);
if ( las_d + 1 != old_d ) {
uL(fprintf(uH, "checkpoint and log disagree! las:%u old:%u\n",
las_d + 1, old_d));
uL(fprintf(uH, "Some events appear to be missing from the log.\n"
"Please contact the authorities, "
"and do not delete your pier!\n"));
u2_lo_bail(rec_u);
}
}
else {
u2_noun rou = roe;