diff options
author | Matt Turner <mattst88@gmail.com> | 2008-11-15 03:17:35 +0000 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2008-11-15 03:17:35 +0000 |
commit | 04741fb6181f8cc1ebc6f527d8d22840d019eb7b (patch) | |
tree | 793fb68beeb2309d424c9cd20b9f54f6a9dee166 /huffman.c | |
parent | c0a8896d9a90e59429b6fecadc397ead42974f59 (diff) |
-- 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
Diffstat (limited to 'huffman.c')
-rw-r--r-- | huffman.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -6,7 +6,7 @@ #include <limits.h> #include <time.h> -#include "nmglobal.h" +#include "cleanbench.h" #include "randnum.h" @@ -51,6 +51,8 @@ static clock_t DoHuffIteration(char *plaintext, char *comparray, char *decomparr static void SetCompBit(uint8_t *comparray, uint32_t bitoffset, char bitchar); static int GetCompBit(uint8_t *comparray, uint32_t bitoffset); +static double results; + /************** ** DoHuffman ** *************** @@ -64,7 +66,6 @@ void DoHuffman(void) { const char* context = "CPU:Huffman"; - HuffStruct* lochuffstruct = &global_huffstruct; char* comparray = NULL; char* decomparray = NULL; char* plaintext = NULL; @@ -155,7 +156,7 @@ DoHuffman(void) free(decomparray); free(hufftree); - lochuffstruct->results = (double)(iterations * CLOCKS_PER_SEC) / (double)total_time; + results = (double)(iterations * CLOCKS_PER_SEC) / (double)total_time; } /********************* @@ -499,3 +500,9 @@ bitnumb=bitoffset % 8; */ return((1<<bitnumb) & comparray[byteoffset] ); } + +inline double +getHuffmanScore(void) +{ + return results; +} |