virNodeGetMemoryStats: Implement remote protocol

Signed-off-by: Minoru Usui <usui@mxm.nes.nec.co.jp>

diff --git a/daemon/remote.c b/daemon/remote.c
index 4daebf68999d76f99b722755650753f4eead2796..4d951789d0f63a59c7150598230d886a2a511f07 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -1593,6 +1593,83 @@ no_memory:
     goto cleanup;
 }
 
+static int
+remoteDispatchNodeGetMemoryStats (struct qemud_server *server ATTRIBUTE_UNUSED,
+                                  struct qemud_client *client ATTRIBUTE_UNUSED,
+                                  virConnectPtr conn,
+                                  remote_message_header *hdr ATTRIBUTE_UNUSED,
+                                  remote_error *rerr,
+                                  remote_node_get_memory_stats_args *args,
+                                  remote_node_get_memory_stats_ret *ret)
+{
+    virMemoryStatsPtr params = NULL;
+    int i;
+    int cellNum = args->cellNum;
+    int nparams = args->nparams;
+    unsigned int flags;
+    int rv = -1;
+
+    if (!conn) {
+        virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open"));
+        goto cleanup;
+    }
+
+    flags = args->flags;
+
+    if (nparams > REMOTE_NODE_MEMORY_STATS_MAX) {
+        virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+        goto cleanup;
+    }
+    if (VIR_ALLOC_N(params, nparams) < 0) {
+        virReportOOMError();
+        goto cleanup;
+    }
+
+    if (virNodeGetMemoryStats(conn, cellNum, params, &nparams, flags) < 0)
+        goto cleanup;
+
+    /* In this case, we need to send back the number of parameters
+     * supported
+     */
+    if (args->nparams == 0) {
+        ret->nparams = nparams;
+        goto success;
+    }
+
+    /* Serialise the memory parameters. */
+    ret->params.params_len = nparams;
+    if (VIR_ALLOC_N(ret->params.params_val, nparams) < 0)
+        goto no_memory;
+
+    for (i = 0; i < nparams; ++i) {
+        /* remoteDispatchClientRequest will free this: */
+        ret->params.params_val[i].field = strdup(params[i].field);
+        if (ret->params.params_val[i].field == NULL)
+            goto no_memory;
+
+        ret->params.params_val[i].value = params[i].value;
+    }
+
+success:
+    rv = 0;
+
+cleanup:
+    if (rv < 0) {
+        remoteDispatchError(rerr);
+        if (ret->params.params_val) {
+            for (i = 0; i < nparams; i++)
+                VIR_FREE(ret->params.params_val[i].field);
+            VIR_FREE(ret->params.params_val);
+        }
+    }
+    VIR_FREE(params);
+    return rv;
+
+no_memory:
+    virReportOOMError();
+    goto cleanup;
+}
+
 /*-------------------------------------------------------------*/
 
 static int

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 805da7b9e292f4e2c6c4c45273a6bdd07b383911..b68584a7e7e83c0f63363f7b53582ec73b5813b4 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1762,6 +1762,70 @@ done:
     return rv;
 }
 
+static int
+remoteNodeGetMemoryStats (virConnectPtr conn,
+                          int cellNum,
+                          virMemoryStatsPtr params, int *nparams,
+                          unsigned int flags)
+{
+    int rv = -1;
+    remote_node_get_memory_stats_args args;
+    remote_node_get_memory_stats_ret ret;
+    int i = -1;
+    struct private_data *priv = conn->privateData;
+
+    remoteDriverLock(priv);
+
+    args.nparams = *nparams;
+    args.cellNum = cellNum;
+    args.flags = flags;
+
+    memset (&ret, 0, sizeof ret);
+    if (call (conn, priv, 0, REMOTE_PROC_NODE_GET_MEMORY_STATS,
+              (xdrproc_t) xdr_remote_node_get_memory_stats_args, (char *) &args,
+              (xdrproc_t) xdr_remote_node_get_memory_stats_ret, (char *) &ret) == -1)
+        goto done;
+
+    /* Check the length of the returned list carefully. */
+    if (ret.params.params_len > REMOTE_NODE_MEMORY_STATS_MAX ||
+        ret.params.params_len > *nparams) {
+        remoteError(VIR_ERR_RPC, "%s",
+                    _("remoteNodeGetMemoryStats: "
+                      "returned number of stats exceeds limit"));
+        goto cleanup;
+    }
+    /* Handle the case when the caller does not know the number of stats
+     * and is asking for the number of stats supported
+     */
+    if (*nparams == 0) {
+        *nparams = ret.nparams;
+        rv = 0;
+        goto cleanup;
+    }
+
+    *nparams = ret.params.params_len;
+
+    /* Deserialise the result. */
+    for (i = 0; i < *nparams; ++i) {
+        if (virStrcpyStatic(params[i].field, ret.params.params_val[i].field) == NULL) {
+            remoteError(VIR_ERR_INTERNAL_ERROR,
+                        _("Stats %s too big for destination"),
+                        ret.params.params_val[i].field);
+            goto cleanup;
+        }
+        params[i].value = ret.params.params_val[i].value;
+    }
+
+    rv = 0;
+
+cleanup:
+    xdr_free ((xdrproc_t) xdr_remote_node_get_memory_stats_ret,
+              (char *) &ret);
+done:
+    remoteDriverUnlock(priv);
+    return rv;
+}
+
 static int
 remoteNodeGetCellsFreeMemory(virConnectPtr conn,
                             unsigned long long *freeMems,
@@ -6361,6 +6425,7 @@ static virDriver remote_driver = {
     .domainMemoryPeek = remoteDomainMemoryPeek, /* 0.4.2 */
     .domainGetBlockInfo = remoteDomainGetBlockInfo, /* 0.8.1 */
     .nodeGetCPUStats = remoteNodeGetCPUStats, /* 0.9.3 */
+    .nodeGetMemoryStats = remoteNodeGetMemoryStats, /* 0.9.3 */
     .nodeGetCellsFreeMemory = remoteNodeGetCellsFreeMemory, /* 0.3.3 */
     .nodeGetFreeMemory = remoteNodeGetFreeMemory, /* 0.3.3 */
     .domainEventRegister = remoteDomainEventRegister, /* 0.5.0 */

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 396bd60093894fe51053f07a8d58ccd92108fd40..d89fae72e46da545bf305267a117e0b00edc3213 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -137,6 +137,9 @@ const REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX = 16;
 /* Upper limit on list of node cpu stats. */
 const REMOTE_NODE_CPU_STATS_MAX = 16;
 
+/* Upper limit on list of node memory stats. */
+const REMOTE_NODE_MEMORY_STATS_MAX = 16;
+
 /* Upper limit on number of NUMA cells */
 const REMOTE_NODE_MAX_CELLS = 1024;
 
@@ -332,6 +335,11 @@ struct remote_node_get_cpu_stats {
     unsigned hyper value;
 };
 
+struct remote_node_get_memory_stats {
+    remote_nonnull_string field;
+    unsigned hyper value;
+};
+
 /*----- Calls. -----*/
 
 /* For each call we may have a 'remote_CALL_args' and 'remote_CALL_ret'
@@ -427,6 +435,17 @@ struct remote_node_get_cpu_stats_ret {
     int nparams;
 };
 
+struct remote_node_get_memory_stats_args {
+    int nparams;
+    int cellNum;
+    unsigned int flags;
+};
+
+struct remote_node_get_memory_stats_ret {
+    remote_node_get_memory_stats params<REMOTE_NODE_MEMORY_STATS_MAX>;
+    int nparams;
+};
+
 struct remote_node_get_cells_free_memory_args {
     int startCell;
     int maxcells;
@@ -2339,7 +2358,8 @@ enum remote_procedure {
     REMOTE_PROC_DOMAIN_EVENT_CONTROL_ERROR = 224, /* skipgen skipgen */
     REMOTE_PROC_DOMAIN_PIN_VCPU_FLAGS = 225, /* skipgen autogen */
     REMOTE_PROC_DOMAIN_SEND_KEY = 226, /* autogen autogen */
-    REMOTE_PROC_NODE_GET_CPU_STATS = 227 /* skipgen skipgen */
+    REMOTE_PROC_NODE_GET_CPU_STATS = 227, /* skipgen skipgen */
+    REMOTE_PROC_NODE_GET_MEMORY_STATS = 228 /* skipgen skipgen */
 
     /*
      * Notice how the entries are grouped in sets of 10 ?

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index ea7bdd2b5f3f63cfde3e052d315f8b9ab1730c04..ef5f266cb5eb8113eb5b69e1ae1303dba27090b0 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -75,6 +75,10 @@ struct remote_node_get_cpu_stats {
         remote_nonnull_string      field;
         uint64_t                   value;
 };
+struct remote_node_get_memory_stats {
+        remote_nonnull_string      field;
+        uint64_t                   value;
+};
 struct remote_open_args {
         remote_string              name;
         int                        flags;
@@ -137,6 +141,18 @@ struct remote_node_get_cpu_stats_ret {
         } params;
         int                        nparams;
 };
+struct remote_node_get_memory_stats_args {
+        int                        nparams;
+        int                        cellNum;
+        u_int                      flags;
+};
+struct remote_node_get_memory_stats_ret {
+        struct {
+                u_int              params_len;
+                remote_node_get_memory_stats * params_val;
+        } params;
+        int                        nparams;
+};
 struct remote_node_get_cells_free_memory_args {
         int                        startCell;
         int                        maxcells;