From patchwork Fri Jan 20 18:21:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 122428 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E8FBC42439; Fri, 20 Jan 2023 19:22:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 862C242D14; Fri, 20 Jan 2023 19:22:16 +0100 (CET) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 2EC8A4067E for ; Fri, 20 Jan 2023 19:22:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674238935; x=1705774935; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X1JUB5/HJPshrjPh94H4qKiYVd18+5dn590aVNt771I=; b=c/i/hcyM5Zbc2MeCSaGDXlR1MW4QL2ee8HbV24UElln5Oj1eIVuj5c8G Rb5/hEi+s0GMNXARYoKA/oeIomSZN5dHKCxTLjlZyz2p8urqSzF04GgTY VT07qy8xNeUA6U0lRn3Ue3hdn7CcefX7eK6YLTe3dHYzoDb7GAl6T1viN Jy2e13cyTv4fre70PwLFnllRinXLjGEjM7wEyrTpLzIlMT8z5aOSx/DGl cXvTzjCgzPQ2/fpqVLfaKEp3g1Qj6RBYp1TMVThugJyyCnTOAzpTkDI75 YPyfD1A/aEkZad0cW0v0VhZKP3rEqJGlvOf04ghCK0pSBBP/Q8VGClP/I w==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="388012436" X-IronPort-AV: E=Sophos;i="5.97,233,1669104000"; d="scan'208";a="388012436" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 10:22:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="691143400" X-IronPort-AV: E=Sophos;i="5.97,233,1669104000"; d="scan'208";a="691143400" Received: from silpixa00401385.ir.intel.com ([10.237.214.55]) by orsmga008.jf.intel.com with ESMTP; 20 Jan 2023 10:22:03 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson Subject: [PATCH v4 0/3] Split logging functionality out of EAL Date: Fri, 20 Jan 2023 18:21:51 +0000 Message-Id: <20230120182154.481039-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220829151901.376754-1-bruce.richardson@intel.com> References: <20220829151901.376754-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org There is a general desire to reduce the size and scope of EAL. To this end, this patchset makes a (very) small step in that direction by taking the logging functionality out of EAL and putting it into its own library that can be built and maintained separately. As with the first RFC for this, the main obstacle is the "fnmatch" function which is needed by both EAL and the new log function when building on windows. While the function cannot stay in EAL - or we would have a circular dependency, moving it to a new library or just putting it in the log library have the disadvantages that it then "leaks" into the public namespace without an rte_prefix, which could cause issues. Since only a single function is involved, subsequent versions take a different approach to v1, and just moves the offending function to be a static function in a header file. This allows use by multiple libs without conflicting names or making it public. The other complication, as explained in v1 RFC was that of multiple implementations for different OS's. This is solved here in the same way as v1, by including the OS in the name and having meson pick the correct file for each build. Since only one file is involved, there seemed little need for replicating EAL's separate subdirectories per-OS. v4: * Fixed windows build error, due to missing strdup (_strdup on windows) * Added doc updates to programmers guide. v3: * Fixed missing log file for BSD * Removed "eal" from the filenames of files in the log directory * added prefixes to elements in the fnmatch header to avoid conflicts * fixed space indentation in new lines in telemetry.c (checkpatch) * removed "extern int logtype" definition in telemetry.c (checkpatch) * added log directory to list for doxygen scanning Bruce Richardson (3): eal/windows: move fnmatch function to header file log: separate logging functions out of EAL telemetry: use standard logging doc/api/doxy-api.conf.in | 1 + .../prog_guide/env_abstraction_layer.rst | 4 +- doc/guides/prog_guide/index.rst | 1 + doc/guides/prog_guide/log_lib.rst | 115 ++++++++++++ lib/eal/common/eal_common_options.c | 2 +- lib/eal/common/eal_private.h | 7 - lib/eal/common/meson.build | 1 - lib/eal/freebsd/eal.c | 6 +- lib/eal/include/meson.build | 1 - lib/eal/linux/eal.c | 8 +- lib/eal/linux/meson.build | 1 - lib/eal/meson.build | 2 +- lib/eal/version.map | 17 -- lib/eal/windows/eal.c | 2 +- lib/eal/windows/fnmatch.c | 172 ----------------- lib/eal/windows/include/fnmatch.h | 175 ++++++++++++++++-- lib/eal/windows/meson.build | 2 - lib/kvargs/meson.build | 3 +- .../common/eal_common_log.c => log/log.c} | 7 +- lib/log/log_freebsd.c | 12 ++ .../common/eal_log.h => log/log_internal.h} | 18 +- lib/{eal/linux/eal_log.c => log/log_linux.c} | 2 +- .../windows/eal_log.c => log/log_windows.c} | 2 +- lib/log/meson.build | 9 + lib/{eal/include => log}/rte_log.h | 0 lib/log/version.map | 34 ++++ lib/meson.build | 1 + lib/telemetry/meson.build | 3 +- lib/telemetry/telemetry.c | 11 +- lib/telemetry/telemetry_internal.h | 3 +- 30 files changed, 370 insertions(+), 252 deletions(-) create mode 100644 doc/guides/prog_guide/log_lib.rst delete mode 100644 lib/eal/windows/fnmatch.c rename lib/{eal/common/eal_common_log.c => log/log.c} (99%) create mode 100644 lib/log/log_freebsd.c rename lib/{eal/common/eal_log.h => log/log_internal.h} (69%) rename lib/{eal/linux/eal_log.c => log/log_linux.c} (97%) rename lib/{eal/windows/eal_log.c => log/log_windows.c} (93%) create mode 100644 lib/log/meson.build rename lib/{eal/include => log}/rte_log.h (100%) create mode 100644 lib/log/version.map --- 2.37.2