From: <ca...@us...> - 2006-12-21 13:11:32
|
Revision: 693 http://svn.sourceforge.net/ganglia/?rev=693&view=rev Author: carenas Date: 2006-12-21 05:11:31 -0800 (Thu, 21 Dec 2006) Log Message: ----------- * compile with NetBSD > 3 which removed statfs and replaced it with a binary incompatible statvfs * update union type for cpu_speed to use uint32 to match the current ABI Modified Paths: -------------- trunk/monitor-core/libmetrics/netbsd/metrics.c Modified: trunk/monitor-core/libmetrics/netbsd/metrics.c =================================================================== --- trunk/monitor-core/libmetrics/netbsd/metrics.c 2006-12-19 15:25:50 UTC (rev 692) +++ trunk/monitor-core/libmetrics/netbsd/metrics.c 2006-12-21 13:11:31 UTC (rev 693) @@ -9,6 +9,12 @@ #include <sys/param.h> #include <sys/mount.h> +#if __NetBSD_Version__ > 299000000 +#include <sys/statvfs.h> +#define statfs statvfs +#define f_flags f_flag +#define f_bsize f_frsize +#endif #include <sys/sysctl.h> #include <sys/time.h> #include <sys/user.h> @@ -118,17 +124,17 @@ cpu_speed_func ( void ) { g_val_t val; - size_t len; + size_t len = sizeof(long); long cpu_speed; cpu_speed = 0; #if (__NetBSD_Version__ > 299000000) if (sysctlbyname("machdep.est.frequency.target", &cpu_speed, &len, NULL, 0) == -1) - val.uint16 = 0; + val.uint32 = 0; #endif - val.uint16 = cpu_speed /= 1000000; + val.uint32 = cpu_speed /= 1000000; return val; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-03-26 07:26:19
|
Revision: 1126 http://ganglia.svn.sourceforge.net/ganglia/?rev=1126&view=rev Author: carenas Date: 2008-03-26 00:26:25 -0700 (Wed, 26 Mar 2008) Log Message: ----------- libmetrics: NetBSD: missing libc definitions for string/memory functions showing warnings for mismatches/intrinsics for str[n]cpy, memcpy, strlen, strchr and bzero in NetBSD 4.0 Modified Paths: -------------- trunk/monitor-core/libmetrics/netbsd/metrics.c Modified: trunk/monitor-core/libmetrics/netbsd/metrics.c =================================================================== --- trunk/monitor-core/libmetrics/netbsd/metrics.c 2008-03-26 07:06:24 UTC (rev 1125) +++ trunk/monitor-core/libmetrics/netbsd/metrics.c 2008-03-26 07:26:25 UTC (rev 1126) @@ -3,6 +3,7 @@ * by Jan Schaumann <jsc...@ne...> * Thu Feb 3 22:33:36 EST 2005 * + * Tested on NetBSD 4.0 (i386) * Tested on NetBSD 3.1 (amd64 and i386) * Tested on NetBSD 3.0 (i386) * Tested on NetBSD 2.0.2 (i386) @@ -37,6 +38,8 @@ #include <fcntl.h> #include <limits.h> #include <paths.h> +#include <string.h> +#include <strings.h> #include <stdlib.h> #include "interface.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-05-03 19:26:33
|
Revision: 1304 http://ganglia.svn.sourceforge.net/ganglia/?rev=1304&view=rev Author: carenas Date: 2008-05-03 12:26:31 -0700 (Sat, 03 May 2008) Log Message: ----------- libmetrics: add prototype for cpu_state to avoid implicit declaration Modified Paths: -------------- trunk/monitor-core/libmetrics/netbsd/metrics.c Modified: trunk/monitor-core/libmetrics/netbsd/metrics.c =================================================================== --- trunk/monitor-core/libmetrics/netbsd/metrics.c 2008-05-03 18:29:49 UTC (rev 1303) +++ trunk/monitor-core/libmetrics/netbsd/metrics.c 2008-05-03 19:26:31 UTC (rev 1304) @@ -78,6 +78,7 @@ static const char **makevfslist(char *); static float find_disk_space(double *, double *); +static int cpu_state(int which); // XXX //static int vm_state(int); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ca...@us...> - 2008-05-03 19:31:12
|
Revision: 1305 http://ganglia.svn.sourceforge.net/ganglia/?rev=1305&view=rev Author: carenas Date: 2008-05-03 12:31:16 -0700 (Sat, 03 May 2008) Log Message: ----------- libmetrics: netbsd: dead code cleanup Modified Paths: -------------- trunk/monitor-core/libmetrics/netbsd/metrics.c Modified: trunk/monitor-core/libmetrics/netbsd/metrics.c =================================================================== --- trunk/monitor-core/libmetrics/netbsd/metrics.c 2008-05-03 19:26:31 UTC (rev 1304) +++ trunk/monitor-core/libmetrics/netbsd/metrics.c 2008-05-03 19:31:16 UTC (rev 1305) @@ -82,9 +82,6 @@ // XXX //static int vm_state(int); -static int use_vm_swap_info = 0; -static int mibswap[MIB_SWAPINFO_SIZE]; -static size_t mibswap_size; static kvm_t *kd = NULL; static int pagesize; static int skipvfs; @@ -289,7 +286,6 @@ static struct timeval this_time, last_time; struct timeval time_diff; size_t len = sizeof(cp_time); - int i; if (which == -1) { bzero(cp_old, sizeof(cp_old)); @@ -1039,7 +1035,6 @@ int mib[3], maxvfsconf; size_t miblen; - struct ovfsconf *ptr; mib[0] = CTL_VFS; mib[1] = VFS_GENERIC; mib[2] = VFS_MAXTYPENUM; miblen=sizeof(maxvfsconf); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |