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

Merge branch 'release/next-userspace' into lf/groups-refactor

Browse Source
This commit is contained in:
Liam Fitzgerald 2020-07-02 12:38:12 +10:00
commit 93cf40a604
38 changed files with 698 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/solid.pill
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b727bafa4d479d0cb6df411b7f414132a2c1d05fd415ec4d606cb43747dfc58
size 16662916
oid sha256:581c9b713aa12126f3a618d75bf4254bb431f633fbfc76941663391d3d13cdb0
size 16742515

15
nix/nixcrpkgs/pkgs/libsigsegv/builder.sh
View File

@ -2,6 +2,21 @@ source $setup
tar -xf $src
cd libsigsegv-$version
patch -p1 << 'HEREDOC'
--- a/src/fault-linux-i386.h 2020-06-25 23:46:02.099235491 +0000
+++ b/src/fault-linux-i386.h 2020-06-25 23:45:48.679156892 +0000
@@ -18,6 +18,7 @@
#include "fault-posix-ucontext.h"
+#define HAVE_STACKVMA 0
#if defined __x86_64__
/* 64 bit registers */
HEREDOC
cd ..
mkdir build
cd build

2
nix/ops/test/builder.sh
View File

@ -24,7 +24,7 @@ herb ./ship -p hood -d '+hood/mass'
# Run the unit tests and then print scrollback
herb ./ship -d '~& ~ ~& %test-unit-start ~'
herb ./ship -d '####-test /'
herb ./ship -d '####-test %/tests'
herb ./ship -d '~& ~ ~& %test-unit-end ~'
# Start and run the test app

7
nix/pkgs/urbit/default.nix
View File

@ -16,9 +16,14 @@ let
exe = ''${meta.bin} ${pkgs.lib.strings.concatStringsSep " " meta.flags}'';
};
sigseg =
pkgs.libsigsegv.overrideAttrs (oldAttrs: rec {
patches = [ ./libsigsegv_fix.patch ];
});
deps =
with pkgs;
[ curl gmp libsigsegv ncurses openssl zlib lmdb ];
[ curl gmp sigseg ncurses openssl zlib lmdb ];
vendor =
[ argon2 softfloat3 ed25519 ent ge-additions libaes_siv h2o scrypt uv murmur3 secp256k1 sni ivory-header ca-header ];

10
nix/pkgs/urbit/libsigsegv_fix.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/src/fault-linux-i386.h 2020-06-25 23:46:02.099235491 +0000
+++ b/src/fault-linux-i386.h 2020-06-25 23:45:48.679156892 +0000
@@ -18,6 +18,7 @@
#include "fault-posix-ucontext.h"
+#define HAVE_STACKVMA 0
#if defined __x86_64__
/* 64 bit registers */

95
pkg/arvo/app/chat-store.hoon
View File

@ -5,24 +5,22 @@
|%
+$ card card:agent:gall
+$ versioned-state
$% state-zero
state-one
state-two
state-three
state-four
$% state-0
state-1
state-2
state-3
==
::
+$ state-zero [%0 =inbox:store]
+$ state-one [%1 =inbox:store]
+$ state-two [%2 =inbox:store]
+$ state-three [%3 =inbox:store]
+$ state-four [%4 =inbox:store]
+$ state-0 [%0 =inbox:store]
+$ state-1 [%1 =inbox:store]
+$ state-2 [%2 =inbox:store]
+$ state-3 [%3 =inbox:store]
+$ admin-action
$% [%trim ~]
==
--
::
=| state-four
=| state-3
=* state -
::
%- agent:dbug
@ -40,14 +38,16 @@
++ on-save !>(state)
++ on-load
|= old-vase=vase
^- (quip card _this)
|^
=/ old !<(versioned-state old-vase)
=| cards=(list card)
|-
^- (quip card _this)
?- -.old
%4 [cards this(state old)]
%3 [cards this(state old)]
::
%3
%2
=/ =inbox:store
(migrate-path-map:group-store inbox.old)
=/ kick-paths
@ -64,24 +64,24 @@
=? cards ?=(^ kick-paths)
:_ cards
[%give %kick kick-paths ~]
$(old [%4 inbox.old])
::
%2
=. cards
:_ cards
[%pass /trim %agent [our.bowl %chat-store] %poke %noun !>([%trim ~])]
$(old [%3 inbox.old])
$(old [%4 inbox.old])
::
%1
=/ reversed-inbox=inbox:store
%- ~(run by inbox.old)
|= =mailbox:store
^- mailbox:store
[config.mailbox (flop envelopes.mailbox)]
$(old [%2 reversed-inbox])
?(%0 %1) $(old [%2 (old-to-2 inbox.old)])
::
%0 $(old [%1 inbox.old])
==
::
++ old-to-2
|= =inbox:store
^- state-2
:- %2
%- ~(run by inbox)
|= =mailbox:store
^- mailbox:store
[config.mailbox (flop envelopes.mailbox)]
--
::
++ on-poke
~/ %chat-store-poke
@ -92,7 +92,7 @@
?+ mark (on-poke:def mark vase)
%json (poke-json:cc !<(json vase))
%chat-action (poke-chat-action:cc !<(action:store vase))
%noun (poke-noun:cc !<(admin-action vase))
%noun [~ (poke-noun:cc !<(admin-action vase))]
==
[cards this]
::
@ -191,28 +191,29 @@
::
++ poke-noun
|= nou=admin-action
^- (quip card _state)
^- _state
~& %trimming-chat-store
:- ~
:- %4
%- ~(urn by inbox)
|= [=path mailbox:store]
^- mailbox:store
=/ [a=* out=(list envelope:store)]
%+ roll envelopes
|= $: =envelope:store
o=[[hav=(set serial:store) curr=@] out=(list envelope:store)]
==
?: (~(has in hav.o) uid.envelope)
[[hav.o curr.o] out.o]
:-
^- [(set serial:store) @]
[(~(put in hav.o) uid.envelope) +(curr.o)]
^- (list envelope:store)
[envelope(number curr.o) out.o]
=/ len (lent out)
~& [path [%old (lent envelopes)] [%new len]]
[[len len] (flop out)]
%_ state
inbox
%- ~(urn by inbox)
|= [=path mailbox:store]
^- mailbox:store
=/ [a=* out=(list envelope:store)]
%+ roll envelopes
|= $: =envelope:store
o=[[hav=(set serial:store) curr=@] out=(list envelope:store)]
==
?: (~(has in hav.o) uid.envelope)
[[hav.o curr.o] out.o]
:-
^- [(set serial:store) @]
[(~(put in hav.o) uid.envelope) +(curr.o)]
^- (list envelope:store)
[envelope(number curr.o) out.o]
=/ len (lent out)
~? !=(len (lent envelopes)) [path [%old (lent envelopes)] [%new len]]
[[len len] (flop out)]
==
::
++ poke-json
|= jon=json

5
pkg/arvo/app/dbug.hoon
View File

@ -360,12 +360,13 @@
:- %a
%+ turn
%+ sort ~(tap by sessions:auth-state:v-eyre)
|= [[@uv a=@da] [@uv b=@da]]
(gth a b)
|= [[@uv a=session:eyre] [@uv b=session:eyre]]
(gth expiry-time.a expiry-time.b)
|= [cookie=@uv session:eyre]
%- pairs
:~ 'cookie'^s+(end 3 4 (rsh 3 2 (scot %x (shax cookie))))
'expiry'^(time expiry-time)
'channels'^(numb ~(wyt in channels))
==
::
:: /eyre/channels.json

1
pkg/arvo/app/goad.hoon
View File

@ -24,6 +24,7 @@
|= [wir=wire sin=sign-arvo]
?+ wir (on-arvo:def wir sin)
[%clay ~] `this
[%behn ~] `this :: backcompat
==
::
++ on-agent on-agent:def

17
pkg/arvo/app/invite-view.hoon Normal file
View File

@ -0,0 +1,17 @@
/+ default-agent
^- agent:gall
|_ =bowl:gall
+* this .
def ~(. (default-agent this %|) bowl)
step `step:agent:gall`[~ this]
++ on-init on-init:def
++ on-save on-save:def
++ on-load on-load:def
++ on-poke |=(* step)
++ on-watch on-watch:def
++ on-leave |=(* step)
++ on-peek |=(* ~)
++ on-agent |=(* step)
++ on-arvo |=(* step)
++ on-fail on-fail:def
--

0
pkg/arvo/app/landscape/img/codeval.png → pkg/arvo/app/landscape/img/codeeval.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

22
pkg/arvo/app/metadata-store.hoon
View File

@ -153,9 +153,27 @@
^- (quip card _this)
?> (team:title our.bowl src.bowl)
=^ cards state
?: ?=(%metadata-action mark)
?+ mark (on-poke:def mark vase)
%metadata-action
(poke-metadata-action:mc !<(metadata-action vase))
(on-poke:def mark vase)
%noun
=/ val=(each [%cleanup path] tang)
(mule |.(!<([%cleanup path] vase)))
?. ?=(%& -.val)
(on-poke:def mark vase)
=/ group=path +.p.val
=/ res=(set resource) (~(get ju group-indices) group)
=. group-indices (~(del by group-indices) group)
:- ~
%+ roll ~(tap in res)
|= [r=resource out=_state]
=. resource-indices.out (~(del by resource-indices.out) r)
=. app-indices.out
%- ~(del ju app-indices.out)
[app-name.r group app-path.r]
=. associations.out (~(del by associations.out) group r)
out
==
[cards this]
::
++ on-watch

74
pkg/arvo/lib/hood/kiln.hoon
View File

@ -240,6 +240,7 @@
?+ i.t.t.t.wire ~&([%strange-ota-take t.t.t.wire] ..abet)
%find (take-find sign-arvo)
%sync (take-sync sign-arvo)
%download (take-download sign-arvo)
%merge-home (take-merge-home sign-arvo)
%merge-kids (take-merge-kids sign-arvo)
==
@ -255,20 +256,39 @@
==
::
++ take-sync
|= =sign-arvo
?> ?=(%writ +<.sign-arvo)
?> ?=(^ ota)
?~ p.sign-arvo
=. ..abet (render-ket "OTA cancelled (1), retrying" ~)
(poke-internal `[ship desk]:u.ota)
=. ..abet (render-ket "downloading OTA update" ~)
=? aeon.u.ota ?=($w p.p.u.p.sign-arvo)
ud:;;(cass:clay q.q.r.u.p.sign-arvo)
%: emit
%pass (make-wire /download) %arvo %c
%warp ship.u.ota desk.u.ota `[%sing %v ud+aeon.u.ota /]
==
::
++ take-download
|= =sign-arvo
^+ ..abet
?> ?=(%writ +<.sign-arvo)
?> ?=(^ ota)
?~ p.sign-arvo
=. ..abet (render-ket "OTA cancelled, retrying" ~)
=. ..abet (render-ket "OTA cancelled (2), retrying" ~)
(poke-internal `[ship desk]:u.ota)
=? aeon.u.ota ?=($w p.p.u.p.sign-arvo)
ud:;;(cass:clay q.q.r.u.p.sign-arvo)
=. ..abet (render-ket "finished downloading OTA" ~)
=. aeon.u.ota +(aeon.u.ota)
=/ =germ (get-germ %home)
=. ..abet (render-ket "beginning OTA to %home" ~)
%: emit
%pass (make-wire /merge-home) %arvo %c
%merg %home ship.u.ota desk.u.ota ud+aeon.u.ota germ
=. ..abet (render-ket "applying OTA to %home" ~)
%- emil
:~ :* %pass (make-wire /merge-home) %arvo %c
%merg %home ship.u.ota desk.u.ota ud+(dec aeon.u.ota) germ
==
:* %pass (make-wire /sync) %arvo %c
%warp ship.u.ota desk.u.ota `[%sing %z ud+aeon.u.ota /]
==
==
::
++ take-merge-home
@ -282,20 +302,14 @@
(poke-internal `[ship desk]:u.ota)
::
?: ?=(%| -.p.sign-arvo)
=. ..abet
=/ =tape "OTA to %home failed, waiting for next revision"
(render-ket tape `p.p.sign-arvo)
=. aeon.u.ota +(aeon.u.ota)
%: emit
%pass (make-wire /sync) %arvo %c
%warp ship.u.ota desk.u.ota `[%sing %z ud+aeon.u.ota /]
==
=/ =tape "OTA to %home failed, waiting for next revision"
(render-ket tape `p.p.sign-arvo)
=. ..abet (render-ket "OTA to %home succeeded" ~)
=. ..abet (render-ket "beginning OTA to %kids" ~)
=. ..abet (render-ket "applying OTA to %kids" ~)
=/ =germ (get-germ %kids)
%: emit
%pass (make-wire /merge-kids) %arvo %c
%merg %kids ship.u.ota desk.u.ota ud+aeon.u.ota germ
%merg %kids ship.u.ota desk.u.ota ud+(dec aeon.u.ota) germ
==
::
++ take-merge-kids
@ -308,15 +322,9 @@
(render-ket tape `p.p.sign-arvo)
(poke-internal `[ship desk]:u.ota)
::
=. ..abet
?- -.p.sign-arvo
%& (render-ket "OTA to %kids succeeded" ~)
%| (render-ket "OTA to %kids failed" `p.p.sign-arvo)
==
=. aeon.u.ota +(aeon.u.ota)
%: emit
%pass (make-wire /sync) %arvo %c
%warp ship.u.ota desk.u.ota `[%sing %z ud+aeon.u.ota /]
?- -.p.sign-arvo
%& (render-ket "OTA to %kids succeeded" ~)
%| (render-ket "OTA to %kids failed" `p.p.sign-arvo)
==
--
::
@ -329,7 +337,10 @@
++ poke-syncs :: print sync config
|= ~
=< abet %- spam
:- [%leaf "OTAs from {<ota>}"]
:- :- %leaf
?~ ota
"OTAs disabled"
"OTAs from {<desk.u.ota>} on {<ship.u.ota>}"
?: =(0 ~(wyt by syn))
[%leaf "no syncs configured"]~
%+ turn ~(tap in ~(key by syn))
@ -443,7 +454,8 @@
?>(?=(%wake +<.sign-arvo) +>.sign-arvo)
[%ota *] abet:(take:update t.wire sign-arvo)
*
?+ +<.sign-arvo ~|([%kiln-bad-take-card +<.sign-arvo wire] !!)
?+ +<.sign-arvo
((slog leaf+"kiln: strange card {<+<.sign-arvo wire>}" ~) abet)
%done %+ done wire
?>(?=(%done +<.sign-arvo) +>.sign-arvo)
%mere %+ take-mere wire
@ -472,6 +484,8 @@
her=(slav %p i.t.way)
sud=(slav %tas i.t.t.way)
==
?. (~(has by syn) hos)
abet
abet:abet:(mere:(auto hos) mes)
::
++ take-writ-find-ship ::
@ -482,6 +496,8 @@
her=(slav %p i.t.way)
sud=(slav %tas i.t.t.way)
==
?. (~(has by syn) hos)
abet
abet:abet:(take-find-ship:(auto hos) rot)
::
++ take-writ-sync ::
@ -492,6 +508,8 @@
her=(slav %p i.t.way)
sud=(slav %tas i.t.t.way)
==
?. (~(has by syn) hos)
abet
abet:abet:(writ:(auto hos) rot)
::
++ take-wake-autocommit

12
pkg/arvo/sys/arvo.hoon
View File

@ -1050,14 +1050,14 @@
:: +dram: upgrade $pram, compatible
::
+$ pram
$~ [%345 nub=*debt:le:part]
$% [%345 nub=debt:le:part]
$~ [%~2020.6.28 nub=*debt:le:part]
$% [%~2020.6.28 nub=debt:le:part]
(list ovum)
==
++ dram
|= ram=pram
^- pram
?: ?=([%345 *] ram)
?: ?=([%~2020.6.28 *] ram)
ram
~| ram+ram
=| nub=debt:le:part
@ -1067,7 +1067,7 @@
|= ovo=ovum
^- move
[[p.ovo]~ %give %& %noun q.ovo]
[%345 nub(run [plan]~)]
[%~2020.6.28 nub(run [plan]~)]
:: $prim: old $pram
:: +drum: upgrade $prim to $pram, incompatible
::
@ -1094,7 +1094,7 @@
vanes (turn nyf |=({a/@tas b/vise} [a [b *worm]]))
==
=. ram (dram ram)
?> ?=([%345 *] ram)
?> ?=([%~2020.6.28 *] ram)
=/ run plot:(spam:(lead now ~) [//arvo %vega ~])
(leap now (then:(lead now `nub.ram) run))
:: +peek: external inspect
@ -1323,7 +1323,7 @@
:* our
now
eny
345+nub
[%~2020.6.28 nub]
bud
(turn vanes |=([label=@tas =vane] [label vase.vane]))
==

4
pkg/arvo/sys/hoon.hoon
View File

@ -12024,8 +12024,8 @@
::
++ slab :: test if contains
|= [way=?(%read %rite %both) cog=@tas typ=type]
?= [%| *]
(~(find ut typ) way ~[cog])
?= [%& *]
(~(fond ut typ) way ~[cog])
::
++ slap
|= {vax/vase gen/hoon} ^- vase :: untyped vase .*

10
pkg/arvo/sys/vane/clay.hoon
View File

@ -771,7 +771,7 @@
^- pile
=/ [=hair res=(unit [=pile =nail])] ((pile-rule pax) [1 1] tex)
?^ res pile.u.res
%- mean
%- mean %- flop
=/ lyn p.hair
=/ col q.hair
:~ leaf+"syntax error at [{<lyn>} {<col>}] in {<pax>}"
@ -2733,7 +2733,7 @@
:: traverse updated state and sanity check
::
=+ ~| :* %bad-foreign-update
[gar=gar let=let.nako nut=(turn nut head) nat=(turn nat head)]
[gar=gar.nako let=let.nako nut=(turn nut head) nat=(turn nat head)]
[hitdom=hit.dom letdom=let.dom]
==
?: =(0 let.nako)
@ -4056,7 +4056,7 @@
|= [=desk data=(map path lobe)]
^- reef-cache
~> %slog.0^leaf+"clay: building reef on {<desk>}"
?: !=(%homer desk)
?: =(%home desk)
[!>(..ride) !>(..is) !>(..zuse)]
|^
=/ [home=? hoon=vase]
@ -4365,7 +4365,9 @@
::
%boon !!
%lost !!
%writ !!
%writ
%- (slog leaf+"clay: strange writ (expected on upgrade to Fusion)" ~)
[~ ..^$]
::
%done
?~ error=error.q.hin

156
pkg/arvo/sys/vane/eyre.hoon
View File

@ -1023,12 +1023,13 @@
?~ parsed
(return-static-data-on-duct 400 'text/html' (login-page ~ our))
::
=/ redirect=(unit @t) (get-header:http 'redirect' u.parsed)
?~ password=(get-header:http 'password' u.parsed)
(return-static-data-on-duct 400 'text/html' (login-page ~ our))
(return-static-data-on-duct 400 'text/html' (login-page redirect our))
:: check that the password is correct
::
?. =(u.password code)
(return-static-data-on-duct 400 'text/html' (login-page ~ our))
(return-static-data-on-duct 400 'text/html' (login-page redirect our))
:: mint a unique session cookie
::
=/ session=@uv
@ -1042,7 +1043,7 @@
=/ first-session=? =(~ sessions.authentication-state.state)
=/ expires-at=@da (add now session-timeout)
=. sessions.authentication-state.state
(~(put by sessions.authentication-state.state) session expires-at)
(~(put by sessions.authentication-state.state) session [expires-at ~])
::
=/ cookie-line=@t
(session-cookie-string session &)
@ -1054,7 +1055,7 @@
=- out(moves [- moves.out])
[duct %pass /sessions/expire %b %wait expires-at]
::
?~ redirect=(get-header:http 'redirect' u.parsed)
?~ redirect
%- handle-response
:* %start
:- status-code=200
@ -1099,15 +1100,33 @@
(handle-response response)
:: delete the requesting session, or all sessions if so specified
::
=. sessions.authentication-state.state
=; all=?
?: all ~
(~(del by sessions.authentication-state.state) u.session-id)
?~ body.request |
=- ?=(^ -)
%+ get-header:http 'all'
(fall (rush q.u.body.request yquy:de-purl:html) ~)
(handle-response response)
=^ channels=(list @t) sessions.authentication-state.state
=* sessions sessions.authentication-state.state
=/ all=?
?~ body.request |
=- ?=(^ -)
%+ get-header:http 'all'
(fall (rush q.u.body.request yquy:de-purl:html) ~)
?. all
:_ (~(del by sessions) u.session-id)
%~ tap in
channels:(~(gut by sessions) u.session-id *session)
:_ ~
%~ tap in
%+ roll ~(val by sessions)
|= [session all=(set @t)]
(~(uni in all) channels)
:: close all affected channels, then send the response
::
=| moves=(list move)
|- ^- (quip move server-state)
?~ channels
=^ moz state
(handle-response response)
[(weld moves moz) state]
=^ moz state
(discard-channel:by-channel i.channels |)
$(moves (weld moves moz), channels t.channels)
:: +session-id-from-request: attempt to find a session cookie
::
++ session-id-from-request
@ -1398,6 +1417,16 @@
::
=. duct-to-key.channel-state.state
(~(put by duct-to-key.channel-state.state) duct channel-id)
:: associate this channel with the session cookie
::
=. sessions.authentication-state.state
=/ session-id=(unit @uv)
(session-id-from-request:authentication request)
?~ session-id sessions.authentication-state.state
%+ ~(jab by sessions.authentication-state.state)
u.session-id
|= =session
session(channels (~(put in channels.session) channel-id))
:: initialize sse heartbeat
::
=/ heartbeat-time=@da (add now ~s20)
@ -1559,50 +1588,10 @@
$(requests t.requests)
::
%delete
=/ unitsession
(~(get by session.channel-state.state) channel-id)
::
?~ unitsession
$(requests t.requests)
::
=/ session u.unitsession
=. session.channel-state.state
(~(del by session.channel-state.state) channel-id)
::
=^ moves state
(discard-channel channel-id |)
=. gall-moves
%+ weld gall-moves
::
:: produce a list of moves which cancels every gall subscription
::
%+ turn ~(tap by subscriptions.session)
|= [channel-wire=wire ship=@p app=term =path duc=^duct]
^- move
::
[duc %pass channel-wire [%g %deal [our ship] app %leave ~]]
::
?: ?=([%& *] state.session)
=. gall-moves
:_ gall-moves
::
^- move
?> ?=([%& *] state.session)
:^ duct.p.state.session %pass /channel/timeout/[channel-id]
[%b %rest date.p.state.session]
::
$(requests t.requests)
::
?> ?=([%| *] state.session)
=. duct-to-key.channel-state.state
(~(del by duct-to-key.channel-state.state) p.state.session)
::
?~ heartbeat.session $(requests t.requests)
=. gall-moves
%+ snoc gall-moves
%^ cancel-heartbeat-move
channel-id
date.u.heartbeat.session
duct.u.heartbeat.session
::
(weld gall-moves moves)
$(requests t.requests)
::
==
@ -1744,10 +1733,12 @@
channel(heartbeat (some [heartbeat-time duct]))
==
(snoc http-moves (set-heartbeat-move channel-id heartbeat-time))
:: +on-channel-timeout: we received a wake to clear an old session
:: +discard-channel: remove a channel from state
::
++ on-channel-timeout
|= channel-id=@t
:: cleans up state, timers, and gall subscriptions of the channel
::
++ discard-channel
|= [channel-id=@t expired=?]
^- [(list move) server-state]
::
=/ usession=(unit channel)
@ -1759,6 +1750,10 @@
:_ %_ state
session.channel-state
(~(del by session.channel-state.state) channel-id)
::
duct-to-key.channel-state
?. ?=(%| -.state.session) duct-to-key.channel-state.state
(~(del by duct-to-key.channel-state.state) p.state.session)
==
=/ heartbeat-cancel=(list move)
?~ heartbeat.session ~
@ -1767,7 +1762,13 @@
date.u.heartbeat.session
duct.u.heartbeat.session
==
=/ expire-cancel=(list move)
?: expired ~
?. ?=(%& -.state.session) ~
=, p.state.session
[(cancel-timeout-move channel-id date duct)]~
%+ weld heartbeat-cancel
%+ weld expire-cancel
:: produce a list of moves which cancels every gall subscription
::
%+ turn ~(tap by subscriptions.session)
@ -1845,7 +1846,9 @@
:: tough luck, we don't create/revive sessions here
::
no-op
:_ (~(put by sessions) u.session-id (add now session-timeout))
:_ %+ ~(jab by sessions) u.session-id
|= =session
session(expiry-time (add now session-timeout))
=- response-header.http-event(headers -)
%^ set-header:http 'set-cookie'
(session-cookie-string u.session-id &)
@ -2137,13 +2140,7 @@
[(zing (flop moves)) http-server-gate]
:: discard channel state, and cancel any active gall subscriptions
::
=^ mov server-state.ax (on-channel-timeout:by-channel channel-id)
:: cancel channel timer
::
=/ channel (~(got by session.channel-state) channel-id)
=? mov ?=([%& *] state.channel)
:_ mov
(cancel-timeout-move:by-channel channel-id p.state.channel)
=^ mov server-state.ax (discard-channel:by-channel channel-id |)
$(moves [mov moves], inactive t.inactive)
::
:: %vega: notifies us of a completed kernel upgrade
@ -2367,10 +2364,10 @@
?> ?=([%b %wake *] sign)
?^ error.sign
[[duct %slip %d %flog %crud %wake u.error.sign]~ http-server-gate]
=/ on-channel-timeout
on-channel-timeout:by-channel:(per-server-event event-args)
=/ discard-channel
discard-channel:by-channel:(per-server-event event-args)
=^ moves server-state.ax
(on-channel-timeout i.t.t.wire)
(discard-channel i.t.t.wire &)
[moves http-server-gate]
::
%heartbeat
@ -2402,11 +2399,9 @@
=* sessions sessions.authentication-state.server-state.ax
=. sessions.authentication-state.server-state.ax
%- ~(gas by *(map @uv session))
%+ murn ~(tap in sessions)
%+ skip ~(tap in sessions)
|= [cookie=@uv session]
^- (unit [@uv session])
?: (lth expiry-time now) ~
`[cookie expiry-time]
(lth expiry-time now)
:: if there's any cookies left, set a timer for the next expected expiry
::
^- [(list move) _http-server-gate]
@ -2438,7 +2433,18 @@
++ load
=> |%
+$ axle-2019-10-6
[date=%~2019.10.6 =server-state]
[date=%~2019.10.6 server-state=server-state-2019-10-6]
::
+$ server-state-2019-10-6
$: bindings=(list [=binding =duct =action])
connections=(map duct outstanding-connection)
authentication-state=sessions=(map @uv @da)
=channel-state
domains=(set turf)
=http-config
ports=[insecure=@ud secure=(unit @ud)]
outgoing-duct=duct
==
--
|= old=$%(axle axle-2019-10-6)
^+ ..^$

3
pkg/arvo/sys/zuse.hoon
View File

@ -1306,6 +1306,9 @@
:: to properly handle cookie expiration as a security mechanism.
::
expiry-time=@da
:: channels: channels opened by this session
::
channels=(set @t)
::
:: TODO: We should add a system for individual capabilities; we should
:: mint some sort of long lived cookie for mobile apps which only has

43
pkg/arvo/ted/test.hoon
View File

@ -73,43 +73,42 @@
=((end 3 5 a) 'test-')
::
++ find-test-files
=| fiz=(set [=spur test=(unit term)])
=| fiz=(set [=beam test=(unit term)])
=/ m (strand ,_fiz)
|= [bek=beak paz=(list path)]
|= bez=(list beam)
^- form:m
=* loop $
?~ paz
?~ bez
(pure:m fiz)
=/ xap=path (flop i.paz)
;< hav=? bind:m (check-for-file:strandio bek hoon+xap)
;< hav=? bind:m (check-for-file:strandio -.i.bez hoon+s.i.bez)
?: hav
loop(paz t.paz, fiz (~(put in fiz) [hoon+xap ~]))
;< fez=(list path) bind:m (list-tree:strandio bek xap)
loop(bez t.bez, fiz (~(put in fiz) [i.bez(s hoon+s.i.bez) ~]))
;< fez=(list path) bind:m (list-tree:strandio i.bez)
?. =(~ fez)
=/ foz (turn fez |=(path [(flop +<) ~]))
loop(paz t.paz, fiz (~(gas in fiz) foz))
~| bad-test-path+i.paz
=/ tex=term =-(?>(((sane %tas) -) -) (head xap))
=/ xup=path (tail xap)
;< hov=? bind:m (check-for-file:strandio bek hoon+xup)
=/ foz (turn fez |=(path [[-.i.bez (flop +<)] ~]))
loop(bez t.bez, fiz (~(gas in fiz) foz))
~| bad-test-beam+i.bez
=/ tex=term =-(?>(((sane %tas) -) -) (head s.i.bez))
=/ xup=path (tail s.i.bez)
;< hov=? bind:m (check-for-file:strandio i.bez(s hoon+xup))
?. hov
~|(no-tests-at-path+paz !!)
loop(paz t.paz, fiz (~(put in fiz) [hoon+xup `tex]))
~|(no-tests-at-path+i.bez !!)
loop(bez t.bez, fiz (~(put in fiz) [[-.i.bez hoon+xup] `tex]))
--
^- thread:spider
|= arg=vase
=/ m (strand ,vase)
^- form:m
=/ paz=(list path) (turn !<((list path) arg) |=(path [%tests +<]))
;< bek=beak bind:m get-beak:strandio
;< fiz=(set [=spur test=(unit term)]) bind:m (find-test-files bek paz)
=> .(fiz ~(tap in fiz))
=/ bez=(list beam)
(turn !<((list path) arg) |=(p=path (need (de-beam:format p))))
;< fiz=(set [=beam test=(unit term)]) bind:m (find-test-files bez)
=> .(fiz (sort ~(tap in fiz) aor))
=| test-arms=(map path (list test-arm))
|- ^- form:m
=* gather-tests $
?^ fiz
~> %slog.0^leaf+"test: building {(spud (flop spur.i.fiz))}"
;< cor=vase bind:m (build-file:strandio bek spur.i.fiz)
~> %slog.0^leaf+"test: building {(spud (flop s.beam.i.fiz))}"
;< cor=vase bind:m (build-file:strandio beam.i.fiz)
=/ arms=(list test-arm) (get-test-arms cor)
=? arms ?=(^ test.i.fiz)
|- ^+ arms
@ -117,7 +116,7 @@
?: =(name.i.arms u.test.i.fiz)
[i.arms]~
$(arms t.arms)
=. test-arms (~(put by test-arms) (flop (tail spur.i.fiz)) arms)
=. test-arms (~(put by test-arms) (flop (tail s.beam.i.fiz)) arms)
gather-tests(fiz t.fiz)
%- pure:m !> ^= ok
%+ roll (resolve-test-paths test-arms)

2
pkg/arvo/tests/sys/vane/clay.hoon
View File

@ -153,7 +153,7 @@
=/ [res=vase nub=state:ford:fusion] (build-file:ford /lib/strandio/hoon)
;: weld
%- expect
!>((slab %get-our -.res))
!>((slab %read %get-our -.res))
::
%+ expect-eq
!> %- ~(gas in *(set path))

6
pkg/interface/config/webpack.prod.js
View File

@ -11,7 +11,7 @@ module.exports = {
module: {
rules: [
{
test: /\.js?$/,
test: /\.(j|t)sx?$/,
use: {
loader: 'babel-loader',
options: {
@ -39,7 +39,7 @@ module.exports = {
]
},
resolve: {
extensions: ['.js']
extensions: ['.js', '.ts', '.tsx']
},
devtool: 'inline-source-map',
// devServer: {
@ -58,7 +58,7 @@ module.exports = {
output: {
filename: 'index.js',
chunkFilename: 'index.js',
path: path.resolve(urbitrc.URBIT_PIERS[0] + '/app/landscape/', 'js'),
path: path.resolve(__dirname, '../../arvo/app/landscape/js'),
publicPath: '/'
},
optimization: {

2
pkg/interface/dbug/src/js/views/eyre.js
View File

@ -146,7 +146,7 @@ export class Eyre extends Component {
const sessionItems = props.authentication.map(s => {
return (<div>
{`${s.cookie} expires ${msToDa(s.expiry)}`}
{`${s.cookie} expires ${msToDa(s.expiry)}, uses ${s.channels} channel(s)`}
</div>);
});

5
pkg/interface/src/apps/chat/components/lib/message.js
View File

@ -72,7 +72,7 @@ export class Message extends Component {
);
} else if ('url' in letter) {
let imgMatch =
/(jpg|img|png|gif|tiff|jpeg|JPG|IMG|PNG|TIFF|GIF|webp|WEBP|webm|WEBM|svg|SVG)$/
/(jpg|img|png|gif|tiff|jpeg|JPG|IMG|PNG|TIFF|GIF|webp|WEBP|svg|SVG)$/
.exec(letter.url);
const youTubeRegex = new RegExp(String(/(?:https?:\/\/(?:[a-z]+.)?)/.source) // protocol
+ /(?:youtu\.?be(?:\.com)?\/)(?:embed\/)?/.source // short and long-links
@ -88,7 +88,8 @@ export class Message extends Component {
src={letter.url}
style={{
height: 'min(250px, 20vh)',
maxWidth: '80vw'
maxWidth: 'calc(100% - 36px - 1.5rem)',
objectFit: 'contain'
}}
></img>
);

14
pkg/interface/src/apps/links/app.js
View File

@ -51,9 +51,18 @@ export class LinksApp extends Component {
const seen = props.linksSeen ? props.linksSeen : {};
const selectedGroups = props.selectedGroups ? props.selectedGroups : [];
const selGroupPaths = selectedGroups.map(g => g[0]);
const totalUnseen = _.reduce(
seen,
(acc, links) => acc + _.reduce(links, (total, hasSeen) => total + (hasSeen ? 0 : 1), 0),
links,
(acc, collection, path) => {
if(selGroupPaths.length > 0
&& !selGroupPaths.includes(associations.link?.[path]?.['group-path'])) {
return acc;
}
return acc + collection.unseenCount;
},
0
);
@ -65,7 +74,6 @@ export class LinksApp extends Component {
const invites = props.invites ?
props.invites : {};
const selectedGroups = props.selectedGroups ? props.selectedGroups : [];
const listening = props.linkListening;

2
pkg/urbit/configure vendored
View File

@ -2,7 +2,7 @@
set -e
URBIT_VERSION="0.10.5"
URBIT_VERSION="0.10.7"
deps=" \
curl gmp sigsegv argon2 ed25519 ent h2o scrypt sni uv murmur3 secp256k1 \

13
pkg/urbit/daemon/main.c
View File

@ -93,10 +93,11 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.tex = c3n;
u3_Host.ops_u.tra = c3n;
u3_Host.ops_u.veb = c3n;
u3_Host.ops_u.hap_w = 50000;
u3_Host.ops_u.kno_w = DefaultKernel;
while ( -1 != (ch_i=getopt(argc, argv,
"G:J:B:K:A:H:I:w:u:e:F:k:p:LljacdgqstvxPDRS")) )
"G:J:B:K:A:H:I:C:w:u:e:F:k:p:LljacdgqstvxPDRS")) )
{
switch ( ch_i ) {
case 'J': {
@ -123,6 +124,12 @@ _main_getopt(c3_i argc, c3_c** argv)
u3_Host.ops_u.jin_c = strdup(optarg);
break;
}
case 'C': {
if ( c3n == _main_readw(optarg, 1000000000, &u3_Host.ops_u.hap_w) ) {
return c3n;
}
break;
}
case 'e': {
u3_Host.ops_u.eth_c = strdup(optarg);
break;
@ -367,9 +374,9 @@ u3_ve_usage(c3_i argc, c3_c** argv)
"where ship_name is a @p phonetic representation of an urbit address\n",
"without the leading '~', and options is some subset of the following:\n",
"\n",
// XX find a way to re-enable
// "-A dir Use dir for initial galaxy sync\n",
"-A dir Use dir for initial clay sync\n",
"-B pill Bootstrap from this pill\n",
"-C limit Set memo cache max size; 0 means uncapped\n",
"-c pier Create a new urbit in pier/\n",
"-D Recompute from events\n",
"-d Daemon mode; implies -t\n",

18
pkg/urbit/include/noun/allocate.h
View File

@ -465,6 +465,24 @@
c3_w
u3a_mark_road(FILE* fil_u);
/* u3a_count_noun(): count size of noun.
*/
c3_w
u3a_count_noun(u3_noun som);
/* u3a_discount_noun(): clean up after counting a noun.
*/
c3_w
u3a_discount_noun(u3_noun som);
/* u3a_count_ptr(): count a pointer for gc. Produce size. */
c3_w
u3a_count_ptr(void* ptr_v);
/* u3a_discount_ptr(): discount a pointer for gc. Produce size. */
c3_w
u3a_discount_ptr(void* ptr_v);
/* u3a_idle(): measure free-lists in [rod_u]
*/
c3_w

10
pkg/urbit/include/noun/hashtable.h
View File

@ -139,6 +139,16 @@
c3_w
u3h_mark(u3p(u3h_root) har_p);
/* u3h_count(): count hashtable for gc.
*/
c3_w
u3h_count(u3p(u3h_root) har_p);
/* u3h_discount(): discount hashtable for gc.
*/
c3_w
u3h_discount(u3p(u3h_root) har_p);
/* u3h_walk_with(): traverse hashtable with key, value fn and data
* argument; RETAINS.
*/

1
pkg/urbit/include/vere/vere.h
View File

@ -559,6 +559,7 @@
c3_o gab; // -g, test garbage collection
c3_c* dns_c; // -H, ames bootstrap domain
c3_c* jin_c; // -I, inject raw event
c3_w hap_w; // -C, cap memo cache
c3_c* lit_c; // -J, ivory (fastboot) kernel
c3_o tra; // -j, json trace
c3_w kno_w; // -K, kernel version

31
pkg/urbit/jets/e/jam.c
View File

@ -6,6 +6,37 @@
u3_noun
u3qe_jam(u3_atom a)
{
#if 0
if (c3y == u3du(a) && 1337 == u3h(a)) {
c3_w siz_w, tot_w = 0;
u3_noun som;
for ( som = u3t(a); c3y == u3du(som); som = u3t(som) ) {
siz_w = u3a_count_noun(u3h(som));
tot_w += siz_w;
if ( 0 == siz_w ) {
u3l_log("item: B/0\r\n");
}
else {
u3a_print_memory(stderr, "item", siz_w);
}
}
if ( u3_blip != som ) {
u3l_log("forgot to terminate list!\r\n");
}
c3_w mem_w = u3h_count(u3R->cax.har_p);
for ( som = u3t(a); c3y == u3du(som); som = u3t(som) ) u3a_discount_noun(u3h(som));
u3h_discount(u3R->cax.har_p);
u3a_print_memory(stderr, "total", tot_w);
u3a_print_memory(stderr, "memoization cache", mem_w);
u3h_root* har_u = u3to(u3h_root, u3R->cax.har_p);
u3l_log("memoization entries: %d\r\n", har_u->use_w);
u3a_print_memory(stderr, "unused free", u3a_open(u3R));
return tot_w;
}
#endif
c3_w bit_w, *sal_w;
c3_w* wor_w = u3s_jam_fib(a, &bit_w);
c3_w len_w = bit_w >> 5;

34
pkg/urbit/jets/f/ut_fond.c
View File

@ -1,34 +0,0 @@
/* j/6/find.c
**
*/
#include "all.h"
u3_noun
u3wfu_fond(u3_noun cor)
{
u3_noun sut, way, hyp, van;
if ( (c3n == u3r_mean(cor, u3x_sam_2, &way,
u3x_sam_3, &hyp,
u3x_con, &van,
0)) ||
(u3_none == (sut = u3r_at(u3x_sam, van))) )
{
return u3m_bail(c3__fail);
}
else {
c3_m fun_m = 141 + c3__fond + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun key = u3z_key_3(fun_m, sut, way, hyp);
u3_weak pro = u3z_find(key);
if ( u3_none != pro ) {
u3z(key);
return pro;
}
else {
pro = u3n_nock_on(u3k(cor), u3k(u3x_at(u3x_bat, cor)));
return u3z_save(key, pro);
}
}
}

34
pkg/urbit/jets/f/ut_peek.c
View File

@ -1,34 +0,0 @@
/* j/6/peek.c
**
*/
#include "all.h"
u3_noun
u3wfu_peek(u3_noun cor)
{
u3_noun sut, way, axe, van;
if ( (c3n == u3r_mean(cor, u3x_sam_2, &way,
u3x_sam_3, &axe,
u3x_con, &van,
0)) ||
(c3n == u3ud(axe)) ||
(u3_none == (sut = u3r_at(u3x_sam, van))) )
{
return u3m_bail(c3__fail);
}
else {
c3_m fun_m = 141 + c3__peek + ((!!u3r_at(u3qfu_van_vet, van)) << 8);
u3_noun key = u3z_key_3(fun_m, sut, way, axe);
u3_weak pro = u3z_find(key);
if ( u3_none != pro ) {
u3z(key);
return pro;
}
else {
pro = u3n_nock_on(u3k(cor), u3k(u3x_at(u3x_bat, cor)));
return u3z_save(key, pro);
}
}
}

31
pkg/urbit/jets/f/ut_play.c
View File

@ -1,31 +0,0 @@
/* j/6/play.c
**
*/
#include "all.h"
u3_noun
u3wfu_play(u3_noun cor)
{
u3_noun sut, gen, van;
if ( (c3n == u3r_mean(cor, u3x_sam, &gen, u3x_con, &van, 0)) ||
(u3_none == (sut = u3r_at(u3x_sam, van))) )
{
return u3m_bail(c3__fail);
}
else {
c3_m fun_m = 141 + c3__play;
u3_noun vrf = u3r_at(u3qfu_van_vrf, van);
u3_noun key = u3z_key_3(fun_m, vrf, sut, gen);
u3_weak pro = u3z_find(key);
if ( u3_none != pro ) {
u3z(key);
return pro;
}
else {
pro = u3n_nock_on(u3k(cor), u3k(u3x_at(u3x_bat, cor)));
return u3z_save(key, pro);
}
}
}

18
pkg/urbit/jets/tree.c
View File

@ -477,11 +477,6 @@ static c3_c* _141_pen_loot_ha[] = {
"d83e5e47f712870aba815d79943d287cbefdc00640409464b30bf755115d4a1a",
0
};
static u3j_harm _141_pen__ut_fond_a[] = {{".2", u3wfu_fond}, {}};
static c3_c* _141_pen__ut_fond_ha[] = {
"0da0cc79c938eb06515a5cc24a17b82cd60a50c0f1a02e2c68e5d1cf71c96054",
0
};
static u3j_harm _141_pen__ut_fish_a[] = {{".2", u3wfu_fish}, {}};
static c3_c* _141_pen__ut_fish_ha[] = {
"2fd315436f48351002d9aa8c137649ca95b01fd57dba09db53d7235f84a284bf",
@ -516,16 +511,6 @@ static c3_c* _141_pen_loot_ha[] = {
{ "nest-in", 7, 0, _141_pen__ut_nest_in_d, _141_pen__ut_nest_in_ha },
{}
};
static u3j_harm _141_pen__ut_peek_a[] = {{".2", u3wfu_peek}, {}};
static c3_c* _141_pen__ut_peek_ha[] = {
"904ff7359e89d1886f884c4409f104269cdb8dfb4683f116ff00bc98a4720df7",
0
};
static u3j_harm _141_pen__ut_play_a[] = {{".2", u3wfu_play}, {}};
static c3_c* _141_pen__ut_play_ha[] = {
"bdc5c072632f7133b4c64c465b1b214d7465b0c1163842b121b7369aba1b9b03",
0
};
static u3j_harm _141_pen__ut_rest_a[] = {{".2", u3wfu_rest}, {}};
static c3_c* _141_pen__ut_rest_ha[] = {
"2e2d15f3efca0a4bf8ce08cca48c54d1d5a7204e2b0525137f59c3e7b037d2fd",
@ -535,14 +520,11 @@ static c3_c* _141_pen_loot_ha[] = {
static u3j_core _141_pen__ut_d[] =
{
{ "crop", 7, _141_pen__ut_crop_a, 0, _141_pen__ut_crop_ha },
{ "fond", 7, _141_pen__ut_fond_a, 0, _141_pen__ut_fond_ha },
{ "fish", 7, _141_pen__ut_fish_a, 0, _141_pen__ut_fish_ha },
{ "fuse", 7, _141_pen__ut_fuse_a, 0, _141_pen__ut_fuse_ha },
{ "mint", 7, _141_pen__ut_mint_a, 0, _141_pen__ut_mint_ha },
{ "mull", 7, _141_pen__ut_mull_a, 0, _141_pen__ut_mull_ha },
{ "nest", 7, 0, _141_pen__ut_nest_d, _141_pen__ut_nest_ha },
{ "peek", 7, _141_pen__ut_peek_a, 0, _141_pen__ut_peek_ha },
{ "play", 7, _141_pen__ut_play_a, 0, _141_pen__ut_play_ha },
{ "rest", 7, _141_pen__ut_rest_a, 0, _141_pen__ut_rest_ha },
{}
};

150
pkg/urbit/noun/allocate.c
View File

@ -1721,6 +1721,156 @@ u3a_mark_noun(u3_noun som)
}
}
/* u3a_count_noun(): count size of pointer.
*/
c3_w
u3a_count_ptr(void* ptr_v)
{
if ( _(u3a_is_north(u3R)) ) {
if ( !((ptr_v >= u3a_into(u3R->rut_p)) &&
(ptr_v < u3a_into(u3R->hat_p))) )
{
return 0;
}
}
else {
if ( !((ptr_v >= u3a_into(u3R->hat_p)) &&
(ptr_v < u3a_into(u3R->rut_p))) )
{
return 0;
}
}
{
u3a_box* box_u = u3a_botox(ptr_v);
c3_w siz_w;
c3_ws use_ws = (c3_ws)box_u->use_w;
if ( use_ws == 0 ) {
fprintf(stderr, "%p is bogus\r\n", ptr_v);
siz_w = 0;
}
else {
c3_assert(use_ws != 0);
if ( use_ws < 0 ) {
siz_w = 0;
}
else {
use_ws = -use_ws;
siz_w = box_u->siz_w;
}
box_u->use_w = (c3_w)use_ws;
}
return siz_w;
}
}
/* u3a_count_noun(): count size of noun.
*/
c3_w
u3a_count_noun(u3_noun som)
{
c3_w siz_w = 0;
while ( 1 ) {
if ( _(u3a_is_senior(u3R, som)) ) {
return siz_w;
}
else {
c3_w* dog_w = u3a_to_ptr(som);
c3_w new_w = u3a_count_ptr(dog_w);
if ( 0 == new_w ) {
return siz_w;
}
else {
siz_w += new_w;
if ( _(u3du(som)) ) {
siz_w += u3a_count_noun(u3h(som));
som = u3t(som);
}
else return siz_w;
}
}
}
}
/* u3a_discount_ptr(): clean up after counting a pointer.
*/
c3_w
u3a_discount_ptr(void* ptr_v)
{
if ( _(u3a_is_north(u3R)) ) {
if ( !((ptr_v >= u3a_into(u3R->rut_p)) &&
(ptr_v < u3a_into(u3R->hat_p))) )
{
return 0;
}
}
else {
if ( !((ptr_v >= u3a_into(u3R->hat_p)) &&
(ptr_v < u3a_into(u3R->rut_p))) )
{
return 0;
}
}
u3a_box* box_u = u3a_botox(ptr_v);
c3_w siz_w;
c3_ws use_ws = (c3_ws)box_u->use_w;
if ( use_ws == 0 ) {
fprintf(stderr, "%p is bogus\r\n", ptr_v);
siz_w = 0;
}
else {
c3_assert(use_ws != 0);
if ( use_ws < 0 ) {
use_ws = -use_ws;
siz_w = box_u->siz_w;
}
else {
siz_w = 0;
}
box_u->use_w = (c3_w)use_ws;
}
return siz_w;
}
/* u3a_discount_noun(): clean up after counting a noun.
*/
c3_w
u3a_discount_noun(u3_noun som)
{
c3_w siz_w = 0;
while ( 1 ) {
if ( _(u3a_is_senior(u3R, som)) ) {
return siz_w;
}
else {
c3_w* dog_w = u3a_to_ptr(som);
c3_w new_w = u3a_discount_ptr(dog_w);
if ( 0 == new_w ) {
return siz_w;
}
else {
siz_w += new_w;
if ( _(u3du(som)) ) {
siz_w += u3a_discount_noun(u3h(som));
som = u3t(som);
}
else return siz_w;
}
}
}
}
/* u3a_print_memory: print memory amount.
*/
void

160
pkg/urbit/noun/hashtable.c
View File

@ -941,3 +941,163 @@ u3h_mark(u3p(u3h_root) har_p)
return tot_w;
}
/* _ch_count_buck(): count bucket for gc.
*/
c3_w
_ch_count_buck(u3h_buck* hab_u)
{
c3_w tot_w = 0;
c3_w i_w;
for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) {
tot_w += u3a_count_noun(u3h_slot_to_noun(hab_u->sot_w[i_w]));
}
tot_w += u3a_count_ptr(hab_u);
return tot_w;
}
/* _ch_count_node(): count node for gc.
*/
c3_w
_ch_count_node(u3h_node* han_u, c3_w lef_w)
{
c3_w tot_w = 0;
c3_w len_w = _ch_popcount(han_u->map_w);
c3_w i_w;
lef_w -= 5;
for ( i_w = 0; i_w < len_w; i_w++ ) {
c3_w sot_w = han_u->sot_w[i_w];
if ( _(u3h_slot_is_noun(sot_w)) ) {
u3_noun kev = u3h_slot_to_noun(sot_w);
tot_w += u3a_count_noun(kev);
}
else {
void* hav_v = u3h_slot_to_node(sot_w);
if ( 0 == lef_w ) {
tot_w += _ch_count_buck(hav_v);
} else {
tot_w += _ch_count_node(hav_v, lef_w);
}
}
}
tot_w += u3a_count_ptr(han_u);
return tot_w;
}
/* u3h_count(): count hashtable for gc.
*/
c3_w
u3h_count(u3p(u3h_root) har_p)
{
c3_w tot_w = 0;
u3h_root* har_u = u3to(u3h_root, har_p);
c3_w i_w;
for ( i_w = 0; i_w < 64; i_w++ ) {
c3_w sot_w = har_u->sot_w[i_w];
if ( _(u3h_slot_is_noun(sot_w)) ) {
u3_noun kev = u3h_slot_to_noun(sot_w);
tot_w += u3a_count_noun(kev);
}
else if ( _(u3h_slot_is_node(sot_w)) ) {
u3h_node* han_u = u3h_slot_to_node(sot_w);
tot_w += _ch_count_node(han_u, 25);
}
}
tot_w += u3a_count_ptr(har_u);
return tot_w;
}
/* _ch_discount_buck(): discount bucket for gc.
*/
c3_w
_ch_discount_buck(u3h_buck* hab_u)
{
c3_w tot_w = 0;
c3_w i_w;
for ( i_w = 0; i_w < hab_u->len_w; i_w++ ) {
tot_w += u3a_discount_noun(u3h_slot_to_noun(hab_u->sot_w[i_w]));
}
tot_w += u3a_discount_ptr(hab_u);
return tot_w;
}
/* _ch_discount_node(): discount node for gc.
*/
c3_w
_ch_discount_node(u3h_node* han_u, c3_w lef_w)
{
c3_w tot_w = 0;
c3_w len_w = _ch_popcount(han_u->map_w);
c3_w i_w;
lef_w -= 5;
for ( i_w = 0; i_w < len_w; i_w++ ) {
c3_w sot_w = han_u->sot_w[i_w];
if ( _(u3h_slot_is_noun(sot_w)) ) {
u3_noun kev = u3h_slot_to_noun(sot_w);
tot_w += u3a_discount_noun(kev);
}
else {
void* hav_v = u3h_slot_to_node(sot_w);
if ( 0 == lef_w ) {
tot_w += _ch_discount_buck(hav_v);
} else {
tot_w += _ch_discount_node(hav_v, lef_w);
}
}
}
tot_w += u3a_discount_ptr(han_u);
return tot_w;
}
/* u3h_discount(): discount hashtable for gc.
*/
c3_w
u3h_discount(u3p(u3h_root) har_p)
{
c3_w tot_w = 0;
u3h_root* har_u = u3to(u3h_root, har_p);
c3_w i_w;
for ( i_w = 0; i_w < 64; i_w++ ) {
c3_w sot_w = har_u->sot_w[i_w];
if ( _(u3h_slot_is_noun(sot_w)) ) {
u3_noun kev = u3h_slot_to_noun(sot_w);
tot_w += u3a_discount_noun(kev);
}
else if ( _(u3h_slot_is_node(sot_w)) ) {
u3h_node* han_u = u3h_slot_to_node(sot_w);
tot_w += _ch_discount_node(han_u, 25);
}
}
tot_w += u3a_discount_ptr(har_u);
return tot_w;
}

3
pkg/urbit/noun/manage.c
View File

@ -10,6 +10,7 @@
#include <openssl/crypto.h>
#include "all.h"
#include "vere/vere.h"
// XX stack-overflow recovery should be gated by -a
//
@ -496,7 +497,7 @@ _pave_south(c3_w* mem_w, c3_w siz_w, c3_w len_w)
static void
_pave_parts(void)
{
u3R->cax.har_p = u3h_new();
u3R->cax.har_p = u3h_new_cache(u3_Host.ops_u.hap_w);
u3R->jed.war_p = u3h_new();
u3R->jed.cod_p = u3h_new();
u3R->jed.han_p = u3h_new();

7
pkg/urbit/vere/pier.c
View File

@ -1039,11 +1039,12 @@ _pier_work_create(u3_pier* pir_u)
/* spawn new process and connect to it
*/
{
c3_c* arg_c[5];
c3_c* arg_c[6];
c3_c* bin_c = u3_Host.wrk_c;
c3_c* pax_c = pir_u->pax_c;
c3_c key_c[256];
c3_c wag_c[11];
c3_c hap_c[11];
c3_i err_i;
sprintf(key_c, "%" PRIx64 ":%" PRIx64 ":%" PRIx64 ":%" PRIx64 "",
@ -1053,12 +1054,14 @@ _pier_work_create(u3_pier* pir_u)
pir_u->key_d[3]);
sprintf(wag_c, "%u", pir_u->wag_w);
sprintf(hap_c, "%u", u3_Host.ops_u.hap_w);
arg_c[0] = bin_c; // executable
arg_c[1] = pax_c; // path to checkpoint directory
arg_c[2] = key_c; // disk key
arg_c[3] = wag_c; // runtime config
arg_c[4] = 0;
arg_c[4] = hap_c; // hash table size
arg_c[5] = 0;
uv_pipe_init(u3L, &god_u->inn_u.pyp_u, 0);
uv_pipe_init(u3L, &god_u->out_u.pyp_u, 0);

4
pkg/urbit/worker/main.c
View File

@ -1015,8 +1015,9 @@ main(c3_i argc, c3_c* argv[])
c3_c* dir_c = argv[1];
c3_c* key_c = argv[2];
c3_c* wag_c = argv[3];
c3_c* hap_c = argv[4];
c3_assert(4 == argc);
c3_assert(5 == argc);
memset(&u3V, 0, sizeof(u3V));
memset(&u3_Host.tra_u, 0, sizeof(u3_Host.tra_u));
@ -1035,6 +1036,7 @@ main(c3_i argc, c3_c* argv[])
*/
{
sscanf(wag_c, "%" SCNu32, &u3C.wag_w);
sscanf(hap_c, "%" SCNu32, &u3_Host.ops_u.hap_w);
}
/* load pier directory