Attachment #75655 for bug #109243

Lines 6-13 Link Here

(-)Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= symon	8	PORTNAME= symon
9	PORTVERSION= 2.72	9	PORTVERSION= 2.75
10	PORTREVISION= 2
11	CATEGORIES= sysutils	10	CATEGORIES= sysutils
12	MASTER_SITES= http://www.xs4all.nl/~wpd/symon/philes/	11	MASTER_SITES= http://www.xs4all.nl/~wpd/symon/philes/
13		12

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (symon-2.72.tar.gz) = c88eeb4c7fb1c99e7d4448a8c3977bb2	1	MD5 (symon-2.75.tar.gz) = 6b50d7ec1bf57ad1c184ac2300f5967d
2	SHA256 (symon-2.72.tar.gz) = b91a084ad6e8d91cd8c01a01a56a88e97e6a42f2036cdd844206ca5ff1f88bf1	2	SHA256 (symon-2.75.tar.gz) = ba0480020e4077895feb7426e869b426b3875a3f883b5b658e4583fcd09c79b1
3	SIZE (symon-2.72.tar.gz) = 82218	3	SIZE (symon-2.75.tar.gz) = 92160




--- platform/FreeBSD/platform.h.orig	Fri Oct 21 16:58:43 2005
+++ platform/FreeBSD/platform.h	Fri Dec  2 12:03:04 2005
@@ -4,8 +4,10 @@
 #define _CONF_FREEBSD_H
 
 #include <sys/queue.h>
-#include <sys/socket.h>
 #include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/dkstat.h>
 #include <sys/resource.h>
 
 #include <net/if.h>




--- platform/FreeBSD/sm_mem.c.orig	Mon Mar 27 06:06:18 2006
+++ platform/FreeBSD/sm_mem.c	Mon Mar 27 06:45:54 2006
@@ -131,12 +131,12 @@
     }
     for (i = 0; i < vmnswp_dat; i++) {
 	struct xswdev vmiswp_dat;
-	int vmiswp_siz;
+	int vmiswp_siz = sizeof vmiswp_dat;
 	me_vmiswp_mib_nam[me_vmiswp_mib_len] = i;
 	if (sysctl(me_vmiswp_mib_nam, me_vmiswp_mib_len + 1, &vmiswp_dat, (void *)&vmiswp_siz, NULL, 0) < 0)
 		continue;
-	me_stats[3] += (vmiswp_dat.xsw_used * DEV_BSIZE);
-	me_stats[4] += (vmiswp_dat.xsw_nblks * DEV_BSIZE);
+	me_stats[3] += pagetob(vmiswp_dat.xsw_used);
+	me_stats[4] += pagetob(vmiswp_dat.xsw_nblks);
     }
 #endif
 




--- platform/FreeBSD/sm_pf.c.orig	Fri Dec  2 12:06:20 2005
+++ platform/FreeBSD/sm_pf.c	Fri Dec  2 12:06:38 2005
@@ -73,6 +73,12 @@
     fatal("pf support not available");
 }
 
+void
+gets_pf()
+{
+    fatal("pf support not available");
+}
+
 int
 get_pf(char *symon_buf, int maxlen, struct stream *st)
 {




--- platform/FreeBSD/sm_io.c.orig	Sat Nov 12 20:16:41 2005
+++ platform/FreeBSD/sm_io.c	Sat Nov 12 20:17:10 2005
@@ -80,7 +80,7 @@
 void
 gets_io()
 {
-#if DEVSTAT_USER_API_VER == 5
+#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
     io_numdevs = devstat_getnumdevs(NULL);
 #else
     io_numdevs = getnumdevs();
@@ -97,7 +97,7 @@
     /* clear the devinfo struct, as getdevs expects it to be all zeroes */
     bzero(io_stats.dinfo, sizeof(struct devinfo));
 
-#if DEVSTAT_USER_API_VER == 5
+#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
     devstat_getdevs(NULL, &io_stats);
 #else
     getdevs(&io_stats);
@@ -117,7 +117,7 @@
 	    strlen(ds->device_name) < strlen(st->arg) &&
 	    isdigit(st->arg[strlen(ds->device_name)]) &&
 	    atoi(&st->arg[strlen(ds->device_name)]) == ds->unit_number) {
-#if DEVSTAT_USER_API_VER == 5
+#if DEVSTAT_USER_API_VER == 5 || DEVSTAT_USER_API_VER == 6
 	    return snpack(symon_buf, maxlen, st->arg, MT_IO2,
 			  ds->operations[DEVSTAT_READ],
 			  ds->operations[DEVSTAT_WRITE],




For the system monitor symon, use the following steps

  1. Copy %%PREFIX%%/share/examples/symon/symon.conf
     to %%PREFIX%%/etc and edit.
  2. Run symon

For the data collector symux, use the following steps

  1. Copy %%PREFIX%%/share/examples/symon/symux.conf
     to %%PREFIX%%/etc and edit.
  2. Enter the directory, where symux should store its data
     (e.g. /var/db/symux) and run
	%%PREFIX%%/share/symon/c_smrrds.sh all
     to create the RR database.
  3. Run symux

Return to bug 109243

Removed Link Here

(-)files/patch-platform__FreeBSD__platform.h (-14 lines)
1	--- platform/FreeBSD/platform.h.orig Fri Oct 21 16:58:43 2005
2	+++ platform/FreeBSD/platform.h Fri Dec 2 12:03:04 2005
3	@@ -4,8 +4,10 @@
4	#define _CONF_FREEBSD_H
5
6	#include <sys/queue.h>
7	-#include <sys/socket.h>
8	#include <sys/types.h>
9	+#include <sys/socket.h>
10	+#include <sys/time.h>
11	+#include <sys/dkstat.h>
12	#include <sys/resource.h>
13
14	#include <net/if.h>

Removed Link Here

(-)files/patch-platform__FreeBSD__sm_mem.c (-18 lines)
1	--- platform/FreeBSD/sm_mem.c.orig Mon Mar 27 06:06:18 2006
2	+++ platform/FreeBSD/sm_mem.c Mon Mar 27 06:45:54 2006
3	@@ -131,12 +131,12 @@
4	}
5	for (i = 0; i < vmnswp_dat; i++) {
6	struct xswdev vmiswp_dat;
7	- int vmiswp_siz;
8	+ int vmiswp_siz = sizeof vmiswp_dat;
9	me_vmiswp_mib_nam[me_vmiswp_mib_len] = i;
10	if (sysctl(me_vmiswp_mib_nam, me_vmiswp_mib_len + 1, &vmiswp_dat, (void *)&vmiswp_siz, NULL, 0) < 0)
11	continue;
12	- me_stats[3] += (vmiswp_dat.xsw_used * DEV_BSIZE);
13	- me_stats[4] += (vmiswp_dat.xsw_nblks * DEV_BSIZE);
14	+ me_stats[3] += pagetob(vmiswp_dat.xsw_used);
15	+ me_stats[4] += pagetob(vmiswp_dat.xsw_nblks);
16	}
17	#endif
18

Removed Link Here

(-)files/patch-platform__FreeBSD__sm_pf.c (-15 lines)
1	--- platform/FreeBSD/sm_pf.c.orig Fri Dec 2 12:06:20 2005
2	+++ platform/FreeBSD/sm_pf.c Fri Dec 2 12:06:38 2005
3	@@ -73,6 +73,12 @@
4	fatal("pf support not available");
5	}
6
7	+void
8	+gets_pf()
9	+{
10	+ fatal("pf support not available");
11	+}
12	+
13	int
14	get_pf(char symon_buf, int maxlen, struct stream st)
15	{

Removed Link Here

(-)files/patch-sm_io.c (-29 lines)
1	--- platform/FreeBSD/sm_io.c.orig Sat Nov 12 20:16:41 2005
2	+++ platform/FreeBSD/sm_io.c Sat Nov 12 20:17:10 2005
3	@@ -80,7 +80,7 @@
4	void
5	gets_io()
6	{
7	-#if DEVSTAT_USER_API_VER == 5
8	+#if DEVSTAT_USER_API_VER == 5 \|\| DEVSTAT_USER_API_VER == 6
9	io_numdevs = devstat_getnumdevs(NULL);
10	#else
11	io_numdevs = getnumdevs();
12	@@ -97,7 +97,7 @@
13	/* clear the devinfo struct, as getdevs expects it to be all zeroes */
14	bzero(io_stats.dinfo, sizeof(struct devinfo));
15
16	-#if DEVSTAT_USER_API_VER == 5
17	+#if DEVSTAT_USER_API_VER == 5 \|\| DEVSTAT_USER_API_VER == 6
18	devstat_getdevs(NULL, &io_stats);
19	#else
20	getdevs(&io_stats);
21	@@ -117,7 +117,7 @@
22	strlen(ds->device_name) < strlen(st->arg) &&
23	isdigit(st->arg[strlen(ds->device_name)]) &&
24	atoi(&st->arg[strlen(ds->device_name)]) == ds->unit_number) {
25	-#if DEVSTAT_USER_API_VER == 5
26	+#if DEVSTAT_USER_API_VER == 5 \|\| DEVSTAT_USER_API_VER == 6
27	return snpack(symon_buf, maxlen, st->arg, MT_IO2,
28	ds->operations[DEVSTAT_READ],
29	ds->operations[DEVSTAT_WRITE],

Lines 1-15 Link Here

(-)files/pkg-message.in (-5 / +5 lines)
1	For the system monitor symon, use the following steps	1	For the system monitor symon, use the following steps
2		2
3	1. Copy %%LOCALBASE%%/share/examples/symon/symon.conf	3	1. Copy %%PREFIX%%/share/examples/symon/symon.conf
4	to %%LOCALBASE%%/etc and edit.	4	to %%PREFIX%%/etc and edit.
5	2. Run symon	5	2. Run symon
6		6
7	For the data collector symux, use the following steps	7	For the data collector symux, use the following steps
8		8
9	1. Copy %%LOCALBASE%%/share/examples/symon/symux.conf	9	1. Copy %%PREFIX%%/share/examples/symon/symux.conf
10	to %%LOCALBASE%%/etc and edit.	10	to %%PREFIX%%/etc and edit.
11	2. Enter the directory, where symux should store its data	11	2. Enter the directory, where symux should store its data
12	(e.g. /var/db/symux) and run	12	(e.g. /var/db/symux) and run
13	%%LOCALBASE%%/share/symon/c_smrrds.sh all	13	%%PREFIX%%/share/symon/c_smrrds.sh all
14	to create the RR database.	14	to create the RR database.
15	3. Run symux	15	3. Run symux