motiejus/turbonss
1
Fork 0
Code Releases Activity

vesion 0.4. It was included the bmz8 algorithm to generate mphfs for small set of keys (at most 256 keys), the vector adpter and some bugs have been corrected.

Browse Source
This commit is contained in:
fc_botelho 2005-09-16 02:53:07 +00:00
parent cff94651c4
commit 92cf0ea484
7 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
INSTALL
View File

@ -1,8 +1,5 @@
Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
Software Foundation, Inc.
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@ -70,9 +67,9 @@ The simplest way to compile this package is:
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@ -105,16 +102,16 @@ Installation Names
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PREFIX'.
option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PREFIX', the package will
use PREFIX as the prefix for installing programs and libraries.
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@ -140,11 +137,11 @@ you can use the `configure' options `--x-includes=DIR' and
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@ -170,9 +167,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@ -195,7 +192,8 @@ overridden in the site shell script).
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'

2
configure.ac
View File

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(Makefile.am)
AM_INIT_AUTOMAKE(cmph, 0.3)
AM_INIT_AUTOMAKE(cmph, 0.4)
AM_CONFIG_HEADER(config.h)
dnl Checks for programs.

8
examples/.deps/file_adapter_ex2.Po
View File

@ -1,7 +1,7 @@
file_adapter_ex2.o file_adapter_ex2.o: file_adapter_ex2.c ../src/cmph.h \
/usr/include/stdlib.h /usr/include/features.h /usr/include/sys/cdefs.h \
/usr/include/gnu/stubs.h \
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stddef.h \
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \
/usr/include/sys/types.h /usr/include/bits/types.h \
/usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
/usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
@ -11,7 +11,7 @@ file_adapter_ex2.o file_adapter_ex2.o: file_adapter_ex2.c ../src/cmph.h \
/usr/include/bits/sched.h /usr/include/alloca.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/bits/wchar.h /usr/include/gconv.h \
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stdarg.h \
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stdarg.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
/usr/include/bits/stdio.h ../src/cmph_types.h
@ -25,7 +25,7 @@ file_adapter_ex2.o file_adapter_ex2.o: file_adapter_ex2.c ../src/cmph.h \
/usr/include/gnu/stubs.h:
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stddef.h:
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h:
/usr/include/sys/types.h:
@ -69,7 +69,7 @@ file_adapter_ex2.o file_adapter_ex2.o: file_adapter_ex2.c ../src/cmph.h \
/usr/include/gconv.h:
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stdarg.h:
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stdarg.h:
/usr/include/bits/stdio_lim.h:

8
examples/.deps/vector_adapter_ex1.Po
View File

@ -1,7 +1,7 @@
vector_adapter_ex1.o vector_adapter_ex1.o: vector_adapter_ex1.c \
../src/cmph.h /usr/include/stdlib.h /usr/include/features.h \
/usr/include/sys/cdefs.h /usr/include/gnu/stubs.h \
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stddef.h \
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h \
/usr/include/sys/types.h /usr/include/bits/types.h \
/usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
/usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
@ -11,7 +11,7 @@ vector_adapter_ex1.o vector_adapter_ex1.o: vector_adapter_ex1.c \
/usr/include/bits/sched.h /usr/include/alloca.h /usr/include/stdio.h \
/usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
/usr/include/bits/wchar.h /usr/include/gconv.h \
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stdarg.h \
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stdarg.h \
/usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
/usr/include/bits/stdio.h ../src/cmph_types.h
@ -25,7 +25,7 @@ vector_adapter_ex1.o vector_adapter_ex1.o: vector_adapter_ex1.c \
/usr/include/gnu/stubs.h:
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stddef.h:
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stddef.h:
/usr/include/sys/types.h:
@ -69,7 +69,7 @@ vector_adapter_ex1.o vector_adapter_ex1.o: vector_adapter_ex1.c \
/usr/include/gconv.h:
/usr/lib/gcc/i386-redhat-linux/3.4.2/include/stdarg.h:
/usr/lib/gcc-lib/i586-suse-linux/3.3.4/include/stdarg.h:
/usr/include/bits/stdio_lim.h:

4
src/Makefile.am
View File

@ -16,8 +16,8 @@ libcmph_la_SOURCES = debug.h\
cmph_structs.h cmph_structs.c\
chm.h chm_structs.h chm.c\
bmz.h bmz_structs.h bmz.c\
bmz8.h bmz8_structs.h bmz8.c\
brz.h brz_structs.h brz.c
bmz8.h bmz8_structs.h bmz8.c
# brz.h brz_structs.h brz.c
libcmph_la_LDFLAGS = -version-info 0:0:0

32
src/cmph.c
View File

@ -3,7 +3,7 @@
#include "chm.h"
#include "bmz.h"
#include "bmz8.h" /* included -- Fabiano */
#include "brz.h" /* included -- Fabiano */
//#include "brz.h" /* included -- Fabiano */
#include <stdlib.h>
#include <assert.h>
@ -159,7 +159,7 @@ void cmph_config_set_algo(cmph_config_t *mph, CMPH_ALGO algo)
bmz8_config_destroy(mph);
break;
case CMPH_BRZ:
brz_config_destroy(mph);
// brz_config_destroy(mph);
break;
default:
assert(0);
@ -176,7 +176,7 @@ void cmph_config_set_algo(cmph_config_t *mph, CMPH_ALGO algo)
mph->data = bmz8_config_new();
break;
case CMPH_BRZ:
mph->data = brz_config_new();
// mph->data = brz_config_new();
break;
default:
assert(0);
@ -196,7 +196,7 @@ void cmph_config_set_tmp_dir(cmph_config_t *mph, cmph_uint8 *tmp_dir)
case CMPH_BMZ8: /* included -- Fabiano */
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_tmp_dir(mph, tmp_dir);
// brz_config_set_tmp_dir(mph, tmp_dir);
break;
default:
assert(0);
@ -215,7 +215,7 @@ void cmph_config_set_memory_availability(cmph_config_t *mph, cmph_uint32 memory_
case CMPH_BMZ8: /* included -- Fabiano */
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_memory_availability(mph, memory_availability);
// brz_config_set_memory_availability(mph, memory_availability);
break;
default:
assert(0);
@ -238,7 +238,7 @@ void cmph_config_destroy(cmph_config_t *mph)
bmz8_config_destroy(mph);
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_destroy(mph);
// brz_config_destroy(mph);
break;
default:
assert(0);
@ -265,7 +265,7 @@ void cmph_config_set_hashfuncs(cmph_config_t *mph, CMPH_HASH *hashfuncs)
bmz8_config_set_hashfuncs(mph, hashfuncs);
break;
case CMPH_BRZ: /* included -- Fabiano */
brz_config_set_hashfuncs(mph, hashfuncs);
// brz_config_set_hashfuncs(mph, hashfuncs);
break;
default:
break;
@ -302,9 +302,9 @@ cmph_t *cmph_new(cmph_config_t *mph)
mphf = bmz8_new(mph, c);
break;
case CMPH_BRZ: /* included -- Fabiano */
DEBUGP("Creating brz hash\n");
/* DEBUGP("Creating brz hash\n");
if (c == 0) c = 1.15;
mphf = brz_new(mph, c);
mphf = brz_new(mph, c);*/
break;
default:
assert(0);
@ -323,7 +323,8 @@ int cmph_dump(cmph_t *mphf, FILE *f)
case CMPH_BMZ8: /* included -- Fabiano */
return bmz8_dump(mphf, f);
case CMPH_BRZ: /* included -- Fabiano */
return brz_dump(mphf, f);
break;
/* return brz_dump(mphf, f);*/
default:
assert(0);
}
@ -352,8 +353,8 @@ cmph_t *cmph_load(FILE *f)
bmz8_load(f, mphf);
break;
case CMPH_BRZ: /* included -- Fabiano */
DEBUGP("Loading brz algorithm dependent parts\n");
brz_load(f, mphf);
/* DEBUGP("Loading brz algorithm dependent parts\n");
brz_load(f, mphf);*/
break;
default:
assert(0);
@ -377,8 +378,9 @@ cmph_uint32 cmph_search(cmph_t *mphf, const char *key, cmph_uint32 keylen)
DEBUGP("bmz8 algorithm search\n");
return bmz8_search(mphf, key, keylen);
case CMPH_BRZ: /* included -- Fabiano */
DEBUGP("brz algorithm search\n");
return brz_search(mphf, key, keylen);
break;
/* DEBUGP("brz algorithm search\n");
return brz_search(mphf, key, keylen);*/
default:
assert(0);
}
@ -405,7 +407,7 @@ void cmph_destroy(cmph_t *mphf)
bmz8_destroy(mphf);
return;
case CMPH_BRZ: /* included -- Fabiano */
brz_destroy(mphf);
/* brz_destroy(mphf);*/
return;
default:
assert(0);

4
src/main.c
View File

@ -143,9 +143,9 @@ int main(int argc, char **argv)
break;
}
}
if (!valid)
if (!valid || mph_algo == CMPH_BRZ)
{
fprintf(stderr, "Invalid mph algorithm: %s\n", optarg);
fprintf(stderr, "Invalid mph algorithm: %s. It is not available in version %s\n", optarg, VERSION);
return -1;
}
}