-
Notifications
You must be signed in to change notification settings - Fork 2
/
unixbench-5.1.2.patch
107 lines (102 loc) · 3.51 KB
/
unixbench-5.1.2.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
diff -urB unixbench-5.1.2/Makefile unixbench-5.1.2-mods/Makefile
--- unixbench-5.1.2/Makefile 2007-12-22 20:51:21.000000000 +0100
+++ unixbench-5.1.2-mods/Makefile 2009-05-07 20:56:25.000000000 +0200
@@ -43,7 +43,7 @@
# X11 libraries on your system.
#
# Comment the line out to disable these tests.
-GRAPHIC_TESTS = defined
+#GRAPHIC_TESTS = defined
# Set "GL_LIBS" to the libraries needed to link a GL program.
GL_LIBS = -lGL -lXext -lX11
diff -urB unixbench-5.1.2/pgms/index.base unixbench-5.1.2-mods/pgms/index.base
--- unixbench-5.1.2/pgms/index.base 2007-10-15 23:31:00.000000000 +0200
+++ unixbench-5.1.2-mods/pgms/index.base 2009-05-07 20:56:50.000000000 +0200
@@ -8,7 +8,7 @@
fsbuffer|20|KBps|1655|1655|1
fsdisk|20|KBps|5800|5800|1
pipe|10|lps|12440|12440|2
-context1|10|lps|4000|4000|2
+#context1|10|lps|4000|4000|2
spawn|20|lps|126|126|1
shell8|60|lpm|6|6|1
syscall|10|lps|15000|15000|2
diff -urB unixbench-5.1.2/Run unixbench-5.1.2-mods/Run
--- unixbench-5.1.2/Run 2007-12-22 22:48:10.000000000 +0100
+++ unixbench-5.1.2-mods/Run 2009-05-07 20:56:35.000000000 +0200
@@ -123,7 +123,8 @@
];
my $oldsystem = [
- "execl", "fstime", "fsbuffer", "fsdisk", "pipe", "context1", "spawn",
+ #"execl", "fstime", "fsbuffer", "fsdisk", "pipe", "context1", "spawn",
+ "execl", "fstime", "fsbuffer", "fsdisk", "pipe", "spawn",
"syscall"
];
@@ -148,7 +149,7 @@
"whetstone-double" => undef,
"syscall" => undef,
"pipe" => undef,
- "context1" => undef,
+ #"context1" => undef,
"spawn" => undef,
"execl" => undef,
"fstime-w" => undef,
@@ -249,12 +250,12 @@
"repeat" => 'long',
"options" => "10",
},
- "context1" => {
- "logmsg" => "Pipe-based Context Switching",
- "cat" => 'system',
- "repeat" => 'long',
- "options" => "10",
- },
+ #"context1" => {
+ # "logmsg" => "Pipe-based Context Switching",
+ # "cat" => 'system',
+ # "repeat" => 'long',
+ # "options" => "10",
+ #},
"pipe" => {
"logmsg" => "Pipe Throughput",
"cat" => 'system',
diff -urB unixbench-5.1.2/Run unixbench-5.1.2-mods/Run
--- unixbench-5.1.2/Run 2009-05-08 17:46:24.000000000 +0200
+++ unixbench-5.1.2-mods/Run 2009-05-08 17:50:20.000000000 +0200
@@ -675,20 +675,20 @@
open(my $fd, "<", "/proc/cpuinfo") || return undef;
my $cpus = [ ];
- my $cpu = 0;
+ my $cpu = -1;
while (<$fd>) {
chomp;
my ( $field, $val ) = split(/[ \t]*:[ \t]*/);
- next if (!$field || !$val);
+ next if (!$field);
if ($field eq "processor") {
- $cpu = $val;
- } elsif ($field eq "model name") {
+ $cpu++;
+ } elsif ($val && $field eq "model name") {
my $model = $val;
$model =~ s/ +/ /g;
$cpus->[$cpu]{'model'} = $model;
- } elsif ($field eq "bogomips") {
+ } elsif ($val && $field eq "bogomips") {
$cpus->[$cpu]{'bogo'} = $val;
- } elsif ($field eq "flags") {
+ } elsif ($val && $field eq "flags") {
$cpus->[$cpu]{'flags'} = processCpuFlags($val);
}
}
@@ -1774,7 +1774,11 @@
push(@$copies, 1);
if (defined($systemInfo->{'numCpus'}) && $systemInfo->{'numCpus'} > 1) {
push(@$copies, $systemInfo->{'numCpus'});
+ } else {
+ # Always run 4 processes for single core machines
+ push(@$copies, 4);
}
+
}
# Display the program banner.