Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: fix half-open cleanup
[vpp.git]
/
src
/
vppinfra
/
hash.h
diff --git
a/src/vppinfra/hash.h
b/src/vppinfra/hash.h
index
36a7006
..
e4a65d2
100644
(file)
--- a/
src/vppinfra/hash.h
+++ b/
src/vppinfra/hash.h
@@
-276,11
+276,11
@@
uword hash_bytes (void *v);
/* Public inline function allocate and copy key to use in hash for pointer key */
always_inline void
/* Public inline function allocate and copy key to use in hash for pointer key */
always_inline void
-hash_set_mem_alloc (uword ** h, void *key, uword v)
+hash_set_mem_alloc (uword ** h,
const
void *key, uword v)
{
size_t ksz = hash_header (*h)->user;
void *copy = clib_mem_alloc (ksz);
{
size_t ksz = hash_header (*h)->user;
void *copy = clib_mem_alloc (ksz);
- clib_memcpy (copy, key, ksz);
+ clib_memcpy
_fast
(copy, key, ksz);
hash_set_mem (*h, copy, v);
}
hash_set_mem (*h, copy, v);
}
@@
-292,14
+292,14
@@
hash_set_mem_alloc (uword ** h, void *key, uword v)
/* Public inline function to unset pointer key and then free the key memory */
always_inline void
/* Public inline function to unset pointer key and then free the key memory */
always_inline void
-hash_unset_mem_free (uword ** h, void *key)
+hash_unset_mem_free (uword ** h,
const
void *key)
{
hash_pair_t *hp = hash_get_pair_mem (*h, key);
if (PREDICT_TRUE (hp != NULL))
{
{
hash_pair_t *hp = hash_get_pair_mem (*h, key);
if (PREDICT_TRUE (hp != NULL))
{
-
key
= uword_to_pointer (hp->key, void *);
- hash_unset_mem (*h,
key
);
- clib_mem_free (
key
);
+
void *_k
= uword_to_pointer (hp->key, void *);
+ hash_unset_mem (*h,
_k
);
+ clib_mem_free (
_k
);
}
}
}
}
@@
-496,7
+496,7
@@
hash_set_value_bytes (hash_t * h, uword value_bytes)
_format_pair,_format_pair_arg) \
({ \
hash_t _h; \
_format_pair,_format_pair_arg) \
({ \
hash_t _h; \
-
memset (&_h, 0, sizeof (_h));
\
+
clib_memset (&_h, 0, sizeof (_h));
\
_h.user = (_user); \
_h.key_sum = (hash_key_sum_function_t *) (_key_sum); \
_h.key_equal = (_key_equal); \
_h.user = (_user); \
_h.key_sum = (hash_key_sum_function_t *) (_key_sum); \
_h.key_equal = (_key_equal); \