From 92c72a38874bb4fd54bc97ffc9c241947bc4860c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 15 Mar 2006 06:44:35 +0000 Subject: fixing Mantis 1003 --- src/plugins/stats/functions.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/plugins/stats/functions.c') diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c index b595c81f..b747da7a 100644 --- a/src/plugins/stats/functions.c +++ b/src/plugins/stats/functions.c @@ -115,7 +115,7 @@ static int getConnectedNodesStat(const void * closure, NULL, "# of connected peers")) return SYSERR; - data[0][0] = 0.8 * val / connectionGoal; + data[0][0] = ((gfloat) val) / connectionGoal; return OK; } @@ -128,7 +128,7 @@ static int getCPULoadStat(const void * closure, NULL, "% of allowed cpu load")) return SYSERR; - data[0][0] = val / 125.0; + data[0][0] = (gfloat) val / 100.0; return OK; } @@ -196,10 +196,10 @@ static int getTrafficRecvStats(const void * closure, data[0][3] = 0.0; return OK; } - data[0][0] = 0.8 * noise / (banddown * dtime / cronSECONDS); /* red */ - data[0][1] = 0.8 * (content+noise) / (banddown * dtime / cronSECONDS); /* green */ - data[0][2] = 0.8 * (queries+content+noise) / (banddown * dtime / cronSECONDS); /* yellow */ - data[0][3] = 0.8 * total / (banddown * dtime / cronSECONDS); /* blue */ + data[0][0] = ((gfloat) noise) / (banddown * dtime / cronSECONDS); /* red */ + data[0][1] = ((gfloat) (content+noise)) / (banddown * dtime / cronSECONDS); /* green */ + data[0][2] = ((gfloat)(queries+content+noise)) / (banddown * dtime / cronSECONDS); /* yellow */ + data[0][3] = ((gfloat) total) / (banddown * dtime / cronSECONDS); /* blue */ /*printf("I: %f %f %f\n", data[0][0], data[0][1], @@ -248,7 +248,7 @@ static int getTrafficSendStats(const void * closure, i = 0; SNPRINTF(buffer, 512, - "# bytes received of type %d", + "# bytes transmitted of type %d", P2P_PROTO_gap_QUERY); if (OK != getStatValue(&queries, &lqueries, @@ -271,10 +271,10 @@ static int getTrafficSendStats(const void * closure, data[0][3] = 0.0; return OK; } - data[0][0] = 0.8 * noise / (bandup * dtime / cronSECONDS); /* red */ - data[0][1] = 0.8 * (noise + content) / (bandup*dtime / cronSECONDS); /* green */ - data[0][2] = 0.8 * (noise + content + queries) / (bandup*dtime / cronSECONDS); /* yellow */ - data[0][3] = 0.8 * total / (bandup*dtime / cronSECONDS); /* blue */ + data[0][0] = ((gfloat) noise) / (bandup * dtime / cronSECONDS); /* red */ + data[0][1] = ((gfloat) (noise + content)) / (bandup*dtime / cronSECONDS); /* green */ + data[0][2] = ((gfloat) (noise + content + queries)) / (bandup*dtime / cronSECONDS); /* yellow */ + data[0][3] = ((gfloat) total) / (bandup*dtime / cronSECONDS); /* blue */ /* printf("O: %f %f %f\n", data[0][0], data[0][1], -- cgit v1.2.3