X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_format_json.c;h=10a5343f2c11bb0a1eba7454eb663a41eacd4a7a;hb=da658a37ddd9421752903c4ff5f2aa83320387c5;hp=c07891e8a3b60a20e08584728ee0f846936b1a55;hpb=20ef953018ec15376b5d5a243b0214e8babb06d0;p=collectd.git diff --git a/src/utils_format_json.c b/src/utils_format_json.c index c07891e8..10a5343f 100644 --- a/src/utils_format_json.c +++ b/src/utils_format_json.c @@ -1,22 +1,27 @@ /** * collectd - src/utils_format_json.c - * Copyright (C) 2009 Florian octo Forster + * Copyright (C) 2009 Florian octo Forster * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" @@ -26,7 +31,7 @@ #include "utils_cache.h" #include "utils_format_json.h" -static int escape_string (char *buffer, size_t buffer_size, /* {{{ */ +static int json_escape_string (char *buffer, size_t buffer_size, /* {{{ */ const char *string) { size_t src_pos; @@ -70,7 +75,7 @@ static int escape_string (char *buffer, size_t buffer_size, /* {{{ */ #undef BUFFER_ADD return (0); -} /* }}} int buffer_add_string */ +} /* }}} int json_escape_string */ static int values_to_json (char *buffer, size_t buffer_size, /* {{{ */ const data_set_t *ds, const value_list_t *vl, int store_rates) @@ -108,7 +113,7 @@ static int values_to_json (char *buffer, size_t buffer_size, /* {{{ */ if (ds->ds[i].type == DS_TYPE_GAUGE) { if(isfinite (vl->values[i].gauge)) - BUFFER_ADD ("%g", vl->values[i].gauge); + BUFFER_ADD (JSON_GAUGE_FORMAT, vl->values[i].gauge); else BUFFER_ADD ("null"); } @@ -124,7 +129,7 @@ static int values_to_json (char *buffer, size_t buffer_size, /* {{{ */ } if(isfinite (rates[i])) - BUFFER_ADD ("%g", rates[i]); + BUFFER_ADD (JSON_GAUGE_FORMAT, rates[i]); else BUFFER_ADD ("null"); } @@ -152,7 +157,7 @@ static int values_to_json (char *buffer, size_t buffer_size, /* {{{ */ } /* }}} int values_to_json */ static int dstypes_to_json (char *buffer, size_t buffer_size, /* {{{ */ - const data_set_t *ds, const value_list_t *vl) + const data_set_t *ds) { size_t offset = 0; int i; @@ -189,7 +194,7 @@ static int dstypes_to_json (char *buffer, size_t buffer_size, /* {{{ */ } /* }}} int dstypes_to_json */ static int dsnames_to_json (char *buffer, size_t buffer_size, /* {{{ */ - const data_set_t *ds, const value_list_t *vl) + const data_set_t *ds) { size_t offset = 0; int i; @@ -225,6 +230,95 @@ static int dsnames_to_json (char *buffer, size_t buffer_size, /* {{{ */ return (0); } /* }}} int dsnames_to_json */ +static int meta_data_to_json (char *buffer, size_t buffer_size, /* {{{ */ + meta_data_t *meta) +{ + size_t offset = 0; + char **keys = NULL; + int keys_num; + int status; + int i; + + buffer[0] = 0; + + if (meta == NULL) + return (EINVAL); + +#define BUFFER_ADD(...) do { \ + status = ssnprintf (buffer + offset, buffer_size - offset, \ + __VA_ARGS__); \ + if (status < 1) \ + return (-1); \ + else if (((size_t) status) >= (buffer_size - offset)) \ + return (-ENOMEM); \ + else \ + offset += ((size_t) status); \ +} while (0) + + keys_num = meta_data_toc (meta, &keys); + if (keys_num == 0) + { + sfree (keys); + return (0); + } + + for (i = 0; i < keys_num; ++i) + { + int type; + char *key = keys[i]; + + type = meta_data_type (meta, key); + if (type == MD_TYPE_STRING) + { + char *value = NULL; + if (meta_data_get_string (meta, key, &value) == 0) + { + char temp[512] = ""; + json_escape_string (temp, sizeof (temp), value); + sfree (value); + BUFFER_ADD (",\"%s\":%s", key, temp); + } + } + else if (type == MD_TYPE_SIGNED_INT) + { + int64_t value = 0; + if (meta_data_get_signed_int (meta, key, &value) == 0) + BUFFER_ADD (",\"%s\":%"PRIi64, key, value); + } + else if (type == MD_TYPE_UNSIGNED_INT) + { + uint64_t value = 0; + if (meta_data_get_unsigned_int (meta, key, &value) == 0) + BUFFER_ADD (",\"%s\":%"PRIu64, key, value); + } + else if (type == MD_TYPE_DOUBLE) + { + double value = 0.0; + if (meta_data_get_double (meta, key, &value) == 0) + BUFFER_ADD (",\"%s\":%f", key, value); + } + else if (type == MD_TYPE_BOOLEAN) + { + _Bool value = 0; + if (meta_data_get_boolean (meta, key, &value) == 0) + BUFFER_ADD (",\"%s\":%s", key, value ? "true" : "false"); + } + + free (key); + } /* for (keys) */ + free (keys); + + if (offset <= 0) + return (ENOENT); + + buffer[0] = '{'; /* replace leading ',' */ + BUFFER_ADD ("}"); + +#undef BUFFER_ADD + + return (0); +} /* }}} int meta_data_to_json */ + static int value_list_to_json (char *buffer, size_t buffer_size, /* {{{ */ const data_set_t *ds, const value_list_t *vl, int store_rates) { @@ -254,12 +348,12 @@ static int value_list_to_json (char *buffer, size_t buffer_size, /* {{{ */ return (status); BUFFER_ADD ("\"values\":%s", temp); - status = dstypes_to_json (temp, sizeof (temp), ds, vl); + status = dstypes_to_json (temp, sizeof (temp), ds); if (status != 0) return (status); BUFFER_ADD (",\"dstypes\":%s", temp); - status = dsnames_to_json (temp, sizeof (temp), ds, vl); + status = dsnames_to_json (temp, sizeof (temp), ds); if (status != 0) return (status); BUFFER_ADD (",\"dsnames\":%s", temp); @@ -267,53 +361,8 @@ static int value_list_to_json (char *buffer, size_t buffer_size, /* {{{ */ BUFFER_ADD (",\"time\":%.3f", CDTIME_T_TO_DOUBLE (vl->time)); BUFFER_ADD (",\"interval\":%.3f", CDTIME_T_TO_DOUBLE (vl->interval)); - if (vl->meta) { - int i, num; - char **table; - meta_data_t *meta = vl->meta; - - num = meta_data_toc(meta, &table); - for (i = 0; i < num; ++i) { - int type; - char *string; - int64_t si; - uint64_t ui; - double d; - _Bool b; - - type = meta_data_type(meta, table[i]); - if (type == MD_TYPE_STRING) { - if (meta_data_get_string(meta, table[i], &string)) - continue; - BUFFER_ADD(",\"%s\":\"%s\"", table[i], string); - free(string); - } else if (type == MD_TYPE_SIGNED_INT) { - if (meta_data_get_signed_int(meta, table[i], &si)) - continue; - BUFFER_ADD(",\"%s\":%ld", table[i], si); - } else if (type == MD_TYPE_UNSIGNED_INT) { - if (meta_data_get_unsigned_int(meta, table[i], &ui)) - continue; - BUFFER_ADD(",\"%s\":%lu", table[i], ui); - } else if (type == MD_TYPE_DOUBLE) { - if (meta_data_get_double(meta, table[i], &d)) - continue; - BUFFER_ADD(",\"%s\":%f", table[i], d); - } else if (type == MD_TYPE_BOOLEAN) { - if (meta_data_get_boolean(meta, table[i], &b)) - continue; - if (b) - BUFFER_ADD(",\"%s\":%u", table[i], b); - else - BUFFER_ADD(",\"%s\":%u", table[i], b); - } - free(table[i]); - } - free(table); - } - #define BUFFER_ADD_KEYVAL(key, value) do { \ - status = escape_string (temp, sizeof (temp), (value)); \ + status = json_escape_string (temp, sizeof (temp), (value)); \ if (status != 0) \ return (status); \ BUFFER_ADD (",\"%s\":%s", (key), temp); \ @@ -325,6 +374,17 @@ static int value_list_to_json (char *buffer, size_t buffer_size, /* {{{ */ BUFFER_ADD_KEYVAL ("type", vl->type); BUFFER_ADD_KEYVAL ("type_instance", vl->type_instance); + if (vl->meta != NULL) + { + char meta_buffer[buffer_size]; + memset (meta_buffer, 0, sizeof (meta_buffer)); + status = meta_data_to_json (meta_buffer, sizeof (meta_buffer), vl->meta); + if (status != 0) + return (status); + + BUFFER_ADD (",\"meta\":%s", meta_buffer); + } /* if (vl->meta != NULL) */ + BUFFER_ADD ("}"); #undef BUFFER_ADD_KEYVAL