Renaming header files.

--HG--
branch : octopus.renaming

diff --git a/include/octopus/dist2.h b/include/octopus/dist2.h
index 90d754a..3e30210 100644 (file)
--- a/include/octopus/dist2.h
+++ b/include/octopus/dist2.h
@@ -15,12 +15,12 @@
 #ifndef DIST2_H_
 #define DIST2_H_
 
-#include <dist2/init.h>
-#include <dist2/getset.h>
-#include <dist2/pubsub.h>
-#include <dist2/lock.h>
-#include <dist2/barrier.h>
-#include <dist2/semaphores.h>
-#include <dist2/trigger.h>
+#include <octopus/init.h>
+#include <octopus/getset.h>
+#include <octopus/pubsub.h>
+#include <octopus/lock.h>
+#include <octopus/barrier.h>
+#include <octopus/semaphores.h>
+#include <octopus/trigger.h>
 
 #endif /* DIST2_H_ */

diff --git a/include/octopus/parser/ast.h b/include/octopus/parser/ast.h
index da6ec74..69ece5b 100644 (file)
--- a/include/octopus/parser/ast.h
+++ b/include/octopus/parser/ast.h
@@ -20,7 +20,7 @@
 
 #ifndef TEST_PARSER
 #include <barrelfish/barrelfish.h>
-#include <dist2/definitions.h>
+#include <octopus/definitions.h>
 #else
 #define MAX_QUERY_LENGTH (5*1024)
 #define SYS_ERR_OK 0

diff --git a/include/octopus/pubsub.h b/include/octopus/pubsub.h
index 9b8d2b3..299b1b5 100644 (file)
--- a/include/octopus/pubsub.h
+++ b/include/octopus/pubsub.h
@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <if/dist2_defs.h>
 
-#include <dist2/trigger.h>
+#include <octopus/trigger.h>
 
 typedef dist2_trigger_id_t subscription_t;
 typedef trigger_handler_fn subscription_handler_fn;

diff --git a/include/octopus/trigger.h b/include/octopus/trigger.h
index 5fccf78..8677a1f 100644 (file)
--- a/include/octopus/trigger.h
+++ b/include/octopus/trigger.h
@@ -18,7 +18,7 @@
 #include <barrelfish/barrelfish.h>
 #include <if/dist2_defs.h>
 
-#include <dist2/definitions.h>
+#include <octopus/definitions.h>
 
 #define NOP_TRIGGER     (dist2_trigger_t){ .in_case = 0, .m = 0, .trigger = 0, .st = 0 }
 

diff --git a/include/octopus_server/query.h b/include/octopus_server/query.h
index fe5b3cd..b494867 100644 (file)
--- a/include/octopus_server/query.h
+++ b/include/octopus_server/query.h
@@ -21,8 +21,8 @@
 #include <barrelfish/barrelfish.h>
 #include <if/dist2_defs.h>
 
-#include <dist2_server/service.h>
-#include <dist2/parser/ast.h>
+#include <octopus_server/service.h>
+#include <octopus/parser/ast.h>
 
 /**
  * \brief Stores a binding for the given id.

diff --git a/include/octopus_server/service.h b/include/octopus_server/service.h
index b17d240..1f37676 100644 (file)
--- a/include/octopus_server/service.h
+++ b/include/octopus_server/service.h
@@ -17,7 +17,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <if/dist2_defs.h>
-#include <dist2/definitions.h>
+#include <octopus/definitions.h>
 
 struct dist_reply_state;
 

diff --git a/lib/barrelfish/init.c b/lib/barrelfish/init.c
index 54504e5..8de5cd5 100644 (file)
--- a/lib/barrelfish/init.c
+++ b/lib/barrelfish/init.c
@@ -27,7 +27,7 @@
 #include <barrelfish_kpi/domain_params.h>
 #include <if/monitor_defs.h>
 #include <trace/trace.h>
-#include <dist2/init.h>
+#include <octopus/init.h>
 #include "threads.h"
 #include "init.h"
 

diff --git a/lib/octopus/client/barriers.c b/lib/octopus/client/barriers.c
index 3f6f0af..540afbb 100644 (file)
--- a/lib/octopus/client/barriers.c
+++ b/lib/octopus/client/barriers.c
@@ -16,10 +16,10 @@
 
 #include <barrelfish/barrelfish.h>
 
-#include <dist2/init.h>
-#include <dist2/barrier.h>
-#include <dist2/getset.h>
-#include <dist2/trigger.h>
+#include <octopus/init.h>
+#include <octopus/barrier.h>
+#include <octopus/getset.h>
+#include <octopus/trigger.h>
 
 #include "common.h"
 

diff --git a/lib/octopus/client/capability_storage.c b/lib/octopus/client/capability_storage.c
index 444d75d..79e26db 100644 (file)
--- a/lib/octopus/client/capability_storage.c
+++ b/lib/octopus/client/capability_storage.c
@@ -16,8 +16,8 @@
 #include <stdio.h>
 
 #include <barrelfish/barrelfish.h>
-#include <dist2/init.h>
-#include <dist2/capability_storage.h>
+#include <octopus/init.h>
+#include <octopus/capability_storage.h>
 
 /**
  * \brief Get a capability from the capability store.

diff --git a/lib/octopus/client/common.h b/lib/octopus/client/common.h
index dd5aaaa..a254639 100644 (file)
--- a/lib/octopus/client/common.h
+++ b/lib/octopus/client/common.h
@@ -23,7 +23,7 @@
 
 #include <barrelfish/event_mutex.h>
 
-#include <dist2/definitions.h>
+#include <octopus/definitions.h>
 
 // TODO saw some TODOs in event_mutex_* so this will probably not work
 // as expected right now

diff --git a/lib/octopus/client/getset.c b/lib/octopus/client/getset.c
index 981f645..6c326e4 100644 (file)
--- a/lib/octopus/client/getset.c
+++ b/lib/octopus/client/getset.c
@@ -21,10 +21,10 @@
 
 #include <barrelfish/barrelfish.h>
 
-#include <dist2/init.h>
-#include <dist2/getset.h>
-#include <dist2/parser/ast.h>
-#include <dist2/trigger.h>
+#include <octopus/init.h>
+#include <octopus/getset.h>
+#include <octopus/parser/ast.h>
+#include <octopus/trigger.h>
 
 #include "strnatcmp.h"
 #include "common.h"

diff --git a/lib/octopus/client/handler.h b/lib/octopus/client/handler.h
index a64b223..cd0606b 100644 (file)
--- a/lib/octopus/client/handler.h
+++ b/lib/octopus/client/handler.h
@@ -17,8 +17,8 @@
 #define DIST2_HANDLER_H_
 
 #include <if/dist2_defs.h>
-#include <dist2/trigger.h>
-#include <dist2/pubsub.h>
+#include <octopus/trigger.h>
+#include <octopus/pubsub.h>
 
 void trigger_handler(struct dist2_binding*, dist2_trigger_id_t,
         uint64_t, dist2_mode_t, char*, uint64_t);

diff --git a/lib/octopus/client/locking.c b/lib/octopus/client/locking.c
index d4fae96..2e3a328 100644 (file)
--- a/lib/octopus/client/locking.c
+++ b/lib/octopus/client/locking.c
@@ -15,10 +15,10 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/threads.h>
 
-#include <dist2/init.h>
-#include <dist2/lock.h>
-#include <dist2/getset.h>
-#include <dist2/trigger.h>
+#include <octopus/init.h>
+#include <octopus/lock.h>
+#include <octopus/getset.h>
+#include <octopus/trigger.h>
 
 #include "common.h"
 

diff --git a/lib/octopus/client/nameservice_client.c b/lib/octopus/client/nameservice_client.c
index 907f6f2..5d3c922 100644 (file)
--- a/lib/octopus/client/nameservice_client.c
+++ b/lib/octopus/client/nameservice_client.c
@@ -19,9 +19,9 @@
 #include <barrelfish/threads.h>
 #include <barrelfish/nameservice_client.h>
 
-#include <dist2/init.h>
-#include <dist2/trigger.h>
-#include <dist2/getset.h>
+#include <octopus/init.h>
+#include <octopus/trigger.h>
+#include <octopus/getset.h>
 
 errval_t nameservice_lookup(const char *iface, iref_t *retiref)
 {

diff --git a/lib/octopus/client/octopus.c b/lib/octopus/client/octopus.c
index a48be14..5c8df7b 100644 (file)
--- a/lib/octopus/client/octopus.c
+++ b/lib/octopus/client/octopus.c
@@ -22,7 +22,7 @@
 #include <barrelfish/nameservice_client.h>
 
 #include <if/monitor_defs.h>
-#include <dist2/init.h>
+#include <octopus/init.h>
 #include <thc/thc.h>
 
 #include "handler.h"

diff --git a/lib/octopus/client/pubsub.c b/lib/octopus/client/pubsub.c
index 728c543..9bcec64 100644 (file)
--- a/lib/octopus/client/pubsub.c
+++ b/lib/octopus/client/pubsub.c
@@ -22,8 +22,8 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/threads.h>
 
-#include <dist2/init.h>
-#include <dist2/pubsub.h>
+#include <octopus/init.h>
+#include <octopus/pubsub.h>
 
 #include "common.h"
 #include "handler.h"

diff --git a/lib/octopus/client/semaphores.c b/lib/octopus/client/semaphores.c
index 355948d..b053aed 100644 (file)
--- a/lib/octopus/client/semaphores.c
+++ b/lib/octopus/client/semaphores.c
@@ -14,11 +14,11 @@
 
 #include <barrelfish/barrelfish.h>
 
-#include <dist2/init.h>
-#include <dist2/getset.h>
-#include <dist2/trigger.h>
-#include <dist2/lock.h>
-#include <dist2/semaphores.h>
+#include <octopus/init.h>
+#include <octopus/getset.h>
+#include <octopus/trigger.h>
+#include <octopus/lock.h>
+#include <octopus/semaphores.h>
 
 #include "common.h"
 

diff --git a/lib/octopus/client/trigger.c b/lib/octopus/client/trigger.c
index 32fa51c..bbf57a5 100644 (file)
--- a/lib/octopus/client/trigger.c
+++ b/lib/octopus/client/trigger.c
@@ -17,8 +17,8 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/threads.h>
 
-#include <dist2/init.h>
-#include <dist2/trigger.h>
+#include <octopus/init.h>
+#include <octopus/trigger.h>
 
 #include "handler.h"
 #include "common.h"

diff --git a/lib/octopus/parser/ast.c b/lib/octopus/parser/ast.c
index 84dd5cf..581b74e 100644 (file)
--- a/lib/octopus/parser/ast.c
+++ b/lib/octopus/parser/ast.c
@@ -18,7 +18,7 @@
 #ifdef TEST_PARSER
 #include "../../../include/dist2/parser/ast.h"
 #else
-#include <dist2/parser/ast.h>
+#include <octopus/parser/ast.h>
 #endif
 
 #include "y.tab.h"

diff --git a/lib/octopus/parser/parse.c b/lib/octopus/parser/parse.c
index 8c85cad..1e36473 100644 (file)
--- a/lib/octopus/parser/parse.c
+++ b/lib/octopus/parser/parse.c
@@ -77,7 +77,7 @@
 #ifdef TEST_PARSER
 #include "../../../include/dist2/parser/ast.h"
 #else
-#include <dist2/parser/ast.h>
+#include <octopus/parser/ast.h>
 #endif
 
 #include "y.tab.h"

diff --git a/lib/octopus/parser/read.c b/lib/octopus/parser/read.c
index 4b9d240..4f0d1a3 100644 (file)
--- a/lib/octopus/parser/read.c
+++ b/lib/octopus/parser/read.c
@@ -18,8 +18,8 @@
 
 #include <barrelfish/barrelfish.h>
 
-#include <dist2/getset.h>
-#include <dist2/parser/ast.h>
+#include <octopus/getset.h>
+#include <octopus/parser/ast.h>
 
 /**
  * \brief Reads the content of a record string based on the provided format.

diff --git a/lib/octopus/parser/scan.c b/lib/octopus/parser/scan.c
index 948e63f..0718b23 100644 (file)
--- a/lib/octopus/parser/scan.c
+++ b/lib/octopus/parser/scan.c
@@ -491,7 +491,7 @@ static yyconst flex_int16_t yy_chk[126] =
 #ifdef TEST_PARSER
 #include "../../../include/dist2/parser/ast.h"
 #else
-#include <dist2/parser/ast.h>
+#include <octopus/parser/ast.h>
 #endif
 
 // not in C99 :-(

diff --git a/lib/octopus/parser/test_parser.c b/lib/octopus/parser/test_parser.c
index 7564ce5..c37868b 100644 (file)
--- a/lib/octopus/parser/test_parser.c
+++ b/lib/octopus/parser/test_parser.c
@@ -23,7 +23,7 @@
 #ifdef TEST_PARSER
 #include "../../../include/dist2/parser/ast.h"
 #else
-#include <dist2/parser/ast.h>
+#include <octopus/parser/ast.h>
 #endif
 
 #include "y.tab.h"

diff --git a/lib/octopus/server/capstorage.c b/lib/octopus/server/capstorage.c
index 441bcc7..c785c49 100644 (file)
--- a/lib/octopus/server/capstorage.c
+++ b/lib/octopus/server/capstorage.c
@@ -28,9 +28,9 @@
 #include <barrelfish/barrelfish.h>
 #include <if/dist2_defs.h>
 
-#include <dist2_server/init.h>
-#include <dist2_server/service.h>
-#include <dist2_server/debug.h>
+#include <octopus_server/init.h>
+#include <octopus_server/service.h>
+#include <octopus_server/debug.h>
 
 #include <hashtable/hashtable.h>
 

diff --git a/lib/octopus/server/init.c b/lib/octopus/server/init.c
index ae4439e..667dfd7 100644 (file)
--- a/lib/octopus/server/init.c
+++ b/lib/octopus/server/init.c
@@ -20,9 +20,9 @@
 #include <if/dist2_defs.h>
 #include <if/monitor_defs.h>
 
-#include <dist2_server/init.h>
-#include <dist2_server/service.h>
-#include <dist2_server/debug.h>
+#include <octopus_server/init.h>
+#include <octopus_server/service.h>
+#include <octopus_server/debug.h>
 
 #define DIST2_RPC_SERVICE_NAME "dist2_rpc"
 

diff --git a/lib/octopus/server/queue.h b/lib/octopus/server/queue.h
index 25d909e..89e3575 100644 (file)
--- a/lib/octopus/server/queue.h
+++ b/lib/octopus/server/queue.h
@@ -18,7 +18,7 @@
 #include <barrelfish/barrelfish.h>
 #include <if/dist2_defs.h>
 
-#include <dist2_server/service.h>
+#include <octopus_server/service.h>
 
 void dist_rpc_enqueue_reply(struct dist2_binding *b,
         struct dist_reply_state* st);

diff --git a/lib/octopus/server/service.c b/lib/octopus/server/service.c
index aca5719..247dd80 100644 (file)
--- a/lib/octopus/server/service.c
+++ b/lib/octopus/server/service.c
@@ -20,12 +20,12 @@
 #include <skb/skb.h> // read list
 #include <if/dist2_defs.h>
 
-#include <dist2_server/service.h>
-#include <dist2_server/query.h>
-#include <dist2_server/debug.h>
+#include <octopus_server/service.h>
+#include <octopus_server/query.h>
+#include <octopus_server/debug.h>
 
-#include <dist2/parser/ast.h>
-#include <dist2/definitions.h>
+#include <octopus/parser/ast.h>
+#include <octopus/definitions.h>
 
 #include <bench/bench.h>
 

diff --git a/usr/acpi/acpi.c b/usr/acpi/acpi.c
index ad1397a..1e0ab88 100644 (file)
--- a/usr/acpi/acpi.c
+++ b/usr/acpi/acpi.c
@@ -18,8 +18,8 @@
 #include <barrelfish_kpi/types.h>
 #include <acpi.h>
 #include <mm/mm.h>
-#include <dist2/getset.h>
-#include <dist2/barrier.h>
+#include <octopus/getset.h>
+#include <octopus/barrier.h>
 #include <skb/skb.h>
 #include <pci/confspace/pci_confspace.h>
 #include "acpi_shared.h"

diff --git a/usr/acpi/acpi_main.c b/usr/acpi/acpi_main.c
index a0d9909..dcc7569 100644 (file)
--- a/usr/acpi/acpi_main.c
+++ b/usr/acpi/acpi_main.c
@@ -20,7 +20,7 @@
 #include <mm/mm.h>
 #include <if/monitor_blocking_rpcclient_defs.h>
 
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 #include "acpi_debug.h"

diff --git a/usr/acpi/apic.c b/usr/acpi/apic.c
index 57acb77..17001b7 100644 (file)
--- a/usr/acpi/apic.c
+++ b/usr/acpi/apic.c
@@ -5,7 +5,7 @@
 #include <acpi.h>
 #include <mm/mm.h>
 #include <skb/skb.h>
-#include <dist2/getset.h>
+#include <octopus/getset.h>
 
 #include "acpi_shared.h"
 #include "acpi_debug.h"

diff --git a/usr/ioapic/interrupts.c b/usr/ioapic/interrupts.c
index 8010ac1..259c6b7 100644 (file)
--- a/usr/ioapic/interrupts.c
+++ b/usr/ioapic/interrupts.c
@@ -18,7 +18,7 @@
 #include <acpi.h> // see add interrupt override
 
 #include <skb/skb.h>
-#include <dist2/getset.h>
+#include <octopus/getset.h>
 
 #include "ioapic.h"
 #include "ioapic_debug.h"

diff --git a/usr/ioapic/ioapic_main.c b/usr/ioapic/ioapic_main.c
index f428fcc..64806b4 100644 (file)
--- a/usr/ioapic/ioapic_main.c
+++ b/usr/ioapic/ioapic_main.c
@@ -19,7 +19,7 @@
 #include <mm/mm.h>
 #include <if/monitor_blocking_rpcclient_defs.h>
 
-#include <dist2/init.h>
+#include <octopus/init.h>
 #include <skb/skb.h>
 
 #include "ioapic.h"

diff --git a/usr/kaluga/common.c b/usr/kaluga/common.c
index 729d50f..265df14 100644 (file)
--- a/usr/kaluga/common.c
+++ b/usr/kaluga/common.c
@@ -1,5 +1,5 @@
 #include <barrelfish/barrelfish.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "kaluga.h"
 

diff --git a/usr/kaluga/kaluga.h b/usr/kaluga/kaluga.h
index d71802d..6e6f2db 100644 (file)
--- a/usr/kaluga/kaluga.h
+++ b/usr/kaluga/kaluga.h
@@ -2,7 +2,7 @@
 #define KALUGA_H_
 
 #include <barrelfish/barrelfish.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "queue.h"
 #include "debug.h"

diff --git a/usr/kaluga/main.c b/usr/kaluga/main.c
index 678b1c5..eec0a10 100644 (file)
--- a/usr/kaluga/main.c
+++ b/usr/kaluga/main.c
@@ -28,7 +28,7 @@
 
 #include <if/monitor_defs.h>
 
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 #include "kaluga.h"

diff --git a/usr/kaluga/start_cpu.c b/usr/kaluga/start_cpu.c
index dcb54a0..269b207 100644 (file)
--- a/usr/kaluga/start_cpu.c
+++ b/usr/kaluga/start_cpu.c
@@ -22,7 +22,7 @@
 
 #include <if/monitor_defs.h>
 
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 #include "kaluga.h"

diff --git a/usr/kaluga/start_pci.c b/usr/kaluga/start_pci.c
index 271eac0..4ee9a27 100644 (file)
--- a/usr/kaluga/start_pci.c
+++ b/usr/kaluga/start_pci.c
@@ -19,7 +19,7 @@
 
 #include <barrelfish/barrelfish.h>
 
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 #include "kaluga.h"

diff --git a/usr/pci/pci.c b/usr/pci/pci.c
index 4ca25ff..928240b 100644 (file)
--- a/usr/pci/pci.c
+++ b/usr/pci/pci.c
@@ -23,7 +23,7 @@
 #include <pci/devids.h>
 #include <mm/mm.h>
 #include <skb/skb.h>
-#include <dist2/getset.h>
+#include <octopus/getset.h>
 #include <acpi_client/acpi_client.h>
 
 #include "pci.h"

diff --git a/usr/pci/pcimain.c b/usr/pci/pcimain.c
index d68056a..bbfe697 100644 (file)
--- a/usr/pci/pcimain.c
+++ b/usr/pci/pcimain.c
@@ -22,7 +22,7 @@
 #include <if/monitor_blocking_rpcclient_defs.h>
 
 #include <mm/mm.h>
-#include <dist2/init.h>
+#include <octopus/init.h>
 #include <skb/skb.h>
 #include <acpi_client/acpi_client.h>
 

diff --git a/usr/skb/dist/code_generator.h b/usr/skb/dist/code_generator.h
index ae6b9e5..e6568b1 100644 (file)
--- a/usr/skb/dist/code_generator.h
+++ b/usr/skb/dist/code_generator.h
@@ -16,7 +16,7 @@
 #define CODE_GENERATOR_H_
 
 #include <barrelfish/barrelfish.h>
-#include <dist2/parser/ast.h>
+#include <octopus/parser/ast.h>
 #include <eclipse.h>
 
 struct skb_ec_terms {

diff --git a/usr/skb/dist/predicates.c b/usr/skb/dist/predicates.c
index 2fcf0fd..74e9277 100644 (file)
--- a/usr/skb/dist/predicates.c
+++ b/usr/skb/dist/predicates.c
@@ -22,9 +22,9 @@
 #include <include/skb_server.h>
 #include <collections/hash_table.h>
 
-#include <dist2_server/debug.h>
-#include <dist2_server/service.h>
-#include <dist2/trigger.h> // for trigger modes
+#include <octopus_server/debug.h>
+#include <octopus_server/service.h>
+#include <octopus/trigger.h> // for trigger modes
 
 #include "predicates.h"
 #include "skiplist.h"

diff --git a/usr/skb/dist/skb_query.c b/usr/skb/dist/skb_query.c
index 4ab6359..2b3b9f5 100644 (file)
--- a/usr/skb/dist/skb_query.c
+++ b/usr/skb/dist/skb_query.c
@@ -23,10 +23,10 @@
 
 #include <include/skb_server.h>
 
-#include <dist2_server/debug.h>
-#include <dist2_server/query.h>
-#include <dist2/parser/ast.h>
-#include <dist2/getset.h> // for SET_SEQUENTIAL define
+#include <octopus_server/debug.h>
+#include <octopus_server/query.h>
+#include <octopus/parser/ast.h>
+#include <octopus/getset.h> // for SET_SEQUENTIAL define
 #include "code_generator.h"
 #include "bitfield.h"
 

diff --git a/usr/skb/skb_main.c b/usr/skb/skb_main.c
index f0351f2..1c84006 100644 (file)
--- a/usr/skb/skb_main.c
+++ b/usr/skb/skb_main.c
@@ -18,7 +18,7 @@
 #include <include/skb_server.h>
 #include <include/skb_debug.h>
 
-#include <dist2_server/init.h>
+#include <octopus_server/init.h>
 
 #include <bench/bench.h>
 

diff --git a/usr/tests/dist2test/d2barrier.c b/usr/tests/dist2test/d2barrier.c
index 0ab3084..8aff68e 100644 (file)
--- a/usr/tests/dist2test/d2barrier.c
+++ b/usr/tests/dist2test/d2barrier.c
@@ -17,7 +17,7 @@
 #include <assert.h>
 
 #include <barrelfish/barrelfish.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "common.h"
 

diff --git a/usr/tests/dist2test/d2bench.c b/usr/tests/dist2test/d2bench.c
index 3e2560a..28cd6a5 100644 (file)
--- a/usr/tests/dist2test/d2bench.c
+++ b/usr/tests/dist2test/d2bench.c
@@ -18,7 +18,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <bench/bench.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 #define MAX_ITERATIONS 500

diff --git a/usr/tests/dist2test/d2bench1.c b/usr/tests/dist2test/d2bench1.c
index 8dae8e5..3a36aa7 100644 (file)
--- a/usr/tests/dist2test/d2bench1.c
+++ b/usr/tests/dist2test/d2bench1.c
@@ -19,7 +19,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <bench/bench.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 /**

diff --git a/usr/tests/dist2test/d2bench2.c b/usr/tests/dist2test/d2bench2.c
index cb7935c..31109f7 100644 (file)
--- a/usr/tests/dist2test/d2bench2.c
+++ b/usr/tests/dist2test/d2bench2.c
@@ -20,7 +20,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <bench/bench.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 #define MAX_ITERATIONS 500

diff --git a/usr/tests/dist2test/d2bench3.c b/usr/tests/dist2test/d2bench3.c
index 319a4e1..f9b1171 100644 (file)
--- a/usr/tests/dist2test/d2bench3.c
+++ b/usr/tests/dist2test/d2bench3.c
@@ -19,7 +19,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <bench/bench.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 #include <skb/skb.h>
 
 #define MAX_SEND 100000

diff --git a/usr/tests/dist2test/d2getset.c b/usr/tests/dist2test/d2getset.c
index f4c4d49..415907e 100644 (file)
--- a/usr/tests/dist2test/d2getset.c
+++ b/usr/tests/dist2test/d2getset.c
@@ -19,7 +19,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <skb/skb.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "common.h"
 

diff --git a/usr/tests/dist2test/d2locksimple.c b/usr/tests/dist2test/d2locksimple.c
index eaed1c5..50b2333 100644 (file)
--- a/usr/tests/dist2test/d2locksimple.c
+++ b/usr/tests/dist2test/d2locksimple.c
@@ -21,7 +21,7 @@
 #include <barrelfish/deferred.h>
 
 #include <skb/skb.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #define LOCKIT_CALLS 100000
 

diff --git a/usr/tests/dist2test/d2pubsub.c b/usr/tests/dist2test/d2pubsub.c
index 1dd17a8..1e08eb6 100644 (file)
--- a/usr/tests/dist2test/d2pubsub.c
+++ b/usr/tests/dist2test/d2pubsub.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "common.h"
 

diff --git a/usr/tests/dist2test/d2read.c b/usr/tests/dist2test/d2read.c
index 5eeb614..9187db6 100644 (file)
--- a/usr/tests/dist2test/d2read.c
+++ b/usr/tests/dist2test/d2read.c
@@ -21,7 +21,7 @@
 #include <barrelfish/deferred.h>
 
 #include <skb/skb.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "common.h"
 

diff --git a/usr/tests/dist2test/d2sem.c b/usr/tests/dist2test/d2sem.c
index ea07d45..b998488 100644 (file)
--- a/usr/tests/dist2test/d2sem.c
+++ b/usr/tests/dist2test/d2sem.c
@@ -18,7 +18,7 @@
 #include <assert.h>
 
 #include <barrelfish/barrelfish.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "common.h"
 

diff --git a/usr/tests/dist2test/d2trigger.c b/usr/tests/dist2test/d2trigger.c
index 280c8f5..f90ab0d 100644 (file)
--- a/usr/tests/dist2test/d2trigger.c
+++ b/usr/tests/dist2test/d2trigger.c
@@ -21,7 +21,7 @@
 #include <barrelfish/deferred.h>
 
 #include <skb/skb.h>
-#include <dist2/dist2.h>
+#include <octopus/dist2.h>
 
 #include "common.h"
 

diff --git a/usr/tests/dist2test/thc.c b/usr/tests/dist2test/thc.c
index 19866ff..cd3cb88 100644 (file)
--- a/usr/tests/dist2test/thc.c
+++ b/usr/tests/dist2test/thc.c
@@ -23,7 +23,7 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/threads.h>
 
-//#include <dist2/getset.h>
+//#include <octopus/getset.h>
 
 #include <thc/thc.h>
 #include <if/dist2_defs.h>