caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use processor base types in HLL_(GET|SET)_REGISTER.

Browse Source 
This speedups the macros by a noticeable factor.
This commit is contained in:
antirez 2014-03-29 08:37:01 +01:00
parent ac8fbe8829
commit 28dce36f76
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hyperloglog.c
View File

@ -160,9 +160,9 @@
* 'p' is an array of unsigned bytes. */ * 'p' is an array of unsigned bytes. */
#define HLL_GET_REGISTER(target,p,regnum) do { \ #define HLL_GET_REGISTER(target,p,regnum) do { \
uint8_t *_p = (uint8_t*) p; \ uint8_t *_p = (uint8_t*) p; \
int _byte = regnum*REDIS_HLL_BITS/8; \ unsigned long _byte = regnum*REDIS_HLL_BITS/8; \
int _leftshift = regnum*REDIS_HLL_BITS&7; \ unsigned long _leftshift = regnum*REDIS_HLL_BITS&7; \
int _rightshift = 8 - _leftshift; \ unsigned long _rightshift = 8 - _leftshift; \
target = ((_p[_byte] << _leftshift) | \ target = ((_p[_byte] << _leftshift) | \
(_p[_byte+1] >> _rightshift)) & \ (_p[_byte+1] >> _rightshift)) & \
REDIS_HLL_REGISTER_MAX; \ REDIS_HLL_REGISTER_MAX; \
@ -172,9 +172,9 @@
* 'p' is an array of unsigned bytes. */ * 'p' is an array of unsigned bytes. */
#define HLL_SET_REGISTER(p,regnum,val) do { \ #define HLL_SET_REGISTER(p,regnum,val) do { \
uint8_t *_p = (uint8_t*) p; \ uint8_t *_p = (uint8_t*) p; \
int _byte = regnum*REDIS_HLL_BITS/8; \ unsigned long _byte = regnum*REDIS_HLL_BITS/8; \
int _leftshift = regnum*REDIS_HLL_BITS&7; \ unsigned long _leftshift = regnum*REDIS_HLL_BITS&7; \
int _rightshift = 8 - _leftshift; \ unsigned long _rightshift = 8 - _leftshift; \
_p[_byte] &= ~(REDIS_HLL_REGISTER_MAX >> _leftshift); \ _p[_byte] &= ~(REDIS_HLL_REGISTER_MAX >> _leftshift); \
_p[_byte] |= val >> _leftshift; \ _p[_byte] |= val >> _leftshift; \
_p[_byte+1] &= ~(REDIS_HLL_REGISTER_MAX << _rightshift); \ _p[_byte+1] &= ~(REDIS_HLL_REGISTER_MAX << _rightshift); \
@ -290,10 +290,10 @@ uint64_t hllCount(uint8_t *registers) {
initialized = 1; initialized = 1;
} }
for (j = 0; j < REDIS_HLL_REGISTERS; j++) {
uint8_t reg;
/* Compute SUM(2^-register[0..i]). */ /* Compute SUM(2^-register[0..i]). */
for (j = 0; j < REDIS_HLL_REGISTERS; j++) {
unsigned long reg;
HLL_GET_REGISTER(reg,registers,j); HLL_GET_REGISTER(reg,registers,j);
if (reg == 0) { if (reg == 0) {
ez++; ez++;