1 files changed, 149 insertions, 172 deletions

diff --git a/src/statistics/functions.c b/src/statistics/functions.c
index 143860e7..129caada 100644
--- a/src/statistics/functions.c
+++ b/src/statistics/functions.c
@@ -50,8 +50,7 @@ static struct GNUNET_GC_Configuration *cfg;
 static struct GNUNET_CronManager *cron;
 
 static int
-getStatValue (unsigned long long *value,
-              unsigned long long *lvalue,
+getStatValue (unsigned long long *value, unsigned long long *lvalue,
               GNUNET_CronTime * dtime, const char *optName, int monotone)
 {
   unsigned int i;
@@ -60,25 +59,24 @@ getStatValue (unsigned long long *value,
   if (lvalue != NULL)
     *lvalue = 0;
   for (i = 0; i < lsv_size; i++)
+  {
+    if (0 == strcmp (optName, lastStatValues[i].statName))
     {
-      if (0 == strcmp (optName, lastStatValues[i].statName))
-        {
-          *value = lastStatValues[i].value;
-          if (lvalue != NULL)
-            *lvalue = lastStatValues[i].lvalue;
-          if (dtime != NULL)
-            *dtime = lastStatValues[i].delta;
-          if ((monotone == GNUNET_YES) && (lvalue != NULL)
-              && (*lvalue > *value))
-            return GNUNET_SYSERR;       /* gnunetd restart? */
-          return GNUNET_OK;
-        }
+      *value = lastStatValues[i].value;
+      if (lvalue != NULL)
+        *lvalue = lastStatValues[i].lvalue;
+      if (dtime != NULL)
+        *dtime = lastStatValues[i].delta;
+      if ((monotone == GNUNET_YES) && (lvalue != NULL) && (*lvalue > *value))
+        return GNUNET_SYSERR;   /* gnunetd restart? */
+      return GNUNET_OK;
     }
+  }
 #if FUNCTIONS_DEBUG
   GNUNET_GE_LOG (ectx,
                  GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
-                 GNUNET_GE_USER | GNUNET_GE_BULK,
-                 "Statistic not found: `%s'\n", optName);
+                 GNUNET_GE_USER | GNUNET_GE_BULK, "Statistic not found: `%s'\n",
+                 optName);
 #endif
   return GNUNET_SYSERR;
 }
@@ -92,13 +90,13 @@ updateConnectionGoal (void *unused)
 
   GNUNET_mutex_lock (lock);
   cmh =
-    GNUNET_get_daemon_configuration_value (sock, "gnunetd",
-                                           "connection-max-hosts");
+      GNUNET_get_daemon_configuration_value (sock, "gnunetd",
+                                             "connection-max-hosts");
   availableDown =
-    GNUNET_get_daemon_configuration_value (sock, "LOAD",
-                                           "MAXNETDOWNBPSTOTAL");
+      GNUNET_get_daemon_configuration_value (sock, "LOAD",
+                                             "MAXNETDOWNBPSTOTAL");
   availableUp =
-    GNUNET_get_daemon_configuration_value (sock, "LOAD", "MAXNETUPBPSTOTAL");
+      GNUNET_get_daemon_configuration_value (sock, "LOAD", "MAXNETUPBPSTOTAL");
   GNUNET_mutex_unlock (lock);
   if (cmh == NULL)
     connectionGoal = 0;
@@ -146,14 +144,13 @@ getLoadStat (const void *closure, gfloat ** data)
   if (GNUNET_OK !=
       getStatValue (&vali, NULL, NULL, "% of allowed io load", GNUNET_NO))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&valu,
-                                 NULL, NULL, "% of allowed network load (up)",
-                                 GNUNET_NO))
+  if (GNUNET_OK !=
+      getStatValue (&valu, NULL, NULL, "% of allowed network load (up)",
+                    GNUNET_NO))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&vald,
-                                 NULL, NULL,
-                                 "% of allowed network load (down)",
-                                 GNUNET_NO))
+  if (GNUNET_OK !=
+      getStatValue (&vald, NULL, NULL, "% of allowed network load (down)",
+                    GNUNET_NO))
     return GNUNET_SYSERR;
   data[0][0] = (gfloat) valc / 100.0;
   data[0][1] = (gfloat) vali / 100.0;
@@ -170,17 +167,15 @@ getQuotaStat (const void *closure, gfloat ** data)
 
   data[0][0] = 0;
   data[0][1] = 0;
-  if ((GNUNET_OK == getStatValue (&allowed,
-                                  NULL, NULL, "# bytes allowed in datastore",
-                                  GNUNET_NO)) &&
-      (allowed != 0) &&
+  if ((GNUNET_OK ==
+       getStatValue (&allowed, NULL, NULL, "# bytes allowed in datastore",
+                     GNUNET_NO)) && (allowed != 0) &&
       (GNUNET_OK ==
        getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO)))
     data[0][0] = ((gfloat) have) / allowed;
-  if ((GNUNET_OK == getStatValue (&allowed,
-                                  NULL, NULL, "# max bytes allowed in dstore",
-                                  GNUNET_NO)) &&
-      (allowed != 0) &&
+  if ((GNUNET_OK ==
+       getStatValue (&allowed, NULL, NULL, "# max bytes allowed in dstore",
+                     GNUNET_NO)) && (allowed != 0) &&
       (GNUNET_OK ==
        getStatValue (&have, NULL, NULL, "# bytes in dstore", GNUNET_NO)))
     data[0][1] = ((gfloat) have) / allowed;
@@ -208,43 +203,39 @@ getTrafficRecvStats (const void *closure, gfloat ** data)
   if (GNUNET_OK !=
       getStatValue (&total, &ltotal, &dtime, "# bytes received", GNUNET_YES))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&noise,
-                                 &lnoise, NULL, "# bytes of noise received",
-                                 GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&noise, &lnoise, NULL, "# bytes of noise received",
+                    GNUNET_YES))
     return GNUNET_SYSERR;
   buffer = GNUNET_malloc (512);
   GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
                    GNUNET_P2P_PROTO_GAP_RESULT);
-  if (GNUNET_OK !=
-      getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
-    {
-      content = 0;
-      lcontent = 0;
-    }
+  if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
+  {
+    content = 0;
+    lcontent = 0;
+  }
   GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
                    GNUNET_P2P_PROTO_HELLO);
   if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
-    {
-      hellos = 0;
-      lhellos = 0;
-    }
+  {
+    hellos = 0;
+    lhellos = 0;
+  }
   GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
                    GNUNET_P2P_PROTO_GAP_QUERY);
+  if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
+  {
+    queries = 0;
+    lqueries = 0;
+  }
   if (GNUNET_OK !=
-      getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
-    {
-      queries = 0;
-      lqueries = 0;
-    }
-  if (GNUNET_OK != getStatValue (&rlimit,
-                                 &lrlimit,
-                                 NULL,
-                                 "# total bytes per second receive limit",
-                                 GNUNET_NO))
-    {
-      rlimit = 0;
-      lrlimit = 0;
-    }
+      getStatValue (&rlimit, &lrlimit, NULL,
+                    "# total bytes per second receive limit", GNUNET_NO))
+  {
+    rlimit = 0;
+    lrlimit = 0;
+  }
   GNUNET_free (buffer);
   if (banddown == 0)
     return GNUNET_SYSERR;
@@ -255,15 +246,15 @@ getTrafficRecvStats (const void *closure, gfloat ** data)
   content -= lcontent;
   hellos -= lhellos;
   if (banddown <= 0)
-    {
-      data[0][0] = 0.0;
-      data[0][1] = 0.0;
-      data[0][2] = 0.0;
-      data[0][3] = 0.0;
-      data[0][4] = 0.0;
-      data[0][5] = 0.0;
-      return GNUNET_OK;
-    }
+  {
+    data[0][0] = 0.0;
+    data[0][1] = 0.0;
+    data[0][2] = 0.0;
+    data[0][3] = 0.0;
+    data[0][4] = 0.0;
+    data[0][5] = 0.0;
+    return GNUNET_OK;
+  }
   data[0][0] = ((gfloat) noise) / (banddown * dtime / GNUNET_CRON_SECONDS);     /* red */
   data[0][1] = ((gfloat) (content + noise)) / (banddown * dtime / GNUNET_CRON_SECONDS); /* green */
   data[0][2] = ((gfloat) (queries + content + noise)) / (banddown * dtime / GNUNET_CRON_SECONDS);       /* yellow */
@@ -294,47 +285,41 @@ getTrafficSendStats (const void *closure, gfloat ** data)
   GNUNET_CronTime dtime;
   char *buffer;
 
-  if (GNUNET_OK != getStatValue (&total,
-                                 &ltotal, &dtime, "# bytes transmitted",
-                                 GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&total, &ltotal, &dtime, "# bytes transmitted", GNUNET_YES))
     return GNUNET_SYSERR;
   if (GNUNET_OK !=
       getStatValue (&noise, &lnoise, NULL, "# bytes noise sent", GNUNET_YES))
     return GNUNET_SYSERR;
   buffer = GNUNET_malloc (512);
-  GNUNET_snprintf (buffer,
-                   512, "# bytes transmitted of type %d",
+  GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
                    GNUNET_P2P_PROTO_GAP_RESULT);
-  if (GNUNET_OK !=
-      getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
-    {
-      content = 0;
-      lcontent = 0;
-    }
-  GNUNET_snprintf (buffer,
-                   512, "# bytes transmitted of type %d",
+  if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
+  {
+    content = 0;
+    lcontent = 0;
+  }
+  GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
                    GNUNET_P2P_PROTO_GAP_QUERY);
-  if (GNUNET_OK !=
-      getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
-    {
-      queries = 0;
-      lqueries = 0;
-    }
+  if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
+  {
+    queries = 0;
+    lqueries = 0;
+  }
   GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
                    GNUNET_P2P_PROTO_HELLO);
   if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
-    {
-      queries = 0;
-      lqueries = 0;
-    }
-  if (GNUNET_OK != getStatValue (&slimit,
-                                 &lslimit,
-                                 NULL, "# total bytes per second send limit",
-                                 GNUNET_NO))
-    {
-      slimit = 0;
-      lslimit = 0;
-    }
+  {
+    queries = 0;
+    lqueries = 0;
+  }
+  if (GNUNET_OK !=
+      getStatValue (&slimit, &lslimit, NULL,
+                    "# total bytes per second send limit", GNUNET_NO))
+  {
+    slimit = 0;
+    lslimit = 0;
+  }
   GNUNET_free (buffer);
   if (bandup == 0)
     return GNUNET_SYSERR;
@@ -344,15 +329,15 @@ getTrafficSendStats (const void *closure, gfloat ** data)
   content -= lcontent;
   hellos -= lhellos;
   if (bandup <= 0)
-    {
-      data[0][0] = 0.0;
-      data[0][1] = 0.0;
-      data[0][2] = 0.0;
-      data[0][3] = 0.0;
-      data[0][4] = 0.0;
-      data[0][5] = 0.0;
-      return GNUNET_OK;
-    }
+  {
+    data[0][0] = 0.0;
+    data[0][1] = 0.0;
+    data[0][2] = 0.0;
+    data[0][3] = 0.0;
+    data[0][4] = 0.0;
+    data[0][5] = 0.0;
+    return GNUNET_OK;
+  }
   data[0][0] = ((gfloat) noise) / (bandup * dtime / GNUNET_CRON_SECONDS);       /* red */
   data[0][1] = ((gfloat) (noise + content)) / (bandup * dtime / GNUNET_CRON_SECONDS);   /* green */
   data[0][2] = ((gfloat) (noise + content + queries)) / (bandup * dtime / GNUNET_CRON_SECONDS); /* yellow */
@@ -376,17 +361,15 @@ getTrustStats (const void *closure, gfloat ** data)
   unsigned long long lawarded;
   unsigned long long max;
 
-  if (GNUNET_OK != getStatValue (&spent,
-                                 &lspent, NULL, "# trust spent", GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&spent, &lspent, NULL, "# trust spent", GNUNET_YES))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&earned,
-                                 &learned,
-                                 NULL, "# trust earned", GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&earned, &learned, NULL, "# trust earned", GNUNET_YES))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&awarded,
-                                 &lawarded,
-                                 NULL, "# gap total trust awarded",
-                                 GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&awarded, &lawarded, NULL, "# gap total trust awarded",
+                    GNUNET_YES))
     return GNUNET_SYSERR;
   max = spent;
   if (earned > max)
@@ -395,17 +378,17 @@ getTrustStats (const void *closure, gfloat ** data)
     max = awarded;
   data[0][0] = 0.0;
   if (max > 0)
-    {
-      data[0][0] = (1.0 * spent) / max;
-      data[0][1] = (1.0 * earned) / max;
-      data[0][2] = (1.0 * awarded) / max;
-    }
+  {
+    data[0][0] = (1.0 * spent) / max;
+    data[0][1] = (1.0 * earned) / max;
+    data[0][2] = (1.0 * awarded) / max;
+  }
   else
-    {
-      data[0][0] = 0.0;
-      data[0][1] = 0.0;
-      data[0][2] = 0.0;
-    }
+  {
+    data[0][0] = 0.0;
+    data[0][1] = 0.0;
+    data[0][2] = 0.0;
+  }
   return GNUNET_OK;
 }
 
@@ -417,14 +400,13 @@ getEffectivenessStats (const void *closure, gfloat ** data)
   unsigned long long ltotal;
   unsigned long long lsuccess;
 
-  if (GNUNET_OK != getStatValue (&total,
-                                 &ltotal,
-                                 NULL,
-                                 "# gap requests total sent", GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&total, &ltotal, NULL, "# gap requests total sent",
+                    GNUNET_YES))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&success,
-                                 &lsuccess,
-                                 NULL, "# gap routes succeeded", GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&success, &lsuccess, NULL, "# gap routes succeeded",
+                    GNUNET_YES))
     return GNUNET_SYSERR;
   if (total > 0)
     data[0][0] = 1.0 * success / total;
@@ -455,22 +437,22 @@ statsProcessor (const char *optName, unsigned long long value, void *data)
   if ((j < lsv_size) && (0 == strcmp (optName, lastStatValues[j].statName)))
     found = j;
   if (found == (unsigned int) -1)
+  {
+    for (j = 0; j < lsv_size; j++)
     {
-      for (j = 0; j < lsv_size; j++)
-        {
-          if (0 == strcmp (optName, lastStatValues[j].statName))
-            {
-              found = j;
-              break;
-            }
-        }
+      if (0 == strcmp (optName, lastStatValues[j].statName))
+      {
+        found = j;
+        break;
+      }
     }
+  }
   if (found == (unsigned int) -1)
-    {
-      found = lsv_size;
-      GNUNET_array_grow (lastStatValues, lsv_size, lsv_size + 1);
-      lastStatValues[found].statName = GNUNET_strdup (optName);
-    }
+  {
+    found = lsv_size;
+    GNUNET_array_grow (lastStatValues, lsv_size, lsv_size + 1);
+    lastStatValues[found].statName = GNUNET_strdup (optName);
+  }
   lastStatValues[found].lvalue = lastStatValues[found].value;
   lastStatValues[found].value = value;
   lastStatValues[found].delta = *delta;
@@ -494,17 +476,17 @@ updateDaemonStatus (void *cls)
   unsigned long long connected_peers;
 
   if (uc->is_running)
-    {
-      if (GNUNET_OK !=
-          getStatValue (&connected_peers, NULL, NULL,
-                        "# of connected peers", GNUNET_NO))
-        GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_UNKNOWN, 0);
-      else if (connected_peers > 0)
-        GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_CONNECTED,
-                                          connected_peers);
-      else
-        GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_DISCONNECTED, 0);
-    }
+  {
+    if (GNUNET_OK !=
+        getStatValue (&connected_peers, NULL, NULL, "# of connected peers",
+                      GNUNET_NO))
+      GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_UNKNOWN, 0);
+    else if (connected_peers > 0)
+      GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_CONNECTED,
+                                        connected_peers);
+    else
+      GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_DISCONNECTED, 0);
+  }
   else
     GNUNET_GTK_display_daemon_status (GNUNET_GTK_STATUS_NODAEMON, 0);
   return NULL;
@@ -613,24 +595,19 @@ StatEntry stats[] = {
 static unsigned long long UPDATE_INTERVAL;
 
 void
-init_functions (struct GNUNET_GE_Context *e,
-                struct GNUNET_GC_Configuration *c)
+init_functions (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
 {
   ectx = e;
   cfg = c;
-  GNUNET_GC_get_configuration_value_number (cfg,
-                                            "GNUNET-GTK",
-                                            "STATS-INTERVAL",
-                                            1,
-                                            99 * GNUNET_CRON_YEARS,
+  GNUNET_GC_get_configuration_value_number (cfg, "GNUNET-GTK", "STATS-INTERVAL",
+                                            1, 99 * GNUNET_CRON_YEARS,
                                             30 * GNUNET_CRON_SECONDS,
                                             &UPDATE_INTERVAL);
   sock = GNUNET_client_connection_create (ectx, cfg);
   lock = GNUNET_mutex_create (GNUNET_NO);
   cron = GNUNET_GTK_get_cron_manager ();
-  GNUNET_cron_add_job (cron,
-                       &updateStatValues, UPDATE_INTERVAL, UPDATE_INTERVAL,
-                       NULL);
+  GNUNET_cron_add_job (cron, &updateStatValues, UPDATE_INTERVAL,
+                       UPDATE_INTERVAL, NULL);
   GNUNET_cron_add_job (cron, &updateConnectionGoal, 5 * GNUNET_CRON_SECONDS,
                        5 * GNUNET_CRON_MINUTES, NULL);
   updateStatValues (NULL);