From patchwork Thu Dec 16 15:21:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 105163 X-Patchwork-Delegate: thomas@monjalon.net 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 D7147A0032; Thu, 16 Dec 2021 16:21:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D6F340696; Thu, 16 Dec 2021 16:21:44 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 2C8C640143 for ; Thu, 16 Dec 2021 16:21:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639668103; x=1671204103; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rwHNg6LwLHKrUBjZT6z66yeLmliKhs+EQnPRMQhhUqw=; b=DGLxPRthkLhdEdu4gijPUprURNd+OECMoWGw2qhoEtUUOuu/8YtYGaLs Qen4z9+bECSj0Uo4fTwDF0+/6hAmNjRosUxrti/uPnhYNzJiXI0MJcPYF ify5LSMfIIhjjyvg1rURbCT1lEdWMbZRTjQpy7ImcXmkAa2U7h+/z49S5 wQsl2xjKci4MsnP1NX7ae8MNDG2w3m+QtWTIWkwmQN1QZtH5ee50Psy2I U38Tu4jmwvk2Swl3dMv96+/cK1i+ZKH31VEvPj4MjzV/6oklxUzrQG2BY Q30Y8uBMI36W8E8j0ZCZ1BsFyQsHhspFwTUE8joX83rqQZpLBEzoB4fiY w==; X-IronPort-AV: E=McAfee;i="6200,9189,10199"; a="239468831" X-IronPort-AV: E=Sophos;i="5.88,211,1635231600"; d="scan'208";a="239468831" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2021 07:21:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,211,1635231600"; d="scan'208";a="506326710" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by orsmga007.jf.intel.com with ESMTP; 16 Dec 2021 07:21:23 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Dmitry Kozlyuk , Jerin Jacob Subject: [PATCH v2] build/eal: add OS defines for C conditional checks Date: Thu, 16 Dec 2021 15:21:07 +0000 Message-Id: <20211216152107.725239-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211210145330.108256-1-bruce.richardson@intel.com> References: <20211210145330.108256-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 Define a set of macros in the build configuration to allow C runtime code to check the current OS environment. This saves the user having to use ifdefs for e.g. disabling particular tests on Windows. See included documentation changes for usage examples. Signed-off-by: Bruce Richardson Acked-by: Dmitry Kozlyuk Acked-by: Jerin Jacob --- V2: Included feedback from Dmitry to expand on documentation to include guidelines on when to use conditional compilation. --- doc/guides/contributing/coding_style.rst | 53 +++++++++++++++++++++++- lib/eal/meson.build | 7 ++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index 0ec37c019b..66803dcccd 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -136,6 +136,24 @@ For example: Conditional Compilation ~~~~~~~~~~~~~~~~~~~~~~~ +.. note:: + + Conditional compilation should be used only when absolutely necessary, as it increases the number of target binaries that need to be built and tested. + See below for details of some utility macros/defines available to allow ifdefs/macros to be replaced by C conditional in some cases. + +Some high-level guidelines on the use of conditional compilation: + +* If code can compile on all platforms/systems, but cannot run on some due to lack of support, + then regular C conditionals, as described in the next section, should be used instead of conditional compilation. +* If the code in question cannot compile on all systems, but constitutes only a small fragment of + a file, then conditional complication should be used, as described in this section. +* If the code for conditional compilation implements an interface in an OS or platform-specific way, + then create a file for each OS or platform and select the appropriate file using the meson build system. + In most cases, these environment-specific files should be created inside the EAL library, + rather than having each library implement its own abstraction layer. + +Additional style guidance for the use of conditional compilation macros: + * When code is conditionally compiled using ``#ifdef`` or ``#if``, a comment may be added following the matching ``#endif`` or ``#else`` to permit the reader to easily discern where conditionally compiled code regions end. * This comment should be used only for (subjectively) long regions, regions greater than 20 lines, or where a series of nested ``#ifdef``'s may be confusing to the reader. @@ -165,9 +183,40 @@ Conditional Compilation /* Or here. */ #endif /* !COMPAT_43 */ -.. note:: +Defines to Avoid Conditional Compilation +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +In many cases in DPDK, one wants to run code based on the target platform, or runtime environment. +While this can be done using the conditional compilation directives, +e.g. ``#ifdef RTE_EXEC_ENV_LINUX``, present in DPDK for many releases, +this can also be done in many cases using regular ``if`` statements and the following defines: + +* ``RTE_ENV_FREEBSD``, ``RTE_ENV_LINUX``, ``RTE_ENV_WINDOWS`` - these define ids for each operating system environment. +* ``RTE_EXEC_ENV`` - this defines the id of the current environment, i.e. one of the items in list above. +* ``RTE_EXEC_ENV_IS_FREEBSD``, ``RTE_EXEC_ENV_IS_LINUX``, ``RTE_EXEC_ENV_IS_WINDOWS`` - 0/1 values indicating if the current environment is that specified, + shortcuts for checking e.g. ``RTE_EXEC_ENV == RTE_ENV_WINDOWS`` + +Examples of use: + +.. code-block:: c + + /* report a unit tests as unsupported on Windows */ + if (RTE_EXEC_ENV_IS_WINDOWS) + return TEST_SKIPPED; + + /* set different default values depending on OS Environment */ + switch (RTE_EXEC_ENV) { + case RTE_ENV_FREEBSD: + default = x; + break; + case RTE_ENV_LINUX: + default = y; + break; + case RTE_ENV_WINDOWS: + default = z; + break; + } - Conditional compilation should be used only when absolutely necessary, as it increases the number of target binaries that need to be built and tested. C Types ------- diff --git a/lib/eal/meson.build b/lib/eal/meson.build index 1722924f67..056beb9461 100644 --- a/lib/eal/meson.build +++ b/lib/eal/meson.build @@ -10,6 +10,13 @@ if not is_windows subdir('unix') endif +exec_envs = {'freebsd': 0, 'linux': 1, 'windows': 2} +foreach env, id:exec_envs + dpdk_conf.set('RTE_ENV_' + env.to_upper(), id) + dpdk_conf.set10('RTE_EXEC_ENV_IS_' + env.to_upper(), (exec_env == env)) +endforeach +dpdk_conf.set('RTE_EXEC_ENV', exec_envs[exec_env]) + dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1) subdir(exec_env)