diff --git a/_tags b/_tags index 33dc39f5..86e9dc21 100644 --- a/_tags +++ b/_tags @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 602453b3fb6b3d0b87012f531fd91c7d) +# DO NOT EDIT (digest: d2e1eb170c363a619afa1e7c0eb71070) # 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 @@ -180,6 +180,26 @@ true: annot, bin_annot : pkg_xcp-inventory : pkg_xmlm : use_xcp +# Library xcp_gpumon +"gpumon/xcp_gpumon.cmxs": use_xcp_gpumon +: pkg_cmdliner +: pkg_cohttp +: pkg_fd-send-recv +: pkg_message_switch +: pkg_message_switch.unix +: pkg_ppx_deriving_rpc +: pkg_ppx_sexp_conv +: pkg_re +: pkg_rpclib +: pkg_rpclib.xml +: pkg_sexplib +: pkg_threads +: pkg_unix +: pkg_uri +: pkg_xapi-backtrace +: pkg_xcp-inventory +: pkg_xmlm +: use_xcp # Executable channel_helper : pkg_cmdliner : pkg_cohttp diff --git a/gpumon/xcp_gpumon.mldylib b/gpumon/xcp_gpumon.mldylib new file mode 100644 index 00000000..07bee543 --- /dev/null +++ b/gpumon/xcp_gpumon.mldylib @@ -0,0 +1,5 @@ +# OASIS_START +# DO NOT EDIT (digest: 2231411ff2e6d81124ad02220e384eb5) +Gpumon_interface +Gpumon_client +# OASIS_STOP diff --git a/gpumon/xcp_gpumon.mllib b/gpumon/xcp_gpumon.mllib new file mode 100644 index 00000000..07bee543 --- /dev/null +++ b/gpumon/xcp_gpumon.mllib @@ -0,0 +1,5 @@ +# OASIS_START +# DO NOT EDIT (digest: 2231411ff2e6d81124ad02220e384eb5) +Gpumon_interface +Gpumon_client +# OASIS_STOP diff --git a/lib/META b/lib/META index cb1fd8a8..60a23d3c 100644 --- a/lib/META +++ b/lib/META @@ -1,5 +1,5 @@ # OASIS_START -# DO NOT EDIT (digest: 8768846be18e97edf6faf163a4fb6e66) +# DO NOT EDIT (digest: d9d865d079bec8418c7a3b944cb39d43) version = "1.2.0" description = "Interface definitions and common boilerplate for the xapi toolstack" @@ -92,5 +92,17 @@ package "memory" ( archive(native, plugin) = "xcp_memory.cmxs" exists_if = "xcp_memory.cma" ) + +package "gpumon" ( + version = "1.2.0" + description = + "Interface definitions and common boilerplate for the xapi toolstack" + requires = "xcp threads rpclib" + archive(byte) = "xcp_gpumon.cma" + archive(byte, plugin) = "xcp_gpumon.cma" + archive(native) = "xcp_gpumon.cmxa" + archive(native, plugin) = "xcp_gpumon.cmxs" + exists_if = "xcp_gpumon.cma" +) # OASIS_STOP diff --git a/myocamlbuild.ml b/myocamlbuild.ml index fabb4691..88e83ec9 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -1,5 +1,5 @@ (* OASIS_START *) -(* DO NOT EDIT (digest: 17a260645a47f8e973325e123b4f77ac) *) +(* DO NOT EDIT (digest: afcb0b4061539ef489b4b83f690c8820) *) module OASISGettext = struct (* # 22 "src/oasis/OASISGettext.ml" *) @@ -894,7 +894,8 @@ let package_default = ("xcp_rrd", ["rrd"], []); ("xcp_xen", ["xen"], []); ("xcp_memory", ["memory"], []); - ("xapi_v6", ["v6"], []) + ("xapi_v6", ["v6"], []); + ("xcp_gpumon", ["gpumon"], []) ]; lib_c = [("xcp", "lib", [])]; flags = []; @@ -907,6 +908,7 @@ let package_default = ("network", ["lib"]); ("memory", ["lib"]); ("lib_test", ["lib"; "xen"]); + ("gpumon", ["lib"]); ("example", ["lib"]) ] } @@ -916,6 +918,6 @@ let conf = {MyOCamlbuildFindlib.no_automatic_syntax = false} let dispatch_default = MyOCamlbuildBase.dispatch_default conf package_default;; -# 920 "myocamlbuild.ml" +# 922 "myocamlbuild.ml" (* OASIS_STOP *) Ocamlbuild_plugin.dispatch dispatch_default;; diff --git a/setup.ml b/setup.ml index 2a2b26a2..7a333909 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.3.1 *) (* OASIS_START *) -(* DO NOT EDIT (digest: f6c9750078db20efeed1f28f698763cd) *) +(* DO NOT EDIT (digest: e0b0513dceeb514f09f197515470c8fe) *) (* Regenerated by OASIS v0.4.8 Visit http://oasis.forge.ocamlcore.org for more information and @@ -8422,6 +8422,153 @@ let setup_t = lib_findlib_directory = None; lib_findlib_containers = [] }); + Library + ({ + cs_name = "xcp_gpumon"; + cs_data = PropList.Data.create (); + cs_plugin_data = [] + }, + { + bs_build = [(OASISExpr.EBool true, true)]; + bs_install = [(OASISExpr.EBool true, true)]; + bs_path = "gpumon"; + bs_compiled_object = Best; + bs_build_depends = + [ + InternalLibrary "xcp"; + FindlibPackage ("threads", None); + FindlibPackage ("rpclib", None) + ]; + bs_build_tools = [ExternalTool "ocamlbuild"]; + bs_interface_patterns = + [ + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("capitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".mli" + ]; + origin = "${capitalize_file module}.mli" + }; + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("uncapitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".mli" + ]; + origin = "${uncapitalize_file module}.mli" + } + ]; + bs_implementation_patterns = + [ + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("capitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".ml" + ]; + origin = "${capitalize_file module}.ml" + }; + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("uncapitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".ml" + ]; + origin = "${uncapitalize_file module}.ml" + }; + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("capitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".mll" + ]; + origin = "${capitalize_file module}.mll" + }; + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("uncapitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".mll" + ]; + origin = "${uncapitalize_file module}.mll" + }; + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("capitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".mly" + ]; + origin = "${capitalize_file module}.mly" + }; + { + OASISSourcePatterns.Templater.atoms = + [ + OASISSourcePatterns.Templater.Text ""; + OASISSourcePatterns.Templater.Expr + (OASISSourcePatterns.Templater.Call + ("uncapitalize_file", + OASISSourcePatterns.Templater.Ident + "module")); + OASISSourcePatterns.Templater.Text ".mly" + ]; + origin = "${uncapitalize_file module}.mly" + } + ]; + bs_c_sources = []; + bs_data_files = []; + bs_findlib_extra_files = []; + bs_ccopt = [(OASISExpr.EBool true, [])]; + bs_cclib = [(OASISExpr.EBool true, [])]; + bs_dlllib = [(OASISExpr.EBool true, [])]; + bs_dllpath = [(OASISExpr.EBool true, [])]; + bs_byteopt = [(OASISExpr.EBool true, [])]; + bs_nativeopt = [(OASISExpr.EBool true, [])] + }, + { + lib_modules = ["Gpumon_interface"; "Gpumon_client"]; + lib_pack = false; + lib_internal_modules = []; + lib_findlib_parent = Some "xcp"; + lib_findlib_name = Some "gpumon"; + lib_findlib_directory = None; + lib_findlib_containers = [] + }); Executable ({ cs_name = "channel_helper"; @@ -8913,7 +9060,8 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.8"; - oasis_digest = Some "}\178M\015\002\0198\182\172\024mz\243|\216]"; + oasis_digest = + Some "\002\222j\143$\218\224\237\211\217\156N\167\138(\228"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -8921,7 +9069,7 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 8925 "setup.ml" +# 9073 "setup.ml" let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t open BaseCompat.Compat_0_4 (* OASIS_STOP *)