Merge pull request #13 from jonludlam/link-stubs

Link stubs
xapi-project · Jun 1, 2014 · 0868f57 · 0868f57
2 parents 6b9ad3b + 418dabb
commit 0868f57
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 14 deletions.
diff --git a/_oasis b/_oasis
@@ -22,5 +22,5 @@ Executable "xcp-rrdd"
   MainIs:             xcp_rrdd.ml
   Custom:             true
   Install:            true
-  BuildDepends:       threads, rpclib, rpclib.unix, gzip, forkexec, stdext, uuid, http-svr, xcp-inventory, xcp-rrd, rrdd-libs, xcp, xcp.rrd, xcp.network, xcp.xen, xenctrl, xenops, rrd-transport, threads, rpclib.syntax
+  BuildDepends:       threads, rpclib, rpclib.unix, gzip, forkexec, stdext, uuid, http-svr, xcp-inventory, xcp-rrd, rrdd-libs, xcp, xcp.rrd, xcp.network, xcp.xen, xenops, rrd-transport, threads, rpclib.syntax, io-page.unix, xen-gnt.unix
 
diff --git a/_tags b/_tags
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 248490cae68fda6339fe3458d5ebe40a)
+# DO NOT EDIT (digest: 8e4c3ba86cdb89f74f649d353c23f4d7)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -26,6 +26,7 @@
 <rrdd/xcp_rrdd.{native,byte}>: pkg_forkexec
 <rrdd/xcp_rrdd.{native,byte}>: pkg_gzip
 <rrdd/xcp_rrdd.{native,byte}>: pkg_http-svr
+<rrdd/xcp_rrdd.{native,byte}>: pkg_io-page.unix
 <rrdd/xcp_rrdd.{native,byte}>: pkg_rpclib
 <rrdd/xcp_rrdd.{native,byte}>: pkg_rpclib.syntax
 <rrdd/xcp_rrdd.{native,byte}>: pkg_rpclib.unix
@@ -39,12 +40,13 @@
 <rrdd/xcp_rrdd.{native,byte}>: pkg_xcp.network
 <rrdd/xcp_rrdd.{native,byte}>: pkg_xcp.rrd
 <rrdd/xcp_rrdd.{native,byte}>: pkg_xcp.xen
-<rrdd/xcp_rrdd.{native,byte}>: pkg_xenctrl
+<rrdd/xcp_rrdd.{native,byte}>: pkg_xen-gnt.unix
 <rrdd/xcp_rrdd.{native,byte}>: pkg_xenops
 <rrdd/xcp_rrdd.{native,byte}>: use_rrdd_libs
 <rrdd/*.ml{,i}>: pkg_forkexec
 <rrdd/*.ml{,i}>: pkg_gzip
 <rrdd/*.ml{,i}>: pkg_http-svr
+<rrdd/*.ml{,i}>: pkg_io-page.unix
 <rrdd/*.ml{,i}>: pkg_rpclib
 <rrdd/*.ml{,i}>: pkg_rpclib.syntax
 <rrdd/*.ml{,i}>: pkg_rpclib.unix
@@ -58,7 +60,7 @@
 <rrdd/*.ml{,i}>: pkg_xcp.network
 <rrdd/*.ml{,i}>: pkg_xcp.rrd
 <rrdd/*.ml{,i}>: pkg_xcp.xen
-<rrdd/*.ml{,i}>: pkg_xenctrl
+<rrdd/*.ml{,i}>: pkg_xen-gnt.unix
 <rrdd/*.ml{,i}>: pkg_xenops
 <rrdd/*.ml{,i}>: use_rrdd_libs
 <rrdd/xcp_rrdd.{native,byte}>: custom

diff --git a/lib/META b/lib/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: f280642d3503a458c4e6a60a010986f5)
-version = "0.9.0"
+# DO NOT EDIT (digest: f027af61bd667e4c479e6657b5a11e4f)
+version = "0.9.3"
 description = "XenServer RRD daemon"
 requires = "xcp stdext threads"
 archive(byte) = "rrdd_libs.cma"

diff --git a/rrdd/xcp_rrdd.ml b/rrdd/xcp_rrdd.ml
@@ -664,10 +664,18 @@ let _ =
 	start (!Rrd_interface.default_path, !Rrd_interface.forwarded_path) Server.process;
 
 	debug "Starting xenstore-watching thread ..";
-        let () = Watcher.create_watcher_thread (Xs.get_client ()) in
+        let () =
+                try
+                        Watcher.create_watcher_thread (Xs.get_client ())
+                with e ->
+                        error "xenstore-watching thread has failed" in
 
 	debug "Creating monitoring loop thread ..";
-       	Debug.with_thread_associated "main" monitor_loop ();
+        let () =
+                try
+       	                Debug.with_thread_associated "main" monitor_loop ()
+                with e ->
+                        error "monitoring loop thread has failed" in
 
 	while true do
 		Thread.delay 300.

diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.4 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 869bf16658242ac70409a55509e389bf) *)
+(* DO NOT EDIT (digest: 31f71f3c8017ba634b8d38a28f6a8534) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6638,7 +6638,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "xcp-rrdd";
-          version = "0.9.0";
+          version = "0.9.3";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -6754,11 +6754,12 @@ let setup_t =
                            FindlibPackage ("xcp.rrd", None);
                            FindlibPackage ("xcp.network", None);
                            FindlibPackage ("xcp.xen", None);
-                           FindlibPackage ("xenctrl", None);
                            FindlibPackage ("xenops", None);
                            FindlibPackage ("rrd-transport", None);
                            FindlibPackage ("threads", None);
-                           FindlibPackage ("rpclib.syntax", None)
+                           FindlibPackage ("rpclib.syntax", None);
+                           FindlibPackage ("io-page.unix", None);
+                           FindlibPackage ("xen-gnt.unix", None)
                         ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
@@ -6779,14 +6780,14 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
-     oasis_digest = Some "y\133B\162\230\142\201\169\179\137X\149t\206\231/";
+     oasis_digest = Some "I\029#\197/5\200\191\250wg~\157x\230\207";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 6791 "setup.ml"
+# 6792 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;