From: Roni Häcki <roni.haecki@inf.ethz.ch>
Date: Tue, 3 Oct 2017 08:33:08 +0000 (+0200)
Subject: proc_mgmt: fixed several dependency issues
X-Git-Tag: release2017-10-12~4
X-Git-Url: http://git.barrelfish.org/?p=barrelfish;a=commitdiff_plain;h=fa3d685f17b47fb6835c6c10c2bdccd709ddb7f2

proc_mgmt: fixed several dependency issues

Signed-off-by: Roni Häcki <roni.haecki@inf.ethz.ch>
---

diff --git a/include/barrelfish/proc_mgmt_client.h b/include/barrelfish/proc_mgmt_client.h
index 6384d1d..ffafa30 100644
--- a/include/barrelfish/proc_mgmt_client.h
+++ b/include/barrelfish/proc_mgmt_client.h
@@ -15,13 +15,17 @@
 #ifndef BARRELFISH_PROC_MGMT_CLIENT_H
 #define BARRELFISH_PROC_MGMT_CLIENT_H
 
-#include <if/proc_mgmt_defs.h>
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 
 struct proc_mgmt_lmp_binding;
 
+
+/* XXX: duplicate of proc_mgmt_bind_continuation_fn in generated code */
+typedef void proc_mgmt_bind_continuation_fn(void *st, errval_t err,
+                                            struct proc_mgmt_binding *_binding);
+
 errval_t proc_mgmt_client_lmp_accept(struct proc_mgmt_lmp_binding *lmpb,
                                      struct waitset *ws,
                                      size_t lmp_buflen_words);
diff --git a/lib/barrelfish/Hakefile b/lib/barrelfish/Hakefile
index a5ebbc4..aa66202 100644
--- a/lib/barrelfish/Hakefile
+++ b/lib/barrelfish/Hakefile
@@ -112,6 +112,7 @@ in
                     cFiles = arch_srcs arch ++ archfam_srcs (archFamily arch)
                              ++ common_srcs ++ idc_srcs,
                     assemblyFiles = arch_assembly (archFamily arch),
+                    flounderDefs = [ "proc_mgmt" ],
                     flounderBindings = [ "mem", "octopus", "interdisp", "spawn",
                                          "proc_mgmt", "terminal", "arrakis",
                                          "terminal_config" ],
diff --git a/usr/monitor/Hakefile b/usr/monitor/Hakefile
index 26298ce..47cf6fb 100644
--- a/usr/monitor/Hakefile
+++ b/usr/monitor/Hakefile
@@ -49,11 +49,12 @@
     build application { target = "monitor",
                         architectures = [arch],
                         cFiles = common_srcs ++ arch_srcs arch ++ idc_srcs,
-                        flounderDefs = [ "mem", "monitor", "monitor_blocking" ],
+                        flounderDefs = [ "mem", "monitor", "monitor_blocking", "proc_mgmt" ],
                         flounderBindings = [ "monitor_mem", "intermon" ],
                         flounderExtraBindings = [ ("monitor", ["loopback"]),
                                                   ("monitor_mem", ["rpcclient"]),
                                                   ("mem", ["rpcclient"]),
+                                                  ("proc_mgmt", ["rpcclient"]),
                                                   ("octopus", ["rpcclient"]) ],
                         addLinkFlags = [ "-e _start_init" ],
                         addIncludes = "include" : [ "include" </> a | a <- arch_dirs arch ],
diff --git a/usr/monitor/monitor_server.c b/usr/monitor/monitor_server.c
index 7757173..37094bf 100644
--- a/usr/monitor/monitor_server.c
+++ b/usr/monitor/monitor_server.c
@@ -18,6 +18,7 @@
 #include <trace/trace.h>
 #include <trace_definitions/trace_defs.h>
 #include <if/mem_defs.h>
+#include <if/proc_mgmt_defs.h>
 #include <barrelfish/monitor_client.h>
 #include <barrelfish/proc_mgmt_client.h>
 #include <barrelfish/syscalls.h>
diff --git a/usr/tests/proc_mgmt_test/main.c b/usr/tests/proc_mgmt_test/main.c
index 07e94d2..9d33977 100644
--- a/usr/tests/proc_mgmt_test/main.c
+++ b/usr/tests/proc_mgmt_test/main.c
@@ -15,6 +15,7 @@
 
 #include <barrelfish/barrelfish.h>
 #include <barrelfish/deferred.h>
+#include <barrelfish/sys_debug.h>
 #include <barrelfish/proc_mgmt_client.h>
 #include <barrelfish/spawn_client.h>
 #include <bench/bench.h>