-- Remove structs completely

-- results is now a static variable in each benchmark
-- added get*Score routines
-- finally got rid of nmglobal.h completely
-- removed more useless stuff


git-svn-id: svn://mattst88.com/svn/cleanbench/trunk@53 0d43b9a7-5ab2-4d7b-af9d-f64450cef757

1 files changed, 10 insertions, 3 deletions

diff --git a/bitfield.c b/bitfield.c
index d87bfe7..99dbd6f 100644
--- a/bitfield.c
+++ b/bitfield.c
@@ -6,7 +6,7 @@
 #include <limits.h>
 #include <time.h>
 
-#include "nmglobal.h"
+#include "cleanbench.h"
 #include "randnum.h"
 
 
@@ -32,6 +32,8 @@ static void FlipBitRun(unsigned long *bitmap,
 		unsigned long bit_addr,
 		unsigned long nbits);
 
+static double results;
+
 /*************
 ** DoBitops **
 **************
@@ -42,7 +44,6 @@ void
 DoBitops(void)
 {
         const char*     context = "CPU:Bitfields";
-        BitOpStruct*    locbitopstruct = &global_bitopstruct;
         unsigned long*  bitarray = NULL;
         unsigned long*  bitoparray = NULL;
         clock_t         total_time = 0;
@@ -116,7 +117,7 @@ DoBitops(void)
         free(bitarray);
         free(bitoparray);
 
-        locbitopstruct->results = (double)(iterations * CLOCKS_PER_SEC) / (double)total_time;
+        results = (double)(iterations * CLOCKS_PER_SEC) / (double)total_time;
 }
 
 /************************
@@ -253,3 +254,9 @@ void ToggleBitRun(unsigned long *bitmap, /* Bitmap */
 		}
 	}	
 }
+
+inline double
+getBitfieldScore(void)
+{
+        return results;
+}