From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by dpdk.org (Postfix) with ESMTP id 2137BB3BE for ; Tue, 12 Aug 2014 23:46:25 +0200 (CEST) Received: by mail-lb0-f170.google.com with SMTP id l4so5729855lbv.29 for ; Tue, 12 Aug 2014 14:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=KLHUljExnHpaNZvKYLsVmg1hXYIHPELprLqgoPqIP7c=; b=kh9af1jmvM2s5khtwz+uaVb+WJlSzepkw7F7YbfcPWkzRjWeGi9gFxMD5EsZDnXPdk TsmmA8Qdh0Hv/DS3y+Cxo5hVB0fvFtdLhxzkRZPa5u3LicjK2qyDkZD/E27+hCfBmV6D 8I1275XW2dBEoS2M2AH5YobshhB5FlkAgGZtKRWK3SCsgOv39KC175t+nc+aGDvNBiBP 1tYZ16dRahZZAkhSjVIToT5XiNG6Tu97JB493eGyBlRoVPQFQxgMG9k+79ZLJRSkh1wH exsNw2Zi8I7+muOT7sc470VVnzGY0mT+sqOIljkvA3Y9ucccSqM2/sr0nFj5U78eqD86 TQGQ== X-Received: by 10.152.121.7 with SMTP id lg7mr401578lab.98.1407880161523; Tue, 12 Aug 2014 14:49:21 -0700 (PDT) Received: from localhost.localdomain (h-79-136-64-87.na.cust.bahnhof.se. [79.136.64.87]) by mx.google.com with ESMTPSA id sc8sm24729288lbb.27.2014.08.12.14.49.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Aug 2014 14:49:20 -0700 (PDT) From: Tomas Vestelind To: dev@dpdk.org Date: Tue, 12 Aug 2014 23:47:33 +0200 Message-Id: <1407880053-14650-1-git-send-email-tomas.vestelind@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [dpdk-dev] [PATCH] hash: added rte_hash_keys to extract all keys X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2014 21:46:25 -0000 I added a function which extracts all the configured keys in a hash map. This is good to have when debugging and printing data store in hash maps. Signed-off-by: Tomas Vestelind --- lib/librte_hash/rte_hash.c | 26 ++++++++++++++++++++++++++ lib/librte_hash/rte_hash.h | 15 +++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/lib/librte_hash/rte_hash.c b/lib/librte_hash/rte_hash.c index d02b6b4..2108c4f 100644 --- a/lib/librte_hash/rte_hash.c +++ b/lib/librte_hash/rte_hash.c @@ -481,3 +481,29 @@ rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys, return 0; } + +unsigned int +rte_hash_keys(const struct rte_hash *h, void *keys) +{ + unsigned int found_keys = 0; + unsigned int bucket, entry; + + /* Go through each bucket and all its entries */ + for (bucket = 0; bucket < h->num_buckets; bucket++) { + const hash_sig_t *sig = get_sig_tbl_bucket(h, bucket); + + for (entry = 0; entry < h->bucket_entries; entry++) { + /* If the signature is valid, find and save the corresponding key */ + if (sig[entry] != NULL_SIGNATURE) { + uint8_t *key_bucket = get_key_tbl_bucket(h, bucket); + void *key = get_key_from_bucket(h, key_bucket, entry); + rte_memcpy(keys, key, h->key_len); + + keys = (uint8_t* )keys + h->key_len; + found_keys++; + } + } + } + + return found_keys; +} diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h index 2ecaf1a..e0fb28f 100644 --- a/lib/librte_hash/rte_hash.h +++ b/lib/librte_hash/rte_hash.h @@ -303,6 +303,21 @@ rte_hash_hash(const struct rte_hash *h, const void *key) int rte_hash_lookup_bulk(const struct rte_hash *h, const void **keys, uint32_t num_keys, int32_t *positions); + +/** + * Copy the hash table keys to the supplied list of keys. + * This operation is multi-thread safe. + * + * @param h + * Hash table to look in. + * @param keys + * A pointer to a list of where keys will be written. + * Must be large enough to fit a potentially full hash map. + * @return + * The number of found keys. + */ +unsigned int +rte_hash_keys(const struct rte_hash *h, void *keys); #ifdef __cplusplus } #endif -- 1.7.10.4