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

Merge remote-tracking branch 'origin/release-candidate' into lighter-than-eyre

Browse Source
This commit is contained in:
Elliot Glaysher 2019-01-07 14:15:44 -08:00
commit ecba9cbd62
6 changed files with 20 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -46,12 +46,7 @@ addons:
- openssl - openssl
- libssl-dev - libssl-dev
- libncurses5-dev - libncurses5-dev
- automake - gcc
- autoconf
- make
- libtool
- g++
- re2c
- libcurl4-gnutls-dev - libcurl4-gnutls-dev
- unzip - unzip
- gdb - gdb

4
app/dojo.hoon
View File

@ -1622,7 +1622,7 @@
(he-diff %tan u.p.cit) (he-diff %tan u.p.cit)
:: ::
++ he-lens ++ he-lens
|= com/command:^^lens |= com/command:lens
^+ +> ^+ +>
=+ ^- source/dojo-source =+ ^- source/dojo-source
=| num/@ =| num/@
@ -1812,7 +1812,7 @@
(wrap he-type):arm (wrap he-type):arm
:: ::
++ poke-lens-command ++ poke-lens-command
|= com/command:^^lens ~| poke-lens+com %. com |= com/command:lens ~| poke-lens+com %. com
(wrap he-lens):arm (wrap he-lens):arm
:: ::
++ poke-json ++ poke-json

4
mar/lens/command.hoon
View File

@ -16,7 +16,7 @@
=, dejs-soft:format =, dejs-soft:format
|% |%
++ source ++ source
^- $-(^^json (unit source:^^lens)) ^- $-(^^json (unit source:lens))
|= jon/^^json |= jon/^^json
=+ tuple=%.(jon (ar source)) =+ tuple=%.(jon (ar source))
?^ tuple ?^ tuple
@ -40,7 +40,7 @@
== ==
++ none |=(^^json (some ~)) ++ none |=(^^json (some ~))
++ sink ++ sink
^- $-(^^json (unit sink:^^lens)) ^- $-(^^json (unit sink:lens))
%- of :~ %- of :~
stdout+none stdout+none
output-file+so output-file+so

19
sys/arvo.hoon
View File

@ -32,12 +32,9 @@
{$ud p/@ud} :: sequence {$ud p/@ud} :: sequence
== :: == ::
++ desk @tas :: ship desk case spur ++ desk @tas :: ship desk case spur
++ dock (pair @p term) :: message target
++ cage (cask vase) :: global metadata ++ cage (cask vase) :: global metadata
++ cask |*(a/mold (pair mark a)) :: global data ++ cask |*(a/mold (pair mark a)) :: global data
++ cuff :: permissions
$: p/(unit (set monk)) :: can be read by
q/(set monk) :: caused or created by
== ::
++ curd {p/@tas q/*} :: typeless card ++ curd {p/@tas q/*} :: typeless card
++ duct (list wire) :: causal history ++ duct (list wire) :: causal history
++ hypo |*(a/mold (pair type a)) :: type associated ++ hypo |*(a/mold (pair type a)) :: type associated
@ -46,20 +43,6 @@
== :: == ::
a :: a ::
== :: == ::
++ kirk (unit (set monk)) :: audience
++ lens :: observation core
$_ ^? ::
|% ++ u *(unit (unit $~)) :: existence
++ v *(unit (unit cage)) :: full history
++ w *(unit (unit (unit cage))) :: latest diff
++ x *(unit (unit cage)) :: data at path
++ y *(unit (unit arch)) :: directory
++ z *(unit (unit cage)) :: current subtree
-- ::
++ marc :: structured mark
$@ mark :: plain mark
$% {$tabl p/(list (pair marc marc))} :: map
== ::
++ mark @tas :: content type ++ mark @tas :: content type
++ mash |=(* (mass +<)) :: producing mass ++ mash |=(* (mass +<)) :: producing mass
++ mass $~ [%$ [%& ~]] :: memory usage ++ mass $~ [%$ [%& ~]] :: memory usage

64
sys/hoon.hoon
View File

@ -14078,84 +14078,20 @@
:: ::
:::: 5f: molds and mold builders :::: 5f: molds and mold builders
:: ::
++ arch {fil/(unit @uvI) dir/(map @ta ~)} :: fundamental node
++ arvo (wind {p/term q/mill} mill) :: arvo card
++ beak {p/ship q/desk r/case} :: path prefix
++ beam {{p/ship q/desk r/case} s/spur} :: global name
++ bone @ud :: opaque duct
++ case :: version
$% {$da p/@da} :: date
{$tas p/@tas} :: label
{$ud p/@ud} :: sequence
== ::
++ desk @tas :: ship desk case spur
++ cage (cask vase) :: global metadata
++ cask |*(a/mold (pair mark a)) :: global data
++ cuff :: permissions
$: p/(unit (set monk)) :: can be read by
q/(set monk) :: caused or created by
== ::
++ curd {p/@tas q/*} :: typeless card
++ dock (pair @p term) :: message target
++ duct (list wire) :: causal history
++ hypo |*(a/mold (pair type a)) :: type associated
++ hobo |* a/gate :: task wrapper
$? $% {$soft p/*} ::
== ::
a ::
== ::
++ kirk (unit (set monk)) :: audience
++ lens :: observation core
$_ ^? ::
|% ++ u *(unit (unit ~)) :: existence
++ v *(unit (unit cage)) :: full history
++ w *(unit (unit (unit cage))) :: latest diff
++ x *(unit (unit cage)) :: data at path
++ y *(unit (unit arch)) :: directory
++ z *(unit (unit cage)) :: current subtree
-- ::
++ mane $@(@tas {@tas @tas}) :: XML name+space ++ mane $@(@tas {@tas @tas}) :: XML name+space
++ manx $~([[%$ ~] ~] {g/marx c/marl}) :: dynamic XML node ++ manx $~([[%$ ~] ~] {g/marx c/marl}) :: dynamic XML node
++ marc :: structured mark
$@ mark :: plain mark
$% {$tabl p/(list (pair marc marc))} :: map
== ::
++ mark @tas :: content type
++ marl (list manx) :: XML node list ++ marl (list manx) :: XML node list
++ mars {t/{n/$$ a/{i/{n/$$ v/tape} t/~}} c/~} :: XML cdata ++ mars {t/{n/$$ a/{i/{n/$$ v/tape} t/~}} c/~} :: XML cdata
++ mart (list {n/mane v/tape}) :: XML attributes ++ mart (list {n/mane v/tape}) :: XML attributes
++ marx $~([%$ ~] {n/mane a/mart}) :: dynamic XML tag ++ marx $~([%$ ~] {n/mane a/mart}) :: dynamic XML tag
++ mash |=(* (mass +<)) :: producing mass
++ mass (pair cord (each noun (list mash))) :: memory usage
++ mill (each vase milt) :: vase+metavase
++ milt {p/* q/*} :: metavase
++ mite (list @ta) :: mime type ++ mite (list @ta) :: mime type
++ monk (each ship {p/@tas q/@ta}) :: general identity ++ monk (each ship {p/@tas q/@ta}) :: general identity
++ muse {p/@tas q/duct r/arvo} :: sourced move
++ move {p/duct q/arvo} :: arvo move
++ ovum {p/wire q/curd} :: typeless ovum
++ pane (list {p/@tas q/vase}) :: kernel modules
++ pass @ :: public key ++ pass @ :: public key
++ pone (list {p/@tas q/vise}) :: kernel modules old
++ ring @ :: private key ++ ring @ :: private key
++ ship @p :: network identity ++ ship @p :: network identity
++ shop (each ship (list @ta)) :: urbit/dns identity ++ shop (each ship (list @ta)) :: urbit/dns identity
++ sink (trel bone ship path) :: subscription
++ spur path :: ship desk case spur ++ spur path :: ship desk case spur
++ time @da :: galactic time ++ time @da :: galactic time
++ vile :: reflexive constants
$: typ/type :: -:!>(*type)
duc/type :: -:!>(*duct)
pah/type :: -:!>(*path)
mev/type :: -:!>([%meta *vase])
== ::
++ wind :: new kernel action
|* {a/gate b/gate} :: forward+reverse
$% {$pass p/path q/a} :: advance
{$slip p/a} :: lateral
{$give p/b} :: retreat
== ::
++ wire path :: event pretext
:: ::
:::: 5g: profiling support (XX move) :::: 5g: profiling support (XX move)
:: ::

18
sys/vane/behn.hoon
View File

@ -86,9 +86,8 @@
:~ timers+[%& timers] :~ timers+[%& timers]
== ==
== ==
:: reverse moves, since they were constructed backward, and return
:: ::
[(flop moves) ..^^$] [moves ..^^$]
:: +set-timer: set a timer, maintaining the sort order of the :timers list :: +set-timer: set a timer, maintaining the sort order of the :timers list
:: ::
++ set-timer ++ set-timer
@ -118,15 +117,18 @@
[i.timers $(timers t.timers)] [i.timers $(timers t.timers)]
:: +notify-clients: wake up vanes whose timers have expired :: +notify-clients: wake up vanes whose timers have expired
:: ::
:: When we return the list moves to clients, we flop them so they're in
:: the same order as they were in :timers.
::
++ notify-clients ++ notify-clients
=| moves=(list move) =| moves=(list move)
|- ^+ [moves timers] |- ^+ [moves timers]
:: ::
?~ timers ?~ timers
[moves timers] [(flop moves) timers]
:: ::
?: (gth date.i.timers now) ?: (gth date.i.timers now)
[moves timers] [(flop moves) timers]
:: ::
%_ $ %_ $
timers t.timers timers t.timers
@ -134,6 +136,14 @@
== ==
:: +set-wake: set or unset a unix timer to wake us when next timer expires :: +set-wake: set or unset a unix timer to wake us when next timer expires
:: ::
:: We prepend the unix %doze event so that it is handled first. Arvo must
:: handle this first because the moves %behn emits will get handled in
:: depth-first order. If we're handling a %wake which causes a move to a
:: different vane and a %doze event to send to unix, Arvo needs to process
:: the %doze first because otherwise if the move to the other vane calls
:: back into %behn and emits a second %doze, the second %doze would be
:: handled by unix first which is incorrect.
::
++ set-wake ++ set-wake
|= moves=(list move) |= moves=(list move)
^+ [moves state] ^+ [moves state]