andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libglusterfs/src/dict.{c,h}: Introduce dict_setn, dict_addn, dict_addn and others.

Browse Source 
They all take as a parameter the key length, instead of strlen() it.
In most cases, we know the key length, we just never bothered to save and pass it along.
(We most likely sprintf'ed it earlier and the return value could have been used).

A more interesting addition is dict_set_nstrn() [horrible name. Ideas are welcome].
It accepts both the string length and the key length and avoids strlen() both.
Some of it can be calculated on compile-time, btw.
For example:
dict_set_str (dict, "key", "all");
Should become:
dict_set_nstrn (dict, "key", sizeof ("key"), "all", sizeof ("all"));

Compile-tested only!

Change-Id: Ic2667f445f6c2e22e279505f5ad435788b4b668c
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
This commit is contained in:
Yaniv Kaul 2018-08-17 22:29:05 +03:00 committed by Amar Tumballi
parent c416327b31
commit b76a84be69
3 changed files with 152 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
libglusterfs/src/dict.c
View File

@ -490,6 +490,16 @@ int32_t
dict_set (dict_t *this,
char *key,
data_t *value)
{
const int keylen = strlen(key);
return dict_setn(this, key, keylen, value);
}
int32_t
dict_setn (dict_t *this,
char *key,
const int keylen,
data_t *value)
{
int32_t ret;
uint32_t key_hash = 0;
@ -502,7 +512,7 @@ dict_set (dict_t *this,
}
if (key) {
key_hash = SuperFastHash (key, strlen(key));
key_hash = SuperFastHash (key, keylen);
}
LOCK (&this->lock);
@ -517,6 +527,13 @@ dict_set (dict_t *this,
int32_t
dict_add (dict_t *this, char *key, data_t *value)
{
const int keylen = strlen (key);
return dict_addn(this, key, keylen, value);
}
int32_t
dict_addn (dict_t *this, char *key, const int keylen, data_t *value)
{
int32_t ret;
uint32_t key_hash = 0;
@ -529,7 +546,7 @@ dict_add (dict_t *this, char *key, data_t *value)
}
if (key) {
key_hash = SuperFastHash (key, strlen(key));
key_hash = SuperFastHash (key, keylen);
}
LOCK (&this->lock);
@ -544,6 +561,13 @@ dict_add (dict_t *this, char *key, data_t *value)
data_t *
dict_get (dict_t *this, char *key)
{
const int keylen = strlen(key);
return dict_getn(this, key, keylen);
}
data_t *
dict_getn (dict_t *this, char *key, const int keylen)
{
data_pair_t *pair;
uint32_t hash;
@ -555,7 +579,7 @@ dict_get (dict_t *this, char *key)
return NULL;
}
hash = SuperFastHash (key, strlen (key));
hash = SuperFastHash (key, keylen);
LOCK (&this->lock);
{
@ -591,6 +615,13 @@ dict_key_count (dict_t *this)
void
dict_del (dict_t *this, char *key)
{
const int keylen = strlen(key);
return dict_deln(this, key, keylen);
}
void
dict_deln (dict_t *this, char *key, const int keylen)
{
int hashval = 0;
uint32_t hash;
@ -601,7 +632,7 @@ dict_del (dict_t *this, char *key)
return;
}
hash = SuperFastHash (key, strlen (key));
hash = SuperFastHash (key, keylen);
LOCK (&this->lock);
@ -1002,6 +1033,28 @@ str_to_data (char *value)
}
data_t *
strn_to_data (char *value, const int vallen)
{
if (!value) {
gf_msg_callingfn ("dict", GF_LOG_WARNING, EINVAL,
LG_MSG_INVALID_ARG, "value is NULL");
return NULL;
}
data_t *data = get_new_data ();
if (!data) {
return NULL;
}
data->len = vallen + 1;
data->data_type = GF_DATA_TYPE_STR;
data->data = value;
data->is_static = 1;
return data;
}
static data_t *
data_from_dynstr (char *value)
{
if (!value) {
@ -1506,6 +1559,13 @@ fail:
int
dict_get_with_ref (dict_t *this, char *key, data_t **data)
{
const int keylen = strlen(key);
return dict_get_with_refn(this, key, keylen, data);
}
int
dict_get_with_refn (dict_t *this, char *key, const int keylen, data_t **data)
{
data_pair_t * pair = NULL;
int ret = -ENOENT;
@ -1519,7 +1579,7 @@ dict_get_with_ref (dict_t *this, char *key, data_t **data)
goto err;
}
hash = SuperFastHash (key, strlen (key));
hash = SuperFastHash (key, keylen);
LOCK (&this->lock);
{
@ -2465,6 +2525,31 @@ err:
return ret;
}
/* Get string - with known key length */
int
dict_get_strn (dict_t *this, char *key, const int keylen, char **str)
{
data_t * data = NULL;
int ret = -EINVAL;
if (!this || !key || !str) {
goto err;
}
ret = dict_get_with_refn (this, key, keylen, &data);
if (ret < 0) {
goto err;
}
VALIDATE_DATA_AND_LOG(data, GF_DATA_TYPE_STR, key, -EINVAL);
*str = data->data;
err:
if (data)
data_unref (data);
return ret;
}
int
dict_get_str (dict_t *this, char *key, char **str)
@ -2511,6 +2596,48 @@ err:
return ret;
}
/* Set string - with known key length */
int
dict_set_strn (dict_t *this, char *key, const int keylen, char *str)
{
data_t * data = NULL;
int ret = 0;
data = str_to_data (str);
if (!data) {
ret = -EINVAL;
goto err;
}
ret = dict_setn (this, key, keylen, data);
if (ret < 0)
data_destroy (data);
err:
return ret;
}
/* Set string - with known key length and known value length */
int
dict_set_nstrn (dict_t *this, char *key, const int keylen, char *str, const int vallen)
{
data_t * data = NULL;
int ret = 0;
data = strn_to_data (str, vallen);
if (!data) {
ret = -EINVAL;
goto err;
}
ret = dict_setn (this, key, keylen, data);
if (ret < 0)
data_destroy (data);
err:
return ret;
}
int
dict_set_dynstr_with_alloc (dict_t *this, char *key, const char *str)
{
@ -2530,6 +2657,13 @@ dict_set_dynstr_with_alloc (dict_t *this, char *key, const char *str)
int
dict_set_dynstr (dict_t *this, char *key, char *str)
{
const int keylen = strlen(key);
return dict_set_dynstrn(this, key, keylen, str);
}
int
dict_set_dynstrn (dict_t *this, char *key, const int keylen, char *str)
{
data_t * data = NULL;
int ret = 0;
@ -2540,7 +2674,7 @@ dict_set_dynstr (dict_t *this, char *key, char *str)
goto err;
}
ret = dict_set (this, key, data);
ret = dict_setn (this, key, keylen, data);
if (ret < 0)
data_destroy (data);

12
libglusterfs/src/dict.h
View File

@ -110,12 +110,16 @@ void data_destroy (data_t *data);
/* function to set a key/value pair (overwrite existing if matches the key */
int32_t dict_set (dict_t *this, char *key, data_t *value);
int32_t dict_setn (dict_t *this, char *key, const int keylen, data_t *value);
/* function to set a new key/value pair (without checking for duplicate) */
int32_t dict_add (dict_t *this, char *key, data_t *value);
int32_t dict_addn (dict_t *this, char *key, const int keylen, data_t *value);
int dict_get_with_ref (dict_t *this, char *key, data_t **data);
int dict_get_with_refn (dict_t *this, char *key, const int keylen, data_t **data);
data_t *dict_get (dict_t *this, char *key);
data_t *dict_getn (dict_t *this, char *key, const int keylen);
void dict_del (dict_t *this, char *key);
void dict_deln (dict_t *this, char *key, const int keylen);
int dict_reset (dict_t *dict);
int dict_key_count (dict_t *this);
@ -137,7 +141,7 @@ int32_t dict_lookup (dict_t *this, char *key, data_t **data);
*/
data_t *int_to_data (int64_t value);
data_t *str_to_data (char *value);
data_t *data_from_dynstr (char *value);
data_t *strn_to_data (char *value, const int vallen);
data_t *data_from_dynptr (void *value, int32_t len);
data_t *bin_to_data (void *value, int32_t len);
data_t *static_str_to_data (char *value);
@ -250,10 +254,14 @@ GF_MUST_CHECK int dict_set_static_bin (dict_t *this, char *key, void *ptr, size_
GF_MUST_CHECK int dict_set_option (dict_t *this, char *key, char *str);
GF_MUST_CHECK int dict_set_str (dict_t *this, char *key, char *str);
GF_MUST_CHECK int dict_set_strn (dict_t *this, char *key, const int keylen, char *str);
GF_MUST_CHECK int dict_set_nstrn (dict_t *this, char *key, const int keylen, char *str, const int vallen);
GF_MUST_CHECK int dict_set_dynstr (dict_t *this, char *key, char *str);
GF_MUST_CHECK int dict_set_dynstrn (dict_t *this, char *key, const int keylen, char *str);
GF_MUST_CHECK int dict_set_dynstr_with_alloc (dict_t *this, char *key, const char *str);
GF_MUST_CHECK int dict_add_dynstr_with_alloc (dict_t *this, char *key, char *str);
GF_MUST_CHECK int dict_get_str (dict_t *this, char *key, char **str);
GF_MUST_CHECK int dict_get_strn (dict_t *this, char *key, const int keylen, char **str);
GF_MUST_CHECK int dict_get_str_boolean (dict_t *this, char *key, int default_val);
GF_MUST_CHECK int dict_rename_key (dict_t *this, char *key, char *replace_key);

2
libglusterfs/src/libglusterfs.sym
View File

@ -410,6 +410,8 @@ dict_set_int8
dict_set_static_bin
dict_set_static_ptr
dict_set_str
dict_set_strn
dict_set_nstrn
dict_set_uint32
dict_set_uint64
dict_set_flag