X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fmhash.c;h=f0f1aa470d70cbb8cafe1ddf585810a96b0195e0;hb=dfd426c2c83f69e95fe8dab5b4827825230f1d7c;hp=791aa36024bd87224332700f7fe66c80ad62a310;hpb=2180baccc1428ffbd64a8312f3c983791a0771ab;p=vpp.git diff --git a/src/vppinfra/mhash.c b/src/vppinfra/mhash.c index 791aa36024b..f0f1aa470d7 100644 --- a/src/vppinfra/mhash.c +++ b/src/vppinfra/mhash.c @@ -164,7 +164,7 @@ mhash_sanitize_hash_user (mhash_t * mh) h->user = pointer_to_uword (mh); } -void +__clib_export void mhash_init (mhash_t * h, uword n_value_bytes, uword n_key_bytes) { static struct @@ -243,7 +243,7 @@ mhash_set_tmp_key (mhash_t * h, const void *key) return ~0; } -hash_pair_t * +__clib_export hash_pair_t * mhash_get_pair (mhash_t * h, const void *key) { uword ikey; @@ -260,7 +260,7 @@ typedef struct vec_header_t vec; } mhash_string_key_t; -uword +__clib_export uword mhash_set_mem (mhash_t * h, void *key, uword * new_value, uword * old_value) { u8 *k; @@ -295,7 +295,7 @@ mhash_set_mem (mhash_t * h, void *key, uword * new_value, uword * old_value) { i = h->key_vector_free_indices[l - 1]; k = vec_elt_at_index (h->key_vector_or_heap, i); - _vec_len (h->key_vector_free_indices) = l - 1; + vec_set_len (h->key_vector_free_indices, l - 1); } else { @@ -332,17 +332,17 @@ mhash_set_mem (mhash_t * h, void *key, uword * new_value, uword * old_value) if (key_alloc_from_free_list) { h->key_vector_free_indices[l] = i; - _vec_len (h->key_vector_free_indices) = l + 1; + vec_set_len (h->key_vector_free_indices, l + 1); } else - _vec_len (h->key_vector_or_heap) -= h->n_key_bytes; + vec_dec_len (h->key_vector_or_heap, h->n_key_bytes); } } return ikey; } -uword +__clib_export uword mhash_unset (mhash_t * h, void *key, uword * old_value) { hash_pair_t *p;