diff options
Diffstat (limited to 'vlib')
| -rw-r--r-- | vlib/vlib/elog_samples.c | 108 | ||||
| -rw-r--r-- | vlib/vlib/main.c | 80 |
2 files changed, 183 insertions, 5 deletions
diff --git a/vlib/vlib/elog_samples.c b/vlib/vlib/elog_samples.c new file mode 100644 index 00000000000..0a5cd202252 --- /dev/null +++ b/vlib/vlib/elog_samples.c @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2016 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. + */ + +#include <vlib/vlib.h> +#include <vppinfra/elog.h> + +static inline void elog_four_int_sample (u32 *data) +{ + ELOG_TYPE_DECLARE(e) = + { + .format = "four int: first %d second %d third %d fourth %d", + .format_args = "i4i4i4i4", + }; + struct { u32 data[4];} * ed; + ed = ELOG_DATA (&vlib_global_main.elog_main, e); + ed->data[0] = data[0]; + ed->data[1] = data[1]; + ed->data[2] = data[2]; + ed->data[3] = data[3]; +} + +static inline void elog_four_int_track_sample (u32 *data) +{ + ELOG_TYPE_DECLARE(e) = + { + .format = "four_int_track: first %d second %d third %d fourth %d", + .format_args = "i4i4i4i4", + }; + struct { u32 data[4];} * ed; + ELOG_TRACK(sample_track); + ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, e, sample_track); + ed->data[0] = data[0]; + ed->data[1] = data[1]; + ed->data[2] = data[2]; + ed->data[3] = data[3]; +} + +static inline void elog_enum_sample (u8 which) +{ + ELOG_TYPE_DECLARE (e) = + { + .format = "my enum: %s", + .format_args = "t1", + .n_enum_strings = 2, + .enum_strings = + { + "string 1", + "string 2", + }, + }; + struct { u8 which;} * ed; + ed = ELOG_DATA (&vlib_global_main.elog_main, e); + ed->which = which; +} + +static inline void elog_one_datum_sample (u32 data) +{ + ELOG_TYPE_DECLARE (e) = + { + .format = "one datum: %d", + .format_args = "i4", + }; + + elog (&vlib_global_main.elog_main, &e, data); +} + +static clib_error_t * +test_elog_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + int i; + u32 samples[4]; + + for (i = 0; i < 10; i++) + { + samples[0] = i; + samples[1] = i+1; + samples[2] = i+2; + samples[3] = i+3; + + elog_four_int_sample (samples); + elog_four_int_track_sample (samples); + elog_enum_sample (0); + elog_enum_sample (1); + elog_one_datum_sample (i); + } + + return 0; +} + +VLIB_CLI_COMMAND (test_elog_command, static) = { + .path = "test elog sample", + .short_help = "test elog sample", + .function = test_elog_command_fn, +}; diff --git a/vlib/vlib/main.c b/vlib/vlib/main.c index fe9a7da8243..07cf7fb2e6b 100644 --- a/vlib/vlib/main.c +++ b/vlib/vlib/main.c @@ -665,8 +665,8 @@ vlib_cli_elog_clear (vlib_main_t * vm, } VLIB_CLI_COMMAND (elog_clear_cli, static) = { - .path = "clear event-logger", - .short_help = "Clear current event log", + .path = "event-logger clear", + .short_help = "Clear the event log", .function = vlib_cli_elog_clear, }; @@ -711,11 +711,78 @@ elog_save_buffer (vlib_main_t * vm, } VLIB_CLI_COMMAND (elog_save_cli, static) = { - .path = "save event-logger", - .short_help = "save event-logger <filename> (saves log in /tmp/<filename>)", + .path = "event-logger save", + .short_help = "event-logger save <filename> (saves log in /tmp/<filename>)", .function = elog_save_buffer, }; +static clib_error_t * +elog_stop (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + elog_main_t * em = &vm->elog_main; + + em->n_total_events_disable_limit = em->n_total_events; + + vlib_cli_output (vm, "Stopped the event logger..."); + return 0; +} + +VLIB_CLI_COMMAND (elog_stop_cli, static) = { + .path = "event-logger stop", + .short_help = "Stop the event-logger", + .function = elog_stop, +}; + +static clib_error_t * +elog_restart (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + elog_main_t * em = &vm->elog_main; + + em->n_total_events_disable_limit = ~0; + + vlib_cli_output (vm, "Restarted the event logger..."); + return 0; +} + +VLIB_CLI_COMMAND (elog_restart_cli, static) = { + .path = "event-logger restart", + .short_help = "Restart the event-logger", + .function = elog_restart, +}; + +static clib_error_t * +elog_resize (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + elog_main_t * em = &vm->elog_main; + u32 tmp; + + /* Stop the parade */ + elog_reset_buffer (&vm->elog_main); + + if (unformat (input, "%d", &tmp)) + { + elog_alloc (em, tmp); + em->n_total_events_disable_limit = ~0; + } + else + return clib_error_return (0, "Must specify how many events in the ring"); + + vlib_cli_output (vm, "Resized ring and restarted the event logger..."); + return 0; +} + +VLIB_CLI_COMMAND (elog_resize_cli, static) = { + .path = "event-logger resize", + .short_help = "event-logger resize <nnn>", + .function = elog_resize, +}; + #endif /* CLIB_UNIX */ static void elog_show_buffer_internal (vlib_main_t * vm, u32 n_events_to_show) @@ -729,7 +796,10 @@ static void elog_show_buffer_internal (vlib_main_t * vm, u32 n_events_to_show) * vm->clib_time.seconds_per_clock; es = elog_peek_events (em); - vlib_cli_output (vm, "%d events in buffer", vec_len (es)); + vlib_cli_output (vm, "%d of %d events in buffer, logger %s", vec_len (es), + em->event_ring_size, + em->n_total_events < em->n_total_events_disable_limit ? + "running" : "stopped"); vec_foreach (e, es) { vlib_cli_output (vm, "%18.9f: %U", |