Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5b6749d
no-op in ames.c if no galaxy domain
Jan 18, 2019
b12f2dd
vere/unix.c: set _XOPEN_SOURCE
fche Jan 20, 2019
e59fbcd
fixes dead link to swap instuctions
Jan 22, 2019
c3f3ea2
ames.c: print galaxy that's missing domain
Jan 29, 2019
20c4151
updates u3m_soft to skip tank printing if we have no kernel
joemfb Jan 30, 2019
02c0c2c
skip profiling if we don't yet have an arvo kernel
joemfb Jan 30, 2019
b118cef
replay most recent event too
Jan 30, 2019
d40d6e4
virtualize pill cue to print message on invalid jamfile
joemfb Jan 30, 2019
2cf8a81
prints error message on invalid pill structure
joemfb Jan 30, 2019
3c5548b
virtualizes evalution of the boot sequence, prints on failure
joemfb Jan 30, 2019
5773b9d
cleaned up boot playback prints
Jan 30, 2019
0c036af
Merge pull request #1173 from urbit/last-event
Jan 30, 2019
787e2ea
adds comment for special-case in u3m_soft()
joemfb Jan 30, 2019
9ef6de4
Merge branch 'master' into hotfix
joemfb Jan 30, 2019
f30df7d
Merge pull request #1172 from urbit/boot-pill-fail
joemfb Jan 30, 2019
9ad367a
Merge pull request #1165 from urbit/fix-url
joemfb Jan 30, 2019
d14df3e
Merge pull request #1158 from urbit/ames-noop
joemfb Jan 30, 2019
a09477f
Move _XOPEN_SOURCE #define to include/c/portable.h
fche Jan 30, 2019
055f318
moves all vere gc to _raft_grab(), run once after event
joemfb Jan 30, 2019
d03b8dd
removes obsolete, commented-out gc implementation from loop.c
joemfb Jan 30, 2019
77947ed
Merge pull request #1161 from fche/patch-1
joemfb Jan 31, 2019
0d52d25
Merge pull request #1174 from urbit/gc-cleanup
joemfb Jan 31, 2019
1f673be
bumps urbit patch number to 0.7.1
joemfb Jan 31, 2019
75d18fe
[CI] updates pinned arvo commit
joemfb Jan 31, 2019
051f31b
removes unused fprintf arg
joemfb Jan 31, 2019
999a11f
Merge pull request #1175 from urbit/hotfix-prep
ixv Jan 31, 2019
d5f607d
[CI] disables deployment of tagged builds
joemfb Jan 31, 2019
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
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ addons:
- unzip
- gdb
# before_deploy: "make deb" # TODO
deploy:
skip_cleanup: true
provider: releases
prerelease: true # turn this off for official releases
api_key:
secure: V4E7784ECSS3MO6ZIRtang9XwibDyvDYGb0MoSaP2CTlmzIAhdokr4KJFM0qM4KRaaajCdQuqi0lojgOjwdxs7e0GkAwScb33LFxQ7Chj/QkFOY7V1AnSRLR5OsXnazB0nur5aSwvcvnggQ2XW3OeF7zIvGfs9aR97SEz/xCrVE=
file: ./build/urbit # TODO upload package from before_deploy
on:
repo: urbit/urbit
tags: true
# deploy:
# skip_cleanup: true
# provider: releases
# prerelease: true # turn this off for official releases
# api_key:
# secure: XX
# file: ./build/urbit # TODO upload package from before_deploy
# on:
# repo: urbit/urbit
# tags: true
2 changes: 1 addition & 1 deletion .travis/pin-arvo-commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d318b2cfcf33ac41aeaacb03e8b5593f8eb5e690
7aaf5fa815f93b01978f42663163f75d8175ad1c
3 changes: 3 additions & 0 deletions include/c/portable.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
*** C file.
**/
# if defined(U3_OS_linux)
# ifndef _XOPEN_SOURCE
# define _XOPEN_SOURCE 700
# endif
# include <inttypes.h>
# include <stdlib.h>
# include <string.h>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ endforeach
incdir = include_directories('include/')

conf_data = configuration_data()
conf_data.set('URBIT_VERSION', '"0.7.0"')
conf_data.set('URBIT_VERSION', '"0.7.1"')
conf_data.set('U3_MEMORY_DEBUG', get_option('gc'))
conf_data.set('U3_CPU_DEBUG', get_option('prof'))
conf_data.set('U3_EVENT_TIME_DEBUG', get_option('event-time'))
Expand Down
76 changes: 55 additions & 21 deletions noun/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -1180,28 +1180,43 @@ u3m_soft(c3_w sec_w,

if ( 0 == u3h(why) ) {
return why;
} else {
u3_noun tax, cod, pro, mok;
}
else {
// don't use .^ at the top level!
//
c3_assert(1 != u3h(why));

c3_assert(1 != u3h(why)); // don't use .^ at the top level!

if ( 2 == u3h(why) ) {
cod = c3__exit;
tax = u3k(u3t(why));
}
// don't call +mook if we have no kernel
//
// This is required to soft the boot sequence.
// XX produce specific error motes instead of %2?
//
if ( 0 == u3A->roc ) {
u3z(why);
return u3nc(2, u3_nul);
}
else {
c3_assert(3 == u3h(why));
u3_noun tax, cod, pro, mok;

cod = u3k(u3h(u3t(why)));
tax = u3k(u3t(u3t(why)));
}
mok = u3dc("mook", 2, tax);
pro = u3nc(cod, u3k(u3t(mok)));
if ( 2 == u3h(why) ) {
cod = c3__exit;
tax = u3k(u3t(why));
}
else {
c3_assert(3 == u3h(why));

u3z(mok);
u3z(why);
cod = u3k(u3h(u3t(why)));
tax = u3k(u3t(u3t(why)));
}

return pro;
mok = u3dc("mook", 2, tax);
pro = u3nc(cod, u3k(u3t(mok)));

u3z(mok);
u3z(why);

return pro;
}
}
}

Expand Down Expand Up @@ -1512,7 +1527,7 @@ u3m_init(c3_o chk_o)
-1, 0);

fprintf(stderr, "boot: mapping %dMB failed\r\n", (len_w / (1024 * 1024)));
fprintf(stderr, "see urbit.org/docs/using/install for adding swap space\r\n");
fprintf(stderr, "see urbit.org/docs/getting-started#swap for adding swap space\r\n");
if ( -1 != (c3_ps)map_v ) {
fprintf(stderr,
"if porting to a new platform, try U3_OS_LoomBase %p\r\n",
Expand Down Expand Up @@ -1708,13 +1723,32 @@ u3m_boot(c3_o nuu_o, c3_o bug_o, c3_c* dir_c,
printf("boot: loading %s\r\n", ful_c);

{
u3_noun sys = u3ke_cue(u3m_file(ful_c));
u3_noun bot;
u3_noun pil = u3m_file(ful_c);
u3_noun sys, bot;

{
u3_noun pro = u3m_soft(0, u3ke_cue, u3k(pil));

if ( 0 != u3h(pro) ) {
fprintf(stderr, "boot: failed: unable to parse pill\r\n");
exit(1);
}

sys = u3k(u3t(pro));
u3z(pro);
}

// XX confirm trel of lists?
//
if ( c3n == u3r_trel(sys, &bot, 0, 0) ) {
fprintf(stderr, "boot: failed: obsolete pill structure\r\n");
exit(1);
}

u3x_trel(sys, &bot, 0, 0);
u3v_boot(u3k(bot));

u3z(sys);
u3z(pil);
}
}
else {
Expand Down
6 changes: 6 additions & 0 deletions noun/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,12 @@ u3t_boot(void)
if ( u3C.wag_w & u3o_debug_cpu ) {
_ct_lop_o = c3n;
#if defined(U3_OS_osx) || defined(U3_OS_linux)
// skip profiling if we don't yet have an arvo kernel
//
if ( 0 == u3A->roc ) {
return;
}

// Register _ct_sigaction to be called on `SIGPROF`.
{
struct sigaction sig_s = {{0}};
Expand Down
27 changes: 23 additions & 4 deletions noun/vortex.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,35 @@ _cv_nock_wish(u3_noun txt)
void
u3v_boot(u3_noun eve)
{
u3_noun cor;

// ensure zero-initialized kernel
//
// So that u3t_slog won't try to print tanks.
//
u3A->roc = 0;

// lifecycle formula
//
u3_noun lyf = u3nt(2, u3nc(0, 3), u3nc(0, 2));
u3_noun cor = u3n_nock_on(eve, lyf);
{
// default namespace function: |=(a/{* *} ~)
//
u3_noun gul = u3nt(u3nt(1, 0, 0), 0, 0);
// lifecycle formula
//
u3_noun lyf = u3nt(2, u3nc(0, 3), u3nc(0, 2));
// evalute lifecycle formula against the boot sequence
// in a virtualization context
//
u3_noun pro = u3m_soft_run(gul, u3n_nock_on, eve, lyf);

if ( 0 != u3h(pro) ) {
fprintf(stderr, "boot: failed: invalid boot sequence (from pill)\r\n");
u3z(pro);
return;
}

cor = u3k(u3t(pro));
u3z(pro);
}

// save the Arvo core (at +7 of the Arvo gate)
//
Expand Down
12 changes: 11 additions & 1 deletion vere/ames.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,17 @@ _ames_czar(u3_pact* pac_u, c3_c* bos_c)
return;
}

c3_assert( 0 != bos_c );
// if we don't have a galaxy domain, no-op
//
if ( 0 == bos_c ) {
u3_noun nam = u3dc("scot", 'p', pac_u->imp_y);
c3_c* nam_c = u3r_string(nam);
fprintf(stderr, "ames: no galaxy domain for %s, no-op\r\n", nam_c);

free(nam_c);
u3z(nam);
return;
}

time_t now = time(0);

Expand Down
Loading