OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bonnie?expand=0&rev=4

2008-10-13 14:16:55 +00:00
parent c652aa61ca
commit f7126cd96b
4 changed files with 93 additions and 26 deletions
--- a/bonnie-1.4.dif
+++ b/bonnie-1.4.dif
@@ -1,6 +1,17 @@
--- Bonnie.c
-+++ Bonnie.c
-@@ -170,6 +170,13 @@
+diff -Naur /tmp/bonnie/bonnie/Bonnie.c bonnie/Bonnie.c
+--- /tmp/bonnie/bonnie/Bonnie.c	2002-04-04 14:59:46.000000000 +0200
+++ bonnie/Bonnie.c	2008-09-23 15:08:22.000000000 +0200
+@@ -79,7 +79,8 @@
+ 
+ #ifdef __linux__
+ /* for o_direct */
+-#include <asm/page.h>
+//#include <asm/page.h>
+#include <time.h>
+ #endif
+ 
+ #ifdef unix
+@@ -170,6 +171,13 @@
 #define o_direct 0
 #endif
 
@@ -14,8 +25,27 @@
 int main(
   int    argc,
   char * argv[])
--- Makefile
-+++ Makefile
+@@ -263,7 +271,7 @@
+   memsz *= sysconf (_SC_PAGESIZE);
+   if (1024*1024*size <= memsz)
+   {
+-	fprintf (stderr, "Bonnie: Warning: You have %iMB RAM, but you test with only %iMB datasize!\n",
+	fprintf (stderr, "Bonnie: Warning: You have %iMB RAM, but you test with only %liMB datasize!\n",
+ 		memsz/(1024*1024), size);
+ 	fprintf (stderr, "Bonnie:          This might yield unrealistically good results,\n");
+ 	fprintf (stderr, "Bonnie:          for reading and seeking%s.\n",
+@@ -622,7 +630,7 @@
+ }
+ 
+ #define FLTBUFS 8
+-char fltidx = 0;
+int fltidx = 0;
+ char fltbuf[8][FLTBUFS];
+ char * cpupc (const int idx)
+ {
+diff -Naur /tmp/bonnie/bonnie/Makefile bonnie/Makefile
+--- /tmp/bonnie/bonnie/Makefile	2002-02-20 19:22:55.000000000 +0100
+++ bonnie/Makefile	2008-09-23 15:08:53.000000000 +0200
@@ -23,9 +23,9 @@
 # Added 99/07/20, <garloff@suse.de>
 install: Bonnie
@@ -28,17 +58,3 @@
 	gzip -9f $(DESTDIR)$(MANDIR)/man1/bonnie.1
 	
 clean: 
--- Bonnie.c	2002-04-04 12:59:46.000000000 +0000
-+++ Bonnie.c	2008-04-26 05:17:35.000000000 +0000
-@@ -77,11 +77,6 @@
- #include <sys/wait.h>
- #include <stdlib.h>
- 
-#ifdef __linux__
-/* for o_direct */
-#include <asm/page.h>
-#endif
-
- #ifdef unix
- #include <signal.h>
- #endif