diff options
author | Dave Barach <dave@barachs.net> | 2019-08-14 09:35:41 -0400 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2019-08-15 10:14:52 +0000 |
commit | 531969ef614bdc15c45dae0f1b5e90afaf86eb7b (patch) | |
tree | 69141710a458ec3a486a83b5fbaadb590001a93a /src/vpp | |
parent | 9094b5c319d3f072d3c248fe7c876e4048c13ac2 (diff) |
stats: refactor header files
Performant stat segment scraping involves caching the results of
stat_segment_ls (...) and directly fishing counter data from the
shared-memory segment.
To do that, we need to publish several things previously hidden,
declared in stat_client.c:
o stat_client_main_t typedef
o stat_segment_access_t typedef
o stat_segment_access_start inline function
o stat_segment_access_end inline function
Type: refactor
Signed-off-by: Dave Barach <dave@barachs.net>
Change-Id: I3175e3d1f1fd8ea816336a584565179d1972115c
Diffstat (limited to 'src/vpp')
-rw-r--r-- | src/vpp/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/vpp/stats/stat_segment.h | 34 | ||||
-rw-r--r-- | src/vpp/stats/stat_segment_shared.h | 60 |
3 files changed, 62 insertions, 33 deletions
diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt index 401f1d01190..da43b0f7a34 100644 --- a/src/vpp/CMakeLists.txt +++ b/src/vpp/CMakeLists.txt @@ -81,6 +81,7 @@ add_vpp_headers(vpp api/vpe_msg_enum.h api/vpe_all_api_h.h stats/stat_segment.h + stats/stat_segment_shared.h ) ############################################################################## diff --git a/src/vpp/stats/stat_segment.h b/src/vpp/stats/stat_segment.h index a67c59feed5..5c55cf94ff9 100644 --- a/src/vpp/stats/stat_segment.h +++ b/src/vpp/stats/stat_segment.h @@ -16,10 +16,9 @@ #ifndef included_stat_segment_h #define included_stat_segment_h -#include <stdatomic.h> #include <vlib/vlib.h> #include <vppinfra/socket.h> -#include <vpp-api/client/stat_client.h> +#include <vpp/stats/stat_segment_shared.h> typedef enum { @@ -59,49 +58,18 @@ typedef enum _(MEM_STATSEG_TOTAL, SCALAR_INDEX, total, /mem/statseg) \ _(MEM_STATSEG_USED, SCALAR_INDEX, used, /mem/statseg) -typedef struct -{ - stat_directory_type_t type; - union { - uint64_t offset; - uint64_t index; - uint64_t value; - }; - uint64_t offset_vector; - char name[128]; // TODO change this to pointer to "somewhere" -} stat_segment_directory_entry_t; - /* Default stat segment 32m */ #define STAT_SEGMENT_DEFAULT_SIZE (32<<20) /* Shared segment memory layout version */ #define STAT_SEGMENT_VERSION 1 -/* - * Shared header first in the shared memory segment. - */ -typedef struct -{ - u64 version; - atomic_int_fast64_t epoch; - atomic_int_fast64_t in_progress; - atomic_int_fast64_t directory_offset; - atomic_int_fast64_t error_offset; - atomic_int_fast64_t stats_offset; -} stat_segment_shared_header_t; - static inline uint64_t stat_segment_offset (void *start, void *data) { return (char *) data - (char *) start; } -static inline void * -stat_segment_pointer (void *start, uint64_t offset) -{ - return ((char *) start + offset); -} - typedef void (*stat_segment_update_fn)(stat_segment_directory_entry_t * e, u32 i); typedef struct { diff --git a/src/vpp/stats/stat_segment_shared.h b/src/vpp/stats/stat_segment_shared.h new file mode 100644 index 00000000000..719cf59c5b1 --- /dev/null +++ b/src/vpp/stats/stat_segment_shared.h @@ -0,0 +1,60 @@ +/* + * 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_directory_type_t; + +typedef struct +{ + stat_directory_type_t type; + union { + uint64_t offset; + uint64_t index; + uint64_t value; + }; + uint64_t offset_vector; + 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; + volatile uint64_t epoch; + volatile uint64_t in_progress; + volatile uint64_t directory_offset; + volatile uint64_t error_offset; + volatile uint64_t stats_offset; +} 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 */ |