From a3ec344eb8ae103787600da0170e5835422bac5e Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 21 Feb 2017 18:15:47 -0800 Subject: [PATCH] clean up machine names/initials C: Code RC: Rendezvous Connector R: Receive --- docs/code.dot | 2 +- docs/machines.dot | 2 +- docs/mailbox.dot | 18 +++++++++--------- docs/nameplates.dot | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/code.dot b/docs/code.dot index 864d757..c5ada30 100644 --- a/docs/code.dot +++ b/docs/code.dot @@ -36,7 +36,7 @@ digraph { color="orange" fontcolor="orange"] S0 -> P0_allocate [label="allocate"] - P0_allocate [shape="box" label="C.tx_allocate"] + P0_allocate [shape="box" label="RC.tx_allocate"] P0_allocate -> S1 S1 [label="S1:\nallocating"] S1 -> P1_generate [label="rx_allocated"] diff --git a/docs/machines.dot b/docs/machines.dot index 7e2ecd3..a1df2e7 100644 --- a/docs/machines.dot +++ b/docs/machines.dot @@ -4,7 +4,7 @@ digraph { color="blue" fontcolor="blue"] Mailbox [shape="box" color="blue" fontcolor="blue"] Connection [label="Rendezvous\nConnector" - shape="box" color="blue" fontcolor="blue"] + shape="oval" color="blue" fontcolor="blue"] websocket [color="blue" fontcolor="blue"] Order [shape="box" label="Ordering" color="blue" fontcolor="blue"] Key [shape="box" label="Key" color="blue" fontcolor="blue"] diff --git a/docs/mailbox.dot b/docs/mailbox.dot index 51afafc..2f64062 100644 --- a/docs/mailbox.dot +++ b/docs/mailbox.dot @@ -36,7 +36,7 @@ digraph { {rank=same; S2A P2_connected S2B} S2A [label="S2A:\nmaybe claimed"] S2A -> P2_connected [label="connected"] - P2_connected [shape="box" label="C.tx_claim" color="orange"] + P2_connected [shape="box" label="RC.tx_claim" color="orange"] P2_connected -> S2B [color="orange"] S2B [label="S2B:\nmaybe claimed\n(bound)" color="orange"] #S2B -> SrB [label="close()" style="dashed"] @@ -58,7 +58,7 @@ digraph { S1A -> S3A [label="(none)" style="invis"] S2B -> P_open [label="rx_claimed" color="orange" fontcolor="orange"] - P_open [shape="box" label="store mailbox\nC.tx_open\nC.tx_add(queued)" color="orange"] + P_open [shape="box" label="store mailbox\nRC.tx_open\nRC.tx_add(queued)" color="orange"] P_open -> S3B [color="orange"] subgraph {rank=same; S3A S3B P3_connected} @@ -67,7 +67,7 @@ digraph { S3A -> P3_connected [label="connected"] S3B -> S3A [label="lost"] - P3_connected [shape="box" label="C.tx_open\nC.tx_add(queued)"] + P3_connected [shape="box" label="RC.tx_open\nRC.tx_add(queued)"] P3_connected -> S3B S3A -> P3_queue [label="add_message" style="dotted"] @@ -77,7 +77,7 @@ digraph { S3B -> S3B [label="rx_claimed"] S3B -> P3_send [label="add_message"] - P3_send [shape="box" label="queue\nC.tx_add(msg)"] + P3_send [shape="box" label="queue\nRC.tx_add(msg)"] P3_send -> S3B S3A -> S4A [label="(none)" style="invis"] @@ -87,7 +87,7 @@ digraph { S3B -> P3_process_theirs [label="rx_message\n(theirs)" color="orange" fontcolor="orange"] P3_process_theirs [shape="box" color="orange" - label="C.tx_release\nO.got_message if new\nrecord" + label="RC.tx_release\nO.got_message if new\nrecord" ] /* pay attention to the race here: this process_message() will deliver msg_pake to the WormholeMachine, which will compute_key() and @@ -103,9 +103,9 @@ digraph { S4B [label="S4B:\nmaybe released\nmaybe open now\n(bound)" color="orange"] S4A -> P4_connected [label="connected"] - P4_connected [shape="box" label="C.tx_open\nC.tx_add(queued)\nC.tx_release"] + P4_connected [shape="box" label="RC.tx_open\nRC.tx_add(queued)\nRC.tx_release"] S4B -> P4_send [label="add_message"] - P4_send [shape="box" label="queue\nC.tx_add(msg)"] + P4_send [shape="box" label="queue\nRC.tx_add(msg)"] P4_send -> S4B S4A -> P4_queue [label="add_message" style="dotted"] P4_queue [shape="box" label="queue" style="dotted"] @@ -129,10 +129,10 @@ digraph { S5A [label="S5A:\nreleased\nopened >=once"] S5A -> P5_connected [label="connected"] - P5_connected [shape="box" label="C.tx_open\nC.tx_add(queued)"] + P5_connected [shape="box" label="RC.tx_open\nRC.tx_add(queued)"] S5B -> P5_send [label="add_message" color="green" fontcolor="green"] - P5_send [shape="box" label="queue\nC.tx_add(msg)" color="green"] + P5_send [shape="box" label="queue\nRC.tx_add(msg)" color="green"] P5_send -> S5B [color="green"] S5A -> P5_queue [label="add_message" style="dotted"] P5_queue [shape="box" label="queue" style="dotted"] diff --git a/docs/nameplates.dot b/docs/nameplates.dot index 5ed4e66..8bc165d 100644 --- a/docs/nameplates.dot +++ b/docs/nameplates.dot @@ -19,7 +19,7 @@ digraph { S1B [label="S1B:\nwant list\nconnected" color="orange"] S1A -> P_tx [label="connected"] - P_tx [shape="box" label="C.tx_list()" color="orange"] + P_tx [shape="box" label="RC.tx_list()" color="orange"] P_tx -> S1B [color="orange"] S1B -> S1A [label="lost"] @@ -33,7 +33,7 @@ digraph { S0B -> P_notify [label="rx"] S1B -> P_notify [label="rx" color="orange" fontcolor="orange"] - P_notify [shape="box" label="W.got_nameplates()"] + P_notify [shape="box" label="C.got_nameplates()"] P_notify -> S0B {rank=same; foo foo2 legend}