Browse Source

[core] use djbhash in gw_backend to choose host

djbhash() is faster and more cache-friendly than is crc32c()
master
Glenn Strauss 1 year ago
parent
commit
044c8e80e5
  1. 1
      src/CMakeLists.txt
  2. 3
      src/Makefile.am
  3. 1
      src/SConscript
  4. 84
      src/crc32.c
  5. 7
      src/crc32.h
  6. 40
      src/gw_backend.c
  7. 1
      src/meson.build

1
src/CMakeLists.txt

@ -728,7 +728,6 @@ set(COMMON_SRC
fdevent_poll.c fdevent_linux_sysepoll.c
fdevent_solaris_devpoll.c fdevent_solaris_port.c
fdevent_freebsd_kqueue.c
crc32.c
connections-glue.c
configfile-glue.c
http-header-glue.c

3
src/Makefile.am

@ -85,7 +85,6 @@ common_src=base64.c buffer.c burl.c log.c \
fdevent_poll.c fdevent_linux_sysepoll.c \
fdevent_solaris_devpoll.c fdevent_solaris_port.c \
fdevent_freebsd_kqueue.c \
crc32.c \
connections-glue.c \
configfile-glue.c \
http-header-glue.c \
@ -457,7 +456,7 @@ hdr = base64.h buffer.h burl.h network.h log.h http_kv.h keyvalue.h \
algo_sha1.h md5.h http_auth.h http_header.h http_vhostdb.h stream.h \
fdevent.h gw_backend.h connections.h base.h base_decls.h stat_cache.h \
plugin.h plugin_config.h \
etag.h array.h vector.h crc32.h \
etag.h array.h vector.h \
fdevent_impl.h network_write.h configfile.h \
mod_ssi.h mod_ssi_expr.h inet_ntop_cache.h \
configparser.h mod_ssi_exprparser.h \

1
src/SConscript

@ -65,7 +65,6 @@ common_src = Split("base64.c buffer.c burl.c log.c \
fdevent_poll.c fdevent_linux_sysepoll.c \
fdevent_solaris_devpoll.c fdevent_solaris_port.c \
fdevent_freebsd_kqueue.c \
crc32.c \
connections-glue.c \
configfile-glue.c \
http-header-glue.c \

84
src/crc32.c

@ -1,84 +0,0 @@
#include "first.h"
#include "crc32.h"
#define CRC32C(c,d) (c=(c>>8)^crc_c[(c^(d))&0xFF])
static const unsigned int crc_c[256] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
};
uint32_t generate_crc32c(const char *buffer, size_t length) {
size_t i;
uint32_t crc32 = ~0L;
for (i = 0; i < length; i++){
CRC32C(crc32, (unsigned char)buffer[i]);
}
return ~crc32;
}

7
src/crc32.h

@ -1,7 +0,0 @@
#ifndef __crc32cr_table_h__
#define __crc32cr_table_h__
#include "first.h"
uint32_t generate_crc32c(const char *string, size_t length);
#endif

40
src/gw_backend.c

@ -21,6 +21,7 @@
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
#include <stdint.h>
#include <stdlib.h>
#include <signal.h>
#include <string.h>
@ -30,10 +31,10 @@
#include "array.h"
#include "buffer.h"
#include "chunk.h"
#include "crc32.h"
#include "fdevent.h"
#include "log.h"
#include "sock_addr.h"
#include "splaytree.h"
@ -787,11 +788,18 @@ enum {
GW_BALANCE_STICKY
};
__attribute_noinline__
static uint32_t
gw_hash(const char *str, const uint32_t len, uint32_t hash)
{
return djbhash(str, len, hash);
}
static gw_host * gw_host_get(request_st * const r, gw_extension *extension, int balance, int debug) {
gw_host *host;
buffer *dst_addr_buf;
unsigned long last_max = ULONG_MAX;
unsigned long base_crc32c;
uint32_t last_max = UINT32_MAX;
uint32_t base_hash = DJBHASH_INIT;
int max_usage = INT_MAX;
int ndx = -1;
uint32_t k;
@ -809,24 +817,24 @@ static gw_host * gw_host_get(request_st * const r, gw_extension *extension, int
"proxy - used hash balancing, hosts: %u", extension->used);
}
base_crc32c = generate_crc32c(CONST_BUF_LEN(&r->uri.path))
+ generate_crc32c(CONST_BUF_LEN(&r->uri.authority));
base_hash = gw_hash(CONST_BUF_LEN(&r->uri.path), base_hash);
base_hash = gw_hash(CONST_BUF_LEN(&r->uri.authority), base_hash);
for (k = 0, ndx = -1, last_max = ULONG_MAX; k < extension->used; ++k) {
unsigned long cur_max;
for (k = 0, ndx = -1, last_max = UINT32_MAX; k < extension->used; ++k) {
uint32_t cur_max;
host = extension->hosts[k];
if (0 == host->active_procs) continue;
cur_max = base_crc32c
+ generate_crc32c(CONST_BUF_LEN(host->host)); /* cacheable */
/* future: hash of host->host could be cached separately, mixed in*/
cur_max = gw_hash(CONST_BUF_LEN(host->host), base_hash);
if (debug) {
log_error(r->conf.errh, __FILE__, __LINE__,
"proxy - election: %s %s %s %lu", r->uri.path.ptr,
"proxy - election: %s %s %s %u", r->uri.path.ptr,
host->host->ptr, r->uri.authority.ptr, cur_max);
}
if (last_max < cur_max || last_max == ULONG_MAX) {
if (last_max < cur_max || last_max == UINT32_MAX) {
last_max = cur_max;
ndx = k;
}
@ -896,16 +904,16 @@ static gw_host * gw_host_get(request_st * const r, gw_extension *extension, int
"proxy - used sticky balancing, hosts: %u", extension->used);
}
base_crc32c = generate_crc32c(CONST_BUF_LEN(dst_addr_buf));
base_hash = gw_hash(CONST_BUF_LEN(dst_addr_buf), base_hash);
for (k = 0, ndx = -1, last_max = ULONG_MAX; k < extension->used; ++k) {
for (k = 0, ndx = -1, last_max = UINT32_MAX; k < extension->used; ++k) {
unsigned long cur_max;
host = extension->hosts[k];
if (0 == host->active_procs) continue;
cur_max = base_crc32c
+ generate_crc32c(CONST_BUF_LEN(host->host)) /* cacheable */
/* future: hash of host->host could be cached separately, mixed in*/
cur_max = gw_hash(CONST_BUF_LEN(host->host), base_hash)
+ host->port;
if (debug) {
@ -914,7 +922,7 @@ static gw_host * gw_host_get(request_st * const r, gw_extension *extension, int
host->host->ptr, host->port, cur_max);
}
if (last_max < cur_max || last_max == ULONG_MAX) {
if (last_max < cur_max || last_max == UINT32_MAX) {
last_max = cur_max;
ndx = k;
}

1
src/meson.build

@ -645,7 +645,6 @@ common_src = [
'chunk.c',
'configfile-glue.c',
'connections-glue.c',
'crc32.c',
'data_array.c',
'data_integer.c',
'data_string.c',

Loading…
Cancel
Save