urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-15 12:43:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test' of https://github.com/urbit/urbit into test

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
Anton Dyudin 2015-05-21 16:04:11 -07:00
commit 7b2ad984b0
7 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
demo/install1.sh
View File

@ -3,7 +3,8 @@
X=$1
DEMO=demo
COLD=$DEMO/files
DESK=urbit/$X/$X/in/$DEMO
DESK=test/$X/$X/in/base
echo "cp -f $COLD/1-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook"
cp -f $COLD/1-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook
echo "cp -f $COLD/1-ape-tictactoe.hoon $DESK/ape/tictactoe/core.hook"
mkdir -p $DESK/ape/tictactoe
cp -f $COLD/1-ape-tictactoe.hoon $DESK/ape/tictactoe/core.hook

8
demo/install2.sh
View File

@ -3,10 +3,12 @@
X=$1
DEMO=demo
COLD=$DEMO/files
DESK=urbit/$X/$X/in/$DEMO
DESK=test/$X/$X/in/base
echo "cp -f $COLD/2-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook"
cp -f $COLD/1-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook
echo "cp -f $COLD/2-ape-tictactoe.hoon $DESK/ape/tictactoe/core.hook"
mkdir -p $DESK/ape/tictactoe
cp -f $COLD/1-ape-tictactoe.hoon $DESK/ape/tictactoe/core.hook
echo "cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook"
mkdir -p $DESK/mar/octo-game
cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook

10
demo/install3.sh
View File

@ -3,18 +3,22 @@
X=$1
DEMO=demo
COLD=$DEMO/files
DESK=urbit/$X/$X/in/$DEMO
DESK=test/$X/$X/in/base
echo "cp -f $COLD/3-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook"
cp -f $COLD/3-ape-tictactoe.hoon $DESK/ape/tictactoe/core/hook
echo "cp -f $COLD/3-ape-tictactoe.hoon $DESK/ape/tictactoe/core.hook"
mkdir -p $DESK/ape/tictactoe
cp -f $COLD/3-ape-tictactoe.hoon $DESK/ape/tictactoe/core.hook
echo "cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook"
mkdir -p $DESK/mar/octo-game
cp -f $COLD/mar-octo-game.hoon $DESK/mar/octo-game/door.hook
echo "cp -f $COLD/pub-octo-hymn.hoon $DESK/pub/octo/fab/hymn.hook"
mkdir -p $DESK/pub/octo/fab
cp -f $COLD/pub-octo-hymn.hoon $DESK/pub/octo/fab/hymn.hook
echo "cp -f $COLD/pub-octo-main.css $DESK/pub/octo/src/main.css"
mkdir -p $DESK/pub/octo/src
cp -f $COLD/pub-octo-main.css $DESK/pub/octo/src/main.css
echo "cp -f $COLD/pub-octo-main.js $DESK/pub/octo/src/main.js"

6
j/b/scag.c
View File

@ -15,7 +15,7 @@
return u3m_bail(c3__fail);
}
else {
u3_noun acc = u3_blip;
u3_noun acc = u3_nul;
c3_w i_w = a;
if ( !i_w )
@ -23,9 +23,9 @@
while ( i_w ) {
if ( c3n == u3du(b) ) {
return u3_nul;
return u3kb_flop(acc);
}
acc = u3i_cell( u3h(b), acc );
acc = u3nc(u3k(u3h(b)), acc);
b = u3t(b);
i_w--;
}

4
j/tree.c
View File

@ -26,7 +26,7 @@ static u3j_harm _mood__hoon_reel_a[] = {{".2", u3wb_reel, c3y}, {}};
static u3j_harm _mood__hoon_roll_a[] = {{".2", u3wb_roll, c3y}, {}};
static u3j_harm _mood__hoon_skim_a[] = {{".2", u3wb_skim, c3y}, {}};
static u3j_harm _mood__hoon_skip_a[] = {{".2", u3wb_skip, c3y}, {}};
// static u3j_harm _mood__hoon_scag_a[] = {{".2", u3wb_scag, c3y}, {}};
static u3j_harm _mood__hoon_scag_a[] = {{".2", u3wb_scag, c3y}, {}};
static u3j_harm _mood__hoon_slag_a[] = {{".2", u3wb_slag, c3y}, {}};
static u3j_harm _mood__hoon_snag_a[] = {{".2", u3wb_snag, c3y}, {}};
// static u3j_harm _mood__hoon_sort_a[] = {{".2", u3wb_sort, c3y}, {}};
@ -395,7 +395,7 @@ static u3j_core _mood__hoon_d[] =
{ "roll", _mood__hoon_roll_a },
{ "skim", _mood__hoon_skim_a },
{ "skip", _mood__hoon_skip_a },
// { "scag", _mood__hoon_scag_a }, // this jet is actually broken
{ "scag", _mood__hoon_scag_a },
{ "slag", _mood__hoon_slag_a },
{ "snag", _mood__hoon_snag_a },
// { "sort", _mood__hoon_sort_a },

1
n/e.c
View File

@ -552,7 +552,6 @@ _ce_patch_compose(void)
}
if ( !pgs_w ) {
fprintf(stderr, "no dirty pages\r\n");
return 0;
}
else {

32
n/t.c
View File

@ -207,10 +207,14 @@ u3t_samp(void)
{
u3C.wag_w &= ~u3o_debug_cpu;
static int home = 0;
static int away = 0;
// Profile sampling, because it allocates on the home road,
// only works on when we're not at home.
//
if ( &(u3H->rod_u) != u3R ) {
home++;
c3_l mot_l;
u3a_road* rod_u;
@ -250,6 +254,10 @@ u3t_samp(void)
}
u3R = rod_u;
}
else {
away++;
// fprintf(stderr,"home: %06d away: %06d\r\n", home, away);
}
u3C.wag_w |= u3o_debug_cpu;
}
@ -349,7 +357,29 @@ u3t_boot(void)
}
#endif
#elif defined(U3_OS_linux)
// TODO: support profiling on linux
{
struct itimerval itm_v;
struct sigaction sig_s;
sigset_t set;
sig_s.sa_handler = _ct_sigaction;
sigemptyset(&(sig_s.sa_mask));
sig_s.sa_flags = 0;
sigaction(SIGPROF, &sig_s, 0);
sigemptyset(&set);
sigaddset(&set, SIGPROF);
if ( 0 != pthread_sigmask(SIG_UNBLOCK, &set, NULL) ) {
perror("pthread_sigmask");
}
itm_v.it_interval.tv_sec = 0;
itm_v.it_interval.tv_usec = 10000;
// itm_v.it_interval.tv_usec = 100000;
itm_v.it_value = itm_v.it_interval;
setitimer(ITIMER_PROF, &itm_v, 0);
}
#elif defined(U3_OS_bsd)
// TODO: support profiling on bsd
#else