r931 - in trunk/varnish-cache: bin/varnishd include lib/libvarnish
phk at projects.linpro.no
phk at projects.linpro.no
Wed Sep 6 23:15:27 CEST 2006
Author: phk
Date: 2006-09-06 23:15:26 +0200 (Wed, 06 Sep 2006)
New Revision: 931
Added:
trunk/varnish-cache/lib/libvarnish/crc32.c
Modified:
trunk/varnish-cache/bin/varnishd/cache_session.c
trunk/varnish-cache/bin/varnishd/hash_classic.c
trunk/varnish-cache/bin/varnishd/hash_simple_list.c
trunk/varnish-cache/bin/varnishd/shmlog.c
trunk/varnish-cache/include/libvarnish.h
trunk/varnish-cache/lib/libvarnish/Makefile.am
Log:
Move CRC32 into libvarnish
Use it for hashing srcaddr as well. Hash the sockaddr instead
of the ascii representation.
Add a primitive mutex tracking facility which writes debug
records to the shmlog if enabled.
Modified: trunk/varnish-cache/bin/varnishd/cache_session.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_session.c 2006-09-06 20:45:49 UTC (rev 930)
+++ trunk/varnish-cache/bin/varnishd/cache_session.c 2006-09-06 21:15:26 UTC (rev 931)
@@ -55,10 +55,6 @@
/*--------------------------------------------------------------------
* Assign a srcaddr to this session.
*
- * We use a simple hash over the ascii representation of the address
- * because it is nice and modular. I'm not sure how much improvement
- * using the binary address would be anyway.
- *
* Each hash bucket is sorted in least recently used order and if we
* need to make a new entry we recycle the first expired entry we find.
* If we find more expired entries during our search, we delete them.
@@ -68,14 +64,12 @@
SES_RefSrcAddr(struct sess *sp)
{
unsigned u, v;
- char *p;
struct srcaddr *c, *c2, *c3;
struct srcaddrhead *ch;
time_t now;
AZ(sp->srcaddr);
- for (u = 0, p = sp->addr; *p; p++)
- u += u + *p;
+ u = crc32_l(sp->sockaddr, sp->sockaddrlen);
v = u % CLIENT_HASH;
ch = &srcaddr_hash[v];
now = time(NULL);
Modified: trunk/varnish-cache/bin/varnishd/hash_classic.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_classic.c 2006-09-06 20:45:49 UTC (rev 930)
+++ trunk/varnish-cache/bin/varnishd/hash_classic.c 2006-09-06 21:15:26 UTC (rev 931)
@@ -2,8 +2,6 @@
* $Id$
*
* A classic bucketed hash
- *
- * The CRC32 implementation is in the public domain.
*/
#include <stdio.h>
@@ -11,8 +9,8 @@
#include <string.h>
#include <sys/types.h>
-#include <shmlog.h>
-#include <cache.h>
+#include "shmlog.h"
+#include "cache.h"
/*--------------------------------------------------------------------*/
@@ -39,71 +37,6 @@
static unsigned hcl_nhash = 16383;
static struct hcl_hd *hcl_head;
-/*--------------------------------------------------------------------*/
-
-static uint32_t crc32bits[] = {
- 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
-};
-
-static uint32_t
-crc32(const char *p1, const char *p2)
-{
- const unsigned char *p;
- uint32_t crc;
-
- crc = ~0U;
-
- for (p = (const unsigned char*)p1; *p != '\0'; p++)
- crc = (crc >> 8) ^ crc32bits[(crc ^ *p) & 0xff];
- for (p = (const unsigned char*)p2; *p != '\0'; p++)
- crc = (crc >> 8) ^ crc32bits[(crc ^ *p) & 0xff];
-
- return (crc ^ ~0U);
-}
-
-
/*--------------------------------------------------------------------
* The ->init method allows the management process to pass arguments
*/
@@ -170,7 +103,7 @@
CHECK_OBJ_NOTNULL(noh, OBJHEAD_MAGIC);
- digest = crc32(key1, key2);
+ digest = crc32_2s(key1, key2);
u1 = digest % hcl_nhash;
hp = &hcl_head[u1];
Modified: trunk/varnish-cache/bin/varnishd/hash_simple_list.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/hash_simple_list.c 2006-09-06 20:45:49 UTC (rev 930)
+++ trunk/varnish-cache/bin/varnishd/hash_simple_list.c 2006-09-06 21:15:26 UTC (rev 931)
@@ -8,7 +8,8 @@
#include <stdlib.h>
#include <string.h>
-#include <cache.h>
+#include "shmlog.h"
+#include "cache.h"
/*--------------------------------------------------------------------*/
Modified: trunk/varnish-cache/bin/varnishd/shmlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/shmlog.c 2006-09-06 20:45:49 UTC (rev 930)
+++ trunk/varnish-cache/bin/varnishd/shmlog.c 2006-09-06 21:15:26 UTC (rev 931)
@@ -61,7 +61,7 @@
}
/* Only hold the lock while we find our space */
- LOCK(&vsl_mtx);
+ LOCKSHM(&vsl_mtx);
assert(loghead->ptr < loghead->size);
/* Wrap if necessary */
@@ -71,7 +71,7 @@
loghead->ptr += 5 + l;
p[5 + l] = SLT_ENDMARKER;
assert(loghead->ptr < loghead->size);
- UNLOCK(&vsl_mtx);
+ UNLOCKSHM(&vsl_mtx);
p[1] = l & 0xff;
p[2] = (id >> 8) & 0xff;
@@ -98,7 +98,7 @@
return;
}
- LOCK(&vsl_mtx);
+ LOCKSHM(&vsl_mtx);
assert(loghead->ptr < loghead->size);
/* Wrap if we cannot fit a full size record */
@@ -122,7 +122,7 @@
loghead->ptr += 5 + n;
assert(loghead->ptr < loghead->size);
- UNLOCK(&vsl_mtx);
+ UNLOCKSHM(&vsl_mtx);
va_end(ap);
}
Modified: trunk/varnish-cache/include/libvarnish.h
===================================================================
--- trunk/varnish-cache/include/libvarnish.h 2006-09-06 20:45:49 UTC (rev 930)
+++ trunk/varnish-cache/include/libvarnish.h 2006-09-06 21:15:26 UTC (rev 931)
@@ -4,6 +4,7 @@
#include <errno.h>
#include <time.h>
+#include <sys/types.h>
#ifndef NULL
#define NULL ((void*)0)
@@ -13,6 +14,10 @@
void FreeArgv(char **argv);
char **ParseArgv(const char *s, int comment);
+/* from libvarnish/crc32.c */
+uint32_t crc32_2s(const char *p1, const char *p2);
+uint32_t crc32_l(const void *p1, unsigned l);
+
/* from libvarnish/time.c */
void TIM_format(time_t t, char *p);
time_t TIM_parse(const char *p);
@@ -52,5 +57,13 @@
#define XXXAZ(foo) do { xxxassert((foo) == 0); } while (0)
#define XXXAN(foo) do { xxxassert((foo) != NULL); } while (0)
+#define LOCKSHM(foo) AZ(pthread_mutex_lock(foo))
+#define UNLOCKSHM(foo) AZ(pthread_mutex_unlock(foo))
+
+#if 1
#define LOCK(foo) AZ(pthread_mutex_lock(foo))
#define UNLOCK(foo) AZ(pthread_mutex_unlock(foo))
+#else
+#define LOCK(foo) do { AZ(pthread_mutex_lock(foo)); VSL(SLT_Debug, 0, "LOCK(%s,%s,%d," #foo ")", __func__, __FILE__, __LINE__); } while (0);
+#define UNLOCK(foo) do { AZ(pthread_mutex_unlock(foo)); VSL(SLT_Debug, 0, "UNLOC(%s,%s,%d," #foo ")", __func__, __FILE__, __LINE__); } while (0);
+#endif
Modified: trunk/varnish-cache/lib/libvarnish/Makefile.am
===================================================================
--- trunk/varnish-cache/lib/libvarnish/Makefile.am 2006-09-06 20:45:49 UTC (rev 930)
+++ trunk/varnish-cache/lib/libvarnish/Makefile.am 2006-09-06 21:15:26 UTC (rev 931)
@@ -10,6 +10,7 @@
binary_heap.c \
cli.c \
cli_common.c \
+ crc32.c \
time.c \
version.c \
vsb.c
Added: trunk/varnish-cache/lib/libvarnish/crc32.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/crc32.c 2006-09-06 20:45:49 UTC (rev 930)
+++ trunk/varnish-cache/lib/libvarnish/crc32.c 2006-09-06 21:15:26 UTC (rev 931)
@@ -0,0 +1,84 @@
+/*
+ * $Id$
+ *
+ * This CRC32 implementation is in the public domain.
+ */
+
+#include "libvarnish.h"
+
+/*--------------------------------------------------------------------*/
+
+static uint32_t crc32bits[] = {
+ 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
+crc32_2s(const char *p1, const char *p2)
+{
+ const unsigned char *p;
+ uint32_t crc;
+
+ crc = ~0U;
+
+ for (p = (const unsigned char*)p1; *p != '\0'; p++)
+ crc = (crc >> 8) ^ crc32bits[(crc ^ *p) & 0xff];
+ for (p = (const unsigned char*)p2; *p != '\0'; p++)
+ crc = (crc >> 8) ^ crc32bits[(crc ^ *p) & 0xff];
+
+ return (crc ^ ~0U);
+}
+
+uint32_t
+crc32_l(const void *p1, unsigned l)
+{
+ const unsigned char *p;
+ uint32_t crc;
+
+ crc = ~0U;
+
+ for (p = (const unsigned char*)p1; l-- > 0; p++)
+ crc = (crc >> 8) ^ crc32bits[(crc ^ *p) & 0xff];
+ return (crc ^ ~0U);
+}
More information about the varnish-commit
mailing list