diff options
| author |   Ole Troan <ot@cisco.com> | 2020-08-10 11:59:20 +0200 |
|---|---|---|
| committer | Ole Troan <ot@cisco.com> | 2020-08-11 09:48:13 +0200 |
| commit | fdc678081ca5f0971b8bcbf312c1e83017365c33 (patch) | |
| tree | 1d5da8cfd91809f8741827def4e7d0af1e1c1615 /src/vpp-api/client/stat_client.c | |
| parent | 3c70c05e1f330ed0034319252c3dcd565cf13d6b (diff) | |
stats: add timeout for in_progress access to stat segment
add new api stat_segment_set_timeout_nsec to limit time waiting for vpp
in_progress state.
Change-Id: Ic78a97bc5013d67d7e4bbcc4a6f0ef918f9f9b33
Type: improvement
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vpp-api/client/stat_client.c')
| -rw-r--r-- | src/vpp-api/client/stat_client.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/vpp-api/client/stat_client.c b/src/vpp-api/client/stat_client.c index 3d1bffc2d5f..54d6db660ee 100644 --- a/src/vpp-api/client/stat_client.c +++ b/src/vpp-api/client/stat_client.c @@ -177,7 +177,8 @@ stat_segment_heartbeat_r (stat_client_main_t * sm) /* Has directory been update? */ if (sm->shared_header->epoch != sm->current_epoch) return 0; - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; ep = vec_elt_at_index (sm->directory_vector, STAT_COUNTER_HEARTBEAT); if (!stat_segment_access_end (&sa, sm)) return 0.0; @@ -336,7 +337,8 @@ stat_segment_ls_r (uint8_t ** patterns, stat_client_main_t * sm) } } - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; stat_segment_directory_entry_t *counter_vec = get_stat_vector_r (sm); for (j = 0; j < vec_len (counter_vec); j++) @@ -389,7 +391,9 @@ stat_segment_dump_r (uint32_t * stats, stat_client_main_t * sm) if (sm->shared_header->epoch != sm->current_epoch) return 0; - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; + for (i = 0; i < vec_len (stats); i++) { /* Collect counter */ @@ -444,7 +448,8 @@ stat_segment_dump_entry_r (uint32_t index, stat_client_main_t * sm) stat_segment_data_t *res = 0; stat_segment_access_t sa; - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; /* Collect counter */ ep = vec_elt_at_index (sm->directory_vector, index); @@ -472,7 +477,8 @@ stat_segment_index_to_name_r (uint32_t index, stat_client_main_t * sm) /* Has directory been update? */ if (sm->shared_header->epoch != sm->current_epoch) return 0; - stat_segment_access_start (&sa, sm); + if (stat_segment_access_start (&sa, sm)) + return 0; vec = get_stat_vector_r (sm); ep = vec_elt_at_index (vec, index); if (!stat_segment_access_end (&sa, sm)) |