From deff75f7f8c9e433ef29c7b51941618f9d549f6d Mon Sep 17 00:00:00 2001 From: chc4 Date: Sat, 9 May 2015 15:12:43 -0400 Subject: [PATCH 1/6] half-update readme Update a good portion of the readme, since the old one was horribly out of date and from 2013. I manually changed the path and ship name to match the old one, which might not have been the correct thing to do. It still needs a bit of work to make all the information correct. --- README.markdown | 189 +++++++++++++++++++++++++++++------------------- 1 file changed, 116 insertions(+), 73 deletions(-) diff --git a/README.markdown b/README.markdown index 0f02a0a80..d060900d3 100644 --- a/README.markdown +++ b/README.markdown @@ -96,33 +96,50 @@ or _ships_. When you run `bin/vere -c`, it automatically creates a 128-bit ship First you'll see a string of messages like: - vere: urbit home is /Users/cyarvin/Documents/src/u3/urb - loom: mapped 1024MB - time: ~2013.9.1..03.57.11..4935 - ames: on localhost, UDP 63908. + vere: urbit home is mypier + vere: hostname is cyarvin + loom: mapped 2048MB + boot: installed 190 jets + boot: loading /home/cyarvin/urbit/urb/urbit.pill + cv_make: loaded pill /home/cyarvin/urbit/urb/urbit.pill, as 8ddffb8 + cv_make: kernel 12e1ffdf, core 23b73cd + cv_jack: activating kernel 12e1ffdf + %post-start + cv_jack: activated + cv_start: time: ~2015.5.9..18.03.32..ba77 + +Next vere will generate a 2048 RSA key that will be used as your identity: + generating 2048-bit RSA pair... and then it'll pause a little, 'cause this is slow, and then - saving passcode in /Users/cyarvin/.urbit/~magsut-hopful.txt + saving passcode in sub/.urb/code.~malmel-ridnep (for real security, write it down and delete the file...) and, then, if the network gods are happy, your submarine will start pulling down Arvo files: - + /~machec-binnev-dordeb-sogduc--dosmul-sarrum-faplec-nidted/main/1/bin/ticket/hoon - + /~machec-binnev-dordeb-sogduc--dosmul-sarrum-faplec-nidted/main/1/bin/reset/hoon - + /~machec-binnev-dordeb-sogduc--dosmul-sarrum-faplec-nidted/main/1/bin/ye/hoon - + /~machec-binnev-dordeb-sogduc--dosmul-sarrum-faplec-nidted/main/1/bin/ls/hoon + [%bos ~zod ~hinfet-rovler-labheb-laddev--ladner-pillur-divmun-tamfur] + [%behn-init ~hinfet-rovler-labheb-laddev--ladner-pillur-divmun-tamfur] + ames: czar zod.urbit.org: ip .192.241.195.84 + kick: init: ~hinfet-rovler-labheb-laddev--ladner-pillur-divmun-tamfur + ames: on localhost, UDP 55659. + http: live (insecure) on 8081 + http: live ("secure") on 8444 + term: live on 10024 + ; ~zod |Tianming| is your neighbor + ; ~zod |Tianming| is your neighbor + -and the like. You'll see a couple pages of this stuff. Don't worry too much -about the details right now. Finally, you'll get the Arvo shell prompt (which -is also a Hoon REPL): +You will probably be stuck here for a while as your local submarine copies all of its files from the master carrier, `~zod`. This is normal. - ~machec-binnev-dordeb-sogduc--dosmul-sarrum-faplec-nidted/try=> +Once that is finished, you will be dropped into the main application, the `+dojo` shell (which is coincidentally also a Hoon REPL): + + ~hinfet-rovler-labheb-laddev--ladner-pillur-divmun-tamfur:dojo> If you would like to safely bring this ship back into port (End the Unix process), -just enter Control-D. +just enter Control-V to switch to the task manager, then Control-D. To re-launch your pier after creation run `bin/vere mypier` (exclude the `-c`) @@ -151,19 +168,18 @@ Let's say one of your ships is `~waclux-tomwyc` and its ticket is rendered in Hoon's syllabic base, `@p`.) A new life awaits you on the off-world colonies! To begin, just -type at the submarine prompt: +type at the `+dojo` prompt: - :begin ~waclux-tomwyc + :helm?begin -and follow the directions. When the script completes, hit return -and you'll be the `~waclux-tomwyc` you wanted to be. Now, when other user's see you in chat or look at your -Urbit social profile (a fasplan), they can learn whatever information you gave the :begin process. +and enter your ship name and ticket when prompted. When the script completes, hit return +and you'll begin re-cloning the files from `~zod` needed to boot the destroyer, after which you will become the `~waclux-tomwyc` you wanted to be. ###5. Play with Arvo If all went well, you now have a nice short prompt: - ~waclux-tomwyc/try=> + ~waclux-tomwyc:dojo> If all did not go well (send us another email), or you're just too impatient to wait for your destroyer, you have a big long @@ -175,29 +191,30 @@ exercises will still work. Let's try a few quick things to stretch your fingers. Type these command lines and you should see the matching results: - ~waclux-tomwyc/try=> "hello, world" + ~waclux-tomwyc:dojo> "hello, world" "hello, world" - - ~waclux-tomwyc/try=> (add 2 2) + + ~waclux-tomwyc:dojo> (add 2 2) 4 - ~waclux-tomwyc/try=> :hello %world - "hello, world." + ~waclux-tomwyc:dojo> +hello %world + 'hello, dlrow' - ~waclux-tomwyc/try=> :cat /=main=/bin/hello/hoon + ~waclux-tomwyc/try=> :cat /=home=/cat/hello/gate/hook :: XX make this work :: - :: /=main=/bin/hello/hoon + :::: /hook/gate/hello/cat + :: + /? 314 :: - |= * - |= [planet=@ta ~] - ^- bowl - :_ ~ :_ ~ - :- %% - !>("hello, {(trip planet)}.") + :::: + !: + |= [* [[txt=@tas ~] ~]] + :- %noun + (crip (weld "hello, " (flop (trip txt)))) What did you just do? -One, you used Arvo as a Hoon REPL to print the constant `"hello, +One, you used the Hoon REPL to print the constant `"hello, world"`, which is a fancy way to write the Nock noun [104 101 108 108 111 44 32 119 111 114 108 100 0] @@ -205,7 +222,7 @@ world"`, which is a fancy way to write the Nock noun Two, you called the Hoon `add` function to see that two plus two is four. Math seems to work the same on the off-world colonies. -Three, you ran the Arvo application `:hello` with the argument +Three, you ran the `+dojo` application `+hello` with the argument `%world`, which is just a fancy way to write the atom `431.316.168.567` (or, for non-Germans, `431,316,168,567`). You might recognize it better as `0x64.6c72.6f77` - the ASCII @@ -214,18 +231,19 @@ characters in LSB first order. (Is Urbit German? Sadly, no. But all our noun print formats are URL-safe, which dot is and comma isn't.) -And you (4) used the Arvo application :cat to print the Hoon file +And you (4) used the `+dojo` application `+cat` to print the Hoon file - /=main=/bin/hello/hoon + /=home=/cat/hello/gate/hook which, supposing your current date is ~2013.9.1..04.38.31..f259 + ~2015.5.9..18.03.32..ba77 -(ie, September 1, 2013 at 4:38:31 GMT/LS25 plus 0xf259/65536 -seconds), is equivalent to the global path +(ie, May 9, 2015 at 18:03:32 GMT/LS25 plus 0xba77/47735 seconds), is +equivalent to the global path - /~waclux-tomwyc/main/~2013.8.23..04.38.31..f259/bin/hello/hoon + /~waclux-tomwyc/home/~2015.5.9..18.03.32..ba77/cat/hello/gate/hook which anyone in Urbit can, see and even use - but we're getting ahead of ourselves. @@ -261,19 +279,18 @@ control. First, we'll quit out of an infinite loop with `^C`: - ~waclux-tomwyc/try=> :infinite + ~waclux-tomwyc/try=> |-($) When you hit return at the end of this line, Arvo will appear to hang. Do not be alarmed! This is not a bug - it means that we've started running our infinite loop before printing the next console prompt. Simply hit `^C`, and you'll see - ! intr + recover: dig: intr + intr + [various stack traces] ~waclux-tomwyc/try=> :infinite -(There may be some stacktrace stuff before the `! intr`, depending -on whether your kernel was compiled with debugging.) - Hit `^U` to delete the line and escape from infinity. Arvo is a deterministic OS; you interrupted it while processing an event that would never terminate. It returns to the state it was in @@ -296,21 +313,22 @@ current character - as in Unix. Try this by running - ~waclux-tomwyc/try=> :begin + ~waclux-tomwyc:dojo> +helm?begin - Do you have a ship and a ticket? yes + ~waclux-tomwyc:dojo: your ship: ~ -Then hit `^D` and you'll be back to the command prompt (which, -unlike in Unix, is not a task itself, but part of the OS). +Then hit `^D` and you'll be back to the command prompt (which is just +another program under Arvo) We don't always want to kill the prompting task. We often want to switch between tasks, or between tasks and the command line. Sort of like switching between windows, except in a command line. -We do this with `^X`. Try +We do this with `^X`. Try + :: XX this is wrong, only between apps(+dojo or +talk) now - ~waclux-tomwyc/try=> :begin + ~waclux-tomwyc:dojo> +helm?begin - Do you have a ship and a ticket? yes + ~waclux-tomwyc:dojo: your ship: ~ But hit `^X` instead of `^D`. You'll get a prompt again. Use it: @@ -331,35 +349,58 @@ Hit `^X` again: And finally, hit `^C` to kill the task. +Arvo has a simple task manager interface, allowing you see the +running commands, along with being able to spawn or kill programs. +Hitting `^V` will bring you to this interface, and running `-prog` +will kill that program while `+prog` will spawn a new one. +If you ever end up with a broken program that is spouting errors +and wish to restart it, do it from this interface. Even our shell +and REPL `+dojo` is just another program in this list! +This is the base view from Arvo as well. If you kill all your running +programs with `^D`, it will drop you into this interface. +Pressing `^D` from this view will also shutdown your ship gracefully, +instead of having to kill all programs first. + Lastly, Arvo is a single-level store. Since it's not the '70s anymore and disk is cheap, everything you do is saved for ever. (In fact, it's saved in two ways - as a memory image and an event log - so you, or the government if they haz your filez, can repeat every computation you've ever performed.) -If the current prompt is just the shell prompt, `^D` on an empty +If the current prompt is the task manager, `^D` on an empty line will log out - as in Unix: - ~waclux-tomwyc/try=> - oxford:~/urbit; pwd - /Users/cyarvin/urbit - oxford:~/urbit; echo "hello, world" + ~waclux-tomwyc# + cyarvin:~/urbit; pwd + /home/cyarvin/urbit + cyarvin:~/urbit; echo "hello, world" hello, world - oxford:~/urbit; + cyarvin:~/urbit; Then you can restart and be right back where you were - just run `bin/vere` without `-c`: - oxford:~/urbit; bin/vere mypier - vere: urbit home is /Users/cyarvin/urb - loom: loaded 9MB - time: ~2013.9.1..17.23.05..0cc1 - ames: on localhost, UDP 60342. - http: live on 8080 - rest: checkpoint to event 383 - rest: old 0v1c.gkr1o, new 0v10.m4gdu + cyarvin:~/urbit; bin/vere mypier + vere: urbit home is mypier + vere: hostname is cyarvin + loom: mapped 2048MB + protected loom + live: loaded: MB/172.933.120 + boot: installed 190 jets + cv_start: time: ~2015.5.9..19.03.45..a758 + raft: single-instance mode + raft: -> lead + sist: booting + rest: checkpoint to event 23.630 + rest: old 0vt.3iqg5, new 0v1j.moa0t + loaded passcode from mypier/.urb/code.~lacsep-bonnyr + ---------------- playback complete---------------- - waclux-tomwyc/try=> + ames: on localhost, UDP 46404. + http: live (insecure) on 8080 + http: live ("secure") on 8443 + term: live on 10023 + ~waclux-tomwyc:dojo, talk# Use your arrow keys and you'll see your history is still there. Arvo is indestructible and can be shut down however you like @@ -370,7 +411,7 @@ But don't try to operate the same ship on two Unix hosts at the same time. This will confuse everyone, including yourself. ####System administration - +:: XX FIX ME Sometimes we make changes to Hoon or Arvo (we never make changes to Nock) and you need to update your ship. @@ -410,17 +451,19 @@ every so often to get the latest Urbit source code. You'll need to run: before executing `bin/vere pier` again. -###6. Chat +###6. Talk Okay, fine. You're a long way from being an Arvo ninja. But - you're ready for the two most important uses of Urbit right now. One, coding. Two, chatting. -To start chatting, simply type +To start chatting, simply press `^X` to switch to the `:talk` app +(If you accidently killed it, no worries: start a new one by typing +`+talk` from the `^V` menu) - ~waclux-tomwyc/try=> :chat + ~waclux-tomwyc:talk() -and type `?` for the list of commands once `:chat` is running. +and type `;join /urbit-meta` to join our main chat room. -Most of us are hanging out on `:chat` regularly. We can answer any questions you might have and help you get oriented in this new environment. +Most of us are hanging out on `:talk` regularly. We can answer any questions you might have and help you get oriented in this new environment. From a4559fc7bbd501d81b69d629f9de7efadfe9b115 Mon Sep 17 00:00:00 2001 From: chc4 Date: Sun, 10 May 2015 21:12:51 -0400 Subject: [PATCH 2/6] Semi-update readme A bit more work. I'm pretty sure calling it `:dojo` is more appropriate than `+dojo` since it is neither a dog nor a cat, like how we call it `:talk` instead of `+talk`. I also rewrote some old sections, but not very well. Grep for "XX" to see what needs improvements... --- README.markdown | 91 +++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 53 deletions(-) diff --git a/README.markdown b/README.markdown index d060900d3..cd5d4cfdf 100644 --- a/README.markdown +++ b/README.markdown @@ -12,7 +12,8 @@ Urbit is a new programming and execution environment designed from scratch. Any resemblance to existing languages or operating systems is coincidental, cosmetic, or inevitable. -All of the source code is entirely in the public domain. +All of the source code is distributed under the MIT license, but is for all +intents and purposes in the public domain. Install ------------------- @@ -92,7 +93,7 @@ Run `bin/vere -c mypier` in the urbit directory, where `mypier` is a directory t A _pier_ is an Urbit virtual machine that hosts one or more Urbit identities, or _ships_. When you run `bin/vere -c`, it automatically creates a 128-bit ship, or `submarine`. Your name (a hash of a randomly-generated public key) will look something like: - ~machec-binnev-dordeb-sogduc--dosmul-sarrum-faplec-nidted + ~hinfet-rovler-labheb-laddev--ladner-pillur-divmun-tamfur First you'll see a string of messages like: @@ -114,7 +115,7 @@ Next vere will generate a 2048 RSA key that will be used as your identity: and then it'll pause a little, 'cause this is slow, and then - saving passcode in sub/.urb/code.~malmel-ridnep + saving passcode in mypier/.urb/code.~malmel-ridnep (for real security, write it down and delete the file...) and, then, if the network gods are happy, your submarine will start pulling @@ -134,7 +135,7 @@ down Arvo files: You will probably be stuck here for a while as your local submarine copies all of its files from the master carrier, `~zod`. This is normal. -Once that is finished, you will be dropped into the main application, the `+dojo` shell (which is coincidentally also a Hoon REPL): +Once that is finished, you will be dropped into the main application, the `:dojo` shell (which is coincidentally also a Hoon REPL): ~hinfet-rovler-labheb-laddev--ladner-pillur-divmun-tamfur:dojo> @@ -168,7 +169,7 @@ Let's say one of your ships is `~waclux-tomwyc` and its ticket is rendered in Hoon's syllabic base, `@p`.) A new life awaits you on the off-world colonies! To begin, just -type at the `+dojo` prompt: +type at the `:dojo` prompt: :helm?begin @@ -200,7 +201,7 @@ command lines and you should see the matching results: ~waclux-tomwyc:dojo> +hello %world 'hello, dlrow' - ~waclux-tomwyc/try=> :cat /=home=/cat/hello/gate/hook :: XX make this work + ~waclux-tomwyc:dojo> :cat /=home=/cat/hello/gate/hook :: XX make this work :: :::: /hook/gate/hello/cat :: @@ -222,7 +223,7 @@ world"`, which is a fancy way to write the Nock noun Two, you called the Hoon `add` function to see that two plus two is four. Math seems to work the same on the off-world colonies. -Three, you ran the `+dojo` application `+hello` with the argument +Three, you ran the `:dojo` application `+hello` with the argument `%world`, which is just a fancy way to write the atom `431.316.168.567` (or, for non-Germans, `431,316,168,567`). You might recognize it better as `0x64.6c72.6f77` - the ASCII @@ -231,13 +232,12 @@ characters in LSB first order. (Is Urbit German? Sadly, no. But all our noun print formats are URL-safe, which dot is and comma isn't.) -And you (4) used the `+dojo` application `+cat` to print the Hoon file +And you (4) used the `:dojo` application `+cat` to print the Hoon file /=home=/cat/hello/gate/hook which, supposing your current date is - ~2013.9.1..04.38.31..f259 ~2015.5.9..18.03.32..ba77 (ie, May 9, 2015 at 18:03:32 GMT/LS25 plus 0xba77/47735 seconds), is @@ -279,7 +279,7 @@ control. First, we'll quit out of an infinite loop with `^C`: - ~waclux-tomwyc/try=> |-($) + ~waclux-tomwyc:dojo> |-($) When you hit return at the end of this line, Arvo will appear to hang. Do not be alarmed! This is not a bug - it means that @@ -289,7 +289,7 @@ console prompt. Simply hit `^C`, and you'll see recover: dig: intr intr [various stack traces] - ~waclux-tomwyc/try=> :infinite + ~waclux-tomwyc:dojo> |-($) Hit `^U` to delete the line and escape from infinity. Arvo is a deterministic OS; you interrupted it while processing an event @@ -317,37 +317,39 @@ Try this by running ~waclux-tomwyc:dojo: your ship: ~ -Then hit `^D` and you'll be back to the command prompt (which is just +Then hit `^D` and you'll kill the current task, the command prompt (which is just another program under Arvo) We don't always want to kill the prompting task. We often want to switch between tasks, or between tasks and the command line. Sort of like switching between windows, except in a command line. -We do this with `^X`. Try - :: XX this is wrong, only between apps(+dojo or +talk) now +We do this with `^X`. - ~waclux-tomwyc:dojo> +helm?begin +Let's try an example: First, make sure you +have two apps running, like `:dojo` and `:talk`. Then, try: + :: XX this is wrong, only between apps(+dojo or +talk) now + :: this entire example is kinda lackluster now... + :: killing the current task kills dojo now, and you + :: cant have multiple dojo instances! + + ~waclux-tomwyc:dojo> :helm?begin ~waclux-tomwyc:dojo: your ship: ~ -But hit `^X` instead of `^D`. You'll get a prompt again. Use +But hit `^X` instead of `^D`. You'll get switched to the next app in line, in this case `:talk`. Use it: - ~waclux-tomwyc/try=> :begin + ~waclux-tomwyc:dojo> :helm?begin - ~waclux-tomwyc/try=> :hello %world - "hello, world." - ~waclux-tomwyc/try=> + ~waclux-tomwyc:talk(/urbit-meta) hello, world! Hit `^X` again: - ~waclux-tomwyc/try=> :begin + ~waclux-tomwyc:dojo> :helm?begin - ~waclux-tomwyc/try=> :hello %world - "hello, world." - Do you have a ship and a ticket? yes + ~waclux-tomwyc:dojo: your ship: ~ -And finally, hit `^C` to kill the task. +And finally, hit `^D` to kill the task. Arvo has a simple task manager interface, allowing you see the running commands, along with being able to spawn or kill programs. @@ -355,11 +357,10 @@ Hitting `^V` will bring you to this interface, and running `-prog` will kill that program while `+prog` will spawn a new one. If you ever end up with a broken program that is spouting errors and wish to restart it, do it from this interface. Even our shell -and REPL `+dojo` is just another program in this list! +and REPL `:dojo` is just another program in this list! + This is the base view from Arvo as well. If you kill all your running programs with `^D`, it will drop you into this interface. -Pressing `^D` from this view will also shutdown your ship gracefully, -instead of having to kill all programs first. Lastly, Arvo is a single-level store. Since it's not the '70s anymore and disk is cheap, everything you do is saved for ever. @@ -370,7 +371,7 @@ repeat every computation you've ever performed.) If the current prompt is the task manager, `^D` on an empty line will log out - as in Unix: - ~waclux-tomwyc# + ~waclux-tomwyc:dojo, talk# cyarvin:~/urbit; pwd /home/cyarvin/urbit cyarvin:~/urbit; echo "hello, world" @@ -411,34 +412,18 @@ But don't try to operate the same ship on two Unix hosts at the same time. This will confuse everyone, including yourself. ####System administration -:: XX FIX ME Sometimes we make changes to Hoon or Arvo (we never make changes to Nock) and you need to update your ship. -There are two steps to updating. You need to get the new files, -and you need to install them. To get them: +Luckily, Arvo has some special sauce that allows it the same carriers +you initially pulled your files from to push kernel update over-the-air. +You may notice this happening from time to time through mysterious messages +such as: - ~waclux-tomwyc/try=> :update - : /~waclux-tomwyc/arvo/2/hoon/hoon - : /~waclux-tomwyc/arvo/2/dill/hoon - : /~waclux-tomwyc/arvo/2/batz/hoon + [%merge-fine blah] :: XX make this an actual %merge-fine example -To install them (the simplest, slowest, most general way): - - ~waclux-tomwyc/try=> :reset - - %reset-start - %reset-parsed - %reset-compiled - %hoon-load - [%tang /~waclux-tomwyc/arvo/~2013.11.26..20.29.15..090f/zuse ~tirnux-latwex] - [%vane %a /~waclux-tomwyc/arvo/~2013.11.26..20.29.15..090f/ames ~tolryn-watret] - [%vane %b /~waclux-tomwyc/arvo/~2013.11.26..20.29.15..090f/batz ~donfex-ladsem] - [%vane %c /~waclux-tomwyc/arvo/~2013.11.26..20.29.15..090f/clay ~picsug-mitref] - [%vane %d /~waclux-tomwyc/arvo/~2013.11.26..20.29.15..090f/dill ~dilpex-laptug] - [%vane %e /~waclux-tomwyc/arvo/~2013.11.26..20.29.15..090f/eyre ~forbur-disben] - -All of your state, including running tasks, will be unchanged. +These updates can be applied without having to restart Arvo or any of its +`%vanes`. All of your state, including running tasks, will be unchanged. Sometimes the interpreter, called `vere` gets updated. In your urbit directory, back in Unixland, run: @@ -448,7 +433,7 @@ every so often to get the latest Urbit source code. You'll need to run: make clean; make -before executing `bin/vere pier` again. +before executing `bin/vere mypier` again. ###6. Talk From 85d9cc87fb80ba6cd630380e328db06d817f423e Mon Sep 17 00:00:00 2001 From: chc4 Date: Tue, 12 May 2015 17:12:53 -0400 Subject: [PATCH 3/6] Readme cleanup Finishing touches. That travis-ci badge doesn't look like it was ever actually setup, and the build never really breaks anyways. Notable issues: - The +cat example doesn't work. At all. You can't even try to type the path without breaking :dojo. - The "Control Characters" example for ^X is a lot more lack-luster now. Instead of being able to spawn arbitrarily many console apps that wait for input, being able to kill and swap between them at will, you can only have one console app running under a :dojo instance and arbitrary other ^V app. This is bad, since if a reader is going through the file sequentially they may not have a program other than :dojo running, making it looks broken. I moved the ^V section to the top so they can hopefully put the pieces together... - Someone should really proofread this. Make sure I updated all the hostnames and shipnames, since I had to do that manually, and that everything read well. Dammit Jim I'm a programmer not a writer... --- README.markdown | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/README.markdown b/README.markdown index cd5d4cfdf..6bd7e050e 100644 --- a/README.markdown +++ b/README.markdown @@ -1,8 +1,6 @@ Urbit ===== -[![Build Status](https://travis-ci.org/urbit/urbit.png?branch=master)](https://travis-ci.org/urbit/urbit) - > Tlön is surely a labyrinth, but it is > a labyrinth devised by men, a labyrinth > destined to be deciphered by men. @@ -201,7 +199,7 @@ command lines and you should see the matching results: ~waclux-tomwyc:dojo> +hello %world 'hello, dlrow' - ~waclux-tomwyc:dojo> :cat /=home=/cat/hello/gate/hook :: XX make this work + ~waclux-tomwyc:dojo> +cat /=home=/cat/hello/gate/hook :: XX make this work :: :::: /hook/gate/hello/cat :: @@ -277,7 +275,19 @@ There are also some special control keys specific to Arvo. It's a good idea to learn these first so that you feel in, um, control. -First, we'll quit out of an infinite loop with `^C`: +First off, Arvo has a simple task manager interface, allowing you see the +running commands, along with being able to spawn or kill programs. + +Hitting `^V` will bring you to this interface, and running `-prog` +will kill that program while `+prog` will spawn a new one. +If you ever end up with a broken program that is spouting errors +and wish to restart it, do it from this interface. Even our shell +and REPL `:dojo` is just another program in this list! + +This is the base view from Arvo as well. If you kill all your running +programs, it will drop you into this interface. + +Next, we'll show you how we can quit out of an infinite loop with `^C`: ~waclux-tomwyc:dojo> |-($) @@ -317,8 +327,7 @@ Try this by running ~waclux-tomwyc:dojo: your ship: ~ -Then hit `^D` and you'll kill the current task, the command prompt (which is just -another program under Arvo) +Then hit `^D` and you'll kill the current task, the command prompt `:dojo`. We don't always want to kill the prompting task. We often want to switch between tasks, or between tasks and the command line. @@ -327,10 +336,6 @@ We do this with `^X`. Let's try an example: First, make sure you have two apps running, like `:dojo` and `:talk`. Then, try: - :: XX this is wrong, only between apps(+dojo or +talk) now - :: this entire example is kinda lackluster now... - :: killing the current task kills dojo now, and you - :: cant have multiple dojo instances! ~waclux-tomwyc:dojo> :helm?begin @@ -341,7 +346,7 @@ it: ~waclux-tomwyc:dojo> :helm?begin - ~waclux-tomwyc:talk(/urbit-meta) hello, world! + ~waclux-tomwyc:talk() hello, world! Hit `^X` again: @@ -351,17 +356,6 @@ Hit `^X` again: And finally, hit `^D` to kill the task. -Arvo has a simple task manager interface, allowing you see the -running commands, along with being able to spawn or kill programs. -Hitting `^V` will bring you to this interface, and running `-prog` -will kill that program while `+prog` will spawn a new one. -If you ever end up with a broken program that is spouting errors -and wish to restart it, do it from this interface. Even our shell -and REPL `:dojo` is just another program in this list! - -This is the base view from Arvo as well. If you kill all your running -programs with `^D`, it will drop you into this interface. - Lastly, Arvo is a single-level store. Since it's not the '70s anymore and disk is cheap, everything you do is saved for ever. (In fact, it's saved in two ways - as a memory image and an event @@ -420,7 +414,7 @@ you initially pulled your files from to push kernel update over-the-air. You may notice this happening from time to time through mysterious messages such as: - [%merge-fine blah] :: XX make this an actual %merge-fine example + ['merge succeeded' {}] These updates can be applied without having to restart Arvo or any of its `%vanes`. All of your state, including running tasks, will be unchanged. From 55a0bdf3e2848d0b54bbec79a4fa271a0cb0b675 Mon Sep 17 00:00:00 2001 From: chc4 Date: Tue, 12 May 2015 17:22:07 -0400 Subject: [PATCH 4/6] Small fix Typo, and make it clearer that the updates happen automagically instead of only being downloaded, with you having to apply them. --- README.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index 6bd7e050e..5493b27ad 100644 --- a/README.markdown +++ b/README.markdown @@ -409,14 +409,14 @@ same time. This will confuse everyone, including yourself. Sometimes we make changes to Hoon or Arvo (we never make changes to Nock) and you need to update your ship. -Luckily, Arvo has some special sauce that allows it the same carriers +Luckily, Arvo has some special sauce that allows the same carrier you initially pulled your files from to push kernel update over-the-air. -You may notice this happening from time to time through mysterious messages +You may notice this happening automatically from time to time through mysterious messages such as: ['merge succeeded' {}] -These updates can be applied without having to restart Arvo or any of its +These updates will be applied without having to restart Arvo or any of its `%vanes`. All of your state, including running tasks, will be unchanged. Sometimes the interpreter, called `vere` gets updated. In your urbit directory, back in Unixland, run: From 816205e708785fdbf58de2f88c9aeec8df9e04e0 Mon Sep 17 00:00:00 2001 From: vere Date: Wed, 13 May 2015 00:11:11 +0000 Subject: [PATCH 5/6] split out road memory data --- v/raft.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/v/raft.c b/v/raft.c index d4b0d7c71..4a82ebc28 100644 --- a/v/raft.c +++ b/v/raft.c @@ -1855,7 +1855,9 @@ static void _raft_grab(u3_noun ova) { if ( u3_nul != u3A->sac ) { - c3_w usr_w = 0, ova_w = 0, sac_w = 0, utv_w = 0, utm_w = 0, wep_w = 0; + c3_w usr_w = 0, ova_w = 0, sac_w = 0, utv_w = 0, utm_w = 0, wep_w = 0, + har_w = 0, das_w = 0, flu_w = 0, tax_w = 0, mer_w = 0, don_w = 0, + day_w = 0, car_w = 0; fprintf(stderr, "\r\n"); usr_w = _raft_prof(u3_nul, 0, u3A->sac); @@ -1874,8 +1876,40 @@ _raft_grab(u3_noun ova) fprintf(stderr, "arvo stuff: "); _raft_print_memory(utv_w); - utm_w = u3m_mark(); - fprintf(stderr, "road stuff: "); + har_w = u3h_mark(u3R->jed.har_p); + fprintf(stderr, " warm jet state: "); + _raft_print_memory(har_w); + + das_w = u3a_mark_noun(u3R->jed.das); + fprintf(stderr, " cold jet state: "); + _raft_print_memory(das_w); + + flu_w = u3a_mark_noun(u3R->ski.flu); + fprintf(stderr, " namespace: "); + _raft_print_memory(flu_w); + + tax_w = u3a_mark_noun(u3R->bug.tax); + fprintf(stderr, " trace stack list: "); + _raft_print_memory(tax_w); + + mer_w = u3a_mark_noun(u3R->bug.mer); + fprintf(stderr, " trace stack buffer: "); + _raft_print_memory(mer_w); + + don_w = u3a_mark_noun(u3R->pro.don); + fprintf(stderr, " profile battery list: "); + _raft_print_memory(don_w); + + day_w = u3a_mark_noun(u3R->pro.day); + fprintf(stderr, " profile doss: "); + _raft_print_memory(day_w); + + car_w = u3h_mark(u3R->cax.har_p); + fprintf(stderr, " memoization: "); + _raft_print_memory(car_w); + + utm_w = har_w + das_w + flu_w + tax_w + mer_w + don_w + day_w + car_w; + fprintf(stderr, "total road stuff: "); _raft_print_memory(utm_w); fprintf(stderr, "total marked: "); From 9b9fe1bfb4d8437fc85fff1501e8b6c672c807a0 Mon Sep 17 00:00:00 2001 From: Philip C Monk Date: Wed, 13 May 2015 18:23:20 -0400 Subject: [PATCH 6/6] plug memoization leak --- n/n.c | 5 ++++- v/raft.c | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/n/n.c b/n/n.c index ceed42d74..61af0fd41 100644 --- a/n/n.c +++ b/n/n.c @@ -86,7 +86,10 @@ _n_hint(u3_noun zep, } pro = _n_nock_on(u3k(bus), u3k(nex)); - u3z_save_2(c3__nock, bus, nex, pro); + if ( u3R != &(u3H->rod_u) ) { + u3z_save_2(c3__nock, bus, nex, pro); + } + u3z(bus); u3z(nex); return pro; diff --git a/v/raft.c b/v/raft.c index 4a82ebc28..72f65beba 100644 --- a/v/raft.c +++ b/v/raft.c @@ -1859,6 +1859,8 @@ _raft_grab(u3_noun ova) har_w = 0, das_w = 0, flu_w = 0, tax_w = 0, mer_w = 0, don_w = 0, day_w = 0, car_w = 0; + c3_assert( u3R == &(u3H->rod_u) ); + fprintf(stderr, "\r\n"); usr_w = _raft_prof(u3_nul, 0, u3A->sac); fprintf(stderr, "total userspace: "); @@ -1919,6 +1921,9 @@ _raft_grab(u3_noun ova) fprintf(stderr, "sweep: "); _raft_print_memory(wep_w); + u3h_free(u3R->cax.har_p); + u3R->cax.har_p = u3h_new(); + u3z(u3A->sac); u3A->sac = u3_nul; }