From: Mathieu Desnoyers Date: Sun, 11 Dec 2016 12:53:26 +0000 (+0100) Subject: Support standard timestamp formats for begin/end X-Git-Tag: v2.0.0-pre1~609 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=528debdf7f5593bfb1abddac48554fc635d26a6d Support standard timestamp formats for begin/end Also use the new plugin parameters to convey this information. Don't allocate a shortcut just yet. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c index 76624b2b..2d66600a 100644 --- a/converter/babeltrace-cfg.c +++ b/converter/babeltrace-cfg.c @@ -722,7 +722,7 @@ void print_legacy_usage(FILE *fp) fprintf(fp, " \n"); fprintf(fp, " --clock-cycles Print timestamps in clock cycles\n"); fprintf(fp, " --clock-date Print timestamp dates\n"); - fprintf(fp, " --clock-gmt Print timestamps in GMT time zone\n"); + fprintf(fp, " --clock-gmt Print and parse timestamps in GMT time zone\n"); fprintf(fp, " (default: local time zone)\n"); fprintf(fp, " --clock-seconds Print the timestamps as [SEC.NS]\n"); fprintf(fp, " (default format: [HH:MM:SS.NS])\n"); @@ -754,20 +754,11 @@ void print_usage(FILE *fp) { fprintf(fp, "Usage: babeltrace [OPTIONS]\n"); fprintf(fp, "\n"); - fprintf(fp, " -B, --base-begin-ns=NS Set NS as the current base beginning\n"); - fprintf(fp, " timestamp of the following source component\n"); - fprintf(fp, " instances\n"); - fprintf(fp, " -E, --base-end-ns=NS Set NS as the current base end timestamp\n"); - fprintf(fp, " of the following source component instances\n"); fprintf(fp, " -b, --base-params=PARAMS Set PARAMS as the current base parameters\n"); fprintf(fp, " of the following source and sink component\n"); fprintf(fp, " instances (see the exact format of PARAMS\n"); fprintf(fp, " below)\n"); - fprintf(fp, " --begin-ns=NS Set the beginning timestamp of the latest\n"); - fprintf(fp, " source component instance to NS\n"); fprintf(fp, " -d, --debug Enable debug mode\n"); - fprintf(fp, " --end-ns=NS Set the end timestamp of the latest source\n"); - fprintf(fp, " component instance to NS\n"); fprintf(fp, " -l, --list List available plugins and their components\n"); fprintf(fp, " -P, --path=PATH Set the `path` parameter of the latest source\n"); fprintf(fp, " or sink component to PATH\n"); @@ -777,10 +768,6 @@ void print_usage(FILE *fp) fprintf(fp, " PARAMS below)\n"); fprintf(fp, " --plugin-path=PATH[:PATH]... Set paths from which dynamic plugins can be\n"); fprintf(fp, " loaded to PATH\n"); - fprintf(fp, " --reset-base-begin-ns Reset the current base beginning timestamp\n"); - fprintf(fp, " of the following source component instances\n"); - fprintf(fp, " --reset-base-end-ns Reset the current base end timestamp of the\n"); - fprintf(fp, " following source component instances\n"); fprintf(fp, " -r, --reset-base-params Reset the current base parameters of the\n"); fprintf(fp, " following source and sink component\n"); fprintf(fp, " instances to an empty map\n"); @@ -1580,8 +1567,7 @@ static int append_sources_from_legacy_opts(GPtrArray *sources, enum legacy_input_format legacy_input_format, struct ctf_legacy_opts *ctf_legacy_opts, - struct bt_value *legacy_input_paths, - int64_t *begin_ns, int64_t *end_ns) + struct bt_value *legacy_input_paths) { int ret = 0; int i; @@ -1646,10 +1632,6 @@ int append_sources_from_legacy_opts(GPtrArray *sources, } BT_MOVE(bt_config_component->params, params); - bt_config_component->begin.value_ns = begin_ns ? *begin_ns : 0; - bt_config_component->begin.set = !!begin_ns; - bt_config_component->end.value_ns = end_ns ? *end_ns : 0; - bt_config_component->end.set = !!end_ns; /* Move created component configuration to the array */ g_ptr_array_add(sources, bt_config_component); @@ -1998,29 +1980,6 @@ end: return; } -/* - * Validates a given source component configuration. - */ -static -bool validate_source_config_component(struct bt_config_component *cfg_comp) -{ - bool valid = false; - - if (cfg_comp->begin.set && cfg_comp->end.set) { - if (cfg_comp->begin.value_ns > cfg_comp->end.value_ns) { - printf_err("Beginning timestamp (%" PRIu64 ") is greater than end timestamp (%" PRIu64 ")\n", - cfg_comp->begin.value_ns, - cfg_comp->end.value_ns); - goto end; - } - } - - valid = true; - -end: - return valid; -} - /* * Validates a given configuration, with optional legacy input and * output formats options. Prints useful error messages if anything @@ -2145,40 +2104,10 @@ int parse_int64(const char *arg, int64_t *val) return 0; } -/* - * Parses a time in nanoseconds. - * - * Returns a negative value if anything goes wrong. - */ -static -int ns_from_arg(const char *arg, int64_t *ns) -{ - int ret = 0; - int64_t value; - - if (parse_int64(arg, &value)) { - ret = -1; - goto end; - } - - if (value < 0) { - ret = -1; - goto end; - } - - *ns = value; - -end: - return ret; -} - /* popt options */ enum { OPT_NONE = 0, - OPT_BASE_BEGIN_NS, - OPT_BASE_END_NS, OPT_BASE_PARAMS, - OPT_BEGIN_NS, OPT_CLOCK_CYCLES, OPT_CLOCK_DATE, OPT_CLOCK_FORCE_CORRELATE, @@ -2190,7 +2119,6 @@ enum { OPT_DEBUG_INFO_DIR, OPT_DEBUG_INFO_FULL_PATH, OPT_DEBUG_INFO_TARGET_PREFIX, - OPT_END_NS, OPT_FIELDS, OPT_HELP, OPT_HELP_LEGACY, @@ -2203,8 +2131,6 @@ enum { OPT_PATH, OPT_PARAMS, OPT_PLUGIN_PATH, - OPT_RESET_BASE_BEGIN_NS, - OPT_RESET_BASE_END_NS, OPT_RESET_BASE_PARAMS, OPT_SINK, OPT_SOURCE, @@ -2216,10 +2142,7 @@ enum { /* popt long option descriptions */ static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - { "base-begin-ns", 'B', POPT_ARG_STRING, NULL, OPT_BASE_BEGIN_NS, NULL, NULL }, - { "base-end-ns", 'E', POPT_ARG_STRING, NULL, OPT_BASE_END_NS, NULL, NULL }, { "base-params", 'b', POPT_ARG_STRING, NULL, OPT_BASE_PARAMS, NULL, NULL }, - { "begin-ns", '\0', POPT_ARG_STRING, NULL, OPT_BEGIN_NS, NULL, NULL }, { "clock-cycles", '\0', POPT_ARG_NONE, NULL, OPT_CLOCK_CYCLES, NULL, NULL }, { "clock-date", '\0', POPT_ARG_NONE, NULL, OPT_CLOCK_DATE, NULL, NULL }, { "clock-force-correlate", '\0', POPT_ARG_NONE, NULL, OPT_CLOCK_FORCE_CORRELATE, NULL, NULL }, @@ -2231,7 +2154,6 @@ static struct poptOption long_options[] = { { "debug-info-dir", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_DIR, NULL, NULL }, { "debug-info-full-path", 0, POPT_ARG_NONE, NULL, OPT_DEBUG_INFO_FULL_PATH, NULL, NULL }, { "debug-info-target-prefix", 0, POPT_ARG_STRING, NULL, OPT_DEBUG_INFO_TARGET_PREFIX, NULL, NULL }, - { "end-ns", '\0', POPT_ARG_STRING, NULL, OPT_END_NS, NULL, NULL }, { "fields", 'f', POPT_ARG_STRING, NULL, OPT_FIELDS, NULL, NULL }, { "help", 'h', POPT_ARG_NONE, NULL, OPT_HELP, NULL, NULL }, { "help-legacy", '\0', POPT_ARG_NONE, NULL, OPT_HELP_LEGACY, NULL, NULL }, @@ -2244,8 +2166,6 @@ static struct poptOption long_options[] = { { "path", 'P', POPT_ARG_STRING, NULL, OPT_PATH, NULL, NULL }, { "params", 'p', POPT_ARG_STRING, NULL, OPT_PARAMS, NULL, NULL }, { "plugin-path", '\0', POPT_ARG_STRING, NULL, OPT_PLUGIN_PATH, NULL, NULL }, - { "reset-base-begin-ns", '\0', POPT_ARG_NONE, NULL, OPT_RESET_BASE_BEGIN_NS, NULL, NULL }, - { "reset-base-end-ns", '\0', POPT_ARG_NONE, NULL, OPT_RESET_BASE_END_NS, NULL, NULL }, { "reset-base-params", 'r', POPT_ARG_NONE, NULL, OPT_RESET_BASE_PARAMS, NULL, NULL }, { "sink", '\0', POPT_ARG_STRING, NULL, OPT_SINK, NULL, NULL }, { "source", '\0', POPT_ARG_STRING, NULL, OPT_SOURCE, NULL, NULL }, @@ -2294,7 +2214,7 @@ static void add_cfg_comp(struct bt_config *cfg, * * Return value is NULL on error, otherwise it's owned by the caller. */ -struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) +struct bt_config *bt_config_from_args(int argc, const char *argv[], int *exit_code) { struct bt_config *cfg = NULL; poptContext pc = NULL; @@ -2309,13 +2229,8 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) enum bt_config_component_dest cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE; struct bt_value *cur_base_params = NULL; - int64_t cur_base_begin_ns = 0; - bool cur_base_begin_ns_set = false; - int64_t cur_base_end_ns = 0; - bool cur_base_end_ns_set = false; int opt; bool cur_cfg_comp_params_set = false; - unsigned int i; memset(&ctf_legacy_opts, 0, sizeof(ctf_legacy_opts)); memset(&text_legacy_opts, 0, sizeof(text_legacy_opts)); @@ -2473,12 +2388,6 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) goto end; } - cur_cfg_comp->begin.value_ns = cur_base_begin_ns; - cur_cfg_comp->begin.set = cur_base_begin_ns_set; - - cur_cfg_comp->end.value_ns = cur_base_end_ns; - cur_cfg_comp->end.set = cur_base_end_ns_set; - cur_cfg_comp_dest = BT_CONFIG_COMPONENT_DEST_SOURCE; cur_cfg_comp_params_set = false; break; @@ -2617,58 +2526,6 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) goto error; } break; - case OPT_BASE_BEGIN_NS: - if (ns_from_arg(arg, &cur_base_begin_ns)) { - printf_err("Invalid --base-begin-ns option's argument:\n %s\n", - arg); - goto error; - } - cur_base_begin_ns_set = true; - break; - case OPT_BASE_END_NS: - if (ns_from_arg(arg, &cur_base_end_ns)) { - printf_err("Invalid --base-end-ns option's argument:\n %s\n", - arg); - goto error; - } - cur_base_end_ns_set = true; - break; - case OPT_RESET_BASE_BEGIN_NS: - cur_base_begin_ns = 0; - cur_base_begin_ns = false; - break; - case OPT_RESET_BASE_END_NS: - cur_base_end_ns = 0; - cur_base_end_ns = false; - break; - case OPT_BEGIN_NS: - if (!cur_cfg_comp || cur_cfg_comp_dest == - BT_CONFIG_COMPONENT_DEST_SINK) { - printf_err("--begin-ns option must follow a --source option\n"); - goto error; - } - - if (ns_from_arg(arg, &cur_cfg_comp->begin.value_ns)) { - printf_err("Invalid --begin-ns option's argument:\n %s\n", - arg); - goto error; - } - cur_cfg_comp->begin.set = true; - break; - case OPT_END_NS: - if (!cur_cfg_comp || cur_cfg_comp_dest == - BT_CONFIG_COMPONENT_DEST_SINK) { - printf_err("--end-ns option must follow a --source option\n"); - goto error; - } - - if (ns_from_arg(arg, &cur_cfg_comp->end.value_ns)) { - printf_err("Invalid --end-ns option's argument:\n %s\n", - arg); - goto error; - } - cur_cfg_comp->end.set = true; - break; case OPT_NAMES: if (text_legacy_opts.names) { printf_err("Duplicate --names option\n"); @@ -2825,9 +2682,7 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) if (legacy_input_format) { if (append_sources_from_legacy_opts(cfg->sources, legacy_input_format, &ctf_legacy_opts, - legacy_input_paths, - cur_base_begin_ns_set ? &cur_base_begin_ns : NULL, - cur_base_end_ns_set ? &cur_base_end_ns : NULL)) { + legacy_input_paths)) { printf_err("Cannot convert legacy input format options to source component instance(s)\n"); goto error; } @@ -2845,21 +2700,6 @@ struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code) } } - for (i = 0; i < cfg->sources->len; i++) { - struct bt_config_component *cfg_component = - bt_config_get_component(cfg->sources, i); - - /* Only peek */ - bt_put(cfg_component); - - if (!validate_source_config_component(cfg_component)) { - printf_err("Invalid source component instance (class %s.%s)\n", - cfg_component->plugin_name->str, - cfg_component->component_name->str); - goto error; - } - } - goto end; error: diff --git a/converter/babeltrace-cfg.h b/converter/babeltrace-cfg.h index 50fd360a..fea844c5 100644 --- a/converter/babeltrace-cfg.h +++ b/converter/babeltrace-cfg.h @@ -38,14 +38,6 @@ struct bt_config_component { GString *plugin_name; GString *component_name; struct bt_value *params; - struct { - bool set; - int64_t value_ns; - } begin; - struct { - bool set; - int64_t value_ns; - } end; }; struct bt_config { @@ -71,6 +63,6 @@ struct bt_config_component *bt_config_get_component(GPtrArray *array, return bt_get(g_ptr_array_index(array, index)); } -struct bt_config *bt_config_from_args(int argc, char *argv[], int *exit_code); +struct bt_config *bt_config_from_args(int argc, const char *argv[], int *exit_code); #endif /* BABELTRACE_CONVERTER_CFG_H */ diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 0246475c..49f4cc2c 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -209,22 +209,6 @@ void print_bt_config_component(struct bt_config_component *bt_config_component) { printf(" %s.%s\n", bt_config_component->plugin_name->str, bt_config_component->component_name->str); - printf(" begin timestamp: "); - - if (!bt_config_component->begin.set) { - printf("not set\n"); - } else { - printf("%" PRIu64 " ns\n", bt_config_component->begin.value_ns); - } - - printf(" end timestamp: "); - - if (!bt_config_component->end.set) { - printf("not set\n"); - } else { - printf("%" PRIu64 " ns\n", bt_config_component->end.value_ns); - } - printf(" params:\n"); print_value(bt_config_component->params, 6, true); } @@ -263,6 +247,7 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg) struct bt_component *trimmer = NULL; struct bt_component_class *trimmer_class = NULL; struct bt_value *trimmer_params = NULL; + struct bt_value *value; assert(component_factory); trimmer_params = bt_value_map_create(); @@ -270,34 +255,33 @@ struct bt_component *create_trimmer(struct bt_config_component *source_cfg) goto end; } - if (source_cfg->begin.set) { + value = bt_value_map_get(source_cfg->params, "begin"); + if (value) { enum bt_value_status ret; - struct bt_value *value; - value = bt_value_integer_create_init( - source_cfg->begin.value_ns); - if (!value) { - goto end; - } - - ret = bt_value_map_insert(trimmer_params, "begin_ns_epoch", + ret = bt_value_map_insert(trimmer_params, "begin", value); BT_PUT(value); if (ret) { goto end; } } - if (source_cfg->end.set) { + value = bt_value_map_get(source_cfg->params, "end"); + if (value) { enum bt_value_status ret; - struct bt_value *value; - value = bt_value_integer_create_init( - source_cfg->end.value_ns); - if (!value) { + ret = bt_value_map_insert(trimmer_params, "end", + value); + BT_PUT(value); + if (ret) { goto end; } + } + value = bt_value_map_get(source_cfg->params, "clock-gmt"); + if (value) { + enum bt_value_status ret; - ret = bt_value_map_insert(trimmer_params, "end_ns_epoch", + ret = bt_value_map_insert(trimmer_params, "clock-gmt", value); BT_PUT(value); if (ret) { @@ -341,7 +325,8 @@ int connect_source_sink(struct bt_component *source, goto end; } - if (source_cfg->begin.set || source_cfg->begin.set) { + if (bt_value_map_has_key(source_cfg->params, "begin") + || bt_value_map_has_key(source_cfg->params, "end")) { /* A trimmer must be inserted in the graph. */ enum bt_component_status trimmer_status; @@ -384,7 +369,7 @@ end: return ret; } -int main(int argc, char **argv) +int main(int argc, const char **argv) { int ret; struct bt_component_class *source_class = NULL; diff --git a/lib/plugin-system/component.c b/lib/plugin-system/component.c index 340e8066..ec939079 100644 --- a/lib/plugin-system/component.c +++ b/lib/plugin-system/component.c @@ -204,8 +204,12 @@ struct bt_component *bt_component_create( } component->initializing = true; - component_class->init(component, params); + ret = component_class->init(component, params); component->initializing = false; + if (ret != BT_COMPONENT_STATUS_OK) { + BT_PUT(component); + goto end; + } ret = component_validation_funcs[type](component); if (ret != BT_COMPONENT_STATUS_OK) { BT_PUT(component); diff --git a/plugins/trimmer/iterator.c b/plugins/trimmer/iterator.c index 0cdd69f2..68105b9f 100644 --- a/plugins/trimmer/iterator.c +++ b/plugins/trimmer/iterator.c @@ -129,6 +129,64 @@ end: return bt_get(trim_it->current_notification); } +static +int update_lazy_bound(struct trimmer_bound *bound, const char *name, + int64_t ts) +{ + struct tm tm; + int64_t value; + time_t timeval; + + if (!bound->lazy) { + return 0; + } + tm.tm_isdst = -1; + timeval = ts / NSEC_PER_SEC; + + if (bound->lazy_values.gmt) { + /* Get day, month, year. */ + if (!gmtime_r(&timeval, &tm)) { + printf_error("Failure in gmtime_r()\n"); + goto error; + } + tm.tm_sec = bound->lazy_values.ss; + tm.tm_min = bound->lazy_values.mm; + tm.tm_hour = bound->lazy_values.hh; + timeval = timegm(&tm); + if (timeval < 0) { + printf_error("Failure in timegm(), incorrectly formatted %s timestamp\n", + name); + goto error; + } + } else { + /* Get day, month, year. */ + if (!localtime_r(&timeval, &tm)) { + printf_error("Failure in localtime_r()\n"); + goto error; + } + tm.tm_sec = bound->lazy_values.ss; + tm.tm_min = bound->lazy_values.mm; + tm.tm_hour = bound->lazy_values.hh; + timeval = mktime(&tm); + if (timeval < 0) { + printf_error("Failure in mktime(), incorrectly formatted %s timestamp\n", + name); + goto error; + } + } + value = (int64_t) timeval; + value *= NSEC_PER_SEC; + value += bound->lazy_values.ns; + bound->value = value; + bound->set = true; + bound->lazy = false; + return 0; + +error: + bound->lazy = false; + return -1; +} + static bool evaluate_event_notification(struct bt_notification *notification, struct trimmer_bound *begin, struct trimmer_bound *end) @@ -173,7 +231,12 @@ bool evaluate_event_notification(struct bt_notification *notification, printf_error("Failed to retrieve clock value timestamp\n"); goto end; } - + if (update_lazy_bound(begin, "begin", ts)) { + goto end; + } + if (update_lazy_bound(end, "end", ts)) { + goto end; + } if (begin->set && ts < begin->value) { in_range = false; } diff --git a/plugins/trimmer/trimmer.c b/plugins/trimmer/trimmer.c index 23fe7134..a6882893 100644 --- a/plugins/trimmer/trimmer.c +++ b/plugins/trimmer/trimmer.c @@ -63,37 +63,214 @@ void destroy_trimmer(struct bt_component *component) destroy_trimmer_data(data); } +/* + * Parses a timestamp, figuring out its format. + * + * Returns a negative value if anything goes wrong. + * + * Expected formats: + * + * YYYY-MM-DD hh:mm:ss.ns + * hh:mm:ss.ns + * -ss.ns + * ss.ns + * YYYY-MM-DD hh:mm:ss + * hh:mm:ss + * -ss + * ss + */ static -void init_from_params(struct trimmer *trimmer, struct bt_value *params) +int timestamp_from_arg(const char *arg, + struct trimmer_bound *result_bound, bool gmt) +{ + int ret; + int64_t value; + unsigned int year, month, day, hh, mm, ss, ns; + + /* YYYY-MM-DD hh:mm:ss.ns */ + ret = sscanf(arg, "%u-%u-%u %u:%u:%u.%u", + &year, &month, &day, &hh, &mm, &ss, &ns); + if (ret == 7) { + struct tm tm = { + .tm_sec = ss, + .tm_min = mm, + .tm_hour = hh, + .tm_mday = day, + .tm_mon = month - 1, + .tm_year = year - 1900, + .tm_isdst = -1, + }; + time_t result; + + if (gmt) { + result = timegm(&tm); + if (result < 0) { + return -1; + } + } else { + result = mktime(&tm); + if (result < 0) { + return -1; + } + } + value = (int64_t) result; + value *= NSEC_PER_SEC; + value += ns; + goto set; + } + /* hh:mm:ss.ns */ + ret = sscanf(arg, "%u:%u:%u.%u", + &hh, &mm, &ss, &ns); + if (ret == 4) { + /* We don't know which day until we get an event. */ + result_bound->lazy_values.hh = hh; + result_bound->lazy_values.mm = mm; + result_bound->lazy_values.ss = ss; + result_bound->lazy_values.ns = ns; + result_bound->lazy_values.gmt = gmt; + goto lazy; + } + /* -ss.ns */ + ret = sscanf(arg, "-%u.%u", + &ss, &ns); + if (ret == 2) { + value = -ss * NSEC_PER_SEC; + value -= ns; + goto set; + } + /* ss.ns */ + ret = sscanf(arg, "%u.%u", + &ss, &ns); + if (ret == 2) { + value = ss * NSEC_PER_SEC; + value += ns; + goto set; + } + + /* YYYY-MM-DD hh:mm:ss */ + ret = sscanf(arg, "%u-%u-%u %u:%u:%u", + &year, &month, &day, &hh, &mm, &ss); + if (ret == 6) { + struct tm tm = { + .tm_sec = ss, + .tm_min = mm, + .tm_hour = hh, + .tm_mday = day, + .tm_mon = month - 1, + .tm_year = year - 1900, + .tm_isdst = -1, + }; + + if (gmt) { + value = timegm(&tm); + if (value < 0) { + return -1; + } + } else { + value = mktime(&tm); + if (value < 0) { + return -1; + } + } + value *= NSEC_PER_SEC; + goto set; + } + /* hh:mm:ss */ + ret = sscanf(arg, "%u:%u:%u", + &hh, &mm, &ss); + if (ret == 3) { + /* We don't know which day until we get an event. */ + result_bound->lazy_values.hh = hh; + result_bound->lazy_values.mm = mm; + result_bound->lazy_values.ss = ss; + result_bound->lazy_values.ns = 0; + result_bound->lazy_values.gmt = gmt; + goto lazy; + } + /* -ss */ + ret = sscanf(arg, "-%u", + &ss); + if (ret == 1) { + value = -ss * NSEC_PER_SEC; + goto set; + } + /* ss */ + ret = sscanf(arg, "%u", + &ss); + if (ret == 1) { + value = ss * NSEC_PER_SEC; + goto set; + } + + /* Not found. */ + return -1; + +set: + result_bound->value = value; + result_bound->set = true; + return 0; + +lazy: + result_bound->lazy = true; + return 0; +} + +static +enum bt_component_status init_from_params(struct trimmer *trimmer, struct bt_value *params) { struct bt_value *value = NULL; + bool gmt = false; + enum bt_component_status ret = BT_COMPONENT_STATUS_OK; assert(params); - value = bt_value_map_get(params, "begin_ns_epoch"); - if (value && bt_value_is_integer(value)) { + value = bt_value_map_get(params, "clock-gmt"); + if (value) { enum bt_value_status value_ret; - value_ret = bt_value_integer_get(value, &trimmer->begin.value); - if (!value_ret) { - trimmer->begin.set = true; - } else { - printf_error("Failed to retrieve begin_ns_epoch value\n"); + value_ret = bt_value_bool_get(value, &gmt); + if (value_ret) { + ret = BT_COMPONENT_STATUS_INVALID; + printf_error("Failed to retrieve clock-gmt value. Expecting a boolean.\n"); } } bt_put(value); - value = bt_value_map_get(params, "end_ns_epoch"); - if (value && bt_value_is_integer(value)) { + if (ret != BT_COMPONENT_STATUS_OK) { + goto end; + } + + value = bt_value_map_get(params, "begin"); + if (value) { enum bt_value_status value_ret; + const char *str; - value_ret = bt_value_integer_get(value, &trimmer->end.value); - if (!value_ret) { - trimmer->end.set = true; - } else { - printf_error("Failed to retrieve end_ns_epoch value\n"); + value_ret = bt_value_string_get(value, &str); + if (value_ret || timestamp_from_arg(str, + &trimmer->begin, gmt)) { + ret = BT_COMPONENT_STATUS_INVALID; + printf_error("Failed to retrieve begin value. Expecting a timestamp string.\n"); } } bt_put(value); + if (ret != BT_COMPONENT_STATUS_OK) { + goto end; + } + + value = bt_value_map_get(params, "end"); + if (value) { + enum bt_value_status value_ret; + const char *str; + + value_ret = bt_value_string_get(value, &str); + if (value_ret || timestamp_from_arg(str, + &trimmer->end, gmt)) { + ret = BT_COMPONENT_STATUS_INVALID; + printf_error("Failed to retrieve end value. Expecting a timestamp string.\n"); + } + } + bt_put(value); +end: + return ret; } enum bt_component_status trimmer_component_init( @@ -124,7 +301,7 @@ enum bt_component_status trimmer_component_init( goto error; } - init_from_params(trimmer, params); + ret = init_from_params(trimmer, params); end: return ret; error: diff --git a/plugins/trimmer/trimmer.h b/plugins/trimmer/trimmer.h index 28bb1e2f..869f2221 100644 --- a/plugins/trimmer/trimmer.h +++ b/plugins/trimmer/trimmer.h @@ -32,9 +32,16 @@ #include #include +#define NSEC_PER_SEC 1000000000LL + struct trimmer_bound { int64_t value; bool set; + bool lazy; + struct { + int hh, mm, ss, ns; + bool gmt; + } lazy_values; }; struct trimmer {