libaitcrc/src/hash.c - diff

Return to hash.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitcrc / src

Diff for /libaitcrc/src/hash.c between versions 1.1.2.1 and 1.2.2.1

version 1.1.2.1, 2010/06/13 16:29:03	version 1.2.2.1, 2012/07/04 14:46:33
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $Id$
*	*
*************************************************************************/	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"


/*	/*
* hash_varchar() Compute index hash by variable length string	* hash_varchar() - Compute index hash by variable length string
	*
* @csStr = Input data buffer	* @csStr = Input data buffer
* @nStrLen = Length of data buffer	* @nStrLen = Length of data buffer
* @nVer = Version of algorythm; 0 - original, 1 - AITNET variant	* @nVer = Version of algorythm; 0 - original, 1 - AITNET variant
Line 28 hash_varchar(const char *csStr, int nStrLen, int nVer)	Line 66 hash_varchar(const char *csStr, int nStrLen, int nVer)
n = 2 * hash + csStr[i];	n = 2 * hash + csStr[i];
if (!nVer) {	if (!nVer) {
if (hash & 0x80000000)	if (hash & 0x80000000)
n ^= 0xC0A0A0D5; // Polynom CRC-32 aviation	n ^= POLY_CRC32; /* Polynom CRC-32 aviation */
} else {	} else {
if (n & 1) // Misho ;) patch for better avalanche!!!	if (n & 1) /* Misho ;) patch for better avalanche!!! */
n ^= 0xC0A0A0D5; // Polynom CRC-32 aviation	n ^= POLY_CRC32; /* Polynom CRC-32 aviation */
}	}
hash = n;	hash = n;
}	}
Line 40 hash_varchar(const char *csStr, int nStrLen, int nVer)	Line 78 hash_varchar(const char *csStr, int nStrLen, int nVer)
}	}

/*	/*
* hash_bernstein() Compute index hash by Bernstein	* hash_bernstein() - Compute index hash by Bernstein
	*
* @csStr = Input data buffer	* @csStr = Input data buffer
* @nStrLen = Length of data buffer	* @nStrLen = Length of data buffer
* @nVer = Version of algorythm; 0 - Bernstein, 1 - DJBX33A variant	* @nVer = Version of algorythm; 0 - Bernstein, 1 - DJBX33A variant
Line 49 hash_varchar(const char *csStr, int nStrLen, int nVer)	Line 88 hash_varchar(const char *csStr, int nStrLen, int nVer)
inline u_int	inline u_int
hash_bernstein(const char *csStr, int nStrLen, int nVer)	hash_bernstein(const char *csStr, int nStrLen, int nVer)
{	{
register u_int hash = 5381;	register u_int hash = INIT_BERNSTEIN;
register int i;	register int i;

assert(csStr);	assert(csStr);
Line 58 hash_bernstein(const char *csStr, int nStrLen, int nVe	Line 97 hash_bernstein(const char *csStr, int nStrLen, int nVe
if (!nVer)	if (!nVer)
hash = ((hash << 5) + hash) + csStr[i];	hash = ((hash << 5) + hash) + csStr[i];
else	else
hash = hash * 33 + csStr[i]; // DJBX33A	hash = hash * 33 + csStr[i]; /* DJBX33A */

return hash;	return hash;
}	}

/*	/*
* hash_fnv1() Compute index hash by FNV-1	* hash_fnv1() - Compute index hash by FNV-1
	*
* @csStr = Input data buffer	* @csStr = Input data buffer
* @nStrLen = Length of data buffer	* @nStrLen = Length of data buffer
* @nVer = Version of algorythm; 0 - FNV-1, 1 - FNV-1a (best avalanche)	* @nVer = Version of algorythm; 0 - FNV-1, 1 - FNV-1a (best avalanche)
Line 73 hash_bernstein(const char *csStr, int nStrLen, int nVe	Line 113 hash_bernstein(const char *csStr, int nStrLen, int nVe
inline u_int	inline u_int
hash_fnv1(const char *csStr, int nStrLen, int nVer)	hash_fnv1(const char *csStr, int nStrLen, int nVer)
{	{
register u_int hash = 0x811c9dc5; // 2166136261	register u_int hash = INIT_FNV1;
register int i;	register int i;

assert(csStr);	assert(csStr);

for (i = 0; i < nStrLen; i++)	for (i = 0; i < nStrLen; i++)
if (!nVer) { // FNV-1	if (!nVer) { /* FNV-1 */
hash *= 16777619;	hash *= POLY_FNV1;
hash ^= csStr[i];	hash ^= csStr[i];
} else { // FNV-1a	} else { /* FNV-1a */
hash ^= csStr[i];	hash ^= csStr[i];
hash *= 16777619;	hash *= POLY_FNV1;
}	}

return hash;	return hash;
}	}

/*	/*
* hash_jenkins() Compute index hash by Jenkins (one-at-a-time)	* hash_jenkins() - Compute index hash by Jenkins (one-at-a-time)
	*
* @csStr = Input data buffer	* @csStr = Input data buffer
* @nStrLen = Length of data buffer	* @nStrLen = Length of data buffer
* return: Hash value	* return: Hash value
Line 112 hash_jenkins(const char *csStr, int nStrLen)	Line 153 hash_jenkins(const char *csStr, int nStrLen)
hash += (hash << 3);	hash += (hash << 3);
hash ^= (hash >> 11);	hash ^= (hash >> 11);
hash += (hash << 15);	hash += (hash << 15);

	return hash;
	}

	/*
	* hash_reddragon() - Compute index hash by Red Dragon
	*
	* @csStr = Input data buffer
	* @nStrLen = Length of data buffer
	* return: Hash value
	*/
	inline u_int
	hash_reddragon(const char *csStr, int nStrLen)
	{
	register u_int g, hash;
	register int i;

	assert(csStr);

	for (hash = 0, i = 0; i < nStrLen; i++) {
	hash = (hash << 4) + csStr[i];
	if ((g = hash & 0xF0000000)) {
	hash ^= g >> 24;
	hash ^= g;
	}
	}

return hash;	return hash;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.1
changed lines
	Added in v.1.2.2.1