Date: Thu, 01 Jan 2004 18:33:29 +0100 (CET) From: Markus Brueffer <brueffer@phoenix-systems.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/60786: [patch] x11/kdebase3: fix statistics of network devices Message-ID: <20040101173329.A4848130@maquis.hitnet.rwth-aachen.de> Resent-Message-ID: <200401011730.i01HUHTk066265@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 60786
>Category: ports
>Synopsis: [patch] x11/kdebase3: fix statistics of network devices
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 01 09:30:17 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Markus Brueffer
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD cheops.phoenix 5.2-CURRENT FreeBSD 5.2-CURRENT #16: Mon Dec 22 00:35:14 CET 2003 root@cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386
>Description:
This patch fixes all outstanding issues with statistics of network
devices in ksysguardd (best described in KDE bug 61512).
It fixes KDE bug 61512 and the problems mentioned in KDE bug 47710.
This is my last PR in the "fixing ksysguardd series". If there
are any other problems left, I'm not aware of, please let me know.
>How-To-Repeat:
>Fix:
--- patch-ksysguard-ksysguardd-FreeBSD-netdevs.c begins here ---
--- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Wed May 7 13:44:17 2003
+++ ksysguard/ksysguardd/FreeBSD/netdev.c Thu Jan 1 17:42:57 2004
@@ -53,9 +53,13 @@
#define MAXNETDEVS 64
static NetDevInfo NetDevs[MAXNETDEVS];
+static NetDevInfo NetDevsOld[MAXNETDEVS];
static int NetDevCnt = 0;
static struct SensorModul* NetDevSM;
+static float elapsed = 0.0;
+static struct timeval old_tv;
+
char **parseCommand(const char *cmd)
{
char tmp_cmd[1024];
@@ -116,12 +120,17 @@
{
int i;
char monitor[1024];
+ gettimeofday(&old_tv, (struct timezone *)0);
NetDevSM = sm;
updateNetDev();
for (i = 0; i < NetDevCnt; i++) {
+ /* init data */
+ NetDevsOld[i] = NetDevs[i];
+
+ /* register monitors */
snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name);
registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo, NetDevSM);
snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name);
@@ -182,6 +191,7 @@
int num_iface, i;
size_t len;
struct ifmibdata ifmd;
+ struct timeval new_tv, tv;
len = sizeof(num_iface);
sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0);
@@ -198,20 +208,27 @@
len = sizeof(ifmd);
sysctl(name, 6, &ifmd, &len, NULL, 0);
if (ifmd.ifmd_flags & IFF_UP) {
+ NetDevsOld[NetDevCnt] = NetDevs[NetDevCnt];
+
strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32);
- NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes;
- NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks;
- NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs;
- NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop;
- NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast;
- NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes;
- NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks;
- NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs;
- NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast;
- NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls;
+ NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes;
+ NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets;
+ NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors;
+ NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops;
+ NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts;
+ NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes;
+ NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets;
+ NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors;
+ NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts;
+ NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions;
NetDevCnt++;
}
}
+
+ gettimeofday(&new_tv, (struct timezone *)0);
+ timersub(&new_tv, &old_tv, &tv);
+ elapsed = tv.tv_sec + (tv.tv_usec * 1e-6);
+ old_tv = new_tv;
}
void checkNetDev(void)
@@ -237,15 +254,15 @@
for (i = 0; i < NetDevCnt; i++) {
if (!strcmp(NetDevs[i].name, retval[0])) {
if (!strncmp(retval[1], "data", 4))
- fprintf(CurrentClient, "%lu", NetDevs[i].recBytes);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].recBytes - NetDevsOld[i].recBytes) / (1024 * elapsed)));
if (!strncmp(retval[1], "packets", 7))
- fprintf(CurrentClient, "%lu", NetDevs[i].recPacks);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].recPacks - NetDevsOld[i].recPacks) / elapsed));
if (!strncmp(retval[1], "errors", 6))
- fprintf(CurrentClient, "%lu", NetDevs[i].recErrs);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].recErrs - NetDevsOld[i].recErrs) / elapsed));
if (!strncmp(retval[1], "drops", 5))
- fprintf(CurrentClient, "%lu", NetDevs[i].recDrop);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].recDrop - NetDevsOld[i].recDrop) / elapsed));
if (!strncmp(retval[1], "multicast", 9))
- fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].recMulticast - NetDevsOld[i].recMulticast) / elapsed));
}
}
@@ -286,15 +303,15 @@
for (i = 0; i < NetDevCnt; i++) {
if (!strcmp(NetDevs[i].name, retval[0])) {
if (!strncmp(retval[1], "data", 4))
- fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].sentBytes - NetDevsOld[i].sentBytes) / (1024 * elapsed)));
if (!strncmp(retval[1], "packets", 7))
- fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].sentPacks - NetDevsOld[i].sentPacks) / elapsed));
if (!strncmp(retval[1], "errors", 6))
- fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].sentErrs - NetDevsOld[i].sentErrs) / elapsed));
if (!strncmp(retval[1], "multicast", 9))
- fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].sentMulticast - NetDevsOld[i].sentMulticast) / elapsed));
if (!strncmp(retval[1], "collisions", 10))
- fprintf(CurrentClient, "%lu", NetDevs[i].sentColls);
+ fprintf(CurrentClient, "%lu", (u_long)((NetDevs[i].sentColls - NetDevsOld[i].sentColls) / elapsed));
}
}
--- patch-ksysguard-ksysguardd-FreeBSD-netdevs.c ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040101173329.A4848130>