ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stats: refactor

Browse Source 
Type: refactor
Change-Id: Ifd533a095d979dc55bfbe5fac7e0b7510a4d900c
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2022-03-01 15:51:18 +01:00
committed by Damjan Marion
parent 317cace618
commit 8973b07eec
36 changed files with 1673 additions and 1807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vpp/CMakeLists.txt
View File

@ -66,8 +66,6 @@ set(VPP_SOURCES
vnet/main.c
app/vpe_cli.c
app/version.c
stats/stat_segment.c
stats/stat_segment_provider.c
api/api.c
api/json_format.c
api/types.c
@ -90,11 +88,6 @@ add_vpp_executable(vpp
DEPENDS vpp_version_h api_headers
)
add_vpp_headers(vpp
stats/stat_segment.h
stats/stat_segment_shared.h
)
##############################################################################
# vppctl binary
##############################################################################

1149
src/vpp/stats/stat_segment.c
View File

File diff suppressed because it is too large Load Diff

123
src/vpp/stats/stat_segment.h
View File

@ -1,123 +0,0 @@
/*
* Copyright (c) 2018 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef included_stat_segment_h
#define included_stat_segment_h
#include <vlib/vlib.h>
#include <vppinfra/socket.h>
#include <vpp/stats/stat_segment_shared.h>
typedef enum
{
STAT_COUNTER_NUM_WORKER_THREADS = 0,
STAT_COUNTER_INPUT_RATE,
STAT_COUNTER_LAST_UPDATE,
STAT_COUNTER_LAST_STATS_CLEAR,
STAT_COUNTER_HEARTBEAT,
STAT_COUNTER_NODE_CLOCKS,
STAT_COUNTER_NODE_VECTORS,
STAT_COUNTER_NODE_CALLS,
STAT_COUNTER_NODE_SUSPENDS,
STAT_COUNTER_INTERFACE_NAMES,
STAT_COUNTER_NODE_NAMES,
STAT_COUNTERS
} stat_segment_counter_t;
/* clang-format off */
#define foreach_stat_segment_node_counter_name \
_ (NODE_CLOCKS, COUNTER_VECTOR_SIMPLE, clocks, /sys/node) \
_ (NODE_VECTORS, COUNTER_VECTOR_SIMPLE, vectors, /sys/node) \
_ (NODE_CALLS, COUNTER_VECTOR_SIMPLE, calls, /sys/node) \
_ (NODE_SUSPENDS, COUNTER_VECTOR_SIMPLE, suspends, /sys/node)
#define foreach_stat_segment_counter_name \
_ (NUM_WORKER_THREADS, SCALAR_INDEX, num_worker_threads, /sys) \
_ (INPUT_RATE, SCALAR_INDEX, input_rate, /sys) \
_ (LAST_UPDATE, SCALAR_INDEX, last_update, /sys) \
_ (LAST_STATS_CLEAR, SCALAR_INDEX, last_stats_clear, /sys) \
_ (HEARTBEAT, SCALAR_INDEX, heartbeat, /sys) \
_ (INTERFACE_NAMES, NAME_VECTOR, names, /if) \
_ (NODE_NAMES, NAME_VECTOR, names, /sys/node) \
foreach_stat_segment_node_counter_name
/* clang-format on */
/* Default stat segment 32m */
#define STAT_SEGMENT_DEFAULT_SIZE (32<<20)
/* Shared segment memory layout version */
#define STAT_SEGMENT_VERSION 2
#define STAT_SEGMENT_INDEX_INVALID UINT32_MAX
typedef void (*stat_segment_update_fn)(stat_segment_directory_entry_t * e, u32 i);
typedef struct {
u32 directory_index;
stat_segment_update_fn fn;
u32 caller_index;
} stat_segment_gauges_pool_t;
typedef struct
{
/* internal, does not point to shared memory */
stat_segment_gauges_pool_t *gauges;
/* statistics segment */
uword *directory_vector_by_name;
stat_segment_directory_entry_t *directory_vector;
volatile u64 **error_vector;
u8 **interfaces;
u8 **nodes;
/* Update interval */
f64 update_interval;
clib_spinlock_t *stat_segment_lockp;
clib_socket_t *socket;
u8 *socket_name;
ssize_t memory_size;
clib_mem_page_sz_t log2_page_sz;
u8 node_counters_enabled;
void *last;
void *heap;
stat_segment_shared_header_t *shared_header; /* pointer to shared memory segment */
int memfd;
u64 last_input_packets; // OLE REMOVE?
} stat_segment_main_t;
extern stat_segment_main_t stat_segment_main;
clib_error_t *
stat_segment_register_gauge (u8 *names, stat_segment_update_fn update_fn, u32 index);
clib_error_t *
stat_segment_register_state_counter(u8 *name, u32 *index);
clib_error_t *
stat_segment_deregister_state_counter(u32 index);
void stat_segment_set_state_counter (u32 index, u64 value);
void stat_segment_poll_add (u32 vector_index, stat_segment_update_fn update_fn,
u32 caller_index, u32 interval);
u32 stat_segment_new_entry (u8 *name, stat_directory_type_t t);
void vlib_stats_register_mem_heap (clib_mem_heap_t *heap);
void vlib_stat_segment_lock (void);
void vlib_stat_segment_unlock (void);
void vlib_stats_register_symlink (void *oldheap, u8 *name, u32 index1,
u32 index2, u8 lock);
void stat_provider_register_vector_rate (u32 num_workers);
#endif

198
src/vpp/stats/stat_segment_provider.c
View File

@ -1,198 +0,0 @@
/*
* Copyright (c) 2021 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Counters handled by the stats module directly.
*/
#include <stdbool.h>
#include <vppinfra/mem.h>
#include <vppinfra/vec.h>
#include <vlib/vlib.h>
#include <vlib/counter.h>
#include "stat_segment.h"
clib_mem_heap_t **memory_heaps_vec;
u32 mem_vector_index;
bool initialized = false;
enum
{
STAT_MEM_TOTAL = 0,
STAT_MEM_USED,
STAT_MEM_FREE,
STAT_MEM_USED_MMAP,
STAT_MEM_TOTAL_ALLOC,
STAT_MEM_FREE_CHUNKS,
STAT_MEM_RELEASABLE,
} stat_mem_usage_e;
/*
* Called from the stats periodic process to update memory counters.
*/
static void
stat_provider_mem_usage_update_fn (stat_segment_directory_entry_t *e,
u32 index)
{
clib_mem_usage_t usage;
clib_mem_heap_t *heap;
counter_t **counters = e->data;
counter_t *cb;
heap = vec_elt (memory_heaps_vec, index);
clib_mem_get_heap_usage (heap, &usage);
cb = counters[0];
cb[STAT_MEM_TOTAL] = usage.bytes_total;
cb[STAT_MEM_USED] = usage.bytes_used;
cb[STAT_MEM_FREE] = usage.bytes_free;
cb[STAT_MEM_USED_MMAP] = usage.bytes_used_mmap;
cb[STAT_MEM_TOTAL_ALLOC] = usage.bytes_max;
cb[STAT_MEM_FREE_CHUNKS] = usage.bytes_free_reclaimed;
cb[STAT_MEM_RELEASABLE] = usage.bytes_overhead;
}
static counter_t **
stat_validate_counter_vector3 (counter_t **counters, u32 max1, u32 max2)
{
stat_segment_main_t *sm = &stat_segment_main;
int i;
void *oldheap = clib_mem_set_heap (sm->heap);
vec_validate_aligned (counters, max1, CLIB_CACHE_LINE_BYTES);
for (i = 0; i <= max1; i++)
vec_validate_aligned (counters[i], max2, CLIB_CACHE_LINE_BYTES);
clib_mem_set_heap (oldheap);
return counters;
}
/*
* Provide memory heap counters.
* Two dimensional array of heap index and per-heap gauges.
*/
void
vlib_stats_register_mem_heap (clib_mem_heap_t *heap)
{
stat_segment_main_t *sm = &stat_segment_main;
vec_add1 (memory_heaps_vec, heap);
u32 heap_index = vec_len (memory_heaps_vec) - 1;
/* Memory counters provider */
u8 *s = format (0, "/mem/%s%c", heap->name, 0);
u8 *s_used = format (0, "/mem/%s/used%c", heap->name, 0);
u8 *s_total = format (0, "/mem/%s/total%c", heap->name, 0);
u8 *s_free = format (0, "/mem/%s/free%c", heap->name, 0);
mem_vector_index =
stat_segment_new_entry (s, STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE);
vec_free (s);
if (mem_vector_index == ~0)
ASSERT (0);
vlib_stat_segment_lock ();
stat_segment_directory_entry_t *ep = &sm->directory_vector[mem_vector_index];
ep->data = stat_validate_counter_vector3 (ep->data, 0, STAT_MEM_RELEASABLE);
/* Create symlink */
void *oldheap = clib_mem_set_heap (sm->heap);
vlib_stats_register_symlink (oldheap, s_total, mem_vector_index,
STAT_MEM_TOTAL, 0);
vlib_stats_register_symlink (oldheap, s_used, mem_vector_index,
STAT_MEM_USED, 0);
vlib_stats_register_symlink (oldheap, s_free, mem_vector_index,
STAT_MEM_FREE, 0);
vlib_stat_segment_unlock ();
clib_mem_set_heap (oldheap);
vec_free (s_used);
vec_free (s_total);
vec_free (s_free);
stat_segment_poll_add (mem_vector_index, stat_provider_mem_usage_update_fn,
heap_index, 10);
}
static void
stat_provider_vector_rate_per_thread_update_fn (
stat_segment_directory_entry_t *e, u32 index)
{
vlib_main_t *this_vlib_main;
int i;
ASSERT (e->data);
counter_t **counters = e->data;
for (i = 0; i < vlib_get_n_threads (); i++)
{
f64 this_vector_rate;
this_vlib_main = vlib_get_main_by_index (i);
this_vector_rate = vlib_internal_node_vector_rate (this_vlib_main);
vlib_clear_internal_node_vector_rate (this_vlib_main);
/* Set the per-worker rate */
counter_t *cb = counters[i];
cb[0] = this_vector_rate;
}
}
static void
stat_provider_vector_rate_update_fn (stat_segment_directory_entry_t *e,
u32 index)
{
vlib_main_t *this_vlib_main;
int i;
f64 vector_rate = 0.0;
for (i = 0; i < vlib_get_n_threads (); i++)
{
f64 this_vector_rate;
this_vlib_main = vlib_get_main_by_index (i);
this_vector_rate = vlib_internal_node_vector_rate (this_vlib_main);
vlib_clear_internal_node_vector_rate (this_vlib_main);
vector_rate += this_vector_rate;
}
/* And set the system average rate */
vector_rate /= (f64) (i > 1 ? i - 1 : 1);
e->value = vector_rate;
}
void
stat_provider_register_vector_rate (u32 num_workers)
{
int i;
u8 *s = format (0, "/sys/vector_rate%c", 0);
i = stat_segment_new_entry (s, STAT_DIR_TYPE_SCALAR_INDEX);
if (i == ~0)
ASSERT (0);
vec_free (s);
stat_segment_poll_add (i, stat_provider_vector_rate_update_fn, ~0, 10);
s = format (0, "/sys/vector_rate_per_worker%c", 0);
i = stat_segment_new_entry (s, STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE);
if (i == ~0)
ASSERT (0);
vec_free (s);
stat_segment_poll_add (i, stat_provider_vector_rate_per_thread_update_fn, ~0,
10);
stat_segment_main_t *sm = &stat_segment_main;
vlib_stat_segment_lock ();
stat_segment_directory_entry_t *ep = &sm->directory_vector[i];
ep->data = stat_validate_counter_vector3 (ep->data, num_workers, 0);
vlib_stat_segment_unlock ();
}

66
src/vpp/stats/stat_segment_shared.h
View File

@ -1,66 +0,0 @@
/*
* Copyright (c) 2018 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef included_stat_segment_shared_h
#define included_stat_segment_shared_h
typedef enum
{
STAT_DIR_TYPE_ILLEGAL = 0,
STAT_DIR_TYPE_SCALAR_INDEX,
STAT_DIR_TYPE_COUNTER_VECTOR_SIMPLE,
STAT_DIR_TYPE_COUNTER_VECTOR_COMBINED,
STAT_DIR_TYPE_ERROR_INDEX,
STAT_DIR_TYPE_NAME_VECTOR,
STAT_DIR_TYPE_EMPTY,
STAT_DIR_TYPE_SYMLINK,
} stat_directory_type_t;
typedef struct
{
stat_directory_type_t type;
union {
struct
{
uint32_t index1;
uint32_t index2;
};
uint64_t index;
uint64_t value;
void *data;
};
char name[128]; // TODO change this to pointer to "somewhere"
} stat_segment_directory_entry_t;
/*
* Shared header first in the shared memory segment.
*/
typedef struct
{
uint64_t version;
void *base;
volatile uint64_t epoch;
volatile uint64_t in_progress;
volatile stat_segment_directory_entry_t *directory_vector;
volatile uint64_t **error_vector;
} stat_segment_shared_header_t;
static inline void *
stat_segment_pointer (void *start, uint64_t offset)
{
return ((char *) start + offset);
}
#endif /* included_stat_segment_shared_h */