From a42cc6594389e8f88cc49e36a7779afdb6529135 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sat, 2 Jul 2011 11:31:09 -0400 Subject: [PATCH] Rename urcu-ht to rculfhash Signed-off-by: Mathieu Desnoyers --- Makefile.am | 5 +++-- urcu-ht.c => rculfhash.c | 8 ++++---- tests/Makefile.am | 5 ++++- tests/{test_ht.c => test_urcu_hash.c} | 0 urcu/cds.h | 1 + urcu-ht.h => urcu/rculfhash.h | 6 +++--- 6 files changed, 15 insertions(+), 10 deletions(-) rename urcu-ht.c => rculfhash.c (99%) rename tests/{test_ht.c => test_urcu_hash.c} (100%) rename urcu-ht.h => urcu/rculfhash.h (91%) diff --git a/Makefile.am b/Makefile.am index 5869c5e..ef11058 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,8 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \ urcu/uatomic/generic.h urcu/arch/generic.h urcu/wfstack.h \ urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \ urcu/ref.h urcu/map/*.h urcu/static/*.h urcu/cds.h \ - urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h + urcu/urcu_ref.h urcu/urcu-futex.h urcu/uatomic_arch.h \ + urcu/urcu-ht.h nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic.h urcu/config.h EXTRA_DIST = $(top_srcdir)/urcu/arch/*.h $(top_srcdir)/urcu/uatomic/*.h \ @@ -37,7 +38,7 @@ lib_LTLIBRARIES = liburcu-cds.la liburcu.la liburcu-qsbr.la \ liburcu-mb.la liburcu-signal.la liburcu-bp.la liburcu_cds_la_SOURCES = wfqueue.c wfstack.c rculfqueue.c rculfstack.c \ - $(COMPAT) + rculfhash.c $(COMPAT) liburcu_la_SOURCES = urcu.c urcu-pointer.c $(COMPAT) liburcu_la_LIBADD = liburcu-cds.la diff --git a/urcu-ht.c b/rculfhash.c similarity index 99% rename from urcu-ht.c rename to rculfhash.c index b8777ac..ec799dc 100644 --- a/urcu-ht.c +++ b/rculfhash.c @@ -11,13 +11,13 @@ #include #include -#include -#include -#include +#include +#include #include +#include #include #include -#include +#include /* * Maximum number of hash table buckets: 256M on 64-bit. diff --git a/tests/Makefile.am b/tests/Makefile.am index 674260f..73dce45 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \ test_urcu_bp test_urcu_bp_dynamic_link test_cycles_per_loop \ test_urcu_lfq test_urcu_wfq test_urcu_lfs test_urcu_wfs \ test_urcu_wfq_dynlink test_urcu_wfs_dynlink \ - test_urcu_lfq_dynlink test_urcu_lfs_dynlink + test_urcu_lfq_dynlink test_urcu_lfs_dynlink test_urcu_hash noinst_HEADERS = rcutorture.h if COMPAT_ARCH @@ -175,6 +175,9 @@ test_urcu_wfs_dynlink_SOURCES = test_urcu_wfs.c test_urcu_wfs_dynlink_CFLAGS = -DDYNAMIC_LINK_TEST $(AM_CFLAGS) test_urcu_wfs_dynlink_LDADD = $(URCU_CDS_LIB) +test_urcu_hash_SOURCES = test_urcu_hash.c $(COMPAT) +test_ht_LDADD = $(URCU_CDS_LIB) + urcutorture.c: api.h check-am: diff --git a/tests/test_ht.c b/tests/test_urcu_hash.c similarity index 100% rename from tests/test_ht.c rename to tests/test_urcu_hash.c diff --git a/urcu/cds.h b/urcu/cds.h index f37a63a..ea74cf1 100644 --- a/urcu/cds.h +++ b/urcu/cds.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include diff --git a/urcu-ht.h b/urcu/rculfhash.h similarity index 91% rename from urcu-ht.h rename to urcu/rculfhash.h index 7e3c36c..d989221 100644 --- a/urcu-ht.h +++ b/urcu/rculfhash.h @@ -1,5 +1,5 @@ -#ifndef _URCU_HT_H -#define _URCU_HT_H +#ifndef _URCU_RCULFHASH_H +#define _URCU_RCULFHASH_H #include @@ -35,4 +35,4 @@ void ht_resize(struct rcu_ht *ht, int growth); uint32_t ht_jhash(void *key, uint32_t length, uint32_t initval); -#endif /* _URCU_HT_H */ +#endif /* _URCU_RCULFHASH_H */ -- 2.34.1