[Xen-devel] [PATCH 19 of 24] tools: ocaml: rename the topology types and functions

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302698152 -3600
# Node ID cdf5d9feb563b274235953579d8c991f38b7ca22
# Parent  7202919ef85649078c4369726b7cc2441d118a9a
tools: ocaml: rename the topology types and functions

The aims are:
1. make the records instantiable if they have field names in common; and
2. to make it easier to derive the names programatically from the IDL

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r 7202919ef856 -r cdf5d9feb563 tools/ocaml/libs/xl/xl.ml
--- a/tools/ocaml/libs/xl/xl.ml Wed Mar 30 18:54:28 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.ml Wed Apr 13 13:35:52 2011 +0100
@@ -211,14 +211,15 @@ module Physinfo = struct
 
 end
 
-type topology = 
-{
-       core: int;
-       socket: int;
-       node: int;
-}
-
-type topologyinfo = topology option array
+module Topologyinfo = struct
+       type t =
+       {
+               core: int;
+               socket: int;
+               node: int;
+       }
+       external get: unit -> t = "stub_xl_topologyinfo"
+end
 
 module Sched_credit = struct
        type t =
@@ -236,7 +237,6 @@ type button =
 
 external button_press : domid -> button -> unit = "stub_xl_button_press"
 
-external topologyinfo: unit -> topologyinfo = "stub_xl_topologyinfo"
 
 external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
 external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
diff -r 7202919ef856 -r cdf5d9feb563 tools/ocaml/libs/xl/xl.mli
--- a/tools/ocaml/libs/xl/xl.mli        Wed Mar 30 18:54:28 2011 +0100
+++ b/tools/ocaml/libs/xl/xl.mli        Wed Apr 13 13:35:52 2011 +0100
@@ -211,14 +211,15 @@ module Physinfo : sig
 
 end
 
-type topology = 
-{
-       core: int;
-       socket: int;
-       node: int;
-}
-
-type topologyinfo = topology option array
+module Topologyinfo : sig
+       type t =
+       {
+               core: int;
+               socket: int;
+               node: int;
+       }
+       external get : unit -> t = "stub_xl_topologyinfo"
+end
 
 module Sched_credit : sig
        type t =
@@ -237,8 +238,6 @@ type button =
 
 external button_press : domid -> button -> unit = "stub_xl_button_press"
 
-external topologyinfo: unit -> topologyinfo = "stub_xl_topologyinfo"
-
 external send_trigger : domid -> string -> int -> unit = "stub_xl_send_trigger"
 external send_sysrq : domid -> char -> unit = "stub_xl_send_sysrq"
 external send_debug_keys : domid -> string -> unit = "stub_xl_send_debug_keys"

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel