From a37f66efd948a96bbfab54cd3faa2ca547d852be Mon Sep 17 00:00:00 2001 From: Cedric Koch-Hofer Date: Sat, 28 Oct 2023 12:12:19 +0000 Subject: [PATCH] DAOS-14532 gurt: Replace environment APIs hook fix clang-format issue. Allow-unstable-test: true Features: mpiio dfuse Required-githooks: true Signed-off-by: Cedric Koch-Hofer --- src/cart/crt_init.c | 76 +++++++++++++++++++------------------- src/cart/utils/crt_utils.c | 17 ++++----- src/mgmt/cli_mgmt.c | 13 +++---- 3 files changed, 52 insertions(+), 54 deletions(-) diff --git a/src/cart/crt_init.c b/src/cart/crt_init.c index 59ce07b52eb..72befef9494 100644 --- a/src/cart/crt_init.c +++ b/src/cart/crt_init.c @@ -19,42 +19,42 @@ struct crt_plugin_gdata crt_plugin_gdata; static bool g_prov_settings_applied[CRT_PROV_COUNT]; /* List of the environment variables used in CaRT */ -static const char *crt_env_names[] = {"D_PROVIDER", - "D_INTERFACE", - "D_DOMAIN", - "D_PORT", - "CRT_PHY_ADDR_STR", - "D_LOG_STDERR_IN_LOG", - "D_LOG_SIZE", - "D_LOG_FILE", - "D_LOG_FILE_APPEND_PID", - "D_LOG_MASK", - "DD_MASK", - "DD_STDERR", - "DD_SUBSYS", - "CRT_TIMEOUT", - "CRT_ATTACH_INFO_PATH", - "OFI_PORT", - "OFI_INTERFACE", - "OFI_DOMAIN", - "CRT_CREDIT_EP_CTX", - "CRT_CTX_SHARE_ADDR", - "CRT_CTX_NUM", - "D_FI_CONFIG", - "FI_UNIVERSE_SIZE", - "CRT_ENABLE_MEM_PIN", - "FI_OFI_RXM_USE_SRX", - "D_LOG_FLUSH", - "CRT_MRC_ENABLE", - "CRT_SECONDARY_PROVIDER", - "D_PROVIDER_AUTH_KEY", - "D_PORT_AUTO_ADJUST", - "D_POLL_TIMEOUT", - "D_LOG_FILE_APPEND_RANK", - "D_QUOTA_RPCS", - "D_POST_INIT", - "D_POST_INCR", - "DAOS_SIGNAL_REGISTER"}; +static const char *crt_env_names[] = {"D_PROVIDER", + "D_INTERFACE", + "D_DOMAIN", + "D_PORT", + "CRT_PHY_ADDR_STR", + "D_LOG_STDERR_IN_LOG", + "D_LOG_SIZE", + "D_LOG_FILE", + "D_LOG_FILE_APPEND_PID", + "D_LOG_MASK", + "DD_MASK", + "DD_STDERR", + "DD_SUBSYS", + "CRT_TIMEOUT", + "CRT_ATTACH_INFO_PATH", + "OFI_PORT", + "OFI_INTERFACE", + "OFI_DOMAIN", + "CRT_CREDIT_EP_CTX", + "CRT_CTX_SHARE_ADDR", + "CRT_CTX_NUM", + "D_FI_CONFIG", + "FI_UNIVERSE_SIZE", + "CRT_ENABLE_MEM_PIN", + "FI_OFI_RXM_USE_SRX", + "D_LOG_FLUSH", + "CRT_MRC_ENABLE", + "CRT_SECONDARY_PROVIDER", + "D_PROVIDER_AUTH_KEY", + "D_PORT_AUTO_ADJUST", + "D_POLL_TIMEOUT", + "D_LOG_FILE_APPEND_RANK", + "D_QUOTA_RPCS", + "D_POST_INIT", + "D_POST_INCR", + "DAOS_SIGNAL_REGISTER"}; static void crt_lib_init(void) __attribute__((__constructor__)); @@ -100,8 +100,8 @@ crt_lib_fini(void) static void dump_envariables(void) { - int i; - char *val; + int i; + char *val; D_INFO("-- ENVARS: --\n"); for (i = 0; i < ARRAY_SIZE(crt_env_names); i++) { diff --git a/src/cart/utils/crt_utils.c b/src/cart/utils/crt_utils.c index a164dfd294c..ea2a95b1d4e 100644 --- a/src/cart/utils/crt_utils.c +++ b/src/cart/utils/crt_utils.c @@ -413,15 +413,15 @@ crtu_dc_mgmt_net_cfg_rank_add(const char *name, crt_group_t *group, int crtu_dc_mgmt_net_cfg_setenv(const char *name) { - int rc; + int rc; char *crt_phy_addr_str; char *crt_ctx_share_addr = NULL; - char *cli_srx_set = NULL; - char *crt_timeout = NULL; - char *ofi_interface; - char *ofi_interface_env = NULL; - char *ofi_domain; - char *ofi_domain_env = NULL; + char *cli_srx_set = NULL; + char *crt_timeout = NULL; + char *ofi_interface; + char *ofi_interface_env = NULL; + char *ofi_domain; + char *ofi_domain_env = NULL; struct dc_mgmt_sys_info crt_net_cfg_info = {0}; Mgmt__GetAttachInfoResp *crt_net_cfg_resp = NULL; @@ -465,8 +465,7 @@ crtu_dc_mgmt_net_cfg_setenv(const char *name) if (rc != 0) D_GOTO(cleanup, rc = d_errno2der(errno)); - D_DEBUG(DB_MGMT, "Using server's value for FI_OFI_RXM_USE_SRX: %s\n", - cli_srx_set); + D_DEBUG(DB_MGMT, "Using server's value for FI_OFI_RXM_USE_SRX: %s\n", cli_srx_set); } else { /* Client may not set it if the server hasn't. */ d_agetenv_str(&cli_srx_set, "FI_OFI_RXM_USE_SRX"); diff --git a/src/mgmt/cli_mgmt.c b/src/mgmt/cli_mgmt.c index 3840cf82bed..78db4c699e4 100644 --- a/src/mgmt/cli_mgmt.c +++ b/src/mgmt/cli_mgmt.c @@ -452,12 +452,12 @@ int dc_mgmt_net_cfg(const char *name) int rc; char *crt_phy_addr_str; char *crt_ctx_share_addr = NULL; - char *cli_srx_set = NULL; + char *cli_srx_set = NULL; char *crt_timeout = NULL; char *ofi_interface; char *ofi_interface_env = NULL; - char *ofi_domain = ""; - char *ofi_domain_env = NULL; + char *ofi_domain = ""; + char *ofi_domain_env = NULL; struct dc_mgmt_sys_info info; Mgmt__GetAttachInfoResp *resp; @@ -495,7 +495,7 @@ int dc_mgmt_net_cfg(const char *name) D_INFO("Setting number of server ranks to %d\n", g_num_serv_ranks); /* These two are always set */ crt_phy_addr_str = info.provider; - rc = d_setenv("CRT_PHY_ADDR_STR", crt_phy_addr_str, 1); + rc = d_setenv("CRT_PHY_ADDR_STR", crt_phy_addr_str, 1); if (rc != 0) D_GOTO(cleanup, rc = d_errno2der(errno)); @@ -518,8 +518,7 @@ int dc_mgmt_net_cfg(const char *name) rc = d_setenv("FI_OFI_RXM_USE_SRX", cli_srx_set, 1); if (rc != 0) D_GOTO(cleanup, rc = d_errno2der(errno)); - D_INFO("Using server's value for FI_OFI_RXM_USE_SRX: %s\n", - cli_srx_set); + D_INFO("Using server's value for FI_OFI_RXM_USE_SRX: %s\n", cli_srx_set); } else { /* Client may not set it if the server hasn't. */ d_agetenv_str(&cli_srx_set, "FI_OFI_RXM_USE_SRX"); @@ -550,7 +549,7 @@ int dc_mgmt_net_cfg(const char *name) d_agetenv_str(&ofi_domain_env, "OFI_DOMAIN"); if (!ofi_interface_env) { ofi_interface = info.interface; - rc = d_setenv("OFI_INTERFACE", ofi_interface, 1); + rc = d_setenv("OFI_INTERFACE", ofi_interface, 1); if (rc != 0) D_GOTO(cleanup, rc = d_errno2der(errno));