pinba plugin: Coding style changes.

[collectd.git] / src / pinba.c

diff --git a/src/pinba.c b/src/pinba.c
index 94e1092..a00720f 100644 (file)
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -57,26 +57,14 @@
 /*
  * Private data structures
  */
-typedef struct _pinba_statres_ pinba_statres_t;
-struct _pinba_statres_ {
-  const char *name;
-  double req_per_sec;
-  double req_time;
-  double ru_utime;
-  double ru_stime;
-  double doc_size;
-  double mem_peak;
-};
-
-struct pinba_socket_s {
+/* {{{ */
+struct pinba_socket_s
+{
   struct pollfd fd[PINBA_MAX_SOCKETS];
   nfds_t fd_num;
 };
 typedef struct pinba_socket_s pinba_socket_t;
 
-typedef double pinba_time_t;
-typedef uint32_t pinba_size_t;
-
 /* Fixed point counter value. n is the decimal part multiplied by 10^9. */
 struct float_counter_s
 {
@@ -87,7 +75,7 @@ typedef struct float_counter_s float_counter_t;
 
 struct pinba_statnode_s
 {
-  /* collector name */
+  /* collector name, used as plugin instance */
   char *name;
 
   /* query data */
@@ -105,10 +93,12 @@ struct pinba_statnode_s
   gauge_t mem_peak;
 };
 typedef struct pinba_statnode_s pinba_statnode_t;
+/* }}} */
 
 /*
  * Module global variables
  */
+/* {{{ */
 static pinba_statnode_t *stat_nodes = NULL;
 static unsigned int stat_nodes_num = 0;
 static pthread_mutex_t stat_nodes_lock;
@@ -119,6 +109,7 @@ static char *conf_service = NULL;
 static _Bool collector_thread_running = 0;
 static _Bool collector_thread_do_shutdown = 0;
 static pthread_t collector_thread_id;
+/* }}} */
 
 /*
  * Functions
@@ -195,10 +186,10 @@ static void service_statnode_add(const char *name, /* {{{ */
   node->mem_peak = NAN;
   
   /* fill query data */
-  strset(&node->name, name);
-  strset(&node->host, host);
-  strset(&node->server, server);
-  strset(&node->script, script);
+  strset (&node->name, name);
+  strset (&node->host, host);
+  strset (&node->server, server);
+  strset (&node->script, script);
   
   /* increment counter */
   stat_nodes_num++;
@@ -260,11 +251,16 @@ static void service_process_request (Pinba__Request *request) /* {{{ */
   
   for (i = 0; i < stat_nodes_num; i++)
   {
-    if(stat_nodes[i].host && strcmp(request->hostname, stat_nodes[i].host))
+    if ((stat_nodes[i].host != NULL)
+        && (strcmp (request->hostname, stat_nodes[i].host) != 0))
       continue;
-    if(stat_nodes[i].server && strcmp(request->server_name, stat_nodes[i].server))
+
+    if ((stat_nodes[i].server != NULL)
+      && (strcmp (request->server_name, stat_nodes[i].server) != 0))
       continue;
-    if(stat_nodes[i].script && strcmp(request->script_name, stat_nodes[i].script))
+
+    if ((stat_nodes[i].script != NULL)
+      && (strcmp (request->script_name, stat_nodes[i].script) != 0))
       continue;
 
     service_statnode_process(&stat_nodes[i], request);
@@ -628,7 +624,7 @@ static int plugin_config (oconfig_item_t *ci) /* {{{ */
   pthread_mutex_unlock(&stat_nodes_lock);
   
   return (0);
-} /* int pinba_config */
+} /* }}} int pinba_config */
 
 static int plugin_init (void) /* {{{ */
 {