From: Dave Barach Date: Wed, 22 Apr 2020 14:02:31 +0000 (-0400) Subject: vppinfra: move unused code to extras/deprecated/vppinfra X-Git-Tag: v20.09-rc0~157 X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=053d0935244843199c433e92df666b4f79007727 vppinfra: move unused code to extras/deprecated/vppinfra Type: improvement Signed-off-by: Dave Barach Change-Id: Id28299a188feefa1899d835fd499f018af95d81b --- diff --git a/src/vppinfra/anneal.c b/extras/deprecated/vppinfra/anneal.c similarity index 100% rename from src/vppinfra/anneal.c rename to extras/deprecated/vppinfra/anneal.c diff --git a/src/vppinfra/anneal.h b/extras/deprecated/vppinfra/anneal.h similarity index 100% rename from src/vppinfra/anneal.h rename to extras/deprecated/vppinfra/anneal.h diff --git a/src/vppinfra/cuckoo_16_8.h b/extras/deprecated/vppinfra/cuckoo_16_8.h similarity index 100% rename from src/vppinfra/cuckoo_16_8.h rename to extras/deprecated/vppinfra/cuckoo_16_8.h diff --git a/src/vppinfra/cuckoo_8_8.h b/extras/deprecated/vppinfra/cuckoo_8_8.h similarity index 100% rename from src/vppinfra/cuckoo_8_8.h rename to extras/deprecated/vppinfra/cuckoo_8_8.h diff --git a/src/vppinfra/cuckoo_common.h b/extras/deprecated/vppinfra/cuckoo_common.h similarity index 100% rename from src/vppinfra/cuckoo_common.h rename to extras/deprecated/vppinfra/cuckoo_common.h diff --git a/src/vppinfra/cuckoo_debug.h b/extras/deprecated/vppinfra/cuckoo_debug.h similarity index 100% rename from src/vppinfra/cuckoo_debug.h rename to extras/deprecated/vppinfra/cuckoo_debug.h diff --git a/src/vppinfra/cuckoo_template.c b/extras/deprecated/vppinfra/cuckoo_template.c similarity index 100% rename from src/vppinfra/cuckoo_template.c rename to extras/deprecated/vppinfra/cuckoo_template.c diff --git a/src/vppinfra/cuckoo_template.h b/extras/deprecated/vppinfra/cuckoo_template.h similarity index 100% rename from src/vppinfra/cuckoo_template.h rename to extras/deprecated/vppinfra/cuckoo_template.h diff --git a/src/vppinfra/fheap.c b/extras/deprecated/vppinfra/fheap.c similarity index 100% rename from src/vppinfra/fheap.c rename to extras/deprecated/vppinfra/fheap.c diff --git a/src/vppinfra/fheap.h b/extras/deprecated/vppinfra/fheap.h similarity index 100% rename from src/vppinfra/fheap.h rename to extras/deprecated/vppinfra/fheap.h diff --git a/src/vppinfra/flowhash_24_16.h b/extras/deprecated/vppinfra/flowhash_24_16.h similarity index 100% rename from src/vppinfra/flowhash_24_16.h rename to extras/deprecated/vppinfra/flowhash_24_16.h diff --git a/src/vppinfra/flowhash_8_8.h b/extras/deprecated/vppinfra/flowhash_8_8.h similarity index 100% rename from src/vppinfra/flowhash_8_8.h rename to extras/deprecated/vppinfra/flowhash_8_8.h diff --git a/src/vppinfra/flowhash_template.h b/extras/deprecated/vppinfra/flowhash_template.h similarity index 100% rename from src/vppinfra/flowhash_template.h rename to extras/deprecated/vppinfra/flowhash_template.h diff --git a/src/vppinfra/pfhash.h b/extras/deprecated/vppinfra/pfhash.h similarity index 100% rename from src/vppinfra/pfhash.h rename to extras/deprecated/vppinfra/pfhash.h diff --git a/src/vppinfra/phash.c b/extras/deprecated/vppinfra/phash.c similarity index 100% rename from src/vppinfra/phash.c rename to extras/deprecated/vppinfra/phash.c diff --git a/src/vppinfra/phash.h b/extras/deprecated/vppinfra/phash.h similarity index 100% rename from src/vppinfra/phash.h rename to extras/deprecated/vppinfra/phash.h diff --git a/src/vppinfra/pipeline.h b/extras/deprecated/vppinfra/pipeline.h similarity index 100% rename from src/vppinfra/pipeline.h rename to extras/deprecated/vppinfra/pipeline.h diff --git a/src/vppinfra/qhash.c b/extras/deprecated/vppinfra/qhash.c similarity index 100% rename from src/vppinfra/qhash.c rename to extras/deprecated/vppinfra/qhash.c diff --git a/src/vppinfra/qhash.h b/extras/deprecated/vppinfra/qhash.h similarity index 100% rename from src/vppinfra/qhash.h rename to extras/deprecated/vppinfra/qhash.h diff --git a/src/vppinfra/slist.c b/extras/deprecated/vppinfra/slist.c similarity index 100% rename from src/vppinfra/slist.c rename to extras/deprecated/vppinfra/slist.c diff --git a/src/vppinfra/slist.h b/extras/deprecated/vppinfra/slist.h similarity index 100% rename from src/vppinfra/slist.h rename to extras/deprecated/vppinfra/slist.h diff --git a/src/vppinfra/test_cuckoo_bihash.c b/extras/deprecated/vppinfra/test_cuckoo_bihash.c similarity index 100% rename from src/vppinfra/test_cuckoo_bihash.c rename to extras/deprecated/vppinfra/test_cuckoo_bihash.c diff --git a/src/vppinfra/test_cuckoo_template.c b/extras/deprecated/vppinfra/test_cuckoo_template.c similarity index 100% rename from src/vppinfra/test_cuckoo_template.c rename to extras/deprecated/vppinfra/test_cuckoo_template.c diff --git a/src/vppinfra/test_flowhash_template.c b/extras/deprecated/vppinfra/test_flowhash_template.c similarity index 100% rename from src/vppinfra/test_flowhash_template.c rename to extras/deprecated/vppinfra/test_flowhash_template.c diff --git a/src/vppinfra/test_phash.c b/extras/deprecated/vppinfra/test_phash.c similarity index 100% rename from src/vppinfra/test_phash.c rename to extras/deprecated/vppinfra/test_phash.c diff --git a/src/vppinfra/test_qhash.c b/extras/deprecated/vppinfra/test_qhash.c similarity index 100% rename from src/vppinfra/test_qhash.c rename to extras/deprecated/vppinfra/test_qhash.c diff --git a/src/vppinfra/test_slist.c b/extras/deprecated/vppinfra/test_slist.c similarity index 100% rename from src/vppinfra/test_slist.c rename to extras/deprecated/vppinfra/test_slist.c diff --git a/src/vppinfra/test_timing_wheel.c b/extras/deprecated/vppinfra/test_timing_wheel.c similarity index 100% rename from src/vppinfra/test_timing_wheel.c rename to extras/deprecated/vppinfra/test_timing_wheel.c diff --git a/src/vppinfra/test_vhash.c b/extras/deprecated/vppinfra/test_vhash.c similarity index 100% rename from src/vppinfra/test_vhash.c rename to extras/deprecated/vppinfra/test_vhash.c diff --git a/src/vppinfra/test_zvec.c b/extras/deprecated/vppinfra/test_zvec.c similarity index 100% rename from src/vppinfra/test_zvec.c rename to extras/deprecated/vppinfra/test_zvec.c diff --git a/src/vppinfra/unix-kelog.c b/extras/deprecated/vppinfra/unix-kelog.c similarity index 100% rename from src/vppinfra/unix-kelog.c rename to extras/deprecated/vppinfra/unix-kelog.c diff --git a/src/vppinfra/vhash.c b/extras/deprecated/vppinfra/vhash.c similarity index 100% rename from src/vppinfra/vhash.c rename to extras/deprecated/vppinfra/vhash.c diff --git a/src/vppinfra/vhash.h b/extras/deprecated/vppinfra/vhash.h similarity index 100% rename from src/vppinfra/vhash.h rename to extras/deprecated/vppinfra/vhash.h diff --git a/src/vppinfra/xy.h b/extras/deprecated/vppinfra/xy.h similarity index 100% rename from src/vppinfra/xy.h rename to extras/deprecated/vppinfra/xy.h diff --git a/src/vppinfra/zvec.c b/extras/deprecated/vppinfra/zvec.c similarity index 100% rename from src/vppinfra/zvec.c rename to extras/deprecated/vppinfra/zvec.c diff --git a/src/vppinfra/zvec.h b/extras/deprecated/vppinfra/zvec.h similarity index 100% rename from src/vppinfra/zvec.h rename to extras/deprecated/vppinfra/zvec.h diff --git a/src/vppinfra/CMakeLists.txt b/src/vppinfra/CMakeLists.txt index f2279d0857c..e667eb03e8c 100644 --- a/src/vppinfra/CMakeLists.txt +++ b/src/vppinfra/CMakeLists.txt @@ -47,7 +47,6 @@ set(VPPINFRA_SRCS elf.c elog.c error.c - fheap.c fifo.c format.c graph.c @@ -68,7 +67,6 @@ set(VPPINFRA_SRCS random_isaac.c rbtree.c serialize.c - slist.c socket.c std-formats.c string.c @@ -87,7 +85,6 @@ set(VPPINFRA_SRCS valloc.c vec.c vector.c - zvec.c ) set(VPPINFRA_HEADERS @@ -109,12 +106,6 @@ set(VPPINFRA_HEADERS clib.h cpu.h crc32.h - cuckoo_8_8.h - cuckoo_16_8.h - cuckoo_common.h - cuckoo_debug.h - cuckoo_template.h - cuckoo_template.c dlist.h dlmalloc.h elf_clib.h @@ -122,12 +113,8 @@ set(VPPINFRA_HEADERS elog.h error_bootstrap.h error.h - fheap.h fifo.h file.h - flowhash_24_16.h - flowhash_8_8.h - flowhash_template.h format.h graph.h hash.h @@ -149,7 +136,6 @@ set(VPPINFRA_HEADERS os.h pcap.h pcap_funcs.h - pipeline.h pmalloc.h pool.h pmc.h @@ -160,7 +146,6 @@ set(VPPINFRA_HEADERS rbtree.h serialize.h sha2.h - slist.h smp.h socket.h sparse_vec.h @@ -190,8 +175,6 @@ set(VPPINFRA_HEADERS vector_neon.h vector_sse42.h xxhash.h - xy.h - zvec.h linux/syscall.h linux/sysfs.h ) @@ -218,12 +201,10 @@ option(VPP_BUILD_VPPINFRA_TESTS "Build vppinfra tests." OFF) if(VPP_BUILD_VPPINFRA_TESTS) foreach(test bihash_vec88 - cuckoo_template dlist elf elog fifo - flowhash_template format fpool hash @@ -238,16 +219,13 @@ if(VPP_BUILD_VPPINFRA_TESTS) random_isaac rwlock serialize - slist socket spinlock time time_range - timing_wheel tw_timer valloc vec - zvec ) add_vpp_executable(test_${test} SOURCES test_${test}.c @@ -255,7 +233,7 @@ if(VPP_BUILD_VPPINFRA_TESTS) ) endforeach() - foreach(test bihash_template cuckoo_bihash) + foreach(test bihash_template) add_vpp_executable(test_${test} SOURCES test_${test}.c LINK_LIBRARIES vppinfra Threads::Threads