d7a3a052ab
New OCF version is ready, so update our submodule. There were a lot of API changes so we need to adjust our bdev/ocf and lib/ocf_env code. Description of code changes: - env: added small functions like ENV_BUILD_BUG_ON, env_vzalloc_flags - env: added "destroy" method for all locks - env: added "execution context" interface - cache/core "id" field made private - signature of "ocf_io_configure" changed - "io->volume" field made private List of changes to OCF is available at https://github.com/Open-CAS/ocf/releases But no new features were implemented for our OCF module since 19.6 Change-Id: I1ac2b6db0aad2a9840e4fa73d65608c5638fcb23 Signed-off-by: Vitaliy Mysak <vitaliy.mysak@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1801 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
110 lines
4.6 KiB
C
110 lines
4.6 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "ctx.h"
|
|
#include "stats.h"
|
|
|
|
int
|
|
vbdev_ocf_stats_get(ocf_cache_t cache, char *core_name, struct vbdev_ocf_stats *stats)
|
|
{
|
|
int status;
|
|
ocf_core_t core;
|
|
|
|
status = ocf_core_get_by_name(cache, core_name, strlen(core_name), &core);
|
|
if (status) {
|
|
return status;
|
|
}
|
|
|
|
return ocf_stats_collect_core(core, &stats->usage, &stats->reqs, &stats->blocks, &stats->errors);
|
|
}
|
|
|
|
#define WJSON_STAT(w, stats, group, field, units) \
|
|
spdk_json_write_named_object_begin(w, #field); \
|
|
spdk_json_write_named_uint64(w, "count", stats->group.field.value); \
|
|
spdk_json_write_named_string_fmt(w, "percentage", "%lu.%lu", \
|
|
stats->group.field.fraction / 100, stats->group.field.fraction % 100); \
|
|
spdk_json_write_named_string(w, "units", units); \
|
|
spdk_json_write_object_end(w);
|
|
|
|
void
|
|
vbdev_ocf_stats_write_json(struct spdk_json_write_ctx *w, struct vbdev_ocf_stats *stats)
|
|
{
|
|
spdk_json_write_object_begin(w);
|
|
|
|
spdk_json_write_named_object_begin(w, "usage");
|
|
WJSON_STAT(w, stats, usage, occupancy, "4KiB blocks");
|
|
WJSON_STAT(w, stats, usage, free, "4KiB blocks");
|
|
WJSON_STAT(w, stats, usage, clean, "4KiB blocks");
|
|
WJSON_STAT(w, stats, usage, dirty, "4KiB blocks");
|
|
spdk_json_write_object_end(w);
|
|
|
|
spdk_json_write_named_object_begin(w, "requests");
|
|
WJSON_STAT(w, stats, reqs, rd_hits, "Requests");
|
|
WJSON_STAT(w, stats, reqs, rd_partial_misses, "Requests");
|
|
WJSON_STAT(w, stats, reqs, rd_full_misses, "Requests");
|
|
WJSON_STAT(w, stats, reqs, rd_total, "Requests");
|
|
WJSON_STAT(w, stats, reqs, wr_hits, "Requests");
|
|
WJSON_STAT(w, stats, reqs, wr_partial_misses, "Requests");
|
|
WJSON_STAT(w, stats, reqs, wr_full_misses, "Requests");
|
|
WJSON_STAT(w, stats, reqs, wr_total, "Requests");
|
|
WJSON_STAT(w, stats, reqs, rd_pt, "Requests");
|
|
WJSON_STAT(w, stats, reqs, wr_pt, "Requests");
|
|
WJSON_STAT(w, stats, reqs, serviced, "Requests");
|
|
WJSON_STAT(w, stats, reqs, total, "Requests");
|
|
spdk_json_write_object_end(w);
|
|
|
|
spdk_json_write_named_object_begin(w, "blocks");
|
|
WJSON_STAT(w, stats, blocks, core_volume_rd, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, core_volume_wr, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, core_volume_total, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, cache_volume_rd, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, cache_volume_wr, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, cache_volume_total, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, volume_rd, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, volume_wr, "4KiB blocks");
|
|
WJSON_STAT(w, stats, blocks, volume_total, "4KiB blocks");
|
|
spdk_json_write_object_end(w);
|
|
|
|
spdk_json_write_named_object_begin(w, "errors");
|
|
WJSON_STAT(w, stats, errors, core_volume_rd, "Requests");
|
|
WJSON_STAT(w, stats, errors, core_volume_wr, "Requests");
|
|
WJSON_STAT(w, stats, errors, core_volume_total, "Requests");
|
|
WJSON_STAT(w, stats, errors, cache_volume_rd, "Requests");
|
|
WJSON_STAT(w, stats, errors, cache_volume_wr, "Requests");
|
|
WJSON_STAT(w, stats, errors, cache_volume_total, "Requests");
|
|
WJSON_STAT(w, stats, errors, total, "Requests");
|
|
spdk_json_write_object_end(w);
|
|
|
|
spdk_json_write_object_end(w);
|
|
}
|