DAOS-14532 gurt: Replace environment APIs hook

Replace d_free_env_str() function with d_freeenv_str()

Features: mpiio
Required-githooks: true
Signed-off-by: Cedric Koch-Hofer <cedric.koch-hofer@intel.com>

src/bio/bio_xstream.c

@@ -296,7 +296,7 @@ bio_nvme_init(const char *nvme_conf, int numa_node, unsigned int mem_size,
  D_WARN("AIO device(s) will be used!\n");
  nvme_glb.bd_bdev_class = BDEV_CLASS_AIO;
  }
- d_free_env_str(&env);
+ d_freeenv_str(&env);
 
  if (numa_node > 0) {
  bio_numa_node = (unsigned int)numa_node;

src/cart/crt_init.c

@@ -110,7 +110,7 @@ dump_envariables(void)
  D_INFO("%s = %s\n", var_names[i], "********");
  else
  D_INFO("%s = %s\n", var_names[i], val);
- d_free_env_str(&val);
+ d_freeenv_str(&val);
  }
 }
 
@@ -693,7 +693,7 @@ crt_init_opt(crt_group_id_t grpid, uint32_t flags, crt_init_options_t *opt)
  else
  D_DEBUG(DB_ALL, "set group_config_path as %s.\n", path);
  }
- d_free_env_str(&path);
+ d_freeenv_str(&path);
 
  if (opt && opt->cio_auth_key)
  D_STRNDUP(auth_key_env, opt->cio_auth_key, strlen(opt->cio_auth_key));
@@ -896,11 +896,11 @@ crt_init_opt(crt_group_id_t grpid, uint32_t flags, crt_init_options_t *opt)
  D_FREE(domain0);
  D_FREE(provider_str0);
  D_FREE(auth_key0);
- d_free_env_str(&port_str);
- d_free_env_str(&domain_env);
- d_free_env_str(&interface_env);
- d_free_env_str(&provider_env);
- d_free_env_str(&auth_key_env);
+ d_freeenv_str(&port_str);
+ d_freeenv_str(&domain_env);
+ d_freeenv_str(&interface_env);
+ d_freeenv_str(&provider_env);
+ d_freeenv_str(&auth_key_env);
 
  if (rc != 0) {
  D_ERROR("failed, "DF_RC"\n", DP_RC(rc));

src/cart/utils/crt_utils.c

@@ -106,7 +106,7 @@ write_completion_file(void)
  "DAOS_TEST_SHARED_DIR must be set for --write_completion_file "
  "option.\n");
  D_ASPRINTF(completion_file, "%s/test-servers-completed.txt.%d", dir, getpid());
- d_free_env_str(&dir);
+ d_freeenv_str(&dir);
  D_ASSERTF(completion_file != NULL, "Error allocating completion_file string\n");
 
  unlink(completion_file);
@@ -424,7 +424,7 @@ crtu_dc_mgmt_net_print_env(void)
  D_ASSERTF(env != NULL, "Can not retrieve environment varirable %s: " DF_RC "\n",
  var_names[0], DP_RC(rc));
  D_ASPRINTF(msg, "CaRT env setup with:\n\t%s=%s", var_names[0], env);
- d_free_env_str(&env);
+ d_freeenv_str(&env);
  if (msg == NULL) {
  D_INFO("Error allocating CaRT env setup message");
  return;
@@ -438,7 +438,7 @@ crtu_dc_mgmt_net_print_env(void)
  var_names[idx], DP_RC(rc));
 
  D_ASPRINTF(msg, "%s, %s=%s", tmp, var_names[idx], env);
- d_free_env_str(&env);
+ d_freeenv_str(&env);
  D_FREE(tmp);
  if (msg == NULL) {
  D_INFO("Error allocating CaRT env setup message");
@@ -500,7 +500,7 @@ crtu_dc_mgmt_net_cfg_setenv(const char *name)
  if (cli_srx_set) {
  D_ERROR("Client set FI_OFI_RXM_USE_SRX to %s, "
  "but server is unset!\n", cli_srx_set);
- d_free_env_str(&cli_srx_set);
+ d_freeenv_str(&cli_srx_set);
  D_GOTO(cleanup, rc = -DER_INVAL);
  }
  }
@@ -515,7 +515,7 @@ crtu_dc_mgmt_net_cfg_setenv(const char *name)
  D_GOTO(cleanup, rc = d_errno2der(errno));
  } else {
  D_DEBUG(DB_MGMT, "Using client provided CRT_TIMEOUT: %s\n", crt_timeout);
- d_free_env_str(&crt_timeout);
+ d_freeenv_str(&crt_timeout);
  }
 
  d_agetenv_str(&ofi_interface, "OFI_INTERFACE");
@@ -528,7 +528,7 @@ crtu_dc_mgmt_net_cfg_setenv(const char *name)
  D_DEBUG(DB_MGMT,
  "Using client provided OFI_INTERFACE: %s\n",
  ofi_interface);
- d_free_env_str(&ofi_interface);
+ d_freeenv_str(&ofi_interface);
  }
 
  d_agetenv_str(&ofi_domain, "OFI_DOMAIN");
@@ -539,7 +539,7 @@ crtu_dc_mgmt_net_cfg_setenv(const char *name)
  D_GOTO(cleanup, rc = d_errno2der(errno));
  } else {
  D_DEBUG(DB_MGMT, "Using client provided OFI_DOMAIN: %s\n", ofi_domain);
- d_free_env_str(&ofi_domain);
+ d_freeenv_str(&ofi_domain);
  }
 
  crtu_dc_mgmt_net_print_env();
@@ -623,7 +623,7 @@ crtu_cli_start_basic(char *local_group_name, char *srv_group_name,
  rc = crtu_load_group_from_file(grp_cfg_file,
  *crt_ctx, *grp,
  -1, true);
- d_free_env_str(&grp_cfg_file);
+ d_freeenv_str(&grp_cfg_file);
  if (rc != 0)
  D_GOTO(out, rc);
  }
@@ -744,7 +744,7 @@ crtu_srv_start_basic(char *srv_group_name, crt_context_t *crt_ctx,
 
  /* load group info from a config file and delete file upon return */
  rc = crtu_load_group_from_file(grp_cfg_file, crt_ctx[0], *grp, my_rank, true);
- d_free_env_str(&grp_cfg_file);
+ d_freeenv_str(&grp_cfg_file);
  if (rc != 0)
  D_GOTO(out, rc);
 

src/client/api/agent.c

@@ -21,7 +21,7 @@ dc_agent_init()
  DAOS_AGENT_DRPC_SOCK_NAME);
  else
  D_STRNDUP_S(path, DEFAULT_DAOS_AGENT_DRPC_SOCK);
- d_free_env_str(&envpath);
+ d_freeenv_str(&envpath);
 
  if (path == NULL)
  return -DER_NOMEM;

src/client/api/job.c

@@ -47,7 +47,7 @@ dc_job_init(void)
  char *tmp_env = jobid_env;
 
  D_STRNDUP(jobid_env, tmp_env, MAX_ENV_NAME);
- d_free_env_str(&tmp_env);
+ d_freeenv_str(&tmp_env);
  }
  if (jobid_env == NULL)
  D_GOTO(out_err, err = -DER_NOMEM);
@@ -63,7 +63,7 @@ dc_job_init(void)
  char *tmp_jobid = jobid;
 
  D_STRNDUP(jobid, tmp_jobid, MAX_JOBID_LEN);
- d_free_env_str(&tmp_jobid);
+ d_freeenv_str(&tmp_jobid);
  if (jobid == NULL)
  D_GOTO(out_env, err = -DER_NOMEM);
  }

src/client/dfuse/pil4dfs/int_dfs.c

@@ -681,9 +681,9 @@ discover_daos_mount_with_env(void)
 free_fs_root:
  D_FREE(dfs_list[num_dfs].fs_root);
 out:
- d_free_env_str(&container);
- d_free_env_str(&pool);
- d_free_env_str(&fs_root);
+ d_freeenv_str(&container);
+ d_freeenv_str(&pool);
+ d_freeenv_str(&fs_root);
  return rc;
 }
 
@@ -5546,7 +5546,7 @@ init_myhook(void)
  report = true;
  if (strncmp(env_log, "0", 2) == 0 || strncasecmp(env_log, "false", 6) == 0)
  report = false;
- d_free_env_str(&env_log);
+ d_freeenv_str(&env_log);
  }
 
  /* Find dfuse mounts from /proc/mounts */

src/client/pydaos/pydaos_shim.c

@@ -115,7 +115,7 @@ __shim_handle__daos_init(PyObject *self, PyObject *args)
  use_glob_eq = 0;
  }
  }
- d_free_env_str(&override);
+ d_freeenv_str(&override);
  }
 
  return PyInt_FromLong(rc);

src/common/debug.c

@@ -131,7 +131,7 @@ io_bypass_init(void)
  }
  tok = str;
  };
- d_free_env_str(&env);
+ d_freeenv_str(&env);
 }
 
 void
@@ -168,15 +168,15 @@ daos_debug_init_ex(char *logfile, d_dbug_t logmask)
  rc = d_agetenv_str(&logfile, D_LOG_FILE_ENV);
  if (logfile == NULL || strlen(logfile) == 0) {
  flags |= DLOG_FLV_STDOUT;
- d_free_env_str(&logfile);
+ d_freeenv_str(&logfile);
  } else if (!strncmp(logfile, "/dev/null", 9)) {
  /* Don't set up logging or log to stdout if the log file is /dev/null */
- d_free_env_str(&logfile);
+ d_freeenv_str(&logfile);
  }
 
  rc = d_log_init_adv("DAOS", logfile, flags, logmask, DLOG_CRIT,
  log_id_cb);
- d_free_env_str(&logfile);
+ d_freeenv_str(&logfile);
  if (rc != 0) {
  D_PRINT_ERR("Failed to init DAOS debug log: "DF_RC"\n",
  DP_RC(rc));

src/common/misc.c

@@ -689,10 +689,10 @@ daos_crt_init_opt_get(bool server, int ctx_nr)
  strncmp(addr_env, CRT_SOCKET_PROV, strlen(CRT_SOCKET_PROV)) == 0) {
  D_INFO("for sockets provider force it to use regular EP.\n");
  daos_crt_init_opt.cio_use_sep = 0;
- d_free_env_str(&addr_env);
+ d_freeenv_str(&addr_env);
  goto out;
  }
- d_free_env_str(&addr_env);
+ d_freeenv_str(&addr_env);
 
  daos_crt_init_opt.cio_use_sep = 1;
 

src/engine/srv.c

@@ -1055,7 +1055,7 @@ dss_xstreams_init(void)
  D_WARN("Invalid relax mode [%s]\n", env);
  sched_relax_mode = SCHED_RELAX_MODE_NET;
  }
- d_free_env_str(&env);
+ d_freeenv_str(&env);
  }
  D_INFO("CPU relax mode is set to [%s]\n",
  sched_relax_mode2str(sched_relax_mode));

src/gurt/debug.c

@@ -395,7 +395,7 @@ debug_prio_err_load_env(void)
  /* invalid DD_STDERR option */
  if (d_dbglog_data.dd_prio_err == 0)
  D_PRINT_ERR("DD_STDERR = %s - invalid option\n", env);
- d_free_env_str(&env);
+ d_freeenv_str(&env);
 }
 
 void
@@ -424,8 +424,8 @@ d_log_sync_mask(void)
 
  d_log_sync_mask_ex(log_mask, dd_mask);
 
- d_free_env_str(&dd_mask);
- d_free_env_str(&log_mask);
+ d_freeenv_str(&dd_mask);
+ d_freeenv_str(&log_mask);
 }
 
 /**
@@ -553,12 +553,12 @@ d_log_init(void)
  d_agetenv_str(&log_file, D_LOG_FILE_ENV);
  if (log_file == NULL || strlen(log_file) == 0) {
  flags |= DLOG_FLV_STDOUT;
- d_free_env_str(&log_file);
+ d_freeenv_str(&log_file);
  }
 
  rc = d_log_init_adv("CaRT", log_file, flags, DLOG_WARN, DLOG_EMERG,
  NULL);
- d_free_env_str(&log_file);
+ d_freeenv_str(&log_file);
  if (rc != DER_SUCCESS) {
  D_PRINT_ERR("d_log_init_adv failed, rc: %d.\n", rc);
  D_GOTO(out, rc);

src/gurt/dlog.c

@@ -847,20 +847,20 @@ d_log_open(char *tag, int maxfac_hint, int default_mask, int stderr_mask,
 
  if (pri != -1)
  mst.flush_pri = pri;
- d_free_env_str(&env);
+ d_freeenv_str(&env);
  }
 
  d_agetenv_str(&env, D_LOG_TRUNCATE_ENV);
  if (env != NULL && atoi(env) > 0)
  truncate = 1;
- d_free_env_str(&env);
+ d_freeenv_str(&env);
 
  d_agetenv_str(&env, D_LOG_SIZE_ENV);
  if (env != NULL) {
  log_size = d_getenv_size(env);
  if (log_size < LOG_SIZE_MIN)
  log_size = LOG_SIZE_MIN;
- d_free_env_str(&env);
+ d_freeenv_str(&env);
  }
 
  d_agetenv_str(&env, D_LOG_FILE_APPEND_PID_ENV);
@@ -875,12 +875,12 @@ d_log_open(char *tag, int maxfac_hint, int default_mask, int stderr_mask,
  "continuing.\n");
  }
  }
- d_free_env_str(&env);
+ d_freeenv_str(&env);
 
  d_agetenv_str(&env, D_LOG_FILE_APPEND_RANK_ENV);
  if (env && strcmp(env, "0") != 0)
  mst.append_rank = true;
- d_free_env_str(&env);
+ d_freeenv_str(&env);
 
  /* quick sanity check (mst.tag is non-null if already open) */
  if (d_log_xst.tag || !tag ||
@@ -918,7 +918,7 @@ d_log_open(char *tag, int maxfac_hint, int default_mask, int stderr_mask,
  d_agetenv_str(&env, D_LOG_STDERR_IN_LOG_ENV);
  if (env != NULL && atoi(env) > 0)
  merge_stderr = true;
- d_free_env_str(&env);
+ d_freeenv_str(&env);
 
  if (!truncate)
  log_flags |= O_APPEND;
@@ -1107,7 +1107,7 @@ bool d_logfac_is_enabled(const char *fac_name)
  rc = true;
 
 out:
- d_free_env_str(&ddsubsys_env);
+ d_freeenv_str(&ddsubsys_env);
  return rc;
 }
 

src/gurt/fault_inject.c

@@ -616,7 +616,7 @@ d_fault_inject_init(void)
 out:
  if (fp)
  fclose(fp);
- d_free_env_str(&config_file);
+ d_freeenv_str(&config_file);
  return rc;
 }
 

src/gurt/misc.c

@@ -1120,7 +1120,7 @@ d_agetenv_str(char **str_val, const char *name)
  * \param[in,out] str_val Copy of an environment string value.
  */
 void
-d_free_env_str(char **str_val)
+d_freeenv_str(char **str_val)
 {
  assert(str_val != NULL);
 

src/gurt/tests/test_gurt.c

@@ -2140,15 +2140,15 @@ test_d_agetenv_str(void **state)
  assert_int_equal(rc, -DER_SUCCESS);
  assert_non_null(env);
  assert_string_equal(env, "bar");
- d_free_env_str(&env);
+ d_freeenv_str(&env);
  assert_null(env);
 
  getenv_return = "";
  rc = d_agetenv_str(&env, "foo");
  assert_int_equal(rc, -DER_SUCCESS);
  assert_non_null(env);
  assert_string_equal(env, "");
- d_free_env_str(&env);
+ d_freeenv_str(&env);
  assert_null(env);
 
  getenv_return = NULL;

src/include/gurt/common.h

@@ -581,7 +581,7 @@ d_getenv_str(char *str_val, size_t str_size, const char *name);
 int
 d_agetenv_str(char **str_val, const char *name);
 void
-d_free_env_str(char **str_val);
+d_freeenv_str(char **str_val);
 int
 d_getenv_bool(const char *name, bool *bool_val);
 int