[asterisk-commits] murf: branch murf/fast-ast2 r88524 - /team/murf/fast-ast2/utils/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 5 08:16:38 CST 2007
Author: murf
Date: Mon Nov 5 08:16:38 2007
New Revision: 88524
URL: http://svn.digium.com/view/asterisk?view=rev&rev=88524
Log:
Has any of my changes to hashtabs damaged them? Bring in the (regression) test program
Added:
team/murf/fast-ast2/utils/hashtest.c (with props)
Modified:
team/murf/fast-ast2/utils/Makefile
Modified: team/murf/fast-ast2/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/utils/Makefile?view=diff&rev=88524&r1=88523&r2=88524
==============================================================================
--- team/murf/fast-ast2/utils/Makefile (original)
+++ team/murf/fast-ast2/utils/Makefile Mon Nov 5 08:16:38 2007
@@ -16,7 +16,7 @@
.PHONY: clean all uninstall
# to get check_expr, add it to the ALL_UTILS list
-ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted check_expr conf2ael hashtest2
+ALL_UTILS:=astman smsq stereorize streamplayer aelparse muted check_expr conf2ael hashtest2 hashtest
UTILS:=$(ALL_UTILS)
include $(ASTTOPDIR)/Makefile.rules
@@ -61,7 +61,7 @@
rm -f *.s *.i
rm -f md5.c strcompat.c ast_expr2.c ast_expr2f.c pbx_ael.c pval.c
rm -f aelparse.c aelbison.c conf2ael
- rm -f utils.c threadstorage.c sha1.c astobj2.c hashtest2
+ rm -f utils.c threadstorage.c sha1.c astobj2.c hashtest2 hashtest
md5.c: ../main/md5.c
@cp $< $@
@@ -71,6 +71,9 @@
stereorize: stereorize.o frame.o
stereorize: LIBS+=-lm
+
+hashtab.c: ../main/hashtab.c
+ @cp $< $@
strcompat.c: ../main/strcompat.c
@cp $< $@
@@ -96,7 +99,7 @@
pval.o : ASTCFLAGS+=-DSTANDALONE
-check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o clicompat.o threadstorage.o
+check_expr: check_expr.o ast_expr2.o ast_expr2f.o strcompat.o threadstorage.o
aelbison.c: ../res/ael/ael.tab.c
@cp $< $@
@@ -131,6 +134,11 @@
hashtest2: hashtest2.o md5.o utils.o astobj2.o sha1.o strcompat.o threadstorage.o clicompat.o
+hashtest: hashtest.o md5.o hashtab.o utils.o sha1.o strcompat.o threadstorage.o
+
+hashtest.o : hashtest.c
+ $(CC) -g -O0 -c hashtest.c -I/usr/include -I../include
+
extconf.o : extconf.c
conf2ael: conf2ael.o ast_expr2f.o ast_expr2.o aelbison.o aelparse.o pbx_ael.o pval.o extconf.o strcompat.o
Added: team/murf/fast-ast2/utils/hashtest.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast2/utils/hashtest.c?view=auto&rev=88524
==============================================================================
--- team/murf/fast-ast2/utils/hashtest.c (added)
+++ team/murf/fast-ast2/utils/hashtest.c Mon Nov 5 08:16:38 2007
@@ -1,0 +1,387 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2007, Steve Murphy
+ *
+ * Steve Murphy <murf at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+/*! \file
+ *
+ * \brief A program to thoroughly thrash a hash table, testing
+ * out locking safety, and making sure all functionality
+ * is functioning. Run with 5 or more threads to get that
+ * fully intense firestorm of activity. If your
+ * hash tables don't crash, lock up, or go weird, it must
+ * be good code! Even features some global counters
+ * that will get slightly behind because they aren't lock-protected.
+ *
+ * \author Steve Murphy <murf at digium.com>
+ */
+
+#include "asterisk.h"
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <alloca.h>
+#include <string.h>
+#include <pthread.h>
+#include <sys/stat.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include "asterisk/lock.h"
+#include "asterisk/hashtab.h"
+#include "asterisk/channel.h"
+#include "asterisk/utils.h"
+#include "asterisk/module.h"
+int testno = 1;
+
+/* stuff we need to make this work with the hashtab stuff */
+
+void ast_cli(int *fd, char *str, ...)
+{
+}
+
+int64_t ast_mark(int prof_id, int x)
+{
+}
+
+struct ht_element
+{
+ char *key;
+ char *val;
+};
+
+static int hashtab_compare_strings_nocase(const void *a, const void *b)
+{
+ const struct ht_element *ae = a, *be = b;
+ return ast_hashtab_compare_strings_nocase(ae->key, be->key);
+}
+
+static int hashtab_compare_strings(const void *a, const void *b)
+{
+ const struct ht_element *ae = a, *be = b;
+ return ast_hashtab_compare_strings(ae->key, be->key);
+}
+
+static unsigned int hashtab_hash_string(const void *obj)
+{
+ const struct ht_element *o = obj;
+ return ast_hashtab_hash_string((const void *)o->key);
+}
+
+static unsigned int hashtab_hash_string_nocase(const void *obj)
+{
+ const struct ht_element *o = obj;
+ return ast_hashtab_hash_string_nocase((const void*)o->key);
+}
+
+/* random numbers */
+
+my_rand(int incl_low, int incl_high, unsigned int *seedp)
+{
+ if (incl_high == 0)
+ return 0;
+
+ return incl_low + (rand_r(seedp) % incl_high);
+}
+
+
+
+
+/* the testing routines */
+
+static int glob_highwater = 0;
+struct ast_hashtab *glob_hashtab = 0;
+unsigned int glob_seed = 0;
+int els_removed = 0;
+int els_added = 0;
+int els_lookedup = 0;
+int els_found = 0;
+int els_traversals = 0;
+
+/* all the operations to perform on the hashtab */
+
+static void add_element(void)
+{
+ char keybuf[100];
+ struct ht_element *x = malloc(sizeof(struct ht_element));
+ sprintf(keybuf,"key%08d", glob_highwater++);
+ x->key = strdup(keybuf);
+ x->val = strdup("interesting data");
+ ast_hashtab_insert_immediate(glob_hashtab, x);
+ els_added++;
+}
+
+static void traverse_elements(void)
+{
+ struct ht_element *el;
+ int c=0;
+ struct ast_hashtab_iter *it = ast_hashtab_start_write_traversal(glob_hashtab);
+#ifdef DEBUG
+ printf("Traverse hashtab\n");
+#endif
+ while ((el = ast_hashtab_next(it))) {
+ c++;
+ }
+ ast_hashtab_end_traversal(it);
+ els_traversals++; /* unprotected, sometimes off, but, not really important, either */
+}
+
+static void * del_element(unsigned int *seedp)
+{
+ char keybuf[100];
+ struct ht_element *el, lookup;
+ int x;
+
+ /* pick a random element from 0 to highwater-1 */
+ x = my_rand(0,glob_highwater-1,seedp);
+ sprintf(keybuf, "key%08d", x);
+#if DEBUG
+ printf("Removing %s", keybuf);
+#endif
+ lookup.key = keybuf;
+ el = ast_hashtab_remove_object_via_lookup(glob_hashtab, &lookup);
+
+ if (el) {
+#if DEBUG
+ printf("...YES (el=%x)\n", (unsigned long)el);
+#endif
+ free(el->key);
+ free(el->val);
+ free(el);
+ els_removed++;
+ } else {
+#if DEBUG
+ printf("...NO.\n");
+#endif
+ return 0;
+ }
+
+
+ return el;
+}
+
+static int lookup_element(unsigned int *seedp)
+{
+ char keybuf[100];
+ struct ht_element *el, lookup;
+ int x;
+
+ /* pick a random element from 0 to highwater-1 */
+ x = my_rand(0,glob_highwater-1,seedp);
+ sprintf(keybuf, "key%08d", x);
+ lookup.key = keybuf;
+ el = ast_hashtab_lookup(glob_hashtab, &lookup);
+ els_lookedup++;
+ if (el)
+ els_found++;
+ if (el)
+ return 1;
+ return 0;
+}
+
+
+static void *hashtest(void *data)
+{
+ int my_els_removed = 0;
+ int my_els_added = 0;
+ int my_els_lookedup = 0;
+ int my_els_found = 0;
+ int my_els_traversals = 0;
+ int my_testno = testno++;
+
+ /* data will be a random number == use as a seed for random numbers */
+ unsigned long seed = (unsigned long)data;
+ printf("hashtest thread created... test beginning\n");
+
+ /* main test routine-- a global hashtab exists, pound it like crazy */
+ int its;
+ for(its=0;its<100000;its++)
+ {
+ void *seed2 = &seed;
+ int op = my_rand(0,100, seed2);
+ if (op<60) {
+ my_els_lookedup++;
+#ifdef DEBUG
+ printf("%d[%d]: LOOKUP\n", my_testno, its);
+#endif
+ if ((my_els_lookedup%1000)==0) {
+ printf(".");
+ fflush(stdout);
+ }
+ if (lookup_element(seed2))
+ my_els_found++;
+ } else if (op < 61) { /* make this 61 and it'll take 15 minutes to run */
+#ifdef DEBUG
+ printf("%d[%d]: TRAVERSE\n", my_testno, its);
+#endif
+ traverse_elements();
+ my_els_traversals++;
+
+ } else if (op < 80) {
+#ifdef DEBUG
+ printf("%d[%d]: REMOVE\n", my_testno, its);
+#endif
+ if (del_element(seed2))
+ my_els_removed++;
+ } else {
+ my_els_added++;
+#ifdef DEBUG
+ printf("%d[%d]: ADD\n", my_testno, its);
+#endif
+ add_element();
+ }
+ }
+ printf("\nhashtest thread %d exiting.... lookups=%d/%d, added=%d, removed=%d, traversals=%d;\n",
+ my_testno, my_els_found, my_els_lookedup, my_els_added, my_els_removed, my_els_traversals);
+ printf("\ntotals..................... lookups=%d/%d, added=%d, removed=%d, traversals=%d;\n",
+ els_found, els_lookedup, els_added, els_removed,els_traversals);
+ pthread_exit(0);
+}
+
+void run_hashtest(int numthr)
+{
+ pthread_t thr[numthr];
+ void *thrres[numthr];
+ int i, biggest, resize_cnt, numobjs, numbuckets;
+
+ /* init a single global hashtab, then... */
+ glob_hashtab = ast_hashtab_create(180000, hashtab_compare_strings_nocase, ast_hashtab_resize_java, ast_hashtab_newsize_java, hashtab_hash_string_nocase, 1);
+ printf("starting with %d elements in the hashtable...\n", ast_hashtab_capacity(glob_hashtab));
+ /* set a random seed */
+ glob_seed = (unsigned int)time(0);
+ srand(glob_seed);
+
+ /* create threads, each running hashtest */
+ for(i=0;i<numthr;i++)
+ {
+ unsigned long z = rand();
+
+ printf("starting hashtest thread %d....\n",i+1);
+ if (ast_pthread_create(&thr[i], NULL, hashtest, (void*)z)) {
+ printf("Sorry, couldn't create thread #%d\n", i+1);
+ }
+ printf("hashtest thread spawned.... \n");
+ }
+ /* collect threads, each running hashtest */
+ for(i=0;i<numthr;i++)
+ {
+ printf("waiting for thread %d....\n", i+1);
+ if (pthread_join(thr[i], &thrres[i])) {
+ printf("Sorry, couldn't join thread #%d\n", i+1);
+ }
+ printf("hashtest thread %d done.... \n",i+1);
+ }
+ /* user has to kill/intr the process to stop the test? */
+ ast_hashtab_get_stats(glob_hashtab, &biggest, &resize_cnt, &numobjs, &numbuckets);
+ printf("Some stats: longest bucket chain: %d; number of resizes: %d; number of objects: %d; capacity: %d\n",
+ biggest, resize_cnt, numobjs, numbuckets);
+}
+
+
+int main(int argc,char **argv)
+{
+ if (argc < 2 || argc > 2 || atoi(argv[1]) < 1)
+ {
+ printf("Usage: hashtest <number of threads>\n");
+ exit(1);
+ }
+
+ /* one arg == number of threads to create */
+ run_hashtest(atoi(argv[1]));
+
+ return 0;
+}
+
+
+struct ast_app *pbx_findapp(const char *app)
+{
+ return (struct ast_app*)1; /* so as not to trigger an error */
+}
+
+int ast_add_profile(const char *x, uint64_t scale)
+{
+}
+
+int ast_loader_register(int (*updater)(void))
+{
+ return 1;
+}
+
+int ast_loader_unregister(int (*updater)(void))
+{
+ return 1;
+}
+void ast_module_register(const struct ast_module_info *x)
+{
+}
+
+void ast_module_unregister(const struct ast_module_info *x)
+{
+}
+
+
+void ast_cli_register_multiple(void)
+{
+}
+
+void ast_register_file_version(const char *file, const char *version)
+{
+}
+
+void ast_unregister_file_version(const char *file)
+{
+
+}
+
+void ast_cli_unregister_multiple(void)
+{
+}
+
+void ast_context_destroy(void)
+{
+}
+
+void ast_log(int level, const char *file, int line, const char *function, const char *fmt, ...)
+{
+ va_list vars;
+ va_start(vars,fmt);
+ printf("LOG: lev:%d file:%s line:%d func: %s ",
+ level, file, line, function);
+ vprintf(fmt, vars);
+ fflush(stdout);
+ va_end(vars);
+}
+
+void ast_verbose(const char *fmt, ...)
+{
+ va_list vars;
+ va_start(vars,fmt);
+
+ printf("VERBOSE: ");
+ vprintf(fmt, vars);
+ fflush(stdout);
+ va_end(vars);
+}
+
+void ast_register_thread(char *name)
+{
+
+}
+
+void ast_unregister_thread(void *id)
+{
+}
Propchange: team/murf/fast-ast2/utils/hashtest.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/murf/fast-ast2/utils/hashtest.c
------------------------------------------------------------------------------
svn:keywords = Author Id Date Revision
Propchange: team/murf/fast-ast2/utils/hashtest.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the asterisk-commits
mailing list