X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemcached.c;h=02215e1cc3bae0bedc92ceab6d41a025f66d817e;hb=11011dc93691989513ff2101c221ea15dab5658a;hp=9e6e725293d152561bd3287427f3e90dffb217f5;hpb=b847e8ff2fd928813397466a941947c8fce66d66;p=collectd.git diff --git a/src/memcached.c b/src/memcached.c index 9e6e7252..02215e1c 100644 --- a/src/memcached.c +++ b/src/memcached.c @@ -34,15 +34,14 @@ #include "plugin.h" #include -#include #include #include +#include #define MEMCACHED_DEF_HOST "127.0.0.1" #define MEMCACHED_DEF_PORT "11211" -struct memcached_s -{ +struct memcached_s { char *name; char *socket; char *host; @@ -52,52 +51,46 @@ typedef struct memcached_s memcached_t; static _Bool memcached_have_instances = 0; -static void memcached_free (void *arg) -{ +static void memcached_free(void *arg) { memcached_t *st = arg; if (st == NULL) return; - sfree (st->name); - sfree (st->socket); - sfree (st->host); - sfree (st->port); - sfree (st); + sfree(st->name); + sfree(st->socket); + sfree(st->host); + sfree(st->port); + sfree(st); } -static int memcached_connect_unix (memcached_t *st) -{ - struct sockaddr_un serv_addr = { 0 }; +static int memcached_connect_unix(memcached_t *st) { + struct sockaddr_un serv_addr = {0}; int fd; serv_addr.sun_family = AF_UNIX; - sstrncpy (serv_addr.sun_path, st->socket, - sizeof (serv_addr.sun_path)); + sstrncpy(serv_addr.sun_path, st->socket, sizeof(serv_addr.sun_path)); /* create our socket descriptor */ - fd = socket (AF_UNIX, SOCK_STREAM, 0); - if (fd < 0) - { + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd < 0) { char errbuf[1024]; - ERROR ("memcached plugin: memcached_connect_unix: socket(2) failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + ERROR("memcached plugin: memcached_connect_unix: socket(2) failed: %s", + sstrerror(errno, errbuf, sizeof(errbuf))); return (-1); } /* connect to the memcached daemon */ - int status = connect (fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)); - if (status != 0) - { - shutdown (fd, SHUT_RDWR); - close (fd); - fd = -1; + int status = connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)); + if (status != 0) { + shutdown(fd, SHUT_RDWR); + close(fd); + fd = -1; } return (fd); } /* int memcached_connect_unix */ -static int memcached_connect_inet (memcached_t *st) -{ +static int memcached_connect_inet(memcached_t *st) { const char *host; const char *port; @@ -108,44 +101,38 @@ static int memcached_connect_inet (memcached_t *st) host = (st->host != NULL) ? st->host : MEMCACHED_DEF_HOST; port = (st->port != NULL) ? st->port : MEMCACHED_DEF_PORT; - struct addrinfo ai_hints = { - .ai_family = AF_UNSPEC, - .ai_flags = AI_ADDRCONFIG, - .ai_socktype = SOCK_STREAM - }; + struct addrinfo ai_hints = {.ai_family = AF_UNSPEC, + .ai_flags = AI_ADDRCONFIG, + .ai_socktype = SOCK_STREAM}; - status = getaddrinfo (host, port, &ai_hints, &ai_list); - if (status != 0) - { + status = getaddrinfo(host, port, &ai_hints, &ai_list); + if (status != 0) { char errbuf[1024]; - ERROR ("memcached plugin: memcached_connect_inet: " - "getaddrinfo(%s,%s) failed: %s", - host, port, - (status == EAI_SYSTEM) - ? sstrerror (errno, errbuf, sizeof (errbuf)) - : gai_strerror (status)); + ERROR("memcached plugin: memcached_connect_inet: " + "getaddrinfo(%s,%s) failed: %s", + host, port, + (status == EAI_SYSTEM) ? sstrerror(errno, errbuf, sizeof(errbuf)) + : gai_strerror(status)); return (-1); } - for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) - { + for (struct addrinfo *ai_ptr = ai_list; ai_ptr != NULL; + ai_ptr = ai_ptr->ai_next) { /* create our socket descriptor */ - fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol); - if (fd < 0) - { + fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol); + if (fd < 0) { char errbuf[1024]; - WARNING ("memcached plugin: memcached_connect_inet: " - "socket(2) failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + WARNING("memcached plugin: memcached_connect_inet: " + "socket(2) failed: %s", + sstrerror(errno, errbuf, sizeof(errbuf))); continue; } /* connect to the memcached daemon */ - status = (int) connect (fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen); - if (status != 0) - { - shutdown (fd, SHUT_RDWR); - close (fd); + status = (int)connect(fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen); + if (status != 0) { + shutdown(fd, SHUT_RDWR); + close(fd); fd = -1; continue; } @@ -154,81 +141,76 @@ static int memcached_connect_inet (memcached_t *st) break; } - freeaddrinfo (ai_list); + freeaddrinfo(ai_list); return (fd); } /* int memcached_connect_inet */ -static int memcached_connect (memcached_t *st) -{ +static int memcached_connect(memcached_t *st) { if (st->socket != NULL) - return (memcached_connect_unix (st)); + return (memcached_connect_unix(st)); else - return (memcached_connect_inet (st)); + return (memcached_connect_inet(st)); } -static int memcached_query_daemon (char *buffer, size_t buffer_size, memcached_t *st) -{ +static int memcached_query_daemon(char *buffer, size_t buffer_size, + memcached_t *st) { int fd, status; size_t buffer_fill; - fd = memcached_connect (st); + fd = memcached_connect(st); if (fd < 0) { - ERROR ("memcached plugin: Instance \"%s\" could not connect to daemon.", - st->name); + ERROR("memcached plugin: Instance \"%s\" could not connect to daemon.", + st->name); return -1; } - status = (int) swrite (fd, "stats\r\n", strlen ("stats\r\n")); - if (status != 0) - { + status = (int)swrite(fd, "stats\r\n", strlen("stats\r\n")); + if (status != 0) { char errbuf[1024]; - ERROR ("memcached plugin: write(2) failed: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + ERROR("memcached plugin: write(2) failed: %s", + sstrerror(errno, errbuf, sizeof(errbuf))); shutdown(fd, SHUT_RDWR); - close (fd); + close(fd); return (-1); } /* receive data from the memcached daemon */ - memset (buffer, 0, buffer_size); + memset(buffer, 0, buffer_size); buffer_fill = 0; - while ((status = (int) recv (fd, buffer + buffer_fill, - buffer_size - buffer_fill, /* flags = */ 0)) != 0) - { + while ((status = (int)recv(fd, buffer + buffer_fill, + buffer_size - buffer_fill, /* flags = */ 0)) != + 0) { char const end_token[5] = {'E', 'N', 'D', '\r', '\n'}; - if (status < 0) - { + if (status < 0) { char errbuf[1024]; if ((errno == EAGAIN) || (errno == EINTR)) - continue; + continue; - ERROR ("memcached: Error reading from socket: %s", - sstrerror (errno, errbuf, sizeof (errbuf))); + ERROR("memcached: Error reading from socket: %s", + sstrerror(errno, errbuf, sizeof(errbuf))); shutdown(fd, SHUT_RDWR); - close (fd); + close(fd); return (-1); } - buffer_fill += (size_t) status; - if (buffer_fill > buffer_size) - { + buffer_fill += (size_t)status; + if (buffer_fill > buffer_size) { buffer_fill = buffer_size; - WARNING ("memcached plugin: Message was truncated."); + WARNING("memcached plugin: Message was truncated."); break; } /* If buffer ends in end_token, we have all the data. */ - if (memcmp (buffer + buffer_fill - sizeof (end_token), - end_token, sizeof (end_token)) == 0) + if (memcmp(buffer + buffer_fill - sizeof(end_token), end_token, + sizeof(end_token)) == 0) break; } /* while (recv) */ status = 0; - if (buffer_fill == 0) - { - WARNING ("memcached plugin: No data returned by memcached."); + if (buffer_fill == 0) { + WARNING("memcached plugin: No data returned by memcached."); status = -1; } @@ -237,8 +219,7 @@ static int memcached_query_daemon (char *buffer, size_t buffer_size, memcached_t return (status); } /* int memcached_query_daemon */ -static void memcached_init_vl (value_list_t *vl, memcached_t const *st) -{ +static void memcached_init_vl(value_list_t *vl, memcached_t const *st) { char const *host = st->host; /* Set vl->host to hostname_g, if: @@ -246,95 +227,88 @@ static void memcached_init_vl (value_list_t *vl, memcached_t const *st) * - "Socket" option is given (doc: "Host option is ignored"). * - "Host" option is not provided. * - "Host" option is set to "localhost" or "127.0.0.1". */ - if ((strcmp (st->name, "__legacy__") == 0) - || (st->socket != NULL) - || (st->host == NULL) - || (strcmp ("127.0.0.1", st->host) == 0) - || (strcmp ("localhost", st->host) == 0)) + if ((strcmp(st->name, "__legacy__") == 0) || (st->socket != NULL) || + (st->host == NULL) || (strcmp("127.0.0.1", st->host) == 0) || + (strcmp("localhost", st->host) == 0)) host = hostname_g; - sstrncpy (vl->plugin, "memcached", sizeof (vl->plugin)); - sstrncpy (vl->host, host, sizeof (vl->host)); - if (strcmp (st->name, "__legacy__") != 0) - sstrncpy (vl->plugin_instance, st->name, sizeof (vl->plugin_instance)); + sstrncpy(vl->plugin, "memcached", sizeof(vl->plugin)); + sstrncpy(vl->host, host, sizeof(vl->host)); + if (strcmp(st->name, "__legacy__") != 0) + sstrncpy(vl->plugin_instance, st->name, sizeof(vl->plugin_instance)); } -static void submit_derive (const char *type, const char *type_inst, - derive_t value, memcached_t *st) -{ +static void submit_derive(const char *type, const char *type_inst, + derive_t value, memcached_t *st) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - memcached_init_vl (&vl, st); + memcached_init_vl(&vl, st); values[0].derive = value; vl.values = values; vl.values_len = 1; - sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy(vl.type, type, sizeof(vl.type)); if (type_inst != NULL) - sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + sstrncpy(vl.type_instance, type_inst, sizeof(vl.type_instance)); - plugin_dispatch_values (&vl); + plugin_dispatch_values(&vl); } -static void submit_derive2 (const char *type, const char *type_inst, - derive_t value0, derive_t value1, memcached_t *st) -{ +static void submit_derive2(const char *type, const char *type_inst, + derive_t value0, derive_t value1, memcached_t *st) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - memcached_init_vl (&vl, st); + memcached_init_vl(&vl, st); values[0].derive = value0; values[1].derive = value1; vl.values = values; vl.values_len = 2; - sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy(vl.type, type, sizeof(vl.type)); if (type_inst != NULL) - sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + sstrncpy(vl.type_instance, type_inst, sizeof(vl.type_instance)); - plugin_dispatch_values (&vl); + plugin_dispatch_values(&vl); } -static void submit_gauge (const char *type, const char *type_inst, - gauge_t value, memcached_t *st) -{ +static void submit_gauge(const char *type, const char *type_inst, gauge_t value, + memcached_t *st) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - memcached_init_vl (&vl, st); + memcached_init_vl(&vl, st); values[0].gauge = value; vl.values = values; vl.values_len = 1; - sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy(vl.type, type, sizeof(vl.type)); if (type_inst != NULL) - sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + sstrncpy(vl.type_instance, type_inst, sizeof(vl.type_instance)); - plugin_dispatch_values (&vl); + plugin_dispatch_values(&vl); } -static void submit_gauge2 (const char *type, const char *type_inst, - gauge_t value0, gauge_t value1, memcached_t *st) -{ +static void submit_gauge2(const char *type, const char *type_inst, + gauge_t value0, gauge_t value1, memcached_t *st) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - memcached_init_vl (&vl, st); + memcached_init_vl(&vl, st); values[0].gauge = value0; values[1].gauge = value1; vl.values = values; vl.values_len = 2; - sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy(vl.type, type, sizeof(vl.type)); if (type_inst != NULL) - sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance)); + sstrncpy(vl.type_instance, type_inst, sizeof(vl.type_instance)); - plugin_dispatch_values (&vl); + plugin_dispatch_values(&vl); } -static int memcached_read (user_data_t *user_data) -{ +static int memcached_read(user_data_t *user_data) { char buf[4096]; char *fields[3]; char *ptr; @@ -359,17 +333,16 @@ static int memcached_read (user_data_t *user_data) st = user_data->data; /* get data from daemon */ - if (memcached_query_daemon (buf, sizeof (buf), st) < 0) { + if (memcached_query_daemon(buf, sizeof(buf), st) < 0) { return -1; } -#define FIELD_IS(cnst) \ - (((sizeof(cnst) - 1) == name_len) && (strcmp (cnst, fields[1]) == 0)) +#define FIELD_IS(cnst) \ + (((sizeof(cnst) - 1) == name_len) && (strcmp(cnst, fields[1]) == 0)) ptr = buf; saveptr = NULL; - while ((line = strtok_r (ptr, "\n\r", &saveptr)) != NULL) - { + while ((line = strtok_r(ptr, "\n\r", &saveptr)) != NULL) { int name_len; ptr = NULL; @@ -390,180 +363,147 @@ static int memcached_read (user_data_t *user_data) /* * CPU time consumed by the memcached process */ - if (FIELD_IS ("rusage_user")) - { - rusage_user = atoll (fields[2]); - } - else if (FIELD_IS ("rusage_system")) - { + if (FIELD_IS("rusage_user")) { + rusage_user = atoll(fields[2]); + } else if (FIELD_IS("rusage_system")) { rusage_syst = atoll(fields[2]); } /* * Number of threads of this instance */ - else if (FIELD_IS ("threads")) - { - submit_gauge2 ("ps_count", NULL, NAN, atof (fields[2]), st); + else if (FIELD_IS("threads")) { + submit_gauge2("ps_count", NULL, NAN, atof(fields[2]), st); } /* * Number of items stored */ - else if (FIELD_IS ("curr_items")) - { - submit_gauge ("memcached_items", "current", atof (fields[2]), st); + else if (FIELD_IS("curr_items")) { + submit_gauge("memcached_items", "current", atof(fields[2]), st); } /* * Number of bytes used and available (total - used) */ - else if (FIELD_IS ("bytes")) - { - bytes_used = atof (fields[2]); - } - else if (FIELD_IS ("limit_maxbytes")) - { + else if (FIELD_IS("bytes")) { + bytes_used = atof(fields[2]); + } else if (FIELD_IS("limit_maxbytes")) { bytes_total = atof(fields[2]); } /* * Connections */ - else if (FIELD_IS ("curr_connections")) - { - submit_gauge ("memcached_connections", "current", atof (fields[2]), st); - } - else if (FIELD_IS ("listen_disabled_num")) - { - submit_derive ("connections", "listen_disabled", atof (fields[2]), st); + else if (FIELD_IS("curr_connections")) { + submit_gauge("memcached_connections", "current", atof(fields[2]), st); + } else if (FIELD_IS("listen_disabled_num")) { + submit_derive("connections", "listen_disabled", atof(fields[2]), st); } /* * Commands */ - else if ((name_len > 4) && (strncmp (fields[1], "cmd_", 4) == 0)) - { + else if ((name_len > 4) && (strncmp(fields[1], "cmd_", 4) == 0)) { const char *name = fields[1] + 4; - submit_derive ("memcached_command", name, atoll (fields[2]), st); - if (strcmp (name, "get") == 0) - gets = atof (fields[2]); + submit_derive("memcached_command", name, atoll(fields[2]), st); + if (strcmp(name, "get") == 0) + gets = atof(fields[2]); } /* * Increment/Decrement */ - else if (FIELD_IS("incr_misses")) - { - derive_t incr_count = atoll (fields[2]); - submit_derive ("memcached_ops", "incr_misses", incr_count, st); + else if (FIELD_IS("incr_misses")) { + derive_t incr_count = atoll(fields[2]); + submit_derive("memcached_ops", "incr_misses", incr_count, st); incr += incr_count; - } - else if (FIELD_IS ("incr_hits")) - { - derive_t incr_count = atoll (fields[2]); - submit_derive ("memcached_ops", "incr_hits", incr_count, st); - incr_hits = atof (fields[2]); + } else if (FIELD_IS("incr_hits")) { + derive_t incr_count = atoll(fields[2]); + submit_derive("memcached_ops", "incr_hits", incr_count, st); + incr_hits = atof(fields[2]); incr += incr_count; - } - else if (FIELD_IS ("decr_misses")) - { - derive_t decr_count = atoll (fields[2]); - submit_derive ("memcached_ops", "decr_misses", decr_count, st); + } else if (FIELD_IS("decr_misses")) { + derive_t decr_count = atoll(fields[2]); + submit_derive("memcached_ops", "decr_misses", decr_count, st); decr += decr_count; - } - else if (FIELD_IS ("decr_hits")) - { - derive_t decr_count = atoll (fields[2]); - submit_derive ("memcached_ops", "decr_hits", decr_count, st); - decr_hits = atof (fields[2]); + } else if (FIELD_IS("decr_hits")) { + derive_t decr_count = atoll(fields[2]); + submit_derive("memcached_ops", "decr_hits", decr_count, st); + decr_hits = atof(fields[2]); decr += decr_count; } /* - * Operations on the cache, i. e. cache hits, cache misses and evictions of items + * Operations on the cache, i. e. cache hits, cache misses and evictions of + * items */ - else if (FIELD_IS ("get_hits")) - { - submit_derive ("memcached_ops", "hits", atoll (fields[2]), st); - hits = atof (fields[2]); - } - else if (FIELD_IS ("get_misses")) - { - submit_derive ("memcached_ops", "misses", atoll (fields[2]), st); - } - else if (FIELD_IS ("evictions")) - { - submit_derive ("memcached_ops", "evictions", atoll (fields[2]), st); + else if (FIELD_IS("get_hits")) { + submit_derive("memcached_ops", "hits", atoll(fields[2]), st); + hits = atof(fields[2]); + } else if (FIELD_IS("get_misses")) { + submit_derive("memcached_ops", "misses", atoll(fields[2]), st); + } else if (FIELD_IS("evictions")) { + submit_derive("memcached_ops", "evictions", atoll(fields[2]), st); } /* * Network traffic */ - else if (FIELD_IS ("bytes_read")) - { - octets_rx = atoll (fields[2]); - } - else if (FIELD_IS ("bytes_written")) - { - octets_tx = atoll (fields[2]); + else if (FIELD_IS("bytes_read")) { + octets_rx = atoll(fields[2]); + } else if (FIELD_IS("bytes_written")) { + octets_tx = atoll(fields[2]); } } /* while ((line = strtok_r (ptr, "\n\r", &saveptr)) != NULL) */ - if (!isnan (bytes_used) && !isnan (bytes_total) && (bytes_used <= bytes_total)) - submit_gauge2 ("df", "cache", bytes_used, bytes_total - bytes_used, st); + if (!isnan(bytes_used) && !isnan(bytes_total) && (bytes_used <= bytes_total)) + submit_gauge2("df", "cache", bytes_used, bytes_total - bytes_used, st); if ((rusage_user != 0) || (rusage_syst != 0)) - submit_derive2 ("ps_cputime", NULL, rusage_user, rusage_syst, st); + submit_derive2("ps_cputime", NULL, rusage_user, rusage_syst, st); if ((octets_rx != 0) || (octets_tx != 0)) - submit_derive2 ("memcached_octets", NULL, octets_rx, octets_tx, st); + submit_derive2("memcached_octets", NULL, octets_rx, octets_tx, st); - if (!isnan (gets) && !isnan (hits)) - { + if (!isnan(gets) && !isnan(hits)) { gauge_t rate = NAN; if (gets != 0.0) rate = 100.0 * hits / gets; - submit_gauge ("percent", "hitratio", rate, st); + submit_gauge("percent", "hitratio", rate, st); } - if (!isnan (incr_hits) && incr != 0) - { + if (!isnan(incr_hits) && incr != 0) { gauge_t incr_rate = 100.0 * incr_hits / incr; - submit_gauge ("percent", "incr_hitratio", incr_rate, st); - submit_derive ("memcached_ops", "incr", incr, st); + submit_gauge("percent", "incr_hitratio", incr_rate, st); + submit_derive("memcached_ops", "incr", incr, st); } - if (!isnan (decr_hits) && decr != 0) - { + if (!isnan(decr_hits) && decr != 0) { gauge_t decr_rate = 100.0 * decr_hits / decr; - submit_gauge ("percent", "decr_hitratio", decr_rate, st); - submit_derive ("memcached_ops", "decr", decr, st); + submit_gauge("percent", "decr_hitratio", decr_rate, st); + submit_derive("memcached_ops", "decr", decr, st); } return 0; } /* int memcached_read */ -static int memcached_add_read_callback (memcached_t *st) -{ - char callback_name[3*DATA_MAX_NAME_LEN]; +static int memcached_add_read_callback(memcached_t *st) { + char callback_name[3 * DATA_MAX_NAME_LEN]; int status; - assert (st->name != NULL); - ssnprintf (callback_name, sizeof (callback_name), "memcached/%s", st->name); + assert(st->name != NULL); + ssnprintf(callback_name, sizeof(callback_name), "memcached/%s", st->name); - user_data_t ud = { - .data = st, - .free_func = memcached_free - }; + user_data_t ud = {.data = st, .free_func = memcached_free}; - status = plugin_register_complex_read (/* group = */ "memcached", - /* name = */ callback_name, - /* callback = */ memcached_read, - /* interval = */ 0, - /* user_data = */ &ud); + status = plugin_register_complex_read(/* group = */ "memcached", + /* name = */ callback_name, + /* callback = */ memcached_read, + /* interval = */ 0, + /* user_data = */ &ud); return (status); } /* int memcached_add_read_callback */ @@ -575,18 +515,16 @@ static int memcached_add_read_callback (memcached_t *st) * * */ -static int config_add_instance(oconfig_item_t *ci) -{ +static int config_add_instance(oconfig_item_t *ci) { memcached_t *st; int status = 0; /* Disable automatic generation of default instance in the init callback. */ memcached_have_instances = 1; - st = calloc (1, sizeof (*st)); - if (st == NULL) - { - ERROR ("memcached plugin: calloc failed."); + st = calloc(1, sizeof(*st)); + if (st == NULL) { + ERROR("memcached plugin: calloc failed."); return (-1); } @@ -595,31 +533,27 @@ static int config_add_instance(oconfig_item_t *ci) st->host = NULL; st->port = NULL; - if (strcasecmp (ci->key, "Plugin") == 0) /* default instance */ - st->name = sstrdup ("__legacy__"); + if (strcasecmp(ci->key, "Plugin") == 0) /* default instance */ + st->name = sstrdup("__legacy__"); else /* block */ - status = cf_util_get_string (ci, &st->name); - if (status != 0) - { - sfree (st); + status = cf_util_get_string(ci, &st->name); + if (status != 0) { + sfree(st); return (status); } - assert (st->name != NULL); + assert(st->name != NULL); - for (int i = 0; i < ci->children_num; i++) - { + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Socket", child->key) == 0) - status = cf_util_get_string (child, &st->socket); - else if (strcasecmp ("Host", child->key) == 0) - status = cf_util_get_string (child, &st->host); - else if (strcasecmp ("Port", child->key) == 0) - status = cf_util_get_service (child, &st->port); - else - { - WARNING ("memcached plugin: Option `%s' not allowed here.", - child->key); + if (strcasecmp("Socket", child->key) == 0) + status = cf_util_get_string(child, &st->socket); + else if (strcasecmp("Host", child->key) == 0) + status = cf_util_get_string(child, &st->host); + else if (strcasecmp("Port", child->key) == 0) + status = cf_util_get_service(child, &st->port); + else { + WARNING("memcached plugin: Option `%s' not allowed here.", child->key); status = -1; } @@ -628,10 +562,9 @@ static int config_add_instance(oconfig_item_t *ci) } if (status == 0) - status = memcached_add_read_callback (st); + status = memcached_add_read_callback(st); - if (status != 0) - { + if (status != 0) { memcached_free(st); return (-1); } @@ -639,39 +572,32 @@ static int config_add_instance(oconfig_item_t *ci) return (0); } -static int memcached_config (oconfig_item_t *ci) -{ +static int memcached_config(oconfig_item_t *ci) { int status = 0; _Bool have_instance_block = 0; - for (int i = 0; i < ci->children_num; i++) - { + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; - if (strcasecmp ("Instance", child->key) == 0) - { - config_add_instance (child); + if (strcasecmp("Instance", child->key) == 0) { + config_add_instance(child); have_instance_block = 1; - } - else if (!have_instance_block) - { + } else if (!have_instance_block) { /* Non-instance option: Assume legacy configuration (without * blocks) and call config_add_instance() with the block. */ - return (config_add_instance (ci)); - } - else - WARNING ("memcached plugin: The configuration option " - "\"%s\" is not allowed here. Did you " - "forget to add an block " - "around the configuration?", - child->key); + return (config_add_instance(ci)); + } else + WARNING("memcached plugin: The configuration option " + "\"%s\" is not allowed here. Did you " + "forget to add an block " + "around the configuration?", + child->key); } /* for (ci->children) */ return (status); } -static int memcached_init (void) -{ +static int memcached_init(void) { memcached_t *st; int status; @@ -679,25 +605,24 @@ static int memcached_init (void) return (0); /* No instances were configured, lets start a default instance. */ - st = calloc (1, sizeof (*st)); + st = calloc(1, sizeof(*st)); if (st == NULL) return (ENOMEM); - st->name = sstrdup ("__legacy__"); + st->name = sstrdup("__legacy__"); st->socket = NULL; st->host = NULL; st->port = NULL; - status = memcached_add_read_callback (st); + status = memcached_add_read_callback(st); if (status == 0) memcached_have_instances = 1; else - memcached_free (st); + memcached_free(st); return (status); } /* int memcached_init */ -void module_register (void) -{ - plugin_register_complex_config ("memcached", memcached_config); - plugin_register_init ("memcached", memcached_init); +void module_register(void) { + plugin_register_complex_config("memcached", memcached_config); + plugin_register_init("memcached", memcached_init); }