diff --git a/app-benchmarks/ffsb/patches/ffsb-6.0-rc2.patch b/app-benchmarks/ffsb/patches/ffsb-6.0-rc2.patch index bd3f4e0b1..7a32f2272 100644 --- a/app-benchmarks/ffsb/patches/ffsb-6.0-rc2.patch +++ b/app-benchmarks/ffsb/patches/ffsb-6.0-rc2.patch @@ -1,6 +1,6 @@ diff -urN ffsb-6.0-rc2/fh.c ffsb-6.0-rc2-haiku/fh.c ---- ffsb-6.0-rc2/fh.c 2008-10-27 20:17:05.056360960 +0000 -+++ ffsb-6.0-rc2-haiku/fh.c 2010-09-23 13:15:37.648019968 +0000 +--- ffsb-6.0-rc2/fh.c 2008-10-27 20:17:05.051118080 +0000 ++++ ffsb-6.0-rc2-haiku/fh.c 2010-09-23 14:01:27.966262784 +0000 @@ -74,7 +74,9 @@ int need_stats = ft_needs_stats(ft, SYS_OPEN) || fs_needs_stats(fs, SYS_OPEN); @@ -13,8 +13,8 @@ diff -urN ffsb-6.0-rc2/fh.c ffsb-6.0-rc2-haiku/fh.c if (need_stats) gettimeofday(&start, NULL); diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c ---- ffsb-6.0-rc2/parser.c 2008-10-27 20:17:05.053739520 +0000 -+++ ffsb-6.0-rc2-haiku/parser.c 2010-09-23 13:40:37.556007424 +0000 +--- ffsb-6.0-rc2/parser.c 2008-10-27 20:17:05.048234496 +0000 ++++ ffsb-6.0-rc2-haiku/parser.c 2010-09-23 14:01:27.976486400 +0000 @@ -320,7 +320,8 @@ static int set_option(char *buf, config_options_t *options) { @@ -60,11 +60,9 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c memset(fs, 0, sizeof(ffsb_fs_t)); -@@ -908,9 +909,8 @@ - printf("No age threaggroup in profile"); - exit(1); +@@ -910,7 +911,7 @@ } -- + age_cont = age_cont->child; - ffsb_tg_t *age_tg = ffsb_malloc(sizeof(ffsb_tg_t)); + age_tg = ffsb_malloc(sizeof(ffsb_tg_t)); @@ -72,14 +70,10 @@ diff -urN ffsb-6.0-rc2/parser.c ffsb-6.0-rc2-haiku/parser.c fs->aging_tg = age_tg; fs->age_fs = 1; diff -urN ffsb-6.0-rc2/util.c ffsb-6.0-rc2-haiku/util.c ---- ffsb-6.0-rc2/util.c 2008-10-27 20:17:05.054788096 +0000 -+++ ffsb-6.0-rc2-haiku/util.c 2010-09-23 13:20:05.660078592 +0000 -@@ -187,26 +187,34 @@ - } - - --/* !!!! check portability */ -+ /* !!!! check portability */ +--- ffsb-6.0-rc2/util.c 2008-10-27 20:17:05.049283072 +0000 ++++ ffsb-6.0-rc2-haiku/util.c 2010-09-23 14:09:14.267386880 +0000 +@@ -190,9 +190,14 @@ + /* !!!! check portability */ float getfsutil(char *dirname) { - struct statvfs64 fsdata; @@ -92,13 +86,9 @@ diff -urN ffsb-6.0-rc2/util.c ffsb-6.0-rc2-haiku/util.c statvfs64(dirname, &fsdata); +#endif --/* return (float)(fsdata.f_blocks-fsdata.f_bfree)/ */ --/* (float)(fsdata.f_blocks-fsdata.f_bfree+fsdata.f_bavail); */ -- return (float) (((float)(fsdata.f_blocks - fsdata.f_bfree)) / -- ((float)fsdata.f_blocks)); -+ /* return (float)(fsdata.f_blocks-fsdata.f_bfree)/ */ -+ /* (float)(fsdata.f_blocks-fsdata.f_bfree+fsdata.f_bavail); */ - } + /* return (float)(fsdata.f_blocks-fsdata.f_bfree)/ */ + /* (float)(fsdata.f_blocks-fsdata.f_bfree+fsdata.f_bavail); */ +@@ -202,8 +207,13 @@ uint64_t getfsutil_size(char *dirname) { @@ -111,8 +101,4 @@ diff -urN ffsb-6.0-rc2/util.c ffsb-6.0-rc2-haiku/util.c +#endif return (fsdata.f_blocks - fsdata.f_bfree) * fsdata.f_bsize; --} -+ } - - int ffsb_system(char *command) - { + }