Attachment #83755 for bug #119600

View | Details | Raw Unified | Return to bug 119600
Collapse All | Expand All

Lines 6-14 Link Here

(-)libmicro/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= libmicro	8	PORTNAME= libmicro
9	PORTVERSION= 0.3.0	9	PORTVERSION= 0.4.0
10	CATEGORIES= benchmarks	10	CATEGORIES= benchmarks
11	MASTER_SITES= http://opensolaris.org/os/community/performance/libmicro/	11	MASTER_SITES= http://opensolaris.org/os/project/libmicro/files/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Set of utilities to benchmark productivity of system calls	14	COMMENT= Set of utilities to benchmark productivity of system calls

Lines 1-3 Link Here

(-)libmicro/distinfo (-3 / +3 lines)
1	MD5 (libmicro-0.3.0.tar.gz) = 3c2ad95bd6e44e4dccae4bb349818038	1	MD5 (libmicro-0.4.0.tar.gz) = 67ea2541a663bca8cfc9efe435577ea3
2	SHA256 (libmicro-0.3.0.tar.gz) = 1673031c579f830f72f74de3c4dc7777db992ec763353ebe0003e38581165e24	2	SHA256 (libmicro-0.4.0.tar.gz) = a005694c125d36ee9b089c1c4fb6d102a5f26e28f0282e5855d5661276bf7b7c
3	SIZE (libmicro-0.3.0.tar.gz) = 49287	3	SIZE (libmicro-0.4.0.tar.gz) = 48858

Lines 1-11 Link Here

(-)libmicro/files/patch-Makefile (-7 / +7 lines)
1	--- Makefile.orig Sat Aug 6 14:07:26 2005	1	--- Makefile.orig Tue Jan 8 12:11:55 2008
2	+++ Makefile Sat Aug 6 14:07:43 2005	2	+++ Makefile Tue Jan 8 12:12:21 2008
3	@@ -67,7 +67,7 @@	3	@@ -68,7 +68,7 @@
4	wrapper \	4	wrapper.sh \
5	README	5	README
6		6
7	-default $(ALL) run cstyle lint tattle: $(BINS)	7	-default $(ALL) run cstyle lint tattle: $(BINS)
8	+all $(ALL) run cstyle lint tattle: $(BINS)	8	+all $(ALL) run cstyle lint tattle: $(BINS)
9	@chmod +x bench multiview	9	@cp bench.sh bench
10	@mkdir -p bin-`uname -m`; cd bin-`uname -m`; MACH=`uname -m` $(MAKE) -f ../Makefile.`uname -s` $@	10	@cp multiview.sh multiview
11		11	@cp wrapper.sh wrapper




--- bench.orig	2008-01-12 14:26:38.000000000 +0100
+++ bench	2008-01-12 14:26:59.000000000 +0100
@@ -65,7 +65,7 @@
 
 touch $IFILE
 
-ARCH=`arch -k`
+ARCH=`uname -p`
 
 # produce benchmark header for easier comparisons
 
@@ -83,6 +83,12 @@
 	p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
 fi
 

 printf "!Libmicro_#:   %30s\n" $libmicro_version
 printf "!Options:      %30s\n" "$OPTS"
 printf "!Machine_name: %30s\n" $hostname
@@ -154,7 +160,6 @@
 memset		$OPTS -N "memset_10k"	-s 10k	-I 600	 
 memset		$OPTS -N "memset_1m"	-s 1m	-I 200000
 memset		$OPTS -N "memset_10m"	-s 10m -I 2000000 
-memset		$OPTS -N "memsetP2_10m"	-s 10m -P 2 -I 2000000 
 
 memrand		$OPTS -N "memrand"	-s 128m -B 10000
 cachetocache	$OPTS -N "cachetocache" -s 100k -T 2 -I 200




--- bench.sh.orig	2008-01-12 14:26:38.000000000 +0100
+++ bench.sh	2008-01-12 14:26:59.000000000 +0100
@@ -65,7 +65,7 @@
 
 touch $IFILE
 
-ARCH=`arch -k`
+ARCH=`uname -p`
 
 # produce benchmark header for easier comparisons
 
@@ -83,6 +83,12 @@
 	p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
 fi
 
+if [ F"`uname -s`" = F"FreeBSD" ] ; then
+	p_count=`sysctl -n hw.ncpu`
+	p_mhz=`sysctl -n hw.clockrate`
+	p_type=`sysctl -n hw.model`
+fi
+
 printf "!Libmicro_#:   %30s\n" $libmicro_version
 printf "!Options:      %30s\n" "$OPTS"
 printf "!Machine_name: %30s\n" $hostname
@@ -154,7 +160,6 @@
 memset		$OPTS -N "memset_10k"	-s 10k	-I 600	 
 memset		$OPTS -N "memset_1m"	-s 1m	-I 200000
 memset		$OPTS -N "memset_10m"	-s 10m -I 2000000 
-memset		$OPTS -N "memsetP2_10m"	-s 10m -P 2 -I 2000000 
 
 memrand		$OPTS -N "memrand"	-s 128m -B 10000
 cachetocache	$OPTS -N "cachetocache" -s 100k -T 2 -I 200

Lines 28-37 Link Here

(-)libmicro/files/patch-multiview (-2 / +2 lines)
28	}	28	}
29		29
30	{	30	{
31	@@ -128,7 +128,7 @@	31	@@ -136,7 +136,7 @@
32		32
33	for (j = 2; j < ARGC; j++)	33	for (j = 2; j < ARGC; j++)
34	printf("<td align=\"right\">%25s</td>\n", "not computed");	34	printf("<td>%s</td>\n", "not computed");
35	- continue;	35	- continue;
36	+ next;	36	+ next;
37	}	37	}

Return to bug 119600

Lines 1-15 Link Here

(-)libmicro/files/patch-bench (-7 / +7 lines)
1	--- bench.orig Fri Aug 5 06:35:13 2005	1	--- bench.orig 2008-01-12 14:26:38.000000000 +0100
2	+++ bench Tue Aug 9 12:32:52 2005	2	+++ bench 2008-01-12 14:26:59.000000000 +0100
3	@@ -67,7 +67,7 @@	3	@@ -65,7 +65,7 @@
4		4
5	touch $IFILE	5	touch $IFILE
6		6
7	-ARCH=`arch -k`	7	-ARCH=`arch -k`
8	+ARCH=`uname -m`	8	+ARCH=`uname -p`
9		9
10	# produce benchmark header for easier comparisons	10	# produce benchmark header for easier comparisons
11		11
12	@@ -85,6 +85,12 @@	12	@@ -83,6 +83,12 @@
13	p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`	13	p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
14	fi	14	fi
15		15
Lines 22-32 Link Here
22	printf "!Libmicro_#: %30s\n" $libmicro_version	22	printf "!Libmicro_#: %30s\n" $libmicro_version
23	printf "!Options: %30s\n" "$OPTS"	23	printf "!Options: %30s\n" "$OPTS"
24	printf "!Machine_name: %30s\n" $hostname	24	printf "!Machine_name: %30s\n" $hostname
25	@@ -156,7 +162,6 @@	25	@@ -154,7 +160,6 @@
26	memset $OPTS -N "memset_10k" -s 10k -I 600	26	memset $OPTS -N "memset_10k" -s 10k -I 600
27	memset $OPTS -N "memset_1m" -s 1m -I 200000	27	memset $OPTS -N "memset_1m" -s 1m -I 200000
28	memset $OPTS -N "memset_10m" -s 10m -I 2000000	28	memset $OPTS -N "memset_10m" -s 10m -I 2000000
29	-memset $OPTS -N "memsetP2_10m" -s 10m -P 2 -I 2000000	29	-memset $OPTS -N "memsetP2_10m" -s 10m -P 2 -I 2000000
30		30
31	memrand $OPTS -N "memrand" -s 40m -B 10000	31	memrand $OPTS -N "memrand" -s 128m -B 10000
32	cachetocache $OPTS -N "cachetocache" -s 100k -T 2 -I 200	32	cachetocache $OPTS -N "cachetocache" -s 100k -T 2 -I 200

Line 0 Link Here

(-)libmicro/files/patch-bench.sh (+32 lines)
	1	--- bench.sh.orig 2008-01-12 14:26:38.000000000 +0100
	2	+++ bench.sh 2008-01-12 14:26:59.000000000 +0100
	3	@@ -65,7 +65,7 @@
	4
	5	touch $IFILE
	6
	7	-ARCH=`arch -k`
	8	+ARCH=`uname -p`
	9
	10	# produce benchmark header for easier comparisons
	11
	12	@@ -83,6 +83,12 @@
	13	p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
	14	fi
	15
	16	+if [ F"`uname -s`" = F"FreeBSD" ] ; then
	17	+ p_count=`sysctl -n hw.ncpu`
	18	+ p_mhz=`sysctl -n hw.clockrate`
	19	+ p_type=`sysctl -n hw.model`
	20	+fi
	21	+
	22	printf "!Libmicro_#: %30s\n" $libmicro_version
	23	printf "!Options: %30s\n" "$OPTS"
	24	printf "!Machine_name: %30s\n" $hostname
	25	@@ -154,7 +160,6 @@
	26	memset $OPTS -N "memset_10k" -s 10k -I 600
	27	memset $OPTS -N "memset_1m" -s 1m -I 200000
	28	memset $OPTS -N "memset_10m" -s 10m -I 2000000
	29	-memset $OPTS -N "memsetP2_10m" -s 10m -P 2 -I 2000000
	30
	31	memrand $OPTS -N "memrand" -s 128m -B 10000
	32	cachetocache $OPTS -N "cachetocache" -s 100k -T 2 -I 200