<div dir="ltr"><div class="gmail_default" style><div class="gmail_default" style><span style="font-family:arial,helvetica,sans-serif"><br></span></div><div class="gmail_default" style><span style="font-family:arial,helvetica,sans-serif">Signed-off-by: George K. Thiruvathukal <<a href="mailto:gkt@cs.luc.edu">gkt@cs.luc.edu</a>></span><br></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">---</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> core/structures/fast_ring.c | 3 +-</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> engine/thorium/actor.h | 107 ++++++++++++++-----------</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> engine/thorium/message.h | 4 +-</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> engine/thorium/modules/actions.h | 19 +++--</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> engine/thorium/modules/binomial_tree_message.h | 5 +-</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> engine/thorium/modules/send_helpers.h | 5 +-</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> engine/thorium/node.h | 9 ++-</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> engine/thorium/transport/message_multiplexer.h | 4 +-</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> examples/ring/ring.h | 14 ++--</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> 9 files changed, 96 insertions(+), 74 deletions(-)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"><br></font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/core/structures/fast_ring.c b/core/structures/fast_ring.c</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index 1e57a2f..a7e4242 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/core/structures/fast_ring.c</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/core/structures/fast_ring.c</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -587,8 +587,7 @@ void core_fast_ring_use_multiple_producers(struct core_fast_ring *self)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> self->use_multiple_producers = YES;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">- marker = THORIUM_MESSAGE_INVALID_ACTION;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+ marker = ACTION_INVALID;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> i = 0;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> while (i < (int)self->number_of_cells) {</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/engine/thorium/actor.h b/engine/thorium/actor.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index 9e013f4..6ae48e0 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/engine/thorium/actor.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/engine/thorium/actor.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -48,40 +48,49 @@</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> #define THORIUM_ACTOR_EXPOSE_ACQUAINTANCE_VECTOR</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+/*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+ * We are going to use the Minix convention:</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+ * - predefined actions all have negative values</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+ * - each module where ACTION_ are defined has a unique base</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+ * in actor.h, the base is #defined as ACTOR_ACTION_BASE</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+ * - each action is a displacement from the base</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+ */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTOR_ACTION_BASE -1000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* for control */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_START 0x00000885</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_START_REPLY 0x0000232f</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_STOP 0x0000388c</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_STOP_REPLY 0x00006fd8</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_ASK_TO_STOP 0x0000607b</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_ASK_TO_STOP_REPLY 0x00003602</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_START (ACTOR_ACTION_BASE + 0)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_START_REPLY (ACTOR_ACTION_BASE + 1)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_STOP (ACTOR_ACTION_BASE + 2)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_STOP_REPLY (ACTOR_ACTION_BASE + 3)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_ASK_TO_STOP (ACTOR_ACTION_BASE + 4)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_ASK_TO_STOP_REPLY (ACTOR_ACTION_BASE + 5)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_CONSUMER 0x000020a9</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_CONSUMER_REPLY 0x00004db0</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_CONSUMER (ACTOR_ACTION_BASE + 6)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_CONSUMER_REPLY (ACTOR_ACTION_BASE + 7)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_PRODUCER 0x00002856</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_PRODUCER_REPLY 0x00000037</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_PRODUCERS 0x00005c0b</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_PRODUCERS_REPLY 0x0000774d</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_PRODUCER (ACTOR_ACTION_BASE + 8)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_PRODUCER_REPLY (ACTOR_ACTION_BASE + 9)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_PRODUCERS (ACTOR_ACTION_BASE + 10)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_PRODUCERS_REPLY (ACTOR_ACTION_BASE + 11)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_CONSUMERS 0x0000671d</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_CONSUMERS_REPLY 0x000071e4</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_CONSUMERS (ACTOR_ACTION_BASE + 12)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_CONSUMERS_REPLY (ACTOR_ACTION_BASE + 13)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* runtime info */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_GET_NODE_NAME 0x00003323</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_GET_NODE_NAME_REPLY 0x00004d9a</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_GET_NODE_WORKER_COUNT 0x0000147d</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_GET_NODE_WORKER_COUNT_REPLY 0x000004ec</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_GET_NODE_NAME (ACTOR_ACTION_BASE + 14)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_GET_NODE_NAME_REPLY (ACTOR_ACTION_BASE + 15)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_GET_NODE_WORKER_COUNT (ACTOR_ACTION_BASE + 16)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_GET_NODE_WORKER_COUNT_REPLY (ACTOR_ACTION_BASE + 17)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* control YIELD is used as a yielding process.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * an actor sends this to itself</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * when it receives ACTION_YIELD_REPLY, it continues</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * its work</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_YIELD 0x00000173</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_YIELD_REPLY 0x000016f1</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_YIELD (ACTOR_ACTION_BASE + 18)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_YIELD_REPLY (ACTOR_ACTION_BASE + 19)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PROXY_MESSAGE 0x00004bed</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PROXY_MESSAGE (ACTOR_ACTION_BASE + 20)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* affinity */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -92,23 +101,23 @@</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* synchronization */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SYNCHRONIZE 0x00004ac9</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SYNCHRONIZE_REPLY 0x00000663</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SYNCHRONIZED 0x0000453d</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SYNCHRONIZE (ACTOR_ACTION_BASE + 21)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SYNCHRONIZE_REPLY (ACTOR_ACTION_BASE + 22)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SYNCHRONIZED (ACTOR_ACTION_BASE + 23)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* spawn new actors remotely */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SPAWN 0x00000119</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SPAWN_REPLY 0x00007b68</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SPAWN (ACTOR_ACTION_BASE + 24)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SPAWN_REPLY (ACTOR_ACTION_BASE + 25)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* for import and export */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PACK_ENABLE 0x000015d3</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PACK_DISABLE 0x00007f0f</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PACK 0x00004cae</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PACK_REPLY 0x000024fc</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_UNPACK 0x00001c73</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_UNPACK_REPLY 0x000064e4</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PACK_SIZE 0x00003307</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PACK_SIZE_REPLY 0x00005254</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PACK_ENABLE (ACTOR_ACTION_BASE + 26)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PACK_DISABLE (ACTOR_ACTION_BASE + 27)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PACK (ACTOR_ACTION_BASE + 28)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PACK_REPLY (ACTOR_ACTION_BASE + 29)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_UNPACK (ACTOR_ACTION_BASE + 30)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_UNPACK_REPLY (ACTOR_ACTION_BASE + 31)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PACK_SIZE (ACTOR_ACTION_BASE + 32)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PACK_SIZE_REPLY (ACTOR_ACTION_BASE + 33)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* cloning */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* design notes:</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -130,19 +139,19 @@ reply THORIUM_ CLONE_REPLY with newly spawned actor</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * CLONE takes one int (the spawner) and returns CLONE_REPLY</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> *</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_CLONE 0x00000d60</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_CLONE (ACTOR_ACTION_BASE + 34)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* CLONE_REPLY returns one int: the clone name */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_CLONE_REPLY 0x00006881</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_CLONE_REPLY (ACTOR_ACTION_BASE + 35)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* for migration */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_MIGRATE 0x000073ff</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_MIGRATE_REPLY 0x00001442</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_MIGRATE_NOTIFY_ACQUAINTANCES 0x000029b6</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_MIGRATE_NOTIFY_ACQUAINTANCES_REPLY 0x00007fe2</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_FORWARD_MESSAGES 0x00000bef</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_FORWARD_MESSAGES_REPLY 0x00002ff3</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_SUPERVISOR 0x0000312f</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_SUPERVISOR_REPLY 0x00007b18</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_MIGRATE (ACTOR_ACTION_BASE + 36)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_MIGRATE_REPLY (ACTOR_ACTION_BASE + 37)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_MIGRATE_NOTIFY_ACQUAINTANCES (ACTOR_ACTION_BASE + 38)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_MIGRATE_NOTIFY_ACQUAINTANCES_REPLY (ACTOR_ACTION_BASE + 39)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_FORWARD_MESSAGES (ACTOR_ACTION_BASE + 39)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_FORWARD_MESSAGES_REPLY (ACTOR_ACTION_BASE + 40)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_SUPERVISOR (ACTOR_ACTION_BASE + 41)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_SUPERVISOR_REPLY (ACTOR_ACTION_BASE + 42)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* name change for acquaintances</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -161,8 +170,8 @@ ACTION_NOTIFY_NAME_CHANGE (source is old name, name is new name)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> the actor just need to change any acquaintance with old name to</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> new name.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_NOTIFY_NAME_CHANGE 0x000068b9</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_NOTIFY_NAME_CHANGE_REPLY 0x00003100</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_NOTIFY_NAME_CHANGE (ACTOR_ACTION_BASE + 43)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_NOTIFY_NAME_CHANGE_REPLY (ACTOR_ACTION_BASE + 44)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * Messages for actors that are data stores</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -171,9 +180,9 @@ new name.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* Auto-scaling stuff</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_ENABLE_AUTO_SCALING 0x00000ede</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_DISABLE_AUTO_SCALING 0x00002b88</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_DO_AUTO_SCALING 0x000064de</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_ENABLE_AUTO_SCALING (ACTOR_ACTION_BASE + 45)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_DISABLE_AUTO_SCALING (ACTOR_ACTION_BASE + 46)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_DO_AUTO_SCALING (ACTOR_ACTION_BASE + 47)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * some actor constants</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/engine/thorium/message.h b/engine/thorium/message.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index f67c9fa..10821fa 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/engine/thorium/message.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/engine/thorium/message.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -17,8 +17,8 @@</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * A message can not be distributed with the action specific</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * ACTION_INVALID.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define THORIUM_MESSAGE_INVALID_ACTION 0x00000000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_INVALID THORIUM_MESSAGE_INVALID_ACTION</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_INVALID -1</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * Use tracepoints to analyze the life cycle of messages.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/engine/thorium/modules/actions.h b/engine/thorium/modules/actions.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index a038e45..f858ca4 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/engine/thorium/modules/actions.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/engine/thorium/modules/actions.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -12,20 +12,23 @@</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * ACTOR_PING can be used by concrete actors, it is</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * not being used by biosal systems.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PING 0x000040b3</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_PING_REPLY 0x00006eda</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define PING_ACTION_BASE -3000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PING (PING_ACTION_BASE + 0)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_PING_REPLY (PING_ACTION_BASE + 1)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * The notify messages can be used freely.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_NOTIFY 0x0000710b</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_NOTIFY_REPLY 0x00005f82</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_NOTIFY (PING_ACTION_BASE + 2)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_NOTIFY_REPLY (PING_ACTION_BASE + 3)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_RESET 0x00005045</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_RESET_REPLY 0x0000056d</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_RESET (PING_ACTION_BASE + 4)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_RESET_REPLY (PING_ACTION_BASE + 5)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_BEGIN 0x0000125f</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_BEGIN_REPLY 0x0000214a</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_BEGIN (PING_ACTION_BASE + 6)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_BEGIN_REPLY (PING_ACTION_BASE + 7)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> struct core_vector;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> struct thorium_actor;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/engine/thorium/modules/binomial_tree_message.h b/engine/thorium/modules/binomial_tree_message.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index b24f1ac..d84690b 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/engine/thorium/modules/binomial_tree_message.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/engine/thorium/modules/binomial_tree_message.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -7,7 +7,10 @@ struct thorium_message;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> struct thorium_actor;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* binomial-tree */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_BINOMIAL_TREE_SEND 0x00005b36</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define BINOMIAL_TREE_ACTION_BASE -4000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_BINOMIAL_TREE_SEND (BINOMIAL_TREE_ACTION_BASE + 0)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> #define DEBUG_BINOMIAL_TREE</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/engine/thorium/modules/send_helpers.h b/engine/thorium/modules/send_helpers.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index 549cfc1..97a31fe 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/engine/thorium/modules/send_helpers.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/engine/thorium/modules/send_helpers.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -6,8 +6,9 @@</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> #include <stdint.h></font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_PRODUCERS_FOR_WORK_STEALING 0x002f77ab</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_SET_PRODUCERS_FOR_WORK_STEALING_REPLY 0x0038c869</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define SEND_HELPERS_ACTION_BASE -5000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_PRODUCERS_FOR_WORK_STEALING (SEND_HELPERS_ACTION_BASE + 0)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_SET_PRODUCERS_FOR_WORK_STEALING_REPLY (SEND_HELPERS_ACTION_BASE + 1)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * Actor helpers are function that work on a thorium_actor but that do not access attributes</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/engine/thorium/node.h b/engine/thorium/node.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index 918a695..8ddbb65 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/engine/thorium/node.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/engine/thorium/node.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -41,10 +41,11 @@</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /* Some message tags at the node level instead of the actor level</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_THORIUM_NODE_ADD_INITIAL_ACTOR 0x00002438</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_THORIUM_NODE_ADD_INITIAL_ACTORS 0x00004c19</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_THORIUM_NODE_ADD_INITIAL_ACTORS_REPLY 0x00003ad3</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_THORIUM_NODE_START 0x0000082c</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define NODE_ACTION_BASE -6000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_THORIUM_NODE_ADD_INITIAL_ACTOR (NODE_ACTION_BASE + 0)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_THORIUM_NODE_ADD_INITIAL_ACTORS (NODE_ACTION_BASE + 1)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_THORIUM_NODE_ADD_INITIAL_ACTORS_REPLY (NODE_ACTION_BASE + 2)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_THORIUM_NODE_START (NODE_ACTION_BASE + 3)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * Use deterministic actor names.</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/engine/thorium/transport/message_multiplexer.h b/engine/thorium/transport/message_multiplexer.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index f7e0aeb..29ff07b 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/engine/thorium/transport/message_multiplexer.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/engine/thorium/transport/message_multiplexer.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -17,7 +17,9 @@ struct thorium_message;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * The multiplexer needs its own action</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_MULTIPLEXER_MESSAGE 0x0024afc9</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define MULTIPLEXER_ACTION_BASE -7000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_MULTIPLEXER_MESSAGE (MULTIPLEXER_ACTION_BASE + 0)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> /*</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> * Genomic graph traversal is characterized by:</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">diff --git a/examples/ring/ring.h b/examples/ring/ring.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">index 9086768..7f83393 100644</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">--- a/examples/ring/ring.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+++ b/examples/ring/ring.h</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">@@ -18,11 +18,15 @@ struct ring {</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> int previous;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> };</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_RING_READY 0x000067db</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_RING_KILL 0x00004cfe</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_RING_SET_NEXT 0x00003833</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_RING_PUSH_NEXT 0x0000153c</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-#define ACTION_RING_SPAWN 0x00001bd7</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+/* see notes in actor.h about how we number internal Thorium engine messages */</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define RING_ACTION_BASE -2000</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_RING_READY (RING_ACTION_BASE + 0)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_RING_KILL (RING_ACTION_BASE + 1)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_RING_SET_NEXT (RING_ACTION_BASE + 2)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_RING_PUSH_NEXT (RING_ACTION_BASE + 3)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">+#define ACTION_RING_SPAWN (RING_ACTION_BASE + 4)</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> extern struct thorium_script ring_script;</font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif"> </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">-- </font></div><div class="gmail_default" style><font face="arial, helvetica, sans-serif">1.9.3 (Apple Git-50)</font></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small"><br></div></div>
</div>