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 <[email protected]>
spdk · Mar 12, 2019 · 25c99fb · 25c99fb
1 parent 610e235
commit 25c99fb
Show file tree

Hide file tree

Showing 22 changed files with 9 additions and 9 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -113,7 +113,7 @@ F: doc/guides/prog_guide/ext_app_lib_make_help.rst
 Meson build
 M: Bruce Richardson <[email protected]>
 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 <[email protected]>
-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
@@ -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
@@ -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
@@ -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 → lib/librte_eal/freebsd/BSDmakefile.meson b/lib/librte_eal/bsdapp/BSDmakefile.meson → lib/librte_eal/freebsd/BSDmakefile.meson
diff --git a/lib/librte_eal/bsdapp/Makefile → lib/librte_eal/freebsd/Makefile b/lib/librte_eal/bsdapp/Makefile → lib/librte_eal/freebsd/Makefile
diff --git a/lib/librte_eal/bsdapp/eal/Makefile → lib/librte_eal/freebsd/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile → lib/librte_eal/freebsd/eal/Makefile
diff --git a/lib/librte_eal/bsdapp/eal/eal.c → lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c → lib/librte_eal/freebsd/eal/eal.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_alarm.c → lib/librte_eal/freebsd/eal/eal_alarm.c b/lib/librte_eal/bsdapp/eal/eal_alarm.c → lib/librte_eal/freebsd/eal/eal_alarm.c
diff --git a/...librte_eal/bsdapp/eal/eal_alarm_private.h → ...ibrte_eal/freebsd/eal/eal_alarm_private.h b/...librte_eal/bsdapp/eal/eal_alarm_private.h → ...ibrte_eal/freebsd/eal/eal_alarm_private.h
diff --git a/lib/librte_eal/bsdapp/eal/eal_cpuflags.c → lib/librte_eal/freebsd/eal/eal_cpuflags.c b/lib/librte_eal/bsdapp/eal/eal_cpuflags.c → lib/librte_eal/freebsd/eal/eal_cpuflags.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_debug.c → lib/librte_eal/freebsd/eal/eal_debug.c b/lib/librte_eal/bsdapp/eal/eal_debug.c → lib/librte_eal/freebsd/eal/eal_debug.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_dev.c → lib/librte_eal/freebsd/eal/eal_dev.c b/lib/librte_eal/bsdapp/eal/eal_dev.c → lib/librte_eal/freebsd/eal/eal_dev.c
diff --git a/...librte_eal/bsdapp/eal/eal_hugepage_info.c → ...ibrte_eal/freebsd/eal/eal_hugepage_info.c b/...librte_eal/bsdapp/eal/eal_hugepage_info.c → ...ibrte_eal/freebsd/eal/eal_hugepage_info.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_interrupts.c → lib/librte_eal/freebsd/eal/eal_interrupts.c b/lib/librte_eal/bsdapp/eal/eal_interrupts.c → lib/librte_eal/freebsd/eal/eal_interrupts.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_lcore.c → lib/librte_eal/freebsd/eal/eal_lcore.c b/lib/librte_eal/bsdapp/eal/eal_lcore.c → lib/librte_eal/freebsd/eal/eal_lcore.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_memalloc.c → lib/librte_eal/freebsd/eal/eal_memalloc.c b/lib/librte_eal/bsdapp/eal/eal_memalloc.c → lib/librte_eal/freebsd/eal/eal_memalloc.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c → lib/librte_eal/freebsd/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c → lib/librte_eal/freebsd/eal/eal_memory.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_thread.c → lib/librte_eal/freebsd/eal/eal_thread.c b/lib/librte_eal/bsdapp/eal/eal_thread.c → lib/librte_eal/freebsd/eal/eal_thread.c
diff --git a/lib/librte_eal/bsdapp/eal/eal_timer.c → lib/librte_eal/freebsd/eal/eal_timer.c b/lib/librte_eal/bsdapp/eal/eal_timer.c → lib/librte_eal/freebsd/eal/eal_timer.c
diff --git a/lib/librte_eal/bsdapp/eal/meson.build → lib/librte_eal/freebsd/eal/meson.build b/lib/librte_eal/bsdapp/eal/meson.build → lib/librte_eal/freebsd/eal/meson.build
diff --git 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()))