Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 42570,
    "url": "http://patches.dpdk.org/api/patches/42570/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1530906406-289697-5-git-send-email-yipeng1.wang@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<1530906406-289697-5-git-send-email-yipeng1.wang@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1530906406-289697-5-git-send-email-yipeng1.wang@intel.com",
    "date": "2018-07-06T19:46:42",
    "name": "[v3,4/8] hash: make duplicated code into functions",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "18306ab4215a0e80567b23d4cafffa7691975efb",
    "submitter": {
        "id": 754,
        "url": "http://patches.dpdk.org/api/people/754/?format=api",
        "name": "Wang, Yipeng1",
        "email": "yipeng1.wang@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1530906406-289697-5-git-send-email-yipeng1.wang@intel.com/mbox/",
    "series": [
        {
            "id": 463,
            "url": "http://patches.dpdk.org/api/series/463/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=463",
            "date": "2018-07-06T19:46:38",
            "name": "Add read-write concurrency to rte_hash library",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/463/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/42570/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/42570/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D9A711BE43;\n\tSat,  7 Jul 2018 04:54:09 +0200 (CEST)",
            "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id BCC5F1BE22\n\tfor <dev@dpdk.org>; Sat,  7 Jul 2018 04:53:58 +0200 (CEST)",
            "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Jul 2018 19:53:55 -0700",
            "from skx-yipeng.jf.intel.com ([10.54.81.175])\n\tby FMSMGA003.fm.intel.com with ESMTP; 06 Jul 2018 19:53:44 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.51,319,1526367600\"; d=\"scan'208\";a=\"62888545\"",
        "From": "Yipeng Wang <yipeng1.wang@intel.com>",
        "To": "pablo.de.lara.guarch@intel.com",
        "Cc": "dev@dpdk.org, yipeng1.wang@intel.com, bruce.richardson@intel.com,\n\thonnappa.nagarahalli@arm.com, vguvva@caviumnetworks.com,\n\tbrijesh.s.singh@gmail.com",
        "Date": "Fri,  6 Jul 2018 12:46:42 -0700",
        "Message-Id": "<1530906406-289697-5-git-send-email-yipeng1.wang@intel.com>",
        "X-Mailer": "git-send-email 2.7.4",
        "In-Reply-To": "<1530906406-289697-1-git-send-email-yipeng1.wang@intel.com>",
        "References": "<1528455078-328182-1-git-send-email-yipeng1.wang@intel.com>\n\t<1530906406-289697-1-git-send-email-yipeng1.wang@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v3 4/8] hash: make duplicated code into functions",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "This commit refactors the hash table lookup/add/del code\nto remove some code duplication. Processing on primary bucket can\nalso apply to secondary bucket with same code.\n\nSigned-off-by: Yipeng Wang <yipeng1.wang@intel.com>\n---\n lib/librte_hash/rte_cuckoo_hash.c | 186 +++++++++++++++++++-------------------\n 1 file changed, 91 insertions(+), 95 deletions(-)",
    "diff": "diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c\nindex 11602af..109da92 100644\n--- a/lib/librte_hash/rte_cuckoo_hash.c\n+++ b/lib/librte_hash/rte_cuckoo_hash.c\n@@ -485,6 +485,33 @@ enqueue_slot_back(const struct rte_hash *h,\n \t\trte_ring_sp_enqueue(h->free_slots, slot_id);\n }\n \n+/* Search a key from bucket and update its data */\n+static inline int32_t\n+search_and_update(const struct rte_hash *h, void *data, const void *key,\n+\tstruct rte_hash_bucket *bkt, hash_sig_t sig, hash_sig_t alt_hash)\n+{\n+\tint i;\n+\tstruct rte_hash_key *k, *keys = h->key_store;\n+\n+\tfor (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {\n+\t\tif (bkt->sig_current[i] == sig &&\n+\t\t\t\tbkt->sig_alt[i] == alt_hash) {\n+\t\t\tk = (struct rte_hash_key *) ((char *)keys +\n+\t\t\t\t\tbkt->key_idx[i] * h->key_entry_size);\n+\t\t\tif (rte_hash_cmp_eq(key, k->key, h) == 0) {\n+\t\t\t\t/* Update data */\n+\t\t\t\tk->pdata = data;\n+\t\t\t\t/*\n+\t\t\t\t * Return index where key is stored,\n+\t\t\t\t * subtracting the first dummy index\n+\t\t\t\t */\n+\t\t\t\treturn bkt->key_idx[i] - 1;\n+\t\t\t}\n+\t\t}\n+\t}\n+\treturn -1;\n+}\n+\n static inline int32_t\n __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \t\t\t\t\t\thash_sig_t sig, void *data)\n@@ -493,7 +520,7 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \tuint32_t prim_bucket_idx, sec_bucket_idx;\n \tunsigned i;\n \tstruct rte_hash_bucket *prim_bkt, *sec_bkt;\n-\tstruct rte_hash_key *new_k, *k, *keys = h->key_store;\n+\tstruct rte_hash_key *new_k, *keys = h->key_store;\n \tvoid *slot_id = NULL;\n \tuint32_t new_idx;\n \tint ret;\n@@ -547,46 +574,14 @@ __rte_hash_add_key_with_hash(const struct rte_hash *h, const void *key,\n \tnew_idx = (uint32_t)((uintptr_t) slot_id);\n \n \t/* Check if key is already inserted in primary location */\n-\tfor (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {\n-\t\tif (prim_bkt->sig_current[i] == sig &&\n-\t\t\t\tprim_bkt->sig_alt[i] == alt_hash) {\n-\t\t\tk = (struct rte_hash_key *) ((char *)keys +\n-\t\t\t\t\tprim_bkt->key_idx[i] * h->key_entry_size);\n-\t\t\tif (rte_hash_cmp_eq(key, k->key, h) == 0) {\n-\t\t\t\t/* Enqueue index of free slot back in the ring. */\n-\t\t\t\tenqueue_slot_back(h, cached_free_slots, slot_id);\n-\t\t\t\t/* Update data */\n-\t\t\t\tk->pdata = data;\n-\t\t\t\t/*\n-\t\t\t\t * Return index where key is stored,\n-\t\t\t\t * subtracting the first dummy index\n-\t\t\t\t */\n-\t\t\t\tret = prim_bkt->key_idx[i] - 1;\n-\t\t\t\tgoto failure;\n-\t\t\t}\n-\t\t}\n-\t}\n+\tret = search_and_update(h, data, key, prim_bkt, sig, alt_hash);\n+\tif (ret != -1)\n+\t\tgoto failure;\n \n \t/* Check if key is already inserted in secondary location */\n-\tfor (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {\n-\t\tif (sec_bkt->sig_alt[i] == sig &&\n-\t\t\t\tsec_bkt->sig_current[i] == alt_hash) {\n-\t\t\tk = (struct rte_hash_key *) ((char *)keys +\n-\t\t\t\t\tsec_bkt->key_idx[i] * h->key_entry_size);\n-\t\t\tif (rte_hash_cmp_eq(key, k->key, h) == 0) {\n-\t\t\t\t/* Enqueue index of free slot back in the ring. */\n-\t\t\t\tenqueue_slot_back(h, cached_free_slots, slot_id);\n-\t\t\t\t/* Update data */\n-\t\t\t\tk->pdata = data;\n-\t\t\t\t/*\n-\t\t\t\t * Return index where key is stored,\n-\t\t\t\t * subtracting the first dummy index\n-\t\t\t\t */\n-\t\t\t\tret = sec_bkt->key_idx[i] - 1;\n-\t\t\t\tgoto failure;\n-\t\t\t}\n-\t\t}\n-\t}\n+\tret = search_and_update(h, data, key, sec_bkt, alt_hash, sig);\n+\tif (ret != -1)\n+\t\tgoto failure;\n \n \t/* Copy key */\n \trte_memcpy(new_k->key, key, h->key_len);\n@@ -699,20 +694,15 @@ rte_hash_add_key_data(const struct rte_hash *h, const void *key, void *data)\n \telse\n \t\treturn ret;\n }\n+\n+/* Search one bucket to find the match key */\n static inline int32_t\n-__rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n-\t\t\t\t\thash_sig_t sig, void **data)\n+search_one_bucket(const struct rte_hash *h, const void *key, hash_sig_t sig,\n+\t\t\tvoid **data, const struct rte_hash_bucket *bkt)\n {\n-\tuint32_t bucket_idx;\n-\thash_sig_t alt_hash;\n-\tunsigned i;\n-\tstruct rte_hash_bucket *bkt;\n+\tint i;\n \tstruct rte_hash_key *k, *keys = h->key_store;\n \n-\tbucket_idx = sig & h->bucket_bitmask;\n-\tbkt = &h->buckets[bucket_idx];\n-\n-\t/* Check if key is in primary location */\n \tfor (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {\n \t\tif (bkt->sig_current[i] == sig &&\n \t\t\t\tbkt->key_idx[i] != EMPTY_SLOT) {\n@@ -729,6 +719,26 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n \t\t\t}\n \t\t}\n \t}\n+\treturn -1;\n+}\n+\n+static inline int32_t\n+__rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n+\t\t\t\t\thash_sig_t sig, void **data)\n+{\n+\tuint32_t bucket_idx;\n+\thash_sig_t alt_hash;\n+\tstruct rte_hash_bucket *bkt;\n+\tint ret;\n+\n+\tbucket_idx = sig & h->bucket_bitmask;\n+\tbkt = &h->buckets[bucket_idx];\n+\n+\n+\t/* Check if key is in primary location */\n+\tret = search_one_bucket(h, key, sig, data, bkt);\n+\tif (ret != -1)\n+\t\treturn ret;\n \n \t/* Calculate secondary hash */\n \talt_hash = rte_hash_secondary_hash(sig);\n@@ -736,22 +746,9 @@ __rte_hash_lookup_with_hash(const struct rte_hash *h, const void *key,\n \tbkt = &h->buckets[bucket_idx];\n \n \t/* Check if key is in secondary location */\n-\tfor (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {\n-\t\tif (bkt->sig_current[i] == alt_hash &&\n-\t\t\t\tbkt->sig_alt[i] == sig) {\n-\t\t\tk = (struct rte_hash_key *) ((char *)keys +\n-\t\t\t\t\tbkt->key_idx[i] * h->key_entry_size);\n-\t\t\tif (rte_hash_cmp_eq(key, k->key, h) == 0) {\n-\t\t\t\tif (data != NULL)\n-\t\t\t\t\t*data = k->pdata;\n-\t\t\t\t/*\n-\t\t\t\t * Return index where key is stored,\n-\t\t\t\t * subtracting the first dummy index\n-\t\t\t\t */\n-\t\t\t\treturn bkt->key_idx[i] - 1;\n-\t\t\t}\n-\t\t}\n-\t}\n+\tret = search_one_bucket(h, key, alt_hash, data, bkt);\n+\tif (ret != -1)\n+\t\treturn ret;\n \n \treturn -ENOENT;\n }\n@@ -815,20 +812,15 @@ remove_entry(const struct rte_hash *h, struct rte_hash_bucket *bkt, unsigned i)\n \t}\n }\n \n+/* Search one bucket and remove the matched key */\n static inline int32_t\n-__rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key,\n-\t\t\t\t\t\thash_sig_t sig)\n+search_and_remove(const struct rte_hash *h, const void *key,\n+\t\t\tstruct rte_hash_bucket *bkt, hash_sig_t sig)\n {\n-\tuint32_t bucket_idx;\n-\thash_sig_t alt_hash;\n-\tunsigned i;\n-\tstruct rte_hash_bucket *bkt;\n \tstruct rte_hash_key *k, *keys = h->key_store;\n+\tunsigned int i;\n \tint32_t ret;\n \n-\tbucket_idx = sig & h->bucket_bitmask;\n-\tbkt = &h->buckets[bucket_idx];\n-\n \t/* Check if key is in primary location */\n \tfor (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {\n \t\tif (bkt->sig_current[i] == sig &&\n@@ -838,41 +830,45 @@ __rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key,\n \t\t\tif (rte_hash_cmp_eq(key, k->key, h) == 0) {\n \t\t\t\tremove_entry(h, bkt, i);\n \n+\t\t\t\tret = bkt->key_idx[i] - 1;\n+\t\t\t\tbkt->key_idx[i] = EMPTY_SLOT;\n \t\t\t\t/*\n \t\t\t\t * Return index where key is stored,\n \t\t\t\t * subtracting the first dummy index\n \t\t\t\t */\n-\t\t\t\tret = bkt->key_idx[i] - 1;\n-\t\t\t\tbkt->key_idx[i] = EMPTY_SLOT;\n \t\t\t\treturn ret;\n \t\t\t}\n \t\t}\n \t}\n+\treturn -1;\n+}\n+\n+static inline int32_t\n+__rte_hash_del_key_with_hash(const struct rte_hash *h, const void *key,\n+\t\t\t\t\t\thash_sig_t sig)\n+{\n+\tuint32_t bucket_idx;\n+\thash_sig_t alt_hash;\n+\tstruct rte_hash_bucket *bkt;\n+\tint32_t ret;\n+\n+\tbucket_idx = sig & h->bucket_bitmask;\n+\tbkt = &h->buckets[bucket_idx];\n+\n+\t/* look for key in primary bucket */\n+\tret = search_and_remove(h, key, bkt, sig);\n+\tif (ret != -1)\n+\t\treturn ret;\n \n \t/* Calculate secondary hash */\n \talt_hash = rte_hash_secondary_hash(sig);\n \tbucket_idx = alt_hash & h->bucket_bitmask;\n \tbkt = &h->buckets[bucket_idx];\n \n-\t/* Check if key is in secondary location */\n-\tfor (i = 0; i < RTE_HASH_BUCKET_ENTRIES; i++) {\n-\t\tif (bkt->sig_current[i] == alt_hash &&\n-\t\t\t\tbkt->key_idx[i] != EMPTY_SLOT) {\n-\t\t\tk = (struct rte_hash_key *) ((char *)keys +\n-\t\t\t\t\tbkt->key_idx[i] * h->key_entry_size);\n-\t\t\tif (rte_hash_cmp_eq(key, k->key, h) == 0) {\n-\t\t\t\tremove_entry(h, bkt, i);\n-\n-\t\t\t\t/*\n-\t\t\t\t * Return index where key is stored,\n-\t\t\t\t * subtracting the first dummy index\n-\t\t\t\t */\n-\t\t\t\tret = bkt->key_idx[i] - 1;\n-\t\t\t\tbkt->key_idx[i] = EMPTY_SLOT;\n-\t\t\t\treturn ret;\n-\t\t\t}\n-\t\t}\n-\t}\n+\t/* look for key in secondary bucket */\n+\tret = search_and_remove(h, key, bkt, alt_hash);\n+\tif (ret != -1)\n+\t\treturn ret;\n \n \treturn -ENOENT;\n }\n",
    "prefixes": [
        "v3",
        "4/8"
    ]
}