diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2010-10-18 17:37:50 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2010-10-18 17:37:50 +0100 |
commit | 4f42a4e74f157e0d9cbb3595b1cc7e215c917428 (patch) | |
tree | 79205000fd9261234c650591d5adf4d8ede3e41f /tools | |
parent | 656ba9748a4af226415bf77039a20a1948444445 (diff) | |
download | xen-4f42a4e74f157e0d9cbb3595b1cc7e215c917428.tar.gz xen-4f42a4e74f157e0d9cbb3595b1cc7e215c917428.tar.bz2 xen-4f42a4e74f157e0d9cbb3595b1cc7e215c917428.zip |
libxc: simplify lock profiling API
Current function has heavily overloaded semantics for the various
arguments. Separate out into more specific functions.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/libxc/xc_misc.c | 40 | ||||
-rw-r--r-- | tools/libxc/xenctrl.h | 12 | ||||
-rw-r--r-- | tools/misc/xenlockprof.c | 9 |
3 files changed, 42 insertions, 19 deletions
diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index a64a633e29..86b4f33158 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -215,8 +215,35 @@ int xc_perfc_query(xc_interface *xch, return do_sysctl(xch, &sysctl); } -int xc_lockprof_control(xc_interface *xch, - uint32_t opcode, +int xc_lockprof_reset(xc_interface *xch) +{ + DECLARE_SYSCTL; + + sysctl.cmd = XEN_SYSCTL_lockprof_op; + sysctl.u.lockprof_op.cmd = XEN_SYSCTL_LOCKPROF_reset; + set_xen_guest_handle(sysctl.u.lockprof_op.data, NULL); + + return do_sysctl(xch, &sysctl); +} + +int xc_lockprof_query_number(xc_interface *xch, + uint32_t *n_elems) +{ + int rc; + DECLARE_SYSCTL; + + sysctl.cmd = XEN_SYSCTL_lockprof_op; + sysctl.u.lockprof_op.cmd = XEN_SYSCTL_LOCKPROF_query; + set_xen_guest_handle(sysctl.u.lockprof_op.data, NULL); + + rc = do_sysctl(xch, &sysctl); + + *n_elems = sysctl.u.lockprof_op.nr_elem; + + return rc; +} + +int xc_lockprof_query(xc_interface *xch, uint32_t *n_elems, uint64_t *time, xc_lockprof_data_t *data) @@ -225,16 +252,13 @@ int xc_lockprof_control(xc_interface *xch, DECLARE_SYSCTL; sysctl.cmd = XEN_SYSCTL_lockprof_op; - sysctl.u.lockprof_op.cmd = opcode; - sysctl.u.lockprof_op.max_elem = n_elems ? *n_elems : 0; + sysctl.u.lockprof_op.cmd = XEN_SYSCTL_LOCKPROF_query; + sysctl.u.lockprof_op.max_elem = *n_elems; set_xen_guest_handle(sysctl.u.lockprof_op.data, data); rc = do_sysctl(xch, &sysctl); - if (n_elems) - *n_elems = sysctl.u.lockprof_op.nr_elem; - if (time) - *time = sysctl.u.lockprof_op.time; + *n_elems = sysctl.u.lockprof_op.nr_elem; return rc; } diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index c004cbc660..4e9493c796 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -898,12 +898,14 @@ int xc_perfc_query(xc_interface *xch, xc_perfc_val_t *val); typedef xen_sysctl_lockprof_data_t xc_lockprof_data_t; +int xc_lockprof_reset(xc_interface *xch); +int xc_lockprof_query_number(xc_interface *xch, + uint32_t *n_elems); /* IMPORTANT: The caller is responsible for mlock()'ing the @data array. */ -int xc_lockprof_control(xc_interface *xch, - uint32_t opcode, - uint32_t *n_elems, - uint64_t *time, - xc_lockprof_data_t *data); +int xc_lockprof_query(xc_interface *xch, + uint32_t *n_elems, + uint64_t *time, + xc_lockprof_data_t *data); /** * Memory maps a range within one domain to a local address range. Mappings diff --git a/tools/misc/xenlockprof.c b/tools/misc/xenlockprof.c index e30fbaaf23..0235ab0150 100644 --- a/tools/misc/xenlockprof.c +++ b/tools/misc/xenlockprof.c @@ -60,8 +60,7 @@ int main(int argc, char *argv[]) if ( argc > 1 ) { - if ( xc_lockprof_control(xc_handle, XEN_SYSCTL_LOCKPROF_reset, NULL, - NULL, NULL) != 0 ) + if ( xc_lockprof_reset(xc_handle) != 0 ) { fprintf(stderr, "Error reseting profile data: %d (%s)\n", errno, strerror(errno)); @@ -71,8 +70,7 @@ int main(int argc, char *argv[]) } n = 0; - if ( xc_lockprof_control(xc_handle, XEN_SYSCTL_LOCKPROF_query, &n, - NULL, NULL) != 0 ) + if ( xc_lockprof_query_number(xc_handle, &n) != 0 ) { fprintf(stderr, "Error getting number of profile records: %d (%s)\n", errno, strerror(errno)); @@ -89,8 +87,7 @@ int main(int argc, char *argv[]) } i = n; - if ( xc_lockprof_control(xc_handle, XEN_SYSCTL_LOCKPROF_query, &i, - &time, data) != 0 ) + if ( xc_lockprof_query(xc_handle, &i, &time, data) != 0 ) { fprintf(stderr, "Error getting profile records: %d (%s)\n", errno, strerror(errno)); |