From 091eaac2584e1c1196fde620eb1b7019b08e5fdf Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Mon, 23 Oct 2017 11:56:07 +0200 Subject: [PATCH] log: remove deprecated functions Remove rte_set_log_level(), rte_get_log_level(), rte_set_log_type(), and rte_get_log_type(). Also update librte_eal.so version in docuementation. The LIBABIVER variable in eal has already been modified in commit f26ab687a74f ("eal: remove Xen dom0 support"). Signed-off-by: Olivier Matz --- doc/guides/rel_notes/deprecation.rst | 8 ---- doc/guides/rel_notes/release_17_11.rst | 10 ++++- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 4 -- lib/librte_eal/common/eal_common_log.c | 40 ------------------- lib/librte_eal/common/include/rte_log.h | 29 -------------- .../linuxapp/eal/rte_eal_version.map | 4 -- 6 files changed, 9 insertions(+), 86 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 52058f5806..0d99251260 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -8,14 +8,6 @@ API and ABI deprecation notices are to be posted here. Deprecation Notices ------------------- -* eal: the following functions are deprecated starting from 17.05 and will - be removed in 17.11: - - - ``rte_set_log_level``, replaced by ``rte_log_set_global_level`` - - ``rte_get_log_level``, replaced by ``rte_log_get_global_level`` - - ``rte_set_log_type``, replaced by ``rte_log_set_level`` - - ``rte_get_log_type``, replaced by ``rte_log_get_level`` - * eal: several API and ABI changes are planned for ``rte_devargs`` in v17.11. The format of device command line parameters will change. The bus will need to be explicitly stated in the device declaration. The enum ``rte_devtype`` diff --git a/doc/guides/rel_notes/release_17_11.rst b/doc/guides/rel_notes/release_17_11.rst index a8b113bb1f..e4e98f77e9 100644 --- a/doc/guides/rel_notes/release_17_11.rst +++ b/doc/guides/rel_notes/release_17_11.rst @@ -283,6 +283,14 @@ API Changes The function ``rte_cryptodev_allocate_driver()`` has been modified. An extra parameter ``struct cryptodev_driver *crypto_drv`` has been added. +* **Removed deprecated functions to manage log level or type.** + + The functions ``rte_set_log_level()``, ``rte_get_log_level()``, + ``rte_set_log_type()`` and ``rte_get_log_type()`` have been removed. + They are respectively replaced by ``rte_log_set_global_level()``, + ``rte_log_get_global_level()``, ``rte_log_set_level()`` and + ``rte_log_get_level()``. + ABI Changes ----------- @@ -343,7 +351,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_cmdline.so.2 librte_cryptodev.so.3 librte_distributor.so.1 - librte_eal.so.5 + + librte_eal.so.6 + librte_ethdev.so.8 + librte_eventdev.so.3 librte_gro.so.1 diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 080896f73d..7dc687f888 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -44,8 +44,6 @@ DPDK_2.0 { 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; @@ -78,8 +76,6 @@ DPDK_2.0 { 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; diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index b62b0a6d61..be404136db 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -89,14 +89,6 @@ rte_log_set_global_level(uint32_t level) rte_logs.level = (uint32_t)level; } -/* Set global log level */ -/* replaced by rte_log_set_global_level */ -__rte_deprecated void -rte_set_log_level(uint32_t level) -{ - rte_log_set_global_level(level); -} - /* Get global log level */ uint32_t rte_log_get_global_level(void) @@ -104,14 +96,6 @@ rte_log_get_global_level(void) return rte_logs.level; } -/* Get global log level */ -/* replaced by rte_log_get_global_level */ -uint32_t -rte_get_log_level(void) -{ - return rte_log_get_global_level(); -} - int rte_log_get_level(uint32_t type) { @@ -121,30 +105,6 @@ rte_log_get_level(uint32_t type) return rte_logs.dynamic_types[type].loglevel; } -/* Set global log type */ -__rte_deprecated void -rte_set_log_type(uint32_t type, int enable) -{ - if (type < RTE_LOGTYPE_FIRST_EXT_ID) { - if (enable) - rte_logs.type |= 1 << type; - else - rte_logs.type &= ~(1 << type); - } - - if (enable) - rte_log_set_level(type, 0); - else - rte_log_set_level(type, RTE_LOG_DEBUG); -} - -/* Get global log type */ -__rte_deprecated uint32_t -rte_get_log_type(void) -{ - return rte_logs.type; -} - int rte_log_set_level(uint32_t type, uint32_t level) { diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h index 2fa119983f..16564d41b9 100644 --- a/lib/librte_eal/common/include/rte_log.h +++ b/lib/librte_eal/common/include/rte_log.h @@ -138,12 +138,6 @@ int rte_openlog_stream(FILE *f); */ void rte_log_set_global_level(uint32_t level); -/** - * Deprecated, replaced by rte_log_set_global_level(). - */ -__rte_deprecated -void rte_set_log_level(uint32_t level); - /** * Get the global log level. * @@ -152,29 +146,6 @@ void rte_set_log_level(uint32_t level); */ uint32_t rte_log_get_global_level(void); -/** - * Deprecated, replaced by rte_log_get_global_level(). - */ -__rte_deprecated -uint32_t rte_get_log_level(void); - -/** - * Enable or disable the log type. - * - * @param type - * Log type, for example, RTE_LOGTYPE_EAL. - * @param enable - * True for enable; false for disable. - */ -__rte_deprecated -void rte_set_log_type(uint32_t type, int enable); - -/** - * Get the global log type. - */ -__rte_deprecated -uint32_t rte_get_log_type(void); - /** * Get the log level for a given type. * diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index c173ccfdb1..8802b288ef 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -44,8 +44,6 @@ DPDK_2.0 { 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; @@ -78,8 +76,6 @@ DPDK_2.0 { 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; -- 2.20.1