From 99fb378cdc336207cadd64f245bb112c3587b6c0 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 12 Sep 2007 15:53:40 +0000 Subject: Change the traversal to use ao2_callback() instead of an ao2_iterator. Using ao2_callback() is a much more efficient way of performing an operation on every item in the container. This change makes hashtest2 run in about 25% of the time it ran before on my system. In general, I would say that it makes the most sense to use an ao2_iterator if the operation being performed is going to take a long time and you don't want to keep the container locked while you work with each object. Otherwise, the use of ao2_callback is preferred. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82282 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- utils/hashtest2.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'utils/hashtest2.c') diff --git a/utils/hashtest2.c b/utils/hashtest2.c index 9bd883143..2e3bc410d 100644 --- a/utils/hashtest2.c +++ b/utils/hashtest2.c @@ -148,16 +148,17 @@ static void add_element(void) els_added++; /* unprotected, sometimes off, but, not really important, either */ } +static int do_nothing_cb(void *obj, void *arg, int flags) +{ + return 0; +} + static void traverse_elements(void) { - struct ht_element *el; - struct ao2_iterator it = ao2_iterator_init(glob_hashtab, 0); #ifdef DEBUG printf("Traverse hashtab\n"); #endif - while ((el = ao2_iterator_next(&it))) { - ao2_ref(el,-1); - } + ao2_callback(glob_hashtab, OBJ_NODATA, do_nothing_cb, NULL); els_traversals++; /* unprotected, sometimes off, but, not really important, either */ } -- cgit v1.2.3