Merge pull request xapi-project#33 from lindig/dune

CP-29621 Port from Oasis to Dune

Author: lindig

.gitignore

@@ -1,6 +1,4 @@
-*.native
-*.swp
-
 _build
-setup.data
-setup.log
+.merlin
+*.install
+

.travis.yml

@@ -1,12 +1,15 @@
 language: c
-services: docker
+sudo: required
+service: docker
 install:
-    - wget https://raw.githubusercontent.com/xenserver/xenserver-build-env/master/utils/travis-build-repo.sh
-script: bash travis-build-repo.sh
-sudo: true
+  - wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-docker.sh
+  - cp  mocks/mock.ml lib/nvml.ml
+  - cp  mocks/mock.c  stubs/nvml_stubs.c
+script: bash -ex .travis-docker.sh
 env:
-    global:
-        - REPO_PACKAGE_NAME=gpumon
-        - REPO_CONFIGURE_CMD=true
-        - REPO_BUILD_CMD=make
-        - REPO_TEST_CMD='make test'
+  global:
+    - PACKAGE=gpumon
+    - PINS="gpumon:."
+    - BASE_REMOTE="https://github.com/xapi-project/xs-opam.git"
+  matrix:
+    - DISTRO="debian-9-ocaml-4.06"

Makefile

@@ -1,28 +1,29 @@
-DESTDIR ?= 
-LIBEXECDIR ?= /opt/xensource/libexec
+# vim: set noet ts=8:
+#
+# This Makefile is not called from Opam but only used for
+# convenience during development
+#
 
-TESTS_FLAG=--enable-tests
+LIBEXECDIR 	?= /opt/xensource/libexec
+PLUGINS     	= $(DESTDIR)$(LIBEXECDIR)/xcp-rrdd-plugins
+BUILD       	= _build/default
+DUNE 		= dune
 
-J=4
+.PHONY: install all clean test mock
 
-LIBEXECDIR?=/opt/xensource/libexec
+all:
+	$(DUNE) build
 
-all: build
+install: all
+	install -D -m 755 $(BUILD)/gpumon/gpumon.exe $(PLUGINS)/xcp-rrdd-gpumon
 
-setup.data:
-	ocaml setup.ml -configure $(TESTS_FLAG)
-
-build: setup.data
-	ocaml setup.ml -build -j $(J)
+clean:
+	$(DUNE) clean
 
-test: build
-	ocaml setup.ml -test
+test:
+	$(DUNE) runtest
 
-clean:
-	ocamlbuild -clean
-	rm -f setup.data setup.log
+mock:
+	cp mocks/mock.ml lib/nvml.ml
+	cp mocks/mock.c  stubs/nvml_stubs.c
 
-.PHONY: install
-install: build
-	mkdir -p $(DESTDIR)$(LIBEXECDIR)/xcp-rrdd-plugins/
-	install -m 755 _build/gpumon/gpumon.native $(DESTDIR)$(LIBEXECDIR)/xcp-rrdd-plugins/xcp-rrdd-gpumon

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/xenserver/gpumon.svg?branch=master)](https://travis-ci.org/xenserver/gpumon)
+
 gpumon
 ------
 

_oasis

@@ -0,0 +1 @@
+(lang dune 1.1)

_tags

@@ -0,0 +1,22 @@
+opam-version: "2.0"
+maintainer: "xen-api@lists.xen.org"
+authors: [ "John Else" ]
+homepage: "https://github.com/xenserver/gpumon"
+bug-reports: "https://github.com/xenserver/gpumon/issues"
+build: [
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+]
+depends: [
+  "base-threads"     
+  "ounit"
+  "result"
+  "rrdd-plugin"
+  "stdext"
+  "xcp"
+]
+dev-repo: "git://github.com/xenserver/gpumon"
+synopsis: "The XenServer GPU monitoring daemon"
+
+
+

dune-project

@@ -0,0 +1,6 @@
+
+(executable
+ (name gpumon)
+ (public_name gpumon)
+ (libraries threads rrdd-plugin xcp.gpumon gpumon_lib))
+

gpumon.opam

@@ -33,8 +33,6 @@ module Make(I: Interface):IMPLEMENTATION = struct
   module D = Debug.Make(struct let name = Gpumon_interface.service_name end)
   open D
 
-  type context = unit
-
   module Nvidia = struct
 
     let host_driver_supporting_migration = 390
@@ -45,7 +43,7 @@ module Make(I: Interface):IMPLEMENTATION = struct
       | Some interface -> interface
       | None -> raise Gpumon_interface.(Gpumon_error NvmlInterfaceNotAvailable)
 
-    let get_pgpu_metadata dbg pgpu_address =
+    let get_pgpu_metadata _dbg pgpu_address =
       let this = "get_pgpu_metadata" in
       let interface = get_interface_exn () in
       try
@@ -72,7 +70,7 @@ module Make(I: Interface):IMPLEMENTATION = struct
       | Gpumon_interface.(Gpumon_error (NvmlFailure _)) as err -> raise err
       | err -> raise Gpumon_interface.(Gpumon_error (NvmlFailure (Printexc.to_string err)))
 
-    let get_vgpu_metadata dbg domid pgpu_address =
+    let get_vgpu_metadata _dbg domid pgpu_address =
       let interface = get_interface_exn () in
       let domid'    = string_of_int domid  in
       try
@@ -82,7 +80,7 @@ module Make(I: Interface):IMPLEMENTATION = struct
       with err ->
         raise Gpumon_interface.(Gpumon_error (NvmlFailure (Printexc.to_string err)))
 
-    let get_pgpu_vgpu_compatibility dbg pgpu_metadata vgpu_metadata =
+    let get_pgpu_vgpu_compatibility _dbg pgpu_metadata vgpu_metadata =
       let interface = get_interface_exn () in
       let compatibility =
         try