FIX new benchmarks working for slow & fast machines

1 files changed, 13 insertions, 11 deletions

diff --git a/modules/benchmark/raytrace.c b/modules/benchmark/raytrace.c
index a1abfcd5..bddc3232 100644
--- a/modules/benchmark/raytrace.c
+++ b/modules/benchmark/raytrace.c
@@ -1,5 +1,5 @@
 /*
- *    HardInfo - Displays System Information
+ *    HardInfo - System Information and Benchmark
  *    Copyright (C) 2003-2007 L. A. F. Pereira <l@tia.mat.br>
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -19,19 +19,16 @@
 #include "benchmark.h"
 
 /* if anything changes in this block, increment revision */
-#define BENCH_REVISION 0
-#define STEPS 1000
+#define BENCH_REVISION 2
+#define CRUNCH_TIME 5
 
 void fbench();	/* fbench.c */
 
-static gpointer
-parallel_raytrace(unsigned int start, unsigned int end, gpointer data, gint thread_number)
+static gpointer parallel_raytrace(void *in_data, gint thread_number)
 {
     unsigned int i;
 
-    for (i = start; i <= end; i++) {
-        fbench();
-    }
+    fbench();
 
     return NULL;
 }
@@ -40,15 +37,20 @@ void
 benchmark_raytrace(void)
 {
     bench_value r = EMPTY_BENCH_VALUE;
+    gchar *test_data = get_test_data(1000);
 
     shell_view_set_enabled(FALSE);
     shell_status_update("Performing John Walker's FBENCH...");
 
-    r = benchmark_parallel_for(0, 0, STEPS, parallel_raytrace, NULL);
-    r.result = r.elapsed_time;
+    r = benchmark_crunch_for(CRUNCH_TIME, 1, parallel_raytrace, test_data);
+
     r.revision = BENCH_REVISION;
-    snprintf(r.extra, 255, "r:%d", STEPS);
+    snprintf(r.extra, 255, "r:%d", 500);//niter from fbench
+
+    g_free(test_data);
 
+    r.result /= 10;
+    
     bench_results[BENCHMARK_RAYTRACE] = r;
 }