projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5' into collectd-5.6
[collectd.git]
/
src
/
pinba.c
diff --git
a/src/pinba.c
b/src/pinba.c
index
cfc0777
..
8a0902a
100644
(file)
--- a/
src/pinba.c
+++ b/
src/pinba.c
@@
-24,9
+24,9
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include <netdb.h>
#include <poll.h>
#include <netdb.h>
#include <poll.h>
@@
-251,11
+251,9
@@
static void service_statnode_process (pinba_statnode_t *node, /* {{{ */
static void service_process_request (Pinba__Request *request) /* {{{ */
{
static void service_process_request (Pinba__Request *request) /* {{{ */
{
- unsigned int i;
-
pthread_mutex_lock (&stat_nodes_lock);
pthread_mutex_lock (&stat_nodes_lock);
- for (i = 0; i < stat_nodes_num; i++)
+ for (
unsigned int
i = 0; i < stat_nodes_num; i++)
{
if ((stat_nodes[i].host != NULL)
&& (strcmp (request->hostname, stat_nodes[i].host) != 0))
{
if ((stat_nodes[i].host != NULL)
&& (strcmp (request->hostname, stat_nodes[i].host) != 0))
@@
-351,25
+349,20
@@
static pinba_socket_t *pinba_socket_open (const char *node, /* {{{ */
{
pinba_socket_t *s;
struct addrinfo *ai_list;
{
pinba_socket_t *s;
struct addrinfo *ai_list;
- struct addrinfo *ai_ptr;
- struct addrinfo ai_hints;
int status;
int status;
- memset (&ai_hints, 0, sizeof (ai_hints));
- ai_hints.ai_flags = AI_PASSIVE;
- ai_hints.ai_family = AF_UNSPEC;
- ai_hints.ai_socktype = SOCK_DGRAM;
- ai_hints.ai_addr = NULL;
- ai_hints.ai_canonname = NULL;
- ai_hints.ai_next = NULL;
-
if (node == NULL)
node = PINBA_DEFAULT_NODE;
if (service == NULL)
service = PINBA_DEFAULT_SERVICE;
if (node == NULL)
node = PINBA_DEFAULT_NODE;
if (service == NULL)
service = PINBA_DEFAULT_SERVICE;
- ai_list = NULL;
+ struct addrinfo ai_hints = {
+ .ai_family = AF_UNSPEC,
+ .ai_flags = AI_PASSIVE,
+ .ai_socktype = SOCK_DGRAM
+ };
+
status = getaddrinfo (node, service,
&ai_hints, &ai_list);
if (status != 0)
status = getaddrinfo (node, service,
&ai_hints, &ai_list);
if (status != 0)
@@
-388,7
+381,7
@@
static pinba_socket_t *pinba_socket_open (const char *node, /* {{{ */
return (NULL);
}
return (NULL);
}
- for (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)
{
status = pb_add_socket (s, ai_ptr);
if (status != 0)
{
status = pb_add_socket (s, ai_ptr);
if (status != 0)
@@
-409,12
+402,10
@@
static pinba_socket_t *pinba_socket_open (const char *node, /* {{{ */
static void pinba_socket_free (pinba_socket_t *socket) /* {{{ */
{
static void pinba_socket_free (pinba_socket_t *socket) /* {{{ */
{
- nfds_t i;
-
if (!socket)
return;
if (!socket)
return;
- for (i = 0; i < socket->fd_num; i++)
+ for (
nfds_t
i = 0; i < socket->fd_num; i++)
{
if (socket->fd[i].fd < 0)
continue;
{
if (socket->fd[i].fd < 0)
continue;
@@
-505,7
+496,6
@@
static int receive_loop (void) /* {{{ */
while (!collector_thread_do_shutdown)
{
int status;
while (!collector_thread_do_shutdown)
{
int status;
- nfds_t i;
if (s->fd_num < 1)
break;
if (s->fd_num < 1)
break;
@@
-528,7
+518,7
@@
static int receive_loop (void) /* {{{ */
return (-1);
}
return (-1);
}
- for (i = 0; i < s->fd_num; i++)
+ for (
nfds_t
i = 0; i < s->fd_num; i++)
{
if (s->fd[i].revents & (POLLERR | POLLHUP | POLLNVAL))
{
{
if (s->fd[i].revents & (POLLERR | POLLHUP | POLLNVAL))
{
@@
-568,13
+558,12
@@
static int pinba_config_view (const oconfig_item_t *ci) /* {{{ */
char *server = NULL;
char *script = NULL;
int status;
char *server = NULL;
char *script = NULL;
int status;
- int i;
status = cf_util_get_string (ci, &name);
if (status != 0)
return (status);
status = cf_util_get_string (ci, &name);
if (status != 0)
return (status);
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-607,13
+596,11
@@
static int pinba_config_view (const oconfig_item_t *ci) /* {{{ */
static int plugin_config (oconfig_item_t *ci) /* {{{ */
{
static int plugin_config (oconfig_item_t *ci) /* {{{ */
{
- int i;
-
/* The lock should not be necessary in the config callback, but let's be
* sure.. */
pthread_mutex_lock (&stat_nodes_lock);
/* The lock should not be necessary in the config callback, but let's be
* sure.. */
pthread_mutex_lock (&stat_nodes_lock);
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;