DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 5/5] eal: use a single version map file
Date: Thu, 19 Oct 2017 17:36:29 +0100	[thread overview]
Message-ID: <20171019163629.28618-6-bruce.richardson@intel.com> (raw)
In-Reply-To: <20171019163629.28618-1-bruce.richardson@intel.com>

Since the functions exported by DPDK EAL on all OS's should be
identical, we should not need separate function version files for each
OS. Therefore move existing version files to the top-level EAL
directory.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/bsdapp/eal/Makefile                 |   2 +-
 lib/librte_eal/linuxapp/eal/Makefile               |   2 +-
 lib/librte_eal/linuxapp/eal/rte_eal_version.map    | 254 ---------------------
 .../{bsdapp/eal => }/rte_eal_version.map           |   0
 4 files changed, 2 insertions(+), 256 deletions(-)
 delete mode 100644 lib/librte_eal/linuxapp/eal/rte_eal_version.map
 rename lib/librte_eal/{bsdapp/eal => }/rte_eal_version.map (100%)

diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile
index 92b8294c3..351fa57f9 100644
--- a/lib/librte_eal/bsdapp/eal/Makefile
+++ b/lib/librte_eal/bsdapp/eal/Makefile
@@ -46,7 +46,7 @@ LDLIBS += -lexecinfo
 LDLIBS += -lpthread
 LDLIBS += -lgcc_s
 
-EXPORT_MAP := rte_eal_version.map
+EXPORT_MAP := ../../rte_eal_version.map
 
 LIBABIVER := 6
 
diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile
index 4e581671f..965da6e30 100644
--- a/lib/librte_eal/linuxapp/eal/Makefile
+++ b/lib/librte_eal/linuxapp/eal/Makefile
@@ -34,7 +34,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
 LIB = librte_eal.a
 
 ARCH_DIR ?= $(RTE_ARCH)
-EXPORT_MAP := rte_eal_version.map
+EXPORT_MAP := ../../rte_eal_version.map
 VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR)
 
 LIBABIVER := 6
diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map
deleted file mode 100644
index c173ccfdb..000000000
--- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map
+++ /dev/null
@@ -1,254 +0,0 @@
-DPDK_2.0 {
-	global:
-
-	__rte_panic;
-	devargs_list;
-	eal_parse_sysfs_value;
-	eal_timer_source;
-	lcore_config;
-	per_lcore__lcore_id;
-	per_lcore__rte_errno;
-	rte_calloc;
-	rte_calloc_socket;
-	rte_cpu_check_supported;
-	rte_cpu_get_flag_enabled;
-	rte_cycles_vmware_tsc_map;
-	rte_delay_us;
-	rte_dump_physmem_layout;
-	rte_dump_registers;
-	rte_dump_stack;
-	rte_dump_tailq;
-	rte_eal_alarm_cancel;
-	rte_eal_alarm_set;
-	rte_eal_devargs_add;
-	rte_eal_devargs_dump;
-	rte_eal_devargs_type_count;
-	rte_eal_get_configuration;
-	rte_eal_get_lcore_state;
-	rte_eal_get_physmem_layout;
-	rte_eal_get_physmem_size;
-	rte_eal_has_hugepages;
-	rte_eal_hpet_init;
-	rte_eal_init;
-	rte_eal_iopl_init;
-	rte_eal_lcore_role;
-	rte_eal_mp_remote_launch;
-	rte_eal_mp_wait_lcore;
-	rte_eal_parse_devargs_str;
-	rte_eal_process_type;
-	rte_eal_remote_launch;
-	rte_eal_tailq_lookup;
-	rte_eal_tailq_register;
-	rte_eal_wait_lcore;
-	rte_exit;
-	rte_free;
-	rte_get_hpet_cycles;
-	rte_get_hpet_hz;
-	rte_get_log_level;
-	rte_get_log_type;
-	rte_get_tsc_hz;
-	rte_hexdump;
-	rte_intr_callback_register;
-	rte_intr_callback_unregister;
-	rte_intr_disable;
-	rte_intr_enable;
-	rte_log;
-	rte_log_cur_msg_loglevel;
-	rte_log_cur_msg_logtype;
-	rte_logs;
-	rte_malloc;
-	rte_malloc_dump_stats;
-	rte_malloc_get_socket_stats;
-	rte_malloc_set_limit;
-	rte_malloc_socket;
-	rte_malloc_validate;
-	rte_malloc_virt2phy;
-	rte_mem_lock_page;
-	rte_mem_phy2mch;
-	rte_mem_virt2phy;
-	rte_memdump;
-	rte_memory_get_nchannel;
-	rte_memory_get_nrank;
-	rte_memzone_dump;
-	rte_memzone_lookup;
-	rte_memzone_reserve;
-	rte_memzone_reserve_aligned;
-	rte_memzone_reserve_bounded;
-	rte_memzone_walk;
-	rte_openlog_stream;
-	rte_realloc;
-	rte_set_application_usage_hook;
-	rte_set_log_level;
-	rte_set_log_type;
-	rte_socket_id;
-	rte_strerror;
-	rte_strsplit;
-	rte_sys_gettid;
-	rte_thread_get_affinity;
-	rte_thread_set_affinity;
-	rte_vlog;
-	rte_zmalloc;
-	rte_zmalloc_socket;
-
-	local: *;
-};
-
-DPDK_2.1 {
-	global:
-
-	rte_epoll_ctl;
-	rte_epoll_wait;
-	rte_intr_allow_others;
-	rte_intr_dp_is_en;
-	rte_intr_efd_disable;
-	rte_intr_efd_enable;
-	rte_intr_rx_ctl;
-	rte_intr_tls_epfd;
-	rte_memzone_free;
-
-} DPDK_2.0;
-
-DPDK_2.2 {
-	global:
-
-	rte_intr_cap_multiple;
-	rte_keepalive_create;
-	rte_keepalive_dispatch_pings;
-	rte_keepalive_mark_alive;
-	rte_keepalive_register_core;
-
-} DPDK_2.1;
-
-DPDK_16.04 {
-	global:
-
-	rte_cpu_get_flag_name;
-	rte_eal_primary_proc_alive;
-
-} DPDK_2.2;
-
-DPDK_16.07 {
-	global:
-
-	pci_get_sysfs_path;
-	rte_keepalive_mark_sleep;
-	rte_keepalive_register_relay_callback;
-	rte_rtm_supported;
-	rte_thread_setname;
-
-} DPDK_16.04;
-
-DPDK_16.11 {
-	global:
-
-	rte_delay_us_block;
-	rte_delay_us_callback_register;
-	rte_eal_dev_attach;
-	rte_eal_dev_detach;
-
-} DPDK_16.07;
-
-DPDK_17.02 {
-	global:
-
-	rte_bus_dump;
-	rte_bus_probe;
-	rte_bus_register;
-	rte_bus_scan;
-	rte_bus_unregister;
-
-} DPDK_16.11;
-
-DPDK_17.05 {
-	global:
-
-	rte_cpu_is_supported;
-	rte_intr_free_epoll_fd;
-	rte_log_dump;
-	rte_log_get_global_level;
-	rte_log_register;
-	rte_log_set_global_level;
-	rte_log_set_level;
-	rte_log_set_level_regexp;
-	rte_pci_detach;
-	rte_pci_dump;
-	rte_pci_ioport_map;
-	rte_pci_ioport_read;
-	rte_pci_ioport_unmap;
-	rte_pci_ioport_write;
-	rte_pci_map_device;
-	rte_pci_probe;
-	rte_pci_probe_one;
-	rte_pci_read_config;
-	rte_pci_register;
-	rte_pci_scan;
-	rte_pci_unmap_device;
-	rte_pci_unregister;
-	rte_pci_write_config;
-	rte_vdev_init;
-	rte_vdev_register;
-	rte_vdev_uninit;
-	rte_vdev_unregister;
-	vfio_get_container_fd;
-	vfio_get_group_fd;
-	vfio_get_group_no;
-
-} DPDK_17.02;
-
-DPDK_17.08 {
-	global:
-
-	rte_bus_find;
-	rte_bus_find_by_device;
-	rte_bus_find_by_name;
-	rte_log_get_level;
-
-} DPDK_17.05;
-
-EXPERIMENTAL {
-	global:
-
-	rte_eal_devargs_insert;
-	rte_eal_devargs_parse;
-	rte_eal_devargs_remove;
-	rte_eal_hotplug_add;
-	rte_eal_hotplug_remove;
-	rte_service_component_register;
-	rte_service_component_unregister;
-	rte_service_component_runstate_set;
-	rte_service_dump;
-	rte_service_get_by_id;
-	rte_service_get_by_name;
-	rte_service_get_count;
-	rte_service_get_name;
-	rte_service_lcore_add;
-	rte_service_lcore_count;
-	rte_service_lcore_count_services;
-	rte_service_lcore_del;
-	rte_service_lcore_list;
-	rte_service_lcore_reset_all;
-	rte_service_lcore_start;
-	rte_service_lcore_stop;
-	rte_service_map_lcore_get;
-	rte_service_map_lcore_set;
-	rte_service_probe_capability;
-	rte_service_reset;
-	rte_service_runstate_get;
-	rte_service_runstate_set;
-	rte_service_set_stats_enable;
-	rte_service_start_with_defaults;
-
-} DPDK_17.08;
-
-DPDK_17.11 {
-	global:
-
-	rte_bus_get_iommu_class;
-	rte_eal_iova_mode;
-	rte_eal_mbuf_default_mempool_ops;
-	rte_lcore_has_role;
-	rte_memcpy_ptr;
-	rte_pci_get_iommu_class;
-	rte_pci_match;
-
-} DPDK_17.08;
diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
similarity index 100%
rename from lib/librte_eal/bsdapp/eal/rte_eal_version.map
rename to lib/librte_eal/rte_eal_version.map
-- 
2.13.6

  parent reply	other threads:[~2017-10-19 16:44 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-19 16:36 [dpdk-dev] [PATCH 0/5] Merge Linux and BSD EAL map files Bruce Richardson
2017-10-19 16:36 ` [dpdk-dev] [PATCH 1/5] eal/bsdapp: align interrupt include file with Linux version Bruce Richardson
2017-10-19 16:36 ` [dpdk-dev] [PATCH 2/5] eal/bsdapp: fix missing interrupt stub functions Bruce Richardson
2017-10-20  9:12   ` Bruce Richardson
2017-10-19 16:36 ` [dpdk-dev] [PATCH 3/5] eal: merge bsdapp and linuxapp interrupt headers Bruce Richardson
2017-10-19 16:36 ` [dpdk-dev] [PATCH 4/5] eal: mark internal interrupts file as such to doxygen Bruce Richardson
2017-10-19 16:36 ` Bruce Richardson [this message]
2017-10-23 23:21   ` [dpdk-dev] [PATCH 5/5] eal: use a single version map file Thomas Monjalon
2017-10-24  9:48     ` Bruce Richardson
2017-10-19 16:45 ` [dpdk-dev] [PATCH 0/5] Merge Linux and BSD EAL map files Bruce Richardson
2017-10-23 23:23   ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171019163629.28618-6-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).