From 542f4b67f95a6fec71a8b966012d83b8be14bdc0 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 27 Jan 2003 21:28:15 +0000
Subject: [PATCH] Replace FREE_NULL with xfree where appropriate.
---
src/slurmctld/job_mgr.c | 44 +++++++++++++++---------------
src/slurmctld/job_scheduler.c | 4 +--
src/slurmctld/node_mgr.c | 8 +++---
src/slurmctld/node_scheduler.c | 12 ++++----
src/slurmctld/read_config.c | 50 +++++++++++++++++-----------------
5 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index a9635115b27..cc668d92ab0 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -195,17 +195,17 @@ void delete_job_details(struct job_record *job_entry)
if (job_entry->details->magic != DETAILS_MAGIC)
fatal
("delete_job_details: passed invalid job details pointer");
- FREE_NULL(job_entry->details->req_nodes);
- FREE_NULL(job_entry->details->exc_nodes);
+ xfree(job_entry->details->req_nodes);
+ xfree(job_entry->details->exc_nodes);
FREE_NULL_BITMAP(job_entry->details->req_node_bitmap);
FREE_NULL_BITMAP(job_entry->details->exc_node_bitmap);
- FREE_NULL(job_entry->details->credential.node_list);
- FREE_NULL(job_entry->details->features);
- FREE_NULL(job_entry->details->err);
- FREE_NULL(job_entry->details->in);
- FREE_NULL(job_entry->details->out);
- FREE_NULL(job_entry->details->work_dir);
- FREE_NULL(job_entry->details);
+ xfree(job_entry->details->credential.node_list);
+ xfree(job_entry->details->features);
+ xfree(job_entry->details->err);
+ xfree(job_entry->details->in);
+ xfree(job_entry->details->out);
+ xfree(job_entry->details->work_dir);
+ xfree(job_entry->details);
}
/* _delete_job_desc_files - delete job descriptor related files */
@@ -534,9 +534,9 @@ static int _load_job_state(Buf buffer)
return SLURM_SUCCESS;
unpack_error:
- FREE_NULL(nodes);
- FREE_NULL(partition);
- FREE_NULL(name);
+ xfree(nodes);
+ xfree(partition);
+ xfree(name);
FREE_NULL_BITMAP(node_bitmap);
return SLURM_FAILURE;
}
@@ -657,15 +657,15 @@ static int _load_job_details(struct job_record *job_ptr, Buf buffer)
return SLURM_SUCCESS;
unpack_error:
- FREE_NULL(req_nodes);
- FREE_NULL(exc_nodes);
+ xfree(req_nodes);
+ xfree(exc_nodes);
FREE_NULL_BITMAP(req_node_bitmap);
FREE_NULL_BITMAP(exc_node_bitmap);
- FREE_NULL(features);
- FREE_NULL(err);
- FREE_NULL(in);
- FREE_NULL(out);
- FREE_NULL(work_dir);
+ xfree(features);
+ xfree(err);
+ xfree(in);
+ xfree(out);
+ xfree(work_dir);
return SLURM_FAILURE;
}
@@ -733,7 +733,7 @@ static int _load_step_state(struct job_record *job_ptr, Buf buffer)
return SLURM_SUCCESS;
unpack_error:
- FREE_NULL(step_node_list);
+ xfree(step_node_list);
return SLURM_FAILURE;
}
@@ -2456,7 +2456,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if (job_specs->features && detail_ptr) {
if (super_user) {
- FREE_NULL(detail_ptr->features);
+ xfree(detail_ptr->features);
detail_ptr->features = job_specs->features;
info("update_job: setting features to %s for job_id %u",
job_specs->features, job_specs->job_id);
@@ -2504,7 +2504,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
error_code = ESLURM_INVALID_NODE_NAME;
}
if (req_bitmap) {
- FREE_NULL(detail_ptr->req_nodes);
+ xfree(detail_ptr->req_nodes);
detail_ptr->req_nodes =
job_specs->req_nodes;
FREE_NULL_BITMAP(detail_ptr->req_node_bitmap);
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 015765084fc..80b6d941919 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -161,8 +161,8 @@ int schedule(void)
}
}
- FREE_NULL(failed_parts);
- FREE_NULL(job_queue);
+ xfree(failed_parts);
+ xfree(job_queue);
unlock_slurmctld(job_write_lock);
return job_cnt;
}
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 2177cc3c617..df55ae1a587 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -471,7 +471,7 @@ int load_all_node_state ( void )
error ("Invalid data for node %s: cpus=%u, state=%u",
node_name, cpus, node_state);
error ("No more node data will be processed from the checkpoint file");
- FREE_NULL (node_name);
+ xfree (node_name);
error_code = EINVAL;
break;
@@ -489,7 +489,7 @@ int load_all_node_state ( void )
error ("Node %s has vanished from configuration",
node_name);
}
- FREE_NULL (node_name);
+ xfree (node_name);
}
free_buf (buffer);
@@ -673,8 +673,8 @@ static void _list_delete_config (void *config_entry)
struct config_record *config_record_point;
config_record_point = (struct config_record *) config_entry;
- FREE_NULL (config_record_point->feature);
- FREE_NULL (config_record_point->nodes);
+ xfree (config_record_point->feature);
+ xfree (config_record_point->nodes);
FREE_NULL_BITMAP (config_record_point->node_bitmap);
xfree (config_record_point);
}
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index fdd3ae0fc60..390cc7134bd 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -467,11 +467,11 @@ _pick_best_quadrics(bitstr_t * bitmap, bitstr_t * req_bitmap,
max_nodes && ((max_nodes - rem_nodes) >= min_nodes))
error_code = SLURM_SUCCESS;
- FREE_NULL(consec_cpus);
- FREE_NULL(consec_nodes);
- FREE_NULL(consec_start);
- FREE_NULL(consec_end);
- FREE_NULL(consec_req);
+ xfree(consec_cpus);
+ xfree(consec_nodes);
+ xfree(consec_start);
+ xfree(consec_end);
+ xfree(consec_req);
return error_code;
}
@@ -899,7 +899,7 @@ static int _build_node_list(struct job_record *job_ptr,
if (node_set_inx == 0) {
info("No nodes satisfy job %u requirements",
job_ptr->job_id);
- FREE_NULL(node_set_ptr);
+ xfree(node_set_ptr);
return ESLURM_REQUESTED_NODE_CONFIG_UNAVAILABLE;
}
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 75212e13713..ebc36741a3e 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -317,7 +317,7 @@ static int _parse_node_spec(char *in_line)
getnodename(this_node_name, 128);
}
if (strcasecmp(this_node_name, "DEFAULT") == 0) {
- FREE_NULL(node_name);
+ xfree(node_name);
if (cpus_val != NO_VAL)
default_config_record.cpus = cpus_val;
if (real_memory_val != NO_VAL)
@@ -331,7 +331,7 @@ static int _parse_node_spec(char *in_line)
if (state_val != NO_VAL)
default_node_record.node_state = state_val;
if (feature) {
- FREE_NULL(default_config_record.feature);
+ xfree(default_config_record.feature);
default_config_record.feature = feature;
feature = NULL;
}
@@ -355,7 +355,7 @@ static int _parse_node_spec(char *in_line)
if (weight_val != NO_VAL)
config_point->weight = weight_val;
if (feature) {
- FREE_NULL(config_point->feature);
+ xfree(config_point->feature);
config_point->feature = feature;
feature = NULL;
}
@@ -400,17 +400,17 @@ static int _parse_node_spec(char *in_line)
}
/* free allocated storage */
- FREE_NULL(node_addr);
+ xfree(node_addr);
if (addr_list)
hostlist_destroy(addr_list);
hostlist_destroy(host_list);
return error_code;
cleanup:
- FREE_NULL(node_addr);
- FREE_NULL(node_name);
- FREE_NULL(feature);
- FREE_NULL(state);
+ xfree(node_addr);
+ xfree(node_name);
+ xfree(feature);
+ xfree(state);
return error_code;
}
@@ -542,12 +542,12 @@ static int _parse_part_spec(char *in_line)
if (shared_val != NO_VAL)
default_part.shared = shared_val;
if (allow_groups) {
- FREE_NULL(default_part.allow_groups);
+ xfree(default_part.allow_groups);
default_part.allow_groups = allow_groups;
allow_groups = NULL;
}
if (nodes) {
- FREE_NULL(default_part.nodes);
+ xfree(default_part.nodes);
default_part.nodes = nodes;
nodes = NULL;
}
@@ -582,12 +582,12 @@ static int _parse_part_spec(char *in_line)
if (shared_val != NO_VAL)
part_record_point->shared = shared_val;
if (allow_groups) {
- FREE_NULL(part_record_point->allow_groups);
+ xfree(part_record_point->allow_groups);
part_record_point->allow_groups = allow_groups;
allow_groups = NULL;
}
if (nodes) {
- FREE_NULL(part_record_point->nodes);
+ xfree(part_record_point->nodes);
if (strcmp(nodes, "localhost") == 0) {
xfree(nodes);
nodes = xmalloc(128);
@@ -602,13 +602,13 @@ static int _parse_part_spec(char *in_line)
return 0;
cleanup:
- FREE_NULL(allow_groups);
- FREE_NULL(default_str);
- FREE_NULL(root_str);
- FREE_NULL(nodes);
- FREE_NULL(partition_name);
- FREE_NULL(shared_str);
- FREE_NULL(state_str);
+ xfree(allow_groups);
+ xfree(default_str);
+ xfree(root_str);
+ xfree(nodes);
+ xfree(partition_name);
+ xfree(shared_str);
+ xfree(state_str);
return error_code;
}
@@ -658,7 +658,7 @@ int read_slurm_conf(int recover)
error
("read_slurm_conf line %d, of input file %s too long",
line_num, slurmctld_conf.slurm_conf);
- FREE_NULL(old_node_table_ptr);
+ xfree(old_node_table_ptr);
fclose(slurm_spec_file);
return E2BIG;
break;
@@ -688,21 +688,21 @@ int read_slurm_conf(int recover)
if ((error_code =
parse_config_spec(in_line, &slurmctld_conf))) {
fclose(slurm_spec_file);
- FREE_NULL(old_node_table_ptr);
+ xfree(old_node_table_ptr);
return error_code;
}
/* node configuration parameters */
if ((error_code = _parse_node_spec(in_line))) {
fclose(slurm_spec_file);
- FREE_NULL(old_node_table_ptr);
+ xfree(old_node_table_ptr);
return error_code;
}
/* partition configuration parameters */
if ((error_code = _parse_part_spec(in_line))) {
fclose(slurm_spec_file);
- FREE_NULL(old_node_table_ptr);
+ xfree(old_node_table_ptr);
return error_code;
}
@@ -716,13 +716,13 @@ int read_slurm_conf(int recover)
if (default_part_loc == NULL) {
error("read_slurm_conf: default partition not set.");
- FREE_NULL(old_node_table_ptr);
+ xfree(old_node_table_ptr);
return EINVAL;
}
if (node_record_count < 1) {
error("read_slurm_conf: no nodes configured.");
- FREE_NULL(old_node_table_ptr);
+ xfree(old_node_table_ptr);
return EINVAL;
}
--
GitLab