More work on parallel benchmarks

2 files changed, 5 insertions, 16 deletions

diff --git a/hardinfo2/arch/common/raytrace.h b/hardinfo2/arch/common/raytrace.h
index c02cb910..7fdc5e21 100644
--- a/hardinfo2/arch/common/raytrace.h
+++ b/hardinfo2/arch/common/raytrace.h
@@ -21,6 +21,8 @@ void fbench();	/* fbench.c */
 static gpointer
 parallel_raytrace(unsigned int start, unsigned int end, gpointer data)
 {
+    unsigned int i;
+    
     for (i = start; i <= end; i++) { 
         fbench();
     }
@@ -31,19 +33,12 @@ parallel_raytrace(unsigned int start, unsigned int end, gpointer data)
 static void
 benchmark_raytrace(void)
 {
-    int i;
-    GTimer *timer = g_timer_new();
     gdouble elapsed = 0;
     
     shell_view_set_enabled(FALSE);
     shell_status_update("Performing John Walker's FBENCH...");
     
-    g_timer_start(timer);
-    benchmark_parallel_for(0, 1000, parallel_raytrace, NULL);
-    g_timer_stop(timer);
-    
-    elapsed = g_timer_elapsed(timer, NULL);
-    g_timer_destroy(timer);
+    elapsed = benchmark_parallel_for(0, 1000, parallel_raytrace, NULL);
     
     bench_results[BENCHMARK_RAYTRACE] = elapsed;
 }
diff --git a/hardinfo2/arch/common/zlib.h b/hardinfo2/arch/common/zlib.h
index f79678b3..9a24c62f 100644
--- a/hardinfo2/arch/common/zlib.h
+++ b/hardinfo2/arch/common/zlib.h
@@ -17,7 +17,7 @@
  */
 
 static gpointer
-parallel_zlib(unsigned int start, unsigned int end, void *data)
+parallel_zlib(unsigned int start, unsigned int end, void *data, GTimer *timer)
 {
     GModule *libz;
     gint i;
@@ -61,7 +61,6 @@ parallel_zlib(unsigned int start, unsigned int end, void *data)
 static void
 benchmark_zlib(void)
 {
-    GTimer *timer = g_timer_new();
     gdouble elapsed = 0;
     gchar *tmpsrc;
     gchar *bdata_path;
@@ -76,13 +75,8 @@ benchmark_zlib(void)
     
     shell_status_update("Compressing 64MB with default options...");
     
-    g_timer_start(timer);
-    benchmark_parallel_for(0, 1000, parallel_zlib, tmpsrc);
-    g_timer_stop(timer);
+    elapsed = benchmark_parallel_for(0, 1000, parallel_zlib, tmpsrc);
     
-    elapsed = g_timer_elapsed(timer, NULL);
-    
-    g_timer_destroy(timer);
     g_free(bdata_path);
     g_free(tmpsrc);