Removed if/octopus_defs.h from public header file.

Referenced in definitions.h and trigger.h.

trigger.h is problematic because it provides helper functions for
types definied in the interface. Clients that want to use trigger.h
now have to make sure to include the interface file.

Signed-off-by: Gerd Zellweger <mail@gerdzellweger.com>

diff --git a/include/octopus/definitions.h b/include/octopus/definitions.h
index 3699ce3..0a1d4f0 100644 (file)
--- a/include/octopus/definitions.h
+++ b/include/octopus/definitions.h
@@ -18,15 +18,14 @@
 #ifndef OCTOPUS_DEFINITIONS_H_
 #define OCTOPUS_DEFINITIONS_H_
 
-#include <if/octopus_defs.h>
 #include <bitmacros.h>
 
 /* compile max response length as maximum of possible interface sizes */
-#define MAX_QUERY_LENGTH \
-MAX(octopus__get_names_response_output_MAX_ARGUMENT_SIZE, \
-MAX(octopus__get_response_output_MAX_ARGUMENT_SIZE, \
-octopus__get_with_idcap_response_output_MAX_ARGUMENT_SIZE))
-
+//#define MAX_QUERY_LENGTH
+//MAX(octopus__get_names_response_output_MAX_ARGUMENT_SIZE,
+//MAX(octopus__get_response_output_MAX_ARGUMENT_SIZE,
+//octopus__get_with_idcap_response_output_MAX_ARGUMENT_SIZE))
+#define MAX_QUERY_LENGTH 4096
 
 
 //

diff --git a/include/octopus/octopus.h b/include/octopus/octopus.h
index 9d613a1..81a9cb4 100644 (file)
--- a/include/octopus/octopus.h
+++ b/include/octopus/octopus.h
@@ -17,10 +17,8 @@
 
 #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 /* OCTOPUS_H_ */

diff --git a/include/octopus/pubsub.h b/include/octopus/pubsub.h
index 60ba118..654f5a3 100644 (file)
--- a/include/octopus/pubsub.h
+++ b/include/octopus/pubsub.h
@@ -16,10 +16,9 @@
 #define OCTOPUS_PUBSUB_H_
 
 #include <stdint.h>
-#include <octopus/trigger.h>
 
-typedef octopus_trigger_id_t subscription_t;
-typedef trigger_handler_fn subscription_handler_fn;
+typedef uint64_t subscription_t;
+typedef void(*subscription_handler_fn)(octopus_mode_t mode, const char* record, void* state);
 
 errval_t oct_subscribe(subscription_handler_fn, const void*, subscription_t*,
         const char*, ...);

diff --git a/lib/barrelfish/spawn_client.c b/lib/barrelfish/spawn_client.c
index 594d208..0350c5e 100644 (file)
--- a/lib/barrelfish/spawn_client.c
+++ b/lib/barrelfish/spawn_client.c
@@ -23,12 +23,13 @@
 #include <if/spawn_defs.h>
 #include <if/arrakis_defs.h>
 #include <if/monitor_defs.h>
+#include <if/octopus_defs.h>
 #include <vfs/vfs_path.h>
 
 // For spawn_program_on_all_cores
 #include <octopus/getset.h> // for oct_read TODO
 #include <octopus/trigger.h> // for NOP_TRIGGER
-#include <if/octopus_defs.h>
+
 
 
 extern char **environ;

diff --git a/lib/octopus/client/barriers.c b/lib/octopus/client/barriers.c
index eafa458..c2df1c2 100644 (file)
--- a/lib/octopus/client/barriers.c
+++ b/lib/octopus/client/barriers.c
@@ -16,12 +16,13 @@
 
 #include <barrelfish/barrelfish.h>
 
+#include <if/octopus_defs.h>
+#include <if/octopus_thc.h>
+
 #include <octopus/init.h>
 #include <octopus/barrier.h>
 #include <octopus/getset.h>
 #include <octopus/trigger.h>
-#include <if/octopus_defs.h>
-#include <if/octopus_thc.h>
 
 #include "common.h"
 

diff --git a/lib/octopus/client/getset.c b/lib/octopus/client/getset.c
index a4b0e64..de4a155 100644 (file)
--- a/lib/octopus/client/getset.c
+++ b/lib/octopus/client/getset.c
@@ -21,16 +21,16 @@
 
 #include <barrelfish/barrelfish.h>
 
+#include <if/octopus_defs.h>
+#include <if/octopus_thc.h>
+
 #include <octopus/init.h>
 #include <octopus/getset.h>
 #include <octopus/parser/ast.h>
 #include <octopus/trigger.h>
-#include <if/octopus_defs.h>
-#include <if/octopus_thc.h>
 
 #include "common.h"
 
-
 /**
  * \brief Retrieve all record names matching a given query.
  *

diff --git a/lib/octopus/client/locking.c b/lib/octopus/client/locking.c
index fad5e1b..1f0a8b7 100644 (file)
--- a/lib/octopus/client/locking.c
+++ b/lib/octopus/client/locking.c
@@ -15,12 +15,13 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/threads.h>
 
+#include <if/octopus_defs.h>
+#include <if/octopus_thc.h>
+
 #include <octopus/init.h>
 #include <octopus/lock.h>
 #include <octopus/getset.h>
 #include <octopus/trigger.h>
-#include <if/octopus_defs.h>
-#include <if/octopus_thc.h>
 
 #include "common.h"
 

diff --git a/lib/octopus/client/pubsub.c b/lib/octopus/client/pubsub.c
index cb2fcf2..e7378bb 100644 (file)
--- a/lib/octopus/client/pubsub.c
+++ b/lib/octopus/client/pubsub.c
@@ -22,11 +22,12 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/threads.h>
 
-#include <octopus/init.h>
-#include <octopus/pubsub.h>
 #include <if/octopus_defs.h>
 #include <if/octopus_thc.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 10386e2..27b84de 100644 (file)
--- a/lib/octopus/client/semaphores.c
+++ b/lib/octopus/client/semaphores.c
@@ -14,13 +14,14 @@
 
 #include <barrelfish/barrelfish.h>
 
+#include <if/octopus_defs.h>
+#include <if/octopus_thc.h>
+
 #include <octopus/init.h>
 #include <octopus/getset.h>
 #include <octopus/trigger.h>
 #include <octopus/lock.h>
 #include <octopus/semaphores.h>
-#include <if/octopus_defs.h>
-#include <if/octopus_thc.h>
 
 #include "common.h"
 

diff --git a/lib/octopus/client/trigger.c b/lib/octopus/client/trigger.c
index 652ab01..81d41b5 100644 (file)
--- a/lib/octopus/client/trigger.c
+++ b/lib/octopus/client/trigger.c
@@ -17,11 +17,12 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/threads.h>
 
+#include <if/octopus_defs.h>
+#include <if/octopus_thc.h>
+
 #include <octopus/init.h>
 #include <octopus/getset.h>
 #include <octopus/trigger.h>
-#include <if/octopus_defs.h>
-#include <if/octopus_thc.h>
 
 #include "handler.h"
 #include "common.h"

diff --git a/lib/posixcompat/pty.c b/lib/posixcompat/pty.c
index 71f64cd..f1497e8 100644 (file)
--- a/lib/posixcompat/pty.c
+++ b/lib/posixcompat/pty.c
@@ -25,8 +25,8 @@
 #include <barrelfish/waitset.h>
 #include <collections/list.h>
 #include <if/octopus_defs.h>
-#include <if/octopus_defs.h>
 #include <octopus/octopus.h>
+#include <octopus/trigger.h>
 #include <posixcompat.h>
 #include <term/server/server.h>
 #include <vfs/fdtab.h>

diff --git a/usr/acpi/acpi_main.c b/usr/acpi/acpi_main.c
index 087ca30..4c5ec6c 100644 (file)
--- a/usr/acpi/acpi_main.c
+++ b/usr/acpi/acpi_main.c
@@ -135,4 +135,3 @@ int main(int argc, char *argv[])
 
     messages_handler_loop();
 }
-

diff --git a/usr/drivers/e1000/e1000n.c b/usr/drivers/e1000/e1000n.c
index a8091fd..8398f14 100644 (file)
--- a/usr/drivers/e1000/e1000n.c
+++ b/usr/drivers/e1000/e1000n.c
@@ -41,9 +41,13 @@
 #include <string.h>
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/nameservice_client.h>
+
+#include <if/octopus_defs.h>
+#include <if/net_queue_manager_defs.h>
+
 #include <octopus/octopus.h>
+#include <octopus/trigger.h>
 #include <net_queue_manager/net_queue_manager.h>
-#include <if/net_queue_manager_defs.h>
 #include <trace/trace.h>
 #ifdef LIBRARY
 #       include <netif/e1000.h>

diff --git a/usr/drivers/xeon_phi/domain.c b/usr/drivers/xeon_phi/domain.c
index d4cf788..91363fe 100644 (file)
--- a/usr/drivers/xeon_phi/domain.c
+++ b/usr/drivers/xeon_phi/domain.c
@@ -15,12 +15,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <barrelfish/barrelfish.h>
-#include <octopus/octopus.h>
 
 #include <if/octopus_defs.h>
-#include <if/octopus_defs.h>
 #include <if/octopus_thc.h>
 
+#include <octopus/octopus.h>
+#include <octopus/trigger.h>
+
 #include "xeon_phi_internal.h"
 #include "domain.h"
 #include "interphi.h"

diff --git a/usr/kaluga/start_cpu.c b/usr/kaluga/start_cpu.c
index cfa2a29..5632ed3 100644 (file)
--- a/usr/kaluga/start_cpu.c
+++ b/usr/kaluga/start_cpu.c
@@ -21,8 +21,11 @@
 #include <barrelfish/cpu_arch.h>
 
 #include <if/monitor_defs.h>
+#include <if/octopus_defs.h>
 
 #include <octopus/octopus.h>
+#include <octopus/trigger.h>
+
 #include <skb/skb.h>
 #include <trace/trace.h>
 #include <barrelfish/spawn_client.h>

diff --git a/usr/kaluga/start_int_ctrl.c b/usr/kaluga/start_int_ctrl.c
index d9a4ea6..1f53db4 100644 (file)
--- a/usr/kaluga/start_int_ctrl.c
+++ b/usr/kaluga/start_int_ctrl.c
@@ -20,8 +20,12 @@
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/spawn_client.h>
 
-#include <octopus/octopus.h>
+#include <if/octopus_defs.h>
 #include <if/octopus_thc.h>
+
+#include <octopus/octopus.h>
+#include <octopus/trigger.h>
+
 #include <skb/skb.h>
 #include <thc/thc.h>
 

diff --git a/usr/kaluga/start_pci.c b/usr/kaluga/start_pci.c
index 43bfcb8..477d431 100644 (file)
--- a/usr/kaluga/start_pci.c
+++ b/usr/kaluga/start_pci.c
@@ -19,8 +19,12 @@
 
 #include <barrelfish/barrelfish.h>
 
-#include <octopus/octopus.h>
+#include <if/octopus_defs.h>
 #include <if/octopus_thc.h>
+
+#include <octopus/octopus.h>
+#include <octopus/trigger.h>
+
 #include <skb/skb.h>
 #include <thc/thc.h>
 
@@ -87,11 +91,11 @@ static void pci_change_event(octopus_mode_t mode, const char* device_record,
         if (err_is_fail(err)) {
             USER_PANIC_ERR(err, "Got malformed device record?");
         }
-        
+
         /* duplicate device record as we may need it for later */
         device_record = strdup(device_record);
         assert(device_record);
-        
+
 
         // Ask the SKB which binary and where to start it...
         static char* query = "find_pci_driver(pci_card(%"PRIu64", %"PRIu64", _, _, _), Driver),"
@@ -289,7 +293,7 @@ errval_t watch_for_pci_root_bridge(void)
     assert(err_is_ok(err));
     err = sys_debug_create_irq_src_cap(all_irq_cap, 0, 65536);
     assert(err_is_ok(err));
-    
+
 #endif
     static char* root_bridge = "r'hw\\.pci\\.rootbridge\\.[0-9]+' { "
                                " bus: _, device: _, function: _, maxbus: _,"