From 25c99fbd6851dcdbded0d5ef86f685043ffa4a55 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 6 Mar 2019 16:22:37 +0000 Subject: [PATCH] eal/bsd: rename bsdapp to freebsd The term "bsdapp" is a legacy one, but just calling the subdirectory "freebsd" is just clearer for all concerned. Signed-off-by: Bruce Richardson --- MAINTAINERS | 8 ++++---- devtools/build-tags.sh | 2 +- doc/guides/prog_guide/env_abstraction_layer.rst | 2 +- lib/librte_eal/Makefile | 4 ++-- lib/librte_eal/{bsdapp => freebsd}/BSDmakefile.meson | 0 lib/librte_eal/{bsdapp => freebsd}/Makefile | 0 lib/librte_eal/{bsdapp => freebsd}/eal/Makefile | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm.c | 0 .../{bsdapp => freebsd}/eal/eal_alarm_private.h | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_cpuflags.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_debug.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_dev.c | 0 .../{bsdapp => freebsd}/eal/eal_hugepage_info.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_interrupts.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_lcore.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_memalloc.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_memory.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_thread.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/eal_timer.c | 0 lib/librte_eal/{bsdapp => freebsd}/eal/meson.build | 0 lib/librte_eal/meson.build | 2 +- 22 files changed, 9 insertions(+), 9 deletions(-) rename lib/librte_eal/{bsdapp => freebsd}/BSDmakefile.meson (100%) rename lib/librte_eal/{bsdapp => freebsd}/Makefile (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/Makefile (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm_private.h (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_cpuflags.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_debug.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_dev.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_hugepage_info.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_interrupts.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_lcore.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_memalloc.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_memory.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_thread.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_timer.c (100%) rename lib/librte_eal/{bsdapp => freebsd}/eal/meson.build (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 097cfb4f3a..d1e624c9a3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -113,7 +113,7 @@ F: doc/guides/prog_guide/ext_app_lib_make_help.rst Meson build M: Bruce Richardson F: meson.build -F: lib/librte_eal/bsdapp/BSDmakefile.meson +F: lib/librte_eal/freebsd/BSDmakefile.meson F: meson_options.txt F: config/rte_config.h F: buildtools/gen-pmdinfo-cfile.sh @@ -174,7 +174,7 @@ F: lib/librte_eal/common/eal_common_fbarray.c F: lib/librte_eal/common/eal_common_mem* F: lib/librte_eal/common/eal_hugepages.h F: lib/librte_eal/linuxapp/eal/eal_mem* -F: lib/librte_eal/bsdapp/eal/eal_mem* +F: lib/librte_eal/freebsd/eal/eal_mem* F: doc/guides/prog_guide/env_abstraction_layer.rst F: app/test/test_external_mem.c F: app/test/test_func_reentrancy.c @@ -260,8 +260,8 @@ F: drivers/bus/pci/linux/*vfio* FreeBSD EAL (with overlaps) M: Bruce Richardson -F: lib/librte_eal/bsdapp/Makefile -F: lib/librte_eal/bsdapp/eal/ +F: lib/librte_eal/freebsd/Makefile +F: lib/librte_eal/freebsd/eal/ F: doc/guides/freebsd_gsg/ FreeBSD contigmem diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh index 03ba1853b6..3a98e9b06e 100755 --- a/devtools/build-tags.sh +++ b/devtools/build-tags.sh @@ -72,7 +72,7 @@ linux_sources() bsd_sources() { - find_sources "lib/librte_eal/bsdapp" '*.[chS]' + find_sources "lib/librte_eal/freebsd" '*.[chS]' } arm_common() diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index 67b45ba7df..73436b0eb8 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -349,7 +349,7 @@ EAL provides the event APIs for this event-driven thread mode. Taking linuxapp as an example, the implementation relies on epoll. Each thread can monitor an epoll instance in which all the wake-up events' file descriptors are added. The event file descriptors are created and mapped to the interrupt vectors according to the UIO/VFIO spec. -From bsdapp's perspective, kqueue is the alternative way, but not implemented yet. +From FreeBSD's perspective, kqueue is the alternative way, but not implemented yet. EAL initializes the mapping between event file descriptors and interrupt vectors, while each device initializes the mapping between interrupt vectors and queues. In this way, EAL actually is unaware of the interrupt cause on the specific vector. diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile index ccd45cb840..39d64bb7aa 100644 --- a/lib/librte_eal/Makefile +++ b/lib/librte_eal/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp DEPDIRS-linuxapp := common -DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp -DEPDIRS-bsdapp := common +DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd +DEPDIRS-freebsd := common include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_eal/bsdapp/BSDmakefile.meson b/lib/librte_eal/freebsd/BSDmakefile.meson similarity index 100% rename from lib/librte_eal/bsdapp/BSDmakefile.meson rename to lib/librte_eal/freebsd/BSDmakefile.meson diff --git a/lib/librte_eal/bsdapp/Makefile b/lib/librte_eal/freebsd/Makefile similarity index 100% rename from lib/librte_eal/bsdapp/Makefile rename to lib/librte_eal/freebsd/Makefile diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/freebsd/eal/Makefile similarity index 100% rename from lib/librte_eal/bsdapp/eal/Makefile rename to lib/librte_eal/freebsd/eal/Makefile diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal.c rename to lib/librte_eal/freebsd/eal/eal.c diff --git a/lib/librte_eal/bsdapp/eal/eal_alarm.c b/lib/librte_eal/freebsd/eal/eal_alarm.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_alarm.c rename to lib/librte_eal/freebsd/eal/eal_alarm.c diff --git a/lib/librte_eal/bsdapp/eal/eal_alarm_private.h b/lib/librte_eal/freebsd/eal/eal_alarm_private.h similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_alarm_private.h rename to lib/librte_eal/freebsd/eal/eal_alarm_private.h diff --git a/lib/librte_eal/bsdapp/eal/eal_cpuflags.c b/lib/librte_eal/freebsd/eal/eal_cpuflags.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_cpuflags.c rename to lib/librte_eal/freebsd/eal/eal_cpuflags.c diff --git a/lib/librte_eal/bsdapp/eal/eal_debug.c b/lib/librte_eal/freebsd/eal/eal_debug.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_debug.c rename to lib/librte_eal/freebsd/eal/eal_debug.c diff --git a/lib/librte_eal/bsdapp/eal/eal_dev.c b/lib/librte_eal/freebsd/eal/eal_dev.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_dev.c rename to lib/librte_eal/freebsd/eal/eal_dev.c diff --git a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c b/lib/librte_eal/freebsd/eal/eal_hugepage_info.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_hugepage_info.c rename to lib/librte_eal/freebsd/eal/eal_hugepage_info.c diff --git a/lib/librte_eal/bsdapp/eal/eal_interrupts.c b/lib/librte_eal/freebsd/eal/eal_interrupts.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_interrupts.c rename to lib/librte_eal/freebsd/eal/eal_interrupts.c diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c b/lib/librte_eal/freebsd/eal/eal_lcore.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_lcore.c rename to lib/librte_eal/freebsd/eal/eal_lcore.c diff --git a/lib/librte_eal/bsdapp/eal/eal_memalloc.c b/lib/librte_eal/freebsd/eal/eal_memalloc.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_memalloc.c rename to lib/librte_eal/freebsd/eal/eal_memalloc.c diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/freebsd/eal/eal_memory.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_memory.c rename to lib/librte_eal/freebsd/eal/eal_memory.c diff --git a/lib/librte_eal/bsdapp/eal/eal_thread.c b/lib/librte_eal/freebsd/eal/eal_thread.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_thread.c rename to lib/librte_eal/freebsd/eal/eal_thread.c diff --git a/lib/librte_eal/bsdapp/eal/eal_timer.c b/lib/librte_eal/freebsd/eal/eal_timer.c similarity index 100% rename from lib/librte_eal/bsdapp/eal/eal_timer.c rename to lib/librte_eal/freebsd/eal/eal_timer.c diff --git a/lib/librte_eal/bsdapp/eal/meson.build b/lib/librte_eal/freebsd/eal/meson.build similarity index 100% rename from lib/librte_eal/bsdapp/eal/meson.build rename to lib/librte_eal/freebsd/eal/meson.build diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index 98c1d1f31e..4ae0efccbc 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -15,7 +15,7 @@ if host_machine.system() == 'linux' elif host_machine.system() == 'freebsd' dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1) - subdir('bsdapp/eal') + subdir('freebsd/eal') else error('unsupported system type "@0@"'.format(host_machine.system())) -- 2.20.1