X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fclient%2Fstat_client.h;h=f8473efd47f0f8dc17ae78463eaf86cf9d0bd7ff;hb=65c56c83ce4e58178b5ad90a8f325692c9904381;hp=9385cd242d5e9fab63129d5addc1d9710dff955e;hpb=7d29e320fb2855a1ddb7a6af09078b8ed636de01;p=vpp.git diff --git a/src/vpp-api/client/stat_client.h b/src/vpp-api/client/stat_client.h index 9385cd242d5..f8473efd47f 100644 --- a/src/vpp-api/client/stat_client.h +++ b/src/vpp-api/client/stat_client.h @@ -90,9 +90,6 @@ typedef struct uint64_t epoch; } stat_segment_access_t; -/* - * Returns 0 on success, -1 on failure (timeout) - */ static inline uint64_t _time_now_nsec (void) { @@ -104,10 +101,17 @@ _time_now_nsec (void) static inline void * stat_segment_adjust (stat_client_main_t * sm, void *data) { - return (void *) ((char *) sm->shared_header + - ((char *) data - (char *) sm->shared_header->base)); + void *p = (void *) ((char *) sm->shared_header + + ((char *) data - (char *) sm->shared_header->base)); + if (p > (void *) sm->shared_header && + ((p + sizeof (p)) < ((void *) sm->shared_header + sm->memory_size))) + return p; + return 0; } +/* + * Returns 0 on success, -1 on failure (timeout) + */ static inline int stat_segment_access_start (stat_segment_access_t * sa, stat_client_main_t * sm) @@ -145,6 +149,19 @@ stat_segment_set_timeout_nsec (stat_client_main_t * sm, uint64_t timeout) sm->timeout = timeout; } +/* + * set maximum number of nano seconds to wait for in_progress state + * this function can be called directly by module using shared stat + * segment + */ +static inline void +stat_segment_set_timeout (uint64_t timeout) +{ + stat_client_main_t *sm = &stat_client_main; + stat_segment_set_timeout_nsec (sm, timeout); +} + + static inline bool stat_segment_access_end (stat_segment_access_t * sa, stat_client_main_t * sm) {