Merge pull request #22 from johnelse/new-rrd-transport-interface

Update to new rrd-transport interface

Author: johnelse

rrdp_iostat.ml

@@ -650,9 +650,11 @@ let gen_metrics () =
 
 let _ =
 	initialise ();
+	(* Approx. one page per VBD, up to the limit. *)
+	let shared_page_count = 2048 in
 	(* It takes (at least) 1 second to get the iostat data, so start reading the data early enough *)
 	main_loop
 		~neg_shift:1.5
-		~target:Reporter.Local
+		~target:(Reporter.Local shared_page_count)
 		~protocol:Rrd_interface.V2
 		~dss_f:gen_metrics

rrdp_squeezed.ml

@@ -135,11 +135,14 @@ let generate_squeezed_dss () =
 		~default:true ~units:"B" ();
 	]
 
+(* This plugin always reports two datasources only, so one page is fine. *)
+let shared_page_count = 1
+
 let _ =
 	initialise ();
 	Watcher.create_watcher_thread (Xs.get_client ());
 	main_loop
 		~neg_shift:0.5
-		~target:Reporter.Local
+		~target:(Reporter.Local shared_page_count)
 		~protocol:Rrd_interface.V2
 		~dss_f:generate_squeezed_dss

rrdp_xenpm.ml

@@ -87,8 +87,10 @@ let _ =
 	initialise ();
 	D.warn "Found %d pCPUs" !nr_cpu;
 	if !nr_cpu = 0 then exit 1;
+	(* Share one page per CPU. *)
+	let shared_page_count = !nr_cpu in
 	main_loop
 		~neg_shift:0.5
-		~target:Reporter.Local
+		~target:(Reporter.Local shared_page_count)
 		~protocol:Rrd_interface.V2
 		~dss_f:generate_dss