All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jukka Rissanen <jukka.rissanen@linux.intel.com>
To: ell@lists.01.org
Subject: [PATCH 7/9] unit: hashmap: Re-entrancy tests added
Date: Tue, 10 Feb 2015 16:42:22 +0200	[thread overview]
Message-ID: <1423579344-10933-8-git-send-email-jukka.rissanen@linux.intel.com> (raw)
In-Reply-To: <1423579344-10933-1-git-send-email-jukka.rissanen@linux.intel.com>

[-- Attachment #1: Type: text/plain, Size: 2464 bytes --]

Check that we can add and remove items from hash while inside
foreach callback.
---
 unit/test-hashmap.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/unit/test-hashmap.c b/unit/test-hashmap.c
index 75c249c..51d03ba 100644
--- a/unit/test-hashmap.c
+++ b/unit/test-hashmap.c
@@ -184,11 +184,92 @@ static void test_str(const void *test_data)
 	l_hashmap_destroy(hashmap, NULL);
 }
 
+static void foreach_cb(const void *key, void *value, void *user_data)
+{
+	struct l_hashmap *hashmap = user_data;
+	static bool removed, insert, conflict;
+	unsigned int entries;
+	char *str, *mykey = "b";
+	bool ret;
+
+	if (!removed) {
+		printf("Removing entry in foreach\n");
+
+		entries = l_hashmap_size(hashmap);
+
+		str = l_hashmap_remove(hashmap, "a");
+		assert(str);
+
+		assert(!l_hashmap_lookup(hashmap, "a"));
+
+		assert(entries == (l_hashmap_size(hashmap) + 1));
+
+		removed = true;
+	}
+
+	if (!insert) {
+		printf("Adding entry in foreach\n");
+
+		entries = l_hashmap_size(hashmap);
+
+		ret = l_hashmap_insert(hashmap, mykey, mykey);
+		assert(ret);
+
+		assert(entries == (l_hashmap_size(hashmap) - 1));
+
+		insert = true;
+	}
+
+	if (!conflict) {
+		printf("Adding conflicting entry in foreach\n");
+
+		entries = l_hashmap_size(hashmap);
+
+		assert(l_hashmap_lookup(hashmap, mykey));
+
+		ret = l_hashmap_insert(hashmap, mykey, mykey);
+		assert(ret);
+
+		assert(entries == l_hashmap_size(hashmap));
+
+		conflict = true;
+	}
+}
+
+static void test_reentrant(const void *test_data)
+{
+	struct l_hashmap *hashmap;
+	const void *ptr;
+	const char **itr, *strings[] = {
+		"hello",
+		"world",
+		"a",
+		"a longer key here",
+		NULL
+	};
+
+	hashmap = l_hashmap_string_new();
+	assert(hashmap);
+	assert(l_hashmap_size(hashmap) == 0);
+	assert(l_hashmap_isempty(hashmap));
+
+	for (itr = strings; *itr != NULL; itr++) {
+		assert(l_hashmap_insert(hashmap, *itr, itr));
+		ptr = l_hashmap_lookup(hashmap, *itr);
+		assert(ptr == itr);
+	}
+
+	l_hashmap_foreach(hashmap, foreach_cb, hashmap);
+
+	l_hashmap_destroy(hashmap, NULL);
+}
+
 int main(int argc, char *argv[])
 {
 	l_test_init(&argc, &argv);
 
 	l_test_add("Pointer Test", test_ptr, NULL);
 	l_test_add("String Test", test_str, NULL);
+	l_test_add("Re-entrant Test", test_reentrant, NULL);
 	return l_test_run();
 }
-- 
1.8.3.1


  parent reply	other threads:[~2015-02-10 14:42 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-10 14:42 [PATCH 0/9] hashmap fixes Jukka Rissanen
2015-02-10 14:42 ` [PATCH 1/9] hashmap: Add value free function Jukka Rissanen
2015-02-10 14:42 ` [PATCH 2/9] hashmap: Call user supplied value free function in destroy Jukka Rissanen
2015-02-10 19:07   ` Denis Kenzior
2015-02-10 14:42 ` [PATCH 3/9] hashmap: Call user supplied value free function in insert Jukka Rissanen
2015-02-10 19:18   ` Denis Kenzior
2015-02-11  9:27     ` Patrik Flykt
2015-02-11 11:04       ` Tomasz Bursztyka
2015-02-11 13:50       ` Denis Kenzior
2015-02-10 14:42 ` [PATCH 4/9] unit: hashmap: Add value free hash entry test Jukka Rissanen
2015-02-10 14:42 ` [PATCH 5/9] unit: hashmap: Add replace " Jukka Rissanen
2015-02-10 14:42 ` [PATCH 6/9] hashmap: Add re-entrancy support to foreach function Jukka Rissanen
2015-02-10 19:47   ` Denis Kenzior
2015-02-11  9:21     ` Patrik Flykt
2015-02-11 14:06       ` Denis Kenzior
2015-02-12  7:23         ` Jukka Rissanen
2015-02-12 18:02           ` Denis Kenzior
2015-02-12  7:25         ` Jukka Rissanen
2015-02-12 17:55           ` Denis Kenzior
2015-02-13 15:38             ` Luiz Augusto von Dentz
2015-02-13 17:04               ` Denis Kenzior
2015-02-13 17:36               ` Marcel Holtmann
2015-02-16  9:44                 ` Luiz Augusto von Dentz
2015-02-16 16:18                   ` Marcel Holtmann
2015-02-16 18:27                     ` Luiz Augusto von Dentz
2015-02-16 19:03                       ` Marcel Holtmann
2015-02-17  9:48                 ` Tomasz Bursztyka
2015-02-17 16:41                   ` Denis Kenzior
2015-02-18  8:23                     ` Tomasz Bursztyka
2015-02-10 14:42 ` Jukka Rissanen [this message]
2015-02-10 14:42 ` [PATCH 8/9] hashmap: Add support to finding an element from hash Jukka Rissanen
2015-02-12  8:35   ` Jukka Rissanen
2015-02-13  0:19     ` Denis Kenzior
2015-02-10 14:42 ` [PATCH 9/9] unit: hashmap: Add unit test for l_hashmap_find Jukka Rissanen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423579344-10933-8-git-send-email-jukka.rissanen@linux.intel.com \
    --to=jukka.rissanen@linux.intel.com \
    --cc=ell@lists.01.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.