diff options
| author | André Draszik <andre.draszik@jci.com> | 2018-01-12 13:16:57 +0000 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-01-22 19:36:03 -0800 |
| commit | fa6d5d1087d299f40e19e5299a14f97c421beaf0 (patch) | |
| tree | 9cfdd31975e3a1d9ae5acef91bc68656892ebe85 | |
| parent | 749c0d0ea32ec9b4d8e80d67a8657711f4565431 (diff) | |
| download | meta-openembedded-fa6d5d1087d299f40e19e5299a14f97c421beaf0.tar.gz | |
mosquitto: use uthash from meta-oe
meta-oe has uthash, so let's use that and not the
old version shipped with the mosquitto source.
(Debian does the same)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch | 975 | ||||
| -rw-r--r-- | meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb | 2 |
2 files changed, 977 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch b/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch new file mode 100644 index 0000000000..c89dfe6bef --- /dev/null +++ b/meta-oe/recipes-connectivity/mosquitto/files/0002-uthash-remove-in-tree-version.patch | |||
| @@ -0,0 +1,975 @@ | |||
| 1 | From d9aeef8d95a325942cc92f4d72415771d75d904c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | ||
| 3 | Date: Tue, 12 Apr 2016 13:05:10 +0100 | ||
| 4 | Subject: [PATCH 2/2] uthash: remove in-tree version | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | We don't need it as we want to use the version provided by | ||
| 10 | meta-oe instead. | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate [embedded-specific] | ||
| 13 | Signed-off-by: André Draszik <andre.draszik@jci.com> | ||
| 14 | --- | ||
| 15 | src/uthash.h | 948 ----------------------------------------------------------- | ||
| 16 | 1 file changed, 948 deletions(-) | ||
| 17 | delete mode 100644 src/uthash.h | ||
| 18 | |||
| 19 | diff --git a/src/uthash.h b/src/uthash.h | ||
| 20 | deleted file mode 100644 | ||
| 21 | index 915a825..0000000 | ||
| 22 | --- a/src/uthash.h | ||
| 23 | +++ /dev/null | ||
| 24 | @@ -1,948 +0,0 @@ | ||
| 25 | -/* | ||
| 26 | -Copyright (c) 2003-2013, Troy D. Hanson http://troydhanson.github.com/uthash/ | ||
| 27 | -All rights reserved. | ||
| 28 | - | ||
| 29 | -Redistribution and use in source and binary forms, with or without | ||
| 30 | -modification, are permitted provided that the following conditions are met: | ||
| 31 | - | ||
| 32 | - * Redistributions of source code must retain the above copyright | ||
| 33 | - notice, this list of conditions and the following disclaimer. | ||
| 34 | - | ||
| 35 | -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS | ||
| 36 | -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
| 37 | -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A | ||
| 38 | -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER | ||
| 39 | -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
| 40 | -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
| 41 | -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
| 42 | -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
| 43 | -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
| 44 | -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
| 45 | -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 46 | -*/ | ||
| 47 | - | ||
| 48 | -#ifndef UTHASH_H | ||
| 49 | -#define UTHASH_H | ||
| 50 | - | ||
| 51 | -#include <string.h> /* memcmp,strlen */ | ||
| 52 | -#include <stddef.h> /* ptrdiff_t */ | ||
| 53 | -#include <stdlib.h> /* exit() */ | ||
| 54 | - | ||
| 55 | -/* These macros use decltype or the earlier __typeof GNU extension. | ||
| 56 | - As decltype is only available in newer compilers (VS2010 or gcc 4.3+ | ||
| 57 | - when compiling c++ source) this code uses whatever method is needed | ||
| 58 | - or, for VS2008 where neither is available, uses casting workarounds. */ | ||
| 59 | -#ifdef _MSC_VER /* MS compiler */ | ||
| 60 | -#if _MSC_VER >= 1600 && defined(__cplusplus) /* VS2010 or newer in C++ mode */ | ||
| 61 | -#define DECLTYPE(x) (decltype(x)) | ||
| 62 | -#else /* VS2008 or older (or VS2010 in C mode) */ | ||
| 63 | -#define NO_DECLTYPE | ||
| 64 | -#define DECLTYPE(x) | ||
| 65 | -#endif | ||
| 66 | -#else /* GNU, Sun and other compilers */ | ||
| 67 | -#define DECLTYPE(x) (__typeof(x)) | ||
| 68 | -#endif | ||
| 69 | - | ||
| 70 | -#ifdef NO_DECLTYPE | ||
| 71 | -#define DECLTYPE_ASSIGN(dst,src) \ | ||
| 72 | -do { \ | ||
| 73 | - char **_da_dst = (char**)(&(dst)); \ | ||
| 74 | - *_da_dst = (char*)(src); \ | ||
| 75 | -} while(0) | ||
| 76 | -#else | ||
| 77 | -#define DECLTYPE_ASSIGN(dst,src) \ | ||
| 78 | -do { \ | ||
| 79 | - (dst) = DECLTYPE(dst)(src); \ | ||
| 80 | -} while(0) | ||
| 81 | -#endif | ||
| 82 | - | ||
| 83 | -/* a number of the hash function use uint32_t which isn't defined on win32 */ | ||
| 84 | -#ifdef _MSC_VER | ||
| 85 | -typedef unsigned int uint32_t; | ||
| 86 | -typedef unsigned char uint8_t; | ||
| 87 | -#else | ||
| 88 | -#include <inttypes.h> /* uint32_t */ | ||
| 89 | -#endif | ||
| 90 | - | ||
| 91 | -#define UTHASH_VERSION 1.9.8 | ||
| 92 | - | ||
| 93 | -#ifndef uthash_fatal | ||
| 94 | -#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */ | ||
| 95 | -#endif | ||
| 96 | -#ifndef uthash_malloc | ||
| 97 | -#define uthash_malloc(sz) malloc(sz) /* malloc fcn */ | ||
| 98 | -#endif | ||
| 99 | -#ifndef uthash_free | ||
| 100 | -#define uthash_free(ptr,sz) free(ptr) /* free fcn */ | ||
| 101 | -#endif | ||
| 102 | - | ||
| 103 | -#ifndef uthash_noexpand_fyi | ||
| 104 | -#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */ | ||
| 105 | -#endif | ||
| 106 | -#ifndef uthash_expand_fyi | ||
| 107 | -#define uthash_expand_fyi(tbl) /* can be defined to log expands */ | ||
| 108 | -#endif | ||
| 109 | - | ||
| 110 | -/* initial number of buckets */ | ||
| 111 | -#define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */ | ||
| 112 | -#define HASH_INITIAL_NUM_BUCKETS_LOG2 5 /* lg2 of initial number of buckets */ | ||
| 113 | -#define HASH_BKT_CAPACITY_THRESH 10 /* expand when bucket count reaches */ | ||
| 114 | - | ||
| 115 | -/* calculate the element whose hash handle address is hhe */ | ||
| 116 | -#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho))) | ||
| 117 | - | ||
| 118 | -#define HASH_FIND(hh,head,keyptr,keylen,out) \ | ||
| 119 | -do { \ | ||
| 120 | - unsigned _hf_bkt,_hf_hashv; \ | ||
| 121 | - out=NULL; \ | ||
| 122 | - if (head) { \ | ||
| 123 | - HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt); \ | ||
| 124 | - if (HASH_BLOOM_TEST((head)->hh.tbl, _hf_hashv)) { \ | ||
| 125 | - HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], \ | ||
| 126 | - keyptr,keylen,out); \ | ||
| 127 | - } \ | ||
| 128 | - } \ | ||
| 129 | -} while (0) | ||
| 130 | - | ||
| 131 | -#ifdef HASH_BLOOM | ||
| 132 | -#define HASH_BLOOM_BITLEN (1ULL << HASH_BLOOM) | ||
| 133 | -#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8) + ((HASH_BLOOM_BITLEN%8) ? 1:0) | ||
| 134 | -#define HASH_BLOOM_MAKE(tbl) \ | ||
| 135 | -do { \ | ||
| 136 | - (tbl)->bloom_nbits = HASH_BLOOM; \ | ||
| 137 | - (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN); \ | ||
| 138 | - if (!((tbl)->bloom_bv)) { uthash_fatal( "out of memory"); } \ | ||
| 139 | - memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN); \ | ||
| 140 | - (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \ | ||
| 141 | -} while (0) | ||
| 142 | - | ||
| 143 | -#define HASH_BLOOM_FREE(tbl) \ | ||
| 144 | -do { \ | ||
| 145 | - uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \ | ||
| 146 | -} while (0) | ||
| 147 | - | ||
| 148 | -#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8))) | ||
| 149 | -#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8))) | ||
| 150 | - | ||
| 151 | -#define HASH_BLOOM_ADD(tbl,hashv) \ | ||
| 152 | - HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1))) | ||
| 153 | - | ||
| 154 | -#define HASH_BLOOM_TEST(tbl,hashv) \ | ||
| 155 | - HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1))) | ||
| 156 | - | ||
| 157 | -#else | ||
| 158 | -#define HASH_BLOOM_MAKE(tbl) | ||
| 159 | -#define HASH_BLOOM_FREE(tbl) | ||
| 160 | -#define HASH_BLOOM_ADD(tbl,hashv) | ||
| 161 | -#define HASH_BLOOM_TEST(tbl,hashv) (1) | ||
| 162 | -#define HASH_BLOOM_BYTELEN 0 | ||
| 163 | -#endif | ||
| 164 | - | ||
| 165 | -#define HASH_MAKE_TABLE(hh,head) \ | ||
| 166 | -do { \ | ||
| 167 | - (head)->hh.tbl = (UT_hash_table*)uthash_malloc( \ | ||
| 168 | - sizeof(UT_hash_table)); \ | ||
| 169 | - if (!((head)->hh.tbl)) { uthash_fatal( "out of memory"); } \ | ||
| 170 | - memset((head)->hh.tbl, 0, sizeof(UT_hash_table)); \ | ||
| 171 | - (head)->hh.tbl->tail = &((head)->hh); \ | ||
| 172 | - (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \ | ||
| 173 | - (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2; \ | ||
| 174 | - (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head); \ | ||
| 175 | - (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc( \ | ||
| 176 | - HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ | ||
| 177 | - if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); } \ | ||
| 178 | - memset((head)->hh.tbl->buckets, 0, \ | ||
| 179 | - HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \ | ||
| 180 | - HASH_BLOOM_MAKE((head)->hh.tbl); \ | ||
| 181 | - (head)->hh.tbl->signature = HASH_SIGNATURE; \ | ||
| 182 | -} while(0) | ||
| 183 | - | ||
| 184 | -#define HASH_ADD(hh,head,fieldname,keylen_in,add) \ | ||
| 185 | - HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add) | ||
| 186 | - | ||
| 187 | -#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced) \ | ||
| 188 | -do { \ | ||
| 189 | - replaced=NULL; \ | ||
| 190 | - HASH_FIND(hh,head,&((add)->fieldname),keylen_in,replaced); \ | ||
| 191 | - if (replaced!=NULL) { \ | ||
| 192 | - HASH_DELETE(hh,head,replaced); \ | ||
| 193 | - }; \ | ||
| 194 | - HASH_ADD(hh,head,fieldname,keylen_in,add); \ | ||
| 195 | -} while(0) | ||
| 196 | - | ||
| 197 | -#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \ | ||
| 198 | -do { \ | ||
| 199 | - unsigned _ha_bkt; \ | ||
| 200 | - (add)->hh.next = NULL; \ | ||
| 201 | - (add)->hh.key = (char*)keyptr; \ | ||
| 202 | - (add)->hh.keylen = (unsigned)keylen_in; \ | ||
| 203 | - if (!(head)) { \ | ||
| 204 | - head = (add); \ | ||
| 205 | - (head)->hh.prev = NULL; \ | ||
| 206 | - HASH_MAKE_TABLE(hh,head); \ | ||
| 207 | - } else { \ | ||
| 208 | - (head)->hh.tbl->tail->next = (add); \ | ||
| 209 | - (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail); \ | ||
| 210 | - (head)->hh.tbl->tail = &((add)->hh); \ | ||
| 211 | - } \ | ||
| 212 | - (head)->hh.tbl->num_items++; \ | ||
| 213 | - (add)->hh.tbl = (head)->hh.tbl; \ | ||
| 214 | - HASH_FCN(keyptr,keylen_in, (head)->hh.tbl->num_buckets, \ | ||
| 215 | - (add)->hh.hashv, _ha_bkt); \ | ||
| 216 | - HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt],&(add)->hh); \ | ||
| 217 | - HASH_BLOOM_ADD((head)->hh.tbl,(add)->hh.hashv); \ | ||
| 218 | - HASH_EMIT_KEY(hh,head,keyptr,keylen_in); \ | ||
| 219 | - HASH_FSCK(hh,head); \ | ||
| 220 | -} while(0) | ||
| 221 | - | ||
| 222 | -#define HASH_TO_BKT( hashv, num_bkts, bkt ) \ | ||
| 223 | -do { \ | ||
| 224 | - bkt = ((hashv) & ((num_bkts) - 1)); \ | ||
| 225 | -} while(0) | ||
| 226 | - | ||
| 227 | -/* delete "delptr" from the hash table. | ||
| 228 | - * "the usual" patch-up process for the app-order doubly-linked-list. | ||
| 229 | - * The use of _hd_hh_del below deserves special explanation. | ||
| 230 | - * These used to be expressed using (delptr) but that led to a bug | ||
| 231 | - * if someone used the same symbol for the head and deletee, like | ||
| 232 | - * HASH_DELETE(hh,users,users); | ||
| 233 | - * We want that to work, but by changing the head (users) below | ||
| 234 | - * we were forfeiting our ability to further refer to the deletee (users) | ||
| 235 | - * in the patch-up process. Solution: use scratch space to | ||
| 236 | - * copy the deletee pointer, then the latter references are via that | ||
| 237 | - * scratch pointer rather than through the repointed (users) symbol. | ||
| 238 | - */ | ||
| 239 | -#define HASH_DELETE(hh,head,delptr) \ | ||
| 240 | -do { \ | ||
| 241 | - unsigned _hd_bkt; \ | ||
| 242 | - struct UT_hash_handle *_hd_hh_del; \ | ||
| 243 | - if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) ) { \ | ||
| 244 | - uthash_free((head)->hh.tbl->buckets, \ | ||
| 245 | - (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \ | ||
| 246 | - HASH_BLOOM_FREE((head)->hh.tbl); \ | ||
| 247 | - uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ | ||
| 248 | - head = NULL; \ | ||
| 249 | - } else { \ | ||
| 250 | - _hd_hh_del = &((delptr)->hh); \ | ||
| 251 | - if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) { \ | ||
| 252 | - (head)->hh.tbl->tail = \ | ||
| 253 | - (UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) + \ | ||
| 254 | - (head)->hh.tbl->hho); \ | ||
| 255 | - } \ | ||
| 256 | - if ((delptr)->hh.prev) { \ | ||
| 257 | - ((UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) + \ | ||
| 258 | - (head)->hh.tbl->hho))->next = (delptr)->hh.next; \ | ||
| 259 | - } else { \ | ||
| 260 | - DECLTYPE_ASSIGN(head,(delptr)->hh.next); \ | ||
| 261 | - } \ | ||
| 262 | - if (_hd_hh_del->next) { \ | ||
| 263 | - ((UT_hash_handle*)((ptrdiff_t)_hd_hh_del->next + \ | ||
| 264 | - (head)->hh.tbl->hho))->prev = \ | ||
| 265 | - _hd_hh_del->prev; \ | ||
| 266 | - } \ | ||
| 267 | - HASH_TO_BKT( _hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \ | ||
| 268 | - HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del); \ | ||
| 269 | - (head)->hh.tbl->num_items--; \ | ||
| 270 | - } \ | ||
| 271 | - HASH_FSCK(hh,head); \ | ||
| 272 | -} while (0) | ||
| 273 | - | ||
| 274 | - | ||
| 275 | -/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */ | ||
| 276 | -#define HASH_FIND_STR(head,findstr,out) \ | ||
| 277 | - HASH_FIND(hh,head,findstr,strlen(findstr),out) | ||
| 278 | -#define HASH_ADD_STR(head,strfield,add) \ | ||
| 279 | - HASH_ADD(hh,head,strfield,strlen(add->strfield),add) | ||
| 280 | -#define HASH_REPLACE_STR(head,strfield,add,replaced) \ | ||
| 281 | - HASH_REPLACE(hh,head,strfield,strlen(add->strfield),add,replaced) | ||
| 282 | -#define HASH_FIND_INT(head,findint,out) \ | ||
| 283 | - HASH_FIND(hh,head,findint,sizeof(int),out) | ||
| 284 | -#define HASH_ADD_INT(head,intfield,add) \ | ||
| 285 | - HASH_ADD(hh,head,intfield,sizeof(int),add) | ||
| 286 | -#define HASH_REPLACE_INT(head,intfield,add,replaced) \ | ||
| 287 | - HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced) | ||
| 288 | -#define HASH_FIND_PTR(head,findptr,out) \ | ||
| 289 | - HASH_FIND(hh,head,findptr,sizeof(void *),out) | ||
| 290 | -#define HASH_ADD_PTR(head,ptrfield,add) \ | ||
| 291 | - HASH_ADD(hh,head,ptrfield,sizeof(void *),add) | ||
| 292 | -#define HASH_REPLACE_PTR(head,ptrfield,add) \ | ||
| 293 | - HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced) | ||
| 294 | -#define HASH_DEL(head,delptr) \ | ||
| 295 | - HASH_DELETE(hh,head,delptr) | ||
| 296 | - | ||
| 297 | -/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined. | ||
| 298 | - * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined. | ||
| 299 | - */ | ||
| 300 | -#ifdef HASH_DEBUG | ||
| 301 | -#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0) | ||
| 302 | -#define HASH_FSCK(hh,head) \ | ||
| 303 | -do { \ | ||
| 304 | - unsigned _bkt_i; \ | ||
| 305 | - unsigned _count, _bkt_count; \ | ||
| 306 | - char *_prev; \ | ||
| 307 | - struct UT_hash_handle *_thh; \ | ||
| 308 | - if (head) { \ | ||
| 309 | - _count = 0; \ | ||
| 310 | - for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) { \ | ||
| 311 | - _bkt_count = 0; \ | ||
| 312 | - _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head; \ | ||
| 313 | - _prev = NULL; \ | ||
| 314 | - while (_thh) { \ | ||
| 315 | - if (_prev != (char*)(_thh->hh_prev)) { \ | ||
| 316 | - HASH_OOPS("invalid hh_prev %p, actual %p\n", \ | ||
| 317 | - _thh->hh_prev, _prev ); \ | ||
| 318 | - } \ | ||
| 319 | - _bkt_count++; \ | ||
| 320 | - _prev = (char*)(_thh); \ | ||
| 321 | - _thh = _thh->hh_next; \ | ||
| 322 | - } \ | ||
| 323 | - _count += _bkt_count; \ | ||
| 324 | - if ((head)->hh.tbl->buckets[_bkt_i].count != _bkt_count) { \ | ||
| 325 | - HASH_OOPS("invalid bucket count %d, actual %d\n", \ | ||
| 326 | - (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count); \ | ||
| 327 | - } \ | ||
| 328 | - } \ | ||
| 329 | - if (_count != (head)->hh.tbl->num_items) { \ | ||
| 330 | - HASH_OOPS("invalid hh item count %d, actual %d\n", \ | ||
| 331 | - (head)->hh.tbl->num_items, _count ); \ | ||
| 332 | - } \ | ||
| 333 | - /* traverse hh in app order; check next/prev integrity, count */ \ | ||
| 334 | - _count = 0; \ | ||
| 335 | - _prev = NULL; \ | ||
| 336 | - _thh = &(head)->hh; \ | ||
| 337 | - while (_thh) { \ | ||
| 338 | - _count++; \ | ||
| 339 | - if (_prev !=(char*)(_thh->prev)) { \ | ||
| 340 | - HASH_OOPS("invalid prev %p, actual %p\n", \ | ||
| 341 | - _thh->prev, _prev ); \ | ||
| 342 | - } \ | ||
| 343 | - _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh); \ | ||
| 344 | - _thh = ( _thh->next ? (UT_hash_handle*)((char*)(_thh->next) + \ | ||
| 345 | - (head)->hh.tbl->hho) : NULL ); \ | ||
| 346 | - } \ | ||
| 347 | - if (_count != (head)->hh.tbl->num_items) { \ | ||
| 348 | - HASH_OOPS("invalid app item count %d, actual %d\n", \ | ||
| 349 | - (head)->hh.tbl->num_items, _count ); \ | ||
| 350 | - } \ | ||
| 351 | - } \ | ||
| 352 | -} while (0) | ||
| 353 | -#else | ||
| 354 | -#define HASH_FSCK(hh,head) | ||
| 355 | -#endif | ||
| 356 | - | ||
| 357 | -/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to | ||
| 358 | - * the descriptor to which this macro is defined for tuning the hash function. | ||
| 359 | - * The app can #include <unistd.h> to get the prototype for write(2). */ | ||
| 360 | -#ifdef HASH_EMIT_KEYS | ||
| 361 | -#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \ | ||
| 362 | -do { \ | ||
| 363 | - unsigned _klen = fieldlen; \ | ||
| 364 | - write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \ | ||
| 365 | - write(HASH_EMIT_KEYS, keyptr, fieldlen); \ | ||
| 366 | -} while (0) | ||
| 367 | -#else | ||
| 368 | -#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) | ||
| 369 | -#endif | ||
| 370 | - | ||
| 371 | -/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */ | ||
| 372 | -#ifdef HASH_FUNCTION | ||
| 373 | -#define HASH_FCN HASH_FUNCTION | ||
| 374 | -#else | ||
| 375 | -#define HASH_FCN HASH_JEN | ||
| 376 | -#endif | ||
| 377 | - | ||
| 378 | -/* The Bernstein hash function, used in Perl prior to v5.6 */ | ||
| 379 | -#define HASH_BER(key,keylen,num_bkts,hashv,bkt) \ | ||
| 380 | -do { \ | ||
| 381 | - unsigned _hb_keylen=keylen; \ | ||
| 382 | - char *_hb_key=(char*)(key); \ | ||
| 383 | - (hashv) = 0; \ | ||
| 384 | - while (_hb_keylen--) { (hashv) = ((hashv) * 33) + *_hb_key++; } \ | ||
| 385 | - bkt = (hashv) & (num_bkts-1); \ | ||
| 386 | -} while (0) | ||
| 387 | - | ||
| 388 | - | ||
| 389 | -/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at | ||
| 390 | - * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */ | ||
| 391 | -#define HASH_SAX(key,keylen,num_bkts,hashv,bkt) \ | ||
| 392 | -do { \ | ||
| 393 | - unsigned _sx_i; \ | ||
| 394 | - char *_hs_key=(char*)(key); \ | ||
| 395 | - hashv = 0; \ | ||
| 396 | - for(_sx_i=0; _sx_i < keylen; _sx_i++) \ | ||
| 397 | - hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i]; \ | ||
| 398 | - bkt = hashv & (num_bkts-1); \ | ||
| 399 | -} while (0) | ||
| 400 | - | ||
| 401 | -#define HASH_FNV(key,keylen,num_bkts,hashv,bkt) \ | ||
| 402 | -do { \ | ||
| 403 | - unsigned _fn_i; \ | ||
| 404 | - char *_hf_key=(char*)(key); \ | ||
| 405 | - hashv = 2166136261UL; \ | ||
| 406 | - for(_fn_i=0; _fn_i < keylen; _fn_i++) \ | ||
| 407 | - hashv = (hashv * 16777619) ^ _hf_key[_fn_i]; \ | ||
| 408 | - bkt = hashv & (num_bkts-1); \ | ||
| 409 | -} while(0) | ||
| 410 | - | ||
| 411 | -#define HASH_OAT(key,keylen,num_bkts,hashv,bkt) \ | ||
| 412 | -do { \ | ||
| 413 | - unsigned _ho_i; \ | ||
| 414 | - char *_ho_key=(char*)(key); \ | ||
| 415 | - hashv = 0; \ | ||
| 416 | - for(_ho_i=0; _ho_i < keylen; _ho_i++) { \ | ||
| 417 | - hashv += _ho_key[_ho_i]; \ | ||
| 418 | - hashv += (hashv << 10); \ | ||
| 419 | - hashv ^= (hashv >> 6); \ | ||
| 420 | - } \ | ||
| 421 | - hashv += (hashv << 3); \ | ||
| 422 | - hashv ^= (hashv >> 11); \ | ||
| 423 | - hashv += (hashv << 15); \ | ||
| 424 | - bkt = hashv & (num_bkts-1); \ | ||
| 425 | -} while(0) | ||
| 426 | - | ||
| 427 | -#define HASH_JEN_MIX(a,b,c) \ | ||
| 428 | -do { \ | ||
| 429 | - a -= b; a -= c; a ^= ( c >> 13 ); \ | ||
| 430 | - b -= c; b -= a; b ^= ( a << 8 ); \ | ||
| 431 | - c -= a; c -= b; c ^= ( b >> 13 ); \ | ||
| 432 | - a -= b; a -= c; a ^= ( c >> 12 ); \ | ||
| 433 | - b -= c; b -= a; b ^= ( a << 16 ); \ | ||
| 434 | - c -= a; c -= b; c ^= ( b >> 5 ); \ | ||
| 435 | - a -= b; a -= c; a ^= ( c >> 3 ); \ | ||
| 436 | - b -= c; b -= a; b ^= ( a << 10 ); \ | ||
| 437 | - c -= a; c -= b; c ^= ( b >> 15 ); \ | ||
| 438 | -} while (0) | ||
| 439 | - | ||
| 440 | -#define HASH_JEN(key,keylen,num_bkts,hashv,bkt) \ | ||
| 441 | -do { \ | ||
| 442 | - unsigned _hj_i,_hj_j,_hj_k; \ | ||
| 443 | - unsigned char *_hj_key=(unsigned char*)(key); \ | ||
| 444 | - hashv = 0xfeedbeef; \ | ||
| 445 | - _hj_i = _hj_j = 0x9e3779b9; \ | ||
| 446 | - _hj_k = (unsigned)keylen; \ | ||
| 447 | - while (_hj_k >= 12) { \ | ||
| 448 | - _hj_i += (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 ) \ | ||
| 449 | - + ( (unsigned)_hj_key[2] << 16 ) \ | ||
| 450 | - + ( (unsigned)_hj_key[3] << 24 ) ); \ | ||
| 451 | - _hj_j += (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 ) \ | ||
| 452 | - + ( (unsigned)_hj_key[6] << 16 ) \ | ||
| 453 | - + ( (unsigned)_hj_key[7] << 24 ) ); \ | ||
| 454 | - hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 ) \ | ||
| 455 | - + ( (unsigned)_hj_key[10] << 16 ) \ | ||
| 456 | - + ( (unsigned)_hj_key[11] << 24 ) ); \ | ||
| 457 | - \ | ||
| 458 | - HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ | ||
| 459 | - \ | ||
| 460 | - _hj_key += 12; \ | ||
| 461 | - _hj_k -= 12; \ | ||
| 462 | - } \ | ||
| 463 | - hashv += keylen; \ | ||
| 464 | - switch ( _hj_k ) { \ | ||
| 465 | - case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); \ | ||
| 466 | - case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); \ | ||
| 467 | - case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); \ | ||
| 468 | - case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); \ | ||
| 469 | - case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); \ | ||
| 470 | - case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); \ | ||
| 471 | - case 5: _hj_j += _hj_key[4]; \ | ||
| 472 | - case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); \ | ||
| 473 | - case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); \ | ||
| 474 | - case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); \ | ||
| 475 | - case 1: _hj_i += _hj_key[0]; \ | ||
| 476 | - } \ | ||
| 477 | - HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ | ||
| 478 | - bkt = hashv & (num_bkts-1); \ | ||
| 479 | -} while(0) | ||
| 480 | - | ||
| 481 | -/* The Paul Hsieh hash function */ | ||
| 482 | -#undef get16bits | ||
| 483 | -#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \ | ||
| 484 | - || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__) | ||
| 485 | -#define get16bits(d) (*((const uint16_t *) (d))) | ||
| 486 | -#endif | ||
| 487 | - | ||
| 488 | -#if !defined (get16bits) | ||
| 489 | -#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8) \ | ||
| 490 | - +(uint32_t)(((const uint8_t *)(d))[0]) ) | ||
| 491 | -#endif | ||
| 492 | -#define HASH_SFH(key,keylen,num_bkts,hashv,bkt) \ | ||
| 493 | -do { \ | ||
| 494 | - unsigned char *_sfh_key=(unsigned char*)(key); \ | ||
| 495 | - uint32_t _sfh_tmp, _sfh_len = keylen; \ | ||
| 496 | - \ | ||
| 497 | - int _sfh_rem = _sfh_len & 3; \ | ||
| 498 | - _sfh_len >>= 2; \ | ||
| 499 | - hashv = 0xcafebabe; \ | ||
| 500 | - \ | ||
| 501 | - /* Main loop */ \ | ||
| 502 | - for (;_sfh_len > 0; _sfh_len--) { \ | ||
| 503 | - hashv += get16bits (_sfh_key); \ | ||
| 504 | - _sfh_tmp = (uint32_t)(get16bits (_sfh_key+2)) << 11 ^ hashv; \ | ||
| 505 | - hashv = (hashv << 16) ^ _sfh_tmp; \ | ||
| 506 | - _sfh_key += 2*sizeof (uint16_t); \ | ||
| 507 | - hashv += hashv >> 11; \ | ||
| 508 | - } \ | ||
| 509 | - \ | ||
| 510 | - /* Handle end cases */ \ | ||
| 511 | - switch (_sfh_rem) { \ | ||
| 512 | - case 3: hashv += get16bits (_sfh_key); \ | ||
| 513 | - hashv ^= hashv << 16; \ | ||
| 514 | - hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)] << 18); \ | ||
| 515 | - hashv += hashv >> 11; \ | ||
| 516 | - break; \ | ||
| 517 | - case 2: hashv += get16bits (_sfh_key); \ | ||
| 518 | - hashv ^= hashv << 11; \ | ||
| 519 | - hashv += hashv >> 17; \ | ||
| 520 | - break; \ | ||
| 521 | - case 1: hashv += *_sfh_key; \ | ||
| 522 | - hashv ^= hashv << 10; \ | ||
| 523 | - hashv += hashv >> 1; \ | ||
| 524 | - } \ | ||
| 525 | - \ | ||
| 526 | - /* Force "avalanching" of final 127 bits */ \ | ||
| 527 | - hashv ^= hashv << 3; \ | ||
| 528 | - hashv += hashv >> 5; \ | ||
| 529 | - hashv ^= hashv << 4; \ | ||
| 530 | - hashv += hashv >> 17; \ | ||
| 531 | - hashv ^= hashv << 25; \ | ||
| 532 | - hashv += hashv >> 6; \ | ||
| 533 | - bkt = hashv & (num_bkts-1); \ | ||
| 534 | -} while(0) | ||
| 535 | - | ||
| 536 | -#ifdef HASH_USING_NO_STRICT_ALIASING | ||
| 537 | -/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads. | ||
| 538 | - * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error. | ||
| 539 | - * MurmurHash uses the faster approach only on CPU's where we know it's safe. | ||
| 540 | - * | ||
| 541 | - * Note the preprocessor built-in defines can be emitted using: | ||
| 542 | - * | ||
| 543 | - * gcc -m64 -dM -E - < /dev/null (on gcc) | ||
| 544 | - * cc -## a.c (where a.c is a simple test file) (Sun Studio) | ||
| 545 | - */ | ||
| 546 | -#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86)) | ||
| 547 | -#define MUR_GETBLOCK(p,i) p[i] | ||
| 548 | -#else /* non intel */ | ||
| 549 | -#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0) | ||
| 550 | -#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1) | ||
| 551 | -#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2) | ||
| 552 | -#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3) | ||
| 553 | -#define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL)) | ||
| 554 | -#if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__)) | ||
| 555 | -#define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24)) | ||
| 556 | -#define MUR_TWO_TWO(p) ((((*WP(p))&0x0000ffff) <<16) | (((*(WP(p)+1))&0xffff0000) >> 16)) | ||
| 557 | -#define MUR_ONE_THREE(p) ((((*WP(p))&0x000000ff) <<24) | (((*(WP(p)+1))&0xffffff00) >> 8)) | ||
| 558 | -#else /* assume little endian non-intel */ | ||
| 559 | -#define MUR_THREE_ONE(p) ((((*WP(p))&0xffffff00) >> 8) | (((*(WP(p)+1))&0x000000ff) << 24)) | ||
| 560 | -#define MUR_TWO_TWO(p) ((((*WP(p))&0xffff0000) >>16) | (((*(WP(p)+1))&0x0000ffff) << 16)) | ||
| 561 | -#define MUR_ONE_THREE(p) ((((*WP(p))&0xff000000) >>24) | (((*(WP(p)+1))&0x00ffffff) << 8)) | ||
| 562 | -#endif | ||
| 563 | -#define MUR_GETBLOCK(p,i) (MUR_PLUS0_ALIGNED(p) ? ((p)[i]) : \ | ||
| 564 | - (MUR_PLUS1_ALIGNED(p) ? MUR_THREE_ONE(p) : \ | ||
| 565 | - (MUR_PLUS2_ALIGNED(p) ? MUR_TWO_TWO(p) : \ | ||
| 566 | - MUR_ONE_THREE(p)))) | ||
| 567 | -#endif | ||
| 568 | -#define MUR_ROTL32(x,r) (((x) << (r)) | ((x) >> (32 - (r)))) | ||
| 569 | -#define MUR_FMIX(_h) \ | ||
| 570 | -do { \ | ||
| 571 | - _h ^= _h >> 16; \ | ||
| 572 | - _h *= 0x85ebca6b; \ | ||
| 573 | - _h ^= _h >> 13; \ | ||
| 574 | - _h *= 0xc2b2ae35l; \ | ||
| 575 | - _h ^= _h >> 16; \ | ||
| 576 | -} while(0) | ||
| 577 | - | ||
| 578 | -#define HASH_MUR(key,keylen,num_bkts,hashv,bkt) \ | ||
| 579 | -do { \ | ||
| 580 | - const uint8_t *_mur_data = (const uint8_t*)(key); \ | ||
| 581 | - const int _mur_nblocks = (keylen) / 4; \ | ||
| 582 | - uint32_t _mur_h1 = 0xf88D5353; \ | ||
| 583 | - uint32_t _mur_c1 = 0xcc9e2d51; \ | ||
| 584 | - uint32_t _mur_c2 = 0x1b873593; \ | ||
| 585 | - uint32_t _mur_k1 = 0; \ | ||
| 586 | - const uint8_t *_mur_tail; \ | ||
| 587 | - const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+_mur_nblocks*4); \ | ||
| 588 | - int _mur_i; \ | ||
| 589 | - for(_mur_i = -_mur_nblocks; _mur_i; _mur_i++) { \ | ||
| 590 | - _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i); \ | ||
| 591 | - _mur_k1 *= _mur_c1; \ | ||
| 592 | - _mur_k1 = MUR_ROTL32(_mur_k1,15); \ | ||
| 593 | - _mur_k1 *= _mur_c2; \ | ||
| 594 | - \ | ||
| 595 | - _mur_h1 ^= _mur_k1; \ | ||
| 596 | - _mur_h1 = MUR_ROTL32(_mur_h1,13); \ | ||
| 597 | - _mur_h1 = _mur_h1*5+0xe6546b64; \ | ||
| 598 | - } \ | ||
| 599 | - _mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4); \ | ||
| 600 | - _mur_k1=0; \ | ||
| 601 | - switch((keylen) & 3) { \ | ||
| 602 | - case 3: _mur_k1 ^= _mur_tail[2] << 16; \ | ||
| 603 | - case 2: _mur_k1 ^= _mur_tail[1] << 8; \ | ||
| 604 | - case 1: _mur_k1 ^= _mur_tail[0]; \ | ||
| 605 | - _mur_k1 *= _mur_c1; \ | ||
| 606 | - _mur_k1 = MUR_ROTL32(_mur_k1,15); \ | ||
| 607 | - _mur_k1 *= _mur_c2; \ | ||
| 608 | - _mur_h1 ^= _mur_k1; \ | ||
| 609 | - } \ | ||
| 610 | - _mur_h1 ^= (keylen); \ | ||
| 611 | - MUR_FMIX(_mur_h1); \ | ||
| 612 | - hashv = _mur_h1; \ | ||
| 613 | - bkt = hashv & (num_bkts-1); \ | ||
| 614 | -} while(0) | ||
| 615 | -#endif /* HASH_USING_NO_STRICT_ALIASING */ | ||
| 616 | - | ||
| 617 | -/* key comparison function; return 0 if keys equal */ | ||
| 618 | -#define HASH_KEYCMP(a,b,len) memcmp(a,b,len) | ||
| 619 | - | ||
| 620 | -/* iterate over items in a known bucket to find desired item */ | ||
| 621 | -#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out) \ | ||
| 622 | -do { \ | ||
| 623 | - if (head.hh_head) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,head.hh_head)); \ | ||
| 624 | - else out=NULL; \ | ||
| 625 | - while (out) { \ | ||
| 626 | - if ((out)->hh.keylen == keylen_in) { \ | ||
| 627 | - if ((HASH_KEYCMP((out)->hh.key,keyptr,keylen_in)) == 0) break; \ | ||
| 628 | - } \ | ||
| 629 | - if ((out)->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,(out)->hh.hh_next)); \ | ||
| 630 | - else out = NULL; \ | ||
| 631 | - } \ | ||
| 632 | -} while(0) | ||
| 633 | - | ||
| 634 | -/* add an item to a bucket */ | ||
| 635 | -#define HASH_ADD_TO_BKT(head,addhh) \ | ||
| 636 | -do { \ | ||
| 637 | - head.count++; \ | ||
| 638 | - (addhh)->hh_next = head.hh_head; \ | ||
| 639 | - (addhh)->hh_prev = NULL; \ | ||
| 640 | - if (head.hh_head) { (head).hh_head->hh_prev = (addhh); } \ | ||
| 641 | - (head).hh_head=addhh; \ | ||
| 642 | - if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH) \ | ||
| 643 | - && (addhh)->tbl->noexpand != 1) { \ | ||
| 644 | - HASH_EXPAND_BUCKETS((addhh)->tbl); \ | ||
| 645 | - } \ | ||
| 646 | -} while(0) | ||
| 647 | - | ||
| 648 | -/* remove an item from a given bucket */ | ||
| 649 | -#define HASH_DEL_IN_BKT(hh,head,hh_del) \ | ||
| 650 | - (head).count--; \ | ||
| 651 | - if ((head).hh_head == hh_del) { \ | ||
| 652 | - (head).hh_head = hh_del->hh_next; \ | ||
| 653 | - } \ | ||
| 654 | - if (hh_del->hh_prev) { \ | ||
| 655 | - hh_del->hh_prev->hh_next = hh_del->hh_next; \ | ||
| 656 | - } \ | ||
| 657 | - if (hh_del->hh_next) { \ | ||
| 658 | - hh_del->hh_next->hh_prev = hh_del->hh_prev; \ | ||
| 659 | - } | ||
| 660 | - | ||
| 661 | -/* Bucket expansion has the effect of doubling the number of buckets | ||
| 662 | - * and redistributing the items into the new buckets. Ideally the | ||
| 663 | - * items will distribute more or less evenly into the new buckets | ||
| 664 | - * (the extent to which this is true is a measure of the quality of | ||
| 665 | - * the hash function as it applies to the key domain). | ||
| 666 | - * | ||
| 667 | - * With the items distributed into more buckets, the chain length | ||
| 668 | - * (item count) in each bucket is reduced. Thus by expanding buckets | ||
| 669 | - * the hash keeps a bound on the chain length. This bounded chain | ||
| 670 | - * length is the essence of how a hash provides constant time lookup. | ||
| 671 | - * | ||
| 672 | - * The calculation of tbl->ideal_chain_maxlen below deserves some | ||
| 673 | - * explanation. First, keep in mind that we're calculating the ideal | ||
| 674 | - * maximum chain length based on the *new* (doubled) bucket count. | ||
| 675 | - * In fractions this is just n/b (n=number of items,b=new num buckets). | ||
| 676 | - * Since the ideal chain length is an integer, we want to calculate | ||
| 677 | - * ceil(n/b). We don't depend on floating point arithmetic in this | ||
| 678 | - * hash, so to calculate ceil(n/b) with integers we could write | ||
| 679 | - * | ||
| 680 | - * ceil(n/b) = (n/b) + ((n%b)?1:0) | ||
| 681 | - * | ||
| 682 | - * and in fact a previous version of this hash did just that. | ||
| 683 | - * But now we have improved things a bit by recognizing that b is | ||
| 684 | - * always a power of two. We keep its base 2 log handy (call it lb), | ||
| 685 | - * so now we can write this with a bit shift and logical AND: | ||
| 686 | - * | ||
| 687 | - * ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0) | ||
| 688 | - * | ||
| 689 | - */ | ||
| 690 | -#define HASH_EXPAND_BUCKETS(tbl) \ | ||
| 691 | -do { \ | ||
| 692 | - unsigned _he_bkt; \ | ||
| 693 | - unsigned _he_bkt_i; \ | ||
| 694 | - struct UT_hash_handle *_he_thh, *_he_hh_nxt; \ | ||
| 695 | - UT_hash_bucket *_he_new_buckets, *_he_newbkt; \ | ||
| 696 | - _he_new_buckets = (UT_hash_bucket*)uthash_malloc( \ | ||
| 697 | - 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ | ||
| 698 | - if (!_he_new_buckets) { uthash_fatal( "out of memory"); } \ | ||
| 699 | - memset(_he_new_buckets, 0, \ | ||
| 700 | - 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \ | ||
| 701 | - tbl->ideal_chain_maxlen = \ | ||
| 702 | - (tbl->num_items >> (tbl->log2_num_buckets+1)) + \ | ||
| 703 | - ((tbl->num_items & ((tbl->num_buckets*2)-1)) ? 1 : 0); \ | ||
| 704 | - tbl->nonideal_items = 0; \ | ||
| 705 | - for(_he_bkt_i = 0; _he_bkt_i < tbl->num_buckets; _he_bkt_i++) \ | ||
| 706 | - { \ | ||
| 707 | - _he_thh = tbl->buckets[ _he_bkt_i ].hh_head; \ | ||
| 708 | - while (_he_thh) { \ | ||
| 709 | - _he_hh_nxt = _he_thh->hh_next; \ | ||
| 710 | - HASH_TO_BKT( _he_thh->hashv, tbl->num_buckets*2, _he_bkt); \ | ||
| 711 | - _he_newbkt = &(_he_new_buckets[ _he_bkt ]); \ | ||
| 712 | - if (++(_he_newbkt->count) > tbl->ideal_chain_maxlen) { \ | ||
| 713 | - tbl->nonideal_items++; \ | ||
| 714 | - _he_newbkt->expand_mult = _he_newbkt->count / \ | ||
| 715 | - tbl->ideal_chain_maxlen; \ | ||
| 716 | - } \ | ||
| 717 | - _he_thh->hh_prev = NULL; \ | ||
| 718 | - _he_thh->hh_next = _he_newbkt->hh_head; \ | ||
| 719 | - if (_he_newbkt->hh_head) _he_newbkt->hh_head->hh_prev = \ | ||
| 720 | - _he_thh; \ | ||
| 721 | - _he_newbkt->hh_head = _he_thh; \ | ||
| 722 | - _he_thh = _he_hh_nxt; \ | ||
| 723 | - } \ | ||
| 724 | - } \ | ||
| 725 | - uthash_free( tbl->buckets, tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \ | ||
| 726 | - tbl->num_buckets *= 2; \ | ||
| 727 | - tbl->log2_num_buckets++; \ | ||
| 728 | - tbl->buckets = _he_new_buckets; \ | ||
| 729 | - tbl->ineff_expands = (tbl->nonideal_items > (tbl->num_items >> 1)) ? \ | ||
| 730 | - (tbl->ineff_expands+1) : 0; \ | ||
| 731 | - if (tbl->ineff_expands > 1) { \ | ||
| 732 | - tbl->noexpand=1; \ | ||
| 733 | - uthash_noexpand_fyi(tbl); \ | ||
| 734 | - } \ | ||
| 735 | - uthash_expand_fyi(tbl); \ | ||
| 736 | -} while(0) | ||
| 737 | - | ||
| 738 | - | ||
| 739 | -/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */ | ||
| 740 | -/* Note that HASH_SORT assumes the hash handle name to be hh. | ||
| 741 | - * HASH_SRT was added to allow the hash handle name to be passed in. */ | ||
| 742 | -#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn) | ||
| 743 | -#define HASH_SRT(hh,head,cmpfcn) \ | ||
| 744 | -do { \ | ||
| 745 | - unsigned _hs_i; \ | ||
| 746 | - unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize; \ | ||
| 747 | - struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail; \ | ||
| 748 | - if (head) { \ | ||
| 749 | - _hs_insize = 1; \ | ||
| 750 | - _hs_looping = 1; \ | ||
| 751 | - _hs_list = &((head)->hh); \ | ||
| 752 | - while (_hs_looping) { \ | ||
| 753 | - _hs_p = _hs_list; \ | ||
| 754 | - _hs_list = NULL; \ | ||
| 755 | - _hs_tail = NULL; \ | ||
| 756 | - _hs_nmerges = 0; \ | ||
| 757 | - while (_hs_p) { \ | ||
| 758 | - _hs_nmerges++; \ | ||
| 759 | - _hs_q = _hs_p; \ | ||
| 760 | - _hs_psize = 0; \ | ||
| 761 | - for ( _hs_i = 0; _hs_i < _hs_insize; _hs_i++ ) { \ | ||
| 762 | - _hs_psize++; \ | ||
| 763 | - _hs_q = (UT_hash_handle*)((_hs_q->next) ? \ | ||
| 764 | - ((void*)((char*)(_hs_q->next) + \ | ||
| 765 | - (head)->hh.tbl->hho)) : NULL); \ | ||
| 766 | - if (! (_hs_q) ) break; \ | ||
| 767 | - } \ | ||
| 768 | - _hs_qsize = _hs_insize; \ | ||
| 769 | - while ((_hs_psize > 0) || ((_hs_qsize > 0) && _hs_q )) { \ | ||
| 770 | - if (_hs_psize == 0) { \ | ||
| 771 | - _hs_e = _hs_q; \ | ||
| 772 | - _hs_q = (UT_hash_handle*)((_hs_q->next) ? \ | ||
| 773 | - ((void*)((char*)(_hs_q->next) + \ | ||
| 774 | - (head)->hh.tbl->hho)) : NULL); \ | ||
| 775 | - _hs_qsize--; \ | ||
| 776 | - } else if ( (_hs_qsize == 0) || !(_hs_q) ) { \ | ||
| 777 | - _hs_e = _hs_p; \ | ||
| 778 | - if (_hs_p){ \ | ||
| 779 | - _hs_p = (UT_hash_handle*)((_hs_p->next) ? \ | ||
| 780 | - ((void*)((char*)(_hs_p->next) + \ | ||
| 781 | - (head)->hh.tbl->hho)) : NULL); \ | ||
| 782 | - } \ | ||
| 783 | - _hs_psize--; \ | ||
| 784 | - } else if (( \ | ||
| 785 | - cmpfcn(DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \ | ||
| 786 | - DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q))) \ | ||
| 787 | - ) <= 0) { \ | ||
| 788 | - _hs_e = _hs_p; \ | ||
| 789 | - if (_hs_p){ \ | ||
| 790 | - _hs_p = (UT_hash_handle*)((_hs_p->next) ? \ | ||
| 791 | - ((void*)((char*)(_hs_p->next) + \ | ||
| 792 | - (head)->hh.tbl->hho)) : NULL); \ | ||
| 793 | - } \ | ||
| 794 | - _hs_psize--; \ | ||
| 795 | - } else { \ | ||
| 796 | - _hs_e = _hs_q; \ | ||
| 797 | - _hs_q = (UT_hash_handle*)((_hs_q->next) ? \ | ||
| 798 | - ((void*)((char*)(_hs_q->next) + \ | ||
| 799 | - (head)->hh.tbl->hho)) : NULL); \ | ||
| 800 | - _hs_qsize--; \ | ||
| 801 | - } \ | ||
| 802 | - if ( _hs_tail ) { \ | ||
| 803 | - _hs_tail->next = ((_hs_e) ? \ | ||
| 804 | - ELMT_FROM_HH((head)->hh.tbl,_hs_e) : NULL); \ | ||
| 805 | - } else { \ | ||
| 806 | - _hs_list = _hs_e; \ | ||
| 807 | - } \ | ||
| 808 | - if (_hs_e) { \ | ||
| 809 | - _hs_e->prev = ((_hs_tail) ? \ | ||
| 810 | - ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL); \ | ||
| 811 | - } \ | ||
| 812 | - _hs_tail = _hs_e; \ | ||
| 813 | - } \ | ||
| 814 | - _hs_p = _hs_q; \ | ||
| 815 | - } \ | ||
| 816 | - if (_hs_tail){ \ | ||
| 817 | - _hs_tail->next = NULL; \ | ||
| 818 | - } \ | ||
| 819 | - if ( _hs_nmerges <= 1 ) { \ | ||
| 820 | - _hs_looping=0; \ | ||
| 821 | - (head)->hh.tbl->tail = _hs_tail; \ | ||
| 822 | - DECLTYPE_ASSIGN(head,ELMT_FROM_HH((head)->hh.tbl, _hs_list)); \ | ||
| 823 | - } \ | ||
| 824 | - _hs_insize *= 2; \ | ||
| 825 | - } \ | ||
| 826 | - HASH_FSCK(hh,head); \ | ||
| 827 | - } \ | ||
| 828 | -} while (0) | ||
| 829 | - | ||
| 830 | -/* This function selects items from one hash into another hash. | ||
| 831 | - * The end result is that the selected items have dual presence | ||
| 832 | - * in both hashes. There is no copy of the items made; rather | ||
| 833 | - * they are added into the new hash through a secondary hash | ||
| 834 | - * hash handle that must be present in the structure. */ | ||
| 835 | -#define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \ | ||
| 836 | -do { \ | ||
| 837 | - unsigned _src_bkt, _dst_bkt; \ | ||
| 838 | - void *_last_elt=NULL, *_elt; \ | ||
| 839 | - UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL; \ | ||
| 840 | - ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst)); \ | ||
| 841 | - if (src) { \ | ||
| 842 | - for(_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) { \ | ||
| 843 | - for(_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head; \ | ||
| 844 | - _src_hh; \ | ||
| 845 | - _src_hh = _src_hh->hh_next) { \ | ||
| 846 | - _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh); \ | ||
| 847 | - if (cond(_elt)) { \ | ||
| 848 | - _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho); \ | ||
| 849 | - _dst_hh->key = _src_hh->key; \ | ||
| 850 | - _dst_hh->keylen = _src_hh->keylen; \ | ||
| 851 | - _dst_hh->hashv = _src_hh->hashv; \ | ||
| 852 | - _dst_hh->prev = _last_elt; \ | ||
| 853 | - _dst_hh->next = NULL; \ | ||
| 854 | - if (_last_elt_hh) { _last_elt_hh->next = _elt; } \ | ||
| 855 | - if (!dst) { \ | ||
| 856 | - DECLTYPE_ASSIGN(dst,_elt); \ | ||
| 857 | - HASH_MAKE_TABLE(hh_dst,dst); \ | ||
| 858 | - } else { \ | ||
| 859 | - _dst_hh->tbl = (dst)->hh_dst.tbl; \ | ||
| 860 | - } \ | ||
| 861 | - HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt); \ | ||
| 862 | - HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt],_dst_hh); \ | ||
| 863 | - (dst)->hh_dst.tbl->num_items++; \ | ||
| 864 | - _last_elt = _elt; \ | ||
| 865 | - _last_elt_hh = _dst_hh; \ | ||
| 866 | - } \ | ||
| 867 | - } \ | ||
| 868 | - } \ | ||
| 869 | - } \ | ||
| 870 | - HASH_FSCK(hh_dst,dst); \ | ||
| 871 | -} while (0) | ||
| 872 | - | ||
| 873 | -#define HASH_CLEAR(hh,head) \ | ||
| 874 | -do { \ | ||
| 875 | - if (head) { \ | ||
| 876 | - uthash_free((head)->hh.tbl->buckets, \ | ||
| 877 | - (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket)); \ | ||
| 878 | - HASH_BLOOM_FREE((head)->hh.tbl); \ | ||
| 879 | - uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \ | ||
| 880 | - (head)=NULL; \ | ||
| 881 | - } \ | ||
| 882 | -} while(0) | ||
| 883 | - | ||
| 884 | -#define HASH_OVERHEAD(hh,head) \ | ||
| 885 | - (size_t)((((head)->hh.tbl->num_items * sizeof(UT_hash_handle)) + \ | ||
| 886 | - ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket)) + \ | ||
| 887 | - (sizeof(UT_hash_table)) + \ | ||
| 888 | - (HASH_BLOOM_BYTELEN))) | ||
| 889 | - | ||
| 890 | -#ifdef NO_DECLTYPE | ||
| 891 | -#define HASH_ITER(hh,head,el,tmp) \ | ||
| 892 | -for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL); \ | ||
| 893 | - el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL)) | ||
| 894 | -#else | ||
| 895 | -#define HASH_ITER(hh,head,el,tmp) \ | ||
| 896 | -for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL); \ | ||
| 897 | - el; (el)=(tmp),(tmp)=DECLTYPE(el)((tmp)?(tmp)->hh.next:NULL)) | ||
| 898 | -#endif | ||
| 899 | - | ||
| 900 | -/* obtain a count of items in the hash */ | ||
| 901 | -#define HASH_COUNT(head) HASH_CNT(hh,head) | ||
| 902 | -#define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0) | ||
| 903 | - | ||
| 904 | -typedef struct UT_hash_bucket { | ||
| 905 | - struct UT_hash_handle *hh_head; | ||
| 906 | - unsigned count; | ||
| 907 | - | ||
| 908 | - /* expand_mult is normally set to 0. In this situation, the max chain length | ||
| 909 | - * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If | ||
| 910 | - * the bucket's chain exceeds this length, bucket expansion is triggered). | ||
| 911 | - * However, setting expand_mult to a non-zero value delays bucket expansion | ||
| 912 | - * (that would be triggered by additions to this particular bucket) | ||
| 913 | - * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH. | ||
| 914 | - * (The multiplier is simply expand_mult+1). The whole idea of this | ||
| 915 | - * multiplier is to reduce bucket expansions, since they are expensive, in | ||
| 916 | - * situations where we know that a particular bucket tends to be overused. | ||
| 917 | - * It is better to let its chain length grow to a longer yet-still-bounded | ||
| 918 | - * value, than to do an O(n) bucket expansion too often. | ||
| 919 | - */ | ||
| 920 | - unsigned expand_mult; | ||
| 921 | - | ||
| 922 | -} UT_hash_bucket; | ||
| 923 | - | ||
| 924 | -/* random signature used only to find hash tables in external analysis */ | ||
| 925 | -#define HASH_SIGNATURE 0xa0111fe1 | ||
| 926 | -#define HASH_BLOOM_SIGNATURE 0xb12220f2 | ||
| 927 | - | ||
| 928 | -typedef struct UT_hash_table { | ||
| 929 | - UT_hash_bucket *buckets; | ||
| 930 | - unsigned num_buckets, log2_num_buckets; | ||
| 931 | - unsigned num_items; | ||
| 932 | - struct UT_hash_handle *tail; /* tail hh in app order, for fast append */ | ||
| 933 | - ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */ | ||
| 934 | - | ||
| 935 | - /* in an ideal situation (all buckets used equally), no bucket would have | ||
| 936 | - * more than ceil(#items/#buckets) items. that's the ideal chain length. */ | ||
| 937 | - unsigned ideal_chain_maxlen; | ||
| 938 | - | ||
| 939 | - /* nonideal_items is the number of items in the hash whose chain position | ||
| 940 | - * exceeds the ideal chain maxlen. these items pay the penalty for an uneven | ||
| 941 | - * hash distribution; reaching them in a chain traversal takes >ideal steps */ | ||
| 942 | - unsigned nonideal_items; | ||
| 943 | - | ||
| 944 | - /* ineffective expands occur when a bucket doubling was performed, but | ||
| 945 | - * afterward, more than half the items in the hash had nonideal chain | ||
| 946 | - * positions. If this happens on two consecutive expansions we inhibit any | ||
| 947 | - * further expansion, as it's not helping; this happens when the hash | ||
| 948 | - * function isn't a good fit for the key domain. When expansion is inhibited | ||
| 949 | - * the hash will still work, albeit no longer in constant time. */ | ||
| 950 | - unsigned ineff_expands, noexpand; | ||
| 951 | - | ||
| 952 | - uint32_t signature; /* used only to find hash tables in external analysis */ | ||
| 953 | -#ifdef HASH_BLOOM | ||
| 954 | - uint32_t bloom_sig; /* used only to test bloom exists in external analysis */ | ||
| 955 | - uint8_t *bloom_bv; | ||
| 956 | - char bloom_nbits; | ||
| 957 | -#endif | ||
| 958 | - | ||
| 959 | -} UT_hash_table; | ||
| 960 | - | ||
| 961 | -typedef struct UT_hash_handle { | ||
| 962 | - struct UT_hash_table *tbl; | ||
| 963 | - void *prev; /* prev element in app order */ | ||
| 964 | - void *next; /* next element in app order */ | ||
| 965 | - struct UT_hash_handle *hh_prev; /* previous hh in bucket order */ | ||
| 966 | - struct UT_hash_handle *hh_next; /* next hh in bucket order */ | ||
| 967 | - void *key; /* ptr to enclosing struct's key */ | ||
| 968 | - unsigned keylen; /* enclosing struct's key len */ | ||
| 969 | - unsigned hashv; /* result of hash-fcn(key) */ | ||
| 970 | -} UT_hash_handle; | ||
| 971 | - | ||
| 972 | -#endif /* UTHASH_H */ | ||
| 973 | -- | ||
| 974 | 2.15.1 | ||
| 975 | |||
diff --git a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb b/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb index 7554248e48..07440a2412 100644 --- a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb +++ b/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb | |||
| @@ -8,9 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20 \ | |||
| 8 | file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ | 8 | file://epl-v10;md5=8d383c379e91d20ba18a52c3e7d3a979 \ |
| 9 | file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ | 9 | file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \ |
| 10 | " | 10 | " |
| 11 | DEPENDS = "uthash" | ||
| 11 | 12 | ||
| 12 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ | 13 | SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ |
| 13 | file://build.patch \ | 14 | file://build.patch \ |
| 15 | file://0002-uthash-remove-in-tree-version.patch \ | ||
| 14 | file://mosquitto.service \ | 16 | file://mosquitto.service \ |
| 15 | file://mosquitto.init \ | 17 | file://mosquitto.init \ |
| 16 | " | 18 | " |
