diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/fieldstat.cpp | 26 | ||||
| -rw-r--r-- | src/fieldstat_dynamic.cpp | 42 | ||||
| -rw-r--r-- | src/fieldstat_internal.h | 6 |
3 files changed, 37 insertions, 37 deletions
diff --git a/src/fieldstat.cpp b/src/fieldstat.cpp index 53d64a3..8e5cdf8 100644 --- a/src/fieldstat.cpp +++ b/src/fieldstat.cpp @@ -69,14 +69,14 @@ int is_valid_tag_value(const char* value) } -int is_valid_tags(const struct fieldstat_tag *tags, size_t n_tags) +int is_valid_tags(const struct field_tag *tags, size_t n_tags) { int i = 0; - struct fieldstat_tag *tag = NULL; + struct field_tag *tag = NULL; for(i = 0; i < (int)n_tags; i++) { - tag = (struct fieldstat_tag *)&tags[i]; + tag = (struct field_tag *)&tags[i]; if (0 == is_valid_field_name(tag->key)) { return 0; @@ -172,16 +172,16 @@ struct metric * get_metric(struct fieldstat_instance *instance, int metric_id) return metric; } -void add_tags_to_metric(const struct fieldstat_tag tags[], size_t n_tag, char *tag_key[], char *tag_value[]) +void add_tags_to_metric(const struct field_tag tags[], size_t n_tag, char *tag_key[], char *tag_value[]) { int i = 0; - struct fieldstat_tag *tag = NULL; + struct field_tag *tag = NULL; char str_longlong[32] = {0}; char str_double[32] = {0}; for(i = 0; i < (int)n_tag; i++) { - tag = (struct fieldstat_tag *)&tags[i]; + tag = (struct field_tag *)&tags[i]; tag_key[i] = __str_dup(tag->key); switch(tag->value_type) { @@ -205,7 +205,7 @@ void add_tags_to_metric(const struct fieldstat_tag tags[], size_t n_tag, char *t } } -struct metric * metric_new(enum field_type type, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag) +struct metric * metric_new(enum field_type type, const char *field_name, const struct field_tag tags[], size_t n_tag) { struct metric *metric = (struct metric*)calloc(1, sizeof(struct metric)); metric->field_name = __str_dup(field_name); @@ -507,7 +507,7 @@ int fieldstat_set_statsd_server(struct fieldstat_instance *instance, const char return 0; } -int fieldstat_register(struct fieldstat_instance *instance, enum field_type type, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag) +int fieldstat_register(struct fieldstat_instance *instance, enum field_type type, const char *field_name, const struct field_tag tags[], size_t n_tag) { int metric_id = 0; struct metric *metric = NULL; @@ -899,7 +899,7 @@ struct table_line ** read_table_line_slot(struct table_metric *table, int line_i return (struct table_line **)&(line[in_block_index]); } -struct table_line *table_line_new(const char *name, const struct fieldstat_tag tags[],size_t n_tag) +struct table_line *table_line_new(const char *name, const struct field_tag tags[],size_t n_tag) { struct table_line *table_line = (struct table_line *)calloc(1, sizeof(struct table_line)); @@ -939,7 +939,7 @@ void table_line_free(struct table_line *table_line) -int fieldstat_register_table_row(struct fieldstat_instance * instance, int table_id, const char *row_name, const struct fieldstat_tag tags[], size_t n_tag, int output_metric_ids[]) +int fieldstat_register_table_row(struct fieldstat_instance * instance, int table_id, const char *row_name, const struct field_tag tags[], size_t n_tag, int output_metric_ids[]) { int metric_id = 0; struct metric *metric = NULL; @@ -1118,7 +1118,7 @@ error_out: } -static int fieldstat_register_histogram(struct fieldstat_instance *instance, enum field_type type, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag, +static int fieldstat_register_histogram(struct fieldstat_instance *instance, enum field_type type, const char *field_name, const struct field_tag tags[], size_t n_tag, const char * bins, long long lowest_trackable_value, long long highest_trackable_value, int significant_figures, int output_window) { struct metric *metric = NULL; @@ -1181,14 +1181,14 @@ static int fieldstat_register_histogram(struct fieldstat_instance *instance, enu } -int fieldstat_register_distribution(struct fieldstat_instance *instance, const char *field_name,const struct fieldstat_tag tags[], size_t n_tag, +int fieldstat_register_distribution(struct fieldstat_instance *instance, const char *field_name,const struct field_tag tags[], size_t n_tag, const char * bins, long long lowest_trackable_value, long long highest_trackable_value, int significant_figures, int output_window) { return fieldstat_register_histogram(instance, FILED_TYPE_HISTOGRAM, field_name, tags, n_tag, bins, lowest_trackable_value, highest_trackable_value, significant_figures, output_window); } -int fieldstat_register_summary(struct fieldstat_instance *instance, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag, +int fieldstat_register_summary(struct fieldstat_instance *instance, const char *field_name, const struct field_tag tags[], size_t n_tag, const char * bins, long long lowest_trackable_value, long long highest_trackable_value, int significant_figures, int output_window) { return fieldstat_register_histogram(instance, FIELD_TYPE_SUMMARY, field_name, tags, n_tag, diff --git a/src/fieldstat_dynamic.cpp b/src/fieldstat_dynamic.cpp index 2083c11..375de17 100644 --- a/src/fieldstat_dynamic.cpp +++ b/src/fieldstat_dynamic.cpp @@ -298,7 +298,7 @@ int fieldstat_register_dynamic_table(struct fieldstat_dynamic_instance *instance } -static int build_dynamic_metric_key(int table_id, const char *field_name, const struct fieldstat_tag tags[], size_t n_tags, size_t out_key_size, char *out_key) { +static int build_dynamic_metric_key(int table_id, const char *field_name, const struct field_tag tags[], size_t n_tags, size_t out_key_size, char *out_key) { unsigned int used_len = 0; /* part1: field name */ @@ -323,7 +323,7 @@ static int build_dynamic_metric_key(int table_id, const char *field_name, const /* part3: tags and value */ for (unsigned int i = 0; i < n_tags; i++) { - struct fieldstat_tag *tag = (struct fieldstat_tag *) &tags[i]; + struct field_tag *tag = (struct field_tag *) &tags[i]; /* tag key len */ unsigned int tag_key_len = strlen(tag->key) + 1; @@ -375,7 +375,7 @@ static int build_dynamic_metric_key(int table_id, const char *field_name, const return (int) used_len; } -static struct metric * read_dynamic_metric(struct fieldstat_dynamic_instance *instance, int table_id, int column_id, const char *field_name, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +static struct metric * read_dynamic_metric(struct fieldstat_dynamic_instance *instance, int table_id, int column_id, const char *field_name, const struct field_tag tags[], size_t n_tags, int thread_id) { struct dynamic_metric **head = &instance->n_thread_dynamic_metric[thread_id]; struct dynamic_metric *find = NULL; @@ -425,7 +425,7 @@ static struct metric * read_dynamic_metric(struct fieldstat_dynamic_instance *in return find->metrics[column_id]; } -static struct metric * create_dynamic_table_metric(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +static struct metric * create_dynamic_table_metric(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, const struct field_tag tags[], size_t n_tags, int thread_id) { int i = 0; struct dynamic_metric **head = NULL; @@ -513,7 +513,7 @@ static struct metric * create_dynamic_table_metric(struct fieldstat_dynamic_inst } -static struct metric * create_dynamic_metric(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +static struct metric * create_dynamic_metric(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { struct dynamic_metric **head = NULL; struct dynamic_metric *insert = NULL; @@ -582,7 +582,7 @@ static struct metric * create_dynamic_metric(struct fieldstat_dynamic_instance * } -static int fieldstat_dynamic_metric_value_operate(struct fieldstat_dynamic_instance *instance, enum field_op op, enum field_type type, const char *field_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +static int fieldstat_dynamic_metric_value_operate(struct fieldstat_dynamic_instance *instance, enum field_op op, enum field_type type, const char *field_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { struct metric * metric = NULL; @@ -602,22 +602,22 @@ static int fieldstat_dynamic_metric_value_operate(struct fieldstat_dynamic_insta } -int fieldstat_dynamic_metric_value_incrby(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +int fieldstat_dynamic_metric_value_incrby(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { return fieldstat_dynamic_metric_value_operate(instance, FS_OP_ADD, type, field_name, value, tags, n_tags, thread_id); } -int fieldstat_dynamic_metric_value_set(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +int fieldstat_dynamic_metric_value_set(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { return fieldstat_dynamic_metric_value_operate(instance, FS_OP_SET, type, field_name, value, tags, n_tags, thread_id); } -int fieldstat_dynamic_metric_value_decrby(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +int fieldstat_dynamic_metric_value_decrby(struct fieldstat_dynamic_instance *instance, enum field_type type, const char *field_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { return fieldstat_dynamic_metric_value_operate(instance, FS_OP_SUB, type, field_name, value, tags, n_tags, thread_id); } -int fieldstat_dynamic_table_metric_value_operate(struct fieldstat_dynamic_instance *instance, enum field_op op, int table_id, unsigned int column_id, const char *row_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +int fieldstat_dynamic_table_metric_value_operate(struct fieldstat_dynamic_instance *instance, enum field_op op, int table_id, unsigned int column_id, const char *row_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { struct metric * metric = NULL; metric = read_dynamic_metric(instance, table_id, column_id, row_name, tags, n_tags, thread_id); @@ -634,22 +634,22 @@ int fieldstat_dynamic_table_metric_value_operate(struct fieldstat_dynamic_instan return 0; } -int fieldstat_dynamic_table_metric_value_incrby(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +int fieldstat_dynamic_table_metric_value_incrby(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { return fieldstat_dynamic_table_metric_value_operate( instance, FS_OP_ADD, table_id, column_id, row_name, value, tags, n_tags, thread_id); } -int fieldstat_dynamic_table_metric_value_set(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +int fieldstat_dynamic_table_metric_value_set(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { return fieldstat_dynamic_table_metric_value_operate(instance, FS_OP_SET, table_id, column_id, row_name, value, tags, n_tags, thread_id); } -int fieldstat_dynamic_table_metric_value_decrby(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, long long value, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +int fieldstat_dynamic_table_metric_value_decrby(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, long long value, const struct field_tag tags[], size_t n_tags, int thread_id) { return fieldstat_dynamic_table_metric_value_operate( instance, FS_OP_SUB, table_id, column_id, row_name, value, tags, n_tags, thread_id); } -static long long dynamic_metric_value_read(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *field_name, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +static long long dynamic_metric_value_read(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *field_name, const struct field_tag tags[], size_t n_tags, int thread_id) { long long value = 0; struct metric * metric = NULL; @@ -663,14 +663,14 @@ static long long dynamic_metric_value_read(struct fieldstat_dynamic_instance *in return value; } -long long fieldstat_dynamic_metric_value_get(struct fieldstat_dynamic_instance *instance, const char *field_name, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +long long fieldstat_dynamic_metric_value_get(struct fieldstat_dynamic_instance *instance, const char *field_name, const struct field_tag tags[], size_t n_tags, int thread_id) { long long value = 0; value = dynamic_metric_value_read(instance, -1, -1, field_name, tags, n_tags, thread_id); return value; } -long long fieldstat_dynamic_table_metric_value_get(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, const struct fieldstat_tag tags[], size_t n_tags, int thread_id) +long long fieldstat_dynamic_table_metric_value_get(struct fieldstat_dynamic_instance *instance, int table_id, unsigned int column_id, const char *row_name, const struct field_tag tags[], size_t n_tags, int thread_id) { long long value = 0; value = dynamic_metric_value_read(instance, table_id, column_id, row_name, tags, n_tags, thread_id); @@ -721,7 +721,7 @@ static struct metric **create_dynamic_table_row_metrics( struct fieldstat_dynamic_instance *instance, int table_id, const char *row_name, - const struct fieldstat_tag tags[], + const struct field_tag tags[], size_t n_tags, int thread_id, char *metric_key, @@ -803,7 +803,7 @@ static int table_row_metric_values_operate( const char *row_name, long long values[], size_t n_values, - const struct fieldstat_tag tags[], + const struct field_tag tags[], size_t n_tags, int thread_id, enum field_op op) @@ -846,7 +846,7 @@ int fieldstat_dynamic_table_row_metric_values_incrby( const char *row_name, long long values[], size_t n_values, - const struct fieldstat_tag tags[], + const struct field_tag tags[], size_t n_tags, int thread_id) { @@ -863,7 +863,7 @@ int fieldstat_dynamic_table_row_metric_values_decrby( const char *row_name, long long values[], size_t n_values, - const struct fieldstat_tag tags[], + const struct field_tag tags[], size_t n_tags, int thread_id) { @@ -880,7 +880,7 @@ int fieldstat_dynamic_table_row_metric_values_set( const char *row_name, long long values[], size_t n_values, - const struct fieldstat_tag tags[], + const struct field_tag tags[], size_t n_tags, int thread_id) { diff --git a/src/fieldstat_internal.h b/src/fieldstat_internal.h index 0dc684b..ab1c083 100644 --- a/src/fieldstat_internal.h +++ b/src/fieldstat_internal.h @@ -287,9 +287,9 @@ struct metric * get_metric(struct fieldstat_instance *instance, int metric_id); long long get_metric_unit_val(struct metric *metric,enum field_calc_algo calc_type,int is_refer); long long read_metric_current_value(struct metric *metric); int is_valid_field_name(const char* name); -int is_valid_tags(const struct fieldstat_tag *tags, size_t n_tags); +int is_valid_tags(const struct field_tag *tags, size_t n_tags); struct metric ** read_metric_slot(struct fieldstat_instance *instance, int metric_id); -struct metric * metric_new(enum field_type type, const char *field_name, const struct fieldstat_tag tags[], size_t n_tag); +struct metric * metric_new(enum field_type type, const char *field_name, const struct field_tag tags[], size_t n_tag); void metric_free(struct metric *metric); int file_output(struct fieldstat_instance *instance,long long interval_ms); struct table_line * read_table_line(struct table_metric *table, int line_id); @@ -302,7 +302,7 @@ void metric_value_operate(struct metric *metric, enum field_op op, long long val struct table_metric* table_metric_new(const char *name, const char *column_name[], enum field_type column_type[], size_t n_column); void table_metric_free(struct table_metric *table); -struct table_line *table_line_new(const char *name, const struct fieldstat_tag tags[],size_t n_tag); +struct table_line *table_line_new(const char *name, const struct field_tag tags[],size_t n_tag); void table_line_free(struct table_line *table_line); int line_protocol_dynamic_metric_output(struct fieldstat_dynamic_instance *instance); |