summaryrefslogtreecommitdiff
path: root/huffman.c
diff options
context:
space:
mode:
Diffstat (limited to 'huffman.c')
-rw-r--r--huffman.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/huffman.c b/huffman.c
index 7ebdd81..051fbbf 100644
--- a/huffman.c
+++ b/huffman.c
@@ -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;
+}