From patchwork Fri Jul 29 13:50:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 15054 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id B669F5323; Fri, 29 Jul 2016 15:55:30 +0200 (CEST) Received: from mail-wm0-f51.google.com (mail-wm0-f51.google.com [74.125.82.51]) by dpdk.org (Postfix) with ESMTP id 7E929376D for ; Fri, 29 Jul 2016 15:55:29 +0200 (CEST) Received: by mail-wm0-f51.google.com with SMTP id f65so291268801wmi.0 for ; Fri, 29 Jul 2016 06:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=gJKWftrQQX+x0Kti0kl5JePpq3bjbbK/Zo7DhU33GUs=; b=GuKx8iG5rYkDzgN/5Dx44wVOe/trGVyDqvKxtXuc7MGzy+lobsWSW9a2HjlnKRlTPi DRguCs9Zg10HJ/7dUfFXkYOVnXCaRhIl2oQsrp2sa5NQTG2IiQRGFmO38DXyRdwlfpVY 7pYbPF37UeVeBEiJbmp8bUJ1Ed4D9GewPpajMRPB4E6gt8JpDEmWBArijB126ek+S9XS ogPUccUEs9jg9Axau14em3Y9q+c0y1sxh7frclq/Lt8G42n80ZQqmuwmKdhgDHTeMgQn ymsRocQQ05EdIis2ZvncwSk20bQfv0jf+ynQtxW9/HFt9uy77lhPYULX5jyvESQFb+ZN qJEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gJKWftrQQX+x0Kti0kl5JePpq3bjbbK/Zo7DhU33GUs=; b=Na2S6SrVMPG5D928Ga/vfOp+CCXcw/NvKMh3IZvyPPrFZ9aOoWes7Iu05ogTaFR0Wy 2NIgVc7fdk5QcIkzlXuaze2KFaQ9sgyPLmeaxaX9LLe5uzsTVgVjaTHP8qyrdmMI0tny kXay45n0ZM4pIa5rGC6TZ83HIPK05JV93Bkz3+6zEtw1Vl4ZQSogMvHfSoA1f/QmenmE t5BmCtvBK/1rXCnaDyAmN0d6QapJe6DrJ8RxNTu1XQvlQTlbIo+256fNqfh/ToFmlQXd NxCGMPPZ1jCZ90U4NQWqYig0UMCgp7rxYjNKAa8QNmdOvVwfWmUaClmbxL68J6u3shW+ iniw== X-Gm-Message-State: AEkoouv8gFGe+0NYY1qxMtYm0GxGCQeb5YwbFfS20s4tAat0MqQEKXAST7W6Pm4XCntk4xtR X-Received: by 10.194.149.176 with SMTP id ub16mr38609286wjb.54.1469800528769; Fri, 29 Jul 2016 06:55:28 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id h7sm16699055wjd.17.2016.07.29.06.55.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Jul 2016 06:55:28 -0700 (PDT) From: Thomas Monjalon To: dev@dpdk.org Date: Fri, 29 Jul 2016 15:50:28 +0200 Message-Id: <1469800228-29558-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1469797306-14527-1-git-send-email-thomas.monjalon@6wind.com> References: <1469797306-14527-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v2] log: remove history dump X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The log history feature was deprecated in 16.07. The remaining empty functions are removed in 16.11. Signed-off-by: Thomas Monjalon Acked-by: David Marchand --- v2: fix LIBABIVER and compilation of test --- app/test/test.h | 5 +++- doc/guides/rel_notes/deprecation.rst | 3 --- doc/guides/rel_notes/release_16_11.rst | 4 +++- lib/librte_eal/bsdapp/eal/Makefile | 2 +- lib/librte_eal/common/eal_common_log.c | 19 --------------- lib/librte_eal/common/include/rte_log.h | 41 --------------------------------- lib/librte_eal/linuxapp/eal/Makefile | 2 +- 7 files changed, 9 insertions(+), 67 deletions(-) diff --git a/app/test/test.h b/app/test/test.h index 467b9c0..74d6021 100644 --- a/app/test/test.h +++ b/app/test/test.h @@ -33,9 +33,12 @@ #ifndef _TEST_H_ #define _TEST_H_ + #include #include -#include "rte_log.h" + +#include +#include #define TEST_SUCCESS (0) #define TEST_FAILED (-1) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index 8263d03..96db661 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -8,9 +8,6 @@ API and ABI deprecation notices are to be posted here. Deprecation Notices ------------------- -* The log history is deprecated. - It is voided in 16.07 and will be removed in release 16.11. - * The ethdev library file will be renamed from libethdev.* to librte_ethdev.* in release 16.11 in order to have a more consistent namespace. diff --git a/doc/guides/rel_notes/release_16_11.rst b/doc/guides/rel_notes/release_16_11.rst index a6e3307..0b9022d 100644 --- a/doc/guides/rel_notes/release_16_11.rst +++ b/doc/guides/rel_notes/release_16_11.rst @@ -94,6 +94,8 @@ API Changes This section is a comment. Make sure to start the actual text at the margin. +* The log history is removed. + ABI Changes ----------- @@ -131,7 +133,7 @@ The libraries prepended with a plus sign were incremented in this version. librte_cmdline.so.2 librte_cryptodev.so.1 librte_distributor.so.1 - librte_eal.so.2 + + librte_eal.so.3 librte_hash.so.2 librte_ip_frag.so.1 librte_ivshmem.so.1 diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 988cbbc..7a0fea5 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -48,7 +48,7 @@ LDLIBS += -lgcc_s EXPORT_MAP := rte_eal_version.map -LIBABIVER := 2 +LIBABIVER := 3 # specific to linuxapp exec-env SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) := eal.c diff --git a/lib/librte_eal/common/eal_common_log.c b/lib/librte_eal/common/eal_common_log.c index 7916c78..967991a 100644 --- a/lib/librte_eal/common/eal_common_log.c +++ b/lib/librte_eal/common/eal_common_log.c @@ -64,19 +64,6 @@ static RTE_DEFINE_PER_LCORE(struct log_cur_msg, log_cur_msg); /* default logs */ -int -rte_log_add_in_history(const char *buf __rte_unused, size_t size __rte_unused) -{ - return 0; -} - -void -rte_log_set_history(int enable) -{ - if (enable) - RTE_LOG(WARNING, EAL, "The log history is deprecated.\n"); -} - /* Change the stream that will be used by logging system */ int rte_openlog_stream(FILE *f) @@ -131,12 +118,6 @@ int rte_log_cur_msg_logtype(void) return RTE_PER_LCORE(log_cur_msg).logtype; } -/* Dump log history to file */ -void -rte_log_dump_history(FILE *out __rte_unused) -{ -} - /* * Generates a log message The message will be sent in the stream * defined by the previous call to rte_openlog_stream(). diff --git a/lib/librte_eal/common/include/rte_log.h b/lib/librte_eal/common/include/rte_log.h index b1add04..919563c 100644 --- a/lib/librte_eal/common/include/rte_log.h +++ b/lib/librte_eal/common/include/rte_log.h @@ -42,8 +42,6 @@ * This file provides a log API to RTE applications. */ -#include "rte_common.h" /* for __rte_deprecated macro */ - #ifdef __cplusplus extern "C" { #endif @@ -181,45 +179,6 @@ int rte_log_cur_msg_loglevel(void); int rte_log_cur_msg_logtype(void); /** - * @deprecated - * Enable or disable the history (enabled by default) - * - * @param enable - * true to enable, or 0 to disable history. - */ -__rte_deprecated -void rte_log_set_history(int enable); - -/** - * @deprecated - * Dump the log history to a file - * - * @param f - * A pointer to a file for output - */ -__rte_deprecated -void rte_log_dump_history(FILE *f); - -/** - * @deprecated - * Add a log message to the history. - * - * This function can be called from a user-defined log stream. It adds - * the given message in the history that can be dumped using - * rte_log_dump_history(). - * - * @param buf - * A data buffer containing the message to be saved in the history. - * @param size - * The length of the data buffer. - * @return - * - 0: Success. - * - (-ENOBUFS) if there is no room to store the message. - */ -__rte_deprecated -int rte_log_add_in_history(const char *buf, size_t size); - -/** * Generates a log message. * * The message will be sent in the stream defined by the previous call diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 182729c..3a7631a 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -37,7 +37,7 @@ ARCH_DIR ?= $(RTE_ARCH) EXPORT_MAP := rte_eal_version.map VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR) -LIBABIVER := 2 +LIBABIVER := 3 VPATH += $(RTE_SDK)/lib/librte_eal/common