motiejus/turbonss
1
Fork 0
Code Releases Activity

FCH algorithm added but not tested...

Browse Source
This commit is contained in:
fc_botelho
2006-08-03 20:00:11 +00:00
parent 9352564651
commit 3825c0a511
5 changed files with 44 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/cmph.c
View File

@@ -4,6 +4,7 @@
#include "bmz.h"
#include "bmz8.h" /* included -- Fabiano */
#include "brz.h" /* included -- Fabiano */
#include "fch.h" /* included -- Fabiano */
#include <stdlib.h>
#include <assert.h>
@@ -11,7 +12,7 @@
//#define DEBUG
#include "debug.h"
const char *cmph_names[] = { "bmz", "bmz8", "chm", "brz", NULL }; /* included -- Fabiano */
const char *cmph_names[] = { "bmz", "bmz8", "chm", "brz", "fch", NULL }; /* included -- Fabiano */
typedef struct
{
@@ -219,6 +220,9 @@ void cmph_config_set_algo(cmph_config_t *mph, CMPH_ALGO algo)
case CMPH_BRZ:
brz_config_destroy(mph);
break;
case CMPH_FCH:
fch_config_destroy(mph);
break;
default:
assert(0);
}
@@ -236,6 +240,9 @@ void cmph_config_set_algo(cmph_config_t *mph, CMPH_ALGO algo)
case CMPH_BRZ:
mph->data = brz_config_new();
break;
case CMPH_FCH:
mph->data = fch_config_new();
break;
default:
assert(0);
}
@@ -245,76 +252,35 @@ void cmph_config_set_algo(cmph_config_t *mph, CMPH_ALGO algo)
void cmph_config_set_tmp_dir(cmph_config_t *mph, cmph_uint8 *tmp_dir)
{
switch (mph->algo)
if (mph->algo == CMPH_BRZ)
{
case CMPH_CHM:
break;
case CMPH_BMZ: /* included -- Fabiano */
break;
case CMPH_BMZ8: /* included -- Fabiano */
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_tmp_dir(mph, tmp_dir);
break;
default:
assert(0);
brz_config_set_tmp_dir(mph, tmp_dir);
}
}
void cmph_config_set_mphf_fd(cmph_config_t *mph, FILE *mphf_fd)
{
switch (mph->algo)
if (mph->algo == CMPH_BRZ)
{
case CMPH_CHM:
break;
case CMPH_BMZ: /* included -- Fabiano */
break;
case CMPH_BMZ8: /* included -- Fabiano */
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_mphf_fd(mph, mphf_fd);
break;
default:
assert(0);
brz_config_set_mphf_fd(mph, mphf_fd);
}
}
void cmph_config_set_b(cmph_config_t *mph, cmph_uint8 b)
{
switch (mph->algo)
if (mph->algo == CMPH_BRZ)
{
case CMPH_CHM:
break;
case CMPH_BMZ: /* included -- Fabiano */
break;
case CMPH_BMZ8: /* included -- Fabiano */
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_b(mph, b);
break;
default:
assert(0);
brz_config_set_b(mph, b);
}
}
void cmph_config_set_memory_availability(cmph_config_t *mph, cmph_uint32 memory_availability)
{
switch (mph->algo)
if (mph->algo == CMPH_BRZ)
{
case CMPH_CHM:
break;
case CMPH_BMZ: /* included -- Fabiano */
break;
case CMPH_BMZ8: /* included -- Fabiano */
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_memory_availability(mph, memory_availability);
break;
default:
assert(0);
brz_config_set_memory_availability(mph, memory_availability);
}
}
void cmph_config_destroy(cmph_config_t *mph)
@@ -334,6 +300,9 @@ void cmph_config_destroy(cmph_config_t *mph)
case CMPH_BRZ: /* included -- Fabiano */
brz_config_destroy(mph);
break;
case CMPH_FCH: /* included -- Fabiano */
fch_config_destroy(mph);
break;
default:
assert(0);
}
@@ -361,6 +330,9 @@ void cmph_config_set_hashfuncs(cmph_config_t *mph, CMPH_HASH *hashfuncs)
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_hashfuncs(mph, hashfuncs);
break;
case CMPH_FCH: /* included -- Fabiano */
fch_config_set_hashfuncs(mph, hashfuncs);
break;
default:
break;
}
@@ -400,6 +372,11 @@ cmph_t *cmph_new(cmph_config_t *mph)
if (c == 0) c = 1.15;
mphf = brz_new(mph, c);
break;
case CMPH_FCH: /* included -- Fabiano */
DEBUGP("Creating fch hash\n");
if (c <= 2) c = 2.1;
mphf = fch_new(mph, c);
break;
default:
assert(0);
}
@@ -418,6 +395,8 @@ int cmph_dump(cmph_t *mphf, FILE *f)
return bmz8_dump(mphf, f);
case CMPH_BRZ: /* included -- Fabiano */
return brz_dump(mphf, f);
case CMPH_FCH: /* included -- Fabiano */
return fch_dump(mphf, f);
default:
assert(0);
}
@@ -449,6 +428,10 @@ cmph_t *cmph_load(FILE *f)
DEBUGP("Loading brz algorithm dependent parts\n");
brz_load(f, mphf);
break;
case CMPH_FCH: /* included -- Fabiano */
DEBUGP("Loading fch algorithm dependent parts\n");
fch_load(f, mphf);
break;
default:
assert(0);
}
@@ -473,6 +456,9 @@ cmph_uint32 cmph_search(cmph_t *mphf, const char *key, cmph_uint32 keylen)
case CMPH_BRZ: /* included -- Fabiano */
DEBUGP("brz algorithm search\n");
return brz_search(mphf, key, keylen);
case CMPH_FCH: /* included -- Fabiano */
DEBUGP("fch algorithm search\n");
return fch_search(mphf, key, keylen);
default:
assert(0);
}
@@ -501,6 +487,9 @@ void cmph_destroy(cmph_t *mphf)
case CMPH_BRZ: /* included -- Fabiano */
brz_destroy(mphf);
return;
case CMPH_FCH: /* included -- Fabiano */
fch_destroy(mphf);
return;
default:
assert(0);
}