Skip to content

Commit

Permalink
cleanup(metrics): apply reviewers suggestions
Browse files Browse the repository at this point in the history 
Co-authored-by: Federico Di Pierro <nierro92@gmail.com>
Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
  • Loading branch information
@incertum @FedeDP
incertum and FedeDP committed Mar 13, 2024
1 parent 33a34ca commit 2c3092e
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 51 deletions.
9 changes: 5 additions & 4 deletions userspace/libpman/src/stats.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ struct metrics_v2 *pman_get_metrics_v2(uint32_t flags, uint32_t *nstats, int32_t
g_state.stats[stat].type = METRIC_VALUE_TYPE_U64;
g_state.stats[stat].flags = METRICS_V2_KERNEL_COUNTERS;
g_state.stats[stat].unit = METRIC_VALUE_UNIT_COUNT;
g_state.stats[stat].metric_type = METRIC_VALUE_MONOTONIC;
g_state.stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
g_state.stats[stat].value.u64 = 0;
strlcpy(g_state.stats[stat].name, modern_bpf_kernel_counters_stats_names[stat], METRIC_NAME_MAX);
}
Expand Down Expand Up @@ -258,26 +258,27 @@ struct metrics_v2 *pman_get_metrics_v2(uint32_t flags, uint32_t *nstats, int32_t
strlcat(g_state.stats[offset].name, modern_bpf_libbpf_stats_names[RUN_CNT], sizeof(g_state.stats[offset].name));
g_state.stats[stat].flags = METRICS_V2_KERNEL_COUNTERS;
g_state.stats[stat].unit = METRIC_VALUE_UNIT_COUNT;
g_state.stats[stat].metric_type = METRIC_VALUE_MONOTONIC;
g_state.stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
g_state.stats[offset].value.u64 = info.run_cnt;
break;
case RUN_TIME_NS:
strlcat(g_state.stats[offset].name, modern_bpf_libbpf_stats_names[RUN_TIME_NS], sizeof(g_state.stats[offset].name));
g_state.stats[stat].unit = METRIC_VALUE_UNIT_TIME_NS_COUNT;
g_state.stats[stat].metric_type = METRIC_VALUE_MONOTONIC;
g_state.stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
g_state.stats[offset].value.u64 = info.run_time_ns;
break;
case AVG_TIME_NS:
strlcat(g_state.stats[offset].name, modern_bpf_libbpf_stats_names[AVG_TIME_NS], sizeof(g_state.stats[offset].name));
g_state.stats[stat].unit = METRIC_VALUE_UNIT_TIME_NS;
g_state.stats[stat].metric_type = METRIC_VALUE_NON_MONOTONIC_CURRENT;
g_state.stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_NON_MONOTONIC_CURRENT;
g_state.stats[offset].value.u64 = 0;
if(info.run_cnt > 0)
{
g_state.stats[offset].value.u64 = info.run_time_ns / info.run_cnt;
}
break;
default:
ASSERT(false);
break;
}
offset++;
Expand Down
9 changes: 5 additions & 4 deletions userspace/libscap/engine/bpf/scap_bpf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1731,7 +1731,7 @@ const struct metrics_v2* scap_bpf_get_stats_v2(struct scap_engine_handle engine,
{
stats[stat].type = METRIC_VALUE_TYPE_U64;
stats[stat].flags = METRICS_V2_KERNEL_COUNTERS;
stats[stat].metric_type = METRIC_VALUE_MONOTONIC;
stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
stats[stat].unit = METRIC_VALUE_UNIT_COUNT;
stats[stat].value.u64 = 0;
strlcpy(stats[stat].name, bpf_kernel_counters_stats_names[stat], METRIC_NAME_MAX);
Expand Down Expand Up @@ -1828,25 +1828,26 @@ const struct metrics_v2* scap_bpf_get_stats_v2(struct scap_engine_handle engine,
strlcat(stats[offset].name, bpf_libbpf_stats_names[RUN_CNT], sizeof(stats[offset].name));
stats[offset].value.u64 = info.run_cnt;
stats[offset].unit = METRIC_VALUE_UNIT_COUNT;
stats[offset].metric_type = METRIC_VALUE_MONOTONIC;
stats[offset].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
break;
case RUN_TIME_NS:
strlcat(stats[offset].name, bpf_libbpf_stats_names[RUN_TIME_NS], sizeof(stats[offset].name));
stats[offset].value.u64 = info.run_time_ns;
stats[offset].unit = METRIC_VALUE_UNIT_TIME_NS_COUNT;
stats[offset].metric_type = METRIC_VALUE_MONOTONIC;
stats[offset].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
break;
case AVG_TIME_NS:
strlcat(stats[offset].name, bpf_libbpf_stats_names[AVG_TIME_NS], sizeof(stats[offset].name));
stats[offset].value.u64 = 0;
stats[offset].unit = METRIC_VALUE_UNIT_TIME_NS;
stats[offset].metric_type = METRIC_VALUE_NON_MONOTONIC_CURRENT;
stats[offset].metric_type = METRIC_VALUE_METRIC_TYPE_NON_MONOTONIC_CURRENT;
if (info.run_cnt > 0)
{
stats[offset].value.u64 = info.run_time_ns / info.run_cnt;
}
break;
default:
ASSERT(false);
break;
}
offset++;
Expand Down
2 changes: 1 addition & 1 deletion userspace/libscap/engine/gvisor/scap_gvisor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ const metrics_v2* engine::get_stats_v2(uint32_t flags, uint32_t* nstats, int32_t
{
stats[stat].type = METRIC_VALUE_TYPE_U64;
stats[stat].unit = METRIC_VALUE_UNIT_COUNT;
stats[stat].metric_type = METRIC_VALUE_MONOTONIC;
stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
stats[stat].value.u64 = 0;
strlcpy(stats[stat].name, gvisor_counters_stats_names[stat], METRIC_NAME_MAX);
}
Expand Down
2 changes: 1 addition & 1 deletion userspace/libscap/engine/kmod/scap_kmod.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ const struct metrics_v2* scap_kmod_get_stats_v2(struct scap_engine_handle engine
stats[stat].type = METRIC_VALUE_TYPE_U64;
stats[stat].flags = METRICS_V2_KERNEL_COUNTERS;
stats[stat].unit = METRIC_VALUE_UNIT_COUNT;
stats[stat].metric_type = METRIC_VALUE_MONOTONIC;
stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
stats[stat].value.u64 = 0;
strlcpy(stats[stat].name, kmod_kernel_counters_stats_names[stat], METRIC_NAME_MAX);
}
Expand Down
2 changes: 1 addition & 1 deletion userspace/libscap/engine/source_plugin/source_plugin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ const struct metrics_v2* get_source_plugin_stats_v2(struct scap_engine_handle en
stats[stat].type = METRIC_VALUE_TYPE_U64;
stats[stat].value.u64 = 0;
stats[stat].unit = METRIC_VALUE_UNIT_COUNT;
stats[stat].metric_type = METRIC_VALUE_MONOTONIC;
stats[stat].metric_type = METRIC_VALUE_METRIC_TYPE_MONOTONIC;
strlcpy(stats[stat].name, source_plugin_counters_stats_names[stat], METRIC_NAME_MAX);
}
stats[N_EVTS].value.u64 = handle->m_nevts;
Expand Down
7 changes: 5 additions & 2 deletions userspace/libscap/metrics_v2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ typedef enum metrics_v2_value_type{
METRIC_VALUE_TYPE_D,
METRIC_VALUE_TYPE_F,
METRIC_VALUE_TYPE_I,
METRIC_VALUE_TYPE_MAX,
} metrics_v2_value_type;

typedef enum metrics_v2_value_unit{
Expand All @@ -72,11 +73,13 @@ typedef enum metrics_v2_value_unit{
METRIC_VALUE_UNIT_TIME_NS_COUNT,
METRIC_VALUE_UNIT_TIME_S_COUNT,
METRIC_VALUE_UNIT_TIME_TIMESTAMP_NS,
METRIC_VALUE_UNIT_MAX,
} metrics_v2_value_unit;

typedef enum metrics_v2_metric_type{
METRIC_VALUE_MONOTONIC,
METRIC_VALUE_NON_MONOTONIC_CURRENT,
METRIC_VALUE_METRIC_TYPE_MONOTONIC,
METRIC_VALUE_METRIC_TYPE_NON_MONOTONIC_CURRENT,
METRIC_VALUE_METRIC_TYPE_MAX,
} metrics_v2_metric_type;

/*!
Expand Down
Loading

0 comments on commit 2c3092e

Please sign in to comment.