some renaming

--HG--
branch : octopus.renaming
rename : include/dist2/barrier.h => include/octopus/barrier.h
rename : include/dist2/capability_storage.h => include/octopus/capability_storage.h
rename : include/dist2/definitions.h => include/octopus/definitions.h
rename : include/dist2/dist2.h => include/octopus/dist2.h
rename : include/dist2/getset.h => include/octopus/getset.h
rename : include/dist2/init.h => include/octopus/init.h
rename : include/dist2/lock.h => include/octopus/lock.h
rename : include/dist2/parser/ast.h => include/octopus/parser/ast.h
rename : include/dist2/pubsub.h => include/octopus/pubsub.h
rename : include/dist2/semaphores.h => include/octopus/semaphores.h
rename : include/dist2/trigger.h => include/octopus/trigger.h
rename : include/dist2_server/debug.h => include/octopus_server/debug.h
rename : include/dist2_server/init.h => include/octopus_server/init.h
rename : include/dist2_server/query.h => include/octopus_server/query.h
rename : include/dist2_server/service.h => include/octopus_server/service.h
rename : lib/dist2/Hakefile => lib/octopus/Hakefile
rename : lib/dist2/client/barriers.c => lib/octopus/client/barriers.c
rename : lib/dist2/client/capability_storage.c => lib/octopus/client/capability_storage.c
rename : lib/dist2/client/common.h => lib/octopus/client/common.h
rename : lib/dist2/client/getset.c => lib/octopus/client/getset.c
rename : lib/dist2/client/handler.h => lib/octopus/client/handler.h
rename : lib/dist2/client/locking.c => lib/octopus/client/locking.c
rename : lib/dist2/client/nameservice_client.c => lib/octopus/client/nameservice_client.c
rename : lib/dist2/client/dist2.c => lib/octopus/client/octopus.c
rename : lib/dist2/client/pubsub.c => lib/octopus/client/pubsub.c
rename : lib/dist2/client/semaphores.c => lib/octopus/client/semaphores.c
rename : lib/dist2/client/strnatcmp.c => lib/octopus/client/strnatcmp.c
rename : lib/dist2/client/strnatcmp.h => lib/octopus/client/strnatcmp.h
rename : lib/dist2/client/trigger.c => lib/octopus/client/trigger.c
rename : lib/dist2/parser/Makefile => lib/octopus/parser/Makefile
rename : lib/dist2/parser/ast.c => lib/octopus/parser/ast.c
rename : lib/dist2/parser/flex.h => lib/octopus/parser/flex.h
rename : lib/dist2/parser/parse.c => lib/octopus/parser/parse.c
rename : lib/dist2/parser/parse.y => lib/octopus/parser/parse.y
rename : lib/dist2/parser/read.c => lib/octopus/parser/read.c
rename : lib/dist2/parser/scan.c => lib/octopus/parser/scan.c
rename : lib/dist2/parser/scan.l => lib/octopus/parser/scan.l
rename : lib/dist2/parser/test_parser.c => lib/octopus/parser/test_parser.c
rename : lib/dist2/parser/y.tab.h => lib/octopus/parser/y.tab.h
rename : lib/dist2/server/capstorage.c => lib/octopus/server/capstorage.c
rename : lib/dist2/server/init.c => lib/octopus/server/init.c
rename : lib/dist2/server/queue.c => lib/octopus/server/queue.c
rename : lib/dist2/server/queue.h => lib/octopus/server/queue.h
rename : lib/dist2/server/service.c => lib/octopus/server/service.c

diff --git a/include/dist2/barrier.h b/include/octopus/barrier.h
similarity index 100%
rename from include/dist2/barrier.h
rename to include/octopus/barrier.h

diff --git a/include/dist2/capability_storage.h b/include/octopus/capability_storage.h
similarity index 100%
rename from include/dist2/capability_storage.h
rename to include/octopus/capability_storage.h

diff --git a/include/dist2/definitions.h b/include/octopus/definitions.h
similarity index 100%
rename from include/dist2/definitions.h
rename to include/octopus/definitions.h

diff --git a/include/dist2/dist2.h b/include/octopus/dist2.h
similarity index 100%
rename from include/dist2/dist2.h
rename to include/octopus/dist2.h

diff --git a/include/dist2/getset.h b/include/octopus/getset.h
similarity index 100%
rename from include/dist2/getset.h
rename to include/octopus/getset.h

diff --git a/include/dist2/init.h b/include/octopus/init.h
similarity index 100%
rename from include/dist2/init.h
rename to include/octopus/init.h

diff --git a/include/dist2/lock.h b/include/octopus/lock.h
similarity index 100%
rename from include/dist2/lock.h
rename to include/octopus/lock.h

diff --git a/include/dist2/parser/ast.h b/include/octopus/parser/ast.h
similarity index 100%
rename from include/dist2/parser/ast.h
rename to include/octopus/parser/ast.h

diff --git a/include/dist2/pubsub.h b/include/octopus/pubsub.h
similarity index 100%
rename from include/dist2/pubsub.h
rename to include/octopus/pubsub.h

diff --git a/include/dist2/semaphores.h b/include/octopus/semaphores.h
similarity index 100%
rename from include/dist2/semaphores.h
rename to include/octopus/semaphores.h

diff --git a/include/dist2/trigger.h b/include/octopus/trigger.h
similarity index 100%
rename from include/dist2/trigger.h
rename to include/octopus/trigger.h

diff --git a/include/dist2_server/debug.h b/include/octopus_server/debug.h
similarity index 100%
rename from include/dist2_server/debug.h
rename to include/octopus_server/debug.h

diff --git a/include/dist2_server/init.h b/include/octopus_server/init.h
similarity index 100%
rename from include/dist2_server/init.h
rename to include/octopus_server/init.h

diff --git a/include/dist2_server/query.h b/include/octopus_server/query.h
similarity index 100%
rename from include/dist2_server/query.h
rename to include/octopus_server/query.h

diff --git a/include/dist2_server/service.h b/include/octopus_server/service.h
similarity index 100%
rename from include/dist2_server/service.h
rename to include/octopus_server/service.h

diff --git a/lib/barrelfish/nameservice_client.c b/lib/barrelfish/nameservice_client.c
index b87662f..e42f89d 100644 (file)
--- a/lib/barrelfish/nameservice_client.c
+++ b/lib/barrelfish/nameservice_client.c
@@ -19,8 +19,8 @@
 #include <if/dist2_defs.h>
 #include <if/dist2_rpcclient_defs.h>
 #include <if/monitor_defs.h>
-#include <dist2/getset.h> // for dist_read TODO
-#include <dist2/trigger.h> // for NOP_TRIGGER
+#include <octopus/getset.h> // for dist_read TODO
+#include <octopus/trigger.h> // for NOP_TRIGGER
 
 /**
  * \brief Non-blocking name service lookup

diff --git a/lib/dist2/Hakefile b/lib/octopus/Hakefile
similarity index 73%
rename from lib/dist2/Hakefile
rename to lib/octopus/Hakefile
index 873c8f4..44ada8b 100644 (file)
--- a/lib/dist2/Hakefile
+++ b/lib/octopus/Hakefile
@@ -6,12 +6,12 @@
 -- If you do not find this file, copies can be found by writing to:
 -- ETH Zurich D-INFK, Haldeneggsteig 4, CH-8092 Zurich. Attn: Systems Group.
 --
--- Hakefile for lib/dist2
+-- Hakefile for lib/octopus
 -- 
 --------------------------------------------------------------------------
 
 [
-    build library { target = "dist_parser",
+    build library { target = "octopus_parser",
                     addCFlags = [ "-O3",
                                   "-Wno-unused-value", 
                                   "-Wno-redundant-decls", 
@@ -25,25 +25,26 @@
      -- no-implicit-function-declaration:
      -- warning: implicit declaration of function ‘yylex’ 
 
-     build library { target = "dist2",
+     build library { target = "octopus",
                      addCFlags = [ "-O2" ],
-                    cFiles = [ "client/dist2.c", "client/getset.c", "client/pubsub.c", 
+                    cFiles = [ "client/octopus.c", "client/getset.c", 
+                               "client/pubsub.c",
                                "client/barriers.c", "client/trigger.c",
                                "client/locking.c", "client/semaphores.c", 
                                "client/capability_storage.c", 
                                "client/strnatcmp.c" ],
-                    flounderDefs = [ "dist2" ],
-                    flounderBindings = [ "dist2" ],
-                    flounderExtraBindings = [ ("dist2", ["rpcclient"]) ],
-                    flounderTHCStubs = [ "dist2" ],
-                    addLibraries = ["dist_parser", "thc"]
+                    flounderDefs = [ "octopus" ],
+                    flounderBindings = [ "octopus" ],
+                    flounderExtraBindings = [ ("octopus", ["rpcclient"]) ],
+                    flounderTHCStubs = [ "octopus" ],
+                    addLibraries = ["octopus_parser", "thc"]
                   },
                   
-    build library { target = "dist_server",
+    build library { target = "octopus_server",
                     addCFlags = [ "-O2" ],
                     cFiles = [ "server/service.c", "server/init.c", 
                                "server/queue.c", "server/capstorage.c" ],
-                    flounderBindings = [ "dist2" ],
+                    flounderBindings = [ "octopus" ],
                     addLibraries = [ "skb", "hashtable" ] 
                    }
 ]

diff --git a/lib/dist2/client/barriers.c b/lib/octopus/client/barriers.c
similarity index 100%
rename from lib/dist2/client/barriers.c
rename to lib/octopus/client/barriers.c

diff --git a/lib/dist2/client/capability_storage.c b/lib/octopus/client/capability_storage.c
similarity index 100%
rename from lib/dist2/client/capability_storage.c
rename to lib/octopus/client/capability_storage.c

diff --git a/lib/dist2/client/common.h b/lib/octopus/client/common.h
similarity index 100%
rename from lib/dist2/client/common.h
rename to lib/octopus/client/common.h

diff --git a/lib/dist2/client/getset.c b/lib/octopus/client/getset.c
similarity index 100%
rename from lib/dist2/client/getset.c
rename to lib/octopus/client/getset.c

diff --git a/lib/dist2/client/handler.h b/lib/octopus/client/handler.h
similarity index 100%
rename from lib/dist2/client/handler.h
rename to lib/octopus/client/handler.h

diff --git a/lib/dist2/client/locking.c b/lib/octopus/client/locking.c
similarity index 100%
rename from lib/dist2/client/locking.c
rename to lib/octopus/client/locking.c

diff --git a/lib/dist2/client/nameservice_client.c b/lib/octopus/client/nameservice_client.c
similarity index 100%
rename from lib/dist2/client/nameservice_client.c
rename to lib/octopus/client/nameservice_client.c

diff --git a/lib/dist2/client/dist2.c b/lib/octopus/client/octopus.c
similarity index 100%
rename from lib/dist2/client/dist2.c
rename to lib/octopus/client/octopus.c

diff --git a/lib/dist2/client/pubsub.c b/lib/octopus/client/pubsub.c
similarity index 100%
rename from lib/dist2/client/pubsub.c
rename to lib/octopus/client/pubsub.c

diff --git a/lib/dist2/client/semaphores.c b/lib/octopus/client/semaphores.c
similarity index 100%
rename from lib/dist2/client/semaphores.c
rename to lib/octopus/client/semaphores.c

diff --git a/lib/dist2/client/strnatcmp.c b/lib/octopus/client/strnatcmp.c
similarity index 100%
rename from lib/dist2/client/strnatcmp.c
rename to lib/octopus/client/strnatcmp.c

diff --git a/lib/dist2/client/strnatcmp.h b/lib/octopus/client/strnatcmp.h
similarity index 100%
rename from lib/dist2/client/strnatcmp.h
rename to lib/octopus/client/strnatcmp.h

diff --git a/lib/dist2/client/trigger.c b/lib/octopus/client/trigger.c
similarity index 100%
rename from lib/dist2/client/trigger.c
rename to lib/octopus/client/trigger.c

diff --git a/lib/dist2/parser/Makefile b/lib/octopus/parser/Makefile
similarity index 100%
rename from lib/dist2/parser/Makefile
rename to lib/octopus/parser/Makefile

diff --git a/lib/dist2/parser/ast.c b/lib/octopus/parser/ast.c
similarity index 100%
rename from lib/dist2/parser/ast.c
rename to lib/octopus/parser/ast.c

diff --git a/lib/dist2/parser/flex.h b/lib/octopus/parser/flex.h
similarity index 100%
rename from lib/dist2/parser/flex.h
rename to lib/octopus/parser/flex.h

diff --git a/lib/dist2/parser/parse.c b/lib/octopus/parser/parse.c
similarity index 100%
rename from lib/dist2/parser/parse.c
rename to lib/octopus/parser/parse.c

diff --git a/lib/dist2/parser/parse.y b/lib/octopus/parser/parse.y
similarity index 100%
rename from lib/dist2/parser/parse.y
rename to lib/octopus/parser/parse.y

diff --git a/lib/dist2/parser/read.c b/lib/octopus/parser/read.c
similarity index 100%
rename from lib/dist2/parser/read.c
rename to lib/octopus/parser/read.c

diff --git a/lib/dist2/parser/scan.c b/lib/octopus/parser/scan.c
similarity index 100%
rename from lib/dist2/parser/scan.c
rename to lib/octopus/parser/scan.c

diff --git a/lib/dist2/parser/scan.l b/lib/octopus/parser/scan.l
similarity index 100%
rename from lib/dist2/parser/scan.l
rename to lib/octopus/parser/scan.l

diff --git a/lib/dist2/parser/test_parser.c b/lib/octopus/parser/test_parser.c
similarity index 100%
rename from lib/dist2/parser/test_parser.c
rename to lib/octopus/parser/test_parser.c

diff --git a/lib/dist2/parser/y.tab.h b/lib/octopus/parser/y.tab.h
similarity index 100%
rename from lib/dist2/parser/y.tab.h
rename to lib/octopus/parser/y.tab.h

diff --git a/lib/dist2/server/capstorage.c b/lib/octopus/server/capstorage.c
similarity index 100%
rename from lib/dist2/server/capstorage.c
rename to lib/octopus/server/capstorage.c

diff --git a/lib/dist2/server/init.c b/lib/octopus/server/init.c
similarity index 100%
rename from lib/dist2/server/init.c
rename to lib/octopus/server/init.c

diff --git a/lib/dist2/server/queue.c b/lib/octopus/server/queue.c
similarity index 100%
rename from lib/dist2/server/queue.c
rename to lib/octopus/server/queue.c

diff --git a/lib/dist2/server/queue.h b/lib/octopus/server/queue.h
similarity index 100%
rename from lib/dist2/server/queue.h
rename to lib/octopus/server/queue.h

diff --git a/lib/dist2/server/service.c b/lib/octopus/server/service.c
similarity index 100%
rename from lib/dist2/server/service.c
rename to lib/octopus/server/service.c

diff --git a/lib/posixcompat/semaphore.c b/lib/posixcompat/semaphore.c
index e7f9e5a..f5cbcbe 100644 (file)
--- a/lib/posixcompat/semaphore.c
+++ b/lib/posixcompat/semaphore.c
@@ -15,8 +15,8 @@
 #include <string.h>
 #include "posixcompat.h"
 
-#include <dist2/init.h>
-#include <dist2/semaphores.h>
+#include <octopus/init.h>
+#include <octopus/semaphores.h>
 
 
 int sem_init(sem_t *sem, int pshared, unsigned int value)

diff --git a/lib/posixcompat/shm.c b/lib/posixcompat/shm.c
index d4c6be7..22a14f3 100644 (file)
--- a/lib/posixcompat/shm.c
+++ b/lib/posixcompat/shm.c
@@ -14,8 +14,8 @@
 #include <errno.h>
 #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>
 #include "fdtab.h"
 #include "posixcompat.h"