diff --git a/slurm/slurmdb.h b/slurm/slurmdb.h
index c0feb275ed5ba33a64e12edd5fdbd4f02d73f8a9..7ad62f3247c1b569195abf6861295ad6236188d3 100644
--- a/slurm/slurmdb.h
+++ b/slurm/slurmdb.h
@@ -352,7 +352,7 @@ typedef struct {
* underlying group of
* associations can run for */
uint64_t grp_cpu_run_mins; /* max number of cpu minutes the
- * undeflying group of
+ * underlying group of
* assoiciations can
* having running at one time */
uint32_t grp_cpus; /* max number of cpus the
diff --git a/src/api/allocate.c b/src/api/allocate.c
index 34c712449c2f343284865ae6730e3273ca960df5..16519b5fbb9f1f93a29bfcbdb32b46b857471f92 100644
--- a/src/api/allocate.c
+++ b/src/api/allocate.c
@@ -321,7 +321,7 @@ int slurm_job_will_run (job_desc_msg_t *req)
return SLURM_PROTOCOL_ERROR;
break;
case RESPONSE_JOB_WILL_RUN:
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
type = "cnodes";
will_run_resp = (will_run_response_msg_t *) resp_msg.data;
slurm_make_time_str(&will_run_resp->start_time,
@@ -742,7 +742,7 @@ _accept_msg_connection(int listen_fd,
msg = xmalloc(sizeof(slurm_msg_t));
slurm_msg_t_init(msg);
- if ((rc = slurm_receive_msg(conn_fd, msg, 0)) != 0) {
+ if((rc = slurm_receive_msg(conn_fd, msg, 0)) != 0) {
slurm_free_msg(msg);
if (errno == EINTR) {
diff --git a/src/api/block_info.c b/src/api/block_info.c
index e40983b81f990dd31486d579febd8c52447bceca..c0186dbbf4a34aa5a5594d850b1acbc738428736 100644
--- a/src/api/block_info.c
+++ b/src/api/block_info.c
@@ -143,14 +143,14 @@ char *slurm_sprint_block_info(
xstrfmtcat(out, "User=%s ConnType=%s",
block_ptr->owner_name,
conn_type_string(block_ptr->conn_type));
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
xstrfmtcat(out, " NodeUse=%s",
node_use_string(block_ptr->node_use));
xstrcat(out, line_end);
/****** Line 3 ******/
- if (block_ptr->ionodes)
+ if(block_ptr->ionodes)
xstrfmtcat(out, "BasePartitions=%s[%s] BPIndices=",
block_ptr->nodes, block_ptr->ionodes);
else
@@ -170,7 +170,7 @@ char *slurm_sprint_block_info(
xstrfmtcat(out, "MloaderImage=%s%s",
block_ptr->mloaderimage, line_end);
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
/****** Line 5 ******/
xstrfmtcat(out, "BlrtsImage=%s%s", block_ptr->blrtsimage,
line_end);
diff --git a/src/api/config_info.c b/src/api/config_info.c
index 5591467990d36412c67a48d784190e0d6ea29033..e52d499e2bfe50e9087db1663b23f2c42af8ee86 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -147,11 +147,11 @@ void slurm_print_ctl_conf ( FILE* out,
char *select_title = "";
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
select_title = "\nBluegene/L configuration\n";
- else if (cluster_flags & CLUSTER_FLAG_BGP)
+ else if(cluster_flags & CLUSTER_FLAG_BGP)
select_title = "\nBluegene/P configuration\n";
- else if (cluster_flags & CLUSTER_FLAG_BGQ)
+ else if(cluster_flags & CLUSTER_FLAG_BGQ)
select_title = "\nBluegene/Q configuration\n";
if ( slurm_ctl_conf_ptr == NULL )
@@ -163,7 +163,7 @@ void slurm_print_ctl_conf ( FILE* out,
time_str);
ret_list = slurm_ctl_conf_2_key_pairs(slurm_ctl_conf_ptr);
- if (ret_list) {
+ if(ret_list) {
slurm_print_key_pairs(out, ret_list, tmp_str);
list_destroy((List)ret_list);
@@ -319,7 +319,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair = xmalloc(sizeof(config_key_pair_t));
list_append(ret_list, key_pair);
key_pair->name = xstrdup("DisableRootJobs");
- if (slurm_ctl_conf_ptr->disable_root_jobs)
+ if(slurm_ctl_conf_ptr->disable_root_jobs)
key_pair->value = xstrdup("YES");
else
key_pair->value = xstrdup("NO");
@@ -327,7 +327,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair = xmalloc(sizeof(config_key_pair_t));
list_append(ret_list, key_pair);
key_pair->name = xstrdup("EnforcePartLimits");
- if (slurm_ctl_conf_ptr->enforce_part_limits)
+ if(slurm_ctl_conf_ptr->enforce_part_limits)
key_pair->value = xstrdup("YES");
else
key_pair->value = xstrdup("NO");
@@ -391,8 +391,8 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(tmp_str);
list_append(ret_list, key_pair);
- if (slurm_ctl_conf_ptr->hash_val != NO_VAL) {
- if (slurm_ctl_conf_ptr->hash_val == slurm_get_hash_val())
+ if(slurm_ctl_conf_ptr->hash_val != NO_VAL) {
+ if(slurm_ctl_conf_ptr->hash_val == slurm_get_hash_val())
snprintf(tmp_str, sizeof(tmp_str), "Match");
else {
snprintf(tmp_str, sizeof(tmp_str),
@@ -418,7 +418,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->health_check_program);
list_append(ret_list, key_pair);
- if (cluster_flags & CLUSTER_FLAG_XCPU) {
+ if(cluster_flags & CLUSTER_FLAG_XCPU) {
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("HAVE_XCPU");
key_pair->value = xstrdup("1");
@@ -585,7 +585,7 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
key_pair->value = xstrdup(slurm_ctl_conf_ptr->mpi_params);
list_append(ret_list, key_pair);
- if (cluster_flags & CLUSTER_FLAG_MULTSD) {
+ if(cluster_flags & CLUSTER_FLAG_MULTSD) {
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("MULTIPLE_SLURMD");
key_pair->value = xstrdup("1");
@@ -1156,8 +1156,8 @@ slurm_load_slurmd_status(slurmd_status_t **slurmd_status_ptr)
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
- if (cluster_flags & CLUSTER_FLAG_MULTSD) {
- if ((this_addr = getenv("SLURMD_NODENAME"))) {
+ if(cluster_flags & CLUSTER_FLAG_MULTSD) {
+ if((this_addr = getenv("SLURMD_NODENAME"))) {
slurm_conf_get_addr(this_addr, &req_msg.address);
} else {
this_addr = "localhost";
diff --git a/src/api/job_info.c b/src/api/job_info.c
index 481b88f30c18c46de6c2128b910cb25e9a1a5d1e..e7b0a4f15868537b2373768a860c5605f27059ff 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -92,14 +92,14 @@ static void _sprint_range(char *str, uint32_t str_size,
char tmp[128];
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit((float)lower, tmp, sizeof(tmp), UNIT_NONE);
} else {
snprintf(tmp, sizeof(tmp), "%u", lower);
}
if (upper > 0) {
char tmp2[128];
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit((float)upper, tmp2,
sizeof(tmp2), UNIT_NONE);
} else {
@@ -160,7 +160,7 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
char select_buf[122];
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
nodelist = "BP_List";
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
@@ -195,7 +195,7 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
"Priority=%u Account=%s QOS=%s",
job_ptr->priority, job_ptr->account, job_ptr->qos);
xstrcat(out, tmp_line);
- if (slurm_get_track_wckey()) {
+ if(slurm_get_track_wckey()) {
snprintf(tmp_line, sizeof(tmp_line),
" WCKey=%s", job_ptr->wckey);
xstrcat(out, tmp_line);
@@ -374,7 +374,7 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
/****** Line 13 ******/
xstrfmtcat(out, "%s=", nodelist);
xstrcat(out, job_ptr->nodes);
- if (job_ptr->nodes && ionodes) {
+ if(job_ptr->nodes && ionodes) {
snprintf(tmp_line, sizeof(tmp_line), "[%s]", ionodes);
xstrcat(out, tmp_line);
xfree(ionodes);
@@ -385,14 +385,14 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
xstrcat(out, "\n ");
/****** Line 14 ******/
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&min_nodes);
if ((min_nodes == 0) || (min_nodes == NO_VAL)) {
min_nodes = job_ptr->num_nodes;
max_nodes = job_ptr->max_nodes;
- } else if (job_ptr->max_nodes)
+ } else if(job_ptr->max_nodes)
max_nodes = min_nodes;
} else {
min_nodes = job_ptr->num_nodes;
@@ -425,7 +425,7 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
if (!job_resrcs)
goto line15;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
if ((job_resrcs->cpu_array_cnt > 0) &&
(job_resrcs->cpu_array_value) &&
(job_resrcs->cpu_array_reps)) {
@@ -592,7 +592,7 @@ line15:
} else
tmp6_ptr = "Node";
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit((float)job_ptr->pn_min_cpus,
tmp1, sizeof(tmp1), UNIT_NONE);
snprintf(tmp_line, sizeof(tmp_line), "MinCPUsNode=%s", tmp1);
@@ -656,7 +656,7 @@ line15:
xstrcat(out, tmp_line);
}
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
/****** Line 20 (optional) ******/
select_g_select_jobinfo_sprint(job_ptr->select_jobinfo,
select_buf, sizeof(select_buf),
@@ -683,7 +683,7 @@ line15:
xstrcat(out, select_buf);
}
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
/****** Line 22 (optional) ******/
select_g_select_jobinfo_sprint(
job_ptr->select_jobinfo,
@@ -708,7 +708,7 @@ line15:
xstrcat(out, " ");
else
xstrcat(out, "\n ");
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
snprintf(tmp_line, sizeof(tmp_line),
"LinuxImage=%s", select_buf);
else
@@ -739,7 +739,7 @@ line15:
xstrcat(out, " ");
else
xstrcat(out, "\n ");
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
snprintf(tmp_line, sizeof(tmp_line),
"RamDiskImage=%s", select_buf);
else
@@ -881,8 +881,8 @@ slurm_pid2jobid (pid_t job_pid, uint32_t *jobid)
slurm_msg_t_init(&req_msg);
slurm_msg_t_init(&resp_msg);
- if (cluster_flags & CLUSTER_FLAG_MULTSD) {
- if ((this_addr = getenv("SLURMD_NODENAME"))) {
+ if(cluster_flags & CLUSTER_FLAG_MULTSD) {
+ if((this_addr = getenv("SLURMD_NODENAME"))) {
slurm_conf_get_addr(this_addr, &req_msg.address);
} else {
this_addr = "localhost";
@@ -911,13 +911,13 @@ slurm_pid2jobid (pid_t job_pid, uint32_t *jobid)
rc = slurm_send_recv_node_msg(&req_msg, &resp_msg, 0);
- if (rc != 0 || !resp_msg.auth_cred) {
+ if(rc != 0 || !resp_msg.auth_cred) {
error("slurm_pid2jobid: %m");
- if (resp_msg.auth_cred)
+ if(resp_msg.auth_cred)
g_slurm_auth_destroy(resp_msg.auth_cred);
return SLURM_ERROR;
}
- if (resp_msg.auth_cred)
+ if(resp_msg.auth_cred)
g_slurm_auth_destroy(resp_msg.auth_cred);
switch (resp_msg.msg_type) {
case RESPONSE_JOB_ID:
@@ -1123,7 +1123,7 @@ extern int slurm_job_cpus_allocated_on_node_id(
for (i = 0; i < job_resrcs_ptr->cpu_array_cnt; i++) {
start_node += job_resrcs_ptr->cpu_array_reps[i];
- if (start_node >= node_id)
+ if(start_node >= node_id)
break;
}
diff --git a/src/api/job_step_info.c b/src/api/job_step_info.c
index d3464ed27b675e928dc971867aa002b3a84946ce..ad27c646fc4a77058454d91ffca0f3bc401ebf89 100644
--- a/src/api/job_step_info.c
+++ b/src/api/job_step_info.c
@@ -57,7 +57,7 @@ static int _sort_pids_by_name(job_step_pids_t *rec_a, job_step_pids_t *rec_b)
{
int diff = 0;
- if (!rec_a->node_name || !rec_b->node_name)
+ if(!rec_a->node_name || !rec_b->node_name)
return 0;
diff = strcmp(rec_a->node_name, rec_b->node_name);
@@ -71,7 +71,7 @@ static int _sort_pids_by_name(job_step_pids_t *rec_a, job_step_pids_t *rec_b)
static int _sort_stats_by_name(job_step_stat_t *rec_a, job_step_stat_t *rec_b)
{
- if (!rec_a->step_pids || !rec_b->step_pids)
+ if(!rec_a->step_pids || !rec_b->step_pids)
return 0;
return _sort_pids_by_name(rec_a->step_pids, rec_b->step_pids);
@@ -301,8 +301,8 @@ extern int slurm_job_step_stat(uint32_t job_id, uint32_t step_id,
xassert(resp);
- if (!node_list) {
- if (!(step_layout =
+ if(!node_list) {
+ if(!(step_layout =
slurm_job_step_layout_get(job_id, step_id))) {
rc = errno;
error("slurm_job_step_get_stat: "
@@ -313,7 +313,7 @@ extern int slurm_job_step_stat(uint32_t job_id, uint32_t step_id,
node_list = step_layout->node_list;
}
- if (!*resp) {
+ if(!*resp) {
resp_out = xmalloc(sizeof(job_step_stat_response_msg_t));
*resp = resp_out;
created = 1;
@@ -333,10 +333,10 @@ extern int slurm_job_step_stat(uint32_t job_id, uint32_t step_id,
req_msg.msg_type = REQUEST_JOB_STEP_STAT;
req_msg.data = &req;
- if (!(ret_list = slurm_send_recv_msgs(node_list, &req_msg, 0, false))) {
+ if(!(ret_list = slurm_send_recv_msgs(node_list, &req_msg, 0, false))) {
error("slurm_job_step_stat: got an error no list returned");
rc = SLURM_ERROR;
- if (created) {
+ if(created) {
slurm_job_step_stat_response_msg_free(resp_out);
*resp = NULL;
}
@@ -347,7 +347,7 @@ extern int slurm_job_step_stat(uint32_t job_id, uint32_t step_id,
while((ret_data_info = list_next(itr))) {
switch (ret_data_info->type) {
case RESPONSE_JOB_STEP_STAT:
- if (!resp_out->stats_list)
+ if(!resp_out->stats_list)
resp_out->stats_list = list_create(
slurm_free_job_step_stat);
list_push(resp_out->stats_list,
@@ -375,7 +375,7 @@ extern int slurm_job_step_stat(uint32_t job_id, uint32_t step_id,
list_iterator_destroy(itr);
list_destroy(ret_list);
- if (resp_out->stats_list)
+ if(resp_out->stats_list)
list_sort(resp_out->stats_list, (ListCmpF)_sort_stats_by_name);
cleanup:
slurm_step_layout_destroy(step_layout);
@@ -409,8 +409,8 @@ extern int slurm_job_step_get_pids(uint32_t job_id, uint32_t step_id,
xassert(resp);
- if (!node_list) {
- if (!(step_layout =
+ if(!node_list) {
+ if(!(step_layout =
slurm_job_step_layout_get(job_id, step_id))) {
rc = errno;
error("slurm_job_step_get_pids: "
@@ -421,7 +421,7 @@ extern int slurm_job_step_get_pids(uint32_t job_id, uint32_t step_id,
node_list = step_layout->node_list;
}
- if (!*resp) {
+ if(!*resp) {
resp_out = xmalloc(sizeof(job_step_pids_response_msg_t));
*resp = resp_out;
created = 1;
@@ -441,11 +441,11 @@ extern int slurm_job_step_get_pids(uint32_t job_id, uint32_t step_id,
req_msg.msg_type = REQUEST_JOB_STEP_PIDS;
req_msg.data = &req;
- if (!(ret_list = slurm_send_recv_msgs(node_list,
+ if(!(ret_list = slurm_send_recv_msgs(node_list,
&req_msg, 0, false))) {
error("slurm_job_step_get_pids: got an error no list returned");
rc = SLURM_ERROR;
- if (created) {
+ if(created) {
slurm_job_step_pids_response_msg_free(resp_out);
*resp = NULL;
}
@@ -456,7 +456,7 @@ extern int slurm_job_step_get_pids(uint32_t job_id, uint32_t step_id,
while((ret_data_info = list_next(itr))) {
switch (ret_data_info->type) {
case RESPONSE_JOB_STEP_PIDS:
- if (!resp_out->pid_list)
+ if(!resp_out->pid_list)
resp_out->pid_list = list_create(
slurm_free_job_step_pids);
list_push(resp_out->pid_list,
@@ -483,7 +483,7 @@ extern int slurm_job_step_get_pids(uint32_t job_id, uint32_t step_id,
list_iterator_destroy(itr);
list_destroy(ret_list);
- if (resp_out->pid_list)
+ if(resp_out->pid_list)
list_sort(resp_out->pid_list, (ListCmpF)_sort_pids_by_name);
cleanup:
slurm_step_layout_destroy(step_layout);
@@ -505,8 +505,8 @@ extern void slurm_job_step_pids_response_msg_free(void *object)
{
job_step_pids_response_msg_t *step_pids_msg =
(job_step_pids_response_msg_t *) object;
- if (step_pids_msg) {
- if (step_pids_msg->pid_list)
+ if(step_pids_msg) {
+ if(step_pids_msg->pid_list)
list_destroy(step_pids_msg->pid_list);
xfree(step_pids_msg);
}
@@ -521,8 +521,8 @@ extern void slurm_job_step_stat_response_msg_free(void *object)
{
job_step_stat_response_msg_t *step_stat_msg =
(job_step_stat_response_msg_t *) object;
- if (step_stat_msg) {
- if (step_stat_msg->stats_list)
+ if(step_stat_msg) {
+ if(step_stat_msg->stats_list)
list_destroy(step_stat_msg->stats_list);
xfree(step_stat_msg);
}
diff --git a/src/api/node_info.c b/src/api/node_info.c
index e30caf825efd202d3d1f0fe19015268f37b23c60..f6283854d486248ef86048be4d9b774529c3759e 100644
--- a/src/api/node_info.c
+++ b/src/api/node_info.c
@@ -131,7 +131,7 @@ slurm_sprint_node_table (node_info_t * node_ptr,
int total_used = node_ptr->cpus;
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (node_scaling)
+ if(node_scaling)
cpus_per_node = node_ptr->cpus / node_scaling;
if (my_state & NODE_STATE_COMPLETING) {
@@ -150,8 +150,8 @@ slurm_sprint_node_table (node_info_t * node_ptr,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG) {
- if (!alloc_cpus
+ if(cluster_flags & CLUSTER_FLAG_BG) {
+ if(!alloc_cpus
&& (IS_NODE_ALLOCATED(node_ptr)
|| IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
@@ -164,7 +164,7 @@ slurm_sprint_node_table (node_info_t * node_ptr,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
err_cpus *= cpus_per_node;
total_used -= err_cpus;
diff --git a/src/api/partition_info.c b/src/api/partition_info.c
index cb0ad16ff83ccd9506f1145483ab8094597426a2..afae5f832de898ccdd2b6ba18b3da9040448709c 100644
--- a/src/api/partition_info.c
+++ b/src/api/partition_info.c
@@ -157,7 +157,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
/****** Line added here for BG partitions
to keep with alphabetized output******/
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
snprintf(tmp_line, sizeof(tmp_line), "BasePartitions=%s",
part_ptr->nodes);
xstrcat(out, tmp_line);
@@ -201,7 +201,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
if (part_ptr->max_nodes == INFINITE)
sprintf(tmp_line, "MaxNodes=UNLIMITED");
else {
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->max_nodes,
tmp1, sizeof(tmp1), UNIT_NONE);
else
@@ -219,7 +219,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
sprintf(tmp_line, " MaxTime=%s", time_line);
}
xstrcat(out, tmp_line);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->min_nodes, tmp1, sizeof(tmp1),
UNIT_NONE);
else
@@ -236,7 +236,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
/****** Line added here for non BG nodes
to keep with alphabetized output******/
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
snprintf(tmp_line, sizeof(tmp_line), "Nodes=%s",
part_ptr->nodes);
xstrcat(out, tmp_line);
@@ -295,7 +295,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
xstrcat(out, tmp_line);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->total_cpus, tmp1,
sizeof(tmp1), UNIT_NONE);
else
@@ -303,7 +303,7 @@ char *slurm_sprint_partition_info ( partition_info_t * part_ptr,
sprintf(tmp_line, " TotalCPUs=%s", tmp1);
xstrcat(out, tmp_line);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->total_nodes, tmp2,
sizeof(tmp2), UNIT_NONE);
else
diff --git a/src/api/reconfigure.c b/src/api/reconfigure.c
index 902d2cd35bc6438f0a51d44ad434df2a44d320b7..90755ff473325a25bf745f4f16f5249d93a581ff 100644
--- a/src/api/reconfigure.c
+++ b/src/api/reconfigure.c
@@ -170,7 +170,7 @@ _send_message_controller (enum controller_id dest, slurm_msg_t *req)
resp_msg = xmalloc(sizeof(slurm_msg_t));
slurm_msg_t_init(resp_msg);
- if ((rc = slurm_receive_msg(fd, resp_msg, 0)) != 0) {
+ if((rc = slurm_receive_msg(fd, resp_msg, 0)) != 0) {
slurm_shutdown_msg_conn(fd);
return SLURMCTLD_COMMUNICATIONS_RECEIVE_ERROR;
}
diff --git a/src/api/signal.c b/src/api/signal.c
index ad6ae33c31bcff19f4ee33fceca3d5fb103b80b1..8e8b0c2ae1ac7f55c17545e39c42a84407b7e28e 100644
--- a/src/api/signal.c
+++ b/src/api/signal.c
@@ -173,11 +173,11 @@ _local_send_recv_rc_msgs(const char *nodelist, slurm_msg_type_t type,
msg->msg_type = type;
msg->data = data;
- if ((ret_list = slurm_send_recv_msgs(nodelist, msg, 0, false))) {
+ if((ret_list = slurm_send_recv_msgs(nodelist, msg, 0, false))) {
while((ret_data_info = list_pop(ret_list))) {
temp_rc = slurm_get_return_code(ret_data_info->type,
ret_data_info->data);
- if (temp_rc)
+ if(temp_rc)
rc = temp_rc;
}
} else {
@@ -213,7 +213,7 @@ static int _signal_batch_script_step(
kill_tasks_msg_t rpc;
int rc = SLURM_SUCCESS;
char *name = nodelist_nth_host(allocation->node_list, 0);
- if (!name) {
+ if(!name) {
error("_signal_batch_script_step: "
"can't get the first name out of %s",
allocation->node_list);
@@ -226,7 +226,7 @@ static int _signal_batch_script_step(
slurm_msg_t_init(&msg);
msg.msg_type = REQUEST_SIGNAL_TASKS;
msg.data = &rpc;
- if (slurm_conf_get_addr(name, &msg.address) == SLURM_ERROR) {
+ if(slurm_conf_get_addr(name, &msg.address) == SLURM_ERROR) {
error("_signal_batch_script_step: "
"can't find address for host %s, check slurm.conf",
name);
@@ -375,7 +375,7 @@ static int _terminate_batch_script_step(
int rc = SLURM_SUCCESS;
int i;
char *name = nodelist_nth_host(allocation->node_list, 0);
- if (!name) {
+ if(!name) {
error("_signal_batch_script_step: "
"can't get the first name out of %s",
allocation->node_list);
@@ -390,7 +390,7 @@ static int _terminate_batch_script_step(
msg.msg_type = REQUEST_TERMINATE_TASKS;
msg.data = &rpc;
- if (slurm_conf_get_addr(name, &msg.address) == SLURM_ERROR) {
+ if(slurm_conf_get_addr(name, &msg.address) == SLURM_ERROR) {
error("_signal_batch_script_step: "
"can't find address for host %s, check slurm.conf",
name);
diff --git a/src/api/slurm_pmi.c b/src/api/slurm_pmi.c
index 9fa0d0efe3461be40c6dca3c0021d4acf602631f..6f7aed731e399be21c13f16117ae56f0815e8bcb 100644
--- a/src/api/slurm_pmi.c
+++ b/src/api/slurm_pmi.c
@@ -306,7 +306,7 @@ int slurm_get_kvs_comm_set(struct kvs_comm_set **kvs_set_ptr,
slurm_close_accepted_conn(srun_fd);
return errno;
}
- if (msg_rcv.auth_cred)
+ if(msg_rcv.auth_cred)
(void)g_slurm_auth_destroy(msg_rcv.auth_cred);
if (msg_rcv.msg_type != PMI_KVS_GET_RESP) {
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index 7086111088332c78a3cd77911294bd8d21478772..b1b5e9f4b9dcbed6dea3ec194d6ce88c274b0ac5 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -559,7 +559,7 @@ void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
active = 0;
num_tasks = sls->layout->tasks[node_id];
for (j = 0; j < num_tasks; j++) {
- if (bit_test(sls->tasks_started,
+ if(bit_test(sls->tasks_started,
sls->layout->tids[node_id][j]) &&
!bit_test(sls->tasks_exited,
sls->layout->tids[node_id][j])) {
@@ -579,7 +579,7 @@ void slurm_step_launch_fwd_signal(slurm_step_ctx_t *ctx, int signo)
pthread_mutex_unlock(&sls->lock);
- if (!hostlist_count(hl)) {
+ if(!hostlist_count(hl)) {
hostlist_destroy(hl);
goto nothing_left;
}
@@ -798,7 +798,7 @@ static int _msg_thr_create(struct step_launch_state *sls, int num_nodes)
/* multiple jobs (easily induced via no_alloc) and highly
* parallel jobs using PMI sometimes result in slow message
* responses and timeouts. Raise the default timeout for srun. */
- if (!message_socket_ops.timeout)
+ if(!message_socket_ops.timeout)
message_socket_ops.timeout = slurm_get_msg_timeout() * 8000;
for (i = 0; i < sls->num_resp_port; i++) {
@@ -1328,7 +1328,7 @@ static int _launch_tasks(slurm_step_ctx_t *ctx,
msg.msg_type = REQUEST_LAUNCH_TASKS;
msg.data = launch_msg;
- if (!(ret_list = slurm_send_recv_msgs(
+ if(!(ret_list = slurm_send_recv_msgs(
ctx->step_resp->step_layout->node_list,
&msg, timeout, false))) {
error("slurm_send_recv_msgs failed miserably: %m");
@@ -1365,7 +1365,7 @@ static int _launch_tasks(slurm_step_ctx_t *ctx,
list_iterator_destroy(ret_itr);
list_destroy(ret_list);
- if (tot_rc != SLURM_SUCCESS)
+ if(tot_rc != SLURM_SUCCESS)
return tot_rc;
return rc;
}
diff --git a/src/common/assoc_mgr.c b/src/common/assoc_mgr.c
index c27394fdfad52abe6651b5b8694700b82902f135..64e748f361a0ea198d1430350acb2126561eae5b 100644
--- a/src/common/assoc_mgr.c
+++ b/src/common/assoc_mgr.c
@@ -99,7 +99,7 @@ static void _normalize_assoc_shares(slurmdb_association_rec_t *assoc)
static int _addto_used_info(slurmdb_association_rec_t *assoc1,
slurmdb_association_rec_t *assoc2)
{
- if (!assoc1 || !assoc2)
+ if(!assoc1 || !assoc2)
return SLURM_ERROR;
assoc1->usage->grp_used_cpus += assoc2->usage->grp_used_cpus;
@@ -115,7 +115,7 @@ static int _addto_used_info(slurmdb_association_rec_t *assoc1,
static int _clear_used_info(slurmdb_association_rec_t *assoc)
{
- if (!assoc)
+ if(!assoc)
return SLURM_ERROR;
assoc->usage->grp_used_cpus = 0;
@@ -150,12 +150,12 @@ static int _change_user_name(slurmdb_user_rec_t *user)
} else
user->uid = pw_uid;
- if (assoc_mgr_association_list) {
+ if(assoc_mgr_association_list) {
itr = list_iterator_create(assoc_mgr_association_list);
while((assoc = list_next(itr))) {
- if (!assoc->user)
+ if(!assoc->user)
continue;
- if (!strcmp(user->old_name, assoc->user)) {
+ if(!strcmp(user->old_name, assoc->user)) {
xfree(assoc->user);
assoc->user = xstrdup(user->name);
assoc->uid = user->uid;
@@ -165,10 +165,10 @@ static int _change_user_name(slurmdb_user_rec_t *user)
list_iterator_destroy(itr);
}
- if (assoc_mgr_wckey_list) {
+ if(assoc_mgr_wckey_list) {
itr = list_iterator_create(assoc_mgr_wckey_list);
while((wckey = list_next(itr))) {
- if (!strcmp(user->old_name, wckey->user)) {
+ if(!strcmp(user->old_name, wckey->user)) {
xfree(wckey->user);
assoc->user = xstrdup(wckey->name);
wckey->uid = user->uid;
@@ -187,17 +187,17 @@ static int _grab_parents_qos(slurmdb_association_rec_t *assoc)
char *qos_char = NULL;
ListIterator itr = NULL;
- if (!assoc)
+ if(!assoc)
return SLURM_ERROR;
- if (assoc->qos_list)
+ if(assoc->qos_list)
list_flush(assoc->qos_list);
else
assoc->qos_list = list_create(slurm_destroy_char);
parent_assoc = assoc->usage->parent_assoc_ptr;
- if (!parent_assoc || !parent_assoc->qos_list
+ if(!parent_assoc || !parent_assoc->qos_list
|| !list_count(parent_assoc->qos_list))
return SLURM_SUCCESS;
@@ -216,12 +216,12 @@ static int _local_update_assoc_qos_list(slurmdb_association_rec_t *assoc,
char *new_qos = NULL, *curr_qos = NULL;
int flushed = 0;
- if (!assoc || !new_qos_list) {
+ if(!assoc || !new_qos_list) {
error("need both new qos_list and an association to update");
return SLURM_ERROR;
}
- if (!list_count(new_qos_list)) {
+ if(!list_count(new_qos_list)) {
_grab_parents_qos(assoc);
return SLURM_SUCCESS;
}
@@ -234,32 +234,32 @@ static int _local_update_assoc_qos_list(slurmdb_association_rec_t *assoc,
curr_qos_itr = list_iterator_create(assoc->qos_list);
while((new_qos = list_next(new_qos_itr))) {
- if (new_qos[0] == '-') {
+ if(new_qos[0] == '-') {
while((curr_qos = list_next(curr_qos_itr))) {
- if (!strcmp(curr_qos, new_qos+1)) {
+ if(!strcmp(curr_qos, new_qos+1)) {
list_delete_item(curr_qos_itr);
break;
}
}
list_iterator_reset(curr_qos_itr);
- } else if (new_qos[0] == '+') {
+ } else if(new_qos[0] == '+') {
while((curr_qos = list_next(curr_qos_itr)))
- if (!strcmp(curr_qos, new_qos+1))
+ if(!strcmp(curr_qos, new_qos+1))
break;
- if (!curr_qos) {
+ if(!curr_qos) {
list_append(assoc->qos_list,
xstrdup(new_qos+1));
list_iterator_reset(curr_qos_itr);
}
- } else if (new_qos[0] == '=') {
- if (!flushed)
+ } else if(new_qos[0] == '=') {
+ if(!flushed)
list_flush(assoc->qos_list);
list_append(assoc->qos_list, xstrdup(new_qos+1));
flushed = 1;
- } else if (new_qos[0]) {
- if (!flushed)
+ } else if(new_qos[0]) {
+ if(!flushed)
list_flush(assoc->qos_list);
list_append(assoc->qos_list, xstrdup(new_qos));
flushed = 1;
@@ -278,17 +278,17 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
static slurmdb_association_rec_t *last_acct_parent = NULL;
static slurmdb_association_rec_t *last_parent = NULL;
- if (reset) {
+ if(reset) {
last_acct_parent = NULL;
last_parent = NULL;
}
- if (!assoc || !assoc_list) {
+ if(!assoc || !assoc_list) {
error("you didn't give me an association");
return SLURM_ERROR;
}
- if (assoc->parent_id) {
+ if(assoc->parent_id) {
/* To speed things up we are first looking if we have
a parent_id to look for. If that doesn't work see
if the last parent we had was what we are looking
@@ -297,18 +297,18 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
will look for it in the list. If it isn't there we
will just add it to the parent and call it good
*/
- if (last_parent && assoc->parent_id == last_parent->id) {
+ if(last_parent && assoc->parent_id == last_parent->id) {
assoc->usage->parent_assoc_ptr = last_parent;
- } else if (last_acct_parent
+ } else if(last_acct_parent
&& assoc->parent_id == last_acct_parent->id) {
assoc->usage->parent_assoc_ptr = last_acct_parent;
} else {
slurmdb_association_rec_t *assoc2 = NULL;
ListIterator itr = list_iterator_create(assoc_list);
while((assoc2 = list_next(itr))) {
- if (assoc2->id == assoc->parent_id) {
+ if(assoc2->id == assoc->parent_id) {
assoc->usage->parent_assoc_ptr = assoc2;
- if (assoc->user)
+ if(assoc->user)
last_parent = assoc2;
else
last_acct_parent = assoc2;
@@ -317,8 +317,8 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
}
list_iterator_destroy(itr);
}
- if (assoc->usage->parent_assoc_ptr && setup_childern) {
- if (!assoc->usage->
+ if(assoc->usage->parent_assoc_ptr && setup_childern) {
+ if(!assoc->usage->
parent_assoc_ptr->usage->childern_list)
assoc->usage->
parent_assoc_ptr->usage->childern_list =
@@ -328,7 +328,7 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
assoc);
}
- if (assoc == assoc->usage->parent_assoc_ptr) {
+ if(assoc == assoc->usage->parent_assoc_ptr) {
assoc->usage->parent_assoc_ptr = NULL;
error("association %u was pointing to "
"itself as it's parent");
@@ -339,7 +339,7 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
assoc_mgr_root_assoc = assoc;
/* set up new root since if running off cache the
total usage for the cluster doesn't get set up again */
- if (last_root) {
+ if(last_root) {
assoc_mgr_root_assoc->usage->usage_raw =
last_root->usage->usage_raw;
assoc_mgr_root_assoc->usage->usage_norm =
@@ -347,7 +347,7 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
}
}
- if (assoc->user) {
+ if(assoc->user) {
uid_t pw_uid;
if (uid_from_string (assoc->user, &pw_uid) < 0)
assoc->uid = (uint32_t)NO_VAL;
@@ -355,8 +355,8 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
assoc->uid = pw_uid;
/* get the qos bitmap here */
- if (g_qos_count > 0) {
- if (!assoc->usage->valid_qos
+ if(g_qos_count > 0) {
+ if(!assoc->usage->valid_qos
|| (bit_size(assoc->usage->valid_qos)
!= g_qos_count)) {
FREE_NULL_BITMAP(assoc->usage->valid_qos);
@@ -368,7 +368,7 @@ static int _set_assoc_parent_and_user(slurmdb_association_rec_t *assoc,
- 1));
set_qos_bitstr_from_list(assoc->usage->valid_qos,
assoc->qos_list);
- if (((int32_t)assoc->def_qos_id > 0)
+ if(((int32_t)assoc->def_qos_id > 0)
&& !bit_test(assoc->usage->valid_qos,
assoc->def_qos_id)) {
error("assoc %u doesn't have access "
@@ -396,27 +396,27 @@ static int _post_association_list(List assoc_list)
int reset = 1;
//DEF_TIMERS;
- if (!assoc_list)
+ if(!assoc_list)
return SLURM_ERROR;
itr = list_iterator_create(assoc_list);
//START_TIMER;
while((assoc = list_next(itr))) {
- if (!assoc->usage)
+ if(!assoc->usage)
assoc->usage = create_assoc_mgr_association_usage();
_set_assoc_parent_and_user(assoc, assoc_list, reset);
reset = 0;
}
- if (setup_childern) {
+ if(setup_childern) {
slurmdb_association_rec_t *assoc2 = NULL;
ListIterator itr2 = NULL;
/* Now set the shares on each level */
list_iterator_reset(itr);
while((assoc = list_next(itr))) {
int count = 0;
- if (!assoc->usage->childern_list
+ if(!assoc->usage->childern_list
|| !list_count(assoc->usage->childern_list))
continue;
itr2 = list_iterator_create(
@@ -446,7 +446,7 @@ static int _post_user_list(List user_list)
while((user = list_next(itr))) {
uid_t pw_uid;
if (uid_from_string (user->name, &pw_uid) < 0) {
- if (slurmdbd_conf)
+ if(slurmdbd_conf)
debug("post user: couldn't get a "
"uid for user %s",
user->name);
@@ -466,7 +466,7 @@ static int _post_wckey_list(List wckey_list)
while((wckey = list_next(itr))) {
uid_t pw_uid;
if (uid_from_string (wckey->user, &pw_uid) < 0) {
- if (slurmdbd_conf)
+ if(slurmdbd_conf)
debug("post wckey: couldn't get a uid "
"for user %s",
wckey->user);
@@ -487,24 +487,24 @@ static int _post_qos_list(List qos_list)
g_qos_max_priority = 0;
while((qos = list_next(itr))) {
- if (!qos->usage)
+ if(!qos->usage)
qos->usage = create_assoc_mgr_qos_usage();
/* get the highest qos value to create bitmaps
from */
- if (qos->id > g_qos_count)
+ if(qos->id > g_qos_count)
g_qos_count = qos->id;
- if (qos->priority > g_qos_max_priority)
+ if(qos->priority > g_qos_max_priority)
g_qos_max_priority = qos->priority;
}
/* Since in the database id's don't start at 1
instead of 0 we need to ignore the 0 bit and start
with 1 so increase the count by 1.
*/
- if (g_qos_count > 0)
+ if(g_qos_count > 0)
g_qos_count++;
- if (g_qos_max_priority) {
+ if(g_qos_max_priority) {
list_iterator_reset(itr);
while((qos = list_next(itr))) {
@@ -525,14 +525,14 @@ static int _get_assoc_mgr_association_list(void *db_conn, int enforce)
// DEF_TIMERS;
assoc_mgr_lock(&locks);
- if (assoc_mgr_association_list)
+ if(assoc_mgr_association_list)
list_destroy(assoc_mgr_association_list);
memset(&assoc_q, 0, sizeof(slurmdb_association_cond_t));
- if (assoc_mgr_cluster_name) {
+ if(assoc_mgr_cluster_name) {
assoc_q.cluster_list = list_create(NULL);
list_append(assoc_q.cluster_list, assoc_mgr_cluster_name);
- } else if ((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
+ } else if((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
error("_get_assoc_mgr_association_list: "
"no cluster name here going to get "
"all associations.");
@@ -543,16 +543,16 @@ static int _get_assoc_mgr_association_list(void *db_conn, int enforce)
acct_storage_g_get_associations(db_conn, uid, &assoc_q);
// END_TIMER2("get_associations");
- if (assoc_q.cluster_list)
+ if(assoc_q.cluster_list)
list_destroy(assoc_q.cluster_list);
- if (!assoc_mgr_association_list) {
+ if(!assoc_mgr_association_list) {
/* create list so we don't keep calling this if there
isn't anything there */
assoc_mgr_association_list =
list_create(slurmdb_destroy_association_rec);
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("_get_assoc_mgr_association_list: "
"no list was made.");
return SLURM_ERROR;
@@ -577,13 +577,13 @@ static int _get_assoc_mgr_qos_list(void *db_conn, int enforce)
WRITE_LOCK, NO_LOCK, NO_LOCK };
assoc_mgr_lock(&locks);
- if (assoc_mgr_qos_list)
+ if(assoc_mgr_qos_list)
list_destroy(assoc_mgr_qos_list);
assoc_mgr_qos_list = acct_storage_g_get_qos(db_conn, uid, NULL);
- if (!assoc_mgr_qos_list) {
+ if(!assoc_mgr_qos_list) {
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("_get_assoc_mgr_qos_list: no list was made.");
return SLURM_ERROR;
} else {
@@ -608,13 +608,13 @@ static int _get_assoc_mgr_user_list(void *db_conn, int enforce)
user_q.with_coords = 1;
assoc_mgr_lock(&locks);
- if (assoc_mgr_user_list)
+ if(assoc_mgr_user_list)
list_destroy(assoc_mgr_user_list);
assoc_mgr_user_list = acct_storage_g_get_users(db_conn, uid, &user_q);
- if (!assoc_mgr_user_list) {
+ if(!assoc_mgr_user_list) {
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("_get_assoc_mgr_user_list: "
"no list was made.");
return SLURM_ERROR;
@@ -639,14 +639,14 @@ static int _get_local_wckey_list(void *db_conn, int enforce)
// DEF_TIMERS;
assoc_mgr_lock(&locks);
- if (assoc_mgr_wckey_list)
+ if(assoc_mgr_wckey_list)
list_destroy(assoc_mgr_wckey_list);
memset(&wckey_q, 0, sizeof(slurmdb_wckey_cond_t));
- if (assoc_mgr_cluster_name) {
+ if(assoc_mgr_cluster_name) {
wckey_q.cluster_list = list_create(NULL);
list_append(wckey_q.cluster_list, assoc_mgr_cluster_name);
- } else if ((enforce & ACCOUNTING_ENFORCE_WCKEYS) && !slurmdbd_conf) {
+ } else if((enforce & ACCOUNTING_ENFORCE_WCKEYS) && !slurmdbd_conf) {
error("_get_local_wckey_list: "
"no cluster name here going to get "
"all wckeys.");
@@ -657,15 +657,15 @@ static int _get_local_wckey_list(void *db_conn, int enforce)
acct_storage_g_get_wckeys(db_conn, uid, &wckey_q);
// END_TIMER2("get_wckeys");
- if (wckey_q.cluster_list)
+ if(wckey_q.cluster_list)
list_destroy(wckey_q.cluster_list);
- if (!assoc_mgr_wckey_list) {
+ if(!assoc_mgr_wckey_list) {
/* create list so we don't keep calling this if there
isn't anything there */
assoc_mgr_wckey_list = list_create(slurmdb_destroy_wckey_rec);
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+ if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
error("_get_local_wckey_list: "
"no list was made.");
return SLURM_ERROR;
@@ -696,10 +696,10 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
// DEF_TIMERS;
memset(&assoc_q, 0, sizeof(slurmdb_association_cond_t));
- if (assoc_mgr_cluster_name) {
+ if(assoc_mgr_cluster_name) {
assoc_q.cluster_list = list_create(NULL);
list_append(assoc_q.cluster_list, assoc_mgr_cluster_name);
- } else if ((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
+ } else if((enforce & ACCOUNTING_ENFORCE_ASSOCS) && !slurmdbd_conf) {
error("_refresh_assoc_mgr_association_list: "
"no cluster name here going to get "
"all associations.");
@@ -714,10 +714,10 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
acct_storage_g_get_associations(db_conn, uid, &assoc_q);
// END_TIMER2("get_associations");
- if (assoc_q.cluster_list)
+ if(assoc_q.cluster_list)
list_destroy(assoc_q.cluster_list);
- if (!assoc_mgr_association_list) {
+ if(!assoc_mgr_association_list) {
assoc_mgr_association_list = current_assocs;
assoc_mgr_unlock(&locks);
@@ -728,7 +728,7 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
_post_association_list(assoc_mgr_association_list);
- if (!current_assocs) {
+ if(!current_assocs) {
assoc_mgr_unlock(&locks);
return SLURM_SUCCESS;
}
@@ -739,10 +739,10 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
/* add used limits We only look for the user associations to
* do the parents since a parent may have moved */
while((curr_assoc = list_next(curr_itr))) {
- if (!curr_assoc->user)
+ if(!curr_assoc->user)
continue;
while((assoc = list_next(assoc_mgr_itr))) {
- if (assoc->id == curr_assoc->id)
+ if(assoc->id == curr_assoc->id)
break;
}
@@ -760,7 +760,7 @@ static int _refresh_assoc_mgr_association_list(void *db_conn, int enforce)
assoc_mgr_unlock(&locks);
- if (current_assocs)
+ if(current_assocs)
list_destroy(current_assocs);
return SLURM_SUCCESS;
@@ -778,7 +778,7 @@ static int _refresh_assoc_mgr_qos_list(void *db_conn, int enforce)
current_qos = acct_storage_g_get_qos(db_conn, uid, NULL);
- if (!current_qos) {
+ if(!current_qos) {
error("_refresh_assoc_mgr_qos_list: "
"no new list given back keeping cached one.");
return SLURM_ERROR;
@@ -787,7 +787,7 @@ static int _refresh_assoc_mgr_qos_list(void *db_conn, int enforce)
assoc_mgr_lock(&locks);
- if (assoc_mgr_qos_list)
+ if(assoc_mgr_qos_list)
list_destroy(assoc_mgr_qos_list);
assoc_mgr_qos_list = current_qos;
@@ -813,7 +813,7 @@ static int _refresh_assoc_mgr_user_list(void *db_conn, int enforce)
current_users = acct_storage_g_get_users(db_conn, uid, &user_q);
- if (!current_users) {
+ if(!current_users) {
error("_refresh_assoc_mgr_user_list: "
"no new list given back keeping cached one.");
return SLURM_ERROR;
@@ -822,7 +822,7 @@ static int _refresh_assoc_mgr_user_list(void *db_conn, int enforce)
assoc_mgr_lock(&locks);
- if (assoc_mgr_user_list)
+ if(assoc_mgr_user_list)
list_destroy(assoc_mgr_user_list);
assoc_mgr_user_list = current_users;
@@ -844,10 +844,10 @@ static int _refresh_assoc_wckey_list(void *db_conn, int enforce)
NO_LOCK, WRITE_LOCK, NO_LOCK };
memset(&wckey_q, 0, sizeof(slurmdb_wckey_cond_t));
- if (assoc_mgr_cluster_name) {
+ if(assoc_mgr_cluster_name) {
wckey_q.cluster_list = list_create(NULL);
list_append(wckey_q.cluster_list, assoc_mgr_cluster_name);
- } else if ((enforce & ACCOUNTING_ENFORCE_WCKEYS) && !slurmdbd_conf) {
+ } else if((enforce & ACCOUNTING_ENFORCE_WCKEYS) && !slurmdbd_conf) {
error("_refresh_assoc_wckey_list: "
"no cluster name here going to get "
"all wckeys.");
@@ -855,7 +855,7 @@ static int _refresh_assoc_wckey_list(void *db_conn, int enforce)
current_wckeys = acct_storage_g_get_wckeys(db_conn, uid, &wckey_q);
- if (!current_wckeys) {
+ if(!current_wckeys) {
error("_refresh_assoc_wckey_list: "
"no new list given back keeping cached one.");
return SLURM_ERROR;
@@ -864,7 +864,7 @@ static int _refresh_assoc_wckey_list(void *db_conn, int enforce)
_post_user_list(current_wckeys);
assoc_mgr_lock(&locks);
- if (assoc_mgr_wckey_list)
+ if(assoc_mgr_wckey_list)
list_destroy(assoc_mgr_wckey_list);
assoc_mgr_wckey_list = current_wckeys;
@@ -943,9 +943,9 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
static uint16_t cache_level = ASSOC_MGR_CACHE_ALL;
static uint16_t checked_prio = 0;
- if (!checked_prio) {
+ if(!checked_prio) {
char *prio = slurm_get_priority_type();
- if (prio && !strcmp(prio, "priority/multifactor"))
+ if(prio && !strcmp(prio, "priority/multifactor"))
setup_childern = 1;
xfree(prio);
@@ -953,47 +953,47 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
memset((void *) &assoc_mgr_locks, 0, sizeof(assoc_mgr_locks));
}
- if (args) {
+ if(args) {
enforce = args->enforce;
- if (args->remove_assoc_notify)
+ if(args->remove_assoc_notify)
remove_assoc_notify = args->remove_assoc_notify;
- if (args->remove_qos_notify)
+ if(args->remove_qos_notify)
remove_qos_notify = args->remove_qos_notify;
cache_level = args->cache_level;
assoc_mgr_refresh_lists(db_conn, args);
}
- if (running_cache) {
+ if(running_cache) {
debug4("No need to run assoc_mgr_init, "
"we probably don't have a connection. "
"If we do use assoc_mgr_refresh_lists instead.");
return SLURM_SUCCESS;
}
- if ((!assoc_mgr_cluster_name) && !slurmdbd_conf) {
+ if((!assoc_mgr_cluster_name) && !slurmdbd_conf) {
xfree(assoc_mgr_cluster_name);
assoc_mgr_cluster_name = slurm_get_cluster_name();
}
/* check if we can't talk to the db yet */
- if (errno == ESLURM_ACCESS_DENIED)
+ if(errno == ESLURM_ACCESS_DENIED)
return SLURM_ERROR;
/* get qos before association since it is used there */
- if ((!assoc_mgr_qos_list) && (cache_level & ASSOC_MGR_CACHE_QOS))
- if (_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
+ if((!assoc_mgr_qos_list) && (cache_level & ASSOC_MGR_CACHE_QOS))
+ if(_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
- if ((!assoc_mgr_association_list)
+ if((!assoc_mgr_association_list)
&& (cache_level & ASSOC_MGR_CACHE_ASSOC))
- if (_get_assoc_mgr_association_list(db_conn, enforce)
+ if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
- if ((!assoc_mgr_user_list) && (cache_level & ASSOC_MGR_CACHE_USER))
- if (_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
+ if((!assoc_mgr_user_list) && (cache_level & ASSOC_MGR_CACHE_USER))
+ if(_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
- if (assoc_mgr_association_list && !setup_childern) {
+ if(assoc_mgr_association_list && !setup_childern) {
slurmdb_association_rec_t *assoc = NULL;
ListIterator itr =
list_iterator_create(assoc_mgr_association_list);
@@ -1002,8 +1002,8 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
}
list_iterator_destroy(itr);
}
- if ((!assoc_mgr_wckey_list) && (cache_level & ASSOC_MGR_CACHE_WCKEY))
- if (_get_local_wckey_list(db_conn, enforce) == SLURM_ERROR)
+ if((!assoc_mgr_wckey_list) && (cache_level & ASSOC_MGR_CACHE_WCKEY))
+ if(_get_local_wckey_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
return SLURM_SUCCESS;
@@ -1011,16 +1011,16 @@ extern int assoc_mgr_init(void *db_conn, assoc_init_args_t *args)
extern int assoc_mgr_fini(char *state_save_location)
{
- if (state_save_location)
+ if(state_save_location)
dump_assoc_mgr_state(state_save_location);
- if (assoc_mgr_association_list)
+ if(assoc_mgr_association_list)
list_destroy(assoc_mgr_association_list);
- if (assoc_mgr_qos_list)
+ if(assoc_mgr_qos_list)
list_destroy(assoc_mgr_qos_list);
- if (assoc_mgr_user_list)
+ if(assoc_mgr_user_list)
list_destroy(assoc_mgr_user_list);
- if (assoc_mgr_wckey_list)
+ if(assoc_mgr_wckey_list)
list_destroy(assoc_mgr_wckey_list);
xfree(assoc_mgr_cluster_name);
assoc_mgr_association_list = NULL;
@@ -1096,8 +1096,8 @@ extern void destroy_assoc_mgr_association_usage(void *object)
assoc_mgr_association_usage_t *usage =
(assoc_mgr_association_usage_t *)object;
- if (usage) {
- if (usage->childern_list)
+ if(usage) {
+ if(usage->childern_list)
list_destroy(usage->childern_list);
FREE_NULL_BITMAP(usage->valid_qos);
@@ -1118,10 +1118,10 @@ extern void destroy_assoc_mgr_qos_usage(void *object)
assoc_mgr_qos_usage_t *usage =
(assoc_mgr_qos_usage_t *)object;
- if (usage) {
- if (usage->job_list)
+ if(usage) {
+ if(usage->job_list)
list_destroy(usage->job_list);
- if (usage->user_limit_list)
+ if(usage->user_limit_list)
list_destroy(usage->user_limit_list);
xfree(usage);
}
@@ -1143,13 +1143,13 @@ extern int assoc_mgr_get_user_assocs(void *db_conn,
xassert(assoc->uid != (uint32_t)NO_VAL);
xassert(assoc_list);
- if (!assoc_mgr_association_list) {
- if (_get_assoc_mgr_association_list(db_conn, enforce)
+ if(!assoc_mgr_association_list) {
+ if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
}
- if ((!assoc_mgr_association_list
+ if((!assoc_mgr_association_list
|| !list_count(assoc_mgr_association_list))
&& !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
@@ -1157,7 +1157,7 @@ extern int assoc_mgr_get_user_assocs(void *db_conn,
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_association_list);
while((found_assoc = list_next(itr))) {
- if (assoc->uid != found_assoc->uid) {
+ if(assoc->uid != found_assoc->uid) {
debug4("not the right user %u != %u",
assoc->uid, found_assoc->uid);
continue;
@@ -1169,7 +1169,7 @@ extern int assoc_mgr_get_user_assocs(void *db_conn,
list_iterator_destroy(itr);
assoc_mgr_unlock(&locks);
- if (set)
+ if(set)
return SLURM_SUCCESS;
else {
debug("user %u does not have any associations", assoc->uid);
@@ -1190,22 +1190,22 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
if (assoc_pptr)
*assoc_pptr = NULL;
- if (!assoc_mgr_association_list) {
- if (_get_assoc_mgr_association_list(db_conn, enforce)
+ if(!assoc_mgr_association_list) {
+ if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
}
- if ((!assoc_mgr_association_list
+ if((!assoc_mgr_association_list
|| !list_count(assoc_mgr_association_list))
&& !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
- if (!assoc->id) {
- if (!assoc->acct) {
+ if(!assoc->id) {
+ if(!assoc->acct) {
slurmdb_user_rec_t user;
- if (assoc->uid == (uint32_t)NO_VAL) {
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ if(assoc->uid == (uint32_t)NO_VAL) {
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("get_assoc_id: "
"Not enough info to "
"get an association");
@@ -1216,10 +1216,10 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
}
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = assoc->uid;
- if (assoc_mgr_fill_in_user(db_conn, &user,
+ if(assoc_mgr_fill_in_user(db_conn, &user,
enforce, NULL)
== SLURM_ERROR) {
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("User %d not found", assoc->uid);
return SLURM_ERROR;
} else {
@@ -1228,10 +1228,10 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
}
}
assoc->user = user.name;
- if (user.default_acct)
+ if(user.default_acct)
assoc->acct = user.default_acct;
else {
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("User %s(%d) doesn't have a "
"default account", assoc->user,
assoc->uid);
@@ -1245,7 +1245,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
}
}
- if (!assoc->cluster)
+ if(!assoc->cluster)
assoc->cluster = assoc_mgr_cluster_name;
}
/* info("looking for assoc of user=%s(%u), acct=%s, " */
@@ -1255,25 +1255,25 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_association_list);
while((found_assoc = list_next(itr))) {
- if (assoc->id) {
- if (assoc->id == found_assoc->id) {
+ if(assoc->id) {
+ if(assoc->id == found_assoc->id) {
ret_assoc = found_assoc;
break;
}
continue;
} else {
- if (assoc->uid == (uint32_t)NO_VAL
+ if(assoc->uid == (uint32_t)NO_VAL
&& found_assoc->uid != (uint32_t)NO_VAL) {
debug3("we are looking for a "
"nonuser association");
continue;
- } else if (assoc->uid != found_assoc->uid) {
+ } else if(assoc->uid != found_assoc->uid) {
debug4("not the right user %u != %u",
assoc->uid, found_assoc->uid);
continue;
}
- if (found_assoc->acct
+ if(found_assoc->acct
&& strcasecmp(assoc->acct, found_assoc->acct)) {
debug4("not the right account %s != %s",
assoc->acct, found_assoc->acct);
@@ -1281,14 +1281,14 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
}
/* only check for on the slurmdbd */
- if (!assoc_mgr_cluster_name && found_assoc->cluster
+ if(!assoc_mgr_cluster_name && found_assoc->cluster
&& strcasecmp(assoc->cluster,
found_assoc->cluster)) {
debug4("not the right cluster");
continue;
}
- if (assoc->partition
+ if(assoc->partition
&& (!found_assoc->partition
|| strcasecmp(assoc->partition,
found_assoc->partition))) {
@@ -1302,9 +1302,9 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
}
list_iterator_destroy(itr);
- if (!ret_assoc) {
+ if(!ret_assoc) {
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS)
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
@@ -1315,10 +1315,10 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
assoc->id = ret_assoc->id;
- if (!assoc->acct)
+ if(!assoc->acct)
assoc->acct = ret_assoc->acct;
- if (!assoc->cluster)
+ if(!assoc->cluster)
assoc->cluster = ret_assoc->cluster;
assoc->grp_cpu_mins = ret_assoc->grp_cpu_mins;
@@ -1339,7 +1339,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
assoc->max_submit_jobs = ret_assoc->max_submit_jobs;
assoc->max_wall_pj = ret_assoc->max_wall_pj;
- if (assoc->parent_acct) {
+ if(assoc->parent_acct) {
xfree(assoc->parent_acct);
assoc->parent_acct = xstrdup(ret_assoc->parent_acct);
} else
@@ -1347,10 +1347,10 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
assoc->parent_id = ret_assoc->parent_id;
- if (!assoc->partition)
+ if(!assoc->partition)
assoc->partition = ret_assoc->partition;
- if (!assoc->qos_list)
+ if(!assoc->qos_list)
assoc->qos_list = ret_assoc->qos_list;
assoc->rgt = ret_assoc->rgt;
@@ -1363,7 +1363,7 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
is really in existance here, if they really want it they can
use the pointer that is returned. */
- /* if (!assoc->usage->childern_list) */
+ /* if(!assoc->usage->childern_list) */
/* assoc->usage->childern_list = ret_assoc->usage->childern_list; */
/* assoc->usage->grp_used_cpus = ret_assoc->usage->grp_used_cpus; */
/* assoc->usage->grp_used_nodes = ret_assoc->usage->grp_used_nodes; */
@@ -1379,13 +1379,13 @@ extern int assoc_mgr_fill_in_assoc(void *db_conn,
/* assoc->usage->used_jobs = ret_assoc->usage->used_jobs; */
/* assoc->usage->used_submit_jobs = ret_assoc->usage->used_submit_jobs; */
- /* if (assoc->usage->valid_qos) { */
+ /* if(assoc->usage->valid_qos) { */
/* FREE_NULL_BITMAP(assoc->usage->valid_qos); */
/* assoc->usage->valid_qos = bit_copy(ret_assoc->usage->valid_qos); */
/* } else */
/* assoc->usage->valid_qos = ret_assoc->usage->valid_qos; */
- if (!assoc->user)
+ if(!assoc->user)
assoc->user = ret_assoc->user;
assoc_mgr_unlock(&locks);
@@ -1402,58 +1402,58 @@ extern int assoc_mgr_fill_in_user(void *db_conn, slurmdb_user_rec_t *user,
assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
NO_LOCK, READ_LOCK, NO_LOCK };
- if (user_pptr)
+ if(user_pptr)
*user_pptr = NULL;
- if (!assoc_mgr_user_list)
- if (_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
+ if(!assoc_mgr_user_list)
+ if(_get_assoc_mgr_user_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
- if ((!assoc_mgr_user_list || !list_count(assoc_mgr_user_list))
+ if((!assoc_mgr_user_list || !list_count(assoc_mgr_user_list))
&& !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_user_list);
while((found_user = list_next(itr))) {
- if (user->uid != NO_VAL) {
- if (user->uid == found_user->uid)
+ if(user->uid != NO_VAL) {
+ if(user->uid == found_user->uid)
break;
- } else if (user->name
+ } else if(user->name
&& !strcasecmp(user->name, found_user->name))
break;
}
list_iterator_destroy(itr);
- if (!found_user) {
+ if(!found_user) {
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_ASSOCS)
+ if(enforce & ACCOUNTING_ENFORCE_ASSOCS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
}
debug3("found correct user");
- if (user_pptr)
+ if(user_pptr)
*user_pptr = found_user;
/* create coord_accts just incase the list does not exist */
- if (!found_user->coord_accts)
+ if(!found_user->coord_accts)
found_user->coord_accts =
list_create(slurmdb_destroy_coord_rec);
user->admin_level = found_user->admin_level;
- if (!user->assoc_list)
+ if(!user->assoc_list)
user->assoc_list = found_user->assoc_list;
- if (!user->coord_accts)
+ if(!user->coord_accts)
user->coord_accts = found_user->coord_accts;
- if (!user->default_acct)
+ if(!user->default_acct)
user->default_acct = found_user->default_acct;
- if (!user->default_wckey)
+ if(!user->default_wckey)
user->default_wckey = found_user->default_wckey;
- if (!user->name)
+ if(!user->name)
user->name = found_user->name;
user->uid = found_user->uid;
- if (!user->wckey_list)
+ if(!user->wckey_list)
user->wckey_list = found_user->wckey_list;
assoc_mgr_unlock(&locks);
@@ -1470,29 +1470,29 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
READ_LOCK, NO_LOCK, NO_LOCK };
- if (qos_pptr)
+ if(qos_pptr)
*qos_pptr = NULL;
- if (!assoc_mgr_qos_list)
- if (_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
+ if(!assoc_mgr_qos_list)
+ if(_get_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
- if ((!assoc_mgr_qos_list || !list_count(assoc_mgr_qos_list))
+ if((!assoc_mgr_qos_list || !list_count(assoc_mgr_qos_list))
&& !(enforce & ACCOUNTING_ENFORCE_QOS))
return SLURM_SUCCESS;
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_qos_list);
while((found_qos = list_next(itr))) {
- if (qos->id == found_qos->id)
+ if(qos->id == found_qos->id)
break;
- else if (qos->name && !strcasecmp(qos->name, found_qos->name))
+ else if(qos->name && !strcasecmp(qos->name, found_qos->name))
break;
}
list_iterator_destroy(itr);
- if (!found_qos) {
+ if(!found_qos) {
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_QOS)
+ if(enforce & ACCOUNTING_ENFORCE_QOS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
@@ -1502,7 +1502,7 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
if (qos_pptr)
*qos_pptr = found_qos;
- if (!qos->description)
+ if(!qos->description)
qos->description = found_qos->description;
qos->id = found_qos->id;
@@ -1523,10 +1523,10 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
qos->max_submit_jobs_pu = found_qos->max_submit_jobs_pu;
qos->max_wall_pj = found_qos->max_wall_pj;
- if (!qos->name)
+ if(!qos->name)
qos->name = found_qos->name;
- if (qos->preempt_bitstr) {
+ if(qos->preempt_bitstr) {
FREE_NULL_BITMAP(qos->preempt_bitstr);
qos->preempt_bitstr = bit_copy(found_qos->preempt_bitstr);
} else
@@ -1546,14 +1546,14 @@ extern int assoc_mgr_fill_in_qos(void *db_conn, slurmdb_qos_rec_t *qos,
/* found_qos->usage->grp_used_submit_jobs; */
/* qos->usage->grp_used_wall = found_qos->usage->grp_used_wall; */
- /* if (!qos->usage->job_list) */
+ /* if(!qos->usage->job_list) */
/* qos->usage->job_list = found_qos->usage->job_list; */
/* qos->usage->norm_priority = found_qos->usage->norm_priority; */
/* qos->usage->usage_raw = found_qos->usage->usage_raw; */
- /* if (!qos->usage->user_limit_list) */
+ /* if(!qos->usage->user_limit_list) */
/* qos->usage->user_limit_list = found_qos->usage->user_limit_list; */
qos->usage_factor = found_qos->usage_factor;
@@ -1573,20 +1573,20 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
if (wckey_pptr)
*wckey_pptr = NULL;
- if (!assoc_mgr_wckey_list) {
- if (_get_local_wckey_list(db_conn, enforce) == SLURM_ERROR)
+ if(!assoc_mgr_wckey_list) {
+ if(_get_local_wckey_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
}
- if ((!assoc_mgr_wckey_list || !list_count(assoc_mgr_wckey_list))
+ if((!assoc_mgr_wckey_list || !list_count(assoc_mgr_wckey_list))
&& !(enforce & ACCOUNTING_ENFORCE_WCKEYS))
return SLURM_SUCCESS;
- if (!wckey->id) {
- if (!wckey->name) {
+ if(!wckey->id) {
+ if(!wckey->name) {
slurmdb_user_rec_t user;
- if (wckey->uid == (uint32_t)NO_VAL && !wckey->user) {
- if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+ if(wckey->uid == (uint32_t)NO_VAL && !wckey->user) {
+ if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
error("get_wckey_id: "
"Not enough info to "
"get an wckey");
@@ -1598,10 +1598,10 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = wckey->uid;
user.name = wckey->user;
- if (assoc_mgr_fill_in_user(db_conn, &user,
+ if(assoc_mgr_fill_in_user(db_conn, &user,
enforce, NULL)
== SLURM_ERROR) {
- if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+ if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
error("User %d not found", wckey->uid);
return SLURM_ERROR;
} else {
@@ -1609,12 +1609,12 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
return SLURM_SUCCESS;
}
}
- if (!wckey->user)
+ if(!wckey->user)
wckey->user = user.name;
- if (user.default_wckey)
+ if(user.default_wckey)
wckey->name = user.default_wckey;
else {
- if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+ if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
error("User %s(%d) doesn't have a "
"default wckey", user.name,
user.uid);
@@ -1627,8 +1627,8 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
}
}
- } else if (wckey->uid == (uint32_t)NO_VAL && !wckey->user) {
- if (enforce & ACCOUNTING_ENFORCE_WCKEYS) {
+ } else if(wckey->uid == (uint32_t)NO_VAL && !wckey->user) {
+ if(enforce & ACCOUNTING_ENFORCE_WCKEYS) {
error("get_wckey_id: "
"Not enough info 2 to "
"get an wckey");
@@ -1639,7 +1639,7 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
}
- if (!wckey->cluster)
+ if(!wckey->cluster)
wckey->cluster = assoc_mgr_cluster_name;
}
/* info("looking for wckey of user=%s(%u), name=%s, " */
@@ -1649,24 +1649,24 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_wckey_list);
while((found_wckey = list_next(itr))) {
- if (wckey->id) {
- if (wckey->id == found_wckey->id) {
+ if(wckey->id) {
+ if(wckey->id == found_wckey->id) {
ret_wckey = found_wckey;
break;
}
continue;
} else {
- if (wckey->uid != NO_VAL) {
- if (wckey->uid != found_wckey->uid) {
+ if(wckey->uid != NO_VAL) {
+ if(wckey->uid != found_wckey->uid) {
debug4("not the right user %u != %u",
wckey->uid, found_wckey->uid);
continue;
}
- } else if (wckey->user && strcasecmp(wckey->user,
+ } else if(wckey->user && strcasecmp(wckey->user,
found_wckey->user))
continue;
- if (wckey->name
+ if(wckey->name
&& (!found_wckey->name
|| strcasecmp(wckey->name, found_wckey->name))) {
debug4("not the right name %s != %s",
@@ -1675,15 +1675,15 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
}
/* only check for on the slurmdbd */
- if (!assoc_mgr_cluster_name) {
- if (!wckey->cluster) {
+ if(!assoc_mgr_cluster_name) {
+ if(!wckey->cluster) {
error("No cluster name was given "
"to check against, "
"we need one to get a wckey.");
continue;
}
- if (found_wckey->cluster
+ if(found_wckey->cluster
&& strcasecmp(wckey->cluster,
found_wckey->cluster)) {
debug4("not the right cluster");
@@ -1696,9 +1696,9 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
}
list_iterator_destroy(itr);
- if (!ret_wckey) {
+ if(!ret_wckey) {
assoc_mgr_unlock(&locks);
- if (enforce & ACCOUNTING_ENFORCE_WCKEYS)
+ if(enforce & ACCOUNTING_ENFORCE_WCKEYS)
return SLURM_ERROR;
else
return SLURM_SUCCESS;
@@ -1707,16 +1707,16 @@ extern int assoc_mgr_fill_in_wckey(void *db_conn, slurmdb_wckey_rec_t *wckey,
if (wckey_pptr)
*wckey_pptr = ret_wckey;
- if (!wckey->cluster)
+ if(!wckey->cluster)
wckey->cluster = ret_wckey->cluster;
wckey->id = ret_wckey->id;
- if (!wckey->name)
+ if(!wckey->name)
wckey->name = ret_wckey->name;
wckey->uid = ret_wckey->uid;
- if (!wckey->user)
+ if(!wckey->user)
wckey->user = ret_wckey->user;
assoc_mgr_unlock(&locks);
@@ -1732,23 +1732,23 @@ extern slurmdb_admin_level_t assoc_mgr_get_admin_level(void *db_conn,
assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
NO_LOCK, READ_LOCK, NO_LOCK };
- if (!assoc_mgr_user_list)
- if (_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
+ if(!assoc_mgr_user_list)
+ if(_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
return SLURMDB_ADMIN_NOTSET;
- if (!assoc_mgr_user_list)
+ if(!assoc_mgr_user_list)
return SLURMDB_ADMIN_NOTSET;
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_user_list);
while((found_user = list_next(itr))) {
- if (uid == found_user->uid)
+ if(uid == found_user->uid)
break;
}
list_iterator_destroy(itr);
assoc_mgr_unlock(&locks);
- if (found_user)
+ if(found_user)
return found_user->admin_level;
return SLURMDB_ADMIN_NOTSET;
@@ -1764,33 +1764,33 @@ extern int assoc_mgr_is_user_acct_coord(void *db_conn,
assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
NO_LOCK, READ_LOCK, NO_LOCK };
- if (!assoc_mgr_user_list)
- if (_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
+ if(!assoc_mgr_user_list)
+ if(_get_assoc_mgr_user_list(db_conn, 0) == SLURM_ERROR)
return SLURMDB_ADMIN_NOTSET;
- if (!assoc_mgr_user_list)
+ if(!assoc_mgr_user_list)
return SLURMDB_ADMIN_NOTSET;
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_user_list);
while((found_user = list_next(itr))) {
- if (uid == found_user->uid)
+ if(uid == found_user->uid)
break;
}
list_iterator_destroy(itr);
- if (!found_user || !found_user->coord_accts) {
+ if(!found_user || !found_user->coord_accts) {
assoc_mgr_unlock(&locks);
return 0;
}
itr = list_iterator_create(found_user->coord_accts);
while((acct = list_next(itr))) {
- if (!strcmp(acct_name, acct->name))
+ if(!strcmp(acct_name, acct->name))
break;
}
list_iterator_destroy(itr);
- if (acct) {
+ if(acct) {
assoc_mgr_unlock(&locks);
return 1;
}
@@ -1815,17 +1815,17 @@ extern List assoc_mgr_get_shares(void *db_conn,
assoc_mgr_lock_t locks = { READ_LOCK, NO_LOCK,
NO_LOCK, NO_LOCK, NO_LOCK };
- if (!assoc_mgr_association_list
+ if(!assoc_mgr_association_list
|| !list_count(assoc_mgr_association_list))
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = uid;
- if (user_list && list_count(user_list))
+ if(user_list && list_count(user_list))
user_itr = list_iterator_create(user_list);
- if (acct_list && list_count(acct_list))
+ if(acct_list && list_count(acct_list))
acct_itr = list_iterator_create(acct_list);
if (private_data & PRIVATE_DATA_USAGE) {
@@ -1833,12 +1833,12 @@ extern List assoc_mgr_get_shares(void *db_conn,
is_admin = 0;
/* Check permissions of the requesting user.
*/
- if ((uid == slurm_uid || uid == 0)
+ if((uid == slurm_uid || uid == 0)
|| assoc_mgr_get_admin_level(db_conn, uid)
>= SLURMDB_ADMIN_OPERATOR)
is_admin = 1;
else {
- if (assoc_mgr_fill_in_user(
+ if(assoc_mgr_fill_in_user(
db_conn, &user,
ACCOUNTING_ENFORCE_ASSOCS, NULL)
== SLURM_ERROR) {
@@ -1853,43 +1853,43 @@ extern List assoc_mgr_get_shares(void *db_conn,
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_association_list);
while((assoc = list_next(itr))) {
- if (user_itr && assoc->user) {
+ if(user_itr && assoc->user) {
while((tmp_char = list_next(user_itr))) {
- if (!strcasecmp(tmp_char, assoc->user))
+ if(!strcasecmp(tmp_char, assoc->user))
break;
}
list_iterator_reset(user_itr);
/* not correct user */
- if (!tmp_char)
+ if(!tmp_char)
continue;
}
- if (acct_itr) {
+ if(acct_itr) {
while((tmp_char = list_next(acct_itr))) {
- if (!strcasecmp(tmp_char, assoc->acct))
+ if(!strcasecmp(tmp_char, assoc->acct))
break;
}
list_iterator_reset(acct_itr);
/* not correct account */
- if (!tmp_char)
+ if(!tmp_char)
continue;
}
if (private_data & PRIVATE_DATA_USAGE) {
- if (!is_admin) {
+ if(!is_admin) {
ListIterator itr = NULL;
slurmdb_coord_rec_t *coord = NULL;
- if (assoc->user &&
+ if(assoc->user &&
!strcmp(assoc->user, user.name))
goto is_user;
- if (!user.coord_accts) {
+ if(!user.coord_accts) {
debug4("This user isn't a coord.");
goto bad_user;
}
- if (!assoc->acct) {
+ if(!assoc->acct) {
debug("No account name given "
"in association.");
goto bad_user;
@@ -1897,13 +1897,13 @@ extern List assoc_mgr_get_shares(void *db_conn,
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name,
+ if(!strcasecmp(coord->name,
assoc->acct))
break;
}
list_iterator_destroy(itr);
- if (coord)
+ if(coord)
goto is_user;
bad_user:
@@ -1918,7 +1918,7 @@ extern List assoc_mgr_get_shares(void *db_conn,
share->assoc_id = assoc->id;
share->cluster = xstrdup(assoc->cluster);
- if (assoc == assoc_mgr_root_assoc)
+ if(assoc == assoc_mgr_root_assoc)
share->shares_raw = NO_VAL;
else
share->shares_raw = assoc->shares_raw;
@@ -1926,11 +1926,11 @@ extern List assoc_mgr_get_shares(void *db_conn,
share->shares_norm = assoc->usage->shares_norm;
share->usage_raw = (uint64_t)assoc->usage->usage_raw;
- if (assoc->user) {
+ if(assoc->user) {
/* We only calculate user effective usage when
* we need it
*/
- if (assoc->usage->usage_efctv == (long double)NO_VAL)
+ if(assoc->usage->usage_efctv == (long double)NO_VAL)
priority_g_set_assoc_usage(assoc);
share->name = xstrdup(assoc->user);
@@ -1938,7 +1938,7 @@ extern List assoc_mgr_get_shares(void *db_conn,
share->user = 1;
} else {
share->name = xstrdup(assoc->acct);
- if (!assoc->parent_acct
+ if(!assoc->parent_acct
&& assoc->usage->parent_assoc_ptr)
share->parent = xstrdup(
assoc->usage->parent_assoc_ptr->acct);
@@ -1951,9 +1951,9 @@ extern List assoc_mgr_get_shares(void *db_conn,
list_iterator_destroy(itr);
assoc_mgr_unlock(&locks);
end_it:
- if (user_itr)
+ if(user_itr)
list_iterator_destroy(user_itr);
- if (acct_itr)
+ if(acct_itr)
list_iterator_destroy(acct_itr);
return ret_list;
@@ -1974,7 +1974,7 @@ extern int assoc_mgr_update(List update_list)
xassert(update_list);
itr = list_iterator_create(update_list);
while((object = list_next(itr))) {
- if (!object->objects || !list_count(object->objects))
+ if(!object->objects || !list_count(object->objects))
continue;
switch(object->type) {
@@ -2030,20 +2030,20 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
WRITE_LOCK, NO_LOCK, NO_LOCK };
- if (!assoc_mgr_association_list)
+ if(!assoc_mgr_association_list)
return SLURM_SUCCESS;
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_association_list);
while((object = list_pop(update->objects))) {
- if (object->cluster && assoc_mgr_cluster_name) {
+ if(object->cluster && assoc_mgr_cluster_name) {
/* only update the local clusters assocs */
- if (strcasecmp(object->cluster,
+ if(strcasecmp(object->cluster,
assoc_mgr_cluster_name)) {
slurmdb_destroy_association_rec(object);
continue;
}
- } else if (assoc_mgr_cluster_name) {
+ } else if(assoc_mgr_cluster_name) {
error("We don't have a cluster here, no "
"idea if this is our association.");
continue;
@@ -2051,22 +2051,22 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
list_iterator_reset(itr);
while((rec = list_next(itr))) {
- if (object->id) {
- if (object->id == rec->id) {
+ if(object->id) {
+ if(object->id == rec->id) {
break;
}
continue;
} else {
- if (!object->user && rec->user) {
+ if(!object->user && rec->user) {
debug4("we are looking for a "
"nonuser association");
continue;
- } else if (object->uid != rec->uid) {
+ } else if(object->uid != rec->uid) {
debug4("not the right user");
continue;
}
- if (object->acct
+ if(object->acct
&& (!rec->acct
|| strcasecmp(object->acct,
rec->acct))) {
@@ -2074,7 +2074,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
continue;
}
- if (object->partition
+ if(object->partition
&& (!rec->partition
|| strcasecmp(object->partition,
rec->partition))) {
@@ -2083,7 +2083,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
}
/* only check for on the slurmdbd */
- if (!assoc_mgr_cluster_name && object->cluster
+ if(!assoc_mgr_cluster_name && object->cluster
&& (!rec->cluster
|| strcasecmp(object->cluster,
rec->cluster))) {
@@ -2096,14 +2096,14 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
//info("%d assoc %u", update->type, object->id);
switch(update->type) {
case SLURMDB_MODIFY_ASSOC:
- if (!rec) {
+ if(!rec) {
rc = SLURM_ERROR;
break;
}
- if (object->shares_raw != NO_VAL) {
+ if(object->shares_raw != NO_VAL) {
rec->shares_raw = object->shares_raw;
- if (setup_childern) {
+ if(setup_childern) {
/* we need to update the shares on
each sibling and child
association now
@@ -2112,49 +2112,49 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
}
}
- if (object->grp_cpu_mins != (uint64_t)NO_VAL)
+ if(object->grp_cpu_mins != (uint64_t)NO_VAL)
rec->grp_cpu_mins = object->grp_cpu_mins;
- if (object->grp_cpu_run_mins != (uint64_t)NO_VAL)
+ if(object->grp_cpu_run_mins != (uint64_t)NO_VAL)
rec->grp_cpu_run_mins =
object->grp_cpu_run_mins;
- if (object->grp_cpus != NO_VAL)
+ if(object->grp_cpus != NO_VAL)
rec->grp_cpus = object->grp_cpus;
- if (object->grp_jobs != NO_VAL)
+ if(object->grp_jobs != NO_VAL)
rec->grp_jobs = object->grp_jobs;
- if (object->grp_nodes != NO_VAL)
+ if(object->grp_nodes != NO_VAL)
rec->grp_nodes = object->grp_nodes;
- if (object->grp_submit_jobs != NO_VAL)
+ if(object->grp_submit_jobs != NO_VAL)
rec->grp_submit_jobs = object->grp_submit_jobs;
- if (object->grp_wall != NO_VAL)
+ if(object->grp_wall != NO_VAL)
rec->grp_wall = object->grp_wall;
- if (object->lft != NO_VAL) {
+ if(object->lft != NO_VAL) {
rec->lft = object->lft;
resort = 1;
}
- if (object->max_cpu_mins_pj != (uint64_t)NO_VAL)
+ if(object->max_cpu_mins_pj != (uint64_t)NO_VAL)
rec->max_cpu_mins_pj = object->max_cpu_mins_pj;
- if (object->max_cpu_run_mins != (uint64_t)NO_VAL)
+ if(object->max_cpu_run_mins != (uint64_t)NO_VAL)
rec->max_cpu_run_mins =
object->max_cpu_run_mins;
- if (object->max_cpus_pj != NO_VAL)
+ if(object->max_cpus_pj != NO_VAL)
rec->max_cpus_pj = object->max_cpus_pj;
- if (object->max_jobs != NO_VAL)
+ if(object->max_jobs != NO_VAL)
rec->max_jobs = object->max_jobs;
- if (object->max_nodes_pj != NO_VAL)
+ if(object->max_nodes_pj != NO_VAL)
rec->max_nodes_pj = object->max_nodes_pj;
- if (object->max_submit_jobs != NO_VAL)
+ if(object->max_submit_jobs != NO_VAL)
rec->max_submit_jobs = object->max_submit_jobs;
- if (object->max_wall_pj != NO_VAL)
+ if(object->max_wall_pj != NO_VAL)
rec->max_wall_pj = object->max_wall_pj;
- if (object->parent_acct) {
+ if(object->parent_acct) {
xfree(rec->parent_acct);
rec->parent_acct = xstrdup(object->parent_acct);
}
- if (object->parent_id) {
+ if(object->parent_id) {
rec->parent_id = object->parent_id;
// after all new parents have been set we will
// reset the parent pointers below
@@ -2162,11 +2162,11 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
}
/* info("rec has def of %d %d", */
/* rec->def_qos_id, object->def_qos_id); */
- if (object->def_qos_id != NO_VAL)
+ if(object->def_qos_id != NO_VAL)
rec->def_qos_id = object->def_qos_id;
- if (object->qos_list) {
- if (rec->qos_list) {
+ if(object->qos_list) {
+ if(rec->qos_list) {
_local_update_assoc_qos_list(
rec, object->qos_list);
} else {
@@ -2174,8 +2174,8 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
object->qos_list = NULL;
}
- if (rec->user && (g_qos_count > 0)) {
- if (!rec->usage->valid_qos
+ if(rec->user && (g_qos_count > 0)) {
+ if(!rec->usage->valid_qos
|| (bit_size(rec->usage->valid_qos)
!= g_qos_count)) {
FREE_NULL_BITMAP(
@@ -2195,7 +2195,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
}
}
- if (rec->def_qos_id && rec->user
+ if(rec->def_qos_id && rec->user
&& rec->usage && rec->usage->valid_qos
&& !bit_test(rec->usage->valid_qos,
rec->def_qos_id)) {
@@ -2206,17 +2206,17 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
}
/* info("now rec has def of %d", rec->def_qos_id); */
- if (!slurmdbd_conf && !parents_changed) {
+ if(!slurmdbd_conf && !parents_changed) {
debug("updating assoc %u", rec->id);
log_assoc_rec(rec, assoc_mgr_qos_list);
}
break;
case SLURMDB_ADD_ASSOC:
- if (rec) {
+ if(rec) {
//rc = SLURM_ERROR;
break;
}
- if (!object->usage)
+ if(!object->usage)
object->usage =
create_assoc_mgr_association_usage();
list_append(assoc_mgr_association_list, object);
@@ -2225,22 +2225,22 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
// set the parent
break;
case SLURMDB_REMOVE_ASSOC:
- if (!rec) {
+ if(!rec) {
//rc = SLURM_ERROR;
break;
}
- if (setup_childern)
+ if(setup_childern)
parents_changed = 1; /* set since we need to
set the shares
of surrounding childern
*/
- if (remove_assoc_notify) {
+ if(remove_assoc_notify) {
/* since there are some deadlock
issues while inside our lock here
we have to process a notify later
*/
- if (!remove_list)
+ if(!remove_list)
remove_list = list_create(
slurmdb_destroy_association_rec);
list_remove(itr);
@@ -2258,16 +2258,16 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
/* We have to do this after the entire list is processed since
* we may have added the parent which wasn't in the list before
*/
- if (parents_changed) {
+ if(parents_changed) {
int reset = 1;
list_sort(assoc_mgr_association_list,
(ListCmpF)_sort_assoc_dec);
list_iterator_reset(itr);
/* flush the childern lists */
- if (setup_childern) {
+ if(setup_childern) {
while((object = list_next(itr))) {
- if (object->usage->childern_list)
+ if(object->usage->childern_list)
list_flush(object->usage->
childern_list);
}
@@ -2282,7 +2282,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
/* reset the limits because since a parent
changed we could have different usage
*/
- if (!object->user) {
+ if(!object->user) {
_clear_used_info(object);
object->usage->usage_raw = 0;
object->usage->grp_used_wall = 0;
@@ -2296,10 +2296,10 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
*/
list_iterator_reset(itr);
while((object = list_next(itr))) {
- if (setup_childern) {
+ if(setup_childern) {
int count = 0;
ListIterator itr2 = NULL;
- if (!object->usage->childern_list
+ if(!object->usage->childern_list
|| !list_count(object->usage->childern_list))
goto is_user;
itr2 = list_iterator_create(
@@ -2312,7 +2312,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
list_iterator_destroy(itr2);
}
is_user:
- if (!object->user)
+ if(!object->user)
continue;
rec = object;
@@ -2328,7 +2328,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
_addto_used_info(object, rec);
}
}
- if (setup_childern) {
+ if(setup_childern) {
/* Now normalize the static shares */
list_iterator_reset(itr);
while((object = list_next(itr))) {
@@ -2345,7 +2345,7 @@ extern int assoc_mgr_update_assocs(slurmdb_update_object_t *update)
/* This needs to happen outside of the
assoc_mgr_lock */
- if (remove_list) {
+ if(remove_list) {
itr = list_iterator_create(remove_list);
while((rec = list_next(itr)))
@@ -2368,20 +2368,20 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
NO_LOCK, NO_LOCK, WRITE_LOCK };
- if (!assoc_mgr_wckey_list)
+ if(!assoc_mgr_wckey_list)
return SLURM_SUCCESS;
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_wckey_list);
while((object = list_pop(update->objects))) {
- if (object->cluster && assoc_mgr_cluster_name) {
+ if(object->cluster && assoc_mgr_cluster_name) {
/* only update the local clusters assocs */
- if (strcasecmp(object->cluster,
+ if(strcasecmp(object->cluster,
assoc_mgr_cluster_name)) {
slurmdb_destroy_wckey_rec(object);
continue;
}
- } else if (assoc_mgr_cluster_name) {
+ } else if(assoc_mgr_cluster_name) {
error("We don't have a cluster here, no "
"idea if this is our wckey.");
continue;
@@ -2389,18 +2389,18 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
list_iterator_reset(itr);
while((rec = list_next(itr))) {
- if (object->id) {
- if (object->id == rec->id) {
+ if(object->id) {
+ if(object->id == rec->id) {
break;
}
continue;
} else {
- if (object->uid != rec->uid) {
+ if(object->uid != rec->uid) {
debug4("not the right user");
continue;
}
- if (object->name
+ if(object->name
&& (!rec->name
|| strcasecmp(object->name,
rec->name))) {
@@ -2409,7 +2409,7 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
}
/* only check for on the slurmdbd */
- if (!assoc_mgr_cluster_name && object->cluster
+ if(!assoc_mgr_cluster_name && object->cluster
&& (!rec->cluster
|| strcasecmp(object->cluster,
rec->cluster))) {
@@ -2422,14 +2422,14 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
//info("%d WCKEY %u", update->type, object->id);
switch(update->type) {
case SLURMDB_MODIFY_WCKEY:
- if (!rec) {
+ if(!rec) {
rc = SLURM_ERROR;
break;
}
/* nothing yet */
break;
case SLURMDB_ADD_WCKEY:
- if (rec) {
+ if(rec) {
//rc = SLURM_ERROR;
break;
}
@@ -2444,7 +2444,7 @@ extern int assoc_mgr_update_wckeys(slurmdb_update_object_t *update)
object = NULL;
break;
case SLURMDB_REMOVE_WCKEY:
- if (!rec) {
+ if(!rec) {
//rc = SLURM_ERROR;
break;
}
@@ -2473,7 +2473,7 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
NO_LOCK, WRITE_LOCK, WRITE_LOCK };
- if (!assoc_mgr_user_list)
+ if(!assoc_mgr_user_list)
return SLURM_SUCCESS;
assoc_mgr_lock(&locks);
@@ -2482,24 +2482,24 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
list_iterator_reset(itr);
while((rec = list_next(itr))) {
char *name;
- if (object->old_name)
+ if(object->old_name)
name = object->old_name;
else
name = object->name;
- if (!strcasecmp(name, rec->name))
+ if(!strcasecmp(name, rec->name))
break;
}
//info("%d user %s", update->type, object->name);
switch(update->type) {
case SLURMDB_MODIFY_USER:
- if (!rec) {
+ if(!rec) {
rc = SLURM_ERROR;
break;
}
- if (object->old_name) {
- if (!object->name) {
+ if(object->old_name) {
+ if(!object->name) {
error("Tried to alter user %s's name "
"without giving a new one.",
rec->name);
@@ -2512,24 +2512,24 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
rc = _change_user_name(rec);
}
- if (object->default_acct) {
+ if(object->default_acct) {
xfree(rec->default_acct);
rec->default_acct = object->default_acct;
object->default_acct = NULL;
}
- if (object->default_wckey) {
+ if(object->default_wckey) {
xfree(rec->default_wckey);
rec->default_wckey = object->default_wckey;
object->default_wckey = NULL;
}
- if (object->admin_level != SLURMDB_ADMIN_NOTSET)
+ if(object->admin_level != SLURMDB_ADMIN_NOTSET)
rec->admin_level = object->admin_level;
break;
case SLURMDB_ADD_USER:
- if (rec) {
+ if(rec) {
//rc = SLURM_ERROR;
break;
}
@@ -2543,7 +2543,7 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
object = NULL;
break;
case SLURMDB_REMOVE_USER:
- if (!rec) {
+ if(!rec) {
//rc = SLURM_ERROR;
break;
}
@@ -2552,16 +2552,16 @@ extern int assoc_mgr_update_users(slurmdb_update_object_t *update)
case SLURMDB_ADD_COORD:
/* same as SLURMDB_REMOVE_COORD */
case SLURMDB_REMOVE_COORD:
- if (!rec) {
+ if(!rec) {
//rc = SLURM_ERROR;
break;
}
/* We always get a complete list here */
- if (!object->coord_accts) {
- if (rec->coord_accts)
+ if(!object->coord_accts) {
+ if(rec->coord_accts)
list_flush(rec->coord_accts);
} else {
- if (rec->coord_accts)
+ if(rec->coord_accts)
list_destroy(rec->coord_accts);
rec->coord_accts = object->coord_accts;
object->coord_accts = NULL;
@@ -2593,7 +2593,7 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
WRITE_LOCK, NO_LOCK, NO_LOCK };
- if (!assoc_mgr_qos_list)
+ if(!assoc_mgr_qos_list)
return SLURM_SUCCESS;
assoc_mgr_lock(&locks);
@@ -2601,7 +2601,7 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
while((object = list_pop(update->objects))) {
list_iterator_reset(itr);
while((rec = list_next(itr))) {
- if (object->id == rec->id) {
+ if(object->id == rec->id) {
break;
}
}
@@ -2609,12 +2609,12 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
//info("%d qos %s", update->type, object->name);
switch(update->type) {
case SLURMDB_ADD_QOS:
- if (rec) {
+ if(rec) {
//rc = SLURM_ERROR;
break;
}
- if (!object->usage)
+ if(!object->usage)
object->usage = create_assoc_mgr_qos_usage();
list_append(assoc_mgr_qos_list, object);
/* char *tmp = get_qos_complete_str_bitstr( */
@@ -2629,53 +2629,53 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
instead of 0 we need to ignore the 0 bit and start
with 1 so increase the count by 1.
*/
- if (object->id+1 > g_qos_count) {
+ if(object->id+1 > g_qos_count) {
resize_qos_bitstr = 1;
g_qos_count = object->id+1;
}
object = NULL;
break;
case SLURMDB_MODIFY_QOS:
- if (!rec) {
+ if(!rec) {
rc = SLURM_ERROR;
break;
}
- if (object->grp_cpu_mins != (uint64_t)NO_VAL)
+ if(object->grp_cpu_mins != (uint64_t)NO_VAL)
rec->grp_cpu_mins = object->grp_cpu_mins;
- if (object->grp_cpu_run_mins != (uint64_t)NO_VAL)
+ if(object->grp_cpu_run_mins != (uint64_t)NO_VAL)
rec->grp_cpu_run_mins =
object->grp_cpu_run_mins;
- if (object->grp_cpus != NO_VAL)
+ if(object->grp_cpus != NO_VAL)
rec->grp_cpus = object->grp_cpus;
- if (object->grp_jobs != NO_VAL)
+ if(object->grp_jobs != NO_VAL)
rec->grp_jobs = object->grp_jobs;
- if (object->grp_nodes != NO_VAL)
+ if(object->grp_nodes != NO_VAL)
rec->grp_nodes = object->grp_nodes;
- if (object->grp_submit_jobs != NO_VAL)
+ if(object->grp_submit_jobs != NO_VAL)
rec->grp_submit_jobs = object->grp_submit_jobs;
- if (object->grp_wall != NO_VAL)
+ if(object->grp_wall != NO_VAL)
rec->grp_wall = object->grp_wall;
- if (object->max_cpu_mins_pj != (uint64_t)NO_VAL)
+ if(object->max_cpu_mins_pj != (uint64_t)NO_VAL)
rec->max_cpu_mins_pj = object->max_cpu_mins_pj;
- if (object->max_cpu_run_mins_pu != (uint64_t)NO_VAL)
+ if(object->max_cpu_run_mins_pu != (uint64_t)NO_VAL)
rec->max_cpu_run_mins_pu =
object->max_cpu_run_mins_pu;
- if (object->max_cpus_pj != NO_VAL)
+ if(object->max_cpus_pj != NO_VAL)
rec->max_cpus_pj = object->max_cpus_pj;
- if (object->max_jobs_pu != NO_VAL)
+ if(object->max_jobs_pu != NO_VAL)
rec->max_jobs_pu = object->max_jobs_pu;
- if (object->max_nodes_pj != NO_VAL)
+ if(object->max_nodes_pj != NO_VAL)
rec->max_nodes_pj = object->max_nodes_pj;
- if (object->max_submit_jobs_pu != NO_VAL)
+ if(object->max_submit_jobs_pu != NO_VAL)
rec->max_submit_jobs_pu =
object->max_submit_jobs_pu;
- if (object->max_wall_pj != NO_VAL)
+ if(object->max_wall_pj != NO_VAL)
rec->max_wall_pj = object->max_wall_pj;
- if (object->preempt_bitstr) {
- if (rec->preempt_bitstr)
+ if(object->preempt_bitstr) {
+ if(rec->preempt_bitstr)
FREE_NULL_BITMAP(rec->preempt_bitstr);
rec->preempt_bitstr = object->preempt_bitstr;
@@ -2689,29 +2689,29 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
/* xfree(tmp); */
}
- if (object->preempt_mode != (uint16_t)NO_VAL)
+ if(object->preempt_mode != (uint16_t)NO_VAL)
rec->preempt_mode = object->preempt_mode;
- if (object->priority != NO_VAL)
+ if(object->priority != NO_VAL)
rec->priority = object->priority;
- if (object->usage_factor != (double)NO_VAL)
+ if(object->usage_factor != (double)NO_VAL)
rec->usage_factor =
object->usage_factor;
break;
case SLURMDB_REMOVE_QOS:
- if (!rec) {
+ if(!rec) {
//rc = SLURM_ERROR;
break;
}
- if (remove_qos_notify) {
+ if(remove_qos_notify) {
/* since there are some deadlock
issues while inside our lock here
we have to process a notify later
*/
- if (!remove_list)
+ if(!remove_list)
remove_list = list_create(
slurmdb_destroy_qos_rec);
list_remove(itr);
@@ -2719,7 +2719,7 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
} else
list_delete_item(itr);
- if (!assoc_mgr_association_list)
+ if(!assoc_mgr_association_list)
break;
/* Remove this qos from all the associations
on this cluster.
@@ -2728,13 +2728,13 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
assoc_mgr_association_list);
while((assoc = list_next(assoc_itr))) {
- if (assoc->def_qos_id == object->id)
+ if(assoc->def_qos_id == object->id)
assoc->def_qos_id = 0;
- if (!assoc->usage->valid_qos)
+ if(!assoc->usage->valid_qos)
continue;
- if (bit_size(assoc->usage->valid_qos)
+ if(bit_size(assoc->usage->valid_qos)
> object->id)
bit_clear(assoc->usage->valid_qos,
object->id);
@@ -2748,23 +2748,23 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
slurmdb_destroy_qos_rec(object);
}
- if (resize_qos_bitstr) {
+ if(resize_qos_bitstr) {
/* we need to resize all bitstring's that represent
qos' */
list_iterator_reset(itr);
while((object = list_next(itr))) {
- if (!object->preempt_bitstr)
+ if(!object->preempt_bitstr)
continue;
object->preempt_bitstr =
bit_realloc(object->preempt_bitstr,
g_qos_count);
}
- if (assoc_mgr_association_list) {
+ if(assoc_mgr_association_list) {
assoc_itr = list_iterator_create(
assoc_mgr_association_list);
while((assoc = list_next(assoc_itr))) {
- if (!assoc->usage->valid_qos)
+ if(!assoc->usage->valid_qos)
continue;
assoc->usage->valid_qos =
bit_realloc(assoc->usage->valid_qos,
@@ -2779,7 +2779,7 @@ extern int assoc_mgr_update_qos(slurmdb_update_object_t *update)
/* This needs to happen outside of the
assoc_mgr_lock */
- if (remove_list) {
+ if(remove_list) {
itr = list_iterator_create(remove_list);
while((rec = list_next(itr)))
@@ -2801,12 +2801,12 @@ extern int assoc_mgr_validate_assoc_id(void *db_conn,
assoc_mgr_lock_t locks = { READ_LOCK, NO_LOCK,
NO_LOCK, NO_LOCK, NO_LOCK };
- if (!assoc_mgr_association_list)
- if (_get_assoc_mgr_association_list(db_conn, enforce)
+ if(!assoc_mgr_association_list)
+ if(_get_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
- if ((!assoc_mgr_association_list
+ if((!assoc_mgr_association_list
|| !list_count(assoc_mgr_association_list))
&& !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
@@ -2814,13 +2814,13 @@ extern int assoc_mgr_validate_assoc_id(void *db_conn,
assoc_mgr_lock(&locks);
itr = list_iterator_create(assoc_mgr_association_list);
while((found_assoc = list_next(itr))) {
- if (assoc_id == found_assoc->id)
+ if(assoc_id == found_assoc->id)
break;
}
list_iterator_destroy(itr);
assoc_mgr_unlock(&locks);
- if (found_assoc || !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
+ if(found_assoc || !(enforce & ACCOUNTING_ENFORCE_ASSOCS))
return SLURM_SUCCESS;
return SLURM_ERROR;
@@ -2862,7 +2862,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
pack_time(time(NULL), buffer);
assoc_mgr_lock(&locks);
- if (assoc_mgr_user_list) {
+ if(assoc_mgr_user_list) {
memset(&msg, 0, sizeof(dbd_list_msg_t));
msg.my_list = assoc_mgr_user_list;
/* let us know what to unpack */
@@ -2871,7 +2871,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
DBD_ADD_USERS, buffer);
}
- if (assoc_mgr_qos_list) {
+ if(assoc_mgr_qos_list) {
memset(&msg, 0, sizeof(dbd_list_msg_t));
msg.my_list = assoc_mgr_qos_list;
/* let us know what to unpack */
@@ -2880,7 +2880,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
DBD_ADD_QOS, buffer);
}
- if (assoc_mgr_wckey_list) {
+ if(assoc_mgr_wckey_list) {
memset(&msg, 0, sizeof(dbd_list_msg_t));
msg.my_list = assoc_mgr_wckey_list;
/* let us know what to unpack */
@@ -2890,7 +2890,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
}
/* this needs to be done last so qos is set up
* before hand when loading it back */
- if (assoc_mgr_association_list) {
+ if(assoc_mgr_association_list) {
memset(&msg, 0, sizeof(dbd_list_msg_t));
msg.my_list = assoc_mgr_association_list;
/* let us know what to unpack */
@@ -2930,11 +2930,11 @@ extern int dump_assoc_mgr_state(char *state_save_location)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
@@ -2951,12 +2951,12 @@ extern int dump_assoc_mgr_state(char *state_save_location)
pack16(ASSOC_USAGE_VERSION, buffer);
pack_time(time(NULL), buffer);
- if (assoc_mgr_association_list) {
+ if(assoc_mgr_association_list) {
ListIterator itr = NULL;
slurmdb_association_rec_t *assoc = NULL;
itr = list_iterator_create(assoc_mgr_association_list);
while((assoc = list_next(itr))) {
- if (!assoc->user)
+ if(!assoc->user)
continue;
pack32(assoc->id, buffer);
@@ -2999,11 +2999,11 @@ extern int dump_assoc_mgr_state(char *state_save_location)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
@@ -3020,7 +3020,7 @@ extern int dump_assoc_mgr_state(char *state_save_location)
pack16(ASSOC_USAGE_VERSION, buffer);
pack_time(time(NULL), buffer);
- if (assoc_mgr_qos_list) {
+ if(assoc_mgr_qos_list) {
ListIterator itr = NULL;
slurmdb_qos_rec_t *qos = NULL;
itr = list_iterator_create(assoc_mgr_qos_list);
@@ -3065,11 +3065,11 @@ extern int dump_assoc_mgr_state(char *state_save_location)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
@@ -3098,7 +3098,7 @@ extern int load_assoc_usage(char *state_save_location)
assoc_mgr_lock_t locks = { WRITE_LOCK, READ_LOCK,
NO_LOCK, NO_LOCK, NO_LOCK };
- if (!assoc_mgr_association_list)
+ if(!assoc_mgr_association_list)
return SLURM_SUCCESS;
/* read the file */
@@ -3161,7 +3161,7 @@ extern int load_assoc_usage(char *state_save_location)
safe_unpack64(&usage_raw, buffer);
safe_unpack32(&grp_used_wall, buffer);
while((assoc = list_next(itr)))
- if (assoc->id == assoc_id)
+ if(assoc->id == assoc_id)
break;
/* We want to do this all the way up to and including
@@ -3184,9 +3184,9 @@ extern int load_assoc_usage(char *state_save_location)
return SLURM_SUCCESS;
unpack_error:
- if (buffer)
+ if(buffer)
free_buf(buffer);
- if (itr)
+ if(itr)
list_iterator_destroy(itr);
assoc_mgr_unlock(&locks);
return SLURM_ERROR;
@@ -3205,7 +3205,7 @@ extern int load_qos_usage(char *state_save_location)
assoc_mgr_lock_t locks = { NO_LOCK, READ_LOCK,
WRITE_LOCK, NO_LOCK, NO_LOCK };
- if (!assoc_mgr_qos_list)
+ if(!assoc_mgr_qos_list)
return SLURM_SUCCESS;
/* read the file */
@@ -3268,9 +3268,9 @@ extern int load_qos_usage(char *state_save_location)
safe_unpack64(&usage_raw, buffer);
safe_unpack32(&grp_used_wall, buffer);
while((qos = list_next(itr)))
- if (qos->id == qos_id)
+ if(qos->id == qos_id)
break;
- if (qos) {
+ if(qos) {
qos->usage->grp_used_wall += grp_used_wall;
qos->usage->usage_raw += (long double)usage_raw;
}
@@ -3284,9 +3284,9 @@ extern int load_qos_usage(char *state_save_location)
return SLURM_SUCCESS;
unpack_error:
- if (buffer)
+ if(buffer)
free_buf(buffer);
- if (itr)
+ if(itr)
list_iterator_destroy(itr);
assoc_mgr_unlock(&locks);
return SLURM_ERROR;
@@ -3363,11 +3363,11 @@ extern int load_assoc_mgr_state(char *state_save_location)
&msg, SLURMDBD_VERSION, DBD_ADD_ASSOCS, buffer);
if (error_code != SLURM_SUCCESS)
goto unpack_error;
- else if (!msg->my_list) {
+ else if(!msg->my_list) {
error("No associations retrieved");
break;
}
- if (assoc_mgr_association_list)
+ if(assoc_mgr_association_list)
list_destroy(assoc_mgr_association_list);
assoc_mgr_association_list = msg->my_list;
_post_association_list(assoc_mgr_association_list);
@@ -3382,11 +3382,11 @@ extern int load_assoc_mgr_state(char *state_save_location)
&msg, SLURMDBD_VERSION, DBD_ADD_USERS, buffer);
if (error_code != SLURM_SUCCESS)
goto unpack_error;
- else if (!msg->my_list) {
+ else if(!msg->my_list) {
error("No users retrieved");
break;
}
- if (assoc_mgr_user_list)
+ if(assoc_mgr_user_list)
list_destroy(assoc_mgr_user_list);
assoc_mgr_user_list = msg->my_list;
_post_user_list(assoc_mgr_user_list);
@@ -3400,11 +3400,11 @@ extern int load_assoc_mgr_state(char *state_save_location)
&msg, SLURMDBD_VERSION, DBD_ADD_QOS, buffer);
if (error_code != SLURM_SUCCESS)
goto unpack_error;
- else if (!msg->my_list) {
+ else if(!msg->my_list) {
error("No qos retrieved");
break;
}
- if (assoc_mgr_qos_list)
+ if(assoc_mgr_qos_list)
list_destroy(assoc_mgr_qos_list);
assoc_mgr_qos_list = msg->my_list;
_post_qos_list(assoc_mgr_qos_list);
@@ -3418,11 +3418,11 @@ extern int load_assoc_mgr_state(char *state_save_location)
&msg, SLURMDBD_VERSION, DBD_ADD_WCKEYS, buffer);
if (error_code != SLURM_SUCCESS)
goto unpack_error;
- else if (!msg->my_list) {
+ else if(!msg->my_list) {
error("No qos retrieved");
break;
}
- if (assoc_mgr_wckey_list)
+ if(assoc_mgr_wckey_list)
list_destroy(assoc_mgr_wckey_list);
assoc_mgr_wckey_list = msg->my_list;
debug("Recovered %u wckeys",
@@ -3442,7 +3442,7 @@ extern int load_assoc_mgr_state(char *state_save_location)
return SLURM_SUCCESS;
unpack_error:
- if (buffer)
+ if(buffer)
free_buf(buffer);
assoc_mgr_unlock(&locks);
return SLURM_ERROR;
@@ -3453,28 +3453,28 @@ extern int assoc_mgr_refresh_lists(void *db_conn, assoc_init_args_t *args)
static uint16_t enforce = 0;
static uint16_t cache_level = ASSOC_MGR_CACHE_ALL;
- if (args) {
+ if(args) {
enforce = args->enforce;
cache_level = args->cache_level;
return SLURM_SUCCESS;
}
- if (cache_level & ASSOC_MGR_CACHE_QOS)
- if (_refresh_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
+ if(cache_level & ASSOC_MGR_CACHE_QOS)
+ if(_refresh_assoc_mgr_qos_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
- if (cache_level & ASSOC_MGR_CACHE_ASSOC) {
- if (_refresh_assoc_mgr_association_list(db_conn, enforce)
+ if(cache_level & ASSOC_MGR_CACHE_ASSOC) {
+ if(_refresh_assoc_mgr_association_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
}
- if (cache_level & ASSOC_MGR_CACHE_USER)
- if (_refresh_assoc_mgr_user_list(db_conn, enforce)
+ if(cache_level & ASSOC_MGR_CACHE_USER)
+ if(_refresh_assoc_mgr_user_list(db_conn, enforce)
== SLURM_ERROR)
return SLURM_ERROR;
- if (cache_level & ASSOC_MGR_CACHE_WCKEY)
- if (_refresh_assoc_wckey_list(db_conn, enforce) == SLURM_ERROR)
+ if(cache_level & ASSOC_MGR_CACHE_WCKEY)
+ if(_refresh_assoc_wckey_list(db_conn, enforce) == SLURM_ERROR)
return SLURM_ERROR;
running_cache = 0;
@@ -3490,11 +3490,11 @@ extern int assoc_mgr_set_missing_uids()
NO_LOCK, WRITE_LOCK, WRITE_LOCK };
assoc_mgr_lock(&locks);
- if (assoc_mgr_association_list) {
+ if(assoc_mgr_association_list) {
slurmdb_association_rec_t *object = NULL;
itr = list_iterator_create(assoc_mgr_association_list);
while((object = list_next(itr))) {
- if (object->user && object->uid == (uint32_t)NO_VAL) {
+ if(object->user && object->uid == (uint32_t)NO_VAL) {
if (uid_from_string(
object->user, &pw_uid) < 0) {
debug2("refresh association "
@@ -3507,11 +3507,11 @@ extern int assoc_mgr_set_missing_uids()
list_iterator_destroy(itr);
}
- if (assoc_mgr_wckey_list) {
+ if(assoc_mgr_wckey_list) {
slurmdb_wckey_rec_t *object = NULL;
itr = list_iterator_create(assoc_mgr_wckey_list);
while((object = list_next(itr))) {
- if (object->user && object->uid == (uint32_t)NO_VAL) {
+ if(object->user && object->uid == (uint32_t)NO_VAL) {
if (uid_from_string(
object->user, &pw_uid) < 0) {
debug2("refresh wckey "
@@ -3524,11 +3524,11 @@ extern int assoc_mgr_set_missing_uids()
list_iterator_destroy(itr);
}
- if (assoc_mgr_user_list) {
+ if(assoc_mgr_user_list) {
slurmdb_user_rec_t *object = NULL;
itr = list_iterator_create(assoc_mgr_user_list);
while((object = list_next(itr))) {
- if (object->name && object->uid == (uint32_t)NO_VAL) {
+ if(object->name && object->uid == (uint32_t)NO_VAL) {
if (uid_from_string(
object->name, &pw_uid) < 0) {
debug3("refresh user couldn't get "
diff --git a/src/common/bitstring.c b/src/common/bitstring.c
index 45f8ab0e84ab92b096a8874c077d4767bf034186..04f5532346ff51d2a500a033f956620cadae2e67 100644
--- a/src/common/bitstring.c
+++ b/src/common/bitstring.c
@@ -1031,7 +1031,7 @@ inx2bitfmt (int *inx)
return NULL;
while (inx[j] >= 0) {
- if (bit_char_ptr)
+ if(bit_char_ptr)
xstrfmtcat(bit_char_ptr, ",%d-%d", inx[j], inx[j+1]);
else
xstrfmtcat(bit_char_ptr, "%d-%d", inx[j], inx[j+1]);
@@ -1235,13 +1235,13 @@ bit_get_bit_num(bitstr_t *b, int pos)
for (bit = 0; bit < bit_cnt; bit++) {
if (bit_test(b, bit)) { /* we got one */
- if (cnt == pos)
+ if(cnt == pos)
break;
cnt++;
}
}
- if (bit >= bit_cnt)
+ if(bit >= bit_cnt)
bit = -1;
return bit;
diff --git a/src/common/checkpoint.c b/src/common/checkpoint.c
index 2005fa315030cec745a93d6852cc1b47d71742e9..347c95f24cb6f1ced076880ec82112726ba5eb92 100644
--- a/src/common/checkpoint.c
+++ b/src/common/checkpoint.c
@@ -176,7 +176,7 @@ _slurm_checkpoint_get_ops( slurm_checkpoint_context_t c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->checkpoint_type, plugin_strerror(errno));
return NULL;
@@ -470,7 +470,7 @@ extern int checkpoint_tasks (uint32_t job_id, uint32_t step_id,
while((ret_data_info = list_pop(ret_list))) {
temp_rc = slurm_get_return_code(ret_data_info->type,
ret_data_info->data);
- if (temp_rc)
+ if(temp_rc)
rc = temp_rc;
}
} else {
diff --git a/src/common/daemonize.c b/src/common/daemonize.c
index dc76db7b5b0cfe3f3fa3baeeca18dd17509d24dd..dc35c7639fe99046ee7a4761f20e6daa4a690307 100644
--- a/src/common/daemonize.c
+++ b/src/common/daemonize.c
@@ -85,7 +85,7 @@ daemon(int nochdir, int noclose)
default: _exit(0); /* exit parent */
}
- if (!nochdir && chdir("/") < 0) {
+ if(!nochdir && chdir("/") < 0) {
error("chdir(/): %m");
return -1;
}
diff --git a/src/common/eio.c b/src/common/eio.c
index 28bab94b61474e90aca2713db8a9d06795633efa..af98c7ca00515d830c8e94ffd0453dd3c1c485df 100644
--- a/src/common/eio.c
+++ b/src/common/eio.c
@@ -169,7 +169,7 @@ int eio_message_socket_accept(eio_obj_t *obj, List objs)
msg = xmalloc(sizeof(slurm_msg_t));
slurm_msg_t_init(msg);
again:
- if (slurm_receive_msg(fd, msg, obj->ops->timeout) != 0) {
+ if(slurm_receive_msg(fd, msg, obj->ops->timeout) != 0) {
if (errno == EINTR) {
goto again;
}
diff --git a/src/common/env.c b/src/common/env.c
index 1780bf75f45d226ec3a6bcb83f63e92e2e0531d0..2e99c4c5638b91341cb77913755ea3e2028565fd 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -88,20 +88,20 @@ static int _setup_particulars(uint32_t cluster_flags,
dynamic_plugin_data_t *select_jobinfo)
{
int rc = SLURM_SUCCESS;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
char *bg_part_id = NULL;
select_g_select_jobinfo_get(select_jobinfo,
SELECT_JOBDATA_BLOCK_ID,
&bg_part_id);
if (bg_part_id) {
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
uint16_t conn_type =
(uint16_t)NO_VAL;
select_g_select_jobinfo_get(
select_jobinfo,
SELECT_JOBDATA_CONN_TYPE,
&conn_type);
- if (conn_type > SELECT_SMALL) {
+ if(conn_type > SELECT_SMALL) {
env_array_overwrite_fmt(dest,
"SUBMIT_POOL",
"%s",
@@ -118,10 +118,10 @@ static int _setup_particulars(uint32_t cluster_flags,
} else
rc = SLURM_FAILURE;
- if (rc == SLURM_FAILURE)
+ if(rc == SLURM_FAILURE)
error("Can't set MPIRUN_PARTITION "
"environment variable");
- } else if (cluster_flags & CLUSTER_FLAG_CRAYXT) {
+ } else if(cluster_flags & CLUSTER_FLAG_CRAYXT) {
char *resv_id = NULL;
select_g_select_jobinfo_get(select_jobinfo,
SELECT_JOBDATA_RESV_ID,
@@ -132,11 +132,11 @@ static int _setup_particulars(uint32_t cluster_flags,
} else
rc = SLURM_FAILURE;
- if (rc == SLURM_FAILURE)
+ if(rc == SLURM_FAILURE)
error("Can't set BASIL_RESERVATION_ID "
"environment variable");
xfree(resv_id);
- } else if (cluster_flags & CLUSTER_FLAG_AIX) {
+ } else if(cluster_flags & CLUSTER_FLAG_AIX) {
env_array_overwrite(dest, "LOADLBATCH", "yes");
}
@@ -305,7 +305,7 @@ setenvf(char ***envp, const char *name, const char *fmt, ...)
xstrfmtcat (str, "%s=%s", name, bufcpy);
xfree(bufcpy);
- if (envp && *envp) {
+ if(envp && *envp) {
ep = _find_name_in_env (*envp, name);
if (*ep != NULL)
@@ -383,12 +383,12 @@ int setup_env(env_t *env, bool preserve_env)
}
if (!preserve_env && env->ntasks) {
- if (setenvf(&env->env, "SLURM_NTASKS", "%d", env->ntasks)) {
+ if(setenvf(&env->env, "SLURM_NTASKS", "%d", env->ntasks)) {
error("Unable to set SLURM_NTASKS "
"environment variable");
rc = SLURM_FAILURE;
}
- if (setenvf(&env->env, "SLURM_NPROCS", "%d", env->ntasks)) {
+ if(setenvf(&env->env, "SLURM_NPROCS", "%d", env->ntasks)) {
error("Unable to set SLURM_NPROCS "
"environment variable");
rc = SLURM_FAILURE;
@@ -431,13 +431,13 @@ int setup_env(env_t *env, bool preserve_env)
}
_set_distribution(env->distribution, &dist, &lllp_dist);
- if (dist)
+ if(dist)
if (setenvf(&env->env, "SLURM_DISTRIBUTION", "%s", dist)) {
error("Can't set SLURM_DISTRIBUTION env variable");
rc = SLURM_FAILURE;
}
- if (env->distribution == SLURM_DIST_PLANE)
+ if(env->distribution == SLURM_DIST_PLANE)
if (setenvf(&env->env, "SLURM_DIST_PLANESIZE", "%u",
env->plane_size)) {
error("Can't set SLURM_DIST_PLANESIZE "
@@ -445,7 +445,7 @@ int setup_env(env_t *env, bool preserve_env)
rc = SLURM_FAILURE;
}
- if (lllp_dist)
+ if(lllp_dist)
if (setenvf(&env->env, "SLURM_DIST_LLLP", "%s", lllp_dist)) {
error("Can't set SLURM_DIST_LLLP env variable");
rc = SLURM_FAILURE;
@@ -667,7 +667,7 @@ int setup_env(env_t *env, bool preserve_env)
rc = SLURM_FAILURE;
}
- if (env->select_jobinfo) {
+ if(env->select_jobinfo) {
_setup_particulars(cluster_flags, &env->env,
env->select_jobinfo);
}
@@ -754,7 +754,7 @@ int setup_env(env_t *env, bool preserve_env)
rc = SLURM_FAILURE;
}
- if (cluster_flags & CLUSTER_FLAG_AIX) {
+ if(cluster_flags & CLUSTER_FLAG_AIX) {
char res_env[128];
char *debug_env = (char *)getenv("SLURM_LL_API_DEBUG");
int debug_num = 0;
@@ -830,7 +830,7 @@ static char *_uint16_array_to_str(int array_len, const uint16_t *array)
char *sep = ","; /* seperator */
char *str = xstrdup("");
- if (array == NULL)
+ if(array == NULL)
return str;
for (i = 0; i < array_len; i++) {
@@ -925,11 +925,11 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
_setup_particulars(cluster_flags, dest, alloc->select_jobinfo);
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
select_g_select_jobinfo_get(alloc->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&node_cnt);
- if (!node_cnt)
+ if(!node_cnt)
node_cnt = alloc->node_cnt;
env_array_overwrite_fmt(dest, "SLURM_BG_NUM_NODES",
@@ -942,15 +942,15 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
alloc->node_list);
_set_distribution(desc->task_dist, &dist, &lllp_dist);
- if (dist)
+ if(dist)
env_array_overwrite_fmt(dest, "SLURM_DISTRIBUTION", "%s",
dist);
- if (desc->task_dist == SLURM_DIST_PLANE)
+ if(desc->task_dist == SLURM_DIST_PLANE)
env_array_overwrite_fmt(dest, "SLURM_DIST_PLANESIZE",
"%u", desc->plane_size);
- if (lllp_dist)
+ if(lllp_dist)
env_array_overwrite_fmt(dest, "SLURM_DIST_LLLP", "%s",
lllp_dist);
@@ -965,7 +965,7 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
env_array_overwrite_fmt(dest, "SLURM_NNODES", "%u", node_cnt);
env_array_overwrite_fmt(dest, "SLURM_NODELIST", "%s", alloc->node_list);
- if (num_tasks == NO_VAL) {
+ if(num_tasks == NO_VAL) {
/* If we know how many tasks we are going to do then
we set SLURM_TASKS_PER_NODE */
int i=0;
@@ -978,20 +978,20 @@ env_array_for_job(char ***dest, const resource_allocation_response_msg_t *alloc,
num_tasks += alloc->cpu_count_reps[i]
* alloc->cpus_per_node[i];
}
- if ((int)desc->cpus_per_task > 1
+ if((int)desc->cpus_per_task > 1
&& desc->cpus_per_task != (uint16_t)NO_VAL)
num_tasks /= desc->cpus_per_task;
//num_tasks = desc->min_cpus;
}
- if (desc->task_dist == SLURM_DIST_ARBITRARY) {
+ if(desc->task_dist == SLURM_DIST_ARBITRARY) {
tmp = desc->req_nodes;
env_array_overwrite_fmt(dest, "SLURM_ARBITRARY_NODELIST",
"%s", tmp);
} else
tmp = alloc->node_list;
- if (!(step_layout = slurm_step_layout_create(tmp,
+ if(!(step_layout = slurm_step_layout_create(tmp,
alloc->cpus_per_node,
alloc->cpu_count_reps,
node_cnt,
@@ -1057,7 +1057,7 @@ env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
env_array_overwrite_fmt(dest, "SLURM_JOB_ID", "%u", batch->job_id);
env_array_overwrite_fmt(dest, "SLURM_JOB_NUM_NODES", "%u", num_nodes);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
env_array_overwrite_fmt(dest, "SLURM_BG_NUM_NODES",
"%u", num_nodes);
@@ -1078,7 +1078,7 @@ env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
env_array_overwrite_fmt(dest, "SLURM_NNODES", "%u", num_nodes);
env_array_overwrite_fmt(dest, "SLURM_NODELIST", "%s", batch->nodes);
- if ((batch->cpus_per_task != 0) &&
+ if((batch->cpus_per_task != 0) &&
(batch->cpus_per_task != (uint16_t) NO_VAL))
cpus_per_task = batch->cpus_per_task;
else
@@ -1088,7 +1088,7 @@ env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
cpus_per_task);
}
- if (num_tasks) {
+ if(num_tasks) {
env_array_overwrite_fmt(dest, "SLURM_NTASKS", "%u",
num_tasks);
/* keep around for old scripts */
@@ -1098,14 +1098,14 @@ env_array_for_batch_job(char ***dest, const batch_job_launch_msg_t *batch,
num_tasks = num_cpus / cpus_per_task;
}
- if ((tmp = getenvp(*dest, "SLURM_ARBITRARY_NODELIST"))) {
+ if((tmp = getenvp(*dest, "SLURM_ARBITRARY_NODELIST"))) {
task_dist = SLURM_DIST_ARBITRARY;
} else {
tmp = batch->nodes;
task_dist = SLURM_DIST_BLOCK;
}
- if (!(step_layout = slurm_step_layout_create(tmp,
+ if(!(step_layout = slurm_step_layout_create(tmp,
batch->cpus_per_node,
batch->cpu_count_reps,
num_nodes,
diff --git a/src/common/forward.c b/src/common/forward.c
index f8a3beac53eda1e703f2c16a3659019f76cdb974..3fcd402cc836c3d74fbfe213aabf16d83f15fefa 100644
--- a/src/common/forward.c
+++ b/src/common/forward.c
@@ -73,8 +73,8 @@ typedef struct {
void _destroy_tree_fwd(fwd_tree_t *fwd_tree)
{
- if (fwd_tree) {
- if (fwd_tree->tree_hl)
+ if(fwd_tree) {
+ if(fwd_tree->tree_hl)
hostlist_destroy(fwd_tree->tree_hl);
xfree(fwd_tree);
}
@@ -97,7 +97,7 @@ void *_forward_thread(void *arg)
/* repeat until we are sure the message was sent */
while((name = hostlist_shift(hl))) {
- if (slurm_conf_get_addr(name, &addr) == SLURM_ERROR) {
+ if(slurm_conf_get_addr(name, &addr) == SLURM_ERROR) {
error("forward_thread: can't find address for host "
"%s, check slurm.conf", name);
slurm_mutex_lock(fwd_msg->forward_mutex);
@@ -154,7 +154,7 @@ void *_forward_thread(void *arg)
/*
* forward message
*/
- if (_slurm_msg_sendto(fd,
+ if(_slurm_msg_sendto(fd,
get_buf_data(buffer),
get_buf_offset(buffer),
SLURM_PROTOCOL_NO_SEND_RECV_FLAGS ) < 0) {
@@ -164,7 +164,7 @@ void *_forward_thread(void *arg)
mark_as_failed_forward(&fwd_msg->ret_list, name,
errno);
free(name);
- if (hostlist_count(hl) > 0) {
+ if(hostlist_count(hl) > 0) {
free_buf(buffer);
buffer = init_buf(fwd_msg->buf_len);
slurm_mutex_unlock(fwd_msg->forward_mutex);
@@ -193,7 +193,7 @@ void *_forward_thread(void *arg)
goto cleanup;
}
- if (fwd_msg->header.forward.cnt > 0) {
+ if(fwd_msg->header.forward.cnt > 0) {
static int message_timeout = -1;
if (message_timeout < 0)
message_timeout =
@@ -211,13 +211,13 @@ void *_forward_thread(void *arg)
/* info("sent %d forwards got %d back", */
/* fwd_msg->header.forward.cnt, list_count(ret_list)); */
- if (!ret_list || (fwd_msg->header.forward.cnt != 0
+ if(!ret_list || (fwd_msg->header.forward.cnt != 0
&& list_count(ret_list) <= 1)) {
slurm_mutex_lock(fwd_msg->forward_mutex);
mark_as_failed_forward(&fwd_msg->ret_list, name,
errno);
free(name);
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
if (hostlist_count(hl) > 0) {
free_buf(buffer);
@@ -228,7 +228,7 @@ void *_forward_thread(void *arg)
continue;
}
goto cleanup;
- } else if ((fwd_msg->header.forward.cnt+1)
+ } else if((fwd_msg->header.forward.cnt+1)
!= list_count(ret_list)) {
/* this should never be called since the above
should catch the failed forwards and pipe
@@ -248,19 +248,19 @@ void *_forward_thread(void *arg)
int node_found = 0;
itr = list_iterator_create(ret_list);
while((ret_data_info = list_next(itr))) {
- if (!ret_data_info->node_name) {
+ if(!ret_data_info->node_name) {
first_node_found = 1;
ret_data_info->node_name =
xstrdup(name);
}
- if (!strcmp(tmp,
+ if(!strcmp(tmp,
ret_data_info->node_name)) {
node_found = 1;
break;
}
}
list_iterator_destroy(itr);
- if (!node_found) {
+ if(!node_found) {
mark_as_failed_forward(
&fwd_msg->ret_list,
tmp,
@@ -269,7 +269,7 @@ void *_forward_thread(void *arg)
free(tmp);
}
hostlist_iterator_destroy(host_itr);
- if (!first_node_found) {
+ if(!first_node_found) {
mark_as_failed_forward(&fwd_msg->ret_list,
name,
SLURM_COMMUNICATIONS_CONNECTION_ERROR);
@@ -278,9 +278,9 @@ void *_forward_thread(void *arg)
break;
}
slurm_mutex_lock(fwd_msg->forward_mutex);
- if (ret_list) {
+ if(ret_list) {
while((ret_data_info = list_pop(ret_list)) != NULL) {
- if (!ret_data_info->node_name) {
+ if(!ret_data_info->node_name) {
ret_data_info->node_name = xstrdup(name);
}
list_push(fwd_msg->ret_list, ret_data_info);
@@ -316,7 +316,7 @@ void *_fwd_tree_thread(void *arg)
/* repeat until we are sure the message was sent */
while((name = hostlist_shift(fwd_tree->tree_hl))) {
- if (slurm_conf_get_addr(name, &send_msg.address)
+ if(slurm_conf_get_addr(name, &send_msg.address)
== SLURM_ERROR) {
error("fwd_tree_thread: can't find address for host "
"%s, check slurm.conf", name);
@@ -331,7 +331,7 @@ void *_fwd_tree_thread(void *arg)
}
send_msg.forward.timeout = fwd_tree->timeout;
- if ((send_msg.forward.cnt = hostlist_count(fwd_tree->tree_hl))) {
+ if((send_msg.forward.cnt = hostlist_count(fwd_tree->tree_hl))) {
hostlist_ranged_string(fwd_tree->tree_hl,
sizeof(buf), buf);
send_msg.forward.nodelist = xstrdup(buf);
@@ -349,7 +349,7 @@ void *_fwd_tree_thread(void *arg)
xfree(send_msg.forward.nodelist);
- if (ret_list) {
+ if(ret_list) {
slurm_mutex_lock(fwd_tree->tree_mutex);
list_transfer(fwd_tree->ret_list, ret_list);
pthread_cond_signal(fwd_tree->notify);
@@ -375,7 +375,7 @@ void *_fwd_tree_thread(void *arg)
free(name);
/* check for error and try again */
- if (errno == SLURM_COMMUNICATIONS_CONNECTION_ERROR)
+ if(errno == SLURM_COMMUNICATIONS_CONNECTION_ERROR)
continue;
break;
@@ -395,7 +395,7 @@ void *_fwd_tree_thread(void *arg)
*/
extern void forward_init(forward_t *forward, forward_t *from)
{
- if (from && from->init == FORWARD_INIT) {
+ if(from && from->init == FORWARD_INIT) {
forward->cnt = from->cnt;
forward->timeout = from->timeout;
forward->nodelist = from->nodelist;
@@ -432,7 +432,7 @@ extern int forward_msg(forward_struct_t *forward_struct,
hostlist_t forward_hl = NULL;
char *name = NULL;
- if (!forward_struct->ret_list) {
+ if(!forward_struct->ret_list) {
error("didn't get a ret_list from forward_struct");
xfree(span);
return SLURM_ERROR;
@@ -455,7 +455,7 @@ extern int forward_msg(forward_struct_t *forward_struct,
forward_msg->timeout = forward_struct->timeout;
- if (forward_msg->timeout <= 0) {
+ if(forward_msg->timeout <= 0) {
/* convert secs to msec */
forward_msg->timeout = slurm_get_msg_timeout() * 1000;
}
@@ -480,7 +480,7 @@ extern int forward_msg(forward_struct_t *forward_struct,
free(name);
for(j = 0; j < span[thr_count]; j++) {
name = hostlist_shift(hl);
- if (!name)
+ if(!name)
break;
hostlist_push(forward_hl, name);
free(name);
@@ -560,7 +560,7 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout)
fwd_tree->notify = ¬ify;
fwd_tree->tree_mutex = &tree_mutex;
- if (fwd_tree->timeout <= 0) {
+ if(fwd_tree->timeout <= 0) {
/* convert secs to msec */
fwd_tree->timeout = slurm_get_msg_timeout() * 1000;
}
@@ -569,7 +569,7 @@ extern List start_msg_tree(hostlist_t hl, slurm_msg_t *msg, int timeout)
free(name);
for(j = 0; j < span[thr_count]; j++) {
name = hostlist_shift(hl);
- if (!name)
+ if(!name)
break;
hostlist_push(fwd_tree->tree_hl, name);
free(name);
@@ -618,7 +618,7 @@ extern void mark_as_failed_forward(List *ret_list, char *node_name, int err)
ret_data_info_t *ret_data_info = NULL;
debug3("problems with %s", node_name);
- if (!*ret_list)
+ if(!*ret_list)
*ret_list = list_create(destroy_data_info);
ret_data_info = xmalloc(sizeof(ret_data_info_t));
@@ -635,7 +635,7 @@ extern void forward_wait(slurm_msg_t * msg)
int count = 0;
/* wait for all the other messages on the tree under us */
- if (msg->forward_struct) {
+ if(msg->forward_struct) {
debug2("looking for %d", msg->forward_struct->fwd_cnt);
slurm_mutex_lock(&msg->forward_struct->forward_mutex);
count = 0;
@@ -663,7 +663,7 @@ extern void forward_wait(slurm_msg_t * msg)
void destroy_data_info(void *object)
{
ret_data_info_t *ret_data_info = (ret_data_info_t *)object;
- if (ret_data_info) {
+ if(ret_data_info) {
slurm_free_msg_data(ret_data_info->type,
ret_data_info->data);
xfree(ret_data_info->node_name);
@@ -673,7 +673,7 @@ void destroy_data_info(void *object)
void destroy_forward(forward_t *forward)
{
- if (forward->init == FORWARD_INIT) {
+ if(forward->init == FORWARD_INIT) {
xfree(forward->nodelist);
forward->init = 0;
} else {
@@ -683,7 +683,7 @@ void destroy_forward(forward_t *forward)
void destroy_forward_struct(forward_struct_t *forward_struct)
{
- if (forward_struct) {
+ if(forward_struct) {
xfree(forward_struct->buf);
xfree(forward_struct->forward_msg);
slurm_mutex_destroy(&forward_struct->forward_mutex);
diff --git a/src/common/hostlist.c b/src/common/hostlist.c
index 0077310c3fb5a9cc711a76f9410829c9575454f0..2aa616642192869d4b5cfbde4241448f4b5d3218 100644
--- a/src/common/hostlist.c
+++ b/src/common/hostlist.c
@@ -607,7 +607,7 @@ static int host_prefix_end(const char *hostname)
len = strlen(hostname);
- if (dims > 1) {
+ if(dims > 1) {
idx = len - 1;
while (idx >= 0) {
@@ -665,7 +665,7 @@ static hostname_t hostname_create(const char *hostname)
hn->suffix = hn->hostname + idx + 1;
- if ((dims > 1) && (strlen(hn->suffix) != dims))
+ if((dims > 1) && (strlen(hn->suffix) != dims))
hostlist_base = 10;
hn->num = strtoul(hn->suffix, &p, hostlist_base);
@@ -958,7 +958,7 @@ static char *hostrange_pop(hostrange_t hr)
size = strlen(hr->prefix) + hr->width + 16;
if (!(host = (char *) malloc(size * sizeof(char))))
out_of_memory("hostrange pop");
- if (dims > 1) {
+ if(dims > 1) {
if (hr->width == dims) {
int len = 0;
int i2=0;
@@ -969,7 +969,7 @@ static char *hostrange_pop(hostrange_t hr)
len = snprintf(host, size, "%s", hr->prefix);
for(i2 = 0; i2<dims; i2++) {
- if (len <= size)
+ if(len <= size)
host[len++] =
alpha_num[coord[i2]];
}
@@ -1005,7 +1005,7 @@ static char *hostrange_shift(hostrange_t hr)
size = strlen(hr->prefix) + hr->width + 16;
if (!(host = (char *) malloc(size * sizeof(char))))
out_of_memory("hostrange shift");
- if (dims > 1) {
+ if(dims > 1) {
if (hr->width == dims) {
int len = 0;
int i2=0;
@@ -1016,7 +1016,7 @@ static char *hostrange_shift(hostrange_t hr)
len = snprintf(host, size, "%s", hr->prefix);
for(i2 = 0; i2<dims; i2++) {
- if (len <= size)
+ if(len <= size)
host[len++] =
alpha_num[coord[i2]];
}
@@ -1181,7 +1181,7 @@ hostrange_to_string(hostrange_t hr, size_t n, char *buf, char *separator)
for (i = hr->lo; i <= hr->hi; i++) {
size_t m = (n - len) <= n ? n - len : 0; /* check for < 0 */
int ret = 0;
- if (dims > 1) {
+ if(dims > 1) {
if (hr->width == dims) {
int i2=0;
int coord[dims];
@@ -1190,7 +1190,7 @@ hostrange_to_string(hostrange_t hr, size_t n, char *buf, char *separator)
i, coord, dims, 0);
ret = snprintf(buf+len, m, "%s", hr->prefix);
for(i2 = 0; i2<dims; i2++) {
- if (len+ret < n)
+ if(len+ret < n)
buf[len+ret] =
alpha_num[coord[i2]];
ret++;
@@ -1237,7 +1237,7 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
if (hr->singlehost || n == 0)
return 0;
- if (dims > 1) {
+ if(dims > 1) {
if (hr->width == dims) {
int i2=0;
int coord[dims];
@@ -1246,7 +1246,7 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
hr->lo, coord, dims, 0);
for(i2 = 0; i2<dims; i2++) {
- if (len <= n)
+ if(len <= n)
buf[len++] = alpha_num[coord[i2]];
}
buf[len] = '\0';
@@ -1259,7 +1259,7 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
if ((len >= 0) && (len < n) && (hr->lo < hr->hi)) {
int len2 = 0;
- if (dims > 1) {
+ if(dims > 1) {
if (hr->width == dims) {
int i2=0;
int coord[dims];
@@ -1269,7 +1269,7 @@ static size_t hostrange_numstr(hostrange_t hr, size_t n, char *buf)
buf[len++] = '-';
for(i2 = 0; i2<dims; i2++) {
- if (len <= n)
+ if(len <= n)
buf[len++] =
alpha_num[coord[i2]];
}
@@ -1505,8 +1505,8 @@ hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
if (hostlist == NULL)
return new;
- if (working_cluster_rec) {
- if (working_cluster_rec->dimensions > 1)
+ if(working_cluster_rec) {
+ if(working_cluster_rec->dimensions > 1)
fatal("WANT_RECKLESS_HOSTRANGE_EXPANSION does not "
"work on Mulitdimentional systems!!!!");
} else {
@@ -1629,7 +1629,7 @@ hostlist_t _hostlist_create(const char *hostlist, char *sep, char *r_op)
}
done:
- if (orig)
+ if(orig)
free(orig);
return new;
@@ -1656,7 +1656,7 @@ static int _parse_box_range(char *str, struct _range *ranges,
char coord2[dims+1];
int i, a;
- if (dims <= 1)
+ if(dims <= 1)
fatal("Unsupported dimensions count %d", dims);
if ((str[dims] != 'x') ||
@@ -1717,12 +1717,12 @@ static int _parse_single_range(const char *str, struct _range *range)
range->width = strlen(str);
- if (dims > 1) {
+ if(dims > 1) {
/* If we get something here where the width is not
SYSTEM_DIMENSIONS we need to treat it as a regular number
since that is how it will be treated in the future.
*/
- if (range->width != dims)
+ if(range->width != dims)
hostlist_base = 10;
}
range->lo = strtoul(str, &q, hostlist_base);
@@ -1891,7 +1891,7 @@ _hostlist_create_bracketed(const char *hostlist, char *sep, char *r_op)
* wanted. We will just tack one on
* the end. */
strcat(cur_tok, "]");
- if (prefix && prefix[0])
+ if(prefix && prefix[0])
hostlist_push_host(new, cur_tok);
else
hostlist_push_host(new, p);
@@ -2029,7 +2029,7 @@ int hostlist_push_list(hostlist_t h1, hostlist_t h2)
char *hostlist_pop(hostlist_t hl)
{
char *host = NULL;
- if (!hl) {
+ if(!hl) {
error("hostlist_pop: no hostlist given");
return NULL;
}
@@ -2054,7 +2054,7 @@ static void
hostlist_shift_iterators(hostlist_t hl, int idx, int depth, int n)
{
hostlist_iterator_t i;
- if (!hl) {
+ if(!hl) {
error("hostlist_shift_iterators: no hostlist given");
return;
}
@@ -2077,7 +2077,7 @@ char *hostlist_shift(hostlist_t hl)
{
char *host = NULL;
- if (!hl){
+ if(!hl){
error("hostlist_shift: no hostlist given");
return NULL;
}
@@ -2109,7 +2109,7 @@ char *hostlist_pop_range(hostlist_t hl)
hostlist_t hltmp;
hostrange_t tail;
- if (!hl)
+ if(!hl)
return NULL;
LOCK_HOSTLIST(hl);
if (hl->nranges < 1 || !(hltmp = hostlist_new())) {
@@ -2184,7 +2184,7 @@ int hostlist_delete(hostlist_t hl, const char *hosts)
int n = 0;
char *hostname = NULL;
hostlist_t hltmp;
- if (!hl)
+ if(!hl)
return -1;
if (!(hltmp = hostlist_create(hosts)))
@@ -2205,7 +2205,7 @@ int hostlist_delete_host(hostlist_t hl, const char *hostname)
{
int n;
- if (!hl)
+ if(!hl)
return -1;
n = hostlist_find(hl, hostname);
@@ -2232,7 +2232,7 @@ _hostrange_string(hostrange_t hr, int depth)
(hr->lo+depth), coord, dims, 0);
for(i2 = 0; i2<dims; i2++) {
- if (len <= (MAXHOSTNAMELEN + 15))
+ if(len <= (MAXHOSTNAMELEN + 15))
buf[len++] =
alpha_num[coord[i2]];
}
@@ -2254,7 +2254,7 @@ char * hostlist_nth(hostlist_t hl, int n)
char *host = NULL;
int i, count;
- if (!hl)
+ if(!hl)
return NULL;
LOCK_HOSTLIST(hl);
count = 0;
@@ -2278,7 +2278,7 @@ int hostlist_delete_nth(hostlist_t hl, int n)
{
int i, count;
- if (!hl)
+ if(!hl)
return -1;
LOCK_HOSTLIST(hl);
assert(n >= 0 && n <= hl->nhosts);
@@ -2316,7 +2316,7 @@ done:
int hostlist_count(hostlist_t hl)
{
int retval;
- if (!hl)
+ if(!hl)
return -1;
LOCK_HOSTLIST(hl);
@@ -2536,8 +2536,8 @@ ssize_t hostlist_deranged_string(hostlist_t hl, size_t n, char *buf)
int hostlist_get_base()
{
int hostlist_base;
- if (working_cluster_rec) {
- if (working_cluster_rec->dimensions > 1)
+ if(working_cluster_rec) {
+ if(working_cluster_rec->dimensions > 1)
hostlist_base = 36;
else
hostlist_base = 10;
@@ -2558,10 +2558,10 @@ void hostlist_parse_int_to_array(int in, int *out, int dims, int hostlist_base)
int my_pow_minus = my_start_pow_minus;
int my_pow = my_start_pow;
- if (!hostlist_base)
+ if(!hostlist_base)
hostlist_base = hostlist_get_base();
- if (!my_start_pow || (last_dims != dims)) {
+ if(!my_start_pow || (last_dims != dims)) {
/* this will never change so just calculate it once */
my_start_pow = 1;
@@ -2581,13 +2581,13 @@ void hostlist_parse_int_to_array(int in, int *out, int dims, int hostlist_base)
/* This only needs to be done until we get a 0 here
meaning we are on the last dimension. This avoids
dividing by 0. */
- if (dims - a) {
+ if(dims - a) {
out[a] /= my_pow_minus;
/* set this up for the next dimension */
my_pow = my_pow_minus;
my_pow_minus /= hostlist_base;
}
- if (out[a] < 0) {
+ if(out[a] < 0) {
error("Dim %d returned negitive %d from %d %d %d",
a, out[a], in, my_pow, my_pow_minus);
xassert(0);
@@ -2670,15 +2670,15 @@ static int _tell_if_used(int dim, int curr,
for (last[dim]=start[dim]; last[dim]<=grid_end[dim]; last[dim]++) {
curr = start_curr + (last[dim] * offset[dim]);
- if (dim == (dims-1)) {
+ if(dim == (dims-1)) {
if (!grid[curr]) {
/* for(i = 0; i<dims; i++) { */
/* coord[i] = alpha_num[last[i]]; */
/* } */
/* info("%s not used", coord); */
- if ((*found) == -1)
+ if((*found) == -1)
continue;
- else if (end[dim] < grid_end[dim]) {
+ else if(end[dim] < grid_end[dim]) {
/* try to get a box out of
this slice. */
grid_end[dim] = end[dim];
@@ -2690,7 +2690,7 @@ static int _tell_if_used(int dim, int curr,
/* coord[i] = alpha_num[last[i]]; */
/* } */
/* info("%s used", coord); */
- if ((*found) == -1) {
+ if((*found) == -1) {
/* for(i = 0; i<dims; i++) { */
/* coord[i] = alpha_num[last[i]]; */
/* } */
@@ -2698,7 +2698,7 @@ static int _tell_if_used(int dim, int curr,
memcpy(start, last, dim_grid_size);
memcpy(end, last, dim_grid_size);
(*found) = dims;
- } else if ((*found) >= dim) {
+ } else if((*found) >= dim) {
/* for(i = 0; i<dims; i++) { */
/* coord[i] = alpha_num[last[i]]; */
/* } */
@@ -2707,19 +2707,19 @@ static int _tell_if_used(int dim, int curr,
(*found) = dim;
}
} else {
- if ((rc = _tell_if_used(dim+1, curr,
+ if((rc = _tell_if_used(dim+1, curr,
start, end,
last, found)) != 1) {
return rc;
}
- if ((*found) >= dim) {
+ if((*found) >= dim) {
/* for(i = 0; i<dims; i++) { */
/* coord[i] = alpha_num[last[i]]; */
/* } */
/* info("%d here %s", dim, coord); */
memcpy(end, last, dim_grid_size);
(*found) = dim;
- } else if ((*found) == -1)
+ } else if((*found) == -1)
start[dim] = grid_start[dim];
}
}
@@ -2749,7 +2749,7 @@ static int _get_next_box(int *start,
/* memset(coord2, 0, sizeof(coord2)); */
again:
- if (start[A] == -1) {
+ if(start[A] == -1) {
memcpy(start, grid_start, dim_grid_size);
/* We need to keep track of this to make sure we get
all the nodes marked since this could change based
@@ -2786,7 +2786,7 @@ again:
_set_min_max_of_grid(A, 0, grid_start, orig_grid_end,
new_min, new_max, pos);
- if (new_max[A] != -1) {
+ if(new_max[A] != -1) {
/* for(i = 0; i<dims; i++) { */
/* coord[i] = alpha_num[new_min[i]]; */
/* coord2[i] = alpha_num[new_max[i]]; */
@@ -2799,7 +2799,7 @@ again:
/* for(i = 0; i<dims; i++) */
/* coord[i] = alpha_num[last[i]]; */
/* info("next start %s", coord); */
- if (found == -1) {
+ if(found == -1) {
/* There are still nodes set in the grid, so we need
to go through them again to make sure we got all
the nodes that weren't included in the boxes of
@@ -2808,7 +2808,7 @@ again:
}
}
- if (found != -1)
+ if(found != -1)
rc = 1;
return rc;
@@ -2838,7 +2838,7 @@ _get_boxes(char *buf, int max_len)
curr_min[A] = -1;
/* for(i=0; i<HOSTLIST_BASE*HOSTLIST_BASE*HOSTLIST_BASE*HOSTLIST_BASE; i++) { */
-/* if (grid[i]) */
+/* if(grid[i]) */
/* info("got one at %d", i); */
/* } */
@@ -2848,30 +2848,30 @@ _get_boxes(char *buf, int max_len)
/* coord2[i] = alpha_num[curr_max[i]]; */
/* } */
/* info("%sx%s is a box", coord, coord2); */
- if (!memcmp(curr_min, curr_max, dim_grid_size)) {
+ if(!memcmp(curr_min, curr_max, dim_grid_size)) {
for(i = 0; i<dims; i++) {
- if (len >= max_len)
+ if(len >= max_len)
goto end_it;
buf[len++] = alpha_num[curr_min[i]];
}
- if (len >= max_len)
+ if(len >= max_len)
goto end_it;
buf[len++] = ',';
} else {
for(i = 0; i<dims; i++) {
- if (len >= max_len)
+ if(len >= max_len)
goto end_it;
buf[len++] = alpha_num[curr_min[i]];
}
- if (len >= max_len)
+ if(len >= max_len)
goto end_it;
buf[len++] = 'x';
for(i = 0; i<dims; i++) {
- if (len >= max_len)
+ if(len >= max_len)
goto end_it;
buf[len++] = alpha_num[curr_max[i]];
}
- if (len >= max_len)
+ if(len >= max_len)
goto end_it;
buf[len++] = ',';
}
@@ -2896,7 +2896,7 @@ _set_box_in_grid(int dim, int curr, int *start,
for (i=start[dim]; i<=end[dim]; i++) {
curr = start_curr + (i * offset[dim]);
- if (dim == (dims-1))
+ if(dim == (dims-1))
grid[curr] = value;
else
_set_box_in_grid(dim+1, curr, start, end, value);
@@ -2917,7 +2917,7 @@ static int _add_box_ranges(int dim, int curr,
for (pos[dim]=start[dim]; pos[dim]<=end[dim]; pos[dim]++) {
curr = start_curr + (pos[dim] * offset[dim]);
- if (dim == (dims-2)) {
+ if(dim == (dims-2)) {
char new_str[(dims*2)+2];
memset(new_str, 0, sizeof(new_str));
@@ -2943,7 +2943,7 @@ static int _add_box_ranges(int dim, int curr,
return 0;
(*count)++;
} else
- if (!_add_box_ranges(dim+1, curr, start, end, pos,
+ if(!_add_box_ranges(dim+1, curr, start, end, pos,
ranges, len, count))
return 0;
}
@@ -2963,8 +2963,8 @@ static void _set_min_max_of_grid(int dim, int curr,
for (pos[dim]=start[dim]; pos[dim]<=end[dim]; pos[dim]++) {
curr = start_curr + (pos[dim] * offset[dim]);
- if (dim == (dims-1)) {
- if (!grid[curr])
+ if(dim == (dims-1)) {
+ if(!grid[curr])
continue;
for(i = 0; i<dims; i++) {
min[i] = MIN(min[i], pos[i]);
@@ -3011,11 +3011,11 @@ _test_box_in_grid(int dim, int curr,
for (i=start[dim]; i<=end[dim]; i++) {
curr = start_curr + (i * offset[dim]);
- if (dim == (dims-1)) {
- if (!grid[curr])
+ if(dim == (dims-1)) {
+ if(!grid[curr])
return false;
} else {
- if (!_test_box_in_grid(dim+1, curr, start, end))
+ if(!_test_box_in_grid(dim+1, curr, start, end))
return false;
}
}
@@ -3029,7 +3029,7 @@ _test_box(int *start, int *end)
int i;
int dims = slurmdb_setup_cluster_dims();
- if (!memcmp(start, end, dim_grid_size)) /* single node */
+ if(!memcmp(start, end, dim_grid_size)) /* single node */
return false;
for(i = 0; i<dims; i++)
@@ -3052,11 +3052,11 @@ ssize_t hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
START_TIMER;
LOCK_HOSTLIST(hl);
- if (dims > 1) { /* logic for block node description */
+ if(dims > 1) { /* logic for block node description */
slurm_mutex_lock(&multi_dim_lock);
/* compute things that only need to be calculated once */
- if (dim_grid_size == -1) {
+ if(dim_grid_size == -1) {
int i;
dim_grid_size = sizeof(int) * dims;
@@ -3104,7 +3104,7 @@ ssize_t hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
if (!memcmp(grid_start, grid_end, dim_grid_size)) {
len += snprintf(buf, n, "%s", hl->hr[0]->prefix);
for(i = 0; i<dims; i++) {
- if (len > n)
+ if(len > n)
goto too_long;
buf[len++] = alpha_num[grid_start[i]];
}
@@ -3115,19 +3115,19 @@ ssize_t hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
} else {
len += snprintf(buf, n, "%s[", hl->hr[0]->prefix);
for(i = 0; i<dims; i++) {
- if (len > n)
+ if(len > n)
goto too_long;
buf[len++] = alpha_num[grid_start[i]];
}
- if (len <= n)
+ if(len <= n)
buf[len++] = 'x';
for(i = 0; i<dims; i++) {
- if (len > n)
+ if(len > n)
goto too_long;
buf[len++] = alpha_num[grid_end[i]];
}
- if (len <= n)
+ if(len <= n)
buf[len++] = ']';
}
if ((len < 0) || (len > n))
@@ -3157,7 +3157,7 @@ notbox:
buf[len > 0 ? len : 0] = '\0';
END_TIMER;
- if (dims > 1) /* logic for block node description */
+ if(dims > 1) /* logic for block node description */
slurm_mutex_unlock(&multi_dim_lock);
// info("time was %s", TIME_STR);
@@ -3291,7 +3291,7 @@ char *hostlist_next(hostlist_iterator_t i)
hostlist_parse_int_to_array(
(i->hr->lo + i->depth), coord, dims, 0);
for(i2 = 0; i2<dims; i2++) {
- if (len <= (MAXHOSTNAMELEN + 15))
+ if(len <= (MAXHOSTNAMELEN + 15))
buf[len++] =
alpha_num[coord[i2]];
}
diff --git a/src/common/job_resources.c b/src/common/job_resources.c
index 44c710beb51a4ab897b905da5e0a0ed26dbd5ecc..362a8363f11846530470d27a31a397b31d464193 100644
--- a/src/common/job_resources.c
+++ b/src/common/job_resources.c
@@ -528,7 +528,7 @@ extern void pack_job_resources(job_resources_t *job_resrcs_ptr, Buf buffer,
{
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
if (job_resrcs_ptr == NULL) {
uint32_t empty = NO_VAL;
pack32(empty, buffer);
@@ -579,7 +579,7 @@ extern void pack_job_resources(job_resources_t *job_resrcs_ptr, Buf buffer,
job_resrcs_ptr->nhosts, buffer);
else
pack32_array(job_resrcs_ptr->memory_used, 0, buffer);
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
int i;
uint32_t core_cnt = 0, sock_recs = 0;
xassert(job_resrcs_ptr->cores_per_socket);
@@ -702,7 +702,7 @@ extern int unpack_job_resources(job_resources_t **job_resrcs_pptr,
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
xassert(job_resrcs_pptr);
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpack32(&empty, buffer);
if (empty == NO_VAL) {
*job_resrcs_pptr = NULL;
@@ -746,7 +746,7 @@ extern int unpack_job_resources(job_resources_t **job_resrcs_pptr,
if (tmp32 == 0)
xfree(job_resrcs->memory_used);
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
safe_unpack16_array(&job_resrcs->sockets_per_node,
&tmp32, buffer);
if (tmp32 == 0)
diff --git a/src/common/jobacct_common.c b/src/common/jobacct_common.c
index cad038a7e594e9fd139658d75decdb8ce1c21b69..e1457ecbe3795631be1d855eaf3f96bd3090e08d 100644
--- a/src/common/jobacct_common.c
+++ b/src/common/jobacct_common.c
@@ -68,7 +68,7 @@ unpack_error:
extern int jobacct_common_init_struct(struct jobacctinfo *jobacct,
jobacct_id_t *jobacct_id)
{
- if (!jobacct_id) {
+ if(!jobacct_id) {
jobacct_id_t temp_id;
temp_id.taskid = (uint16_t)NO_VAL;
temp_id.nodeid = (uint32_t)NO_VAL;
@@ -260,42 +260,42 @@ extern void jobacct_common_aggregate(struct jobacctinfo *dest,
xassert(from);
slurm_mutex_lock(&jobacct_lock);
- if (dest->max_vsize < from->max_vsize) {
+ if(dest->max_vsize < from->max_vsize) {
dest->max_vsize = from->max_vsize;
dest->max_vsize_id = from->max_vsize_id;
}
dest->tot_vsize += from->tot_vsize;
- if (dest->max_rss < from->max_rss) {
+ if(dest->max_rss < from->max_rss) {
dest->max_rss = from->max_rss;
dest->max_rss_id = from->max_rss_id;
}
dest->tot_rss += from->tot_rss;
- if (dest->max_pages < from->max_pages) {
+ if(dest->max_pages < from->max_pages) {
dest->max_pages = from->max_pages;
dest->max_pages_id = from->max_pages_id;
}
dest->tot_pages += from->tot_pages;
- if ((dest->min_cpu > from->min_cpu)
+ if((dest->min_cpu > from->min_cpu)
|| (dest->min_cpu == (uint32_t)NO_VAL)) {
- if (from->min_cpu == (uint32_t)NO_VAL)
+ if(from->min_cpu == (uint32_t)NO_VAL)
from->min_cpu = 0;
dest->min_cpu = from->min_cpu;
dest->min_cpu_id = from->min_cpu_id;
}
dest->tot_cpu += from->tot_cpu;
- if (dest->max_vsize_id.taskid == (uint16_t)NO_VAL)
+ if(dest->max_vsize_id.taskid == (uint16_t)NO_VAL)
dest->max_vsize_id = from->max_vsize_id;
- if (dest->max_rss_id.taskid == (uint16_t)NO_VAL)
+ if(dest->max_rss_id.taskid == (uint16_t)NO_VAL)
dest->max_rss_id = from->max_rss_id;
- if (dest->max_pages_id.taskid == (uint16_t)NO_VAL)
+ if(dest->max_pages_id.taskid == (uint16_t)NO_VAL)
dest->max_pages_id = from->max_pages_id;
- if (dest->min_cpu_id.taskid == (uint16_t)NO_VAL)
+ if(dest->min_cpu_id.taskid == (uint16_t)NO_VAL)
dest->min_cpu_id = from->min_cpu_id;
dest->user_cpu_sec += from->user_cpu_sec;
@@ -344,7 +344,7 @@ extern void jobacct_common_pack(struct jobacctinfo *jobacct,
{
int i=0;
- if (!jobacct) {
+ if(!jobacct) {
for(i=0; i<16; i++)
pack32((uint32_t) 0, buffer);
for(i=0; i<4; i++)
@@ -393,16 +393,16 @@ extern int jobacct_common_unpack(struct jobacctinfo **jobacct,
safe_unpack32(&(*jobacct)->tot_pages, buffer);
safe_unpack32(&(*jobacct)->min_cpu, buffer);
safe_unpack32(&(*jobacct)->tot_cpu, buffer);
- if (_unpack_jobacct_id(&(*jobacct)->max_vsize_id, rpc_version, buffer)
+ if(_unpack_jobacct_id(&(*jobacct)->max_vsize_id, rpc_version, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
- if (_unpack_jobacct_id(&(*jobacct)->max_rss_id, rpc_version, buffer)
+ if(_unpack_jobacct_id(&(*jobacct)->max_rss_id, rpc_version, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
- if (_unpack_jobacct_id(&(*jobacct)->max_pages_id, rpc_version, buffer)
+ if(_unpack_jobacct_id(&(*jobacct)->max_pages_id, rpc_version, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
- if (_unpack_jobacct_id(&(*jobacct)->min_cpu_id, rpc_version, buffer)
+ if(_unpack_jobacct_id(&(*jobacct)->min_cpu_id, rpc_version, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
@@ -436,7 +436,7 @@ extern int jobacct_common_add_task(pid_t pid, jobacct_id_t *jobacct_id,
struct jobacctinfo *jobacct = jobacct_common_alloc_jobacct(jobacct_id);
slurm_mutex_lock(&jobacct_lock);
- if (pid <= 0) {
+ if(pid <= 0) {
error("invalid pid given (%d) for task acct", pid);
goto error;
} else if (!task_list) {
@@ -472,7 +472,7 @@ extern struct jobacctinfo *jobacct_common_stat_task(pid_t pid, List task_list)
itr = list_iterator_create(task_list);
while((jobacct = list_next(itr))) {
- if (jobacct->pid == pid)
+ if(jobacct->pid == pid)
break;
}
list_iterator_destroy(itr);
@@ -499,13 +499,13 @@ extern struct jobacctinfo *jobacct_common_remove_task(pid_t pid, List task_list)
itr = list_iterator_create(task_list);
while((jobacct = list_next(itr))) {
- if (jobacct->pid == pid) {
+ if(jobacct->pid == pid) {
list_remove(itr);
break;
}
}
list_iterator_destroy(itr);
- if (jobacct) {
+ if(jobacct) {
debug2("removing task %u pid %d from jobacct",
jobacct->max_vsize_id.taskid, jobacct->pid);
} else {
diff --git a/src/common/list.c b/src/common/list.c
index 73a8c1d1f700430d28d00e9d5cf67a723e9666ae..39d70ab935f4cf29a9b42f54d9029ac3ca91db47 100644
--- a/src/common/list.c
+++ b/src/common/list.c
@@ -384,7 +384,7 @@ list_append_list (List l, List sub)
assert(sub != NULL);
itr = list_iterator_create(sub);
while((v = list_next(itr))) {
- if (list_append(l, v))
+ if(list_append(l, v))
n++;
else
break;
@@ -404,10 +404,10 @@ list_transfer (List l, List sub)
assert(sub != NULL);
assert(l->fDel == sub->fDel);
while((v = list_pop(sub))) {
- if (list_append(l, v))
+ if(list_append(l, v))
n++;
else {
- if (l->fDel)
+ if(l->fDel)
l->fDel(v);
break;
}
diff --git a/src/common/log.c b/src/common/log.c
index f7f756651907a8edfe511817468caeb3f24cffaf..d3042596749d1701e1f4ed596d8e275ccbe4e923 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -567,13 +567,13 @@ static char *vxstrfmt(const char *fmt, va_list ap)
xstrcat(buf, "%u");
break;
case 'l':
- if ((unprocessed == 0) && (*(p+1) == 'l')) {
+ if((unprocessed == 0) && (*(p+1) == 'l')) {
long_long = 1;
p++;
}
if ((unprocessed == 0) && (*(p+1) == 'u')) {
- if (long_long) {
+ if(long_long) {
snprintf(tmp, sizeof(tmp),
"%llu",
va_arg(ap,
@@ -587,7 +587,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
xstrcat(buf, tmp);
p++;
} else if ((unprocessed==0) && (*(p+1)=='d')) {
- if (long_long) {
+ if(long_long) {
snprintf(tmp, sizeof(tmp),
"%lld",
va_arg(ap,
@@ -600,7 +600,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
xstrcat(buf, tmp);
p++;
} else if ((unprocessed==0) && (*(p+1)=='f')) {
- if (long_long) {
+ if(long_long) {
xstrcat(buf, "%llf");
long_long = 0;
} else
@@ -610,7 +610,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
xstrcat(buf, tmp);
p++;
} else if ((unprocessed==0) && (*(p+1)=='x')) {
- if (long_long) {
+ if(long_long) {
snprintf(tmp, sizeof(tmp),
"%llx",
va_arg(ap,
@@ -622,7 +622,7 @@ static char *vxstrfmt(const char *fmt, va_list ap)
va_arg(ap, long int));
xstrcat(buf, tmp);
p++;
- } else if (long_long) {
+ } else if(long_long) {
xstrcat(buf, "%ll");
long_long = 0;
} else
diff --git a/src/common/mpi.c b/src/common/mpi.c
index 524301c5994f73525d58ac663a6690e75910398c..283f73da5e43ff4228451f436cd8e44d49ed991a 100644
--- a/src/common/mpi.c
+++ b/src/common/mpi.c
@@ -177,7 +177,7 @@ _slurm_mpi_get_ops( slurm_mpi_context_t c )
xfree(plugin_dir);
}
- if (strcasecmp(c->mpi_type, "mpi/list") == 0) {
+ if (strcasecmp (c->mpi_type, "mpi/list") == 0) {
plugrack_print_all_plugin(c->plugin_list);
exit(0);
} else {
@@ -245,7 +245,7 @@ int _mpi_init (char *mpi_type)
done:
- if (got_default)
+ if(got_default)
xfree(mpi_type);
slurm_mutex_unlock( &context_lock );
return retval;
@@ -257,7 +257,7 @@ int mpi_hook_slurmstepd_init (char ***env)
debug("mpi type = %s", mpi_type);
- if (_mpi_init(mpi_type) == SLURM_ERROR)
+ if(_mpi_init(mpi_type) == SLURM_ERROR)
return SLURM_ERROR;
unsetenvp (*env, "SLURM_MPI_TYPE");
@@ -277,7 +277,7 @@ int mpi_hook_client_init (char *mpi_type)
{
debug("mpi type = %s", mpi_type);
- if (_mpi_init(mpi_type) == SLURM_ERROR)
+ if(_mpi_init(mpi_type) == SLURM_ERROR)
return SLURM_ERROR;
return SLURM_SUCCESS;
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 4f200021724e996c06c3200ff5daae6a679bfc33..095460e097b0cdd6e1ee2fb7b5515c181389e36b 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -238,7 +238,7 @@ static int _select_get_ops(char *select_type,
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return SLURM_SUCCESS;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->select_type, plugin_strerror(errno));
return SLURM_ERROR;
@@ -326,24 +326,24 @@ extern int slurm_select_init(bool only_default)
goto done;
select_type = slurm_get_select_type();
- if (working_cluster_rec) {
+ if(working_cluster_rec) {
/* just ignore warnings here */
} else {
#ifdef HAVE_XCPU
- if (strcasecmp(select_type, "select/linear")) {
+ if(strcasecmp(select_type, "select/linear")) {
error("%s is incompatible with XCPU use", select_type);
fatal("Use SelectType=select/linear");
}
#endif
#ifdef HAVE_BG
# ifdef HAVE_BGQ
- if (strcasecmp(select_type, "select/bgq")) {
+ if(strcasecmp(select_type, "select/bgq")) {
error("%s is incompatible with BlueGene/Q",
select_type);
fatal("Use SelectType=select/bgq");
}
# else
- if (strcasecmp(select_type, "select/bluegene")) {
+ if(strcasecmp(select_type, "select/bluegene")) {
error("%s is incompatible with BlueGene", select_type);
fatal("Use SelectType=select/bluegene");
}
@@ -352,7 +352,7 @@ extern int slurm_select_init(bool only_default)
}
select_context_cnt = 0;
- if (only_default) {
+ if(only_default) {
select_context = xmalloc(sizeof(slurm_select_context_t));
rc = _select_get_ops(select_type, select_context);
if (rc == SLURM_SUCCESS) {
@@ -362,7 +362,7 @@ extern int slurm_select_init(bool only_default)
goto skip_load_all;
}
- if (!(dir_array = slurm_get_plugin_dir())) {
+ if(!(dir_array = slurm_get_plugin_dir())) {
error("plugin_load_and_link: No plugin dir given");
goto done;
}
@@ -373,11 +373,11 @@ extern int slurm_select_init(bool only_default)
if (dir_array[i] == ':') {
dir_array[i] = '\0';
got_colon = 1;
- } else if (dir_array[i] != '\0')
+ } else if(dir_array[i] != '\0')
continue;
/* Open the directory. */
- if (!(dirp = opendir(head))) {
+ if(!(dirp = opendir(head))) {
error("cannot open plugin directory %s", dir_array[i]);
goto done;
}
@@ -385,7 +385,7 @@ extern int slurm_select_init(bool only_default)
while (1) {
char full_name[128];
- if (!(e = readdir( dirp )))
+ if(!(e = readdir( dirp )))
break;
/* Check only files with select_ in them. */
if (strncmp(e->d_name, "select_", 7))
@@ -437,7 +437,7 @@ extern int slurm_select_init(bool only_default)
}
skip_load_all:
- if (select_context_default == -1)
+ if(select_context_default == -1)
fatal("Can't find plugin for %s", select_type);
/* Insure that plugin_id is valid and unique */
@@ -495,10 +495,10 @@ extern int select_get_plugin_id_pos(uint32_t plugin_id)
return SLURM_ERROR;
for (i=0; i<select_context_cnt; i++) {
- if (*(select_context[i].ops.plugin_id) == plugin_id)
+ if(*(select_context[i].ops.plugin_id) == plugin_id)
break;
}
- if (i >= select_context_cnt)
+ if(i >= select_context_cnt)
return SLURM_ERROR;
return i;
}
@@ -720,13 +720,13 @@ extern int select_g_select_nodeinfo_pack(dynamic_plugin_data_t *nodeinfo,
if (slurm_select_init(0) < 0)
return SLURM_ERROR;
- if (nodeinfo) {
+ if(nodeinfo) {
data = nodeinfo->data;
plugin_id = nodeinfo->plugin_id;
} else
plugin_id = select_context_default;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION)
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION)
pack32(*(select_context[plugin_id].ops.plugin_id),
buffer);
@@ -746,12 +746,12 @@ extern int select_g_select_nodeinfo_unpack(dynamic_plugin_data_t **nodeinfo,
nodeinfo_ptr = xmalloc(sizeof(dynamic_plugin_data_t));
*nodeinfo = nodeinfo_ptr;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
int i;
uint32_t plugin_id;
safe_unpack32(&plugin_id, buffer);
for (i=0; i<select_context_cnt; i++)
- if (*(select_context[i].ops.plugin_id) == plugin_id) {
+ if(*(select_context[i].ops.plugin_id) == plugin_id) {
nodeinfo_ptr->plugin_id = i;
break;
}
@@ -794,8 +794,8 @@ extern int select_g_select_nodeinfo_free(dynamic_plugin_data_t *nodeinfo)
if (slurm_select_init(0) < 0)
return SLURM_ERROR;
- if (nodeinfo) {
- if (nodeinfo->data)
+ if(nodeinfo) {
+ if(nodeinfo->data)
rc = (*(select_context[nodeinfo->plugin_id].ops.
nodeinfo_free))(nodeinfo->data);
xfree(nodeinfo);
@@ -832,7 +832,7 @@ extern int select_g_select_nodeinfo_get(dynamic_plugin_data_t *nodeinfo,
if (slurm_select_init(0) < 0)
return SLURM_ERROR;
- if (nodeinfo) {
+ if(nodeinfo) {
nodedata = nodeinfo->data;
plugin_id = nodeinfo->plugin_id;
} else
@@ -1205,8 +1205,8 @@ extern int select_g_select_jobinfo_free(dynamic_plugin_data_t *jobinfo)
if (slurm_select_init(0) < 0)
return SLURM_ERROR;
- if (jobinfo) {
- if (jobinfo->data)
+ if(jobinfo) {
+ if(jobinfo->data)
rc = (*(select_context[jobinfo->plugin_id].ops.
jobinfo_free))(jobinfo->data);
xfree(jobinfo);
@@ -1224,7 +1224,7 @@ extern int select_g_select_jobinfo_set(dynamic_plugin_data_t *jobinfo,
if (slurm_select_init(0) < 0)
return SLURM_ERROR;
- if (jobinfo) {
+ if(jobinfo) {
jobdata = jobinfo->data;
plugin_id = jobinfo->plugin_id;
} else
@@ -1249,7 +1249,7 @@ extern int select_g_select_jobinfo_get(dynamic_plugin_data_t *jobinfo,
if (slurm_select_init(0) < 0)
return SLURM_ERROR;
- if (jobinfo) {
+ if(jobinfo) {
jobdata = jobinfo->data;
plugin_id = jobinfo->plugin_id;
} else
@@ -1272,7 +1272,7 @@ extern dynamic_plugin_data_t *select_g_select_jobinfo_copy(
return NULL;
jobinfo_ptr = xmalloc(sizeof(dynamic_plugin_data_t));
- if (jobinfo) {
+ if(jobinfo) {
jobinfo_ptr->plugin_id = jobinfo->plugin_id;
jobinfo_ptr->data = (*(select_context[jobinfo->plugin_id].ops.
jobinfo_copy))(jobinfo->data);
@@ -1297,13 +1297,13 @@ extern int select_g_select_jobinfo_pack(dynamic_plugin_data_t *jobinfo,
if (slurm_select_init(0) < 0)
return SLURM_ERROR;
- if (jobinfo) {
+ if(jobinfo) {
data = jobinfo->data;
plugin_id = jobinfo->plugin_id;
} else
plugin_id = select_context_default;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION)
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION)
pack32(*(select_context[plugin_id].ops.plugin_id),
buffer);
return (*(select_context[plugin_id].ops.
@@ -1327,12 +1327,12 @@ extern int select_g_select_jobinfo_unpack(
jobinfo_ptr = xmalloc(sizeof(dynamic_plugin_data_t));
*jobinfo = jobinfo_ptr;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
int i;
uint32_t plugin_id;
safe_unpack32(&plugin_id, buffer);
for (i=0; i<select_context_cnt; i++)
- if (*(select_context[i].ops.plugin_id) == plugin_id) {
+ if(*(select_context[i].ops.plugin_id) == plugin_id) {
jobinfo_ptr->plugin_id = i;
break;
}
@@ -1367,7 +1367,7 @@ extern char *select_g_select_jobinfo_sprint(dynamic_plugin_data_t *jobinfo,
if (slurm_select_init(0) < 0)
return NULL;
- if (jobinfo) {
+ if(jobinfo) {
data = jobinfo->data;
plugin_id = jobinfo->plugin_id;
} else
@@ -1391,7 +1391,7 @@ extern char *select_g_select_jobinfo_xstrdup(
if (slurm_select_init(0) < 0)
return NULL;
- if (jobinfo) {
+ if(jobinfo) {
data = jobinfo->data;
plugin_id = jobinfo->plugin_id;
} else
diff --git a/src/common/pack.c b/src/common/pack.c
index 5f65775c92364a8eec7eae2f9fb3c7bf01805d48..0bed231a8f7ee318fe10d2773daa616c406e1da9 100644
--- a/src/common/pack.c
+++ b/src/common/pack.c
@@ -145,7 +145,7 @@ Buf init_buf(int size)
error("init_buf: buffer size too large");
return NULL;
}
- if (size <= 0)
+ if(size <= 0)
size = BUF_SIZE;
my_buf = xmalloc(sizeof(struct slurm_buf));
my_buf->magic = BUF_MAGIC;
diff --git a/src/common/parse_config.c b/src/common/parse_config.c
index 3b9da1e1e7cc35cc2de8c6d1686d81b297f90d74..002ca5d146a89402f2421de043938893e8891019 100644
--- a/src/common/parse_config.c
+++ b/src/common/parse_config.c
@@ -345,7 +345,7 @@ static void _compute_hash_val(uint32_t *hash_val, char *line)
{
int idx, i, len;
- if (!hash_val)
+ if(!hash_val)
return;
len = strlen(line);
diff --git a/src/common/parse_spec.c b/src/common/parse_spec.c
index c6d597e9ab2013e610de4f8278b511caeaab3451..d07abc120d18964b30c989f761cc09aa7ca91b10 100644
--- a/src/common/parse_spec.c
+++ b/src/common/parse_spec.c
@@ -193,7 +193,7 @@ _load_integer (int *destination, char *keyword, char *in_line)
str_ptr2 = (char *) strtok_r (scratch, SEPCHARS,
&str_ptr3);
str_len2 = strlen (str_ptr2);
- if (strcasecmp(str_ptr2, "UNLIMITED") == 0)
+ if (strcasecmp (str_ptr2, "UNLIMITED") == 0)
*destination = -1;
else if ((str_ptr2[0] >= '0') &&
(str_ptr2[0] <= '9')) {
@@ -250,7 +250,7 @@ _load_long (long *destination, char *keyword, char *in_line)
str_ptr2 = (char *) strtok_r (scratch, SEPCHARS,
&str_ptr3);
str_len2 = strlen (str_ptr2);
- if (strcasecmp(str_ptr2, "UNLIMITED") == 0)
+ if (strcasecmp (str_ptr2, "UNLIMITED") == 0)
*destination = -1L;
else if ((str_ptr2[0] == '-') ||
((str_ptr2[0] >= '0') &&
diff --git a/src/common/parse_time.c b/src/common/parse_time.c
index b8f434afe2c4e5fbe6fa66a00902d2efa2b664eb..13650739595cd9141a5a5042a3c3ec07672a8614 100644
--- a/src/common/parse_time.c
+++ b/src/common/parse_time.c
@@ -224,7 +224,7 @@ static int _get_date(char *time_str, int *pos, int *month, int *mday, int *year)
int mon, day, yr;
int offset = *pos;
- if (time_str[offset+4] && (time_str[offset+4] == '-')
+ if(time_str[offset+4] && (time_str[offset+4] == '-')
&& time_str[offset+7] && (time_str[offset+7] == '-')) {
/* get year */
if ((time_str[offset] < '0') || (time_str[offset] > '9'))
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 4915f188bf835223028891b1a88e74e943ce072e..2981017526619e56e2f08b65f7add6f73fc39655 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -216,11 +216,11 @@ plugin_load_and_link(const char *type_name, int n_syms,
so_name = xstrdup_printf("%s.so", type_name);
while(so_name[i]) {
- if (so_name[i] == '/')
+ if(so_name[i] == '/')
so_name[i] = '_';
i++;
}
- if (!(dir_array = slurm_get_plugin_dir())) {
+ if(!(dir_array = slurm_get_plugin_dir())) {
error("plugin_load_and_link: No plugin dir given");
xfree(so_name);
return plug;
@@ -232,7 +232,7 @@ plugin_load_and_link(const char *type_name, int n_syms,
if (dir_array[i] == ':') {
dir_array[i] = '\0';
got_colon = 1;
- } else if (dir_array[i] != '\0')
+ } else if(dir_array[i] != '\0')
continue;
file_name = xstrdup_printf("%s/%s", head, so_name);
@@ -243,7 +243,7 @@ plugin_load_and_link(const char *type_name, int n_syms,
xfree(file_name);
err = EPLUGIN_NOTFOUND;
} else {
- if ((err = plugin_load_from_file(&plug, file_name))
+ if((err = plugin_load_from_file(&plug, file_name))
== EPLUGIN_SUCCESS) {
if (plugin_get_syms(plug, n_syms,
names, ptrs) >=
diff --git a/src/common/print_fields.c b/src/common/print_fields.c
index f35c43524920a8fdf71fc129ca99c814f5d0cc59..97014a486d523edc2586d65b3c1f03504abaf3de 100644
--- a/src/common/print_fields.c
+++ b/src/common/print_fields.c
@@ -58,7 +58,7 @@ extern void destroy_print_field(void *object)
{
print_field_t *field = (print_field_t *)object;
- if (field) {
+ if(field) {
xfree(field->name);
xfree(field);
}
@@ -71,18 +71,18 @@ extern void print_fields_header(List print_fields_list)
int curr_inx = 1;
int field_count = 0;
- if (!print_fields_list || !print_fields_have_header)
+ if(!print_fields_list || !print_fields_have_header)
return;
field_count = list_count(print_fields_list);
itr = list_iterator_create(print_fields_list);
while((field = list_next(itr))) {
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& (curr_inx == field_count))
printf("%s", field->name);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", field->name);
else {
int abs_len = abs(field->len);
@@ -92,7 +92,7 @@ extern void print_fields_header(List print_fields_list)
}
list_iterator_reset(itr);
printf("\n");
- if (print_fields_parsable_print)
+ if(print_fields_parsable_print)
return;
while((field = list_next(itr))) {
int abs_len = abs(field->len);
@@ -109,15 +109,15 @@ extern void print_fields_date(print_field_t *field, time_t value, int last)
char temp_char[abs_len+1];
time_t now = value;
- if (!now)
+ if(!now)
now = time(NULL);
slurm_make_time_str(&value, (char *)temp_char, sizeof(temp_char));
- if (print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
+ if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", temp_char);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", temp_char);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, temp_char);
else
printf("%-*.*s ", abs_len, abs_len, temp_char);
@@ -128,29 +128,29 @@ extern void print_fields_str(print_field_t *field, char *value, int last)
int abs_len = abs(field->len);
char temp_char[abs_len+1];
char *print_this = NULL;
- if (!value) {
- if (print_fields_parsable_print)
+ if(!value) {
+ if(print_fields_parsable_print)
print_this = "";
else
print_this = " ";
} else
print_this = value;
- if (print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
+ if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if (value) {
+ if(value) {
memcpy(&temp_char, value, abs_len);
- if (strlen(value) > abs_len)
+ if(strlen(value) > abs_len)
temp_char[abs_len-1] = '+';
print_this = temp_char;
}
- if (field->len == abs_len)
+ if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
printf("%-*.*s ", abs_len, abs_len, print_this);
@@ -161,23 +161,23 @@ extern void print_fields_int(print_field_t *field, int value, int last)
{
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
- if ((value == NO_VAL) || (value == INFINITE)) {
- if (print_fields_parsable_print
+ if((value == NO_VAL) || (value == INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%*s ", abs_len, " ");
} else {
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%d", value);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%d|", value);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*d ", abs_len, value);
else
printf("%-*d ", abs_len, value);
@@ -188,23 +188,23 @@ extern void print_fields_uint32(print_field_t *field, uint32_t value, int last)
{
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
- if ((value == NO_VAL) || (value == INFINITE)) {
- if (print_fields_parsable_print
+ if((value == NO_VAL) || (value == INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%*s ", field->len, " ");
} else {
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%u", value);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%u|", value);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*u ", abs_len, value);
else
printf("%-*u ", abs_len, value);
@@ -216,23 +216,23 @@ extern void print_fields_uint64(print_field_t *field, uint64_t value, int last)
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
- if ((value == (uint64_t)NO_VAL) || (value == (uint64_t)INFINITE)) {
- if (print_fields_parsable_print
+ if((value == (uint64_t)NO_VAL) || (value == (uint64_t)INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%*s ", field->len, " ");
} else {
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%llu", (long long unsigned) value);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%llu|", (long long unsigned) value);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*llu ", abs_len, (long long unsigned) value);
else
printf("%-*llu ", abs_len, (long long unsigned) value);
@@ -243,23 +243,23 @@ extern void print_fields_double(print_field_t *field, double value, int last)
{
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
- if ((value == NO_VAL) || (value == INFINITE)) {
- if (print_fields_parsable_print
+ if((value == NO_VAL) || (value == INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%*s ", field->len, " ");
} else {
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%f", value);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%f|", value);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*f ", abs_len, value);
else
printf("%-*f ", abs_len, value);
@@ -271,23 +271,23 @@ extern void print_fields_long_double(
{
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
- if ((value == NO_VAL) || (value == INFINITE)) {
- if (print_fields_parsable_print
+ if((value == NO_VAL) || (value == INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%*s ", field->len, " ");
} else {
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%Lf", value);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%Lf|", value);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*Lf ", abs_len, value);
else
printf("%-*Lf ", abs_len, value);
@@ -299,25 +299,25 @@ extern void print_fields_time(print_field_t *field, uint32_t value, int last)
{
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
- if ((value == NO_VAL) || (value == INFINITE)) {
- if (print_fields_parsable_print
+ if((value == NO_VAL) || (value == INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%*s ", field->len, " ");
} else {
char time_buf[32];
mins2time_str((time_t) value, time_buf, sizeof(time_buf));
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", time_buf);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", time_buf);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*s ", abs_len, time_buf);
else
printf("%-*s ", abs_len, time_buf);
@@ -329,25 +329,25 @@ extern void print_fields_time_from_secs(print_field_t *field,
{
int abs_len = abs(field->len);
/* (value == unset) || (value == cleared) */
- if ((value == NO_VAL) || (value == INFINITE)) {
- if (print_fields_parsable_print
+ if((value == NO_VAL) || (value == INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%*s ", field->len, " ");
} else {
char time_buf[32];
secs2time_str((time_t) value, time_buf, sizeof(time_buf));
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", time_buf);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", time_buf);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*s ", abs_len, time_buf);
else
printf("%-*s ", abs_len, time_buf);
@@ -361,8 +361,8 @@ extern void print_fields_char_list(print_field_t *field, List value, int last)
char *print_this = NULL;
char *object = NULL;
- if (!value || !list_count(value)) {
- if (print_fields_parsable_print)
+ if(!value || !list_count(value)) {
+ if(print_fields_parsable_print)
print_this = xstrdup("");
else
print_this = xstrdup(" ");
@@ -370,7 +370,7 @@ extern void print_fields_char_list(print_field_t *field, List value, int last)
list_sort(value, (ListCmpF)_sort_char_list);
itr = list_iterator_create(value);
while((object = list_next(itr))) {
- if (print_this)
+ if(print_this)
xstrfmtcat(print_this, ",%s", object);
else
print_this = xstrdup(object);
@@ -378,16 +378,16 @@ extern void print_fields_char_list(print_field_t *field, List value, int last)
list_iterator_destroy(itr);
}
- if (print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
+ if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if (strlen(print_this) > abs_len)
+ if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
- if (field->len == abs_len)
+ if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
printf("%-*.*s ", abs_len, abs_len, print_this);
diff --git a/src/common/proc_args.c b/src/common/proc_args.c
index e0f9d4a56ccea75f0fcd0840bdceaa72f7df2d6f..4c009361340706042c1fae9f0b52e84618f1cb72 100644
--- a/src/common/proc_args.c
+++ b/src/common/proc_args.c
@@ -114,7 +114,7 @@ task_dist_states_t verify_dist_type(const char *arg, uint32_t *plane_size)
} else {
/* -m plane=<plane_size> */
dist_str = strchr(arg,'=');
- if (dist_str != NULL) {
+ if(dist_str != NULL) {
*plane_size=atoi(dist_str+1);
len = dist_str-arg;
plane_dist = true;
@@ -158,8 +158,8 @@ uint16_t verify_conn_type(const char *arg)
uint16_t len = strlen(arg);
bool no_bgl = 1;
- if (working_cluster_rec) {
- if (working_cluster_rec->flags & CLUSTER_FLAG_BGL)
+ if(working_cluster_rec) {
+ if(working_cluster_rec->flags & CLUSTER_FLAG_BGL)
no_bgl = 0;
} else {
#ifdef HAVE_BGL
@@ -167,7 +167,7 @@ uint16_t verify_conn_type(const char *arg)
#endif
}
- if (!len) {
+ if(!len) {
/* no input given */
error("no conn-type argument given.");
return (uint16_t)NO_VAL;
@@ -178,7 +178,7 @@ uint16_t verify_conn_type(const char *arg)
else if (!strncasecmp(arg, "NAV", len))
return SELECT_NAV;
else if (no_bgl) {
- if (!strncasecmp(arg, "HTC", len)
+ if(!strncasecmp(arg, "HTC", len)
|| !strncasecmp(arg, "HTC_S", len))
return SELECT_HTC_S;
else if (!strncasecmp(arg, "HTC_D", len))
@@ -397,7 +397,7 @@ bool verify_node_list(char **node_list_pptr, enum task_dist_states dist,
/* If we are using Arbitrary grab count out of the hostfile
using them exactly the way we read it in since we are
saying, lay it out this way! */
- if (dist == SLURM_DIST_ARBITRARY)
+ if(dist == SLURM_DIST_ARBITRARY)
nodelist = slurm_read_hostfile(*node_list_pptr, task_count);
else
nodelist = slurm_read_hostfile(*node_list_pptr, NO_VAL);
@@ -441,7 +441,7 @@ bool get_resource_arg_range(const char *arg, const char *what, int* min,
if (*p == 'k' || *p == 'K') {
result *= 1024;
p++;
- } else if (*p == 'm' || *p == 'M') {
+ } else if(*p == 'm' || *p == 'M') {
result *= 1048576;
p++;
}
@@ -469,7 +469,7 @@ bool get_resource_arg_range(const char *arg, const char *what, int* min,
if ((*p == 'k') || (*p == 'K')) {
result *= 1024;
p++;
- } else if (*p == 'm' || *p == 'M') {
+ } else if(*p == 'm' || *p == 'M') {
result *= 1048576;
p++;
}
diff --git a/src/common/read_config.c b/src/common/read_config.c
index 69df5c98096c2acb50049fa8b936b73f4b08f2b1..830d19a37a0f3f78ae270e5c9029e580ead0fa37 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -375,20 +375,20 @@ static void _set_node_prefix(const char *nodenames)
xassert(nodenames != NULL);
for (i = 1; nodenames[i] != '\0'; i++) {
- if ((nodenames[i-1] == '[')
+ if((nodenames[i-1] == '[')
|| (nodenames[i-1] <= '9'
&& nodenames[i-1] >= '0'))
break;
}
- if (i == 1) {
+ if(i == 1) {
error("In your Node definition in your slurm.conf you "
"gave a nodelist '%s' without a prefix. "
"Please try something like bg%s.", nodenames, nodenames);
}
xfree(conf_ptr->node_prefix);
- if (nodenames[i] == '\0')
+ if(nodenames[i] == '\0')
conf_ptr->node_prefix = xstrdup(nodenames);
else {
tmp = xmalloc(sizeof(char)*i+1);
@@ -1128,7 +1128,7 @@ static void _init_slurmd_nodehash(void)
else
nodehash_initialized = true;
- if (!conf_initialized) {
+ if(!conf_initialized) {
_init_slurm_conf(NULL);
conf_initialized = true;
}
@@ -1479,7 +1479,7 @@ free_slurm_conf (slurm_ctl_conf_t *ctl_conf_ptr, bool purge_node_hash)
xfree (ctl_conf_ptr->sched_params);
xfree (ctl_conf_ptr->schedtype);
xfree (ctl_conf_ptr->select_type);
- if (ctl_conf_ptr->select_conf_key_pairs)
+ if(ctl_conf_ptr->select_conf_key_pairs)
list_destroy((List)ctl_conf_ptr->select_conf_key_pairs);
xfree (ctl_conf_ptr->slurm_conf);
xfree (ctl_conf_ptr->slurm_user_name);
@@ -1658,7 +1658,7 @@ static void _init_slurm_conf(const char *file_name)
if (name == NULL)
name = default_slurm_config_file;
}
- if (conf_initialized) {
+ if(conf_initialized) {
error("the conf_hashtbl is already inited");
}
conf_hashtbl = s_p_hashtbl_create(slurm_conf_options);
@@ -1666,7 +1666,7 @@ static void _init_slurm_conf(const char *file_name)
/* init hash to 0 */
conf_ptr->hash_val = 0;
- if (s_p_parse_file(conf_hashtbl, &conf_ptr->hash_val, name)
+ if(s_p_parse_file(conf_hashtbl, &conf_ptr->hash_val, name)
== SLURM_ERROR)
fatal("something wrong with opening/reading conf file");
/* s_p_dump_values(conf_hashtbl, slurm_conf_options); */
@@ -1876,7 +1876,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
the cluster name is lower case since sacctmgr makes sure
this is the case as well.
*/
- if (conf->cluster_name) {
+ if(conf->cluster_name) {
int i;
for (i = 0; conf->cluster_name[i] != '\0'; i++)
conf->cluster_name[i] =
@@ -2028,7 +2028,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
"documentation for further explanation.");
}
- if (!s_p_get_string(&conf->job_acct_gather_type,
+ if(!s_p_get_string(&conf->job_acct_gather_type,
"JobAcctGatherType", hashtbl))
conf->job_acct_gather_type =
xstrdup(DEFAULT_JOB_ACCT_GATHER_TYPE);
@@ -2037,8 +2037,8 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
conf->job_ckpt_dir = xstrdup(DEFAULT_JOB_CKPT_DIR);
if (!s_p_get_string(&conf->job_comp_type, "JobCompType", hashtbl)) {
- if (default_storage_type) {
- if (!strcasecmp("slurmdbd", default_storage_type)) {
+ if(default_storage_type) {
+ if(!strcasecmp("slurmdbd", default_storage_type)) {
error("Can not use the default storage type "
"specified for jobcomp since there is "
"not slurmdbd type. We are using %s "
@@ -2055,9 +2055,9 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
conf->job_comp_type = xstrdup(DEFAULT_JOB_COMP_TYPE);
}
if (!s_p_get_string(&conf->job_comp_loc, "JobCompLoc", hashtbl)) {
- if (default_storage_loc)
+ if(default_storage_loc)
conf->job_comp_loc = xstrdup(default_storage_loc);
- else if (!strcmp(conf->job_comp_type, "job_comp/mysql")
+ else if(!strcmp(conf->job_comp_type, "job_comp/mysql")
|| !strcmp(conf->job_comp_type, "job_comp/pgsql"))
conf->job_comp_loc = xstrdup(DEFAULT_JOB_COMP_DB);
else
@@ -2066,30 +2066,30 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (!s_p_get_string(&conf->job_comp_host, "JobCompHost",
hashtbl)) {
- if (default_storage_host)
+ if(default_storage_host)
conf->job_comp_host = xstrdup(default_storage_host);
else
conf->job_comp_host = xstrdup(DEFAULT_STORAGE_HOST);
}
if (!s_p_get_string(&conf->job_comp_user, "JobCompUser",
hashtbl)) {
- if (default_storage_user)
+ if(default_storage_user)
conf->job_comp_user = xstrdup(default_storage_user);
else
conf->job_comp_user = xstrdup(DEFAULT_STORAGE_USER);
}
if (!s_p_get_string(&conf->job_comp_pass, "JobCompPass",
hashtbl)) {
- if (default_storage_pass)
+ if(default_storage_pass)
conf->job_comp_pass = xstrdup(default_storage_pass);
}
if (!s_p_get_uint32(&conf->job_comp_port, "JobCompPort",
hashtbl)) {
- if (default_storage_port)
+ if(default_storage_port)
conf->job_comp_port = default_storage_port;
- else if (!strcmp(conf->job_comp_type, "job_comp/mysql"))
+ else if(!strcmp(conf->job_comp_type, "job_comp/mysql"))
conf->job_comp_port = DEFAULT_MYSQL_PORT;
- else if (!strcmp(conf->job_comp_type, "job_comp/pgsql"))
+ else if(!strcmp(conf->job_comp_type, "job_comp/pgsql"))
conf->job_comp_port = DEFAULT_PGSQL_PORT;
else
conf->job_comp_port = DEFAULT_STORAGE_PORT;
@@ -2156,13 +2156,13 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
s_p_get_string(&conf->mpi_params, "MpiParams", hashtbl);
- if (!s_p_get_boolean((bool *)&conf->track_wckey,
+ if(!s_p_get_boolean((bool *)&conf->track_wckey,
"TrackWCKey", hashtbl))
conf->track_wckey = false;
if (!s_p_get_string(&conf->accounting_storage_type,
"AccountingStorageType", hashtbl)) {
- if (default_storage_type)
+ if(default_storage_type)
conf->accounting_storage_type =
xstrdup_printf("accounting_storage/%s",
default_storage_type);
@@ -2212,7 +2212,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
if (!s_p_get_string(&conf->accounting_storage_host,
"AccountingStorageHost", hashtbl)) {
- if (default_storage_host)
+ if(default_storage_host)
conf->accounting_storage_host =
xstrdup(default_storage_host);
else
@@ -2228,10 +2228,10 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
"AccountingStorageLoc", hashtbl)
&& !s_p_get_string(&conf->accounting_storage_loc,
"JobAcctLogFile", hashtbl)) {
- if (default_storage_loc)
+ if(default_storage_loc)
conf->accounting_storage_loc =
xstrdup(default_storage_loc);
- else if (!strcmp(conf->accounting_storage_type,
+ else if(!strcmp(conf->accounting_storage_type,
"accounting_storage/mysql")
|| !strcmp(conf->accounting_storage_type,
"accounting_storage/pgsql"))
@@ -2243,7 +2243,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
}
if (!s_p_get_string(&conf->accounting_storage_user,
"AccountingStorageUser", hashtbl)) {
- if (default_storage_user)
+ if(default_storage_user)
conf->accounting_storage_user =
xstrdup(default_storage_user);
else
@@ -2252,21 +2252,21 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
}
if (!s_p_get_string(&conf->accounting_storage_pass,
"AccountingStoragePass", hashtbl)) {
- if (default_storage_pass)
+ if(default_storage_pass)
conf->accounting_storage_pass =
xstrdup(default_storage_pass);
}
if (!s_p_get_uint32(&conf->accounting_storage_port,
"AccountingStoragePort", hashtbl)) {
- if (default_storage_port)
+ if(default_storage_port)
conf->accounting_storage_port = default_storage_port;
- else if (!strcmp(conf->accounting_storage_type,
+ else if(!strcmp(conf->accounting_storage_type,
"accounting_storage/slurmdbd"))
conf->accounting_storage_port = SLURMDBD_PORT;
- else if (!strcmp(conf->accounting_storage_type,
+ else if(!strcmp(conf->accounting_storage_type,
"accounting_storage/mysql"))
conf->accounting_storage_port = DEFAULT_MYSQL_PORT;
- else if (!strcmp(conf->accounting_storage_type,
+ else if(!strcmp(conf->accounting_storage_type,
"accounting_storage/pgsql"))
conf->accounting_storage_port = DEFAULT_PGSQL_PORT;
else
@@ -2274,7 +2274,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
}
/* remove the user and loc if using slurmdbd */
- if (!strcmp(conf->accounting_storage_type,
+ if(!strcmp(conf->accounting_storage_type,
"accounting_storage/slurmdbd")) {
xfree(conf->accounting_storage_loc);
conf->accounting_storage_loc = xstrdup("N/A");
@@ -2388,7 +2388,7 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
xfree(temp_str);
} else {
conf->priority_reset_period = PRIORITY_RESET_NONE;
- if (!conf->priority_decay_hl) {
+ if(!conf->priority_decay_hl) {
fatal("You have to either have "
"PriorityDecayHalfLife != 0 or "
"PriorityUsageResetPeriod set to something "
@@ -2948,7 +2948,7 @@ extern void destroy_config_key_pair(void *object)
{
config_key_pair_t *key_pair_ptr = (config_key_pair_t *)object;
- if (key_pair_ptr) {
+ if(key_pair_ptr) {
xfree(key_pair_ptr->name);
xfree(key_pair_ptr->value);
xfree(key_pair_ptr);
diff --git a/src/common/safeopen.c b/src/common/safeopen.c
index 3e7ee3f5a62e154508fde973f2e7e8744421b93d..a6c06373dc2f5297273012abda00fc6357041e59 100644
--- a/src/common/safeopen.c
+++ b/src/common/safeopen.c
@@ -62,7 +62,7 @@ FILE * safeopen(const char *path, const char *mode, int flags)
int oflags;
struct stat fb1, fb2;
- if (mode[0] == 'w') {
+ if(mode[0] == 'w') {
oflags = O_WRONLY;
} else if (mode[0] == 'a') {
oflags = O_CREAT | O_WRONLY | O_APPEND;
diff --git a/src/common/slurm_accounting_storage.c b/src/common/slurm_accounting_storage.c
index d212a887a4597f2eb7d6df4c26637bf5e4288b48..c8e5fd74a776234a19563bbc2a42845821ae979b 100644
--- a/src/common/slurm_accounting_storage.c
+++ b/src/common/slurm_accounting_storage.c
@@ -277,7 +277,7 @@ static slurm_acct_storage_ops_t * _acct_storage_get_ops(
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->acct_storage_type, plugin_strerror(errno));
return NULL;
@@ -382,7 +382,7 @@ extern int slurm_acct_storage_init(char *loc)
if ( g_acct_storage_context )
goto done;
- if (loc)
+ if(loc)
slurm_set_accounting_storage_loc(loc);
acct_storage_type = slurm_get_accounting_storage_type();
@@ -800,13 +800,13 @@ extern int clusteracct_storage_g_node_up(void *db_conn,
/* on some systems we need to make sure we don't say something
is completely up if there are cpus in an error state */
- if (node_ptr->select_nodeinfo) {
+ if(node_ptr->select_nodeinfo) {
uint16_t err_cpus = 0;
select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
- if (err_cpus) {
+ if(err_cpus) {
char *reason = "Setting partial node down.";
struct node_record send_node;
struct config_record config_rec;
diff --git a/src/common/slurm_auth.c b/src/common/slurm_auth.c
index d59356bff503653cf43981897ce50c6d79699e3d..6bc043af09be39bcc1b19355016dad72cfb1fcdb 100644
--- a/src/common/slurm_auth.c
+++ b/src/common/slurm_auth.c
@@ -146,7 +146,7 @@ slurm_auth_get_ops( slurm_auth_context_t c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->auth_type, plugin_strerror(errno));
return NULL;
diff --git a/src/common/slurm_cred.c b/src/common/slurm_cred.c
index c056beb82059fe19658f776547e393446a9513de..b2880edee27cbc7e05f51ff5a23eec6ba8c843a1 100644
--- a/src/common/slurm_cred.c
+++ b/src/common/slurm_cred.c
@@ -355,7 +355,7 @@ _slurm_crypto_get_ops( slurm_crypto_context_t *c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->crypto_type, plugin_strerror(errno));
return NULL;
diff --git a/src/common/slurm_jobacct_gather.c b/src/common/slurm_jobacct_gather.c
index 47f53e4dff4f4d9e3d2a7a59348102b26f10c120..2cf9d23a59d75a98da5b70351dc88b355c4bb678 100644
--- a/src/common/slurm_jobacct_gather.c
+++ b/src/common/slurm_jobacct_gather.c
@@ -201,7 +201,7 @@ _slurm_jobacct_gather_get_ops( slurm_jobacct_gather_context_t *c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->jobacct_gather_type, plugin_strerror(errno));
return NULL;
diff --git a/src/common/slurm_jobcomp.c b/src/common/slurm_jobcomp.c
index 4bf728a13f93aeac822ef4a8004f43825370475c..df0da5f48246f019cec1311dff466ca6d984d09f 100644
--- a/src/common/slurm_jobcomp.c
+++ b/src/common/slurm_jobcomp.c
@@ -164,7 +164,7 @@ _slurm_jobcomp_get_ops( slurm_jobcomp_context_t c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->jobcomp_type, plugin_strerror(errno));
return NULL;
diff --git a/src/common/slurm_priority.c b/src/common/slurm_priority.c
index 4a0f936354ef2da4a90981d5415597c60f079cbc..b586362fc0eacd4e3467fe257ac9d4f11cb5b95a 100644
--- a/src/common/slurm_priority.c
+++ b/src/common/slurm_priority.c
@@ -96,7 +96,7 @@ static slurm_priority_ops_t * _priority_get_ops(
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->priority_type, plugin_strerror(errno));
return NULL;
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index a6fedc71d0e65b401bba2ce5bf217cfae797ec49..1f08de112baed120bcba16548a9cf7e2d2dcf47a 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -195,7 +195,7 @@ uint16_t slurm_get_complete_wait(void)
uint16_t complete_wait = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
complete_wait = conf->complete_wait;
@@ -220,7 +220,7 @@ uint16_t slurm_get_batch_start_timeout(void)
uint16_t batch_start_timeout = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
batch_start_timeout = conf->batch_start_timeout;
@@ -237,7 +237,7 @@ uint16_t slurm_get_suspend_timeout(void)
uint16_t suspend_timeout = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
suspend_timeout = conf->suspend_timeout;
@@ -254,7 +254,7 @@ uint16_t slurm_get_resume_timeout(void)
uint16_t resume_timeout = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
resume_timeout = conf->resume_timeout;
@@ -271,7 +271,7 @@ uint32_t slurm_get_suspend_time(void)
uint32_t suspend_time = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
suspend_time = conf->suspend_time;
@@ -288,7 +288,7 @@ uint32_t slurm_get_def_mem_per_cpu(void)
uint32_t mem_per_cpu = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
mem_per_cpu = conf->def_mem_per_cpu;
@@ -305,7 +305,7 @@ uint16_t slurm_get_kill_on_bad_exit(void)
uint16_t kill_on_bad_exit = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
kill_on_bad_exit = conf->kill_on_bad_exit;
@@ -322,7 +322,7 @@ uint32_t slurm_get_debug_flags(void)
uint32_t debug_flags = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
debug_flags = conf->debug_flags;
@@ -339,7 +339,7 @@ uint32_t slurm_get_max_mem_per_cpu(void)
uint32_t mem_per_cpu = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
mem_per_cpu = conf->max_mem_per_cpu;
@@ -356,7 +356,7 @@ uint32_t slurm_get_epilog_msg_time(void)
uint32_t epilog_msg_time = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
epilog_msg_time = conf->epilog_msg_time;
@@ -373,7 +373,7 @@ int inline slurm_get_env_timeout(void)
int timeout = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
timeout = conf->get_env_timeout;
@@ -391,7 +391,7 @@ char *slurm_get_mpi_default(void)
char *mpi_default = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
mpi_default = xstrdup(conf->mpi_default);
@@ -409,7 +409,7 @@ char *slurm_get_mpi_params(void)
char *mpi_params = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
mpi_params = xstrdup(conf->mpi_params);
@@ -426,7 +426,7 @@ uint16_t slurm_get_msg_timeout(void)
uint16_t msg_timeout = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
msg_timeout = slurmdbd_conf->msg_timeout;
} else {
conf = slurm_conf_lock();
@@ -448,7 +448,7 @@ char *slurm_get_plugin_dir(void)
char *plugin_dir = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
plugin_dir = xstrdup(slurmdbd_conf->plugindir);
} else {
conf = slurm_conf_lock();
@@ -467,7 +467,7 @@ uint32_t slurm_get_priority_decay_hl(void)
uint32_t priority_hl = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
priority_hl = conf->priority_decay_hl;
@@ -486,7 +486,7 @@ uint32_t slurm_get_priority_calc_period(void)
uint32_t calc_period = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
calc_period = conf->priority_calc_period;
@@ -505,7 +505,7 @@ bool slurm_get_priority_favor_small(void)
bool factor = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_favor_small;
@@ -525,7 +525,7 @@ uint32_t slurm_get_priority_max_age(void)
uint32_t age = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
age = conf->priority_max_age;
@@ -544,7 +544,7 @@ uint16_t slurm_get_priority_reset_period(void)
uint16_t reset_period = (uint16_t) 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
reset_period = conf->priority_reset_period;
@@ -563,7 +563,7 @@ char *slurm_get_priority_type(void)
char *priority_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
priority_type = xstrdup(conf->priority_type);
@@ -582,7 +582,7 @@ uint32_t slurm_get_priority_weight_age(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_age;
@@ -602,7 +602,7 @@ uint32_t slurm_get_priority_weight_fairshare(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_fs;
@@ -622,7 +622,7 @@ uint32_t slurm_get_priority_weight_job_size(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_js;
@@ -641,7 +641,7 @@ uint32_t slurm_get_priority_weight_partition(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_part;
@@ -661,7 +661,7 @@ uint32_t slurm_get_priority_weight_qos(void)
uint32_t factor = NO_VAL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
factor = conf->priority_weight_qos;
@@ -680,7 +680,7 @@ uint16_t slurm_get_private_data(void)
uint16_t private_data = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
private_data = slurmdbd_conf->private_data;
} else {
conf = slurm_conf_lock();
@@ -699,7 +699,7 @@ char *slurm_get_state_save_location(void)
char *state_save_loc = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
state_save_loc = xstrdup(conf->state_save_location);
@@ -717,7 +717,7 @@ char *slurm_get_auth_type(void)
char *auth_type = NULL;
slurm_ctl_conf_t *conf = NULL;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
auth_type = xstrdup(slurmdbd_conf->auth_type);
} else {
conf = slurm_conf_lock();
@@ -736,7 +736,7 @@ extern char *slurm_get_checkpoint_type(void)
char *checkpoint_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
checkpoint_type = xstrdup(conf->checkpoint_type);
@@ -754,7 +754,7 @@ char *slurm_get_cluster_name(void)
char *name = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
name = xstrdup(conf->cluster_name);
@@ -772,7 +772,7 @@ extern char *slurm_get_crypto_type(void)
char *crypto_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
crypto_type = xstrdup(conf->crypto_type);
@@ -790,7 +790,7 @@ extern char * slurm_get_topology_plugin(void)
char *topology_plugin = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
topology_plugin = xstrdup(conf->topology_plugin);
@@ -807,7 +807,7 @@ extern uint16_t slurm_get_propagate_prio_process(void)
uint16_t propagate_prio = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
propagate_prio = conf->propagate_prio_process;
@@ -824,7 +824,7 @@ extern uint16_t slurm_get_fast_schedule(void)
uint16_t fast_val = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
fast_val = conf->fast_schedule;
@@ -841,7 +841,7 @@ extern uint16_t slurm_get_track_wckey(void)
uint16_t track_wckey = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
track_wckey = slurmdbd_conf->track_wckey;
} else {
conf = slurm_conf_lock();
@@ -859,7 +859,7 @@ extern int slurm_set_tree_width(uint16_t tree_width)
{
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
if (tree_width == 0) {
@@ -879,7 +879,7 @@ extern uint16_t slurm_get_tree_width(void)
uint16_t tree_width = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
tree_width = conf->tree_width;
@@ -896,7 +896,7 @@ extern uint16_t slurm_get_vsize_factor(void)
uint16_t vsize_factor = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
vsize_factor = conf->vsize_factor;
@@ -914,7 +914,7 @@ extern int slurm_set_auth_type(char *auth_type)
{
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
xfree(slurmdbd_conf->auth_type);
slurmdbd_conf->auth_type = xstrdup(auth_type);
} else {
@@ -936,7 +936,7 @@ uint32_t slurm_get_hash_val(void)
uint32_t hash_val;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
hash_val = NO_VAL;
} else {
conf = slurm_conf_lock();
@@ -956,7 +956,7 @@ char *slurm_get_health_check_program(void)
char *health_check_program = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
health_check_program = xstrdup(conf->health_check_program);
@@ -975,7 +975,7 @@ char *slurm_get_gres_plugins(void)
char *gres_plugins = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
gres_plugins = xstrdup(conf->gres_plugins);
@@ -995,7 +995,7 @@ char *slurm_get_job_submit_plugins(void)
char *job_submit_plugins = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
job_submit_plugins = xstrdup(conf->job_submit_plugins);
@@ -1013,7 +1013,7 @@ char *slurm_get_accounting_storage_type(void)
char *accounting_type;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
accounting_type = xstrdup(slurmdbd_conf->storage_type);
} else {
conf = slurm_conf_lock();
@@ -1033,7 +1033,7 @@ char *slurm_get_accounting_storage_user(void)
char *storage_user;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
storage_user = xstrdup(slurmdbd_conf->storage_user);
} else {
conf = slurm_conf_lock();
@@ -1051,7 +1051,7 @@ int slurm_set_accounting_storage_user(char *user)
{
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
xfree(slurmdbd_conf->storage_user);
slurmdbd_conf->storage_user = xstrdup(user);
} else {
@@ -1072,7 +1072,7 @@ char *slurm_get_accounting_storage_backup_host(void)
char *storage_host;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
storage_host = xstrdup(slurmdbd_conf->storage_backup_host);
} else {
conf = slurm_conf_lock();
@@ -1091,7 +1091,7 @@ char *slurm_get_accounting_storage_host(void)
char *storage_host;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
storage_host = xstrdup(slurmdbd_conf->storage_host);
} else {
conf = slurm_conf_lock();
@@ -1109,7 +1109,7 @@ int slurm_set_accounting_storage_host(char *host)
{
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
xfree(slurmdbd_conf->storage_host);
slurmdbd_conf->storage_host = xstrdup(host);
} else {
@@ -1130,7 +1130,7 @@ char *slurm_get_accounting_storage_loc(void)
char *storage_loc;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
storage_loc = xstrdup(slurmdbd_conf->storage_loc);
} else {
conf = slurm_conf_lock();
@@ -1148,7 +1148,7 @@ int slurm_set_accounting_storage_loc(char *loc)
{
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
xfree(slurmdbd_conf->storage_loc);
slurmdbd_conf->storage_loc = xstrdup(loc);
} else {
@@ -1168,7 +1168,7 @@ int slurm_get_accounting_storage_enforce(void)
int enforce = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
enforce = conf->accounting_storage_enforce;
@@ -1186,11 +1186,11 @@ int slurm_get_is_association_based_accounting(void)
int enforce = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
return 1;
} else {
conf = slurm_conf_lock();
- if (!strcasecmp(conf->accounting_storage_type,
+ if(!strcasecmp(conf->accounting_storage_type,
"accounting_storage/slurmdbd")
|| !strcasecmp(conf->accounting_storage_type,
"accounting_storage/mysql")
@@ -1212,7 +1212,7 @@ char *slurm_get_accounting_storage_pass(void)
char *storage_pass;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
storage_pass = xstrdup(slurmdbd_conf->storage_pass);
} else {
conf = slurm_conf_lock();
@@ -1234,12 +1234,12 @@ static char *_global_auth_key(void)
static char *storage_pass_ptr = NULL;
slurm_ctl_conf_t *conf;
- if (loaded_storage_pass)
+ if(loaded_storage_pass)
return storage_pass_ptr;
- if (slurmdbd_conf) {
- if (slurmdbd_conf->auth_info) {
- if (strlen(slurmdbd_conf->auth_info) >
+ if(slurmdbd_conf) {
+ if(slurmdbd_conf->auth_info) {
+ if(strlen(slurmdbd_conf->auth_info) >
sizeof(storage_pass))
fatal("AuthInfo is too long");
strncpy(storage_pass, slurmdbd_conf->auth_info,
@@ -1248,8 +1248,8 @@ static char *_global_auth_key(void)
}
} else {
conf = slurm_conf_lock();
- if (conf->accounting_storage_pass) {
- if (strlen(conf->accounting_storage_pass) >
+ if(conf->accounting_storage_pass) {
+ if(strlen(conf->accounting_storage_pass) >
sizeof(storage_pass))
fatal("AccountingStoragePass is too long");
strncpy(storage_pass, conf->accounting_storage_pass,
@@ -1271,7 +1271,7 @@ uint32_t slurm_get_accounting_storage_port(void)
uint32_t storage_port;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
storage_port = slurmdbd_conf->storage_port;
} else {
conf = slurm_conf_lock();
@@ -1290,7 +1290,7 @@ int slurm_set_accounting_storage_port(uint32_t storage_port)
{
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
slurmdbd_conf->storage_port = storage_port;
} else {
conf = slurm_conf_lock();
@@ -1314,7 +1314,7 @@ uint16_t slurm_get_preempt_mode(void)
uint16_t preempt_mode = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
preempt_mode = conf->preempt_mode;
@@ -1332,7 +1332,7 @@ char *slurm_get_jobacct_gather_type(void)
char *jobacct_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
jobacct_type = xstrdup(conf->job_acct_gather_type);
@@ -1350,7 +1350,7 @@ uint16_t slurm_get_jobacct_gather_freq(void)
uint16_t freq = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
freq = conf->job_acct_gather_freq;
@@ -1368,7 +1368,7 @@ char *slurm_get_jobcomp_type(void)
char *jobcomp_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
jobcomp_type = xstrdup(conf->job_comp_type);
@@ -1386,7 +1386,7 @@ char *slurm_get_jobcomp_loc(void)
char *jobcomp_loc = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
jobcomp_loc = xstrdup(conf->job_comp_loc);
@@ -1404,7 +1404,7 @@ char *slurm_get_jobcomp_user(void)
char *storage_user = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
storage_user = xstrdup(conf->job_comp_user);
@@ -1422,7 +1422,7 @@ char *slurm_get_jobcomp_host(void)
char *storage_host = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
storage_host = xstrdup(conf->job_comp_host);
@@ -1440,7 +1440,7 @@ char *slurm_get_jobcomp_pass(void)
char *storage_pass = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
storage_pass = xstrdup(conf->job_comp_pass);
@@ -1458,7 +1458,7 @@ uint32_t slurm_get_jobcomp_port(void)
uint32_t storage_port = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
storage_port = conf->job_comp_port;
@@ -1476,7 +1476,7 @@ int slurm_set_jobcomp_port(uint32_t port)
{
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
if (port == 0) {
@@ -1499,7 +1499,7 @@ char *slurm_get_preempt_type(void)
char *preempt_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
preempt_type = xstrdup(conf->preempt_type);
@@ -1517,7 +1517,7 @@ char *slurm_get_proctrack_type(void)
char *proctrack_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
proctrack_type = xstrdup(conf->proctrack_type);
@@ -1535,7 +1535,7 @@ uint16_t slurm_get_slurmd_port(void)
uint16_t slurmd_port = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
slurmd_port = conf->slurmd_port;
@@ -1553,7 +1553,7 @@ uint32_t slurm_get_slurm_user_id(void)
uint32_t slurm_uid = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
slurm_uid = slurmdbd_conf->slurm_user_id;
} else {
conf = slurm_conf_lock();
@@ -1572,7 +1572,7 @@ uint32_t slurm_get_slurmd_user_id(void)
uint32_t slurmd_uid = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
slurmd_uid = conf->slurmd_user_id;
@@ -1588,7 +1588,7 @@ extern uint16_t slurm_get_root_filter(void)
uint16_t root_filter = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
root_filter = conf->schedrootfltr;
@@ -1604,7 +1604,7 @@ extern char *slurm_get_sched_params(void)
char *params = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
params = xstrdup(conf->sched_params);
@@ -1620,7 +1620,7 @@ extern uint16_t slurm_get_sched_port(void)
uint16_t port = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
port = conf->schedport;
@@ -1638,7 +1638,7 @@ char *slurm_get_sched_type(void)
char *sched_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
sched_type = xstrdup(conf->schedtype);
@@ -1656,7 +1656,7 @@ char *slurm_get_select_type(void)
char *select_type = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
select_type = xstrdup(conf->select_type);
@@ -1689,7 +1689,7 @@ uint16_t slurm_get_wait_time(void)
uint16_t wait_time = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
wait_time = conf->wait_time;
@@ -1707,7 +1707,7 @@ char *slurm_get_srun_prolog(void)
char *prolog = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
prolog = xstrdup(conf->srun_prolog);
@@ -1725,7 +1725,7 @@ char *slurm_get_srun_epilog(void)
char *epilog = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
epilog = xstrdup(conf->srun_epilog);
@@ -1741,7 +1741,7 @@ char *slurm_get_task_epilog(void)
char *task_epilog = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
task_epilog = xstrdup(conf->task_epilog);
@@ -1757,7 +1757,7 @@ char *slurm_get_task_prolog(void)
char *task_prolog = NULL;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
task_prolog = xstrdup(conf->task_prolog);
@@ -1785,7 +1785,7 @@ uint16_t slurm_get_task_plugin_param(void)
uint16_t task_plugin_param = 0;
slurm_ctl_conf_t *conf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
} else {
conf = slurm_conf_lock();
task_plugin_param = conf->task_plugin_param;
@@ -1937,7 +1937,7 @@ slurm_fd_t slurm_open_controller_conn(slurm_addr_t *addr)
if (retry)
sleep(1);
if (working_cluster_rec) {
- if (working_cluster_rec->control_addr.sin_port == 0) {
+ if(working_cluster_rec->control_addr.sin_port == 0) {
slurm_set_addr(
&working_cluster_rec->control_addr,
working_cluster_rec->control_port,
@@ -2077,10 +2077,10 @@ int slurm_receive_msg(slurm_fd_t fd, slurm_msg_t *msg, int timeout)
/* convert secs to msec */
timeout = slurm_get_msg_timeout() * 1000;
- else if (timeout > (slurm_get_msg_timeout() * 10000)) {
+ else if(timeout > (slurm_get_msg_timeout() * 10000)) {
debug("You are receiving a message with very long "
"timeout of %d seconds", (timeout/1000));
- } else if (timeout < 1000) {
+ } else if(timeout < 1000) {
error("You are receiving a message with a very short "
"timeout of %d msecs", timeout);
}
@@ -2102,7 +2102,7 @@ int slurm_receive_msg(slurm_fd_t fd, slurm_msg_t *msg, int timeout)
#endif
buffer = create_buf(buf, buflen);
- if (unpack_header(&header, buffer) == SLURM_ERROR) {
+ if(unpack_header(&header, buffer) == SLURM_ERROR) {
free_buf(buffer);
rc = SLURM_COMMUNICATIONS_RECEIVE_ERROR;
goto total_return;
@@ -2121,7 +2121,7 @@ int slurm_receive_msg(slurm_fd_t fd, slurm_msg_t *msg, int timeout)
goto total_return;
}
//info("ret_cnt = %d",header.ret_cnt);
- if (header.ret_cnt > 0) {
+ if(header.ret_cnt > 0) {
error("we received more than one message back use "
"slurm_receive_msgs instead");
header.ret_cnt = 0;
@@ -2131,7 +2131,7 @@ int slurm_receive_msg(slurm_fd_t fd, slurm_msg_t *msg, int timeout)
/* Forward message to other nodes */
- if (header.forward.cnt > 0) {
+ if(header.forward.cnt > 0) {
error("We need to forward this to other nodes use "
"slurm_receive_msg_and_forward instead");
}
@@ -2143,7 +2143,7 @@ int slurm_receive_msg(slurm_fd_t fd, slurm_msg_t *msg, int timeout)
rc = ESLURM_PROTOCOL_INCOMPLETE_PACKET;
goto total_return;
}
- if (header.flags & SLURM_GLOBAL_AUTH_KEY) {
+ if(header.flags & SLURM_GLOBAL_AUTH_KEY) {
rc = g_slurm_auth_verify( auth_cred, NULL, 2,
_global_auth_key() );
} else
@@ -2182,7 +2182,7 @@ total_return:
destroy_forward(&header.forward);
slurm_seterrno(rc);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
msg->auth_cred = (void *) NULL;
error("slurm_receive_msg: %s", slurm_strerror(rc));
rc = -1;
@@ -2221,12 +2221,12 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
slurm_msg_t_init(&msg);
msg.conn_fd = fd;
- if (timeout <= 0) {
+ if(timeout <= 0) {
/* convert secs to msec */
timeout = slurm_get_msg_timeout() * 1000;
orig_timeout = timeout;
}
- if (steps) {
+ if(steps) {
if (message_timeout < 0)
message_timeout = slurm_get_msg_timeout() * 1000;
orig_timeout = (timeout -
@@ -2239,13 +2239,13 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
/* we compare to the orig_timeout here because that is really
* what we are going to wait for each step
*/
- if (orig_timeout >= (slurm_get_msg_timeout() * 10000)) {
+ if(orig_timeout >= (slurm_get_msg_timeout() * 10000)) {
debug("slurm_receive_msgs: "
"You are sending a message with timeout's greater "
"than %d seconds, your's is %d seconds",
(slurm_get_msg_timeout() * 10),
(timeout/1000));
- } else if (orig_timeout < 1000) {
+ } else if(orig_timeout < 1000) {
debug("slurm_receive_msgs: "
"You are sending a message with a very short timeout of "
"%d milliseconds each step in the tree has %d "
@@ -2258,7 +2258,7 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
* length and allocate space on the heap for a buffer containing
* the message.
*/
- if (_slurm_msg_recvfrom_timeout(fd, &buf, &buflen, 0, timeout) < 0) {
+ if(_slurm_msg_recvfrom_timeout(fd, &buf, &buflen, 0, timeout) < 0) {
forward_init(&header.forward, NULL);
rc = errno;
goto total_return;
@@ -2269,13 +2269,13 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
#endif
buffer = create_buf(buf, buflen);
- if (unpack_header(&header, buffer) == SLURM_ERROR) {
+ if(unpack_header(&header, buffer) == SLURM_ERROR) {
free_buf(buffer);
rc = SLURM_COMMUNICATIONS_RECEIVE_ERROR;
goto total_return;
}
- if (check_header_version(&header) < 0) {
+ if(check_header_version(&header) < 0) {
slurm_addr_t resp_addr;
char addr_str[32];
int uid = _unpack_msg_uid(buffer);
@@ -2288,8 +2288,8 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
goto total_return;
}
//info("ret_cnt = %d",header.ret_cnt);
- if (header.ret_cnt > 0) {
- if (header.ret_list)
+ if(header.ret_cnt > 0) {
+ if(header.ret_list)
ret_list = header.ret_list;
else
ret_list = list_create(destroy_data_info);
@@ -2298,25 +2298,25 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
}
/* Forward message to other nodes */
- if (header.forward.cnt > 0) {
+ if(header.forward.cnt > 0) {
error("We need to forward this to other nodes use "
"slurm_receive_msg_and_forward instead");
}
- if ((auth_cred = g_slurm_auth_unpack(buffer)) == NULL) {
+ if((auth_cred = g_slurm_auth_unpack(buffer)) == NULL) {
error( "authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(NULL)));
free_buf(buffer);
rc = ESLURM_PROTOCOL_INCOMPLETE_PACKET;
goto total_return;
}
- if (header.flags & SLURM_GLOBAL_AUTH_KEY) {
+ if(header.flags & SLURM_GLOBAL_AUTH_KEY) {
rc = g_slurm_auth_verify( auth_cred, NULL, 2,
_global_auth_key() );
} else
rc = g_slurm_auth_verify( auth_cred, NULL, 2, NULL );
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("authentication: %s ",
g_slurm_auth_errstr(g_slurm_auth_errno(auth_cred)));
(void) g_slurm_auth_destroy(auth_cred);
@@ -2331,7 +2331,7 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
msg.msg_type = header.msg_type;
msg.flags = header.flags;
- if ((header.body_length > remaining_buf(buffer)) ||
+ if((header.body_length > remaining_buf(buffer)) ||
(unpack_msg(&msg, buffer) != SLURM_SUCCESS)) {
(void) g_slurm_auth_destroy(auth_cred);
free_buf(buffer);
@@ -2346,8 +2346,8 @@ List slurm_receive_msgs(slurm_fd_t fd, int steps, int timeout)
total_return:
destroy_forward(&header.forward);
- if (rc != SLURM_SUCCESS) {
- if (ret_list) {
+ if(rc != SLURM_SUCCESS) {
+ if(ret_list) {
ret_data_info = xmalloc(sizeof(ret_data_info_t));
ret_data_info->err = rc;
ret_data_info->type = RESPONSE_FORWARD_FAILED;
@@ -2356,7 +2356,7 @@ total_return:
}
error("slurm_receive_msgs: %s", slurm_strerror(rc));
} else {
- if (!ret_list)
+ if(!ret_list)
ret_list = list_create(destroy_data_info);
ret_data_info = xmalloc(sizeof(ret_data_info_t));
ret_data_info->err = rc;
@@ -2409,7 +2409,7 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
xassert(fd >= 0);
- if (msg->forward.init != FORWARD_INIT)
+ if(msg->forward.init != FORWARD_INIT)
slurm_msg_t_init(msg);
/* set msg connection fd to accepted fd. This allows
* possibility for slurmd_req () to close accepted connection
@@ -2428,13 +2428,13 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
/* convert secs to msec */
timeout = slurm_get_msg_timeout() * 1000;
- if (timeout >= (slurm_get_msg_timeout() * 10000)) {
+ if(timeout >= (slurm_get_msg_timeout() * 10000)) {
debug("slurm_receive_msg_and_forward: "
"You are sending a message with timeout's greater "
"than %d seconds, your's is %d seconds",
(slurm_get_msg_timeout() * 10),
(timeout/1000));
- } else if (timeout < 1000) {
+ } else if(timeout < 1000) {
debug("slurm_receive_msg_and_forward: "
"You are sending a message with a very short timeout of "
"%d milliseconds", timeout);
@@ -2456,7 +2456,7 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
#endif
buffer = create_buf(buf, buflen);
- if (unpack_header(&header, buffer) == SLURM_ERROR) {
+ if(unpack_header(&header, buffer) == SLURM_ERROR) {
free_buf(buffer);
rc = SLURM_COMMUNICATIONS_RECEIVE_ERROR;
goto total_return;
@@ -2474,7 +2474,7 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
rc = SLURM_PROTOCOL_VERSION_ERROR;
goto total_return;
}
- if (header.ret_cnt > 0) {
+ if(header.ret_cnt > 0) {
error("we received more than one message back use "
"slurm_receive_msgs instead");
header.ret_cnt = 0;
@@ -2482,7 +2482,7 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
header.ret_list = NULL;
}
//info("ret_cnt = %d",header.ret_cnt);
- /* if (header.ret_cnt > 0) { */
+ /* if(header.ret_cnt > 0) { */
/* while((ret_data_info = list_pop(header.ret_list))) */
/* list_push(msg->ret_list, ret_data_info); */
/* header.ret_cnt = 0; */
@@ -2494,14 +2494,14 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
* came from if this is a forward else we set the
* header.orig_addr to our addr just incase we need to send it off.
*/
- if (header.orig_addr.sin_addr.s_addr != 0) {
+ if(header.orig_addr.sin_addr.s_addr != 0) {
memcpy(&msg->orig_addr, &header.orig_addr, sizeof(slurm_addr_t));
} else {
memcpy(&header.orig_addr, orig_addr, sizeof(slurm_addr_t));
}
/* Forward message to other nodes */
- if (header.forward.cnt > 0) {
+ if(header.forward.cnt > 0) {
debug("forwarding to %u", header.forward.cnt);
msg->forward_struct = xmalloc(sizeof(forward_struct_t));
slurm_mutex_init(&msg->forward_struct->forward_mutex);
@@ -2520,7 +2520,7 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
msg->forward_struct->ret_list = msg->ret_list;
/* take out the amount of timeout from this hop */
msg->forward_struct->timeout = header.forward.timeout;
- if (msg->forward_struct->timeout <= 0)
+ if(msg->forward_struct->timeout <= 0)
msg->forward_struct->timeout = message_timeout;
msg->forward_struct->fwd_cnt = header.forward.cnt;
@@ -2528,7 +2528,7 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
msg->forward_struct->fwd_cnt,
msg->forward_struct->timeout);
- if (forward_msg(msg->forward_struct, &header) == SLURM_ERROR) {
+ if(forward_msg(msg->forward_struct, &header) == SLURM_ERROR) {
error("problem with forward msg");
}
}
@@ -2540,7 +2540,7 @@ int slurm_receive_msg_and_forward(slurm_fd_t fd, slurm_addr_t *orig_addr,
rc = ESLURM_PROTOCOL_INCOMPLETE_PACKET;
goto total_return;
}
- if (header.flags & SLURM_GLOBAL_AUTH_KEY) {
+ if(header.flags & SLURM_GLOBAL_AUTH_KEY) {
rc = g_slurm_auth_verify( auth_cred, NULL, 2,
_global_auth_key() );
} else
@@ -2578,7 +2578,7 @@ total_return:
destroy_forward(&header.forward);
slurm_seterrno(rc);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
msg->msg_type = RESPONSE_FORWARD_FAILED;
msg->auth_cred = (void *) NULL;
msg->data = NULL;
@@ -2644,7 +2644,7 @@ int slurm_send_node_msg(slurm_fd_t fd, slurm_msg_t * msg)
slurm_seterrno_ret(SLURM_PROTOCOL_AUTHENTICATION_ERROR);
}
- if (msg->forward.init != FORWARD_INIT) {
+ if(msg->forward.init != FORWARD_INIT) {
forward_init(&msg->forward, NULL);
msg->ret_list = NULL;
}
@@ -3071,7 +3071,7 @@ _send_and_recv_msg(slurm_fd_t fd, slurm_msg_t *req,
int rc = -1;
slurm_msg_t_init(resp);
- if (slurm_send_node_msg(fd, req) >= 0) {
+ if(slurm_send_node_msg(fd, req) >= 0) {
/* no need to adjust and timeouts here since we are not
forwarding or expecting anything other than 1 message
and the regular timeout will be altered in
@@ -3111,12 +3111,12 @@ _send_and_recv_msgs(slurm_fd_t fd, slurm_msg_t *req, int timeout)
int steps = 0;
if (!req->forward.timeout) {
- if (!timeout)
+ if(!timeout)
timeout = slurm_get_msg_timeout() * 1000;
req->forward.timeout = timeout;
}
- if (slurm_send_node_msg(fd, req) >= 0) {
- if (req->forward.cnt>0) {
+ if(slurm_send_node_msg(fd, req) >= 0) {
+ if(req->forward.cnt>0) {
/* figure out where we are in the tree and set
* the timeout for to wait for our childern
* correctly
@@ -3174,7 +3174,7 @@ int slurm_send_recv_controller_msg(slurm_msg_t *req, slurm_msg_t *resp)
req->ret_list = NULL;
req->forward_struct = NULL;
- if (working_cluster_rec)
+ if(working_cluster_rec)
req->flags |= SLURM_GLOBAL_AUTH_KEY;
if ((fd = slurm_open_controller_conn(&ctrl_addr)) < 0) {
@@ -3270,7 +3270,7 @@ int slurm_send_only_controller_msg(slurm_msg_t *req)
goto cleanup;
}
- if ((rc = slurm_send_node_msg(fd, req) < 0)) {
+ if((rc = slurm_send_node_msg(fd, req) < 0)) {
rc = SLURM_ERROR;
} else {
debug3("slurm_send_only_controller_msg: sent %d", rc);
@@ -3309,7 +3309,7 @@ int slurm_send_only_node_msg(slurm_msg_t *req)
return SLURM_SOCKET_ERROR;
}
- if ((rc = slurm_send_node_msg(fd, req) < 0)) {
+ if((rc = slurm_send_node_msg(fd, req) < 0)) {
rc = SLURM_ERROR;
} else {
debug3("slurm_send_only_node_msg: sent %d", rc);
@@ -3348,7 +3348,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
// ret_data_info_t *ret_data_info = NULL;
// ListIterator itr;
- if (!nodelist || !strlen(nodelist)) {
+ if(!nodelist || !strlen(nodelist)) {
error("slurm_send_recv_msgs: no nodelist given");
return NULL;
}
@@ -3373,7 +3373,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
hl = hostlist_create(nodelist);
#endif
- if (!hl) {
+ if(!hl) {
error("slurm_send_recv_msgs: problem creating hostlist");
return NULL;
}
@@ -3389,7 +3389,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
/* while((name = hostlist_shift(hl))) { */
-/* if (slurm_conf_get_addr(name, &msg->address) == SLURM_ERROR) { */
+/* if(slurm_conf_get_addr(name, &msg->address) == SLURM_ERROR) { */
/* if (quiet) { */
/* debug("slurm_send_recv_msgs: can't find " */
/* "address for host %s, check slurm.conf", */
@@ -3427,7 +3427,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
/* } else */
/* debug3("sending to %s", name); */
-/* if (!(ret_list = _send_and_recv_msgs(fd, msg, timeout))) { */
+/* if(!(ret_list = _send_and_recv_msgs(fd, msg, timeout))) { */
/* xfree(msg->forward.nodelist); */
/* if (quiet) { */
/* debug("slurm_send_recv_msgs" */
@@ -3444,7 +3444,7 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
/* } else { */
/* itr = list_iterator_create(ret_list); */
/* while((ret_data_info = list_next(itr))) */
-/* if (!ret_data_info->node_name) { */
+/* if(!ret_data_info->node_name) { */
/* ret_data_info->node_name = */
/* xstrdup(name); */
/* } */
@@ -3456,8 +3456,8 @@ List slurm_send_recv_msgs(const char *nodelist, slurm_msg_t *msg,
/* } */
/* hostlist_destroy(hl); */
-/* if (tmp_ret_list) { */
-/* if (!ret_list) */
+/* if(tmp_ret_list) { */
+/* if(!ret_list) */
/* ret_list = tmp_ret_list; */
/* else { */
/* list_transfer(ret_list, tmp_ret_list); */
@@ -3492,14 +3492,14 @@ List slurm_send_addr_recv_msgs(slurm_msg_t *msg, char *name, int timeout)
msg->ret_list = NULL;
msg->forward_struct = NULL;
- if (!(ret_list = _send_and_recv_msgs(fd, msg, timeout))) {
+ if(!(ret_list = _send_and_recv_msgs(fd, msg, timeout))) {
mark_as_failed_forward(&ret_list, name, errno);
errno = SLURM_COMMUNICATIONS_CONNECTION_ERROR;
return ret_list;
} else {
itr = list_iterator_create(ret_list);
while((ret_data_info = list_next(itr)))
- if (!ret_data_info->node_name) {
+ if(!ret_data_info->node_name) {
ret_data_info->node_name = xstrdup(name);
}
list_iterator_destroy(itr);
@@ -3538,8 +3538,8 @@ int slurm_send_recv_rc_msg_only_one(slurm_msg_t *req, int *rc, int timeout)
return -1;
}
- if (!_send_and_recv_msg(fd, req, &resp, timeout)) {
- if (resp.auth_cred)
+ if(!_send_and_recv_msg(fd, req, &resp, timeout)) {
+ if(resp.auth_cred)
g_slurm_auth_destroy(resp.auth_cred);
*rc = slurm_get_return_code(resp.msg_type, resp.data);
slurm_free_msg_data(resp.msg_type, resp.data);
@@ -3559,7 +3559,7 @@ int slurm_send_recv_controller_rc_msg(slurm_msg_t *req, int *rc)
int ret_c;
slurm_msg_t resp;
- if (!slurm_send_recv_controller_msg(req, &resp)) {
+ if(!slurm_send_recv_controller_msg(req, &resp)) {
*rc = slurm_get_return_code(resp.msg_type, resp.data);
slurm_free_msg_data(resp.msg_type, resp.data);
ret_c = 0;
@@ -3590,14 +3590,14 @@ extern int *set_span(int total, uint16_t tree_width)
span = xmalloc(sizeof(int) * tree_width);
//info("span count = %d", tree_width);
- if (total <= tree_width) {
+ if(total <= tree_width) {
return span;
}
while(left > 0) {
for(i = 0; i < tree_width; i++) {
- if ((tree_width-i) >= left) {
- if (span[i] == 0) {
+ if((tree_width-i) >= left) {
+ if(span[i] == 0) {
left = 0;
break;
} else {
@@ -3605,7 +3605,7 @@ extern int *set_span(int total, uint16_t tree_width)
left = 0;
break;
}
- } else if (left <= tree_width) {
+ } else if(left <= tree_width) {
span[i] += left;
left = 0;
break;
@@ -3622,10 +3622,10 @@ extern int *set_span(int total, uint16_t tree_width)
*/
extern void slurm_free_msg(slurm_msg_t * msg)
{
- if (msg->auth_cred)
+ if(msg->auth_cred)
(void) g_slurm_auth_destroy(msg->auth_cred);
- if (msg->ret_list) {
+ if(msg->ret_list) {
list_destroy(msg->ret_list);
msg->ret_list = NULL;
}
@@ -3654,10 +3654,10 @@ extern void convert_num_unit(float num, char *buf, int buf_size, int orig_type)
char *unit = "\0KMGP?";
int i = (int)num % 512;
- if ((int)num == 0) {
+ if((int)num == 0) {
snprintf(buf, buf_size, "%d", (int)num);
return;
- } else if (i > 0) {
+ } else if(i > 0) {
snprintf(buf, buf_size, "%d%c", (int)num, unit[orig_type]);
return;
}
@@ -3667,14 +3667,14 @@ extern void convert_num_unit(float num, char *buf, int buf_size, int orig_type)
orig_type++;
}
- if (orig_type < UNIT_NONE || orig_type > UNIT_PETA)
+ if(orig_type < UNIT_NONE || orig_type > UNIT_PETA)
orig_type = UNIT_UNKNOWN;
i = (int)num;
/* Here we are checking to see if these numbers are the same,
meaning the float has not floating point. If we do have
floating point print as a float.
*/
- if ((float)i == num)
+ if((float)i == num)
snprintf(buf, buf_size, "%d%c", i, unit[orig_type]);
else
snprintf(buf, buf_size, "%.2f%c", num, unit[orig_type]);
@@ -3685,17 +3685,17 @@ extern int revert_num_unit(const char *buf)
char *unit = "\0KMGP\0";
int i = 1, j = 0, number = 0;
- if (!buf)
+ if(!buf)
return -1;
j = strlen(buf) - 1;
while(unit[i]) {
- if (toupper((int)buf[j]) == unit[i])
+ if(toupper((int)buf[j]) == unit[i])
break;
i++;
}
number = atoi(buf);
- if (unit[i])
+ if(unit[i])
number *= (i*1024);
return number;
diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c
index 53c7f235aee7b40ab388f4cf911b8399fe88b0f6..9afa7cbdfb0fd236af52ea5636f77bb347a68214 100644
--- a/src/common/slurm_protocol_defs.c
+++ b/src/common/slurm_protocol_defs.c
@@ -132,18 +132,18 @@ extern char *slurm_add_slash_to_quotes(char *str)
int i=0, start=0;
char *fixed = NULL;
- if (!str)
+ if(!str)
return NULL;
while(str[i]) {
- if ((str[i] == '"')) {
+ if((str[i] == '"')) {
char *tmp = xstrndup(str+start, i-start);
xstrfmtcat(fixed, "%s\\\"", tmp);
xfree(tmp);
start = i+1;
}
- if ((str[i] == '\'')) {
+ if((str[i] == '\'')) {
char *tmp = xstrndup(str+start, i-start);
xstrfmtcat(fixed, "%s\\\'", tmp);
xfree(tmp);
@@ -153,7 +153,7 @@ extern char *slurm_add_slash_to_quotes(char *str)
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
char *tmp = xstrndup(str+start, i-start);
xstrcat(fixed, tmp);
xfree(tmp);
@@ -172,13 +172,13 @@ extern int slurm_addto_char_list(List char_list, char *names)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -187,17 +187,17 @@ extern int slurm_addto_char_list(List char_list, char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
+ else if(names[i] == ',') {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
/* If we get a duplicate remove the
@@ -205,7 +205,7 @@ extern int slurm_addto_char_list(List char_list, char *names)
This is needed for get associations
with qos.
*/
- if (tmp_char)
+ if(tmp_char)
list_delete_item(itr);
else
count++;
@@ -217,7 +217,7 @@ extern int slurm_addto_char_list(List char_list, char *names)
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -231,7 +231,7 @@ extern int slurm_addto_char_list(List char_list, char *names)
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
@@ -240,7 +240,7 @@ extern int slurm_addto_char_list(List char_list, char *names)
This is needed for get associations
with qos.
*/
- if (tmp_char)
+ if(tmp_char)
list_delete_item(itr);
else
count++;
@@ -650,7 +650,7 @@ void slurm_free_launch_tasks_request_msg(launch_tasks_request_msg_t * msg)
xfree(msg->spank_job_env[i]);
}
xfree(msg->spank_job_env);
- if (msg->nnodes && msg->global_task_ids)
+ if(msg->nnodes && msg->global_task_ids)
for(i=0; i<msg->nnodes; i++) {
xfree(msg->global_task_ids[i]);
}
@@ -1469,16 +1469,16 @@ extern char *bg_block_state_string(uint16_t state)
* states are extremely rare so it isn't that big of a deal.
*/
#ifdef HAVE_BGL
- if (working_cluster_rec) {
- if (!(working_cluster_rec->flags & CLUSTER_FLAG_BGL)) {
- if (state == RM_PARTITION_BUSY)
+ if(working_cluster_rec) {
+ if(!(working_cluster_rec->flags & CLUSTER_FLAG_BGL)) {
+ if(state == RM_PARTITION_BUSY)
state = RM_PARTITION_READY;
}
}
#else
- if (working_cluster_rec) {
- if (working_cluster_rec->flags & CLUSTER_FLAG_BGL) {
- if (state == RM_PARTITION_REBOOTING)
+ if(working_cluster_rec) {
+ if(working_cluster_rec->flags & CLUSTER_FLAG_BGL) {
+ if(state == RM_PARTITION_REBOOTING)
state = RM_PARTITION_READY;
}
}
@@ -1883,7 +1883,7 @@ extern void slurm_free_job_step_stat(void *object)
extern void slurm_free_job_step_pids(void *object)
{
job_step_pids_t *msg = (job_step_pids_t *)object;
- if (msg) {
+ if(msg) {
xfree(msg->node_name);
xfree(msg->pid);
xfree(msg);
@@ -1893,7 +1893,7 @@ extern void slurm_free_job_step_pids(void *object)
extern void slurm_free_block_info_members(block_info_t *block_info)
{
- if (block_info) {
+ if(block_info) {
xfree(block_info->bg_block_id);
xfree(block_info->blrtsimage);
xfree(block_info->bp_inx);
@@ -1909,7 +1909,7 @@ extern void slurm_free_block_info_members(block_info_t *block_info)
extern void slurm_free_block_info(block_info_t *block_info)
{
- if (block_info) {
+ if(block_info) {
slurm_free_block_info_members(block_info);
xfree(block_info);
}
@@ -1917,7 +1917,7 @@ extern void slurm_free_block_info(block_info_t *block_info)
extern void slurm_free_block_info_msg(block_info_msg_t *block_info_msg)
{
- if (block_info_msg) {
+ if(block_info_msg) {
if (block_info_msg->block_array) {
int i;
for(i=0; i<block_info_msg->record_count; i++)
@@ -1956,7 +1956,7 @@ void inline slurm_destroy_association_shares_object(void *object)
association_shares_object_t *obj_ptr =
(association_shares_object_t *)object;
- if (obj_ptr) {
+ if(obj_ptr) {
xfree(obj_ptr->cluster);
xfree(obj_ptr->name);
xfree(obj_ptr->parent);
@@ -1966,10 +1966,10 @@ void inline slurm_destroy_association_shares_object(void *object)
void inline slurm_free_shares_request_msg(shares_request_msg_t *msg)
{
- if (msg) {
- if (msg->acct_list)
+ if(msg) {
+ if(msg->acct_list)
list_destroy(msg->acct_list);
- if (msg->user_list)
+ if(msg->user_list)
list_destroy(msg->user_list);
xfree(msg);
}
@@ -1977,8 +1977,8 @@ void inline slurm_free_shares_request_msg(shares_request_msg_t *msg)
void inline slurm_free_shares_response_msg(shares_response_msg_t *msg)
{
- if (msg) {
- if (msg->assoc_shares_list)
+ if(msg) {
+ if(msg->assoc_shares_list)
list_destroy(msg->assoc_shares_list);
xfree(msg);
}
@@ -1994,10 +1994,10 @@ void inline slurm_destroy_priority_factors_object(void *object)
void inline slurm_free_priority_factors_request_msg(
priority_factors_request_msg_t *msg)
{
- if (msg) {
- if (msg->job_id_list)
+ if(msg) {
+ if(msg->job_id_list)
list_destroy(msg->job_id_list);
- if (msg->uid_list)
+ if(msg->uid_list)
list_destroy(msg->uid_list);
xfree(msg);
}
@@ -2006,8 +2006,8 @@ void inline slurm_free_priority_factors_request_msg(
void inline slurm_free_priority_factors_response_msg(
priority_factors_response_msg_t *msg)
{
- if (msg) {
- if (msg->priority_factors_list)
+ if(msg) {
+ if(msg->priority_factors_list)
list_destroy(msg->priority_factors_list);
xfree(msg);
}
@@ -2016,8 +2016,8 @@ void inline slurm_free_priority_factors_response_msg(
void inline slurm_free_accounting_update_msg(accounting_update_msg_t *msg)
{
- if (msg) {
- if (msg->update_list)
+ if(msg) {
+ if(msg->update_list)
list_destroy(msg->update_list);
xfree(msg);
}
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index a7c3fb8e4bcf5fb6a4d9304cf136e19c2290e165..49bc5f438ac45ac93906a3ab057b8b14c21104cb 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -585,7 +585,7 @@ pack_header(header_t * header, Buf buffer)
pack32((uint32_t)header->forward.timeout, buffer);
}
pack16((uint16_t)header->ret_cnt, buffer);
- if (header->ret_cnt > 0) {
+ if(header->ret_cnt > 0) {
_pack_ret_list(header->ret_list,
header->ret_cnt, buffer, header->version);
}
@@ -619,8 +619,8 @@ unpack_header(header_t * header, Buf buffer)
}
safe_unpack16(&header->ret_cnt, buffer);
- if (header->ret_cnt > 0) {
- if (_unpack_ret_list(&(header->ret_list),
+ if(header->ret_cnt > 0) {
+ if(_unpack_ret_list(&(header->ret_list),
header->ret_cnt, buffer, header->version))
goto unpack_error;
} else {
@@ -633,7 +633,7 @@ unpack_header(header_t * header, Buf buffer)
unpack_error:
error("unpacking header");
destroy_forward(&header->forward);
- if (header->ret_list)
+ if(header->ret_list)
list_destroy(header->ret_list);
return SLURM_ERROR;
}
@@ -1621,7 +1621,7 @@ static void _pack_assoc_shares_object(void *in, Buf buffer,
{
association_shares_object_t *object = (association_shares_object_t *)in;
- if (!object) {
+ if(!object) {
pack32(0, buffer);
packnull(buffer);
@@ -1696,10 +1696,10 @@ static void _pack_shares_request_msg(shares_request_msg_t * msg, Buf buffer,
xassert(msg != NULL);
- if (msg->acct_list)
+ if(msg->acct_list)
count = list_count(msg->acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(msg->acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1709,10 +1709,10 @@ static void _pack_shares_request_msg(shares_request_msg_t * msg, Buf buffer,
count = NO_VAL;
- if (msg->user_list)
+ if(msg->user_list)
count = list_count(msg->user_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(msg->user_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1737,7 +1737,7 @@ static int _unpack_shares_request_msg(shares_request_msg_t ** msg, Buf buffer,
*msg = object_ptr;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->acct_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -1747,7 +1747,7 @@ static int _unpack_shares_request_msg(shares_request_msg_t ** msg, Buf buffer,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->user_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -1771,10 +1771,10 @@ static void _pack_shares_response_msg(shares_response_msg_t * msg, Buf buffer,
uint32_t count = NO_VAL;
xassert(msg != NULL);
- if (msg->assoc_shares_list)
+ if(msg->assoc_shares_list)
count = list_count(msg->assoc_shares_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(msg->assoc_shares_list);
while((share = list_next(itr)))
_pack_assoc_shares_object(share, buffer,
@@ -1800,11 +1800,11 @@ static int _unpack_shares_response_msg(shares_response_msg_t ** msg,
*msg = object_ptr;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->assoc_shares_list =
list_create(slurm_destroy_association_shares_object);
for(i=0; i<count; i++) {
- if (_unpack_assoc_shares_object(&tmp_info, buffer,
+ if(_unpack_assoc_shares_object(&tmp_info, buffer,
protocol_version)
!= SLURM_SUCCESS)
goto unpack_error;
@@ -1827,7 +1827,7 @@ static void _pack_priority_factors_object(void *in, Buf buffer,
{
priority_factors_object_t *object = (priority_factors_object_t *)in;
- if (!object) {
+ if(!object) {
pack32(0, buffer);
pack32(0, buffer);
@@ -1891,10 +1891,10 @@ _pack_priority_factors_request_msg(priority_factors_request_msg_t * msg,
xassert(msg != NULL);
- if (msg->job_id_list)
+ if(msg->job_id_list)
count = list_count(msg->job_id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(msg->job_id_list);
while((tmp = list_next(itr))) {
pack32(*tmp, buffer);
@@ -1903,10 +1903,10 @@ _pack_priority_factors_request_msg(priority_factors_request_msg_t * msg,
}
count = NO_VAL;
- if (msg->uid_list)
+ if(msg->uid_list)
count = list_count(msg->uid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(msg->uid_list);
while((tmp = list_next(itr))) {
pack32(*tmp, buffer);
@@ -1932,7 +1932,7 @@ _unpack_priority_factors_request_msg(priority_factors_request_msg_t ** msg,
*msg = object_ptr;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->job_id_list = list_create(slurm_destroy_uint32_ptr);
for(i=0; i<count; i++) {
uint32_tmp = xmalloc(sizeof(uint32_t));
@@ -1942,7 +1942,7 @@ _unpack_priority_factors_request_msg(priority_factors_request_msg_t ** msg,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->uid_list = list_create(slurm_destroy_uint32_ptr);
for(i=0; i<count; i++) {
uint32_tmp = xmalloc(sizeof(uint32_t));
@@ -1968,10 +1968,10 @@ _pack_priority_factors_response_msg(priority_factors_response_msg_t * msg,
uint32_t count = NO_VAL;
xassert(msg != NULL);
- if (msg->priority_factors_list)
+ if(msg->priority_factors_list)
count = list_count(msg->priority_factors_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(msg->priority_factors_list);
while((factors = list_next(itr)))
_pack_priority_factors_object(factors, buffer,
@@ -2000,11 +2000,11 @@ _unpack_priority_factors_response_msg(priority_factors_response_msg_t ** msg,
*msg = object_ptr;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->priority_factors_list =
list_create(_priority_factors_resp_list_del);
for(i=0; i<count; i++) {
- if (_unpack_priority_factors_object(&tmp_info, buffer,
+ if(_unpack_priority_factors_object(&tmp_info, buffer,
protocol_version)
!= SLURM_SUCCESS)
goto unpack_error;
@@ -2026,7 +2026,7 @@ _pack_update_node_msg(update_node_msg_t * msg, Buf buffer,
uint16_t protocol_version)
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
packstr(msg->node_names, buffer);
pack16(msg->node_state, buffer);
packstr(msg->features, buffer);
@@ -2055,7 +2055,7 @@ _unpack_update_node_msg(update_node_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(update_node_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&tmp_ptr->node_names,
&uint32_tmp, buffer);
safe_unpack16(&tmp_ptr->node_state, buffer);
@@ -2091,7 +2091,7 @@ _pack_node_registration_status_msg(slurm_node_registration_status_msg_t *
uint32_t gres_info_size = 0;
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
pack_time(msg->timestamp, buffer);
pack_time(msg->slurmd_start_time, buffer);
pack32(msg->status, buffer);
@@ -2166,7 +2166,7 @@ _unpack_node_registration_status_msg(slurm_node_registration_status_msg_t
node_reg_ptr = xmalloc(sizeof(slurm_node_registration_status_msg_t));
*msg = node_reg_ptr;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
/* unpack timestamp of snapshot */
safe_unpack_time(&node_reg_ptr->timestamp, buffer);
safe_unpack_time(&node_reg_ptr->slurmd_start_time, buffer);
@@ -2344,7 +2344,7 @@ _pack_job_alloc_info_response_msg(job_alloc_info_response_msg_t * msg,
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack32(msg->error_code, buffer);
pack32(msg->job_id, buffer);
packstr(msg->node_list, buffer);
@@ -2380,7 +2380,7 @@ _unpack_job_alloc_info_response_msg(job_alloc_info_response_msg_t ** msg,
*msg = tmp_ptr;
/* load the data values */
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&tmp_ptr->error_code, buffer);
safe_unpack32(&tmp_ptr->job_id, buffer);
safe_unpackstr_xmalloc(&tmp_ptr->node_list, &uint32_tmp,
@@ -2522,7 +2522,7 @@ _unpack_node_info_msg(node_info_msg_t ** msg, Buf buffer,
*msg = xmalloc(sizeof(node_info_msg_t));
/* load buffer's header (data structure version and time) */
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&((*msg)->record_count), buffer);
safe_unpack32(&((*msg)->node_scaling), buffer);
safe_unpack_time(&((*msg)->last_update), buffer);
@@ -2553,7 +2553,7 @@ _unpack_node_info_members(node_info_t * node, Buf buffer,
xassert(node != NULL);
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&node->name, &uint32_tmp, buffer);
safe_unpack16(&node->node_state, buffer);
safe_unpack16(&node->cpus, buffer);
@@ -2611,7 +2611,7 @@ _pack_update_partition_msg(update_part_msg_t * msg, Buf buffer,
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
packstr(msg->allow_groups, buffer);
packstr(msg->alternate, buffer);
pack32(msg-> max_time, buffer);
@@ -2687,7 +2687,7 @@ _unpack_update_partition_msg(update_part_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(update_part_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&tmp_ptr->allow_groups,
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&tmp_ptr->alternate, &uint32_tmp, buffer);
@@ -2763,7 +2763,7 @@ _pack_update_resv_msg(resv_desc_msg_t * msg, Buf buffer,
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
packstr(msg->name, buffer);
pack_time(msg->start_time, buffer);
pack_time(msg->end_time, buffer);
@@ -2793,7 +2793,7 @@ _unpack_update_resv_msg(resv_desc_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(resv_desc_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&tmp_ptr->name, &uint32_tmp, buffer);
safe_unpack_time(&tmp_ptr->start_time, buffer);
safe_unpack_time(&tmp_ptr->end_time, buffer);
@@ -2828,7 +2828,7 @@ _pack_delete_partition_msg(delete_part_msg_t * msg, Buf buffer,
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
packstr(msg->name, buffer);
}
}
@@ -2846,7 +2846,7 @@ _unpack_delete_partition_msg(delete_part_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(delete_part_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&tmp_ptr->name, &uint32_tmp, buffer);
}
return SLURM_SUCCESS;
@@ -2863,7 +2863,7 @@ _pack_resv_name_msg(reservation_name_msg_t * msg, Buf buffer,
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
packstr(msg->name, buffer);
}
}
@@ -2881,7 +2881,7 @@ _unpack_resv_name_msg(reservation_name_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(reservation_name_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&tmp_ptr->name, &uint32_tmp, buffer);
}
return SLURM_SUCCESS;
@@ -2899,7 +2899,7 @@ _pack_job_step_create_request_msg(job_step_create_request_msg_t
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
pack32(msg->job_id, buffer);
pack32(msg->user_id, buffer);
pack32(msg->min_nodes, buffer);
@@ -2970,7 +2970,7 @@ _unpack_job_step_create_request_msg(job_step_create_request_msg_t ** msg,
tmp_ptr = xmalloc(sizeof(job_step_create_request_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpack32(&(tmp_ptr->job_id), buffer);
safe_unpack32(&(tmp_ptr->user_id), buffer);
safe_unpack32(&(tmp_ptr->min_nodes), buffer);
@@ -3046,7 +3046,7 @@ _pack_kill_job_msg(kill_job_msg_t * msg, Buf buffer, uint16_t protocol_version)
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack32(msg->job_id, buffer);
pack32(msg->step_id, buffer);
pack16(msg->job_state, buffer);
@@ -3072,7 +3072,7 @@ _unpack_kill_job_msg(kill_job_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(kill_job_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&(tmp_ptr->job_id), buffer);
safe_unpack32(&(tmp_ptr->step_id), buffer);
safe_unpack16(&(tmp_ptr->job_state), buffer);
@@ -3099,7 +3099,7 @@ _pack_signal_job_msg(signal_job_msg_t * msg, Buf buffer,
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack32((uint32_t)msg->job_id, buffer);
pack32((uint32_t)msg->signal, buffer);
}
@@ -3117,7 +3117,7 @@ _unpack_signal_job_msg(signal_job_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(signal_job_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&(tmp_ptr->job_id), buffer);
safe_unpack32(&(tmp_ptr->signal), buffer);
}
@@ -3176,7 +3176,7 @@ _pack_update_job_time_msg(job_time_msg_t * msg, Buf buffer,
{
xassert(msg != NULL);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack32((uint32_t)msg->job_id, buffer);
pack_time(msg->expiration_time, buffer);
}
@@ -3193,7 +3193,7 @@ _unpack_update_job_time_msg(job_time_msg_t ** msg, Buf buffer,
tmp_ptr = xmalloc(sizeof(job_time_msg_t));
*msg = tmp_ptr;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&(tmp_ptr->job_id), buffer);
safe_unpack_time(& (tmp_ptr->expiration_time), buffer);
}
@@ -3267,7 +3267,7 @@ _unpack_partition_info_msg(partition_info_msg_t ** msg, Buf buffer,
*msg = xmalloc(sizeof(partition_info_msg_t));
/* load buffer's header (data structure version and time) */
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&((*msg)->record_count), buffer);
safe_unpack_time(&((*msg)->last_update), buffer);
@@ -3299,7 +3299,7 @@ _unpack_partition_info_members(partition_info_t * part, Buf buffer,
uint32_t uint32_tmp;
char *node_inx_str = NULL;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&part->name, &uint32_tmp, buffer);
if (part->name == NULL)
part->name = xmalloc(1);/* part->name = "" implicit */
@@ -3394,7 +3394,7 @@ _unpack_reserve_info_msg(reserve_info_msg_t ** msg, Buf buffer,
*msg = xmalloc(sizeof(reserve_info_msg_t));
/* load buffer's header (data structure version and time) */
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&((*msg)->record_count), buffer);
safe_unpack_time(&((*msg)->last_update), buffer);
@@ -3424,7 +3424,7 @@ _unpack_reserve_info_members(reserve_info_t * resv, Buf buffer,
char *node_inx_str = NULL;
uint32_t uint32_tmp;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&resv->accounts, &uint32_tmp, buffer);
safe_unpack_time(&resv->end_time, buffer);
safe_unpackstr_xmalloc(&resv->features, &uint32_tmp, buffer);
@@ -3466,7 +3466,7 @@ _unpack_job_step_info_members(job_step_info_t * step, Buf buffer,
uint32_t uint32_tmp = 0;
char *node_inx_str;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpack32(&step->job_id, buffer);
safe_unpack32(&step->step_id, buffer);
safe_unpack16(&step->ckpt_interval, buffer);
@@ -3536,7 +3536,7 @@ _unpack_job_step_info_response_msg(job_step_info_response_msg_t** msg,
xassert(msg != NULL);
*msg = xmalloc(sizeof(job_step_info_response_msg_t));
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack_time(&(*msg)->last_update, buffer);
safe_unpack32(&(*msg)->job_step_count, buffer);
@@ -3574,7 +3574,7 @@ _unpack_job_info_msg(job_info_msg_t ** msg, Buf buffer,
*msg = xmalloc(sizeof(job_info_msg_t));
/* load buffer's header (data structure version and time) */
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&((*msg)->record_count), buffer);
safe_unpack_time(&((*msg)->last_update), buffer);
job = (*msg)->job_array =
@@ -3609,7 +3609,7 @@ _unpack_job_info_members(job_info_t * job, Buf buffer,
char *node_inx_str;
multi_core_data_t *mc_ptr;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpack32(&job->assoc_id, buffer);
safe_unpack32(&job->job_id, buffer);
safe_unpack32(&job->user_id, buffer);
@@ -3715,7 +3715,7 @@ _unpack_job_info_members(job_info_t * job, Buf buffer,
job->ntasks_per_core = mc_ptr->ntasks_per_core;
xfree(mc_ptr);
}
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&job->assoc_id, buffer);
safe_unpack32(&job->job_id, buffer);
safe_unpack32(&job->user_id, buffer);
@@ -3835,7 +3835,7 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer,
uint16_t uint16_tmp;
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
pack_time(build_ptr->last_update, buffer);
pack16(build_ptr->accounting_storage_enforce, buffer);
@@ -3959,11 +3959,11 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer,
pack16(build_ptr->sched_time_slice, buffer);
packstr(build_ptr->schedtype, buffer);
packstr(build_ptr->select_type, buffer);
- if (build_ptr->select_conf_key_pairs)
+ if(build_ptr->select_conf_key_pairs)
count = list_count(build_ptr->select_conf_key_pairs);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
ListIterator itr = list_iterator_create(
(List)build_ptr->select_conf_key_pairs);
config_key_pair_t *key_pair = NULL;
@@ -3993,7 +3993,7 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer,
pack16(build_ptr->slurmd_debug, buffer);
packstr(build_ptr->slurmd_logfile, buffer);
packstr(build_ptr->slurmd_pidfile, buffer);
- if (!(cluster_flags & CLUSTER_FLAG_MULTSD))
+ if(!(cluster_flags & CLUSTER_FLAG_MULTSD))
pack32(build_ptr->slurmd_port, buffer);
packstr(build_ptr->slurmd_spooldir, buffer);
@@ -4029,7 +4029,7 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer,
pack16(build_ptr->z_16, buffer);
pack32(build_ptr->z_32, buffer);
packstr(build_ptr->z_char, buffer);
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack_time(build_ptr->last_update, buffer);
pack16(build_ptr->accounting_storage_enforce, buffer);
@@ -4152,11 +4152,11 @@ _pack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t * build_ptr, Buf buffer,
pack16(build_ptr->sched_time_slice, buffer);
packstr(build_ptr->schedtype, buffer);
packstr(build_ptr->select_type, buffer);
- if (build_ptr->select_conf_key_pairs)
+ if(build_ptr->select_conf_key_pairs)
count = list_count(build_ptr->select_conf_key_pairs);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
ListIterator itr = list_iterator_create(
(List)build_ptr->select_conf_key_pairs);
config_key_pair_t *key_pair = NULL;
@@ -4242,7 +4242,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **build_buffer_ptr,
build_ptr->hash_val = NO_VAL;
/* load the data values */
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
/* unpack timestamp of snapshot */
safe_unpack_time(&build_ptr->last_update, buffer);
@@ -4416,12 +4416,12 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **build_buffer_ptr,
safe_unpackstr_xmalloc(&build_ptr->select_type,
&uint32_tmp, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
List tmp_list = list_create(destroy_config_key_pair);
config_key_pair_t *object = NULL;
int i;
for(i=0; i<count; i++) {
- if (unpack_config_key_pair(
+ if(unpack_config_key_pair(
(void *)&object, SLURMDBD_VERSION,
buffer)
== SLURM_ERROR)
@@ -4456,7 +4456,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **build_buffer_ptr,
buffer);
safe_unpackstr_xmalloc(&build_ptr->slurmd_pidfile, &uint32_tmp,
buffer);
- if (!(cluster_flags & CLUSTER_FLAG_MULTSD))
+ if(!(cluster_flags & CLUSTER_FLAG_MULTSD))
safe_unpack32(&build_ptr->slurmd_port, buffer);
safe_unpackstr_xmalloc(&build_ptr->slurmd_spooldir,
@@ -4509,7 +4509,7 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **build_buffer_ptr,
safe_unpack32(&build_ptr->z_32, buffer);
safe_unpackstr_xmalloc(&build_ptr->z_char, &uint32_tmp,
buffer);
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
uint16_t max_job_cnt;
char *tmp_str = NULL;
/* unpack timestamp of snapshot */
@@ -4684,12 +4684,12 @@ _unpack_slurm_ctl_conf_msg(slurm_ctl_conf_info_msg_t **build_buffer_ptr,
safe_unpackstr_xmalloc(&build_ptr->select_type,
&uint32_tmp, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
List tmp_list = list_create(destroy_config_key_pair);
config_key_pair_t *object = NULL;
int i;
for(i=0; i<count; i++) {
- if (unpack_config_key_pair(
+ if(unpack_config_key_pair(
(void *)&object, SLURMDBD_VERSION,
buffer)
== SLURM_ERROR)
@@ -4796,7 +4796,7 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer,
uint16_t protocol_version)
{
/* load the data values */
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
pack16(job_desc_ptr->contiguous, buffer);
pack16(job_desc_ptr->task_dist, buffer);
pack16(job_desc_ptr->kill_on_node_fail, buffer);
@@ -4880,14 +4880,14 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer,
pack16(job_desc_ptr->warn_time, buffer);
packstr(job_desc_ptr->wckey, buffer);
- if (job_desc_ptr->select_jobinfo) {
+ if(job_desc_ptr->select_jobinfo) {
select_g_select_jobinfo_pack(
job_desc_ptr->select_jobinfo,
buffer, protocol_version);
} else {
job_desc_ptr->select_jobinfo =
select_g_select_jobinfo_alloc();
- if (job_desc_ptr->geometry[0] != (uint16_t) NO_VAL)
+ if(job_desc_ptr->geometry[0] != (uint16_t) NO_VAL)
select_g_select_jobinfo_set(
job_desc_ptr->select_jobinfo,
SELECT_JOBDATA_GEOMETRY,
@@ -4937,7 +4937,7 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer,
job_desc_ptr->select_jobinfo = NULL;
}
pack16(job_desc_ptr->wait_all_nodes, buffer);
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack16(job_desc_ptr->contiguous, buffer);
pack16(job_desc_ptr->task_dist, buffer);
pack16(job_desc_ptr->kill_on_node_fail, buffer);
@@ -5018,7 +5018,7 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer,
pack16(job_desc_ptr->warn_time, buffer);
packstr(job_desc_ptr->wckey, buffer);
- if (job_desc_ptr->select_jobinfo) {
+ if(job_desc_ptr->select_jobinfo) {
select_g_select_jobinfo_pack(
job_desc_ptr->select_jobinfo,
buffer, protocol_version);
@@ -5026,7 +5026,7 @@ _pack_job_desc_msg(job_desc_msg_t * job_desc_ptr, Buf buffer,
job_desc_ptr->select_jobinfo =
select_g_select_jobinfo_alloc();
- if (job_desc_ptr->geometry[0] != (uint16_t) NO_VAL)
+ if(job_desc_ptr->geometry[0] != (uint16_t) NO_VAL)
select_g_select_jobinfo_set(
job_desc_ptr->select_jobinfo,
SELECT_JOBDATA_GEOMETRY,
@@ -5092,7 +5092,7 @@ _unpack_job_desc_msg(job_desc_msg_t ** job_desc_buffer_ptr, Buf buffer,
job_desc_msg_t *job_desc_ptr;
/* alloc memory for structure */
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
job_desc_ptr = xmalloc(sizeof(job_desc_msg_t));
*job_desc_buffer_ptr = job_desc_ptr;
@@ -5222,7 +5222,7 @@ _unpack_job_desc_msg(job_desc_msg_t ** job_desc_buffer_ptr, Buf buffer,
job_desc_ptr->mloaderimage = NULL;
job_desc_ptr->ramdiskimage = NULL;
safe_unpack16(&job_desc_ptr->wait_all_nodes, buffer);
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
job_desc_ptr = xmalloc(sizeof(job_desc_msg_t));
*job_desc_buffer_ptr = job_desc_ptr;
@@ -5997,7 +5997,7 @@ static void
_pack_cancel_tasks_msg(kill_tasks_msg_t * msg, Buf buffer,
uint16_t protocol_version)
{
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack32((uint32_t)msg->job_id, buffer);
pack32((uint32_t)msg->job_step_id, buffer);
pack32((uint32_t)msg->signal, buffer);
@@ -6013,7 +6013,7 @@ _unpack_cancel_tasks_msg(kill_tasks_msg_t ** msg_ptr, Buf buffer,
msg = xmalloc(sizeof(kill_tasks_msg_t));
*msg_ptr = msg;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&msg->job_id, buffer);
safe_unpack32(&msg->job_step_id, buffer);
safe_unpack32(&msg->signal, buffer);
@@ -6030,7 +6030,7 @@ static void
_pack_checkpoint_tasks_msg(checkpoint_tasks_msg_t * msg, Buf buffer,
uint16_t protocol_version)
{
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack32(msg->job_id, buffer);
pack32(msg->job_step_id, buffer);
pack_time(msg->timestamp, buffer);
@@ -6048,7 +6048,7 @@ _unpack_checkpoint_tasks_msg(checkpoint_tasks_msg_t ** msg_ptr, Buf buffer,
msg = xmalloc(sizeof(checkpoint_tasks_msg_t));
*msg_ptr = msg;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&msg->job_id, buffer);
safe_unpack32(&msg->job_step_id, buffer);
safe_unpack_time(&msg->timestamp, buffer);
@@ -6293,7 +6293,7 @@ static void
_pack_job_step_pids(job_step_pids_t *msg, Buf buffer,
uint16_t protocol_version)
{
- if (!msg) {
+ if(!msg) {
packnull(buffer);
pack32(0, buffer);
return;
@@ -6428,10 +6428,10 @@ static int _unpack_block_info_members(block_info_t *block_info, Buf buffer,
char *bp_inx_str = NULL;
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&block_info->bg_block_id,
&uint32_tmp, buffer);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
safe_unpackstr_xmalloc(&block_info->blrtsimage,
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&bp_inx_str, &uint32_tmp, buffer);
@@ -6459,7 +6459,7 @@ static int _unpack_block_info_members(block_info_t *block_info, Buf buffer,
safe_unpackstr_xmalloc(&(block_info->nodes), &uint32_tmp,
buffer);
safe_unpack32(&block_info->node_cnt, buffer);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
safe_unpack16(&block_info->node_use, buffer);
safe_unpackstr_xmalloc(&block_info->owner_name,
&uint32_tmp, buffer);
@@ -6479,10 +6479,10 @@ static void _pack_block_info_msg(block_info_t *block_info, Buf buffer,
uint16_t protocol_version)
{
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
- if (!block_info) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(!block_info) {
packnull(buffer);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
packnull(buffer);
pack16((uint16_t)NO_VAL, buffer);
packnull(buffer);
@@ -6496,17 +6496,17 @@ static void _pack_block_info_msg(block_info_t *block_info, Buf buffer,
packnull(buffer);
packnull(buffer);
pack32(NO_VAL, buffer);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
pack16((uint16_t)NO_VAL, buffer);
packnull(buffer);
packnull(buffer);
pack16((uint16_t)NO_VAL, buffer);
} else {
packstr(block_info->bg_block_id, buffer);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
packstr(block_info->blrtsimage, buffer);
- if (block_info->bp_inx) {
+ if(block_info->bp_inx) {
char *bitfmt = inx2bitfmt(block_info->bp_inx);
packstr(bitfmt, buffer);
xfree(bitfmt);
@@ -6517,7 +6517,7 @@ static void _pack_block_info_msg(block_info_t *block_info, Buf buffer,
packstr(block_info->ionodes, buffer);
- if (block_info->ionode_inx) {
+ if(block_info->ionode_inx) {
char *bitfmt =
inx2bitfmt(block_info->ionode_inx);
packstr(bitfmt, buffer);
@@ -6531,7 +6531,7 @@ static void _pack_block_info_msg(block_info_t *block_info, Buf buffer,
packstr(block_info->mloaderimage, buffer);
packstr(block_info->nodes, buffer);
pack32(block_info->node_cnt, buffer);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
pack16(block_info->node_use, buffer);
packstr(block_info->owner_name, buffer);
packstr(block_info->ramdiskimage, buffer);
@@ -6548,7 +6548,7 @@ extern int slurm_unpack_block_info_msg(
block_info_msg_t *buf;
buf = xmalloc(sizeof(block_info_msg_t));
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&(buf->record_count), buffer);
safe_unpack_time(&(buf->last_update), buffer);
buf->block_array = xmalloc(sizeof(block_info_t) *
@@ -6575,7 +6575,7 @@ extern int _unpack_block_info(block_info_t **block_info, Buf buffer,
int rc = SLURM_SUCCESS;
block_info_t *bg_rec = xmalloc(sizeof(block_info_t));
- if ((rc = _unpack_block_info_members(bg_rec, buffer, protocol_version))
+ if((rc = _unpack_block_info_members(bg_rec, buffer, protocol_version))
!= SLURM_SUCCESS)
xfree(bg_rec);
else
@@ -7865,12 +7865,12 @@ static void _pack_accounting_update_msg(accounting_update_msg_t *msg,
ListIterator itr = NULL;
slurmdb_update_object_t *rec = NULL;
- if (msg->update_list)
+ if(msg->update_list)
count = list_count(msg->update_list);
pack32(count, buffer);
- if (count) {
+ if(count) {
itr = list_iterator_create(msg->update_list);
while((rec = list_next(itr))) {
slurmdb_pack_update_object(rec, msg->rpc_version,
@@ -7898,7 +7898,7 @@ static int _unpack_accounting_update_msg(accounting_update_msg_t **msg,
/* this is only ran in the slurmctld so we can just
use the version here.
*/
- if ((slurmdb_unpack_update_object(&rec, SLURMDBD_VERSION,
+ if((slurmdb_unpack_update_object(&rec, SLURMDBD_VERSION,
buffer))
== SLURM_ERROR)
goto unpack_error;
diff --git a/src/common/slurm_protocol_util.c b/src/common/slurm_protocol_util.c
index d2dbd0dd29729d616093c59dc594bdf47dbd1f0d..416b3ccba87ab30d289fb62ddb304f5426359ca1 100644
--- a/src/common/slurm_protocol_util.c
+++ b/src/common/slurm_protocol_util.c
@@ -56,7 +56,7 @@
*/
int check_header_version(header_t * header)
{
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
if (header->version != SLURM_PROTOCOL_VERSION
&& header->version != SLURM_2_1_PROTOCOL_VERSION
&& header->version != SLURM_2_0_PROTOCOL_VERSION
@@ -100,7 +100,7 @@ int check_header_version(header_t * header)
case REQUEST_UPDATE_BLOCK:
case REQUEST_UPDATE_JOB:
case REQUEST_UPDATE_PARTITION:
- if (header->version == SLURM_2_1_PROTOCOL_VERSION)
+ if(header->version == SLURM_2_1_PROTOCOL_VERSION)
break;
default:
slurm_seterrno_ret(SLURM_PROTOCOL_VERSION_ERROR);
@@ -124,17 +124,17 @@ void init_header(header_t *header, slurm_msg_t *msg,
/* Since the slurmdbd could talk to a host of different
versions of slurm this needs to be kept current when the
protocol version changes. */
- if (msg->protocol_version != (uint16_t)NO_VAL)
+ if(msg->protocol_version != (uint16_t)NO_VAL)
header->version = msg->protocol_version;
- else if (msg->msg_type == ACCOUNTING_UPDATE_MSG
+ else if(msg->msg_type == ACCOUNTING_UPDATE_MSG
|| msg->msg_type == ACCOUNTING_FIRST_REG) {
uint32_t rpc_version =
((accounting_update_msg_t *)msg->data)->rpc_version;
- if (rpc_version >= 8)
+ if(rpc_version >= 8)
header->version = SLURM_PROTOCOL_VERSION;
- else if (rpc_version >= 6)
+ else if(rpc_version >= 6)
header->version = SLURM_2_1_PROTOCOL_VERSION;
- else if (rpc_version >= 5)
+ else if(rpc_version >= 5)
header->version = SLURM_2_0_PROTOCOL_VERSION;
else
header->version = SLURM_1_3_PROTOCOL_VERSION;
@@ -145,7 +145,7 @@ void init_header(header_t *header, slurm_msg_t *msg,
header->msg_type = msg->msg_type;
header->body_length = 0; /* over-written later */
header->forward = msg->forward;
- if (msg->ret_list)
+ if(msg->ret_list)
header->ret_cnt = list_count(msg->ret_list);
else
header->ret_cnt = 0;
diff --git a/src/common/slurm_resource_info.c b/src/common/slurm_resource_info.c
index 11011fa88ae55da4e10931a7b117c28fe773ff84..8e60e2135ff14ae5c1de750ab0e06066ddac7409 100644
--- a/src/common/slurm_resource_info.c
+++ b/src/common/slurm_resource_info.c
@@ -53,7 +53,7 @@
#include "src/common/xmalloc.h"
#include "src/common/xstring.h"
-#if (0)
+#if(0)
#define DEBUG 1
#endif
@@ -151,7 +151,7 @@ int slurm_get_avail_procs(const uint16_t socket_cnt,
if (alloc_cores[i])
allocated_sockets++;
}
-#if (DEBUG)
+#if(DEBUG)
info("get_avail_procs %u %s User_ sockets %u cores %u threads %u",
job_id, name, socket_cnt, core_cnt, thread_cnt);
info("get_avail_procs %u %s HW_ sockets %u cores %u threads %u",
@@ -286,7 +286,7 @@ int slurm_get_avail_procs(const uint16_t socket_cnt,
avail_cpus = (*cpus / cpus_per_task) * cpus_per_task;
avail_cpus = MIN(avail_cpus, max_cpus);
-#if (DEBUG)
+#if(DEBUG)
info("get_avail_procs %u %s return cpus %u sockets %u cores %u threads %u",
job_id, name, *cpus, *sockets, *cores, *threads);
info("get_avail_procs %d %s avail_cpus %u", job_id, name, avail_cpus);
diff --git a/src/common/slurm_step_layout.c b/src/common/slurm_step_layout.c
index 46963a307876979ae00ae35a885e5403379db0c9..5c9023dbfc9d8658207749c6088d5a29c50ff0a8 100644
--- a/src/common/slurm_step_layout.c
+++ b/src/common/slurm_step_layout.c
@@ -101,7 +101,7 @@ slurm_step_layout_t *slurm_step_layout_create(
uint32_t cluster_flags = slurmdb_setup_cluster_flags();
step_layout->task_dist = task_dist;
- if (task_dist == SLURM_DIST_ARBITRARY) {
+ if(task_dist == SLURM_DIST_ARBITRARY) {
hostlist_t hl = NULL;
char buf[65536];
/* set the node list for the task layout later if user
@@ -118,20 +118,20 @@ slurm_step_layout_t *slurm_step_layout_create(
}
step_layout->task_cnt = num_tasks;
- if (cluster_flags & CLUSTER_FLAG_FE) {
+ if(cluster_flags & CLUSTER_FLAG_FE) {
/* Limited job step support */
/* All jobs execute through front-end on Blue Gene.
* Normally we would not permit execution of job steps,
* but can fake it by just allocating all tasks to
* one of the allocated nodes. */
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
step_layout->node_cnt = num_hosts;
else
step_layout->node_cnt = 1;
} else
step_layout->node_cnt = num_hosts;
- if (_init_task_layout(step_layout, arbitrary_nodes,
+ if(_init_task_layout(step_layout, arbitrary_nodes,
cpus_per_node, cpu_count_reps,
cpus_per_task,
task_dist, plane_size)
@@ -170,7 +170,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
hostlist_t hl = NULL;
slurm_step_layout_t *step_layout = NULL;
- if ((node_cnt <= 0) || (task_cnt <= 0 && !cpus_per_node) || !tlist) {
+ if((node_cnt <= 0) || (task_cnt <= 0 && !cpus_per_node) || !tlist) {
error("there is a problem with your fake_step_layout request\n"
"node_cnt = %u, task_cnt = %u, tlist = %s",
node_cnt, task_cnt, tlist);
@@ -179,7 +179,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
hl = hostlist_create(tlist);
/* make out how many cpus there are on each node */
- if (task_cnt > 0)
+ if(task_cnt > 0)
cpn = (task_cnt + node_cnt - 1) / node_cnt;
step_layout = xmalloc(sizeof(slurm_step_layout_t));
@@ -192,7 +192,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
step_layout->task_cnt = 0;
for (i=0; i<step_layout->node_cnt; i++) {
- if (cpus_per_node && cpu_count_reps) {
+ if(cpus_per_node && cpu_count_reps) {
step_layout->tasks[i] = cpus_per_node[cpu_inx];
step_layout->tids[i] = xmalloc(sizeof(uint32_t) *
step_layout->tasks[i]);
@@ -207,7 +207,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
cpu_cnt = 0;
}
} else {
- if (step_layout->task_cnt >= task_cnt) {
+ if(step_layout->task_cnt >= task_cnt) {
step_layout->tasks[i] = 0;
step_layout->tids[i] = NULL;
} else {
@@ -218,7 +218,7 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
for (j=0; j<cpn; j++) {
step_layout->tids[i][j] =
step_layout->task_cnt++;
- if (step_layout->task_cnt >= task_cnt) {
+ if(step_layout->task_cnt >= task_cnt) {
step_layout->tasks[i] = j + 1;
break;
}
@@ -226,12 +226,12 @@ slurm_step_layout_t *fake_slurm_step_layout_create(
}
}
/* name = hostlist_shift(hl); */
-/* if (!name) { */
+/* if(!name) { */
/* error("fake_slurm_step_layout_create: " */
/* "We don't have the correct nodelist."); */
/* goto error; */
/* } */
-/* if (slurm_conf_get_addr(name, &step_layout->node_addr[i]) == */
+/* if(slurm_conf_get_addr(name, &step_layout->node_addr[i]) == */
/* SLURM_ERROR) { */
/* error("fake_slurm_step_layout_create: " */
/* "we didn't get an addr for host %s.", name); */
@@ -255,7 +255,7 @@ extern slurm_step_layout_t *slurm_step_layout_copy(
{
slurm_step_layout_t *layout;
int i=0;
- if (!step_layout)
+ if(!step_layout)
return NULL;
layout = xmalloc(sizeof(slurm_step_layout_t));
@@ -286,12 +286,12 @@ extern void pack_slurm_step_layout(slurm_step_layout_t *step_layout,
Buf buffer, uint16_t protocol_version)
{
uint16_t i = 0;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
- if (step_layout)
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(step_layout)
i=1;
pack16(i, buffer);
- if (!i)
+ if(!i)
return;
packstr(step_layout->node_list, buffer);
pack32(step_layout->node_cnt, buffer);
@@ -316,9 +316,9 @@ extern int unpack_slurm_step_layout(slurm_step_layout_t **layout, Buf buffer,
slurm_step_layout_t *step_layout = NULL;
int i;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack16(&uint16_tmp, buffer);
- if (!uint16_tmp)
+ if(!uint16_tmp)
return SLURM_SUCCESS;
step_layout = xmalloc(sizeof(slurm_step_layout_t));
@@ -363,7 +363,7 @@ unpack_error:
extern int slurm_step_layout_destroy(slurm_step_layout_t *step_layout)
{
int i=0;
- if (step_layout) {
+ if(step_layout) {
xfree(step_layout->node_list);
/* xfree(step_layout->node_addr); */
xfree(step_layout->tasks);
@@ -385,7 +385,7 @@ int slurm_step_layout_host_id (slurm_step_layout_t *s, int taskid)
return SLURM_ERROR;
for (i=0; i < s->node_cnt; i++)
for (j=0; j<s->tasks[i]; j++)
- if (s->tids[i][j] == taskid)
+ if(s->tids[i][j] == taskid)
return i;
return SLURM_ERROR;
@@ -419,7 +419,7 @@ static int _init_task_layout(slurm_step_layout_t *step_layout,
if (step_layout->tasks) /* layout already completed */
return SLURM_SUCCESS;
- if ((int)cpus_per_task < 1 || cpus_per_task == (uint16_t)NO_VAL)
+ if((int)cpus_per_task < 1 || cpus_per_task == (uint16_t)NO_VAL)
cpus_per_task = 1;
step_layout->plane_size = plane_size;
@@ -428,26 +428,26 @@ static int _init_task_layout(slurm_step_layout_t *step_layout,
* step_layout->node_cnt);
step_layout->tids = xmalloc(sizeof(uint32_t *)
* step_layout->node_cnt);
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
hostlist_t hl = hostlist_create(step_layout->node_list);
/* make sure the number of nodes we think we have
* is the correct number */
i = hostlist_count(hl);
- if (step_layout->node_cnt > i)
+ if(step_layout->node_cnt > i)
step_layout->node_cnt = i;
hostlist_destroy(hl);
}
debug("laying out the %u tasks on %u hosts %s",
step_layout->task_cnt, step_layout->node_cnt,
step_layout->node_list);
- if (step_layout->node_cnt < 1) {
+ if(step_layout->node_cnt < 1) {
error("no hostlist given can't layout tasks");
return SLURM_ERROR;
}
for (i=0; i<step_layout->node_cnt; i++) {
/* name = hostlist_shift(hl); */
-/* if (!name) { */
+/* if(!name) { */
/* error("hostlist incomplete for this job request"); */
/* hostlist_destroy(hl); */
/* return SLURM_ERROR; */
@@ -473,10 +473,10 @@ static int _init_task_layout(slurm_step_layout_t *step_layout,
(task_dist == SLURM_DIST_CYCLIC_CYCLIC) ||
(task_dist == SLURM_DIST_CYCLIC_BLOCK))
return _task_layout_cyclic(step_layout, cpus);
- else if (task_dist == SLURM_DIST_ARBITRARY
+ else if(task_dist == SLURM_DIST_ARBITRARY
&& !(cluster_flags & CLUSTER_FLAG_FE))
return _task_layout_hostfile(step_layout, arbitrary_nodes);
- else if (task_dist == SLURM_DIST_PLANE)
+ else if(task_dist == SLURM_DIST_PLANE)
return _task_layout_plane(step_layout, cpus);
else
return _task_layout_block(step_layout, cpus);
@@ -498,14 +498,14 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
debug2("job list is %s", step_layout->node_list);
job_alloc_hosts = hostlist_create(step_layout->node_list);
itr = hostlist_iterator_create(job_alloc_hosts);
- if (!arbitrary_nodes) {
+ if(!arbitrary_nodes) {
error("no hostlist given for arbitrary dist");
return SLURM_ERROR;
}
debug2("list is %s", arbitrary_nodes);
step_alloc_hosts = hostlist_create(arbitrary_nodes);
- if (hostlist_count(step_alloc_hosts) != step_layout->task_cnt) {
+ if(hostlist_count(step_alloc_hosts) != step_layout->task_cnt) {
error("Asked for %u tasks have %d in the nodelist. "
"Check your nodelist, or set the -n option to be %d",
step_layout->task_cnt,
@@ -517,16 +517,16 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
while((host = hostlist_next(itr))) {
step_layout->tasks[i] = 0;
while((host_task = hostlist_next(itr_task))) {
- if (!strcmp(host, host_task)) {
+ if(!strcmp(host, host_task)) {
step_layout->tasks[i]++;
task_cnt++;
}
free(host_task);
- if (task_cnt >= step_layout->task_cnt)
+ if(task_cnt >= step_layout->task_cnt)
break;
}
debug3("%s got %u tasks", host, step_layout->tasks[i]);
- if (step_layout->tasks[i] == 0)
+ if(step_layout->tasks[i] == 0)
goto reset_hosts;
step_layout->tids[i] = xmalloc(sizeof(uint32_t)
* step_layout->tasks[i]);
@@ -534,27 +534,27 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
j = 0;
hostlist_iterator_reset(itr_task);
while((host_task = hostlist_next(itr_task))) {
- if (!strcmp(host, host_task)) {
+ if(!strcmp(host, host_task)) {
step_layout->tids[i][j] = taskid;
j++;
}
taskid++;
free(host_task);
- if (j >= step_layout->tasks[i])
+ if(j >= step_layout->tasks[i])
break;
}
i++;
reset_hosts:
hostlist_iterator_reset(itr_task);
free(host);
- if (i > step_layout->task_cnt)
+ if(i > step_layout->task_cnt)
break;
}
hostlist_iterator_destroy(itr);
hostlist_iterator_destroy(itr_task);
hostlist_destroy(job_alloc_hosts);
hostlist_destroy(step_alloc_hosts);
- if (task_cnt != step_layout->task_cnt) {
+ if(task_cnt != step_layout->task_cnt) {
error("Asked for %u tasks but placed %d. Check your nodelist",
step_layout->task_cnt, task_cnt);
return SLURM_ERROR;
@@ -701,7 +701,7 @@ static int _task_layout_plane(slurm_step_layout_t *step_layout,
return SLURM_ERROR;
}
-#if (0)
+#if(0)
/* debugging only */
for (i=0; i < step_layout->node_cnt; i++) {
info("tasks[%d]: %u", i, step_layout->tasks[i]);
diff --git a/src/common/slurm_topology.c b/src/common/slurm_topology.c
index d38b2bebcb86a310c74b291c9a9f6ae63a7fa077..8da99c8177ad06484d9034ef0a507395f78dcda9 100644
--- a/src/common/slurm_topology.c
+++ b/src/common/slurm_topology.c
@@ -96,7 +96,7 @@ slurm_topo_get_ops( slurm_topo_context_t *c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->topo_type, plugin_strerror(errno));
return NULL;
diff --git a/src/common/slurmdb_defs.c b/src/common/slurmdb_defs.c
index 3c5cdf55a10c3705ab0f05c3dffdc3731e1a79c4..6a47c20ca4c5325133f2ae14848c96d701ab904a 100644
--- a/src/common/slurmdb_defs.c
+++ b/src/common/slurmdb_defs.c
@@ -64,16 +64,16 @@ static int _sort_childern_list(slurmdb_hierarchical_rec_t *assoc_a,
/* first just check the lfts and rgts if a lft is inside of the
* others lft and rgt just return it is less
*/
- if (assoc_a->assoc->lft > assoc_b->assoc->lft
+ if(assoc_a->assoc->lft > assoc_b->assoc->lft
&& assoc_a->assoc->lft < assoc_b->assoc->rgt)
return 1;
/* check to see if this is a user association or an account.
* We want the accounts at the bottom
*/
- if (assoc_a->assoc->user && !assoc_b->assoc->user)
+ if(assoc_a->assoc->user && !assoc_b->assoc->user)
return -1;
- else if (!assoc_a->assoc->user && assoc_b->assoc->user)
+ else if(!assoc_a->assoc->user && assoc_b->assoc->user)
return 1;
diff = strcmp(assoc_a->sort_name, assoc_b->sort_name);
@@ -93,14 +93,14 @@ static int _sort_slurmdb_hierarchical_rec_list(
slurmdb_hierarchical_rec_t *slurmdb_hierarchical_rec = NULL;
ListIterator itr;
- if (!list_count(slurmdb_hierarchical_rec_list))
+ if(!list_count(slurmdb_hierarchical_rec_list))
return SLURM_SUCCESS;
list_sort(slurmdb_hierarchical_rec_list, (ListCmpF)_sort_childern_list);
itr = list_iterator_create(slurmdb_hierarchical_rec_list);
while((slurmdb_hierarchical_rec = list_next(itr))) {
- if (list_count(slurmdb_hierarchical_rec->childern))
+ if(list_count(slurmdb_hierarchical_rec->childern))
_sort_slurmdb_hierarchical_rec_list(
slurmdb_hierarchical_rec->childern);
}
@@ -115,17 +115,17 @@ static int _append_hierarchical_childern_ret_list(
slurmdb_hierarchical_rec_t *slurmdb_hierarchical_rec = NULL;
ListIterator itr;
- if (!ret_list)
+ if(!ret_list)
return SLURM_ERROR;
- if (!list_count(slurmdb_hierarchical_rec_list))
+ if(!list_count(slurmdb_hierarchical_rec_list))
return SLURM_SUCCESS;
itr = list_iterator_create(slurmdb_hierarchical_rec_list);
while((slurmdb_hierarchical_rec = list_next(itr))) {
list_append(ret_list, slurmdb_hierarchical_rec->assoc);
- if (list_count(slurmdb_hierarchical_rec->childern))
+ if(list_count(slurmdb_hierarchical_rec->childern))
_append_hierarchical_childern_ret_list(
ret_list, slurmdb_hierarchical_rec->childern);
}
@@ -140,12 +140,12 @@ static char *_get_qos_list_str(List qos_list)
ListIterator itr = NULL;
slurmdb_qos_rec_t *qos = NULL;
- if (!qos_list)
+ if(!qos_list)
return NULL;
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
- if (qos_char)
+ if(qos_char)
xstrfmtcat(qos_char, ",%s", qos->name);
else
xstrcat(qos_char, qos->name);
@@ -161,20 +161,20 @@ static int _setup_cluster_rec(slurmdb_cluster_rec_t *cluster_rec)
xassert(cluster_rec);
- if (!cluster_rec->control_port) {
+ if(!cluster_rec->control_port) {
debug("Slurmctld on '%s' hasn't registered yet.",
cluster_rec->name);
return SLURM_ERROR;
}
- if (cluster_rec->rpc_version < 8) {
+ if(cluster_rec->rpc_version < 8) {
debug("Slurmctld on '%s' must be running at least "
"SLURM 2.2 for cross-cluster communication.",
cluster_rec->name);
return SLURM_ERROR;
}
- if ((plugin_id_select = select_get_plugin_id_pos(
+ if((plugin_id_select = select_get_plugin_id_pos(
cluster_rec->plugin_id_select)) == SLURM_ERROR) {
error("Cluster '%s' has an unknown select plugin_id %u",
cluster_rec->name,
@@ -196,7 +196,7 @@ static int _setup_cluster_rec(slurmdb_cluster_rec_t *cluster_rec)
return SLURM_ERROR;
}
- if (cluster_rec->flags & CLUSTER_FLAG_BG) {
+ if(cluster_rec->flags & CLUSTER_FLAG_BG) {
int number, i, len;
char *nodes = cluster_rec->nodes;
@@ -204,9 +204,9 @@ static int _setup_cluster_rec(slurmdb_cluster_rec_t *cluster_rec)
sizeof(int) * cluster_rec->dimensions);
len = strlen(nodes);
i = len - cluster_rec->dimensions;
- if (nodes[len-1] == ']')
+ if(nodes[len-1] == ']')
i--;
- if (i > cluster_rec->dimensions) {
+ if(i > cluster_rec->dimensions) {
char *p = '\0';
number = xstrntol(nodes + i, &p,
cluster_rec->dimensions,
@@ -258,16 +258,16 @@ extern void slurmdb_destroy_user_rec(void *object)
{
slurmdb_user_rec_t *slurmdb_user = (slurmdb_user_rec_t *)object;
- if (slurmdb_user) {
- if (slurmdb_user->assoc_list)
+ if(slurmdb_user) {
+ if(slurmdb_user->assoc_list)
list_destroy(slurmdb_user->assoc_list);
- if (slurmdb_user->coord_accts)
+ if(slurmdb_user->coord_accts)
list_destroy(slurmdb_user->coord_accts);
xfree(slurmdb_user->default_acct);
xfree(slurmdb_user->default_wckey);
xfree(slurmdb_user->name);
xfree(slurmdb_user->old_name);
- if (slurmdb_user->wckey_list)
+ if(slurmdb_user->wckey_list)
list_destroy(slurmdb_user->wckey_list);
xfree(slurmdb_user);
}
@@ -278,10 +278,10 @@ extern void slurmdb_destroy_account_rec(void *object)
slurmdb_account_rec_t *slurmdb_account =
(slurmdb_account_rec_t *)object;
- if (slurmdb_account) {
- if (slurmdb_account->assoc_list)
+ if(slurmdb_account) {
+ if(slurmdb_account->assoc_list)
list_destroy(slurmdb_account->assoc_list);
- if (slurmdb_account->coordinators)
+ if(slurmdb_account->coordinators)
list_destroy(slurmdb_account->coordinators);
xfree(slurmdb_account->description);
xfree(slurmdb_account->name);
@@ -295,7 +295,7 @@ extern void slurmdb_destroy_coord_rec(void *object)
slurmdb_coord_rec_t *slurmdb_coord =
(slurmdb_coord_rec_t *)object;
- if (slurmdb_coord) {
+ if(slurmdb_coord) {
xfree(slurmdb_coord->name);
xfree(slurmdb_coord);
}
@@ -306,7 +306,7 @@ extern void slurmdb_destroy_cluster_accounting_rec(void *object)
slurmdb_cluster_accounting_rec_t *clusteracct_rec =
(slurmdb_cluster_accounting_rec_t *)object;
- if (clusteracct_rec) {
+ if(clusteracct_rec) {
xfree(clusteracct_rec);
}
}
@@ -316,8 +316,8 @@ extern void slurmdb_destroy_cluster_rec(void *object)
slurmdb_cluster_rec_t *slurmdb_cluster =
(slurmdb_cluster_rec_t *)object;
- if (slurmdb_cluster) {
- if (slurmdb_cluster->accounting_list)
+ if(slurmdb_cluster) {
+ if(slurmdb_cluster->accounting_list)
list_destroy(slurmdb_cluster->accounting_list);
xfree(slurmdb_cluster->control_host);
xfree(slurmdb_cluster->dim_size);
@@ -333,7 +333,7 @@ extern void slurmdb_destroy_accounting_rec(void *object)
slurmdb_accounting_rec_t *slurmdb_accounting =
(slurmdb_accounting_rec_t *)object;
- if (slurmdb_accounting) {
+ if(slurmdb_accounting) {
xfree(slurmdb_accounting);
}
}
@@ -343,14 +343,14 @@ extern void slurmdb_destroy_association_rec(void *object)
slurmdb_association_rec_t *slurmdb_association =
(slurmdb_association_rec_t *)object;
- if (slurmdb_association) {
- if (slurmdb_association->accounting_list)
+ if(slurmdb_association) {
+ if(slurmdb_association->accounting_list)
list_destroy(slurmdb_association->accounting_list);
xfree(slurmdb_association->acct);
xfree(slurmdb_association->cluster);
xfree(slurmdb_association->parent_acct);
xfree(slurmdb_association->partition);
- if (slurmdb_association->qos_list)
+ if(slurmdb_association->qos_list)
list_destroy(slurmdb_association->qos_list);
xfree(slurmdb_association->user);
@@ -365,7 +365,7 @@ extern void slurmdb_destroy_event_rec(void *object)
slurmdb_event_rec_t *slurmdb_event =
(slurmdb_event_rec_t *)object;
- if (slurmdb_event) {
+ if(slurmdb_event) {
xfree(slurmdb_event->cluster);
xfree(slurmdb_event->cluster_nodes);
xfree(slurmdb_event->node_name);
@@ -385,7 +385,7 @@ extern void slurmdb_destroy_job_rec(void *object)
xfree(job->jobname);
xfree(job->partition);
xfree(job->nodes);
- if (job->steps) {
+ if(job->steps) {
list_destroy(job->steps);
job->steps = NULL;
}
@@ -398,11 +398,11 @@ extern void slurmdb_destroy_job_rec(void *object)
extern void slurmdb_destroy_qos_rec(void *object)
{
slurmdb_qos_rec_t *slurmdb_qos = (slurmdb_qos_rec_t *)object;
- if (slurmdb_qos) {
+ if(slurmdb_qos) {
xfree(slurmdb_qos->description);
xfree(slurmdb_qos->name);
FREE_NULL_BITMAP(slurmdb_qos->preempt_bitstr);
- if (slurmdb_qos->preempt_list)
+ if(slurmdb_qos->preempt_list)
list_destroy(slurmdb_qos->preempt_list);
destroy_assoc_mgr_qos_usage(slurmdb_qos->usage);
xfree(slurmdb_qos);
@@ -413,7 +413,7 @@ extern void slurmdb_destroy_reservation_rec(void *object)
{
slurmdb_reservation_rec_t *slurmdb_resv =
(slurmdb_reservation_rec_t *)object;
- if (slurmdb_resv) {
+ if(slurmdb_resv) {
xfree(slurmdb_resv->assocs);
xfree(slurmdb_resv->cluster);
xfree(slurmdb_resv->name);
@@ -437,7 +437,7 @@ extern void slurmdb_destroy_step_rec(void *object)
extern void slurmdb_destroy_txn_rec(void *object)
{
slurmdb_txn_rec_t *slurmdb_txn = (slurmdb_txn_rec_t *)object;
- if (slurmdb_txn) {
+ if(slurmdb_txn) {
xfree(slurmdb_txn->accts);
xfree(slurmdb_txn->actor_name);
xfree(slurmdb_txn->clusters);
@@ -452,8 +452,8 @@ extern void slurmdb_destroy_wckey_rec(void *object)
{
slurmdb_wckey_rec_t *wckey = (slurmdb_wckey_rec_t *)object;
- if (wckey) {
- if (wckey->accounting_list)
+ if(wckey) {
+ if(wckey->accounting_list)
list_destroy(wckey->accounting_list);
xfree(wckey->cluster);
xfree(wckey->name);
@@ -466,7 +466,7 @@ extern void slurmdb_destroy_archive_rec(void *object)
{
slurmdb_archive_rec_t *arch_rec = (slurmdb_archive_rec_t *)object;
- if (arch_rec) {
+ if(arch_rec) {
xfree(arch_rec->archive_file);
xfree(arch_rec->insert);
xfree(arch_rec);
@@ -477,7 +477,7 @@ extern void slurmdb_destroy_report_assoc_rec(void *object)
{
slurmdb_report_assoc_rec_t *slurmdb_report_assoc =
(slurmdb_report_assoc_rec_t *)object;
- if (slurmdb_report_assoc) {
+ if(slurmdb_report_assoc) {
xfree(slurmdb_report_assoc->acct);
xfree(slurmdb_report_assoc->cluster);
xfree(slurmdb_report_assoc->parent_acct);
@@ -490,11 +490,11 @@ extern void slurmdb_destroy_report_user_rec(void *object)
{
slurmdb_report_user_rec_t *slurmdb_report_user =
(slurmdb_report_user_rec_t *)object;
- if (slurmdb_report_user) {
+ if(slurmdb_report_user) {
xfree(slurmdb_report_user->acct);
- if (slurmdb_report_user->acct_list)
+ if(slurmdb_report_user->acct_list)
list_destroy(slurmdb_report_user->acct_list);
- if (slurmdb_report_user->assoc_list)
+ if(slurmdb_report_user->assoc_list)
list_destroy(slurmdb_report_user->assoc_list);
xfree(slurmdb_report_user->name);
xfree(slurmdb_report_user);
@@ -505,11 +505,11 @@ extern void slurmdb_destroy_report_cluster_rec(void *object)
{
slurmdb_report_cluster_rec_t *slurmdb_report_cluster =
(slurmdb_report_cluster_rec_t *)object;
- if (slurmdb_report_cluster) {
- if (slurmdb_report_cluster->assoc_list)
+ if(slurmdb_report_cluster) {
+ if(slurmdb_report_cluster->assoc_list)
list_destroy(slurmdb_report_cluster->assoc_list);
xfree(slurmdb_report_cluster->name);
- if (slurmdb_report_cluster->user_list)
+ if(slurmdb_report_cluster->user_list)
list_destroy(slurmdb_report_cluster->user_list);
xfree(slurmdb_report_cluster);
}
@@ -519,11 +519,11 @@ extern void slurmdb_destroy_user_cond(void *object)
{
slurmdb_user_cond_t *slurmdb_user = (slurmdb_user_cond_t *)object;
- if (slurmdb_user) {
+ if(slurmdb_user) {
slurmdb_destroy_association_cond(slurmdb_user->assoc_cond);
- if (slurmdb_user->def_acct_list)
+ if(slurmdb_user->def_acct_list)
list_destroy(slurmdb_user->def_acct_list);
- if (slurmdb_user->def_wckey_list)
+ if(slurmdb_user->def_wckey_list)
list_destroy(slurmdb_user->def_wckey_list);
xfree(slurmdb_user);
}
@@ -534,11 +534,11 @@ extern void slurmdb_destroy_account_cond(void *object)
slurmdb_account_cond_t *slurmdb_account =
(slurmdb_account_cond_t *)object;
- if (slurmdb_account) {
+ if(slurmdb_account) {
slurmdb_destroy_association_cond(slurmdb_account->assoc_cond);
- if (slurmdb_account->description_list)
+ if(slurmdb_account->description_list)
list_destroy(slurmdb_account->description_list);
- if (slurmdb_account->organization_list)
+ if(slurmdb_account->organization_list)
list_destroy(slurmdb_account->organization_list);
xfree(slurmdb_account);
}
@@ -549,8 +549,8 @@ extern void slurmdb_destroy_cluster_cond(void *object)
slurmdb_cluster_cond_t *slurmdb_cluster =
(slurmdb_cluster_cond_t *)object;
- if (slurmdb_cluster) {
- if (slurmdb_cluster->cluster_list)
+ if(slurmdb_cluster) {
+ if(slurmdb_cluster->cluster_list)
list_destroy(slurmdb_cluster->cluster_list);
xfree(slurmdb_cluster);
}
@@ -561,61 +561,61 @@ extern void slurmdb_destroy_association_cond(void *object)
slurmdb_association_cond_t *slurmdb_association =
(slurmdb_association_cond_t *)object;
- if (slurmdb_association) {
- if (slurmdb_association->acct_list)
+ if(slurmdb_association) {
+ if(slurmdb_association->acct_list)
list_destroy(slurmdb_association->acct_list);
- if (slurmdb_association->cluster_list)
+ if(slurmdb_association->cluster_list)
list_destroy(slurmdb_association->cluster_list);
- if (slurmdb_association->def_qos_id_list)
+ if(slurmdb_association->def_qos_id_list)
list_destroy(slurmdb_association->def_qos_id_list);
- if (slurmdb_association->fairshare_list)
+ if(slurmdb_association->fairshare_list)
list_destroy(slurmdb_association->fairshare_list);
- if (slurmdb_association->grp_cpu_mins_list)
+ if(slurmdb_association->grp_cpu_mins_list)
list_destroy(slurmdb_association->grp_cpu_mins_list);
- if (slurmdb_association->grp_cpu_run_mins_list)
+ if(slurmdb_association->grp_cpu_run_mins_list)
list_destroy(slurmdb_association->
grp_cpu_run_mins_list);
- if (slurmdb_association->grp_cpus_list)
+ if(slurmdb_association->grp_cpus_list)
list_destroy(slurmdb_association->grp_cpus_list);
- if (slurmdb_association->grp_jobs_list)
+ if(slurmdb_association->grp_jobs_list)
list_destroy(slurmdb_association->grp_jobs_list);
- if (slurmdb_association->grp_nodes_list)
+ if(slurmdb_association->grp_nodes_list)
list_destroy(slurmdb_association->grp_nodes_list);
- if (slurmdb_association->grp_submit_jobs_list)
+ if(slurmdb_association->grp_submit_jobs_list)
list_destroy(slurmdb_association->grp_submit_jobs_list);
- if (slurmdb_association->grp_wall_list)
+ if(slurmdb_association->grp_wall_list)
list_destroy(slurmdb_association->grp_wall_list);
- if (slurmdb_association->id_list)
+ if(slurmdb_association->id_list)
list_destroy(slurmdb_association->id_list);
- if (slurmdb_association->max_cpu_mins_pj_list)
+ if(slurmdb_association->max_cpu_mins_pj_list)
list_destroy(slurmdb_association->max_cpu_mins_pj_list);
- if (slurmdb_association->max_cpu_run_mins_list)
+ if(slurmdb_association->max_cpu_run_mins_list)
list_destroy(slurmdb_association->
max_cpu_run_mins_list);
- if (slurmdb_association->max_cpus_pj_list)
+ if(slurmdb_association->max_cpus_pj_list)
list_destroy(slurmdb_association->max_cpus_pj_list);
- if (slurmdb_association->max_jobs_list)
+ if(slurmdb_association->max_jobs_list)
list_destroy(slurmdb_association->max_jobs_list);
- if (slurmdb_association->max_nodes_pj_list)
+ if(slurmdb_association->max_nodes_pj_list)
list_destroy(slurmdb_association->max_nodes_pj_list);
- if (slurmdb_association->max_submit_jobs_list)
+ if(slurmdb_association->max_submit_jobs_list)
list_destroy(slurmdb_association->max_submit_jobs_list);
- if (slurmdb_association->max_wall_pj_list)
+ if(slurmdb_association->max_wall_pj_list)
list_destroy(slurmdb_association->max_wall_pj_list);
- if (slurmdb_association->partition_list)
+ if(slurmdb_association->partition_list)
list_destroy(slurmdb_association->partition_list);
- if (slurmdb_association->parent_acct_list)
+ if(slurmdb_association->parent_acct_list)
list_destroy(slurmdb_association->parent_acct_list);
- if (slurmdb_association->qos_list)
+ if(slurmdb_association->qos_list)
list_destroy(slurmdb_association->qos_list);
- if (slurmdb_association->user_list)
+ if(slurmdb_association->user_list)
list_destroy(slurmdb_association->user_list);
xfree(slurmdb_association);
}
@@ -626,16 +626,16 @@ extern void slurmdb_destroy_event_cond(void *object)
slurmdb_event_cond_t *slurmdb_event =
(slurmdb_event_cond_t *)object;
- if (slurmdb_event) {
- if (slurmdb_event->cluster_list)
+ if(slurmdb_event) {
+ if(slurmdb_event->cluster_list)
list_destroy(slurmdb_event->cluster_list);
- if (slurmdb_event->node_list)
+ if(slurmdb_event->node_list)
list_destroy(slurmdb_event->node_list);
- if (slurmdb_event->reason_list)
+ if(slurmdb_event->reason_list)
list_destroy(slurmdb_event->reason_list);
- if (slurmdb_event->reason_uid_list)
+ if(slurmdb_event->reason_uid_list)
list_destroy(slurmdb_event->reason_uid_list);
- if (slurmdb_event->state_list)
+ if(slurmdb_event->state_list)
list_destroy(slurmdb_event->state_list);
xfree(slurmdb_event);
}
@@ -646,31 +646,31 @@ extern void slurmdb_destroy_job_cond(void *object)
slurmdb_job_cond_t *job_cond =
(slurmdb_job_cond_t *)object;
- if (job_cond) {
- if (job_cond->acct_list)
+ if(job_cond) {
+ if(job_cond->acct_list)
list_destroy(job_cond->acct_list);
- if (job_cond->associd_list)
+ if(job_cond->associd_list)
list_destroy(job_cond->associd_list);
- if (job_cond->cluster_list)
+ if(job_cond->cluster_list)
list_destroy(job_cond->cluster_list);
- if (job_cond->groupid_list)
+ if(job_cond->groupid_list)
list_destroy(job_cond->groupid_list);
- if (job_cond->partition_list)
+ if(job_cond->partition_list)
list_destroy(job_cond->partition_list);
- if (job_cond->qos_list)
+ if(job_cond->qos_list)
list_destroy(job_cond->qos_list);
- if (job_cond->resv_list)
+ if(job_cond->resv_list)
list_destroy(job_cond->resv_list);
- if (job_cond->resvid_list)
+ if(job_cond->resvid_list)
list_destroy(job_cond->resvid_list);
- if (job_cond->step_list)
+ if(job_cond->step_list)
list_destroy(job_cond->step_list);
- if (job_cond->state_list)
+ if(job_cond->state_list)
list_destroy(job_cond->state_list);
xfree(job_cond->used_nodes);
- if (job_cond->userid_list)
+ if(job_cond->userid_list)
list_destroy(job_cond->userid_list);
- if (job_cond->wckey_list)
+ if(job_cond->wckey_list)
list_destroy(job_cond->wckey_list);
xfree(job_cond);
}
@@ -679,10 +679,10 @@ extern void slurmdb_destroy_job_cond(void *object)
extern void slurmdb_destroy_qos_cond(void *object)
{
slurmdb_qos_cond_t *slurmdb_qos = (slurmdb_qos_cond_t *)object;
- if (slurmdb_qos) {
- if (slurmdb_qos->id_list)
+ if(slurmdb_qos) {
+ if(slurmdb_qos->id_list)
list_destroy(slurmdb_qos->id_list);
- if (slurmdb_qos->name_list)
+ if(slurmdb_qos->name_list)
list_destroy(slurmdb_qos->name_list);
xfree(slurmdb_qos);
}
@@ -692,12 +692,12 @@ extern void slurmdb_destroy_reservation_cond(void *object)
{
slurmdb_reservation_cond_t *slurmdb_resv =
(slurmdb_reservation_cond_t *)object;
- if (slurmdb_resv) {
- if (slurmdb_resv->cluster_list)
+ if(slurmdb_resv) {
+ if(slurmdb_resv->cluster_list)
list_destroy(slurmdb_resv->cluster_list);
- if (slurmdb_resv->id_list)
+ if(slurmdb_resv->id_list)
list_destroy(slurmdb_resv->id_list);
- if (slurmdb_resv->name_list)
+ if(slurmdb_resv->name_list)
list_destroy(slurmdb_resv->name_list);
xfree(slurmdb_resv->nodes);
xfree(slurmdb_resv);
@@ -707,22 +707,22 @@ extern void slurmdb_destroy_reservation_cond(void *object)
extern void slurmdb_destroy_txn_cond(void *object)
{
slurmdb_txn_cond_t *slurmdb_txn = (slurmdb_txn_cond_t *)object;
- if (slurmdb_txn) {
- if (slurmdb_txn->acct_list)
+ if(slurmdb_txn) {
+ if(slurmdb_txn->acct_list)
list_destroy(slurmdb_txn->acct_list);
- if (slurmdb_txn->action_list)
+ if(slurmdb_txn->action_list)
list_destroy(slurmdb_txn->action_list);
- if (slurmdb_txn->actor_list)
+ if(slurmdb_txn->actor_list)
list_destroy(slurmdb_txn->actor_list);
- if (slurmdb_txn->cluster_list)
+ if(slurmdb_txn->cluster_list)
list_destroy(slurmdb_txn->cluster_list);
- if (slurmdb_txn->id_list)
+ if(slurmdb_txn->id_list)
list_destroy(slurmdb_txn->id_list);
- if (slurmdb_txn->info_list)
+ if(slurmdb_txn->info_list)
list_destroy(slurmdb_txn->info_list);
- if (slurmdb_txn->name_list)
+ if(slurmdb_txn->name_list)
list_destroy(slurmdb_txn->name_list);
- if (slurmdb_txn->user_list)
+ if(slurmdb_txn->user_list)
list_destroy(slurmdb_txn->user_list);
xfree(slurmdb_txn);
}
@@ -732,14 +732,14 @@ extern void slurmdb_destroy_wckey_cond(void *object)
{
slurmdb_wckey_cond_t *wckey = (slurmdb_wckey_cond_t *)object;
- if (wckey) {
- if (wckey->cluster_list)
+ if(wckey) {
+ if(wckey->cluster_list)
list_destroy(wckey->cluster_list);
- if (wckey->id_list)
+ if(wckey->id_list)
list_destroy(wckey->id_list);
- if (wckey->name_list)
+ if(wckey->name_list)
list_destroy(wckey->name_list);
- if (wckey->user_list)
+ if(wckey->user_list)
list_destroy(wckey->user_list);
xfree(wckey);
}
@@ -749,7 +749,7 @@ extern void slurmdb_destroy_archive_cond(void *object)
{
slurmdb_archive_cond_t *arch_cond = (slurmdb_archive_cond_t *)object;
- if (arch_cond) {
+ if(arch_cond) {
xfree(arch_cond->archive_dir);
xfree(arch_cond->archive_script);
slurmdb_destroy_job_cond(arch_cond->job_cond);
@@ -763,8 +763,8 @@ extern void slurmdb_destroy_update_object(void *object)
slurmdb_update_object_t *slurmdb_update =
(slurmdb_update_object_t *) object;
- if (slurmdb_update) {
- if (slurmdb_update->objects)
+ if(slurmdb_update) {
+ if(slurmdb_update->objects)
list_destroy(slurmdb_update->objects);
xfree(slurmdb_update);
@@ -776,7 +776,7 @@ extern void slurmdb_destroy_used_limits(void *object)
slurmdb_used_limits_t *slurmdb_used_limits =
(slurmdb_used_limits_t *)object;
- if (slurmdb_used_limits) {
+ if(slurmdb_used_limits) {
xfree(slurmdb_used_limits);
}
}
@@ -791,7 +791,7 @@ extern void slurmdb_destroy_print_tree(void *object)
slurmdb_print_tree_t *slurmdb_print_tree =
(slurmdb_print_tree_t *)object;
- if (slurmdb_print_tree) {
+ if(slurmdb_print_tree) {
xfree(slurmdb_print_tree->name);
xfree(slurmdb_print_tree->print_name);
xfree(slurmdb_print_tree->spaces);
@@ -806,8 +806,8 @@ extern void slurmdb_destroy_hierarchical_rec(void *object)
*/
slurmdb_hierarchical_rec_t *slurmdb_hierarchical_rec =
(slurmdb_hierarchical_rec_t *)object;
- if (slurmdb_hierarchical_rec) {
- if (slurmdb_hierarchical_rec->childern) {
+ if(slurmdb_hierarchical_rec) {
+ if(slurmdb_hierarchical_rec->childern) {
list_destroy(slurmdb_hierarchical_rec->childern);
}
xfree(slurmdb_hierarchical_rec);
@@ -826,8 +826,8 @@ extern void slurmdb_destroy_report_job_grouping(void *object)
{
slurmdb_report_job_grouping_t *job_grouping =
(slurmdb_report_job_grouping_t *)object;
- if (job_grouping) {
- if (job_grouping->jobs)
+ if(job_grouping) {
+ if(job_grouping->jobs)
list_destroy(job_grouping->jobs);
xfree(job_grouping);
}
@@ -837,9 +837,9 @@ extern void slurmdb_destroy_report_acct_grouping(void *object)
{
slurmdb_report_acct_grouping_t *acct_grouping =
(slurmdb_report_acct_grouping_t *)object;
- if (acct_grouping) {
+ if(acct_grouping) {
xfree(acct_grouping->acct);
- if (acct_grouping->groups)
+ if(acct_grouping->groups)
list_destroy(acct_grouping->groups);
xfree(acct_grouping);
}
@@ -849,9 +849,9 @@ extern void slurmdb_destroy_report_cluster_grouping(void *object)
{
slurmdb_report_cluster_grouping_t *cluster_grouping =
(slurmdb_report_cluster_grouping_t *)object;
- if (cluster_grouping) {
+ if(cluster_grouping) {
xfree(cluster_grouping->cluster);
- if (cluster_grouping->acct_list)
+ if(cluster_grouping->acct_list)
list_destroy(cluster_grouping->acct_list);
xfree(cluster_grouping);
}
@@ -867,9 +867,9 @@ extern uint32_t slurmdb_setup_cluster_flags()
{
static uint32_t cluster_flags = NO_VAL;
- if (working_cluster_rec)
+ if(working_cluster_rec)
return working_cluster_rec->flags;
- else if (cluster_flags != NO_VAL)
+ else if(cluster_flags != NO_VAL)
return cluster_flags;
cluster_flags = 0;
@@ -951,59 +951,59 @@ extern char *slurmdb_cluster_flags_2_str(uint32_t flags_in)
xstrcat(cluster_flags, "Bluegene");
if (flags_in & CLUSTER_FLAG_BGL) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "BGL");
}
if (flags_in & CLUSTER_FLAG_BGP) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "BGP");
}
if (flags_in & CLUSTER_FLAG_BGQ) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "BGQ");
}
if (flags_in & CLUSTER_FLAG_SC) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "SunConstellation");
}
if (flags_in & CLUSTER_FLAG_XCPU) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "XCPU");
}
if (flags_in & CLUSTER_FLAG_AIX) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "AIX");
}
if (flags_in & CLUSTER_FLAG_MULTSD) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "MultipleSlurmd");
}
if (flags_in & CLUSTER_FLAG_CRAYXT) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "CrayXT");
}
if (flags_in & CLUSTER_FLAG_FE) {
- if (cluster_flags)
+ if(cluster_flags)
xstrcat(cluster_flags, ",");
xstrcat(cluster_flags, "FrontEnd");
}
- if (!cluster_flags)
+ if(!cluster_flags)
cluster_flags = xstrdup("None");
return cluster_flags;
@@ -1020,7 +1020,7 @@ extern List slurmdb_get_info_cluster(char *cluster_names)
int err = 0;
bool all_clusters = 0;
- if (cluster_names && !strcmp(cluster_names, "all"))
+ if(cluster_names && !strcmp(cluster_names, "all"))
all_clusters = 1;
cluster_name = slurm_get_cluster_name();
@@ -1028,20 +1028,20 @@ extern List slurmdb_get_info_cluster(char *cluster_names)
xfree(cluster_name);
slurmdb_init_cluster_cond(&cluster_cond);
- if (cluster_names && !all_clusters) {
+ if(cluster_names && !all_clusters) {
cluster_cond.cluster_list = list_create(slurm_destroy_char);
slurm_addto_char_list(cluster_cond.cluster_list, cluster_names);
}
- if (!(temp_list = acct_storage_g_get_clusters(
+ if(!(temp_list = acct_storage_g_get_clusters(
db_conn, getuid(), &cluster_cond))) {
error("Problem talking to database");
goto end_it;
}
itr = list_iterator_create(temp_list);
- if (!cluster_names || all_clusters) {
+ if(!cluster_names || all_clusters) {
while((cluster_rec = list_next(itr))) {
- if (_setup_cluster_rec(cluster_rec) != SLURM_SUCCESS) {
+ if(_setup_cluster_rec(cluster_rec) != SLURM_SUCCESS) {
err = 1;
list_delete_item(itr);
}
@@ -1050,16 +1050,16 @@ extern List slurmdb_get_info_cluster(char *cluster_names)
itr2 = list_iterator_create(cluster_cond.cluster_list);
while((cluster_name = list_next(itr2))) {
while((cluster_rec = list_next(itr)))
- if (!strcmp(cluster_name, cluster_rec->name))
+ if(!strcmp(cluster_name, cluster_rec->name))
break;
- if (!cluster_rec) {
+ if(!cluster_rec) {
error("No cluster '%s' known by database.",
cluster_name);
err = 1;
goto next;
}
- if (_setup_cluster_rec(cluster_rec) != SLURM_SUCCESS) {
+ if(_setup_cluster_rec(cluster_rec) != SLURM_SUCCESS) {
err = 1;
list_delete_item(itr);
}
@@ -1071,11 +1071,11 @@ extern List slurmdb_get_info_cluster(char *cluster_names)
list_iterator_destroy(itr);
end_it:
- if (cluster_cond.cluster_list)
+ if(cluster_cond.cluster_list)
list_destroy(cluster_cond.cluster_list);
acct_storage_g_close_connection(&db_conn);
- if (temp_list && !list_count(temp_list)) {
+ if(temp_list && !list_count(temp_list)) {
list_destroy(temp_list);
temp_list = NULL;
}
@@ -1085,7 +1085,7 @@ end_it:
extern void slurmdb_init_association_rec(slurmdb_association_rec_t *assoc)
{
- if (!assoc)
+ if(!assoc)
return;
memset(assoc, 0, sizeof(slurmdb_association_rec_t));
@@ -1120,7 +1120,7 @@ extern void slurmdb_init_association_rec(slurmdb_association_rec_t *assoc)
extern void slurmdb_init_cluster_rec(slurmdb_cluster_rec_t *cluster)
{
- if (!cluster)
+ if(!cluster)
return;
memset(cluster, 0, sizeof(slurmdb_cluster_rec_t));
@@ -1129,7 +1129,7 @@ extern void slurmdb_init_cluster_rec(slurmdb_cluster_rec_t *cluster)
extern void slurmdb_init_qos_rec(slurmdb_qos_rec_t *qos)
{
- if (!qos)
+ if(!qos)
return;
memset(qos, 0, sizeof(slurmdb_qos_rec_t));
@@ -1158,7 +1158,7 @@ extern void slurmdb_init_qos_rec(slurmdb_qos_rec_t *qos)
extern void slurmdb_init_cluster_cond(slurmdb_cluster_cond_t *cluster)
{
- if (!cluster)
+ if(!cluster)
return;
memset(cluster, 0, sizeof(slurmdb_cluster_cond_t));
@@ -1170,21 +1170,21 @@ extern char *slurmdb_qos_str(List qos_list, uint32_t level)
ListIterator itr = NULL;
slurmdb_qos_rec_t *qos = NULL;
- if (!qos_list) {
+ if(!qos_list) {
error("We need a qos list to translate");
return NULL;
- } else if (!level) {
+ } else if(!level) {
debug2("no level");
return "";
}
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
- if (level == qos->id)
+ if(level == qos->id)
break;
}
list_iterator_destroy(itr);
- if (qos)
+ if(qos)
return qos->name;
else
return NULL;
@@ -1196,26 +1196,26 @@ extern uint32_t str_2_slurmdb_qos(List qos_list, char *level)
slurmdb_qos_rec_t *qos = NULL;
char *working_level = NULL;
- if (!qos_list) {
+ if(!qos_list) {
error("We need a qos list to translate");
return NO_VAL;
- } else if (!level) {
+ } else if(!level) {
debug2("no level");
return 0;
}
- if (level[0] == '+' || level[0] == '-')
+ if(level[0] == '+' || level[0] == '-')
working_level = level+1;
else
working_level = level;
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
- if (!strncasecmp(working_level, qos->name,
+ if(!strncasecmp(working_level, qos->name,
strlen(working_level)))
break;
}
list_iterator_destroy(itr);
- if (qos)
+ if(qos)
return qos->id;
else
return NO_VAL;
@@ -1245,13 +1245,13 @@ extern char *slurmdb_admin_level_str(slurmdb_admin_level_t level)
extern slurmdb_admin_level_t str_2_slurmdb_admin_level(char *level)
{
- if (!level) {
+ if(!level) {
return SLURMDB_ADMIN_NOTSET;
- } else if (!strncasecmp(level, "None", 1)) {
+ } else if(!strncasecmp(level, "None", 1)) {
return SLURMDB_ADMIN_NONE;
- } else if (!strncasecmp(level, "Operator", 1)) {
+ } else if(!strncasecmp(level, "Operator", 1)) {
return SLURMDB_ADMIN_OPERATOR;
- } else if (!strncasecmp(level, "SuperUser", 1)
+ } else if(!strncasecmp(level, "SuperUser", 1)
|| !strncasecmp(level, "Admin", 1)) {
return SLURMDB_ADMIN_SUPER_USER;
} else {
@@ -1304,7 +1304,7 @@ extern List slurmdb_get_acct_hierarchical_rec_list(List assoc_list)
will look for it in the list. If it isn't there we
will just add it to the parent and call it good
*/
- if (!assoc->parent_id) {
+ if(!assoc->parent_id) {
arch_rec->sort_name = assoc->cluster;
list_append(arch_rec_list, arch_rec);
@@ -1313,15 +1313,15 @@ extern List slurmdb_get_acct_hierarchical_rec_list(List assoc_list)
continue;
}
- if (assoc->user)
+ if(assoc->user)
arch_rec->sort_name = assoc->user;
else
arch_rec->sort_name = assoc->acct;
- if (last_parent && assoc->parent_id == last_parent->assoc->id
+ if(last_parent && assoc->parent_id == last_parent->assoc->id
&& !strcmp(assoc->cluster, last_parent->assoc->cluster)) {
par_arch_rec = last_parent;
- } else if (last_acct_parent
+ } else if(last_acct_parent
&& (assoc->parent_id == last_acct_parent->assoc->id)
&& !strcmp(assoc->cluster,
last_acct_parent->assoc->cluster)) {
@@ -1329,10 +1329,10 @@ extern List slurmdb_get_acct_hierarchical_rec_list(List assoc_list)
} else {
list_iterator_reset(itr2);
while((par_arch_rec = list_next(itr2))) {
- if (assoc->parent_id == par_arch_rec->assoc->id
+ if(assoc->parent_id == par_arch_rec->assoc->id
&& !strcmp(assoc->cluster,
par_arch_rec->assoc->cluster)) {
- if (assoc->user)
+ if(assoc->user)
last_parent = par_arch_rec;
else
last_parent
@@ -1343,7 +1343,7 @@ extern List slurmdb_get_acct_hierarchical_rec_list(List assoc_list)
}
}
- if (!par_arch_rec) {
+ if(!par_arch_rec) {
list_append(arch_rec_list, arch_rec);
last_parent = last_acct_parent = arch_rec;
} else
@@ -1368,37 +1368,37 @@ extern char *slurmdb_tree_name_get(char *name, char *parent, List tree_list)
slurmdb_print_tree_t *slurmdb_print_tree = NULL;
slurmdb_print_tree_t *par_slurmdb_print_tree = NULL;
- if (!tree_list)
+ if(!tree_list)
return NULL;
itr = list_iterator_create(tree_list);
while((slurmdb_print_tree = list_next(itr))) {
/* we don't care about users in this list. They are
only there so we don't leak memory */
- if (slurmdb_print_tree->user)
+ if(slurmdb_print_tree->user)
continue;
- if (!strcmp(name, slurmdb_print_tree->name))
+ if(!strcmp(name, slurmdb_print_tree->name))
break;
- else if (parent && !strcmp(parent, slurmdb_print_tree->name))
+ else if(parent && !strcmp(parent, slurmdb_print_tree->name))
par_slurmdb_print_tree = slurmdb_print_tree;
}
list_iterator_destroy(itr);
- if (parent && slurmdb_print_tree)
+ if(parent && slurmdb_print_tree)
return slurmdb_print_tree->print_name;
slurmdb_print_tree = xmalloc(sizeof(slurmdb_print_tree_t));
slurmdb_print_tree->name = xstrdup(name);
- if (par_slurmdb_print_tree)
+ if(par_slurmdb_print_tree)
slurmdb_print_tree->spaces =
xstrdup_printf(" %s", par_slurmdb_print_tree->spaces);
else
slurmdb_print_tree->spaces = xstrdup("");
/* user account */
- if (name[0] == '|') {
+ if(name[0] == '|') {
slurmdb_print_tree->print_name = xstrdup_printf(
"%s%s", slurmdb_print_tree->spaces, parent);
slurmdb_print_tree->user = 1;
@@ -1421,21 +1421,21 @@ extern int set_qos_bitstr_from_list(bitstr_t *valid_qos, List qos_list)
xassert(valid_qos);
- if (!qos_list)
+ if(!qos_list)
return SLURM_ERROR;
itr = list_iterator_create(qos_list);
while((temp_char = list_next(itr))) {
- if (temp_char[0] == '-') {
+ if(temp_char[0] == '-') {
temp_char++;
my_function = bit_clear;
- } else if (temp_char[0] == '+') {
+ } else if(temp_char[0] == '+') {
temp_char++;
my_function = bit_set;
} else
my_function = bit_set;
bit = atoi(temp_char);
- if (bit >= bit_size(valid_qos)) {
+ if(bit >= bit_size(valid_qos)) {
rc = SLURM_ERROR;
break;
}
@@ -1454,22 +1454,22 @@ extern char *get_qos_complete_str_bitstr(List qos_list, bitstr_t *valid_qos)
ListIterator itr = NULL;
int i = 0;
- if (!qos_list || !list_count(qos_list)
+ if(!qos_list || !list_count(qos_list)
|| !valid_qos || (bit_ffs(valid_qos) == -1))
return xstrdup("");
temp_list = list_create(NULL);
for(i=0; i<bit_size(valid_qos); i++) {
- if (!bit_test(valid_qos, i))
+ if(!bit_test(valid_qos, i))
continue;
- if ((temp_char = slurmdb_qos_str(qos_list, i)))
+ if((temp_char = slurmdb_qos_str(qos_list, i)))
list_append(temp_list, temp_char);
}
list_sort(temp_list, (ListCmpF)slurm_sort_char_list_asc);
itr = list_iterator_create(temp_list);
while((temp_char = list_next(itr))) {
- if (print_this)
+ if(print_this)
xstrfmtcat(print_this, ",%s", temp_char);
else
print_this = xstrdup(temp_char);
@@ -1477,7 +1477,7 @@ extern char *get_qos_complete_str_bitstr(List qos_list, bitstr_t *valid_qos)
list_iterator_destroy(itr);
list_destroy(temp_list);
- if (!print_this)
+ if(!print_this)
return xstrdup("");
return print_this;
@@ -1491,7 +1491,7 @@ extern char *get_qos_complete_str(List qos_list, List num_qos_list)
ListIterator itr = NULL;
int option = 0;
- if (!qos_list || !list_count(qos_list)
+ if(!qos_list || !list_count(qos_list)
|| !num_qos_list || !list_count(num_qos_list))
return xstrdup("");
@@ -1500,13 +1500,13 @@ extern char *get_qos_complete_str(List qos_list, List num_qos_list)
itr = list_iterator_create(num_qos_list);
while((temp_char = list_next(itr))) {
option = 0;
- if (temp_char[0] == '+' || temp_char[0] == '-') {
+ if(temp_char[0] == '+' || temp_char[0] == '-') {
option = temp_char[0];
temp_char++;
}
temp_char = slurmdb_qos_str(qos_list, atoi(temp_char));
- if (temp_char) {
- if (option)
+ if(temp_char) {
+ if(option)
list_append(temp_list, xstrdup_printf(
"%c%s", option, temp_char));
else
@@ -1517,7 +1517,7 @@ extern char *get_qos_complete_str(List qos_list, List num_qos_list)
list_sort(temp_list, (ListCmpF)slurm_sort_char_list_asc);
itr = list_iterator_create(temp_list);
while((temp_char = list_next(itr))) {
- if (print_this)
+ if(print_this)
xstrfmtcat(print_this, ",%s", temp_char);
else
print_this = xstrdup(temp_char);
@@ -1525,7 +1525,7 @@ extern char *get_qos_complete_str(List qos_list, List num_qos_list)
list_iterator_destroy(itr);
list_destroy(temp_list);
- if (!print_this)
+ if(!print_this)
return xstrdup("");
return print_this;
@@ -1541,25 +1541,25 @@ extern char *get_classification_str(uint16_t class)
return NULL;
break;
case SLURMDB_CLASS_CAPACITY:
- if (classified)
+ if(classified)
return "*Capacity";
else
return "Capacity";
break;
case SLURMDB_CLASS_CAPABILITY:
- if (classified)
+ if(classified)
return "*Capability";
else
return "Capability";
break;
case SLURMDB_CLASS_CAPAPACITY:
- if (classified)
+ if(classified)
return "*Capapacity";
else
return "Capapacity";
break;
default:
- if (classified)
+ if(classified)
return "*Unknown";
else
return "Unknown";
@@ -1570,19 +1570,19 @@ extern char *get_classification_str(uint16_t class)
extern uint16_t str_2_classification(char *class)
{
uint16_t type = 0;
- if (!class)
+ if(!class)
return type;
- if (slurm_strcasestr(class, "capac"))
+ if(slurm_strcasestr(class, "capac"))
type = SLURMDB_CLASS_CAPACITY;
- else if (slurm_strcasestr(class, "capab"))
+ else if(slurm_strcasestr(class, "capab"))
type = SLURMDB_CLASS_CAPABILITY;
- else if (slurm_strcasestr(class, "capap"))
+ else if(slurm_strcasestr(class, "capap"))
type = SLURMDB_CLASS_CAPAPACITY;
- if (slurm_strcasestr(class, "*"))
+ if(slurm_strcasestr(class, "*"))
type |= SLURMDB_CLASSIFIED_FLAG;
- else if (slurm_strcasestr(class, "class"))
+ else if(slurm_strcasestr(class, "class"))
type |= SLURMDB_CLASSIFIED_FLAG;
return type;
@@ -1618,16 +1618,16 @@ extern uint16_t str_2_slurmdb_problem(char *problem)
{
uint16_t type = 0;
- if (!problem)
+ if(!problem)
return type;
- if (slurm_strcasestr(problem, "account no associations"))
+ if(slurm_strcasestr(problem, "account no associations"))
type = SLURMDB_PROBLEM_USER_NO_ASSOC;
- else if (slurm_strcasestr(problem, "account no users"))
+ else if(slurm_strcasestr(problem, "account no users"))
type = SLURMDB_PROBLEM_ACCT_NO_USERS;
- else if (slurm_strcasestr(problem, "user no associations"))
+ else if(slurm_strcasestr(problem, "user no associations"))
type = SLURMDB_PROBLEM_USER_NO_ASSOC;
- else if (slurm_strcasestr(problem, "user no uid"))
+ else if(slurm_strcasestr(problem, "user no uid"))
type = SLURMDB_PROBLEM_USER_NO_UID;
return type;
@@ -1642,104 +1642,104 @@ extern void log_assoc_rec(slurmdb_association_rec_t *assoc_ptr,
debug2(" acct : %s", assoc_ptr->acct);
debug2(" cluster : %s", assoc_ptr->cluster);
- if (assoc_ptr->shares_raw == INFINITE)
+ if(assoc_ptr->shares_raw == INFINITE)
debug2(" RawShares : NONE");
- else if (assoc_ptr->shares_raw != NO_VAL)
+ else if(assoc_ptr->shares_raw != NO_VAL)
debug2(" RawShares : %u", assoc_ptr->shares_raw);
- if (assoc_ptr->def_qos_id)
+ if(assoc_ptr->def_qos_id)
debug2(" Default QOS : %s",
slurmdb_qos_str(qos_list, assoc_ptr->def_qos_id));
else
debug2(" Default QOS : NONE");
- if (assoc_ptr->grp_cpu_mins == INFINITE)
+ if(assoc_ptr->grp_cpu_mins == INFINITE)
debug2(" GrpCPUMins : NONE");
- else if (assoc_ptr->grp_cpu_mins != NO_VAL)
+ else if(assoc_ptr->grp_cpu_mins != NO_VAL)
debug2(" GrpCPUMins : %llu", assoc_ptr->grp_cpu_mins);
- if (assoc_ptr->grp_cpu_run_mins == INFINITE)
+ if(assoc_ptr->grp_cpu_run_mins == INFINITE)
debug2(" GrpCPURunMins : NONE");
- else if (assoc_ptr->grp_cpu_mins != NO_VAL)
+ else if(assoc_ptr->grp_cpu_mins != NO_VAL)
debug2(" GrpCPURunMins : %llu",
assoc_ptr->grp_cpu_run_mins);
- if (assoc_ptr->grp_cpus == INFINITE)
+ if(assoc_ptr->grp_cpus == INFINITE)
debug2(" GrpCPUs : NONE");
- else if (assoc_ptr->grp_cpus != NO_VAL)
+ else if(assoc_ptr->grp_cpus != NO_VAL)
debug2(" GrpCPUs : %u", assoc_ptr->grp_cpus);
- if (assoc_ptr->grp_jobs == INFINITE)
+ if(assoc_ptr->grp_jobs == INFINITE)
debug2(" GrpJobs : NONE");
- else if (assoc_ptr->grp_jobs != NO_VAL)
+ else if(assoc_ptr->grp_jobs != NO_VAL)
debug2(" GrpJobs : %u", assoc_ptr->grp_jobs);
- if (assoc_ptr->grp_nodes == INFINITE)
+ if(assoc_ptr->grp_nodes == INFINITE)
debug2(" GrpNodes : NONE");
- else if (assoc_ptr->grp_nodes != NO_VAL)
+ else if(assoc_ptr->grp_nodes != NO_VAL)
debug2(" GrpNodes : %u", assoc_ptr->grp_nodes);
- if (assoc_ptr->grp_submit_jobs == INFINITE)
+ if(assoc_ptr->grp_submit_jobs == INFINITE)
debug2(" GrpSubmitJobs : NONE");
- else if (assoc_ptr->grp_submit_jobs != NO_VAL)
+ else if(assoc_ptr->grp_submit_jobs != NO_VAL)
debug2(" GrpSubmitJobs : %u", assoc_ptr->grp_submit_jobs);
- if (assoc_ptr->grp_wall == INFINITE)
+ if(assoc_ptr->grp_wall == INFINITE)
debug2(" GrpWall : NONE");
- else if (assoc_ptr->grp_wall != NO_VAL) {
+ else if(assoc_ptr->grp_wall != NO_VAL) {
char time_buf[32];
mins2time_str((time_t) assoc_ptr->grp_wall,
time_buf, sizeof(time_buf));
debug2(" GrpWall : %s", time_buf);
}
- if (assoc_ptr->max_cpu_mins_pj == INFINITE)
+ if(assoc_ptr->max_cpu_mins_pj == INFINITE)
debug2(" MaxCPUMins : NONE");
- else if (assoc_ptr->max_cpu_mins_pj != NO_VAL)
+ else if(assoc_ptr->max_cpu_mins_pj != NO_VAL)
debug2(" MaxCPUMins : %llu", assoc_ptr->max_cpu_mins_pj);
- if (assoc_ptr->max_cpu_run_mins == INFINITE)
+ if(assoc_ptr->max_cpu_run_mins == INFINITE)
debug2(" MaxCPURunMins : NONE");
- else if (assoc_ptr->max_cpu_run_mins != NO_VAL)
+ else if(assoc_ptr->max_cpu_run_mins != NO_VAL)
debug2(" MaxCPURunMins : %llu",
assoc_ptr->max_cpu_run_mins);
- if (assoc_ptr->max_cpus_pj == INFINITE)
+ if(assoc_ptr->max_cpus_pj == INFINITE)
debug2(" MaxCPUs : NONE");
- else if (assoc_ptr->max_cpus_pj != NO_VAL)
+ else if(assoc_ptr->max_cpus_pj != NO_VAL)
debug2(" MaxCPUs : %u", assoc_ptr->max_cpus_pj);
- if (assoc_ptr->max_jobs == INFINITE)
+ if(assoc_ptr->max_jobs == INFINITE)
debug2(" MaxJobs : NONE");
- else if (assoc_ptr->max_jobs != NO_VAL)
+ else if(assoc_ptr->max_jobs != NO_VAL)
debug2(" MaxJobs : %u", assoc_ptr->max_jobs);
- if (assoc_ptr->max_nodes_pj == INFINITE)
+ if(assoc_ptr->max_nodes_pj == INFINITE)
debug2(" MaxNodes : NONE");
- else if (assoc_ptr->max_nodes_pj != NO_VAL)
+ else if(assoc_ptr->max_nodes_pj != NO_VAL)
debug2(" MaxNodes : %u", assoc_ptr->max_nodes_pj);
- if (assoc_ptr->max_submit_jobs == INFINITE)
+ if(assoc_ptr->max_submit_jobs == INFINITE)
debug2(" MaxSubmitJobs : NONE");
- else if (assoc_ptr->max_submit_jobs != NO_VAL)
+ else if(assoc_ptr->max_submit_jobs != NO_VAL)
debug2(" MaxSubmitJobs : %u", assoc_ptr->max_submit_jobs);
- if (assoc_ptr->max_wall_pj == INFINITE)
+ if(assoc_ptr->max_wall_pj == INFINITE)
debug2(" MaxWall : NONE");
- else if (assoc_ptr->max_wall_pj != NO_VAL) {
+ else if(assoc_ptr->max_wall_pj != NO_VAL) {
char time_buf[32];
mins2time_str((time_t) assoc_ptr->max_wall_pj,
time_buf, sizeof(time_buf));
debug2(" MaxWall : %s", time_buf);
}
- if (assoc_ptr->qos_list) {
+ if(assoc_ptr->qos_list) {
char *temp_char = get_qos_complete_str(qos_list,
assoc_ptr->qos_list);
- if (temp_char) {
+ if(temp_char) {
debug2(" Qos : %s", temp_char);
xfree(temp_char);
- if (assoc_ptr->usage && assoc_ptr->usage->valid_qos) {
+ if(assoc_ptr->usage && assoc_ptr->usage->valid_qos) {
temp_char = get_qos_complete_str_bitstr(
qos_list, assoc_ptr->usage->valid_qos);
debug3(" Valid Qos : %s", temp_char);
@@ -1750,20 +1750,20 @@ extern void log_assoc_rec(slurmdb_association_rec_t *assoc_ptr,
debug2(" Qos : %s", "Normal");
}
- if (assoc_ptr->parent_acct)
+ if(assoc_ptr->parent_acct)
debug2(" ParentAccount : %s", assoc_ptr->parent_acct);
- if (assoc_ptr->partition)
+ if(assoc_ptr->partition)
debug2(" Partition : %s", assoc_ptr->partition);
- if (assoc_ptr->user)
+ if(assoc_ptr->user)
debug2(" User : %s(%u)",
assoc_ptr->user, assoc_ptr->uid);
- if (assoc_ptr->usage) {
- if (assoc_ptr->usage->shares_norm != (double)NO_VAL)
+ if(assoc_ptr->usage) {
+ if(assoc_ptr->usage->shares_norm != (double)NO_VAL)
debug2(" NormalizedShares : %f",
assoc_ptr->usage->shares_norm);
- if (assoc_ptr->usage->level_shares != NO_VAL)
+ if(assoc_ptr->usage->level_shares != NO_VAL)
debug2(" LevelShares : %u",
assoc_ptr->usage->level_shares);
@@ -1783,8 +1783,8 @@ extern int slurmdb_report_set_start_end_time(time_t *start, time_t *end)
// info("now got %d and %d sent", (*start), (*end));
/* Default is going to be the last day */
- if (!sent_end) {
- if (!localtime_r(&my_time, &end_tm)) {
+ if(!sent_end) {
+ if(!localtime_r(&my_time, &end_tm)) {
error("Couldn't get localtime from end %d",
my_time);
return SLURM_ERROR;
@@ -1793,14 +1793,14 @@ extern int slurmdb_report_set_start_end_time(time_t *start, time_t *end)
//(*end) = mktime(&end_tm);
} else {
temp_time = sent_end;
- if (!localtime_r(&temp_time, &end_tm)) {
+ if(!localtime_r(&temp_time, &end_tm)) {
error("Couldn't get localtime from user end %d",
my_time);
return SLURM_ERROR;
}
- if (end_tm.tm_sec >= 30)
+ if(end_tm.tm_sec >= 30)
end_tm.tm_min++;
- if (end_tm.tm_min >= 30)
+ if(end_tm.tm_min >= 30)
end_tm.tm_hour++;
}
@@ -1809,8 +1809,8 @@ extern int slurmdb_report_set_start_end_time(time_t *start, time_t *end)
end_tm.tm_isdst = -1;
(*end) = mktime(&end_tm);
- if (!sent_start) {
- if (!localtime_r(&my_time, &start_tm)) {
+ if(!sent_start) {
+ if(!localtime_r(&my_time, &start_tm)) {
error("Couldn't get localtime from start %d",
my_time);
return SLURM_ERROR;
@@ -1820,14 +1820,14 @@ extern int slurmdb_report_set_start_end_time(time_t *start, time_t *end)
//(*start) = mktime(&start_tm);
} else {
temp_time = sent_start;
- if (!localtime_r(&temp_time, &start_tm)) {
+ if(!localtime_r(&temp_time, &start_tm)) {
error("Couldn't get localtime from user start %d",
my_time);
return SLURM_ERROR;
}
- if (start_tm.tm_sec >= 30)
+ if(start_tm.tm_sec >= 30)
start_tm.tm_min++;
- if (start_tm.tm_min >= 30)
+ if(start_tm.tm_min >= 30)
start_tm.tm_hour++;
}
start_tm.tm_sec = 0;
@@ -1835,7 +1835,7 @@ extern int slurmdb_report_set_start_end_time(time_t *start, time_t *end)
start_tm.tm_isdst = -1;
(*start) = mktime(&start_tm);
- if ((*end)-(*start) < 3600)
+ if((*end)-(*start) < 3600)
(*end) = (*start) + 3600;
/* info("now got %d and %d sent", (*start), (*end)); */
/* char start_char[20]; */
@@ -1873,7 +1873,7 @@ extern uint32_t slurmdb_parse_purge(char *string)
while(string[i]) {
if ((string[i] >= '0') && (string[i] <= '9')) {
- if (purge == NO_VAL)
+ if(purge == NO_VAL)
purge = 0;
purge = (purge * 10) + (string[i] - '0');
} else
@@ -1883,11 +1883,11 @@ extern uint32_t slurmdb_parse_purge(char *string)
if (purge != NO_VAL) {
int len = strlen(string+i);
- if (!len || !strncasecmp("months", string+i, MAX(len, 1))) {
+ if(!len || !strncasecmp("months", string+i, MAX(len, 1))) {
purge |= SLURMDB_PURGE_MONTHS;
- } else if (!strncasecmp("hours", string+i, MAX(len, 1))) {
+ } else if(!strncasecmp("hours", string+i, MAX(len, 1))) {
purge |= SLURMDB_PURGE_HOURS;
- } else if (!strncasecmp("days", string+i, MAX(len, 1))) {
+ } else if(!strncasecmp("days", string+i, MAX(len, 1))) {
purge |= SLURMDB_PURGE_DAYS;
} else {
error("Invalid purge unit '%s', valid options "
@@ -1905,18 +1905,18 @@ extern char *slurmdb_purge_string(uint32_t purge, char *string, int len,
{
uint32_t units = SLURMDB_PURGE_GET_UNITS(purge);
- if (SLURMDB_PURGE_IN_HOURS(purge)) {
- if (with_archive && SLURMDB_PURGE_ARCHIVE_SET(purge))
+ if(SLURMDB_PURGE_IN_HOURS(purge)) {
+ if(with_archive && SLURMDB_PURGE_ARCHIVE_SET(purge))
snprintf(string, len, "%u hours*", units);
else
snprintf(string, len, "%u hours", units);
- } else if (SLURMDB_PURGE_IN_DAYS(purge)) {
- if (with_archive && SLURMDB_PURGE_ARCHIVE_SET(purge))
+ } else if(SLURMDB_PURGE_IN_DAYS(purge)) {
+ if(with_archive && SLURMDB_PURGE_ARCHIVE_SET(purge))
snprintf(string, len, "%u days*", units);
else
snprintf(string, len, "%u days", units);
} else {
- if (with_archive && SLURMDB_PURGE_ARCHIVE_SET(purge))
+ if(with_archive && SLURMDB_PURGE_ARCHIVE_SET(purge))
snprintf(string, len, "%u months*", units);
else
snprintf(string, len, "%u months", units);
@@ -1938,18 +1938,18 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
int equal_set = 0;
int add_set = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
- if (!qos_list || !list_count(qos_list)) {
+ if(!qos_list || !list_count(qos_list)) {
debug2("No real qos_list");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -1957,14 +1957,14 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
}
start = i;
while(names[i]) {
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
int tmp_option = option;
- if (names[start] == '+'
+ if(names[start] == '+'
|| names[start] == '-') {
tmp_option = names[start];
start++;
@@ -1973,7 +1973,7 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
memcpy(name, names+start, (i-start));
id = str_2_slurmdb_qos(qos_list, name);
- if (id == NO_VAL) {
+ if(id == NO_VAL) {
char *tmp = _get_qos_list_str(
qos_list);
error("You gave a bad qos "
@@ -1986,8 +1986,8 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
}
xfree(name);
- if (tmp_option) {
- if (equal_set) {
+ if(tmp_option) {
+ if(equal_set) {
error("You can't set "
"qos equal to "
"something and "
@@ -2001,7 +2001,7 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
name = xstrdup_printf(
"%c%u", tmp_option, id);
} else {
- if (add_set) {
+ if(add_set) {
error("You can't set "
"qos equal to "
"something and "
@@ -2015,12 +2015,12 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
name = xstrdup_printf("%u", id);
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
list_iterator_reset(itr);
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -2032,7 +2032,7 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
error("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -2041,9 +2041,9 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
int tmp_option = option;
- if (names[start] == '+' || names[start] == '-') {
+ if(names[start] == '+' || names[start] == '-') {
tmp_option = names[start];
start++;
}
@@ -2051,7 +2051,7 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
memcpy(name, names+start, (i-start));
id = str_2_slurmdb_qos(qos_list, name);
- if (id == NO_VAL) {
+ if(id == NO_VAL) {
char *tmp = _get_qos_list_str(qos_list);
error("You gave a bad qos "
"'%s'. Valid QOS's are "
@@ -2063,8 +2063,8 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
}
xfree(name);
- if (tmp_option) {
- if (equal_set) {
+ if(tmp_option) {
+ if(equal_set) {
error("You can't set "
"qos equal to "
"something and "
@@ -2077,7 +2077,7 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
name = xstrdup_printf(
"%c%u", tmp_option, id);
} else {
- if (add_set) {
+ if(add_set) {
error("You can't set "
"qos equal to "
"something and "
@@ -2090,11 +2090,11 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
name = xstrdup_printf("%u", id);
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -2104,7 +2104,7 @@ extern int slurmdb_addto_qos_char_list(List char_list, List qos_list,
count++;
}
}
- if (!count) {
+ if(!count) {
error("You gave me an empty qos list");
}
diff --git a/src/common/slurmdb_pack.c b/src/common/slurmdb_pack.c
index dd73349f7b5cfeb7fcfc3790c74f670bca07ff27..30045c2828cb14b967e8ab6fec83d2df2098109e 100644
--- a/src/common/slurmdb_pack.c
+++ b/src/common/slurmdb_pack.c
@@ -47,8 +47,8 @@ static void _pack_slurmdb_stats(slurmdb_stats_t *stats,
{
int i=0;
- if (rpc_version >= 6) {
- if (!stats) {
+ if(rpc_version >= 6) {
+ if(!stats) {
for(i=0; i<4; i++)
pack32((uint32_t) 0, buffer);
@@ -86,7 +86,7 @@ static void _pack_slurmdb_stats(slurmdb_stats_t *stats,
static int _unpack_slurmdb_stats(slurmdb_stats_t *stats,
uint16_t rpc_version, Buf buffer)
{
- if (rpc_version >= 6) {
+ if(rpc_version >= 6) {
safe_unpack32(&stats->vsize_max, buffer);
safe_unpack32(&stats->rss_max, buffer);
safe_unpack32(&stats->pages_max, buffer);
@@ -123,8 +123,8 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
slurmdb_association_rec_t *assoc = NULL;
slurmdb_wckey_rec_t *wckey = NULL;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
pack16(0, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -139,11 +139,11 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack16(object->admin_level, buffer);
- if (object->assoc_list)
+ if(object->assoc_list)
count = list_count(object->assoc_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
while((assoc = list_next(itr))) {
slurmdb_pack_association_rec(assoc, rpc_version,
@@ -153,11 +153,11 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->coord_accts)
+ if(object->coord_accts)
count = list_count(object->coord_accts);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->coord_accts);
while((coord = list_next(itr))) {
slurmdb_pack_coord_rec(coord,
@@ -174,11 +174,11 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->uid, buffer);
- if (object->wckey_list)
+ if(object->wckey_list)
count = list_count(object->wckey_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->wckey_list);
while((wckey = list_next(itr))) {
slurmdb_pack_wckey_rec(wckey, rpc_version,
@@ -187,8 +187,8 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
list_iterator_destroy(itr);
}
count = NO_VAL;
- } else if (rpc_version >= 4) {
- if (!object) {
+ } else if(rpc_version >= 4) {
+ if(!object) {
pack16(0, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -202,11 +202,11 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack16(object->admin_level, buffer);
- if (object->assoc_list)
+ if(object->assoc_list)
count = list_count(object->assoc_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
while((assoc = list_next(itr))) {
slurmdb_pack_association_rec(assoc, rpc_version,
@@ -216,11 +216,11 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->coord_accts)
+ if(object->coord_accts)
count = list_count(object->coord_accts);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->coord_accts);
while((coord = list_next(itr))) {
slurmdb_pack_coord_rec(coord,
@@ -236,11 +236,11 @@ extern void slurmdb_pack_user_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->uid, buffer);
- if (object->wckey_list)
+ if(object->wckey_list)
count = list_count(object->wckey_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->wckey_list);
while((wckey = list_next(itr))) {
slurmdb_pack_wckey_rec(wckey, rpc_version,
@@ -265,14 +265,14 @@ extern int slurmdb_unpack_user_rec(void **object, uint16_t rpc_version,
*object = object_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack16(&object_ptr->admin_level, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->assoc_list =
list_create(slurmdb_destroy_association_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_association_rec(
+ if(slurmdb_unpack_association_rec(
(void *)&assoc, rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -280,11 +280,11 @@ extern int slurmdb_unpack_user_rec(void **object, uint16_t rpc_version,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->coord_accts =
list_create(slurmdb_destroy_coord_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_coord_rec((void *)&coord,
+ if(slurmdb_unpack_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -300,11 +300,11 @@ extern int slurmdb_unpack_user_rec(void **object, uint16_t rpc_version,
&uint32_tmp, buffer);
safe_unpack32(&object_ptr->uid, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->wckey_list =
list_create(slurmdb_destroy_wckey_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_wckey_rec(
+ if(slurmdb_unpack_wckey_rec(
(void *)&wckey, rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -312,14 +312,14 @@ extern int slurmdb_unpack_user_rec(void **object, uint16_t rpc_version,
}
}
- } else if (rpc_version >= 4) {
+ } else if(rpc_version >= 4) {
safe_unpack16(&object_ptr->admin_level, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->assoc_list =
list_create(slurmdb_destroy_association_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_association_rec(
+ if(slurmdb_unpack_association_rec(
(void *)&assoc, rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -327,11 +327,11 @@ extern int slurmdb_unpack_user_rec(void **object, uint16_t rpc_version,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->coord_accts =
list_create(slurmdb_destroy_coord_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_coord_rec((void *)&coord,
+ if(slurmdb_unpack_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -345,11 +345,11 @@ extern int slurmdb_unpack_user_rec(void **object, uint16_t rpc_version,
safe_unpackstr_xmalloc(&object_ptr->name, &uint32_tmp, buffer);
safe_unpack32(&object_ptr->uid, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->wckey_list =
list_create(slurmdb_destroy_wckey_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_wckey_rec(
+ if(slurmdb_unpack_wckey_rec(
(void *)&wckey, rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -371,8 +371,8 @@ extern void slurmdb_pack_used_limits(void *in, uint16_t rpc_version, Buf buffer)
{
slurmdb_used_limits_t *object = (slurmdb_used_limits_t *)in;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
pack64(0, buffer);
pack32(0, buffer);
pack32(0, buffer);
@@ -384,8 +384,8 @@ extern void slurmdb_pack_used_limits(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->jobs, buffer);
pack32(object->submit_jobs, buffer);
pack32(object->uid, buffer);
- } else if (rpc_version >= 6) {
- if (!object) {
+ } else if(rpc_version >= 6) {
+ if(!object) {
pack32(0, buffer);
pack32(0, buffer);
pack32(0, buffer);
@@ -406,12 +406,12 @@ extern int slurmdb_unpack_used_limits(void **object,
*object = (void *)object_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack64(&object_ptr->cpu_run_mins, buffer);
safe_unpack32(&object_ptr->jobs, buffer);
safe_unpack32(&object_ptr->submit_jobs, buffer);
safe_unpack32(&object_ptr->uid, buffer);
- } else if (rpc_version >= 6) {
+ } else if(rpc_version >= 6) {
safe_unpack32(&object_ptr->jobs, buffer);
safe_unpack32(&object_ptr->submit_jobs, buffer);
safe_unpack32(&object_ptr->uid, buffer);
@@ -432,8 +432,8 @@ extern void slurmdb_pack_account_rec(void *in, uint16_t rpc_version, Buf buffer)
slurmdb_account_rec_t *object = (slurmdb_account_rec_t *)in;
slurmdb_association_rec_t *assoc = NULL;
- if (rpc_version >= 3) {
- if (!object) {
+ if(rpc_version >= 3) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
packnull(buffer);
@@ -442,11 +442,11 @@ extern void slurmdb_pack_account_rec(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->assoc_list)
+ if(object->assoc_list)
count = list_count(object->assoc_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->assoc_list);
while((assoc = list_next(itr))) {
slurmdb_pack_association_rec(assoc, rpc_version,
@@ -456,11 +456,11 @@ extern void slurmdb_pack_account_rec(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->coordinators)
+ if(object->coordinators)
count = list_count(object->coordinators);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->coordinators);
while((coord = list_next(itr))) {
slurmdb_pack_coord_rec(coord,
@@ -489,13 +489,13 @@ extern int slurmdb_unpack_account_rec(void **object, uint16_t rpc_version,
*object = object_ptr;
- if (rpc_version >= 3) {
+ if(rpc_version >= 3) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->assoc_list =
list_create(slurmdb_destroy_association_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_association_rec(
+ if(slurmdb_unpack_association_rec(
(void *)&assoc, rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -503,11 +503,11 @@ extern int slurmdb_unpack_account_rec(void **object, uint16_t rpc_version,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->coordinators =
list_create(slurmdb_destroy_coord_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_coord_rec((void *)&coord,
+ if(slurmdb_unpack_coord_rec((void *)&coord,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
@@ -533,7 +533,7 @@ extern void slurmdb_pack_coord_rec(void *in, uint16_t rpc_version, Buf buffer)
{
slurmdb_coord_rec_t *object = (slurmdb_coord_rec_t *)in;
- if (!object) {
+ if(!object) {
packnull(buffer);
pack16(0, buffer);
return;
@@ -566,8 +566,8 @@ extern void slurmdb_pack_cluster_accounting_rec(void *in, uint16_t rpc_version,
slurmdb_cluster_accounting_rec_t *object =
(slurmdb_cluster_accounting_rec_t *)in;
- if (rpc_version >= 5) {
- if (!object) {
+ if(rpc_version >= 5) {
+ if(!object) {
pack64(0, buffer);
pack32(0, buffer);
pack64(0, buffer);
@@ -599,7 +599,7 @@ extern int slurmdb_unpack_cluster_accounting_rec(void **object,
*object = object_ptr;
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
safe_unpack64(&object_ptr->alloc_secs, buffer);
safe_unpack32(&object_ptr->cpu_count, buffer);
safe_unpack64(&object_ptr->down_secs, buffer);
@@ -625,8 +625,8 @@ extern void slurmdb_pack_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
uint32_t count = NO_VAL;
slurmdb_cluster_rec_t *object = (slurmdb_cluster_rec_t *)in;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack16(0, buffer);
packnull(buffer);
@@ -646,12 +646,12 @@ extern void slurmdb_pack_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->accounting_list)
+ if(object->accounting_list)
count = list_count(object->accounting_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((slurmdb_info = list_next(itr))) {
slurmdb_pack_cluster_accounting_rec(
@@ -677,8 +677,8 @@ extern void slurmdb_pack_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
rpc_version, buffer);
pack16(object->rpc_version, buffer);
- } else if (rpc_version >= 5) {
- if (!object) {
+ } else if(rpc_version >= 5) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack16(0, buffer);
packnull(buffer);
@@ -694,12 +694,12 @@ extern void slurmdb_pack_cluster_rec(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->accounting_list)
+ if(object->accounting_list)
count = list_count(object->accounting_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((slurmdb_info = list_next(itr))) {
slurmdb_pack_cluster_accounting_rec(
@@ -737,9 +737,9 @@ extern int slurmdb_unpack_cluster_rec(void **object, uint16_t rpc_version,
*object = object_ptr;
slurmdb_init_cluster_rec(object_ptr);
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->accounting_list = list_create(
slurmdb_destroy_cluster_accounting_rec);
for(i=0; i<count; i++) {
@@ -764,16 +764,16 @@ extern int slurmdb_unpack_cluster_rec(void **object, uint16_t rpc_version,
safe_unpack32(&object_ptr->plugin_id_select, buffer);
- if (slurmdb_unpack_association_rec(
+ if(slurmdb_unpack_association_rec(
(void **)&object_ptr->root_assoc,
rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
safe_unpack16(&object_ptr->rpc_version, buffer);
- } else if (rpc_version >= 5) {
+ } else if(rpc_version >= 5) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->accounting_list = list_create(
slurmdb_destroy_cluster_accounting_rec);
for(i=0; i<count; i++) {
@@ -794,7 +794,7 @@ extern int slurmdb_unpack_cluster_rec(void **object, uint16_t rpc_version,
safe_unpackstr_xmalloc(&object_ptr->name, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->nodes, &uint32_tmp, buffer);
- if (slurmdb_unpack_association_rec(
+ if(slurmdb_unpack_association_rec(
(void **)&object_ptr->root_assoc,
rpc_version, buffer)
== SLURM_ERROR)
@@ -816,7 +816,7 @@ extern void slurmdb_pack_accounting_rec(void *in, uint16_t rpc_version,
{
slurmdb_accounting_rec_t *object = (slurmdb_accounting_rec_t *)in;
- if (!object) {
+ if(!object) {
pack64(0, buffer);
pack32(0, buffer);
pack_time(0, buffer);
@@ -858,7 +858,7 @@ extern void slurmdb_pack_association_rec(void *in, uint16_t rpc_version,
slurmdb_association_rec_t *object = (slurmdb_association_rec_t *)in;
if (rpc_version >= 8) {
- if (!object) {
+ if(!object) {
pack32(NO_VAL, buffer);
packnull(buffer);
packnull(buffer);
@@ -899,12 +899,12 @@ extern void slurmdb_pack_association_rec(void *in, uint16_t rpc_version,
return;
}
- if (object->accounting_list)
+ if(object->accounting_list)
count = list_count(object->accounting_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((slurmdb_info = list_next(itr))) {
slurmdb_pack_accounting_rec(slurmdb_info,
@@ -948,12 +948,12 @@ extern void slurmdb_pack_association_rec(void *in, uint16_t rpc_version,
pack32(object->parent_id, buffer);
packstr(object->partition, buffer);
- if (object->qos_list)
+ if(object->qos_list)
count = list_count(object->qos_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->qos_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -967,7 +967,7 @@ extern void slurmdb_pack_association_rec(void *in, uint16_t rpc_version,
packstr(object->user, buffer);
} else if (rpc_version >= 4) {
- if (!object) {
+ if(!object) {
pack32(NO_VAL, buffer);
packnull(buffer);
packnull(buffer);
@@ -1004,12 +1004,12 @@ extern void slurmdb_pack_association_rec(void *in, uint16_t rpc_version,
return;
}
- if (object->accounting_list)
+ if(object->accounting_list)
count = list_count(object->accounting_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((slurmdb_info = list_next(itr))) {
slurmdb_pack_accounting_rec(slurmdb_info,
@@ -1049,12 +1049,12 @@ extern void slurmdb_pack_association_rec(void *in, uint16_t rpc_version,
pack32(object->parent_id, buffer);
packstr(object->partition, buffer);
- if (object->qos_list)
+ if(object->qos_list)
count = list_count(object->qos_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->qos_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1087,11 +1087,11 @@ extern int slurmdb_unpack_association_rec(void **object, uint16_t rpc_version,
if (rpc_version >= 8) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->accounting_list =
list_create(slurmdb_destroy_accounting_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_accounting_rec(
+ if(slurmdb_unpack_accounting_rec(
(void **)&slurmdb_info,
rpc_version,
buffer) == SLURM_ERROR)
@@ -1137,7 +1137,7 @@ extern int slurmdb_unpack_association_rec(void **object, uint16_t rpc_version,
safe_unpack32(&count, buffer);
/* This needs to look for zero to tell if something
has changed */
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->qos_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -1152,11 +1152,11 @@ extern int slurmdb_unpack_association_rec(void **object, uint16_t rpc_version,
safe_unpackstr_xmalloc(&object_ptr->user, &uint32_tmp, buffer);
} else if (rpc_version >= 4) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->accounting_list =
list_create(slurmdb_destroy_accounting_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_accounting_rec(
+ if(slurmdb_unpack_accounting_rec(
(void **)&slurmdb_info,
rpc_version,
buffer) == SLURM_ERROR)
@@ -1198,7 +1198,7 @@ extern int slurmdb_unpack_association_rec(void **object, uint16_t rpc_version,
safe_unpack32(&count, buffer);
/* This needs to look for zero to tell if something
has changed */
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->qos_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -1225,7 +1225,7 @@ extern void slurmdb_pack_event_rec(void *in, uint16_t rpc_version, Buf buffer)
{
slurmdb_event_rec_t *object = (slurmdb_event_rec_t *)in;
- if (!object) {
+ if(!object) {
packnull(buffer);
packnull(buffer);
pack32(NO_VAL, buffer);
@@ -1285,8 +1285,8 @@ extern void slurmdb_pack_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
uint32_t count = NO_VAL;
char *tmp_info = NULL;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
packnull(buffer);
pack32(0, buffer);
packnull(buffer);
@@ -1341,12 +1341,12 @@ extern void slurmdb_pack_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack_bit_str(object->preempt_bitstr, buffer);
- if (object->preempt_list)
+ if(object->preempt_list)
count = list_count(object->preempt_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->preempt_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1359,8 +1359,8 @@ extern void slurmdb_pack_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->priority, buffer);
packdouble(object->usage_factor, buffer);
- } else if (rpc_version >= 6) {
- if (!object) {
+ } else if(rpc_version >= 6) {
+ if(!object) {
packnull(buffer);
pack32(0, buffer);
packnull(buffer);
@@ -1410,12 +1410,12 @@ extern void slurmdb_pack_qos_rec(void *in, uint16_t rpc_version, Buf buffer)
pack_bit_str(object->preempt_bitstr, buffer);
- if (object->preempt_list)
+ if(object->preempt_list)
count = list_count(object->preempt_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->preempt_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1443,7 +1443,7 @@ extern int slurmdb_unpack_qos_rec(void **object, uint16_t rpc_version,
slurmdb_init_qos_rec(object_ptr);
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpackstr_xmalloc(&object_ptr->description,
&uint32_tmp, buffer);
safe_unpack32(&object_ptr->id, buffer);
@@ -1469,7 +1469,7 @@ extern int slurmdb_unpack_qos_rec(void **object, uint16_t rpc_version,
unpack_bit_str(&object_ptr->preempt_bitstr, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->preempt_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -1484,7 +1484,7 @@ extern int slurmdb_unpack_qos_rec(void **object, uint16_t rpc_version,
safe_unpack32(&object_ptr->priority, buffer);
safe_unpackdouble(&object_ptr->usage_factor, buffer);
- } else if (rpc_version >= 6) {
+ } else if(rpc_version >= 6) {
safe_unpackstr_xmalloc(&object_ptr->description,
&uint32_tmp, buffer);
safe_unpack32(&object_ptr->id, buffer);
@@ -1508,7 +1508,7 @@ extern int slurmdb_unpack_qos_rec(void **object, uint16_t rpc_version,
unpack_bit_str(&object_ptr->preempt_bitstr, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->preempt_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -1537,7 +1537,7 @@ extern void slurmdb_pack_reservation_rec(void *in, uint16_t rpc_version,
{
slurmdb_reservation_rec_t *object = (slurmdb_reservation_rec_t *)in;
- if (!object) {
+ if(!object) {
pack64(0, buffer);
packnull(buffer);
packnull(buffer);
@@ -1604,8 +1604,8 @@ extern void slurmdb_pack_txn_rec(void *in, uint16_t rpc_version, Buf buffer)
{
slurmdb_txn_rec_t *object = (slurmdb_txn_rec_t *)in;
- if (rpc_version >= 3) {
- if (!object) {
+ if(rpc_version >= 3) {
+ if(!object) {
packnull(buffer);
pack16(0, buffer);
packnull(buffer);
@@ -1669,7 +1669,7 @@ extern void slurmdb_pack_wckey_rec(void *in, uint16_t rpc_version, Buf buffer)
uint32_t count = NO_VAL;
slurmdb_wckey_rec_t *object = (slurmdb_wckey_rec_t *)in;
- if (!object) {
+ if(!object) {
pack32(NO_VAL, buffer);
packnull(buffer);
@@ -1684,12 +1684,12 @@ extern void slurmdb_pack_wckey_rec(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->accounting_list)
+ if(object->accounting_list)
count = list_count(object->accounting_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->accounting_list);
while((slurmdb_info = list_next(itr))) {
slurmdb_pack_accounting_rec(slurmdb_info,
@@ -1723,11 +1723,11 @@ extern int slurmdb_unpack_wckey_rec(void **object, uint16_t rpc_version,
*object = object_ptr;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->accounting_list =
list_create(slurmdb_destroy_accounting_rec);
for(i=0; i<count; i++) {
- if (slurmdb_unpack_accounting_rec(
+ if(slurmdb_unpack_accounting_rec(
(void **)&slurmdb_info,
rpc_version,
buffer) == SLURM_ERROR)
@@ -1760,7 +1760,7 @@ extern void slurmdb_pack_archive_rec(void *in, uint16_t rpc_version, Buf buffer)
{
slurmdb_archive_rec_t *object = (slurmdb_archive_rec_t *)in;
- if (!object) {
+ if(!object) {
packnull(buffer);
packnull(buffer);
return;
@@ -1798,8 +1798,8 @@ extern void slurmdb_pack_user_cond(void *in, uint16_t rpc_version, Buf buffer)
slurmdb_user_cond_t *object = (slurmdb_user_cond_t *)in;
uint32_t count = NO_VAL;
- if (rpc_version >= 4) {
- if (!object) {
+ if(rpc_version >= 4) {
+ if(!object) {
pack16(0, buffer);
slurmdb_pack_association_cond(NULL,
rpc_version, buffer);
@@ -1817,12 +1817,12 @@ extern void slurmdb_pack_user_cond(void *in, uint16_t rpc_version, Buf buffer)
slurmdb_pack_association_cond(object->assoc_cond,
rpc_version, buffer);
- if (object->def_acct_list)
+ if(object->def_acct_list)
count = list_count(object->def_acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->def_acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1831,12 +1831,12 @@ extern void slurmdb_pack_user_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->def_wckey_list)
+ if(object->def_wckey_list)
count = list_count(object->def_wckey_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->def_wckey_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1863,16 +1863,16 @@ extern int slurmdb_unpack_user_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
- if (rpc_version >= 4) {
+ if(rpc_version >= 4) {
safe_unpack16(&object_ptr->admin_level, buffer);
- if (slurmdb_unpack_association_cond(
+ if(slurmdb_unpack_association_cond(
(void **)&object_ptr->assoc_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->def_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -1884,7 +1884,7 @@ extern int slurmdb_unpack_user_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->def_wckey_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -1916,8 +1916,8 @@ extern void slurmdb_pack_account_cond(void *in, uint16_t rpc_version,
slurmdb_account_cond_t *object = (slurmdb_account_cond_t *)in;
uint32_t count = NO_VAL;
- if (rpc_version >= 3) {
- if (!object) {
+ if(rpc_version >= 3) {
+ if(!object) {
slurmdb_pack_association_cond(NULL, rpc_version,
buffer);
pack32(NO_VAL, buffer);
@@ -1931,12 +1931,12 @@ extern void slurmdb_pack_account_cond(void *in, uint16_t rpc_version,
rpc_version, buffer);
count = NO_VAL;
- if (object->description_list)
+ if(object->description_list)
count = list_count(object->description_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->description_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1945,12 +1945,12 @@ extern void slurmdb_pack_account_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->organization_list)
+ if(object->organization_list)
count = list_count(object->organization_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->organization_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -1978,13 +1978,13 @@ extern int slurmdb_unpack_account_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
if (rpc_version >= 3) {
- if (slurmdb_unpack_association_cond(
+ if(slurmdb_unpack_association_cond(
(void **)&object_ptr->assoc_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->description_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -1995,7 +1995,7 @@ extern int slurmdb_unpack_account_cond(void **object, uint16_t rpc_version,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->organization_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2026,8 +2026,8 @@ extern void slurmdb_pack_cluster_cond(void *in, uint16_t rpc_version,
slurmdb_cluster_cond_t *object = (slurmdb_cluster_cond_t *)in;
uint32_t count = NO_VAL;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
pack16(0, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -2042,12 +2042,12 @@ extern void slurmdb_pack_cluster_cond(void *in, uint16_t rpc_version,
pack16(object->classification, buffer);
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2058,12 +2058,12 @@ extern void slurmdb_pack_cluster_cond(void *in, uint16_t rpc_version,
pack32(object->flags, buffer);
- if (object->plugin_id_select_list)
+ if(object->plugin_id_select_list)
count = list_count(object->plugin_id_select_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->plugin_id_select_list);
while((tmp_info = list_next(itr))) {
@@ -2073,12 +2073,12 @@ extern void slurmdb_pack_cluster_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->rpc_version_list)
+ if(object->rpc_version_list)
count = list_count(object->rpc_version_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->rpc_version_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2092,8 +2092,8 @@ extern void slurmdb_pack_cluster_cond(void *in, uint16_t rpc_version,
pack16(object->with_usage, buffer);
pack16(object->with_deleted, buffer);
- } else if (rpc_version >= 5) {
- if (!object) {
+ } else if(rpc_version >= 5) {
+ if(!object) {
pack16(0, buffer);
pack32(NO_VAL, buffer);
pack_time(0, buffer);
@@ -2105,12 +2105,12 @@ extern void slurmdb_pack_cluster_cond(void *in, uint16_t rpc_version,
pack16(object->classification, buffer);
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2140,10 +2140,10 @@ extern int slurmdb_unpack_cluster_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
slurmdb_init_cluster_cond(object_ptr);
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack16(&object_ptr->classification, buffer);
safe_unpack32(&count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2156,7 +2156,7 @@ extern int slurmdb_unpack_cluster_cond(void **object, uint16_t rpc_version,
safe_unpack32(&object_ptr->flags, buffer);
safe_unpack32(&count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
object_ptr->plugin_id_select_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2168,7 +2168,7 @@ extern int slurmdb_unpack_cluster_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
object_ptr->rpc_version_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2184,10 +2184,10 @@ extern int slurmdb_unpack_cluster_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->with_usage, buffer);
safe_unpack16(&object_ptr->with_deleted, buffer);
- } else if (rpc_version >= 5) {
+ } else if(rpc_version >= 5) {
safe_unpack16(&object_ptr->classification, buffer);
safe_unpack32(&count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2219,8 +2219,8 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
ListIterator itr = NULL;
slurmdb_association_cond_t *object = (slurmdb_association_cond_t *)in;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -2265,11 +2265,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
return;
}
- if (object->acct_list)
+ if(object->acct_list)
count = list_count(object->acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2278,11 +2278,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2291,11 +2291,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->def_qos_id_list)
+ if(object->def_qos_id_list)
count = list_count(object->def_qos_id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->def_qos_id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2304,11 +2304,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->fairshare_list)
+ if(object->fairshare_list)
count = list_count(object->fairshare_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->fairshare_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2317,11 +2317,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_cpu_mins_list)
+ if(object->grp_cpu_mins_list)
count = list_count(object->grp_cpu_mins_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpu_mins_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2330,11 +2330,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_cpu_run_mins_list)
+ if(object->grp_cpu_run_mins_list)
count = list_count(object->grp_cpu_run_mins_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->grp_cpu_run_mins_list);
while((tmp_info = list_next(itr))) {
@@ -2344,11 +2344,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_cpus_list)
+ if(object->grp_cpus_list)
count = list_count(object->grp_cpus_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpus_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2357,11 +2357,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_jobs_list)
+ if(object->grp_jobs_list)
count = list_count(object->grp_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_jobs_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2370,11 +2370,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_nodes_list)
+ if(object->grp_nodes_list)
count = list_count(object->grp_nodes_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_nodes_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2383,11 +2383,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_submit_jobs_list)
+ if(object->grp_submit_jobs_list)
count = list_count(object->grp_submit_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->grp_submit_jobs_list);
while((tmp_info = list_next(itr))) {
@@ -2397,11 +2397,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_wall_list)
+ if(object->grp_wall_list)
count = list_count(object->grp_wall_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_wall_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2410,11 +2410,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->id_list)
+ if(object->id_list)
count = list_count(object->id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2422,11 +2422,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->max_cpu_mins_pj_list)
+ if(object->max_cpu_mins_pj_list)
count = list_count(object->max_cpu_mins_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->max_cpu_mins_pj_list);
while((tmp_info = list_next(itr))) {
@@ -2436,11 +2436,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->max_cpu_run_mins_list)
+ if(object->max_cpu_run_mins_list)
count = list_count(object->max_cpu_run_mins_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->max_cpu_run_mins_list);
while((tmp_info = list_next(itr))) {
@@ -2450,11 +2450,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->max_cpus_pj_list)
+ if(object->max_cpus_pj_list)
count = list_count(object->max_cpus_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_cpus_pj_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2462,11 +2462,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_jobs_list)
+ if(object->max_jobs_list)
count = list_count(object->max_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_jobs_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2474,11 +2474,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_nodes_pj_list)
+ if(object->max_nodes_pj_list)
count = list_count(object->max_nodes_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_nodes_pj_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2486,11 +2486,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_submit_jobs_list)
+ if(object->max_submit_jobs_list)
count = list_count(object->max_submit_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->max_submit_jobs_list);
while((tmp_info = list_next(itr))) {
@@ -2499,11 +2499,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_wall_pj_list)
+ if(object->max_wall_pj_list)
count = list_count(object->max_wall_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_wall_pj_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2512,11 +2512,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->partition_list)
+ if(object->partition_list)
count = list_count(object->partition_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2525,11 +2525,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->parent_acct_list)
+ if(object->parent_acct_list)
count = list_count(object->parent_acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->parent_acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2538,12 +2538,12 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->qos_list)
+ if(object->qos_list)
count = list_count(object->qos_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->qos_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2555,11 +2555,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
pack_time(object->usage_end, buffer);
pack_time(object->usage_start, buffer);
- if (object->user_list)
+ if(object->user_list)
count = list_count(object->user_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2574,8 +2574,8 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
pack16(object->with_sub_accts, buffer);
pack16(object->without_parent_info, buffer);
pack16(object->without_parent_limits, buffer);
- } else if (rpc_version >= 5) {
- if (!object) {
+ } else if(rpc_version >= 5) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -2616,11 +2616,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
return;
}
- if (object->acct_list)
+ if(object->acct_list)
count = list_count(object->acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2629,11 +2629,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2642,11 +2642,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->fairshare_list)
+ if(object->fairshare_list)
count = list_count(object->fairshare_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->fairshare_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2655,11 +2655,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_cpu_mins_list)
+ if(object->grp_cpu_mins_list)
count = list_count(object->grp_cpu_mins_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpu_mins_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2668,11 +2668,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_cpus_list)
+ if(object->grp_cpus_list)
count = list_count(object->grp_cpus_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_cpus_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2681,11 +2681,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_jobs_list)
+ if(object->grp_jobs_list)
count = list_count(object->grp_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_jobs_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2694,11 +2694,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_nodes_list)
+ if(object->grp_nodes_list)
count = list_count(object->grp_nodes_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_nodes_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2707,11 +2707,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_submit_jobs_list)
+ if(object->grp_submit_jobs_list)
count = list_count(object->grp_submit_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->grp_submit_jobs_list);
while((tmp_info = list_next(itr))) {
@@ -2721,11 +2721,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->grp_wall_list)
+ if(object->grp_wall_list)
count = list_count(object->grp_wall_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->grp_wall_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2734,11 +2734,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->id_list)
+ if(object->id_list)
count = list_count(object->id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2746,11 +2746,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->max_cpu_mins_pj_list)
+ if(object->max_cpu_mins_pj_list)
count = list_count(object->max_cpu_mins_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->max_cpu_mins_pj_list);
while((tmp_info = list_next(itr))) {
@@ -2759,11 +2759,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_cpus_pj_list)
+ if(object->max_cpus_pj_list)
count = list_count(object->max_cpus_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_cpus_pj_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2771,11 +2771,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_jobs_list)
+ if(object->max_jobs_list)
count = list_count(object->max_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_jobs_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2783,11 +2783,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_nodes_pj_list)
+ if(object->max_nodes_pj_list)
count = list_count(object->max_nodes_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_nodes_pj_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2795,11 +2795,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_submit_jobs_list)
+ if(object->max_submit_jobs_list)
count = list_count(object->max_submit_jobs_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(
object->max_submit_jobs_list);
while((tmp_info = list_next(itr))) {
@@ -2808,11 +2808,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
list_iterator_destroy(itr);
}
count = NO_VAL;
- if (object->max_wall_pj_list)
+ if(object->max_wall_pj_list)
count = list_count(object->max_wall_pj_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->max_wall_pj_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2821,11 +2821,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->partition_list)
+ if(object->partition_list)
count = list_count(object->partition_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2834,11 +2834,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->parent_acct_list)
+ if(object->parent_acct_list)
count = list_count(object->parent_acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->parent_acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2847,12 +2847,12 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->qos_list)
+ if(object->qos_list)
count = list_count(object->qos_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->qos_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2864,11 +2864,11 @@ extern void slurmdb_pack_association_cond(void *in, uint16_t rpc_version,
pack_time(object->usage_end, buffer);
pack_time(object->usage_start, buffer);
- if (object->user_list)
+ if(object->user_list)
count = list_count(object->user_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -2897,9 +2897,9 @@ extern int slurmdb_unpack_association_cond(void **object,
char *tmp_info = NULL;
*object = object_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2909,7 +2909,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2921,7 +2921,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->def_qos_id_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2933,7 +2933,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->fairshare_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2945,7 +2945,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_cpu_mins_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2956,7 +2956,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_cpu_run_mins_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2967,7 +2967,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_cpus_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2978,7 +2978,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -2989,7 +2989,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_nodes_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3000,7 +3000,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3011,7 +3011,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_wall_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3023,7 +3023,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3033,7 +3033,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_cpu_mins_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3044,7 +3044,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_cpu_run_mins_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3055,7 +3055,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_cpus_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3066,7 +3066,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3077,7 +3077,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_nodes_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3088,7 +3088,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3099,7 +3099,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_wall_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3111,7 +3111,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->partition_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3123,7 +3123,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->parent_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3135,7 +3135,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->qos_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3148,7 +3148,7 @@ extern int slurmdb_unpack_association_cond(void **object,
safe_unpack_time(&object_ptr->usage_start, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3164,9 +3164,9 @@ extern int slurmdb_unpack_association_cond(void **object,
safe_unpack16(&object_ptr->with_sub_accts, buffer);
safe_unpack16(&object_ptr->without_parent_info, buffer);
safe_unpack16(&object_ptr->without_parent_limits, buffer);
- } else if (rpc_version >= 5) {
+ } else if(rpc_version >= 5) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3176,7 +3176,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3188,7 +3188,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->fairshare_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3200,7 +3200,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_cpu_mins_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3211,7 +3211,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_cpus_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3222,7 +3222,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3233,7 +3233,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_nodes_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3244,7 +3244,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3255,7 +3255,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->grp_wall_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3267,7 +3267,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3277,7 +3277,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_cpu_mins_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3288,7 +3288,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_cpus_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3299,7 +3299,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3310,7 +3310,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_nodes_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3321,7 +3321,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_submit_jobs_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3332,7 +3332,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->max_wall_pj_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3344,7 +3344,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->partition_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3356,7 +3356,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->parent_acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3368,7 +3368,7 @@ extern int slurmdb_unpack_association_cond(void **object,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->qos_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3381,7 +3381,7 @@ extern int slurmdb_unpack_association_cond(void **object,
safe_unpack_time(&object_ptr->usage_start, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3415,7 +3415,7 @@ extern void slurmdb_pack_event_cond(void *in, uint16_t rpc_version, Buf buffer)
ListIterator itr = NULL;
slurmdb_event_cond_t *object = (slurmdb_event_cond_t *)in;
- if (!object) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -3429,11 +3429,11 @@ extern void slurmdb_pack_event_cond(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3446,11 +3446,11 @@ extern void slurmdb_pack_event_cond(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->cpus_min, buffer);
pack16(object->event_type, buffer);
- if (object->node_list)
+ if(object->node_list)
count = list_count(object->node_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->node_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3462,11 +3462,11 @@ extern void slurmdb_pack_event_cond(void *in, uint16_t rpc_version, Buf buffer)
pack_time(object->period_end, buffer);
pack_time(object->period_start, buffer);
- if (object->reason_list)
+ if(object->reason_list)
count = list_count(object->reason_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->reason_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3475,11 +3475,11 @@ extern void slurmdb_pack_event_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->reason_uid_list)
+ if(object->reason_uid_list)
count = list_count(object->reason_uid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->reason_uid_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3488,11 +3488,11 @@ extern void slurmdb_pack_event_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->state_list)
+ if(object->state_list)
count = list_count(object->state_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->state_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3515,7 +3515,7 @@ extern int slurmdb_unpack_event_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3528,7 +3528,7 @@ extern int slurmdb_unpack_event_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->event_type, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->node_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3541,7 +3541,7 @@ extern int slurmdb_unpack_event_cond(void **object, uint16_t rpc_version,
safe_unpack_time(&object_ptr->period_start, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->reason_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3551,7 +3551,7 @@ extern int slurmdb_unpack_event_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->reason_uid_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3561,7 +3561,7 @@ extern int slurmdb_unpack_event_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->state_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3587,8 +3587,8 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
ListIterator itr = NULL;
slurmdb_job_cond_t *object = (slurmdb_job_cond_t *)in;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -3616,11 +3616,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->acct_list)
+ if(object->acct_list)
count = list_count(object->acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3629,11 +3629,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->associd_list)
+ if(object->associd_list)
count = list_count(object->associd_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->associd_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3641,11 +3641,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3659,11 +3659,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(object->duplicates, buffer);
pack32((uint32_t)object->exitcode, buffer);
- if (object->groupid_list)
+ if(object->groupid_list)
count = list_count(object->groupid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->groupid_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3673,11 +3673,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->nodes_max, buffer);
pack32(object->nodes_min, buffer);
- if (object->partition_list)
+ if(object->partition_list)
count = list_count(object->partition_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3686,11 +3686,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->qos_list)
+ if(object->qos_list)
count = list_count(object->qos_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->qos_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3699,11 +3699,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->resv_list)
+ if(object->resv_list)
count = list_count(object->resv_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->resv_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3712,11 +3712,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->resvid_list)
+ if(object->resvid_list)
count = list_count(object->resvid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->resvid_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3725,11 +3725,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->step_list)
+ if(object->step_list)
count = list_count(object->step_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->step_list);
while((job = list_next(itr))) {
slurmdb_pack_selected_step(job, rpc_version,
@@ -3739,11 +3739,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->state_list)
+ if(object->state_list)
count = list_count(object->state_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->state_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3759,11 +3759,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
packstr(object->used_nodes, buffer);
- if (object->userid_list)
+ if(object->userid_list)
count = list_count(object->userid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->userid_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3773,7 +3773,7 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
count = NO_VAL;
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->wckey_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3784,8 +3784,8 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(object->without_steps, buffer);
pack16(object->without_usage_truncation, buffer);
- } else if (rpc_version >= 6) {
- if (!object) {
+ } else if(rpc_version >= 6) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -3809,11 +3809,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->acct_list)
+ if(object->acct_list)
count = list_count(object->acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3822,11 +3822,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->associd_list)
+ if(object->associd_list)
count = list_count(object->associd_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->associd_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3834,11 +3834,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3851,11 +3851,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->cpus_min, buffer);
pack16(object->duplicates, buffer);
- if (object->groupid_list)
+ if(object->groupid_list)
count = list_count(object->groupid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->groupid_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3865,11 +3865,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
pack32(object->nodes_max, buffer);
pack32(object->nodes_min, buffer);
- if (object->partition_list)
+ if(object->partition_list)
count = list_count(object->partition_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->partition_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3878,11 +3878,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->resv_list)
+ if(object->resv_list)
count = list_count(object->resv_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->resv_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3891,11 +3891,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->resvid_list)
+ if(object->resvid_list)
count = list_count(object->resvid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->resvid_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3904,11 +3904,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->step_list)
+ if(object->step_list)
count = list_count(object->step_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->step_list);
while((job = list_next(itr))) {
slurmdb_pack_selected_step(job, rpc_version,
@@ -3918,11 +3918,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->state_list)
+ if(object->state_list)
count = list_count(object->state_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->state_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3936,11 +3936,11 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
packstr(object->used_nodes, buffer);
- if (object->userid_list)
+ if(object->userid_list)
count = list_count(object->userid_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->userid_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3950,7 +3950,7 @@ extern void slurmdb_pack_job_cond(void *in, uint16_t rpc_version, Buf buffer)
count = NO_VAL;
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->wckey_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -3976,9 +3976,9 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->acct_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -3988,7 +3988,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->associd_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -3999,7 +3999,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4016,7 +4016,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
object_ptr->exitcode = (int32_t)uint32_tmp;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->groupid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4030,7 +4030,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
safe_unpack32(&object_ptr->nodes_min, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->partition_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4042,7 +4042,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->qos_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4054,7 +4054,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->resv_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4066,7 +4066,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->resvid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4078,7 +4078,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->step_list =
list_create(slurmdb_destroy_selected_step);
for(i=0; i<count; i++) {
@@ -4089,7 +4089,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->state_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4108,7 +4108,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
&uint32_tmp, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->userid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4119,7 +4119,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->wckey_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4131,9 +4131,9 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->without_steps, buffer);
safe_unpack16(&object_ptr->without_usage_truncation, buffer);
- } else if (rpc_version >= 6) {
+ } else if(rpc_version >= 6) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->acct_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4143,7 +4143,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->associd_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4154,7 +4154,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4169,7 +4169,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->duplicates, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->groupid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4183,7 +4183,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
safe_unpack32(&object_ptr->nodes_min, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->partition_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4195,7 +4195,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->resv_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4207,7 +4207,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->resvid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4219,7 +4219,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->step_list =
list_create(slurmdb_destroy_selected_step);
for(i=0; i<count; i++) {
@@ -4230,7 +4230,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->state_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4247,7 +4247,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
&uint32_tmp, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->userid_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4258,7 +4258,7 @@ extern int slurmdb_unpack_job_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->wckey_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4287,7 +4287,7 @@ extern void slurmdb_pack_job_rec(void *object, uint16_t rpc_version, Buf buffer)
slurmdb_step_rec_t *step = NULL;
uint32_t count = 0;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
packstr(job->account, buffer);
pack32(job->alloc_cpus, buffer);
pack32(job->alloc_nodes, buffer);
@@ -4316,10 +4316,10 @@ extern void slurmdb_pack_job_rec(void *object, uint16_t rpc_version, Buf buffer)
pack_time(job->start, buffer);
pack16((uint16_t)job->state, buffer);
_pack_slurmdb_stats(&job->stats, rpc_version, buffer);
- if (job->steps)
+ if(job->steps)
count = list_count(job->steps);
pack32(count, buffer);
- if (count) {
+ if(count) {
itr = list_iterator_create(job->steps);
while((step = list_next(itr))) {
slurmdb_pack_step_rec(step, rpc_version,
@@ -4341,7 +4341,7 @@ extern void slurmdb_pack_job_rec(void *object, uint16_t rpc_version, Buf buffer)
pack32(job->user_cpu_usec, buffer);
packstr(job->wckey, buffer); /* added for rpc_version 4 */
pack32(job->wckeyid, buffer); /* added for rpc_version 4 */
- } else if (rpc_version >= 5) {
+ } else if(rpc_version >= 5) {
pack32(job->alloc_cpus, buffer);
pack32(job->alloc_nodes, buffer);
pack32(job->associd, buffer);
@@ -4370,10 +4370,10 @@ extern void slurmdb_pack_job_rec(void *object, uint16_t rpc_version, Buf buffer)
pack32(job->show_full, buffer);
pack_time(job->start, buffer);
pack16((uint16_t)job->state, buffer);
- if (job->steps)
+ if(job->steps)
count = list_count(job->steps);
pack32(count, buffer);
- if (count) {
+ if(count) {
itr = list_iterator_create(job->steps);
while((step = list_next(itr))) {
slurmdb_pack_step_rec(step, rpc_version,
@@ -4409,7 +4409,7 @@ extern int slurmdb_unpack_job_rec(void **job, uint16_t rpc_version, Buf buffer)
*job = job_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpackstr_xmalloc(&job_ptr->account, &uint32_tmp, buffer);
safe_unpack32(&job_ptr->alloc_cpus, buffer);
safe_unpack32(&job_ptr->alloc_nodes, buffer);
@@ -4437,7 +4437,7 @@ extern int slurmdb_unpack_job_rec(void **job, uint16_t rpc_version, Buf buffer)
safe_unpack_time(&job_ptr->start, buffer);
safe_unpack16(&uint16_tmp, buffer);
job_ptr->state = uint16_tmp;
- if (_unpack_slurmdb_stats(&job_ptr->stats, rpc_version, buffer)
+ if(_unpack_slurmdb_stats(&job_ptr->stats, rpc_version, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
@@ -4445,9 +4445,9 @@ extern int slurmdb_unpack_job_rec(void **job, uint16_t rpc_version, Buf buffer)
job_ptr->steps = list_create(slurmdb_destroy_step_rec);
for(i=0; i<count; i++) {
slurmdb_unpack_step_rec(&step, rpc_version, buffer);
- if (step) {
+ if(step) {
step->job_ptr = job_ptr;
- if (!job_ptr->first_step_ptr)
+ if(!job_ptr->first_step_ptr)
job_ptr->first_step_ptr = step;
list_append(job_ptr->steps, step);
}
@@ -4467,7 +4467,7 @@ extern int slurmdb_unpack_job_rec(void **job, uint16_t rpc_version, Buf buffer)
safe_unpack32(&job_ptr->user_cpu_usec, buffer);
safe_unpackstr_xmalloc(&job_ptr->wckey, &uint32_tmp, buffer);
safe_unpack32(&job_ptr->wckeyid, buffer);
- } else if (rpc_version >= 5) {
+ } else if(rpc_version >= 5) {
safe_unpack32(&job_ptr->alloc_cpus, buffer);
safe_unpack32(&job_ptr->alloc_nodes, buffer);
safe_unpack32(&job_ptr->associd, buffer);
@@ -4491,7 +4491,7 @@ extern int slurmdb_unpack_job_rec(void **job, uint16_t rpc_version, Buf buffer)
safe_unpack32(&job_ptr->resvid, buffer);
safe_unpack32(&job_ptr->req_cpus, buffer);
safe_unpack32(&job_ptr->requid, buffer);
- if (_unpack_slurmdb_stats(&job_ptr->stats, rpc_version, buffer)
+ if(_unpack_slurmdb_stats(&job_ptr->stats, rpc_version, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
safe_unpack32(&job_ptr->show_full, buffer);
@@ -4503,9 +4503,9 @@ extern int slurmdb_unpack_job_rec(void **job, uint16_t rpc_version, Buf buffer)
job_ptr->steps = list_create(slurmdb_destroy_step_rec);
for(i=0; i<count; i++) {
slurmdb_unpack_step_rec(&step, rpc_version, buffer);
- if (step) {
+ if(step) {
step->job_ptr = job_ptr;
- if (!job_ptr->first_step_ptr)
+ if(!job_ptr->first_step_ptr)
job_ptr->first_step_ptr = step;
list_append(job_ptr->steps, step);
}
@@ -4542,8 +4542,8 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
ListIterator itr = NULL;
slurmdb_qos_cond_t *object = (slurmdb_qos_cond_t *)in;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -4552,11 +4552,11 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->description_list)
+ if(object->description_list)
count = list_count(object->description_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->description_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4565,11 +4565,11 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->id_list)
+ if(object->id_list)
count = list_count(object->id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4578,11 +4578,11 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->name_list)
+ if(object->name_list)
count = list_count(object->name_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4594,7 +4594,7 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(object->preempt_mode, buffer);
pack16(object->with_deleted, buffer);
} else {
- if (!object) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -4602,11 +4602,11 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->description_list)
+ if(object->description_list)
count = list_count(object->description_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->description_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4615,11 +4615,11 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->id_list)
+ if(object->id_list)
count = list_count(object->id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4628,11 +4628,11 @@ extern void slurmdb_pack_qos_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->name_list)
+ if(object->name_list)
count = list_count(object->name_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4656,9 +4656,9 @@ extern int slurmdb_unpack_qos_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->description_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4670,7 +4670,7 @@ extern int slurmdb_unpack_qos_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4680,7 +4680,7 @@ extern int slurmdb_unpack_qos_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->name_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4693,7 +4693,7 @@ extern int slurmdb_unpack_qos_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->with_deleted, buffer);
} else {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->description_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -4705,7 +4705,7 @@ extern int slurmdb_unpack_qos_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4715,7 +4715,7 @@ extern int slurmdb_unpack_qos_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->name_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -4743,7 +4743,7 @@ extern void slurmdb_pack_reservation_cond(void *in, uint16_t rpc_version,
ListIterator itr = NULL;
char *tmp_info = NULL;
- if (!object) {
+ if(!object) {
pack32((uint32_t)NO_VAL, buffer);
pack16(0, buffer);
pack32((uint16_t)NO_VAL, buffer);
@@ -4755,11 +4755,11 @@ extern void slurmdb_pack_reservation_cond(void *in, uint16_t rpc_version,
return;
}
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4770,11 +4770,11 @@ extern void slurmdb_pack_reservation_cond(void *in, uint16_t rpc_version,
pack16(object->flags, buffer);
- if (object->id_list)
+ if(object->id_list)
count = list_count(object->id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4783,11 +4783,11 @@ extern void slurmdb_pack_reservation_cond(void *in, uint16_t rpc_version,
}
count = NO_VAL;
- if (object->name_list)
+ if(object->name_list)
count = list_count(object->name_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4814,7 +4814,7 @@ extern int slurmdb_unpack_reservation_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp, buffer);
@@ -4825,7 +4825,7 @@ extern int slurmdb_unpack_reservation_cond(void **object, uint16_t rpc_version,
safe_unpack16(&object_ptr->flags, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp, buffer);
@@ -4834,7 +4834,7 @@ extern int slurmdb_unpack_reservation_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->name_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp, buffer);
@@ -4884,7 +4884,7 @@ unpack_error:
extern void slurmdb_pack_step_rec(slurmdb_step_rec_t *step,
uint16_t rpc_version, Buf buffer)
{
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
pack32(step->elapsed, buffer);
pack_time(step->end, buffer);
pack32((uint32_t)step->exitcode, buffer);
@@ -4920,7 +4920,7 @@ extern int slurmdb_unpack_step_rec(slurmdb_step_rec_t **step,
*step = step_ptr;
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
safe_unpack32(&step_ptr->elapsed, buffer);
safe_unpack_time(&step_ptr->end, buffer);
safe_unpack32(&uint32_tmp, buffer);
@@ -4930,7 +4930,7 @@ extern int slurmdb_unpack_step_rec(slurmdb_step_rec_t **step,
safe_unpackstr_xmalloc(&step_ptr->nodes, &uint32_tmp, buffer);
safe_unpack32(&step_ptr->ntasks, buffer);
safe_unpack32(&step_ptr->requid, buffer);
- if (_unpack_slurmdb_stats(&step_ptr->stats, rpc_version, buffer)
+ if(_unpack_slurmdb_stats(&step_ptr->stats, rpc_version, buffer)
!= SLURM_SUCCESS)
goto unpack_error;
safe_unpack_time(&step_ptr->start, buffer);
@@ -4964,8 +4964,8 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
ListIterator itr = NULL;
slurmdb_txn_cond_t *object = (slurmdb_txn_cond_t *)in;
- if (rpc_version >= 5) {
- if (!object) {
+ if(rpc_version >= 5) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -4978,11 +4978,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
pack16(0, buffer);
return;
}
- if (object->acct_list)
+ if(object->acct_list)
count = list_count(object->acct_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->acct_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -4991,11 +4991,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->action_list)
+ if(object->action_list)
count = list_count(object->action_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->action_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5004,11 +5004,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->actor_list)
+ if(object->actor_list)
count = list_count(object->actor_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->actor_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5017,11 +5017,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5030,11 +5030,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->id_list)
+ if(object->id_list)
count = list_count(object->id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5043,11 +5043,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->info_list)
+ if(object->info_list)
count = list_count(object->info_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->info_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5056,11 +5056,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->name_list)
+ if(object->name_list)
count = list_count(object->name_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5071,11 +5071,11 @@ extern void slurmdb_pack_txn_cond(void *in, uint16_t rpc_version, Buf buffer)
pack_time(object->time_end, buffer);
pack_time(object->time_start, buffer);
- if (object->user_list)
+ if(object->user_list)
count = list_count(object->user_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5100,7 +5100,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
if (rpc_version >= 5) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->acct_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5111,7 +5111,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->action_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5122,7 +5122,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->actor_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5133,7 +5133,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5144,7 +5144,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info,
@@ -5154,7 +5154,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->info_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5165,7 +5165,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->name_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5179,7 +5179,7 @@ extern int slurmdb_unpack_txn_cond(void **object, uint16_t rpc_version,
safe_unpack_time(&object_ptr->time_start, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5207,8 +5207,8 @@ extern void slurmdb_pack_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
ListIterator itr = NULL;
slurmdb_wckey_cond_t *object = (slurmdb_wckey_cond_t *)in;
- if (rpc_version >= 5) {
- if (!object) {
+ if(rpc_version >= 5) {
+ if(!object) {
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
pack32(NO_VAL, buffer);
@@ -5223,11 +5223,11 @@ extern void slurmdb_pack_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
return;
}
- if (object->cluster_list)
+ if(object->cluster_list)
count = list_count(object->cluster_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->cluster_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5236,11 +5236,11 @@ extern void slurmdb_pack_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->id_list)
+ if(object->id_list)
count = list_count(object->id_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->id_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5248,11 +5248,11 @@ extern void slurmdb_pack_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
}
count = NO_VAL;
- if (object->name_list)
+ if(object->name_list)
count = list_count(object->name_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->name_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5264,11 +5264,11 @@ extern void slurmdb_pack_wckey_cond(void *in, uint16_t rpc_version, Buf buffer)
pack_time(object->usage_end, buffer);
pack_time(object->usage_start, buffer);
- if (object->user_list)
+ if(object->user_list)
count = list_count(object->user_list);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->user_list);
while((tmp_info = list_next(itr))) {
packstr(tmp_info, buffer);
@@ -5294,9 +5294,9 @@ extern int slurmdb_unpack_wckey_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->cluster_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5308,7 +5308,7 @@ extern int slurmdb_unpack_wckey_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->id_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&tmp_info, &uint32_tmp,
@@ -5318,7 +5318,7 @@ extern int slurmdb_unpack_wckey_cond(void **object, uint16_t rpc_version,
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->name_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5332,7 +5332,7 @@ extern int slurmdb_unpack_wckey_cond(void **object, uint16_t rpc_version,
safe_unpack_time(&object_ptr->usage_start, buffer);
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->user_list =
list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
@@ -5358,8 +5358,8 @@ extern void slurmdb_pack_archive_cond(void *in, uint16_t rpc_version,
{
slurmdb_archive_cond_t *object = (slurmdb_archive_cond_t *)in;
- if (rpc_version >= 8) {
- if (!object) {
+ if(rpc_version >= 8) {
+ if(!object) {
packnull(buffer);
packnull(buffer);
slurmdb_pack_job_cond(NULL, rpc_version, buffer);
@@ -5378,7 +5378,7 @@ extern void slurmdb_pack_archive_cond(void *in, uint16_t rpc_version,
pack32(object->purge_step, buffer);
pack32(object->purge_suspend, buffer);
} else {
- if (!object) {
+ if(!object) {
packnull(buffer);
pack16((uint16_t)0, buffer);
pack16((uint16_t)0, buffer);
@@ -5420,12 +5420,12 @@ extern int slurmdb_unpack_archive_cond(void **object, uint16_t rpc_version,
*object = object_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpackstr_xmalloc(&object_ptr->archive_dir,
&uint32_tmp, buffer);
safe_unpackstr_xmalloc(&object_ptr->archive_script,
&uint32_tmp, buffer);
- if (slurmdb_unpack_job_cond((void *)&object_ptr->job_cond,
+ if(slurmdb_unpack_job_cond((void *)&object_ptr->job_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
safe_unpack32(&object_ptr->purge_event, buffer);
@@ -5443,36 +5443,36 @@ extern int slurmdb_unpack_archive_cond(void **object, uint16_t rpc_version,
&uint32_tmp, buffer);
safe_unpack16(&a_steps, buffer);
safe_unpack16(&a_suspend, buffer);
- if (slurmdb_unpack_job_cond((void *)&object_ptr->job_cond,
+ if(slurmdb_unpack_job_cond((void *)&object_ptr->job_cond,
rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
safe_unpack16(&tmp16, buffer);
object_ptr->purge_event = tmp16;
- if (tmp16 != (uint16_t)NO_VAL) {
+ if(tmp16 != (uint16_t)NO_VAL) {
object_ptr->purge_event |= SLURMDB_PURGE_MONTHS;
- if (a_events)
+ if(a_events)
object_ptr->purge_event |=
SLURMDB_PURGE_ARCHIVE;
}
safe_unpack16(&tmp16, buffer);
object_ptr->purge_job = tmp16;
- if (tmp16 != (uint16_t)NO_VAL) {
+ if(tmp16 != (uint16_t)NO_VAL) {
object_ptr->purge_job |= SLURMDB_PURGE_MONTHS;
- if (a_jobs)
+ if(a_jobs)
object_ptr->purge_job |= SLURMDB_PURGE_ARCHIVE;
}
safe_unpack16(&tmp16, buffer);
object_ptr->purge_step = tmp16;
- if (tmp16 != (uint16_t)NO_VAL) {
+ if(tmp16 != (uint16_t)NO_VAL) {
object_ptr->purge_step |= SLURMDB_PURGE_MONTHS;
- if (a_steps)
+ if(a_steps)
object_ptr->purge_step |= SLURMDB_PURGE_ARCHIVE;
}
safe_unpack16(&tmp16, buffer);
object_ptr->purge_suspend = tmp16;
- if (tmp16 != (uint16_t)NO_VAL) {
+ if(tmp16 != (uint16_t)NO_VAL) {
object_ptr->purge_suspend |= SLURMDB_PURGE_MONTHS;
- if (a_suspend)
+ if(a_suspend)
object_ptr->purge_suspend |=
SLURMDB_PURGE_ARCHIVE;
}
@@ -5530,11 +5530,11 @@ extern void slurmdb_pack_update_object(slurmdb_update_object_t *object,
}
pack16(object->type, buffer);
- if (object->objects)
+ if(object->objects)
count = list_count(object->objects);
pack32(count, buffer);
- if (count && count != NO_VAL) {
+ if(count && count != NO_VAL) {
itr = list_iterator_create(object->objects);
while((slurmdb_object = list_next(itr))) {
(*(my_function))(slurmdb_object, rpc_version, buffer);
@@ -5595,10 +5595,10 @@ extern int slurmdb_unpack_update_object(slurmdb_update_object_t **object,
goto unpack_error;
}
safe_unpack32(&count, buffer);
- if (count != NO_VAL) {
+ if(count != NO_VAL) {
object_ptr->objects = list_create((*(my_destroy)));
for(i=0; i<count; i++) {
- if (((*(my_function))(&slurmdb_object,
+ if(((*(my_function))(&slurmdb_object,
rpc_version, buffer))
== SLURM_ERROR)
goto unpack_error;
diff --git a/src/common/slurmdbd_defs.c b/src/common/slurmdbd_defs.c
index 45c155b03734c5ab66231f50bada5a4d1f055b94..c0869455a2b5214622f0dc72c36e639f92929238 100644
--- a/src/common/slurmdbd_defs.c
+++ b/src/common/slurmdbd_defs.c
@@ -165,12 +165,12 @@ extern int slurm_open_slurmdbd_conn(char *auth_info, bool make_agent,
slurm_mutex_lock(&agent_lock);
if (make_agent && ((agent_tid == 0) || (agent_list == NULL)))
_create_agent();
- else if (agent_list)
+ else if(agent_list)
_load_dbd_state();
slurm_mutex_unlock(&agent_lock);
- if (tmp_errno) {
+ if(tmp_errno) {
errno = tmp_errno;
return tmp_errno;
} else if (slurmdbd_fd < 0)
@@ -226,12 +226,12 @@ extern int slurm_send_slurmdbd_recv_rc_msg(uint16_t rpc_version,
} else { /* resp->msg_type == DBD_RC */
dbd_rc_msg_t *msg = resp->data;
*resp_code = msg->return_code;
- if (msg->return_code != SLURM_SUCCESS
+ if(msg->return_code != SLURM_SUCCESS
&& msg->return_code != ACCOUNTING_FIRST_REG) {
char *comment = msg->comment;
- if (!comment)
+ if(!comment)
comment = slurm_strerror(msg->return_code);
- if (msg->sent_type == DBD_REGISTER_CTLD &&
+ if(msg->sent_type == DBD_REGISTER_CTLD &&
slurm_get_accounting_storage_enforce()) {
error("slurmdbd: Issue with call "
"%s(%u): %u(%s)",
@@ -283,7 +283,7 @@ extern int slurm_send_recv_slurmdbd_msg(uint16_t rpc_version,
if (slurmdbd_fd < 0) {
/* Either slurm_open_slurmdbd_conn() was not executed or
* the connection to Slurm DBD has been closed */
- if (req->msg_type == DBD_GET_CONFIG)
+ if(req->msg_type == DBD_GET_CONFIG)
_open_slurmdbd_fd(0);
else
_open_slurmdbd_fd(1);
@@ -293,7 +293,7 @@ extern int slurm_send_recv_slurmdbd_msg(uint16_t rpc_version,
}
}
- if (!(buffer = pack_slurmdbd_msg(req, rpc_version))) {
+ if(!(buffer = pack_slurmdbd_msg(req, rpc_version))) {
rc = SLURM_ERROR;
goto end_it;
}
@@ -409,10 +409,10 @@ again:
if (slurmdbd_fd < 0) {
debug("slurmdbd: slurm_open_msg_conn to %s:%u: %m",
slurmdbd_host, slurmdbd_port);
- if (try_backup) {
+ if(try_backup) {
try_backup = false;
xfree(slurmdbd_host);
- if ((slurmdbd_host =
+ if((slurmdbd_host =
slurm_get_accounting_storage_backup_host()))
goto again;
}
@@ -420,7 +420,7 @@ again:
int rc;
fd_set_nonblocking(slurmdbd_fd);
rc = _send_init_msg();
- if ((!need_db && rc == ESLURM_DB_CONNECTION)
+ if((!need_db && rc == ESLURM_DB_CONNECTION)
|| (rc == SLURM_SUCCESS)) {
debug("slurmdbd: Sent DbdInit msg");
/* clear errno (checked after this for
@@ -786,155 +786,155 @@ unpack_error:
extern slurmdbd_msg_type_t str_2_slurmdbd_msg_type(char *msg_type)
{
- if (!msg_type) {
+ if(!msg_type) {
return NO_VAL;
- } else if (!strcasecmp(msg_type, "Init")) {
+ } else if(!strcasecmp(msg_type, "Init")) {
return DBD_INIT;
- } else if (!strcasecmp(msg_type, "Fini")) {
+ } else if(!strcasecmp(msg_type, "Fini")) {
return DBD_FINI;
- } else if (!strcasecmp(msg_type, "Add Accounts")) {
+ } else if(!strcasecmp(msg_type, "Add Accounts")) {
return DBD_ADD_ACCOUNTS;
- } else if (!strcasecmp(msg_type, "Add Account Coord")) {
+ } else if(!strcasecmp(msg_type, "Add Account Coord")) {
return DBD_ADD_ACCOUNT_COORDS;
- } else if (!strcasecmp(msg_type, "Add Associations")) {
+ } else if(!strcasecmp(msg_type, "Add Associations")) {
return DBD_ADD_ASSOCS;
- } else if (!strcasecmp(msg_type, "Add Clusters")) {
+ } else if(!strcasecmp(msg_type, "Add Clusters")) {
return DBD_ADD_CLUSTERS;
- } else if (!strcasecmp(msg_type, "Add Users")) {
+ } else if(!strcasecmp(msg_type, "Add Users")) {
return DBD_ADD_USERS;
- } else if (!strcasecmp(msg_type, "Cluster Processors")) {
+ } else if(!strcasecmp(msg_type, "Cluster Processors")) {
return DBD_CLUSTER_CPUS;
- } else if (!strcasecmp(msg_type, "Flush Jobs")) {
+ } else if(!strcasecmp(msg_type, "Flush Jobs")) {
return DBD_FLUSH_JOBS;
- } else if (!strcasecmp(msg_type, "Get Accounts")) {
+ } else if(!strcasecmp(msg_type, "Get Accounts")) {
return DBD_GET_ACCOUNTS;
- } else if (!strcasecmp(msg_type, "Get Associations")) {
+ } else if(!strcasecmp(msg_type, "Get Associations")) {
return DBD_GET_ASSOCS;
- } else if (!strcasecmp(msg_type, "Get Association Usage")) {
+ } else if(!strcasecmp(msg_type, "Get Association Usage")) {
return DBD_GET_ASSOC_USAGE;
- } else if (!strcasecmp(msg_type, "Get Clusters")) {
+ } else if(!strcasecmp(msg_type, "Get Clusters")) {
return DBD_GET_CLUSTERS;
- } else if (!strcasecmp(msg_type, "Get Cluster Usage")) {
+ } else if(!strcasecmp(msg_type, "Get Cluster Usage")) {
return DBD_GET_CLUSTER_USAGE;
- } else if (!strcasecmp(msg_type, "Get Events")) {
+ } else if(!strcasecmp(msg_type, "Get Events")) {
return DBD_GET_EVENTS;
- } else if (!strcasecmp(msg_type, "Get Jobs")) {
+ } else if(!strcasecmp(msg_type, "Get Jobs")) {
return DBD_GET_JOBS;
- } else if (!strcasecmp(msg_type, "Get Problems")) {
+ } else if(!strcasecmp(msg_type, "Get Problems")) {
return DBD_GET_PROBS;
- } else if (!strcasecmp(msg_type, "Get Users")) {
+ } else if(!strcasecmp(msg_type, "Get Users")) {
return DBD_GET_USERS;
- } else if (!strcasecmp(msg_type, "Got Accounts")) {
+ } else if(!strcasecmp(msg_type, "Got Accounts")) {
return DBD_GOT_ACCOUNTS;
- } else if (!strcasecmp(msg_type, "Got Associations")) {
+ } else if(!strcasecmp(msg_type, "Got Associations")) {
return DBD_GOT_ASSOCS;
- } else if (!strcasecmp(msg_type, "Got Association Usage")) {
+ } else if(!strcasecmp(msg_type, "Got Association Usage")) {
return DBD_GOT_ASSOC_USAGE;
- } else if (!strcasecmp(msg_type, "Got Clusters")) {
+ } else if(!strcasecmp(msg_type, "Got Clusters")) {
return DBD_GOT_CLUSTERS;
- } else if (!strcasecmp(msg_type, "Got Cluster Usage")) {
+ } else if(!strcasecmp(msg_type, "Got Cluster Usage")) {
return DBD_GOT_CLUSTER_USAGE;
- } else if (!strcasecmp(msg_type, "Got Events")) {
+ } else if(!strcasecmp(msg_type, "Got Events")) {
return DBD_GOT_EVENTS;
- } else if (!strcasecmp(msg_type, "Got Jobs")) {
+ } else if(!strcasecmp(msg_type, "Got Jobs")) {
return DBD_GOT_JOBS;
- } else if (!strcasecmp(msg_type, "Got List")) {
+ } else if(!strcasecmp(msg_type, "Got List")) {
return DBD_GOT_LIST;
- } else if (!strcasecmp(msg_type, "Got Problems")) {
+ } else if(!strcasecmp(msg_type, "Got Problems")) {
return DBD_GOT_PROBS;
- } else if (!strcasecmp(msg_type, "Got Users")) {
+ } else if(!strcasecmp(msg_type, "Got Users")) {
return DBD_GOT_USERS;
- } else if (!strcasecmp(msg_type, "Job Complete")) {
+ } else if(!strcasecmp(msg_type, "Job Complete")) {
return DBD_JOB_COMPLETE;
- } else if (!strcasecmp(msg_type, "Job Start")) {
+ } else if(!strcasecmp(msg_type, "Job Start")) {
return DBD_JOB_START;
- } else if (!strcasecmp(msg_type, "ID RC")) {
+ } else if(!strcasecmp(msg_type, "ID RC")) {
return DBD_ID_RC;
- } else if (!strcasecmp(msg_type, "Job Suspend")) {
+ } else if(!strcasecmp(msg_type, "Job Suspend")) {
return DBD_JOB_SUSPEND;
- } else if (!strcasecmp(msg_type, "Modify Accounts")) {
+ } else if(!strcasecmp(msg_type, "Modify Accounts")) {
return DBD_MODIFY_ACCOUNTS;
- } else if (!strcasecmp(msg_type, "Modify Associations")) {
+ } else if(!strcasecmp(msg_type, "Modify Associations")) {
return DBD_MODIFY_ASSOCS;
- } else if (!strcasecmp(msg_type, "Modify Clusters")) {
+ } else if(!strcasecmp(msg_type, "Modify Clusters")) {
return DBD_MODIFY_CLUSTERS;
- } else if (!strcasecmp(msg_type, "Modify QOS")) {
+ } else if(!strcasecmp(msg_type, "Modify QOS")) {
return DBD_MODIFY_QOS;
- } else if (!strcasecmp(msg_type, "Modify Users")) {
+ } else if(!strcasecmp(msg_type, "Modify Users")) {
return DBD_MODIFY_USERS;
- } else if (!strcasecmp(msg_type, "Node State")) {
+ } else if(!strcasecmp(msg_type, "Node State")) {
return DBD_NODE_STATE;
- } else if (!strcasecmp(msg_type, "RC")) {
+ } else if(!strcasecmp(msg_type, "RC")) {
return DBD_RC;
- } else if (!strcasecmp(msg_type, "Register Cluster")) {
+ } else if(!strcasecmp(msg_type, "Register Cluster")) {
return DBD_REGISTER_CTLD;
- } else if (!strcasecmp(msg_type, "Remove Accounts")) {
+ } else if(!strcasecmp(msg_type, "Remove Accounts")) {
return DBD_REMOVE_ACCOUNTS;
- } else if (!strcasecmp(msg_type, "Remove Account Coords")) {
+ } else if(!strcasecmp(msg_type, "Remove Account Coords")) {
return DBD_REMOVE_ACCOUNT_COORDS;
- } else if (!strcasecmp(msg_type, "Archive Dump")) {
+ } else if(!strcasecmp(msg_type, "Archive Dump")) {
return DBD_ARCHIVE_DUMP;
- } else if (!strcasecmp(msg_type, "Archive Load")) {
+ } else if(!strcasecmp(msg_type, "Archive Load")) {
return DBD_ARCHIVE_LOAD;
- } else if (!strcasecmp(msg_type, "Remove Associations")) {
+ } else if(!strcasecmp(msg_type, "Remove Associations")) {
return DBD_REMOVE_ASSOCS;
- } else if (!strcasecmp(msg_type, "Remove Clusters")) {
+ } else if(!strcasecmp(msg_type, "Remove Clusters")) {
return DBD_REMOVE_CLUSTERS;
- } else if (!strcasecmp(msg_type, "Remove Users")) {
+ } else if(!strcasecmp(msg_type, "Remove Users")) {
return DBD_REMOVE_USERS;
- } else if (!strcasecmp(msg_type, "Roll Usage")) {
+ } else if(!strcasecmp(msg_type, "Roll Usage")) {
return DBD_ROLL_USAGE;
- } else if (!strcasecmp(msg_type, "Step Complete")) {
+ } else if(!strcasecmp(msg_type, "Step Complete")) {
return DBD_STEP_COMPLETE;
- } else if (!strcasecmp(msg_type, "Step Start")) {
+ } else if(!strcasecmp(msg_type, "Step Start")) {
return DBD_STEP_START;
- } else if (!strcasecmp(msg_type, "Get Jobs Conditional")) {
+ } else if(!strcasecmp(msg_type, "Get Jobs Conditional")) {
return DBD_GET_JOBS_COND;
- } else if (!strcasecmp(msg_type, "Get Transations")) {
+ } else if(!strcasecmp(msg_type, "Get Transations")) {
return DBD_GET_TXN;
- } else if (!strcasecmp(msg_type, "Got Transations")) {
+ } else if(!strcasecmp(msg_type, "Got Transations")) {
return DBD_GOT_TXN;
- } else if (!strcasecmp(msg_type, "Add QOS")) {
+ } else if(!strcasecmp(msg_type, "Add QOS")) {
return DBD_ADD_QOS;
- } else if (!strcasecmp(msg_type, "Get QOS")) {
+ } else if(!strcasecmp(msg_type, "Get QOS")) {
return DBD_GET_QOS;
- } else if (!strcasecmp(msg_type, "Got QOS")) {
+ } else if(!strcasecmp(msg_type, "Got QOS")) {
return DBD_GOT_QOS;
- } else if (!strcasecmp(msg_type, "Remove QOS")) {
+ } else if(!strcasecmp(msg_type, "Remove QOS")) {
return DBD_REMOVE_QOS;
- } else if (!strcasecmp(msg_type, "Add WCKeys")) {
+ } else if(!strcasecmp(msg_type, "Add WCKeys")) {
return DBD_ADD_WCKEYS;
- } else if (!strcasecmp(msg_type, "Get WCKeys")) {
+ } else if(!strcasecmp(msg_type, "Get WCKeys")) {
return DBD_GET_WCKEYS;
- } else if (!strcasecmp(msg_type, "Got WCKeys")) {
+ } else if(!strcasecmp(msg_type, "Got WCKeys")) {
return DBD_GOT_WCKEYS;
- } else if (!strcasecmp(msg_type, "Remove WCKeys")) {
+ } else if(!strcasecmp(msg_type, "Remove WCKeys")) {
return DBD_REMOVE_WCKEYS;
- } else if (!strcasecmp(msg_type, "Get WCKey Usage")) {
+ } else if(!strcasecmp(msg_type, "Get WCKey Usage")) {
return DBD_GET_WCKEY_USAGE;
- } else if (!strcasecmp(msg_type, "Got WCKey Usage")) {
+ } else if(!strcasecmp(msg_type, "Got WCKey Usage")) {
return DBD_GOT_WCKEY_USAGE;
- } else if (!strcasecmp(msg_type, "Add Reservation")) {
+ } else if(!strcasecmp(msg_type, "Add Reservation")) {
return DBD_ADD_RESV;
- } else if (!strcasecmp(msg_type, "Remove Reservation")) {
+ } else if(!strcasecmp(msg_type, "Remove Reservation")) {
return DBD_REMOVE_RESV;
- } else if (!strcasecmp(msg_type, "Modify Reservation")) {
+ } else if(!strcasecmp(msg_type, "Modify Reservation")) {
return DBD_MODIFY_RESV;
- } else if (!strcasecmp(msg_type, "Get Reservations")) {
+ } else if(!strcasecmp(msg_type, "Get Reservations")) {
return DBD_GET_RESVS;
- } else if (!strcasecmp(msg_type, "Got Reservations")) {
+ } else if(!strcasecmp(msg_type, "Got Reservations")) {
return DBD_GOT_RESVS;
- } else if (!strcasecmp(msg_type, "Get Config")) {
+ } else if(!strcasecmp(msg_type, "Get Config")) {
return DBD_GET_CONFIG;
- } else if (!strcasecmp(msg_type, "Got Config")) {
+ } else if(!strcasecmp(msg_type, "Got Config")) {
return DBD_GOT_CONFIG;
- } else if (!strcasecmp(msg_type, "Send Multiple Job Starts")) {
+ } else if(!strcasecmp(msg_type, "Send Multiple Job Starts")) {
return DBD_SEND_MULT_JOB_START;
- } else if (!strcasecmp(msg_type, "Got Multiple Job Starts")) {
+ } else if(!strcasecmp(msg_type, "Got Multiple Job Starts")) {
return DBD_GOT_MULT_JOB_START;
- } else if (!strcasecmp(msg_type, "Send Multiple Messages")) {
+ } else if(!strcasecmp(msg_type, "Send Multiple Messages")) {
return DBD_SEND_MULT_MSG;
- } else if (!strcasecmp(msg_type, "Got Multiple Message Returns")) {
+ } else if(!strcasecmp(msg_type, "Got Multiple Message Returns")) {
return DBD_GOT_MULT_MSG;
} else {
return NO_VAL;
@@ -947,445 +947,445 @@ extern char *slurmdbd_msg_type_2_str(slurmdbd_msg_type_t msg_type, int get_enum)
{
switch(msg_type) {
case DBD_INIT:
- if (get_enum) {
+ if(get_enum) {
return "DBD_INIT";
} else
return "Init";
break;
case DBD_FINI:
- if (get_enum) {
+ if(get_enum) {
return "DBD_FINI";
} else
return "Fini";
break;
case DBD_ADD_ACCOUNTS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_ACCOUNTS";
} else
return "Add Accounts";
break;
case DBD_ADD_ACCOUNT_COORDS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_ACCOUNT_COORDS";
} else
return "Add Account Coord";
break;
case DBD_ADD_ASSOCS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_ASSOCS";
} else
return "Add Associations";
break;
case DBD_ADD_CLUSTERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_CLUSTERS";
} else
return "Add Clusters";
break;
case DBD_ADD_USERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_USERS";
} else
return "Add Users";
break;
case DBD_CLUSTER_CPUS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_CLUSTER_CPUS";
} else
return "Cluster Processors";
break;
case DBD_FLUSH_JOBS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_FLUSH_JOBS";
} else
return "Flush Jobs";
break;
case DBD_GET_ACCOUNTS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_ACCOUNTS";
} else
return "Get Accounts";
break;
case DBD_GET_ASSOCS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_ASSOCS";
} else
return "Get Associations";
break;
case DBD_GET_ASSOC_USAGE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_ASSOC_USAGE";
} else
return "Get Association Usage";
break;
case DBD_GET_CLUSTERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_CLUSTERS";
} else
return "Get Clusters";
break;
case DBD_GET_CLUSTER_USAGE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_CLUSTER_USAGE";
} else
return "Get Cluster Usage";
break;
case DBD_GET_EVENTS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_EVENTS";
} else
return "Get Events";
break;
case DBD_GET_JOBS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_JOBS";
} else
return "Get Jobs";
break;
case DBD_GET_PROBS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_PROBS";
} else
return "Get Problems";
break;
case DBD_GET_USERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_USERS";
} else
return "Get Users";
break;
case DBD_GOT_ACCOUNTS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_ACCOUNTS";
} else
return "Got Accounts";
break;
case DBD_GOT_ASSOCS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_ASSOCS";
} else
return "Got Associations";
break;
case DBD_GOT_ASSOC_USAGE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_ASSOC_USAGE";
} else
return "Got Association Usage";
break;
case DBD_GOT_CLUSTERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_CLUSTERS";
} else
return "Got Clusters";
break;
case DBD_GOT_CLUSTER_USAGE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_CLUSTER_USAGE";
} else
return "Got Cluster Usage";
break;
case DBD_GOT_EVENTS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_EVENTS";
} else
return "Got Events";
break;
case DBD_GOT_JOBS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_JOBS";
} else
return "Got Jobs";
break;
case DBD_GOT_LIST:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_LIST";
} else
return "Got List";
break;
case DBD_GOT_PROBS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_PROBS";
} else
return "Got Problems";
break;
case DBD_GOT_USERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_USERS";
} else
return "Got Users";
break;
case DBD_JOB_COMPLETE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_JOB_COMPLETE";
} else
return "Job Complete";
break;
case DBD_JOB_START:
- if (get_enum) {
+ if(get_enum) {
return "DBD_JOB_START";
} else
return "Job Start";
break;
case DBD_ID_RC:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ID_RC";
} else
return "ID RC";
break;
case DBD_JOB_SUSPEND:
- if (get_enum) {
+ if(get_enum) {
return "DBD_JOB_SUSPEND";
} else
return "Job Suspend";
break;
case DBD_MODIFY_ACCOUNTS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_MODIFY_ACCOUNTS";
} else
return "Modify Accounts";
break;
case DBD_MODIFY_ASSOCS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_MODIFY_ASSOCS";
} else
return "Modify Associations";
break;
case DBD_MODIFY_CLUSTERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_MODIFY_CLUSTERS";
} else
return "Modify Clusters";
break;
case DBD_MODIFY_QOS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_MODIFY_QOS";
} else
return "Modify QOS";
break;
case DBD_MODIFY_USERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_MODIFY_USERS";
} else
return "Modify Users";
break;
case DBD_NODE_STATE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_NODE_STATE";
} else
return "Node State";
break;
case DBD_RC:
- if (get_enum) {
+ if(get_enum) {
return "DBD_RC";
} else
return "Return Code";
break;
case DBD_REGISTER_CTLD:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REGISTER_CTLD";
} else
return "Register Cluster";
break;
case DBD_REMOVE_ACCOUNTS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_ACCOUNTS";
} else
return "Remove Accounts";
break;
case DBD_REMOVE_ACCOUNT_COORDS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_ACCOUNT_COORDS";
} else
return "Remove Account Coords";
break;
case DBD_ARCHIVE_DUMP:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ARCHIVE_DUMP";
} else
return "Archive Dump";
break;
case DBD_ARCHIVE_LOAD:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ARCHIVE_LOAD";
} else
return "Archive Load";
break;
case DBD_REMOVE_ASSOCS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_ASSOCS";
} else
return "Remove Associations";
break;
case DBD_REMOVE_CLUSTERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_CLUSTERS";
} else
return "Remove Clusters";
break;
case DBD_REMOVE_USERS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_USERS";
} else
return "Remove Users";
break;
case DBD_ROLL_USAGE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ROLL_USAGE";
} else
return "Roll Usage";
break;
case DBD_STEP_COMPLETE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_STEP_COMPLETE";
} else
return "Step Complete";
break;
case DBD_STEP_START:
- if (get_enum) {
+ if(get_enum) {
return "DBD_STEP_START";
} else
return "Step Start";
break;
case DBD_GET_JOBS_COND:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_JOBS_COND";
} else
return "Get Jobs Conditional";
break;
case DBD_GET_TXN:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_TXN";
} else
return "Get Transations";
break;
case DBD_GOT_TXN:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_TXN";
} else
return "Got Transations";
break;
case DBD_ADD_QOS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_QOS";
} else
return "Add QOS";
break;
case DBD_GET_QOS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_QOS";
} else
return "Get QOS";
break;
case DBD_GOT_QOS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_QOS";
} else
return "Got QOS";
break;
case DBD_REMOVE_QOS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_QOS";
} else
return "Remove QOS";
break;
case DBD_ADD_WCKEYS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_WCKEYS";
} else
return "Add WCKeys";
break;
case DBD_GET_WCKEYS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_WCKEYS";
} else
return "Get WCKeys";
break;
case DBD_GOT_WCKEYS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_WCKEYS";
} else
return "Got WCKeys";
break;
case DBD_REMOVE_WCKEYS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_WCKEYS";
} else
return "Remove WCKeys";
break;
case DBD_GET_WCKEY_USAGE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_WCKEY_USAGE";
} else
return "Get WCKey Usage";
break;
case DBD_GOT_WCKEY_USAGE:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_WCKEY_USAGE";
} else
return "Got WCKey Usage";
break;
case DBD_ADD_RESV:
- if (get_enum) {
+ if(get_enum) {
return "DBD_ADD_RESV";
} else
return "Add Reservation";
break;
case DBD_REMOVE_RESV:
- if (get_enum) {
+ if(get_enum) {
return "DBD_REMOVE_RESV";
} else
return "Remove Reservation";
break;
case DBD_MODIFY_RESV:
- if (get_enum) {
+ if(get_enum) {
return "DBD_MODIFY_RESV";
} else
return "Modify Reservation";
break;
case DBD_GET_RESVS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_RESVS";
} else
return "Get Reservations";
break;
case DBD_GOT_RESVS:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_RESVS";
} else
return "Got Reservations";
break;
case DBD_GET_CONFIG:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GET_CONFIG";
} else
return "Get Config";
break;
case DBD_GOT_CONFIG:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_CONFIG";
} else
return "Got Config";
break;
case DBD_SEND_MULT_JOB_START:
- if (get_enum) {
+ if(get_enum) {
return "DBD_SEND_MULT_JOB_START";
} else
return "Send Multiple Job Starts";
break;
case DBD_GOT_MULT_JOB_START:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_MULT_JOB_START";
} else
return "Got Multiple Job Starts";
break;
case DBD_SEND_MULT_MSG:
- if (get_enum) {
+ if(get_enum) {
return "DBD_SEND_MULT_MSG";
} else
return "Send Multiple Messages";
break;
case DBD_GOT_MULT_MSG:
- if (get_enum) {
+ if(get_enum) {
return "DBD_GOT_MULT_MSG";
} else
return "Got Multiple Message Returns";
@@ -1401,7 +1401,7 @@ extern char *slurmdbd_msg_type_2_str(slurmdbd_msg_type_t msg_type, int get_enum)
extern void slurmdbd_free_buffer(void *x)
{
Buf buffer = (Buf) x;
- if (buffer)
+ if(buffer)
free_buf(buffer);
}
@@ -1434,9 +1434,9 @@ static int _send_init_msg()
read_timeout = slurm_get_msg_timeout() * 1000;
rc = _get_return_code(SLURMDBD_VERSION, read_timeout);
- if (tmp_errno)
+ if(tmp_errno)
errno = tmp_errno;
- else if (rc != SLURM_SUCCESS)
+ else if(rc != SLURM_SUCCESS)
errno = rc;
return rc;
}
@@ -1448,7 +1448,7 @@ static int _send_fini_msg(void)
/* If the connection is already gone, we don't need to send a
fini. */
- if (_fd_writeable(slurmdbd_fd) == -1)
+ if(_fd_writeable(slurmdbd_fd) == -1)
return SLURM_SUCCESS;
buffer = init_buf(1024);
@@ -1497,7 +1497,7 @@ static int _send_msg(Buf buffer)
return EAGAIN;
/* if errno is ACCESS_DENIED do not try to reopen to
connection just return that */
- if (errno == ESLURM_ACCESS_DENIED)
+ if(errno == ESLURM_ACCESS_DENIED)
return ESLURM_ACCESS_DENIED;
_reopen_slurmdbd_fd();
rc = _fd_writeable(slurmdbd_fd);
@@ -1553,7 +1553,7 @@ static int _unpack_return_code(uint16_t rpc_version, Buf buffer)
== SLURM_SUCCESS) {
rc = msg->return_code;
if (rc != SLURM_SUCCESS) {
- if (msg->sent_type == DBD_REGISTER_CTLD &&
+ if(msg->sent_type == DBD_REGISTER_CTLD &&
slurm_get_accounting_storage_enforce()) {
error("slurmdbd: DBD_RC is %d from "
"%s(%u): %s",
@@ -1630,7 +1630,7 @@ static int _handle_mult_rc_ret(uint16_t rpc_version, int read_timeout)
ListIterator itr =
list_iterator_create(list_msg->my_list);
while((out_buf = list_next(itr))) {
- if ((rc = _unpack_return_code(
+ if((rc = _unpack_return_code(
rpc_version, out_buf))
!= SLURM_SUCCESS)
break;
@@ -1647,7 +1647,7 @@ static int _handle_mult_rc_ret(uint16_t rpc_version, int read_timeout)
== SLURM_SUCCESS) {
rc = msg->return_code;
if (rc != SLURM_SUCCESS) {
- if (msg->sent_type == DBD_REGISTER_CTLD &&
+ if(msg->sent_type == DBD_REGISTER_CTLD &&
slurm_get_accounting_storage_enforce()) {
error("slurmdbd: DBD_RC is %d from "
"%s(%u): %s",
@@ -1938,7 +1938,7 @@ static void *_agent(void *x)
while (agent_shutdown == 0) {
/* START_TIMER; */
slurm_mutex_lock(&slurmdbd_lock);
- if (halt_agent)
+ if(halt_agent)
pthread_cond_wait(&slurmdbd_cond, &slurmdbd_lock);
if ((slurmdbd_fd < 0) &&
@@ -1967,7 +1967,7 @@ static void *_agent(void *x)
info("slurmdbd: agent queue size %u", cnt);
/* Leave item on the queue until processing complete */
if (agent_list) {
- if (list_count(agent_list) > 1) {
+ if(list_count(agent_list) > 1) {
list_msg.my_list = agent_list;
buffer = pack_slurmdbd_msg(&list_req,
SLURMDBD_VERSION);
@@ -1980,7 +1980,7 @@ static void *_agent(void *x)
slurm_mutex_unlock(&slurmdbd_lock);
slurm_mutex_lock(&assoc_cache_mutex);
- if (slurmdbd_fd >= 0 && running_cache)
+ if(slurmdbd_fd >= 0 && running_cache)
pthread_cond_signal(&assoc_cache_cond);
slurm_mutex_unlock(&assoc_cache_mutex);
@@ -1997,7 +1997,7 @@ static void *_agent(void *x)
break;
}
error("slurmdbd: Failure sending message: %d: %m", rc);
- } else if (list_msg.my_list) {
+ } else if(list_msg.my_list) {
rc = _handle_mult_rc_ret(SLURMDBD_VERSION,
read_timeout);
} else {
@@ -2013,7 +2013,7 @@ static void *_agent(void *x)
}
slurm_mutex_unlock(&slurmdbd_lock);
slurm_mutex_lock(&assoc_cache_mutex);
- if (slurmdbd_fd >= 0 && running_cache)
+ if(slurmdbd_fd >= 0 && running_cache)
pthread_cond_signal(&assoc_cache_cond);
slurm_mutex_unlock(&assoc_cache_mutex);
@@ -2024,7 +2024,7 @@ static void *_agent(void *x)
list_msg.my_list as NULL as that is the
sign we sent a mult_msg.
*/
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_msg.my_list = NULL;
else
buffer = (Buf) list_dequeue(agent_list);
@@ -2035,7 +2035,7 @@ static void *_agent(void *x)
/* We still need to free a mult_msg even if we
got a failure.
*/
- if (list_msg.my_list) {
+ if(list_msg.my_list) {
list_msg.my_list = NULL;
free_buf(buffer);
}
@@ -2086,7 +2086,7 @@ static void _save_dbd_state(void)
set_buf_offset(buffer, 0);
unpack16(&msg_type, buffer);
set_buf_offset(buffer, offset);
- if (msg_type == DBD_REGISTER_CTLD) {
+ if(msg_type == DBD_REGISTER_CTLD) {
free_buf(buffer);
continue;
}
@@ -2115,7 +2115,7 @@ static void _load_dbd_state(void)
fd = open(dbd_fname, O_RDONLY);
if (fd < 0) {
/* don't print an error message if there is no file */
- if (errno == ENOENT)
+ if(errno == ENOENT)
debug4("slurmdbd: There is no state save file to "
"open by name %s", dbd_fname);
else
@@ -2265,8 +2265,8 @@ static int _purge_job_start_req(void)
\****************************************************************************/
void inline slurmdbd_free_acct_coord_msg(dbd_acct_coord_msg_t *msg)
{
- if (msg) {
- if (msg->acct_list) {
+ if(msg) {
+ if(msg->acct_list) {
list_destroy(msg->acct_list);
msg->acct_list = NULL;
}
@@ -2299,7 +2299,7 @@ void inline slurmdbd_free_rec_msg(dbd_rec_msg_t *msg,
fatal("Unknown rec type");
return;
}
- if (msg->rec)
+ if(msg->rec)
(*(my_destroy))(msg->rec);
xfree(msg);
}
@@ -2356,7 +2356,7 @@ void inline slurmdbd_free_cond_msg(dbd_cond_msg_t *msg,
fatal("Unknown cond type");
return;
}
- if (msg->cond)
+ if(msg->cond)
(*(my_destroy))(msg->cond);
xfree(msg);
}
@@ -2366,9 +2366,9 @@ void inline slurmdbd_free_get_jobs_msg(dbd_get_jobs_msg_t *msg)
{
if (msg) {
xfree(msg->cluster_name);
- if (msg->selected_steps)
+ if(msg->selected_steps)
list_destroy(msg->selected_steps);
- if (msg->selected_parts)
+ if(msg->selected_parts)
list_destroy(msg->selected_parts);
xfree(msg->user);
xfree(msg);
@@ -2377,7 +2377,7 @@ void inline slurmdbd_free_get_jobs_msg(dbd_get_jobs_msg_t *msg)
void inline slurmdbd_free_init_msg(dbd_init_msg_t *msg)
{
- if (msg) {
+ if(msg) {
xfree(msg->cluster_name);
xfree(msg);
}
@@ -2425,7 +2425,7 @@ void inline slurmdbd_free_job_suspend_msg(dbd_job_suspend_msg_t *msg)
void inline slurmdbd_free_list_msg(dbd_list_msg_t *msg)
{
if (msg) {
- if (msg->my_list)
+ if(msg->my_list)
list_destroy(msg->my_list);
xfree(msg);
}
@@ -2464,9 +2464,9 @@ void inline slurmdbd_free_modify_msg(dbd_modify_msg_t *msg,
return;
}
- if (msg->cond)
+ if(msg->cond)
(*(destroy_cond))(msg->cond);
- if (msg->rec)
+ if(msg->rec)
(*(destroy_rec))(msg->rec);
xfree(msg);
}
@@ -2483,7 +2483,7 @@ void inline slurmdbd_free_node_state_msg(dbd_node_state_msg_t *msg)
void inline slurmdbd_free_rc_msg(dbd_rc_msg_t *msg)
{
- if (msg) {
+ if(msg) {
xfree(msg->comment);
xfree(msg);
}
@@ -2540,7 +2540,7 @@ void inline slurmdbd_free_usage_msg(dbd_usage_msg_t *msg,
return;
}
- if (msg->rec)
+ if(msg->rec)
(*(destroy_rec))(msg->rec);
xfree(msg);
}
@@ -2557,11 +2557,11 @@ slurmdbd_pack_acct_coord_msg(dbd_acct_coord_msg_t *msg,
ListIterator itr = NULL;
uint32_t count = 0;
- if (msg->acct_list)
+ if(msg->acct_list)
count = list_count(msg->acct_list);
pack32(count, buffer);
- if (count) {
+ if(count) {
itr = list_iterator_create(msg->acct_list);
while((acct = list_next(itr))) {
packstr(acct, buffer);
@@ -2585,7 +2585,7 @@ slurmdbd_unpack_acct_coord_msg(dbd_acct_coord_msg_t **msg,
*msg = msg_ptr;
safe_unpack32(&count, buffer);
- if (count) {
+ if(count) {
msg_ptr->acct_list = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&acct, &uint32_tmp, buffer);
@@ -2593,7 +2593,7 @@ slurmdbd_unpack_acct_coord_msg(dbd_acct_coord_msg_t **msg,
}
}
- if (slurmdb_unpack_user_cond((void *)&msg_ptr->cond, rpc_version, buffer)
+ if(slurmdb_unpack_user_cond((void *)&msg_ptr->cond, rpc_version, buffer)
== SLURM_ERROR)
goto unpack_error;
return SLURM_SUCCESS;
@@ -2608,7 +2608,7 @@ void inline
slurmdbd_pack_cluster_cpus_msg(dbd_cluster_cpus_msg_t *msg,
uint16_t rpc_version, Buf buffer)
{
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
packstr(msg->cluster_nodes, buffer);
pack32(msg->cpu_count, buffer);
pack_time(msg->event_time, buffer);
@@ -2631,7 +2631,7 @@ slurmdbd_unpack_cluster_cpus_msg(dbd_cluster_cpus_msg_t **msg,
msg_ptr = xmalloc(sizeof(dbd_cluster_cpus_msg_t));
*msg = msg_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpackstr_xmalloc(&msg_ptr->cluster_nodes,
&uint32_tmp, buffer);
safe_unpack32(&msg_ptr->cpu_count, buffer);
@@ -2693,7 +2693,7 @@ int inline slurmdbd_unpack_rec_msg(dbd_rec_msg_t **msg,
msg_ptr = xmalloc(sizeof(dbd_rec_msg_t));
*msg = msg_ptr;
- if ((*(my_function))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
+ if((*(my_function))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
return SLURM_SUCCESS;
@@ -2815,7 +2815,7 @@ int inline slurmdbd_unpack_cond_msg(dbd_cond_msg_t **msg,
msg_ptr = xmalloc(sizeof(dbd_cond_msg_t));
*msg = msg_ptr;
- if ((*(my_function))(&msg_ptr->cond, rpc_version, buffer) == SLURM_ERROR)
+ if((*(my_function))(&msg_ptr->cond, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
return SLURM_SUCCESS;
@@ -2842,11 +2842,11 @@ void inline slurmdbd_pack_get_jobs_msg(dbd_get_jobs_msg_t *msg,
pack_time(msg->last_update, buffer);
- if (msg->selected_steps)
+ if(msg->selected_steps)
i = list_count(msg->selected_steps);
pack32(i, buffer);
- if (i) {
+ if(i) {
itr = list_iterator_create(msg->selected_steps);
while((job = list_next(itr))) {
slurmdb_pack_selected_step(job, rpc_version, buffer);
@@ -2855,11 +2855,11 @@ void inline slurmdbd_pack_get_jobs_msg(dbd_get_jobs_msg_t *msg,
}
i = 0;
- if (msg->selected_parts)
+ if(msg->selected_parts)
i = list_count(msg->selected_parts);
pack32(i, buffer);
- if (i) {
+ if(i) {
itr = list_iterator_create(msg->selected_parts);
while((part = list_next(itr))) {
packstr(part, buffer);
@@ -2891,7 +2891,7 @@ int inline slurmdbd_unpack_get_jobs_msg(dbd_get_jobs_msg_t **msg,
safe_unpack_time(&msg_ptr->last_update, buffer);
safe_unpack32(&count, buffer);
- if (count) {
+ if(count) {
msg_ptr->selected_steps =
list_create(slurmdb_destroy_selected_step);
for(i=0; i<count; i++) {
@@ -2900,7 +2900,7 @@ int inline slurmdbd_unpack_get_jobs_msg(dbd_get_jobs_msg_t **msg,
}
}
safe_unpack32(&count, buffer);
- if (count) {
+ if(count) {
msg_ptr->selected_parts = list_create(slurm_destroy_char);
for(i=0; i<count; i++) {
safe_unpackstr_xmalloc(&part, &uint32_tmp, buffer);
@@ -2930,7 +2930,7 @@ slurmdbd_pack_init_msg(dbd_init_msg_t *msg, uint16_t rpc_version,
/* Adding anything to this needs to happen after the version
since this is where the reciever gets the version from. */
- if (rpc_version >= 7) {
+ if(rpc_version >= 7) {
packstr(msg->cluster_name, buffer);
}
@@ -2968,7 +2968,7 @@ slurmdbd_unpack_init_msg(dbd_init_msg_t **msg,
/* We find out the version of the caller right here so use
that as the rpc_version. */
- if (msg_ptr->version >= 7) {
+ if(msg_ptr->version >= 7) {
safe_unpackstr_xmalloc(&msg_ptr->cluster_name, &tmp32, buffer);
}
@@ -2980,7 +2980,7 @@ slurmdbd_unpack_init_msg(dbd_init_msg_t **msg,
goto unpack_error;
}
msg_ptr->uid = g_slurm_auth_get_uid(auth_cred, auth_info);
- if (g_slurm_auth_errno(auth_cred) != SLURM_SUCCESS) {
+ if(g_slurm_auth_errno(auth_cred) != SLURM_SUCCESS) {
error("Bad authentication: %s",
g_slurm_auth_errstr(g_slurm_auth_errno(auth_cred)));
rc = ESLURM_ACCESS_DENIED;
@@ -2992,7 +2992,7 @@ slurmdbd_unpack_init_msg(dbd_init_msg_t **msg,
unpack_error:
slurmdbd_free_init_msg(msg_ptr);
*msg = NULL;
- if (rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
rc = SLURM_ERROR;
return rc;
}
@@ -3025,7 +3025,7 @@ void inline
slurmdbd_pack_job_complete_msg(dbd_job_comp_msg_t *msg,
uint16_t rpc_version, Buf buffer)
{
- if (rpc_version >= 6) {
+ if(rpc_version >= 6) {
pack32(msg->assoc_id, buffer);
pack32(msg->db_index, buffer);
pack_time(msg->end_time, buffer);
@@ -3047,7 +3047,7 @@ slurmdbd_unpack_job_complete_msg(dbd_job_comp_msg_t **msg,
dbd_job_comp_msg_t *msg_ptr = xmalloc(sizeof(dbd_job_comp_msg_t));
*msg = msg_ptr;
- if (rpc_version >= 6) {
+ if(rpc_version >= 6) {
safe_unpack32(&msg_ptr->assoc_id, buffer);
safe_unpack32(&msg_ptr->db_index, buffer);
safe_unpack_time(&msg_ptr->end_time, buffer);
@@ -3072,7 +3072,7 @@ slurmdbd_pack_job_start_msg(void *in,
uint16_t rpc_version, Buf buffer)
{
dbd_job_start_msg_t *msg = (dbd_job_start_msg_t *)in;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
packstr(msg->account, buffer);
pack32(msg->alloc_cpus, buffer);
pack32(msg->alloc_nodes, buffer);
@@ -3132,7 +3132,7 @@ slurmdbd_unpack_job_start_msg(void **msg,
dbd_job_start_msg_t *msg_ptr = xmalloc(sizeof(dbd_job_start_msg_t));
*msg = msg_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpackstr_xmalloc(&msg_ptr->account, &uint32_tmp, buffer);
safe_unpack32(&msg_ptr->alloc_cpus, buffer);
safe_unpack32(&msg_ptr->alloc_nodes, buffer);
@@ -3198,7 +3198,7 @@ slurmdbd_pack_id_rc_msg(void *in,
{
dbd_id_rc_msg_t *msg = (dbd_id_rc_msg_t *)in;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
pack32(msg->job_id, buffer);
pack32(msg->id, buffer);
pack32(msg->return_code, buffer);
@@ -3215,7 +3215,7 @@ slurmdbd_unpack_id_rc_msg(void **msg,
dbd_id_rc_msg_t *msg_ptr = xmalloc(sizeof(dbd_id_rc_msg_t));
*msg = msg_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack32(&msg_ptr->job_id, buffer);
safe_unpack32(&msg_ptr->id, buffer);
safe_unpack32(&msg_ptr->return_code, buffer);
@@ -3332,14 +3332,14 @@ void inline slurmdbd_pack_list_msg(dbd_list_msg_t *msg,
return;
}
- if (msg->my_list) {
+ if(msg->my_list) {
count = list_count(msg->my_list);
pack32(count, buffer);
} else {
// to let user know there wasn't a list (error)
pack32((uint32_t)-1, buffer);
}
- if (count) {
+ if(count) {
itr = list_iterator_create(msg->my_list);
while((object = list_next(itr))) {
(*(my_function))(object, rpc_version, buffer);
@@ -3347,7 +3347,7 @@ void inline slurmdbd_pack_list_msg(dbd_list_msg_t *msg,
list_iterator_destroy(itr);
}
- if (rpc_version >= 8)
+ if(rpc_version >= 8)
pack32(msg->return_code, buffer);
}
@@ -3439,21 +3439,21 @@ int inline slurmdbd_unpack_list_msg(dbd_list_msg_t **msg, uint16_t rpc_version,
*msg = msg_ptr;
safe_unpack32(&count, buffer);
- if ((int)count > -1) {
+ if((int)count > -1) {
/* here we are looking to make the list if -1 or
higher than 0. If -1 we don't want to have the
list be NULL meaning an error occured.
*/
msg_ptr->my_list = list_create((*(my_destroy)));
for(i=0; i<count; i++) {
- if (((*(my_function))(&object, rpc_version, buffer))
+ if(((*(my_function))(&object, rpc_version, buffer))
== SLURM_ERROR)
goto unpack_error;
list_append(msg_ptr->my_list, object);
}
}
- if (rpc_version >= 8)
+ if(rpc_version >= 8)
safe_unpack32(&msg_ptr->return_code, buffer);
return SLURM_SUCCESS;
@@ -3539,9 +3539,9 @@ int inline slurmdbd_unpack_modify_msg(dbd_modify_msg_t **msg,
return SLURM_ERROR;
}
- if ((*(my_cond))(&msg_ptr->cond, rpc_version, buffer) == SLURM_ERROR)
+ if((*(my_cond))(&msg_ptr->cond, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
- if ((*(my_rec))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
+ if((*(my_rec))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
return SLURM_SUCCESS;
@@ -3556,7 +3556,7 @@ void inline
slurmdbd_pack_node_state_msg(dbd_node_state_msg_t *msg,
uint16_t rpc_version, Buf buffer)
{
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
pack32(msg->cpu_count, buffer);
packstr(msg->hostlist, buffer);
packstr(msg->reason, buffer);
@@ -3588,7 +3588,7 @@ slurmdbd_unpack_node_state_msg(dbd_node_state_msg_t **msg,
msg_ptr->reason_uid = NO_VAL;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack32(&msg_ptr->cpu_count, buffer);
safe_unpackstr_xmalloc(&msg_ptr->hostlist, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&msg_ptr->reason, &uint32_tmp, buffer);
@@ -3645,7 +3645,7 @@ void inline
slurmdbd_pack_register_ctld_msg(dbd_register_ctld_msg_t *msg,
uint16_t rpc_version, Buf buffer)
{
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
pack16(msg->dimensions, buffer);
pack32(msg->flags, buffer);
pack32(msg->plugin_id_select, buffer);
@@ -3664,7 +3664,7 @@ slurmdbd_unpack_register_ctld_msg(dbd_register_ctld_msg_t **msg,
dbd_register_ctld_msg_t *msg_ptr = xmalloc(
sizeof(dbd_register_ctld_msg_t));
*msg = msg_ptr;
- if (rpc_version >= 8) {
+ if(rpc_version >= 8) {
safe_unpack16(&msg_ptr->dimensions, buffer);
safe_unpack32(&msg_ptr->flags, buffer);
safe_unpack32(&msg_ptr->plugin_id_select, buffer);
@@ -3686,7 +3686,7 @@ void inline
slurmdbd_pack_roll_usage_msg(dbd_roll_usage_msg_t *msg,
uint16_t rpc_version, Buf buffer)
{
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
pack16(msg->archive_data, buffer);
pack_time(msg->end, buffer);
pack_time(msg->start, buffer);
@@ -3701,7 +3701,7 @@ slurmdbd_unpack_roll_usage_msg(dbd_roll_usage_msg_t **msg,
*msg = msg_ptr;
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
safe_unpack16(&msg_ptr->archive_data, buffer);
safe_unpack_time(&msg_ptr->end, buffer);
safe_unpack_time(&msg_ptr->start, buffer);
@@ -3762,7 +3762,7 @@ void inline
slurmdbd_pack_step_start_msg(dbd_step_start_msg_t *msg, uint16_t rpc_version,
Buf buffer)
{
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
pack32(msg->assoc_id, buffer);
pack32(msg->db_index, buffer);
pack32(msg->job_id, buffer);
@@ -3786,7 +3786,7 @@ slurmdbd_unpack_step_start_msg(dbd_step_start_msg_t **msg,
uint32_t uint32_tmp;
dbd_step_start_msg_t *msg_ptr = xmalloc(sizeof(dbd_step_start_msg_t));
*msg = msg_ptr;
- if (rpc_version >= 5) {
+ if(rpc_version >= 5) {
safe_unpack32(&msg_ptr->assoc_id, buffer);
safe_unpack32(&msg_ptr->db_index, buffer);
safe_unpack32(&msg_ptr->job_id, buffer);
@@ -3869,7 +3869,7 @@ int inline slurmdbd_unpack_usage_msg(dbd_usage_msg_t **msg,
return SLURM_ERROR;
}
- if ((*(my_rec))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
+ if((*(my_rec))(&msg_ptr->rec, rpc_version, buffer) == SLURM_ERROR)
goto unpack_error;
unpack_time(&msg_ptr->start, buffer);
@@ -3902,7 +3902,7 @@ int inline slurmdbd_unpack_buffer(void **out,
uint32_t uint32_tmp;
safe_unpackmem_xmalloc(&msg, &uint32_tmp, buffer);
- if (!(out_ptr = create_buf(msg, uint32_tmp)))
+ if(!(out_ptr = create_buf(msg, uint32_tmp)))
goto unpack_error;
*out = out_ptr;
diff --git a/src/common/stepd_api.c b/src/common/stepd_api.c
index fefd07fb63b01bbdb07156e3bd940b3f19073253..98e449dbe5c17c6c7e18abf391431e635af5d757 100644
--- a/src/common/stepd_api.c
+++ b/src/common/stepd_api.c
@@ -574,7 +574,7 @@ stepd_available(const char *directory, const char *nodename)
}
l = list_create((ListDelF) _free_step_loc_t);
- if (_sockname_regex_init(&re, nodename) == -1)
+ if(_sockname_regex_init(&re, nodename) == -1)
goto done;
/*
diff --git a/src/common/switch.c b/src/common/switch.c
index abb2edba23336dcfdcd365a403cd694cfa17049d..b4e2d559da079071f9b0c747b3c82ee61ea59c29 100644
--- a/src/common/switch.c
+++ b/src/common/switch.c
@@ -235,7 +235,7 @@ _slurm_switch_get_ops( slurm_switch_context_t *c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->switch_type, plugin_strerror(errno));
return NULL;
diff --git a/src/common/timers.c b/src/common/timers.c
index 29c312697eb17675ff0cf66fbe3b7ec60523eeab..bf3e4d81c1ca4a991f7e7969d3680ea20782a71c 100644
--- a/src/common/timers.c
+++ b/src/common/timers.c
@@ -57,10 +57,10 @@ inline void diff_tv_str(struct timeval *tv1,struct timeval *tv2,
delta_t = (tv2->tv_sec - tv1->tv_sec) * 1000000;
delta_t += tv2->tv_usec - tv1->tv_usec;
snprintf(tv_str, len_tv_str, "usec=%ld", delta_t);
- if (from) {
- if (!limit)
+ if(from) {
+ if(!limit)
limit = 1000000;
- if (delta_t > limit) {
+ if(delta_t > limit) {
verbose("Warning: Note very large processing "
"time from %s: %s",
from, tv_str);
diff --git a/src/common/xstring.c b/src/common/xstring.c
index 7315168e439d863ecd710203da0484f94823fdfb..4eaeca2e1f061f44b8d219e17e8f32d4148fbaac 100644
--- a/src/common/xstring.c
+++ b/src/common/xstring.c
@@ -223,7 +223,7 @@ int _xstrfmtcat(char **str, const char *fmt, ...)
char *p = NULL;
va_list ap;
- if ((p = xmalloc(size)) == NULL)
+ if((p = xmalloc(size)) == NULL)
return 0;
while(1) {
/* Try to print in the allocated space. */
@@ -322,7 +322,7 @@ char *xstrdup_printf(const char *fmt, ...)
char *p = NULL;
va_list ap;
- if ((p = xmalloc(size)) == NULL)
+ if((p = xmalloc(size)) == NULL)
return NULL;
while(1) {
/* Try to print in the allocated space. */
@@ -432,7 +432,7 @@ char *xstrstrip(char *str)
char quote_c = '\0';
int quote = 0;
- if (!str)
+ if(!str)
return NULL;
/* first strip off the ("|')'s */
@@ -444,13 +444,13 @@ char *xstrstrip(char *str)
start = i;
while(str[i]) {
- if (quote && str[i] == quote_c) {
+ if(quote && str[i] == quote_c) {
found = 1;
break;
}
i++;
}
- if (found) {
+ if(found) {
meat = xmalloc((i-start)+1);
memcpy(meat, str+start, (i-start));
} else
@@ -507,7 +507,7 @@ bool xstring_is_whitespace(const char *str)
*/
char *xstrtolower(char *str)
{
- if (str) {
+ if(str) {
int j = 0;
while(str[j]) {
str[j] = tolower(str[j]);
diff --git a/src/database/mysql_common.c b/src/database/mysql_common.c
index 72427e72547c46a9709b0d1722b5af56df7e3f39..fbddde39ffd92af2d8101c26d909d17624537d65 100644
--- a/src/database/mysql_common.c
+++ b/src/database/mysql_common.c
@@ -56,7 +56,7 @@ static MYSQL_RES *_get_first_result(MYSQL *mysql_db)
int rc = 0;
do {
/* did current statement return data? */
- if ((result = mysql_store_result(mysql_db)))
+ if((result = mysql_store_result(mysql_db)))
return result;
/* more results? -1 = no, >0 = error, 0 = yes (keep looping) */
@@ -75,8 +75,8 @@ static MYSQL_RES *_get_last_result(MYSQL *mysql_db)
int rc = 0;
do {
/* did current statement return data? */
- if ((result = mysql_store_result(mysql_db))) {
- if (last_result)
+ if((result = mysql_store_result(mysql_db))) {
+ if(last_result)
mysql_free_result(last_result);
last_result = result;
}
@@ -111,23 +111,23 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
/* figure out the keys in the table */
query = xstrdup_printf("show index from %s", table_name);
- if (!(result = mysql_db_query_ret(mysql_db, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_db, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
while((row = mysql_fetch_row(result))) {
// row[2] is the key name
- if (!strcasecmp(row[2], "PRIMARY"))
+ if(!strcasecmp(row[2], "PRIMARY"))
old_primary = 1;
- else if (!old_index)
+ else if(!old_index)
old_index = xstrdup(row[2]);
}
mysql_free_result(result);
/* figure out the existing columns in the table */
query = xstrdup_printf("show columns from %s", table_name);
- if (!(result = mysql_db_query_ret(mysql_db, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_db, query, 0))) {
xfree(query);
xfree(old_index);
return SLURM_ERROR;
@@ -150,7 +150,7 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
list_iterator_reset(itr);
while((col = list_next(itr))) {
- if (!strcmp(col, fields[i].name)) {
+ if(!strcmp(col, fields[i].name)) {
xstrfmtcat(query, " modify %s %s,",
fields[i].name,
fields[i].options);
@@ -162,8 +162,8 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
break;
}
}
- if (!found) {
- if (i) {
+ if(!found) {
+ if(i) {
info("adding column %s after %s in table %s",
fields[i].name,
fields[i-1].name,
@@ -204,23 +204,23 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
list_iterator_destroy(itr);
list_destroy(columns);
- if ((temp = strstr(ending, "primary key ("))) {
+ if((temp = strstr(ending, "primary key ("))) {
int open = 0, close =0;
int end = 0;
while(temp[end++]) {
- if (temp[end] == '(')
+ if(temp[end] == '(')
open++;
- else if (temp[end] == ')')
+ else if(temp[end] == ')')
close++;
else
continue;
- if (open == close)
+ if(open == close)
break;
}
- if (temp[end]) {
+ if(temp[end]) {
end++;
primary_key = xstrndup(temp, end);
- if (old_primary) {
+ if(old_primary) {
xstrcat(query, " drop primary key,");
xstrcat(correct_query, " drop primary key,");
}
@@ -231,23 +231,23 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
}
}
- if ((temp = strstr(ending, "unique index ("))) {
+ if((temp = strstr(ending, "unique index ("))) {
int open = 0, close =0;
int end = 0;
while(temp[end++]) {
- if (temp[end] == '(')
+ if(temp[end] == '(')
open++;
- else if (temp[end] == ')')
+ else if(temp[end] == ')')
close++;
else
continue;
- if (open == close)
+ if(open == close)
break;
}
- if (temp[end]) {
+ if(temp[end]) {
end++;
unique_index = xstrndup(temp, end);
- if (old_index) {
+ if(old_index) {
xstrfmtcat(query, " drop index %s,",
old_index);
xstrfmtcat(correct_query, " drop index %s,",
@@ -265,7 +265,7 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
//info("%d query\n%s", __LINE__, query);
/* see if we have already done this definition */
- if (!adding) {
+ if(!adding) {
char *quoted = slurm_add_slash_to_quotes(query);
char *query2 = xstrdup_printf("select table_name from "
"%s where definition='%s'",
@@ -275,19 +275,19 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
xfree(quoted);
run_update = 1;
- if ((result = mysql_db_query_ret(mysql_db, query2, 0))) {
- if ((row = mysql_fetch_row(result)))
+ if((result = mysql_db_query_ret(mysql_db, query2, 0))) {
+ if((row = mysql_fetch_row(result)))
run_update = 0;
mysql_free_result(result);
}
xfree(query2);
- if (run_update) {
+ if(run_update) {
run_update = 2;
query2 = xstrdup_printf("select table_name from "
"%s where table_name='%s'",
table_defs_table, table_name);
- if ((result = mysql_db_query_ret(mysql_db, query2, 0))) {
- if ((row = mysql_fetch_row(result)))
+ if((result = mysql_db_query_ret(mysql_db, query2, 0))) {
+ if((row = mysql_fetch_row(result)))
run_update = 1;
mysql_free_result(result);
}
@@ -296,16 +296,16 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
}
/* if something has changed run the alter line */
- if (run_update || adding) {
+ if(run_update || adding) {
time_t now = time(NULL);
char *query2 = NULL;
char *quoted = NULL;
- if (run_update == 2)
+ if(run_update == 2)
debug4("Table %s doesn't exist, adding", table_name);
else
debug("Table %s has changed. Updating...", table_name);
- if (mysql_db_query(mysql_db, query)) {
+ if(mysql_db_query(mysql_db, query)) {
xfree(query);
return SLURM_ERROR;
}
@@ -319,7 +319,7 @@ static int _mysql_make_table_current(MYSQL *mysql_db, char *table_name,
table_name, quoted,
quoted, now);
xfree(quoted);
- if (mysql_db_query(mysql_db, query2)) {
+ if(mysql_db_query(mysql_db, query2)) {
xfree(query2);
return SLURM_ERROR;
}
@@ -348,7 +348,7 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
#ifdef MYSQL_NOT_THREAD_SAFE
slurm_mutex_lock(&mysql_lock);
#endif
- if (!(mysql_db = mysql_init(mysql_db)))
+ if(!(mysql_db = mysql_init(mysql_db)))
fatal("mysql_init failed: %s", mysql_error(mysql_db));
db_host = db_info->host;
@@ -372,7 +372,7 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
if (db_ptr) {
snprintf(create_line, sizeof(create_line),
"create database %s", db_name);
- if (mysql_query(mysql_db, create_line)) {
+ if(mysql_query(mysql_db, create_line)) {
fatal("mysql_real_query failed: %d %s\n%s",
mysql_errno(mysql_db),
mysql_error(mysql_db), create_line);
@@ -394,7 +394,7 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
#ifdef MYSQL_NOT_THREAD_SAFE
slurm_mutex_unlock(&mysql_lock);
#endif
- if (rc == SLURM_ERROR)
+ if(rc == SLURM_ERROR)
sleep(3);
}
return rc;
@@ -402,7 +402,7 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
extern int *destroy_mysql_conn(mysql_conn_t *mysql_conn)
{
- if (mysql_conn) {
+ if(mysql_conn) {
mysql_close_db_connection(&mysql_conn->db_conn);
xfree(mysql_conn->pre_commit_query);
xfree(mysql_conn->cluster_name);
@@ -414,7 +414,7 @@ extern int *destroy_mysql_conn(mysql_conn_t *mysql_conn)
extern int *destroy_mysql_db_info(mysql_db_info_t *db_info)
{
- if (db_info) {
+ if(db_info) {
xfree(db_info->backup);
xfree(db_info->host);
xfree(db_info->user);
@@ -432,7 +432,7 @@ extern int mysql_get_db_connection(MYSQL **mysql_db, char *db_name,
char *db_host = db_info->host;
- if (!(*mysql_db = mysql_init(*mysql_db)))
+ if(!(*mysql_db = mysql_init(*mysql_db)))
fatal("mysql_init failed: %s", mysql_error(*mysql_db));
else {
unsigned int my_timeout = 30;
@@ -444,11 +444,11 @@ extern int mysql_get_db_connection(MYSQL **mysql_db, char *db_name,
mysql_options(*mysql_db, MYSQL_OPT_CONNECT_TIMEOUT,
(char *)&my_timeout);
while(!storage_init) {
- if (!mysql_real_connect(*mysql_db, db_host,
+ if(!mysql_real_connect(*mysql_db, db_host,
db_info->user, db_info->pass,
db_name, db_info->port,
NULL, CLIENT_MULTI_STATEMENTS)) {
- if (mysql_errno(*mysql_db) == ER_BAD_DB_ERROR) {
+ if(mysql_errno(*mysql_db) == ER_BAD_DB_ERROR) {
debug("Database %s not created. "
"Creating", db_name);
rc = _create_db(db_name, db_info);
@@ -478,8 +478,8 @@ extern int mysql_get_db_connection(MYSQL **mysql_db, char *db_name,
extern int mysql_close_db_connection(MYSQL **mysql_db)
{
- if (mysql_db && *mysql_db) {
- if (mysql_thread_safe())
+ if(mysql_db && *mysql_db) {
+ if(mysql_thread_safe())
mysql_thread_end();
mysql_close(*mysql_db);
*mysql_db = NULL;
@@ -508,7 +508,7 @@ extern int mysql_clear_results(MYSQL *mysql_db)
int rc = 0;
do {
/* did current statement return data? */
- if ((result = mysql_store_result(mysql_db)))
+ if((result = mysql_store_result(mysql_db)))
mysql_free_result(result);
/* more results? -1 = no, >0 = error, 0 = yes (keep looping) */
@@ -518,7 +518,7 @@ extern int mysql_clear_results(MYSQL *mysql_db)
mysql_error(mysql_db));
} while (rc == 0);
- if (rc > 0) {
+ if(rc > 0) {
errno = rc;
return SLURM_ERROR;
}
@@ -528,7 +528,7 @@ extern int mysql_clear_results(MYSQL *mysql_db)
extern int mysql_db_query(MYSQL *mysql_db, char *query)
{
- if (!mysql_db)
+ if(!mysql_db)
fatal("You haven't inited this storage yet.");
#ifdef MYSQL_NOT_THREAD_SAFE
slurm_mutex_lock(&mysql_lock);
@@ -536,9 +536,9 @@ extern int mysql_db_query(MYSQL *mysql_db, char *query)
/* clear out the old results so we don't get a 2014 error */
mysql_clear_results(mysql_db);
//try_again:
- if (mysql_query(mysql_db, query)) {
+ if(mysql_query(mysql_db, query)) {
errno = mysql_errno(mysql_db);
- if (errno == ER_NO_SUCH_TABLE) {
+ if(errno == ER_NO_SUCH_TABLE) {
debug4("This could happen often and is expected.\n"
"mysql_query failed: %d %s\n%s",
mysql_errno(mysql_db),
@@ -552,7 +552,7 @@ extern int mysql_db_query(MYSQL *mysql_db, char *query)
#ifdef MYSQL_NOT_THREAD_SAFE
slurm_mutex_unlock(&mysql_lock);
#endif
- if (errno == ER_LOCK_WAIT_TIMEOUT)
+ if(errno == ER_LOCK_WAIT_TIMEOUT)
fatal("mysql gave ER_LOCK_WAIT_TIMEOUT as an error. "
"The only way to fix this is restart the "
"calling program");
@@ -587,7 +587,7 @@ extern int mysql_db_commit(MYSQL *mysql_db)
#endif
/* clear out the old results so we don't get a 2014 error */
mysql_clear_results(mysql_db);
- if (mysql_commit(mysql_db)) {
+ if(mysql_commit(mysql_db)) {
error("mysql_commit failed: %d %s",
mysql_errno(mysql_db),
mysql_error(mysql_db));
@@ -610,7 +610,7 @@ extern int mysql_db_rollback(MYSQL *mysql_db)
#endif
/* clear out the old results so we don't get a 2014 error */
mysql_clear_results(mysql_db);
- if (mysql_rollback(mysql_db)) {
+ if(mysql_rollback(mysql_db)) {
error("mysql_commit failed: %d %s",
mysql_errno(mysql_db),
mysql_error(mysql_db));
@@ -632,14 +632,14 @@ extern MYSQL_RES *mysql_db_query_ret(MYSQL *mysql_db, char *query, bool last)
{
MYSQL_RES *result = NULL;
- if (mysql_db_query(mysql_db, query) != SLURM_ERROR) {
- if (mysql_errno(mysql_db) == ER_NO_SUCH_TABLE)
+ if(mysql_db_query(mysql_db, query) != SLURM_ERROR) {
+ if(mysql_errno(mysql_db) == ER_NO_SUCH_TABLE)
return result;
- else if (last)
+ else if(last)
result = _get_last_result(mysql_db);
else
result = _get_first_result(mysql_db);
- if (!result && mysql_field_count(mysql_db)) {
+ if(!result && mysql_field_count(mysql_db)) {
/* should have returned data */
error("We should have gotten a result: '%m' '%s'",
mysql_error(mysql_db));
@@ -653,7 +653,7 @@ extern int mysql_db_query_check_after(MYSQL *mysql_db, char *query)
{
int rc = SLURM_SUCCESS;
- if ((rc = mysql_db_query(mysql_db, query)) != SLURM_ERROR)
+ if((rc = mysql_db_query(mysql_db, query)) != SLURM_ERROR)
rc = mysql_clear_results(mysql_db);
return rc;
@@ -663,9 +663,9 @@ extern int mysql_insert_ret_id(MYSQL *mysql_db, char *query)
{
int new_id = 0;
- if (mysql_db_query(mysql_db, query) != SLURM_ERROR) {
+ if(mysql_db_query(mysql_db, query) != SLURM_ERROR) {
new_id = mysql_insert_id(mysql_db);
- if (!new_id) {
+ if(!new_id) {
/* should have new id */
error("We should have gotten a new id: %s",
mysql_error(mysql_db));
@@ -683,7 +683,7 @@ extern int mysql_db_create_table(MYSQL *mysql_db, char *table_name,
int i = 0;
storage_field_t *first_field = fields;
- if (!fields || !fields->name) {
+ if(!fields || !fields->name) {
error("Not creating an empty table");
return SLURM_ERROR;
}
@@ -701,7 +701,7 @@ extern int mysql_db_create_table(MYSQL *mysql_db, char *table_name,
"primary key (table_name(50))) engine='innodb'",
table_defs_table);
- if (mysql_db_query(mysql_db, query) == SLURM_ERROR) {
+ if(mysql_db_query(mysql_db, query) == SLURM_ERROR) {
xfree(query);
return SLURM_ERROR;
}
@@ -722,7 +722,7 @@ extern int mysql_db_create_table(MYSQL *mysql_db, char *table_name,
/* make sure we can do a rollback */
xstrcat(query, " engine='innodb'");
- if (mysql_db_query(mysql_db, query) == SLURM_ERROR) {
+ if(mysql_db_query(mysql_db, query) == SLURM_ERROR) {
xfree(query);
return SLURM_ERROR;
}
diff --git a/src/database/pgsql_common.c b/src/database/pgsql_common.c
index c8d8b92849d5ee71618ee233c66e6d43ea39146d..245e7679da1730f3f386aa18308367b4735d98b9 100644
--- a/src/database/pgsql_common.c
+++ b/src/database/pgsql_common.c
@@ -46,7 +46,7 @@ pthread_mutex_t pgsql_lock = PTHREAD_MUTEX_INITIALIZER;
extern int *destroy_pgsql_db_info(pgsql_db_info_t *db_info)
{
- if (db_info) {
+ if(db_info) {
xfree(db_info->host);
xfree(db_info->user);
xfree(db_info->pass);
@@ -113,8 +113,8 @@ extern int pgsql_get_db_connection(PGconn **pgsql_db, char *db_name,
//debug2("pgsql connect: %s", connect_line);
*pgsql_db = PQconnectdb(connect_line);
- if (PQstatus(*pgsql_db) != CONNECTION_OK) {
- if (!strcmp(PQerrorMessage(*pgsql_db),
+ if(PQstatus(*pgsql_db) != CONNECTION_OK) {
+ if(!strcmp(PQerrorMessage(*pgsql_db),
"no password supplied")) {
PQfinish(*pgsql_db);
fatal("This Postgres connection needs "
@@ -157,7 +157,7 @@ extern int pgsql_get_db_connection(PGconn **pgsql_db, char *db_name,
extern int pgsql_close_db_connection(PGconn **pgsql_db)
{
- if (pgsql_db && *pgsql_db) {
+ if(pgsql_db && *pgsql_db) {
PQfinish(*pgsql_db);
*pgsql_db = NULL;
}
@@ -168,10 +168,10 @@ extern int pgsql_db_query(PGconn *pgsql_db, char *query)
{
PGresult *result = NULL;
- if (!pgsql_db)
+ if(!pgsql_db)
fatal("You haven't inited this storage yet.");
- if (!(result = pgsql_db_query_ret(pgsql_db, query)))
+ if(!(result = pgsql_db_query_ret(pgsql_db, query)))
return SLURM_ERROR;
PQclear(result);
@@ -197,12 +197,12 @@ extern PGresult *pgsql_db_query_ret(PGconn *pgsql_db, char *query)
{
PGresult *result = NULL;
- if (!pgsql_db)
+ if(!pgsql_db)
fatal("You haven't inited this storage yet.");
result = PQexec(pgsql_db, query);
- if (PQresultStatus(result) != PGRES_COMMAND_OK
+ if(PQresultStatus(result) != PGRES_COMMAND_OK
&& PQresultStatus(result) != PGRES_TUPLES_OK) {
error("PQexec failed: %d %s", PQresultStatus(result),
PQerrorMessage(pgsql_db));
@@ -220,16 +220,16 @@ extern int pgsql_insert_ret_id(PGconn *pgsql_db, char *sequence_name,
PGresult *result = NULL;
slurm_mutex_lock(&pgsql_lock);
- if (pgsql_db_query(pgsql_db, query) != SLURM_ERROR) {
+ if(pgsql_db_query(pgsql_db, query) != SLURM_ERROR) {
char *new_query = xstrdup_printf(
"select last_value from %s", sequence_name);
- if ((result = pgsql_db_query_ret(pgsql_db, new_query))) {
+ if((result = pgsql_db_query_ret(pgsql_db, new_query))) {
new_id = atoi(PQgetvalue(result, 0, 0));
PQclear(result);
}
xfree(new_query);
- if (!new_id) {
+ if(!new_id) {
/* should have new id */
error("We should have gotten a new id: %s",
PQerrorMessage(pgsql_db));
@@ -277,7 +277,7 @@ extern int pgsql_db_create_table(PGconn *pgsql_db,
next = xstrdup_printf(" %s %s",
fields->name,
fields->options);
- if (i)
+ if(i)
xstrcat(tmp, ",");
xstrcat(tmp, next);
xfree(next);
@@ -288,7 +288,7 @@ extern int pgsql_db_create_table(PGconn *pgsql_db,
xfree(tmp);
xstrcat(query, ending);
- if (pgsql_db_query(pgsql_db, query) == SLURM_ERROR) {
+ if(pgsql_db_query(pgsql_db, query) == SLURM_ERROR) {
xfree(query);
return SLURM_ERROR;
}
@@ -317,7 +317,7 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
"information_schema.columns where "
"table_name='%s'", table_name);
- if (!(result = pgsql_db_query_ret(pgsql_db, query))) {
+ if(!(result = pgsql_db_query_ret(pgsql_db, query))) {
xfree(query);
return SLURM_ERROR;
}
@@ -335,25 +335,25 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
while(fields[i].name) {
int found = 0;
not_null = 0;
- if (!strcasecmp("serial", fields[i].options)) {
+ if(!strcasecmp("serial", fields[i].options)) {
i++;
continue;
}
opt_part = xstrdup(fields[i].options);
original_ptr = opt_part;
opt_part = strtok_r(opt_part, " ", &temp_char);
- if (opt_part) {
+ if(opt_part) {
type = xstrdup(opt_part); /* XXX: only one identifier supported */
opt_part = strtok_r(NULL, " ", &temp_char);
while(opt_part) {
- if (!strcasecmp("not", opt_part)) {
+ if(!strcasecmp("not", opt_part)) {
opt_part = strtok_r(NULL, " ",
&temp_char);
if (!strcasecmp("null", opt_part)) {
not_null = 1;
}
- } else if (!strcasecmp("default", opt_part)){
+ } else if(!strcasecmp("default", opt_part)){
opt_part = strtok_r(NULL,
" ", &temp_char);
default_str = xstrdup(opt_part);
@@ -367,7 +367,7 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
xfree(original_ptr);
list_iterator_reset(itr);
while((col = list_next(itr))) {
- if (!strcmp(col, fields[i].name)) {
+ if(!strcmp(col, fields[i].name)) {
list_delete_item(itr);
found = 1;
break;
@@ -375,23 +375,23 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
}
temp_char = NULL;
- if (!found) {
+ if(!found) {
info("adding column %s", fields[i].name);
- if (default_str)
+ if(default_str)
xstrfmtcat(temp_char,
" default %s", default_str);
- if (not_null)
+ if(not_null)
xstrcat(temp_char, " not null");
xstrfmtcat(query,
" add %s %s",
fields[i].name, type);
- if (temp_char)
+ if(temp_char)
xstrcat(query, temp_char);
xstrcat(query, ",");
} else {
- if (default_str)
+ if(default_str)
xstrfmtcat(temp_char,
" alter %s set default %s,",
fields[i].name, default_str);
@@ -400,7 +400,7 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
" alter %s drop default,",
fields[i].name);
- if (not_null)
+ if(not_null)
xstrfmtcat(temp_char,
" alter %s set not null,",
fields[i].name);
@@ -422,7 +422,7 @@ extern int pgsql_db_make_table_current(PGconn *pgsql_db, char *table_name,
query[strlen(query)-1] = ';';
//debug4("pgsql db create/alter table:\n %s", query);
- if (pgsql_db_query(pgsql_db, query)) {
+ if(pgsql_db_query(pgsql_db, query)) {
xfree(query);
return SLURM_ERROR;
}
diff --git a/src/db_api/cluster_report_functions.c b/src/db_api/cluster_report_functions.c
index 49f896abe1fdff5590e342f87f37e6f958447a38..db513862389e9107565826acb87c4e329bf8c20f 100644
--- a/src/db_api/cluster_report_functions.c
+++ b/src/db_api/cluster_report_functions.c
@@ -68,17 +68,17 @@ static void _process_ua(List user_list, slurmdb_association_rec_t *assoc)
*/
itr = list_iterator_create(user_list);
while((slurmdb_report_user = list_next(itr))) {
- if (!strcmp(slurmdb_report_user->name, assoc->user)
+ if(!strcmp(slurmdb_report_user->name, assoc->user)
&& !strcmp(slurmdb_report_user->acct, assoc->acct))
break;
}
list_iterator_destroy(itr);
- if (!slurmdb_report_user) {
+ if(!slurmdb_report_user) {
struct passwd *passwd_ptr = NULL;
uid_t uid = NO_VAL;
passwd_ptr = getpwnam(assoc->user);
- if (passwd_ptr)
+ if(passwd_ptr)
uid = passwd_ptr->pw_uid;
/* In this report we are using the slurmdb_report user
structure to store the information we want
@@ -137,7 +137,7 @@ static void _process_uw(List user_list, slurmdb_wckey_rec_t *wckey)
uid_t uid = NO_VAL;
passwd_ptr = getpwnam(wckey->user);
- if (passwd_ptr)
+ if(passwd_ptr)
uid = passwd_ptr->pw_uid;
/* In this report we are using the slurmdb_report user
structure to store the information we want
@@ -172,12 +172,12 @@ static void _process_wu(List assoc_list, slurmdb_wckey_rec_t *wckey)
/* find the parent */
itr = list_iterator_create(assoc_list);
while((parent_assoc = list_next(itr))) {
- if (!parent_assoc->user
+ if(!parent_assoc->user
&& !strcmp(parent_assoc->acct, wckey->name))
break;
}
list_iterator_destroy(itr);
- if (!parent_assoc) {
+ if(!parent_assoc) {
parent_assoc = xmalloc(sizeof(slurmdb_report_assoc_rec_t));
list_append(assoc_list,
@@ -214,20 +214,20 @@ static void _process_assoc_type(
/* now add the associations of interest here by user */
while((assoc = list_next(itr))) {
- if (!assoc->accounting_list
+ if(!assoc->accounting_list
|| !list_count(assoc->accounting_list)
|| ((type == CLUSTER_REPORT_UA) && !assoc->user)) {
list_delete_item(itr);
continue;
}
- if (strcmp(cluster_name, assoc->cluster))
+ if(strcmp(cluster_name, assoc->cluster))
continue;
- if (type == CLUSTER_REPORT_UA)
+ if(type == CLUSTER_REPORT_UA)
_process_ua(slurmdb_report_cluster->user_list,
assoc);
- else if (type == CLUSTER_REPORT_AU)
+ else if(type == CLUSTER_REPORT_AU)
_process_au(slurmdb_report_cluster->assoc_list,
assoc);
@@ -245,20 +245,20 @@ static void _process_wckey_type(
/* now add the wckeyiations of interest here by user */
while((wckey = list_next(itr))) {
- if (!wckey->accounting_list
+ if(!wckey->accounting_list
|| !list_count(wckey->accounting_list)
|| ((type == CLUSTER_REPORT_UW) && !wckey->user)) {
list_delete_item(itr);
continue;
}
- if (strcmp(cluster_name, wckey->cluster))
+ if(strcmp(cluster_name, wckey->cluster))
continue;
- if (type == CLUSTER_REPORT_UW)
+ if(type == CLUSTER_REPORT_UW)
_process_uw(slurmdb_report_cluster->user_list,
wckey);
- else if (type == CLUSTER_REPORT_WU)
+ else if(type == CLUSTER_REPORT_WU)
_process_wu(slurmdb_report_cluster->assoc_list,
wckey);
@@ -288,13 +288,13 @@ static List _process_util_by_report(void *db_conn, char *calling_name,
cluster_cond.with_deleted = 1;
cluster_cond.with_usage = 1;
- if ((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU)) {
+ if((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU)) {
start_time = ((slurmdb_association_cond_t *)cond)->usage_start;
end_time = ((slurmdb_association_cond_t *)cond)->usage_end;
cluster_cond.cluster_list =
((slurmdb_association_cond_t *)cond)->cluster_list;
- } else if ((type == CLUSTER_REPORT_UW) || (type == CLUSTER_REPORT_WU)) {
+ } else if((type == CLUSTER_REPORT_UW) || (type == CLUSTER_REPORT_WU)) {
start_time = ((slurmdb_wckey_cond_t *)cond)->usage_start;
end_time = ((slurmdb_wckey_cond_t *)cond)->usage_end;
@@ -317,32 +317,32 @@ static List _process_util_by_report(void *db_conn, char *calling_name,
cluster_list = acct_storage_g_get_clusters(
db_conn, my_uid, &cluster_cond);
- if (!cluster_list) {
+ if(!cluster_list) {
exit_code=1;
fprintf(stderr, "%s: Problem with cluster query.\n",
calling_name);
goto end_it;
}
- if ((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU)) {
+ if((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU)) {
((slurmdb_association_cond_t *)cond)->usage_start = start_time;
((slurmdb_association_cond_t *)cond)->usage_end = end_time;
type_list = acct_storage_g_get_associations(
db_conn, my_uid, cond);
- } else if ((type == CLUSTER_REPORT_UW) || (type == CLUSTER_REPORT_WU)) {
+ } else if((type == CLUSTER_REPORT_UW) || (type == CLUSTER_REPORT_WU)) {
((slurmdb_wckey_cond_t *)cond)->usage_start = start_time;
((slurmdb_wckey_cond_t *)cond)->usage_end = end_time;
type_list = acct_storage_g_get_wckeys(
db_conn, my_uid, cond);
}
- if (!type_list) {
+ if(!type_list) {
exit_code=1;
fprintf(stderr, "%s: Problem with get query.\n", calling_name);
goto end_it;
}
- if ((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU)) {
+ if((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU)) {
first_list = type_list;
type_list = slurmdb_get_hierarchical_sorted_assoc_list(
first_list);
@@ -356,7 +356,7 @@ static List _process_util_by_report(void *db_conn, char *calling_name,
/* check to see if this cluster is around during the
time we are looking at */
- if (!cluster->accounting_list
+ if(!cluster->accounting_list
|| !list_count(cluster->accounting_list))
continue;
@@ -366,10 +366,10 @@ static List _process_util_by_report(void *db_conn, char *calling_name,
list_append(ret_list, slurmdb_report_cluster);
slurmdb_report_cluster->name = xstrdup(cluster->name);
- if ((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_UW))
+ if((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_UW))
slurmdb_report_cluster->user_list =
list_create(slurmdb_destroy_report_user_rec);
- else if ((type == CLUSTER_REPORT_AU)
+ else if((type == CLUSTER_REPORT_AU)
|| (type == CLUSTER_REPORT_WU))
slurmdb_report_cluster->assoc_list =
list_create(slurmdb_destroy_report_assoc_rec);
@@ -387,10 +387,10 @@ static List _process_util_by_report(void *db_conn, char *calling_name,
slurmdb_report_cluster->cpu_count /=
list_count(cluster->accounting_list);
- if ((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU))
+ if((type == CLUSTER_REPORT_UA) || (type == CLUSTER_REPORT_AU))
_process_assoc_type(type_itr, slurmdb_report_cluster,
cluster->name, type);
- else if ((type == CLUSTER_REPORT_UW)
+ else if((type == CLUSTER_REPORT_UW)
|| (type == CLUSTER_REPORT_WU))
_process_wckey_type(type_itr, slurmdb_report_cluster,
cluster->name, type);
@@ -401,23 +401,23 @@ static List _process_util_by_report(void *db_conn, char *calling_name,
end_it:
- if (type_list) {
+ if(type_list) {
list_destroy(type_list);
type_list = NULL;
}
- if (first_list) {
+ if(first_list) {
list_destroy(first_list);
first_list = NULL;
}
- if (cluster_list) {
+ if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
- if (exit_code) {
- if (ret_list) {
+ if(exit_code) {
+ if(ret_list) {
list_destroy(ret_list);
ret_list = NULL;
}
diff --git a/src/db_api/job_report_functions.c b/src/db_api/job_report_functions.c
index bc2b1396237503db486f41015fda18fd44674ce6..647c5c0345c4c376144c8f711b06302aace34036 100644
--- a/src/db_api/job_report_functions.c
+++ b/src/db_api/job_report_functions.c
@@ -96,11 +96,11 @@ static List _process_grouped_report(void *db_conn,
here since we may be looking for sub accounts of a specific
account.
*/
- if (!job_cond) {
+ if(!job_cond) {
destroy_job_cond = 1;
job_cond = xmalloc(sizeof(slurmdb_job_cond_t));
}
- if (!grouping_list) {
+ if(!grouping_list) {
destroy_grouping_list = 1;
grouping_list = list_create(slurm_destroy_char);
slurm_addto_char_list(grouping_list, "50,250,500,1000");
@@ -113,7 +113,7 @@ static List _process_grouped_report(void *db_conn,
job_cond->acct_list = tmp_acct_list;
tmp_acct_list = NULL;
- if (!job_list) {
+ if(!job_list) {
exit_code=1;
fprintf(stderr, " Problem with job query.\n");
goto end_it;
@@ -121,21 +121,21 @@ static List _process_grouped_report(void *db_conn,
group_itr = list_iterator_create(grouping_list);
/* make a group for each job size we find. */
- if (!list_count(grouping_list)) {
+ if(!list_count(grouping_list)) {
char *group = NULL;
char *tmp = NULL;
individual = 1;
itr = list_iterator_create(job_list);
while((job = list_next(itr))) {
- if (!job->elapsed || !job->alloc_cpus)
+ if(!job->elapsed || !job->alloc_cpus)
continue;
tmp = xstrdup_printf("%u", job->alloc_cpus);
while((group = list_next(group_itr))) {
- if (!strcmp(group, tmp)) {
+ if(!strcmp(group, tmp)) {
break;
}
}
- if (!group)
+ if(!group)
list_append(grouping_list, tmp);
else
xfree(tmp);
@@ -149,10 +149,10 @@ static List _process_grouped_report(void *db_conn,
cluster_itr = list_iterator_create(cluster_list);
- if (flat_view)
+ if(flat_view)
goto no_objects;
- if (wckey_type) {
+ if(wckey_type) {
slurmdb_wckey_cond_t wckey_cond;
memset(&wckey_cond, 0, sizeof(slurmdb_wckey_cond_t));
wckey_cond.name_list = job_cond->wckey_list;
@@ -167,8 +167,8 @@ static List _process_grouped_report(void *db_conn,
assoc_cond.cluster_list = job_cond->cluster_list;
/* don't limit associations to having the partition_list */
//assoc_cond.partition_list = job_cond->partition_list;
- if (!job_cond->acct_list || !list_count(job_cond->acct_list)) {
- if (job_cond->acct_list)
+ if(!job_cond->acct_list || !list_count(job_cond->acct_list)) {
+ if(job_cond->acct_list)
list_destroy(job_cond->acct_list);
job_cond->acct_list = list_create(NULL);
list_append(job_cond->acct_list, "root");
@@ -178,7 +178,7 @@ static List _process_grouped_report(void *db_conn,
&assoc_cond);
}
- if (!object_list) {
+ if(!object_list) {
debug2(" No join list given.\n");
goto no_objects;
}
@@ -190,7 +190,7 @@ static List _process_grouped_report(void *db_conn,
slurmdb_association_rec_t *assoc =
(slurmdb_association_rec_t *)object;
- if (wckey_type) {
+ if(wckey_type) {
cluster = wckey->cluster;
name = wckey->name;
} else {
@@ -199,10 +199,10 @@ static List _process_grouped_report(void *db_conn,
}
while((cluster_group = list_next(cluster_itr))) {
- if (!strcmp(cluster, cluster_group->cluster))
+ if(!strcmp(cluster, cluster_group->cluster))
break;
}
- if (!cluster_group) {
+ if(!cluster_group) {
cluster_group = xmalloc(
sizeof(slurmdb_report_cluster_grouping_t));
cluster_group->cluster = xstrdup(cluster);
@@ -213,18 +213,18 @@ static List _process_grouped_report(void *db_conn,
acct_itr = list_iterator_create(cluster_group->acct_list);
while((acct_group = list_next(acct_itr))) {
- if (!strcmp(name, acct_group->acct))
+ if(!strcmp(name, acct_group->acct))
break;
}
list_iterator_destroy(acct_itr);
- if (!acct_group) {
+ if(!acct_group) {
uint32_t last_size = 0;
char *group = NULL;
acct_group = xmalloc(
sizeof(slurmdb_report_acct_grouping_t));
acct_group->acct = xstrdup(name);
- if (wckey_type)
+ if(wckey_type)
acct_group->lft = wckey->id;
else {
acct_group->lft = assoc->lft;
@@ -237,22 +237,22 @@ static List _process_grouped_report(void *db_conn,
job_group = xmalloc(
sizeof(slurmdb_report_job_grouping_t));
job_group->jobs = list_create(NULL);
- if (!individual)
+ if(!individual)
job_group->min_size = last_size;
last_size = atoi(group);
- if (!individual)
+ if(!individual)
job_group->max_size = last_size-1;
else
job_group->min_size =
job_group->max_size = last_size;
list_append(acct_group->groups, job_group);
}
- if (last_size && !individual) {
+ if(last_size && !individual) {
job_group = xmalloc(
sizeof(slurmdb_report_job_grouping_t));
job_group->jobs = list_create(NULL);
job_group->min_size = last_size;
- if (individual)
+ if(individual)
job_group->max_size =
job_group->min_size;
else
@@ -271,26 +271,26 @@ no_objects:
char *local_cluster = "UNKNOWN";
char *local_account = "UNKNOWN";
- if (!job->elapsed) {
+ if(!job->elapsed) {
/* here we don't care about jobs that didn't
* really run here */
continue;
}
- if (job->cluster)
+ if(job->cluster)
local_cluster = job->cluster;
- if (job->account)
+ if(job->account)
local_account = job->account;
list_iterator_reset(cluster_itr);
while((cluster_group = list_next(cluster_itr))) {
- if (!strcmp(local_cluster, cluster_group->cluster))
+ if(!strcmp(local_cluster, cluster_group->cluster))
break;
}
- if (!cluster_group) {
+ if(!cluster_group) {
/* here we are only looking for groups that
* were added with the associations above
*/
- if (!flat_view)
+ if(!flat_view)
continue;
cluster_group = xmalloc(
sizeof(slurmdb_report_cluster_grouping_t));
@@ -302,33 +302,33 @@ no_objects:
acct_itr = list_iterator_create(cluster_group->acct_list);
while((acct_group = list_next(acct_itr))) {
- if (wckey_type) {
- if (!strcmp(job->wckey, acct_group->acct))
+ if(wckey_type) {
+ if(!strcmp(job->wckey, acct_group->acct))
break;
continue;
}
- if (!flat_view
+ if(!flat_view
&& (acct_group->lft != (uint32_t)NO_VAL)
&& (job->lft != (uint32_t)NO_VAL)) {
/* keep separate since we don't want
* to so a strcmp if we don't have to
*/
- if (job->lft > acct_group->lft
+ if(job->lft > acct_group->lft
&& job->lft < acct_group->rgt)
break;
- } else if (!strcmp(acct_group->acct, local_account))
+ } else if(!strcmp(acct_group->acct, local_account))
break;
}
list_iterator_destroy(acct_itr);
- if (!acct_group) {
+ if(!acct_group) {
char *group = NULL;
uint32_t last_size = 0;
/* here we are only looking for groups that
* were added with the associations above
*/
- if (!flat_view)
+ if(!flat_view)
continue;
acct_group = xmalloc(
@@ -342,22 +342,22 @@ no_objects:
job_group = xmalloc(
sizeof(slurmdb_report_job_grouping_t));
job_group->jobs = list_create(NULL);
- if (!individual)
+ if(!individual)
job_group->min_size = last_size;
last_size = atoi(group);
- if (!individual)
+ if(!individual)
job_group->max_size = last_size-1;
else
job_group->min_size =
job_group->max_size = last_size;
list_append(acct_group->groups, job_group);
}
- if (last_size && !individual) {
+ if(last_size && !individual) {
job_group = xmalloc(
sizeof(slurmdb_report_job_grouping_t));
job_group->jobs = list_create(NULL);
job_group->min_size = last_size;
- if (individual)
+ if(individual)
job_group->max_size =
job_group->min_size;
else
@@ -370,7 +370,7 @@ no_objects:
local_itr = list_iterator_create(acct_group->groups);
while((job_group = list_next(local_itr))) {
uint64_t total_secs = 0;
- if ((job->alloc_cpus < job_group->min_size)
+ if((job->alloc_cpus < job_group->min_size)
|| (job->alloc_cpus > job_group->max_size))
continue;
list_append(job_group->jobs, job);
@@ -388,17 +388,17 @@ no_objects:
list_iterator_destroy(cluster_itr);
end_it:
- if (object_list)
+ if(object_list)
list_destroy(object_list);
- if (destroy_job_cond)
+ if(destroy_job_cond)
slurmdb_destroy_job_cond(job_cond);
- if (destroy_grouping_list && grouping_list)
+ if(destroy_grouping_list && grouping_list)
list_destroy(grouping_list);
- if (exit_code) {
- if (cluster_list) {
+ if(exit_code) {
+ if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
diff --git a/src/db_api/user_report_functions.c b/src/db_api/user_report_functions.c
index 373d1067517469fd6156d06d1f272b910f5a004b..6169d133837df5aadf8e96a8f3d2a2bd22d164bc 100644
--- a/src/db_api/user_report_functions.c
+++ b/src/db_api/user_report_functions.c
@@ -74,18 +74,18 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
delete_cluster_list = 0;
time_t start_time, end_time;
- if (!user_cond) {
+ if(!user_cond) {
delete_user_cond = 1;
user_cond = xmalloc(sizeof(slurmdb_user_cond_t));
}
- if (!user_cond->assoc_cond) {
+ if(!user_cond->assoc_cond) {
delete_assoc_cond = 1;
user_cond->assoc_cond =
xmalloc(sizeof(slurmdb_association_cond_t));
}
- if (!user_cond->assoc_cond->cluster_list) {
+ if(!user_cond->assoc_cond->cluster_list) {
delete_cluster_list = 1;
user_cond->assoc_cond->cluster_list =
list_create(slurm_destroy_char);
@@ -107,7 +107,7 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
user_cond->assoc_cond->usage_end = end_time;
user_list = acct_storage_g_get_users(db_conn, my_uid, user_cond);
- if (!user_list) {
+ if(!user_list) {
exit_code=1;
fprintf(stderr, " Problem with user query.\n");
goto end_it;
@@ -126,7 +126,7 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
usage_cluster_list = acct_storage_g_get_clusters(
db_conn, my_uid, &cluster_cond);
- if (!usage_cluster_list) {
+ if(!usage_cluster_list) {
exit_code=1;
fprintf(stderr, " Problem with cluster query.\n");
goto end_it;
@@ -140,7 +140,7 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
/* check to see if this cluster is around during the
time we are looking at */
- if (!cluster->accounting_list
+ if(!cluster->accounting_list
|| !list_count(cluster->accounting_list))
continue;
@@ -174,11 +174,11 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
cluster_itr = list_iterator_create(cluster_list);
while((user = list_next(itr))) {
struct passwd *passwd_ptr = NULL;
- if (!user->assoc_list || !list_count(user->assoc_list))
+ if(!user->assoc_list || !list_count(user->assoc_list))
continue;
passwd_ptr = getpwnam(user->name);
- if (passwd_ptr)
+ if(passwd_ptr)
user->uid = passwd_ptr->pw_uid;
else
user->uid = (uint32_t)NO_VAL;
@@ -186,16 +186,16 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
itr2 = list_iterator_create(user->assoc_list);
while((assoc = list_next(itr2))) {
- if (!assoc->accounting_list
+ if(!assoc->accounting_list
|| !list_count(assoc->accounting_list))
continue;
while((slurmdb_report_cluster =
list_next(cluster_itr))) {
- if (!strcmp(slurmdb_report_cluster->name,
+ if(!strcmp(slurmdb_report_cluster->name,
assoc->cluster)) {
ListIterator user_itr = NULL;
- if (!group_accounts) {
+ if(!group_accounts) {
slurmdb_report_user = NULL;
goto new_user;
}
@@ -204,13 +204,13 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
user_list);
while((slurmdb_report_user
= list_next(user_itr))) {
- if (slurmdb_report_user->uid
+ if(slurmdb_report_user->uid
!= NO_VAL) {
- if (slurmdb_report_user->
+ if(slurmdb_report_user->
uid
== user->uid)
break;
- } else if (slurmdb_report_user->
+ } else if(slurmdb_report_user->
name
&& !strcasecmp(
slurmdb_report_user->
@@ -220,7 +220,7 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
}
list_iterator_destroy(user_itr);
new_user:
- if (!slurmdb_report_user) {
+ if(!slurmdb_report_user) {
slurmdb_report_user = xmalloc(
sizeof
(slurmdb_report_user_rec_t));
@@ -238,7 +238,7 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
break;
}
}
- if (!slurmdb_report_cluster) {
+ if(!slurmdb_report_cluster) {
error("This cluster '%s' hasn't "
"registered yet, but we have jobs "
"that ran?", assoc->cluster);
@@ -263,12 +263,12 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
itr3 = list_iterator_create(
slurmdb_report_user->acct_list);
while((object = list_next(itr3))) {
- if (!strcmp(object, assoc->acct))
+ if(!strcmp(object, assoc->acct))
break;
}
list_iterator_destroy(itr3);
- if (!object)
+ if(!object)
list_append(slurmdb_report_user->acct_list,
xstrdup(assoc->acct));
itr3 = list_iterator_create(assoc->accounting_list);
@@ -286,28 +286,28 @@ extern List slurmdb_report_user_top_usage(void *db_conn,
list_iterator_destroy(cluster_itr);
end_it:
- if (delete_cluster_list) {
+ if(delete_cluster_list) {
list_destroy(user_cond->assoc_cond->cluster_list);
user_cond->assoc_cond->cluster_list = NULL;
}
- if (delete_assoc_cond) {
+ if(delete_assoc_cond) {
slurmdb_destroy_association_cond(user_cond->assoc_cond);
user_cond->assoc_cond = NULL;
}
- if (delete_user_cond) {
+ if(delete_user_cond) {
slurmdb_destroy_user_cond(user_cond);
user_cond = NULL;
}
- if (user_list) {
+ if(user_list) {
list_destroy(user_list);
user_list = NULL;
}
- if (exit_code) {
- if (cluster_list) {
+ if(exit_code) {
+ if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
diff --git a/src/plugins/accounting_storage/common/common_as.c b/src/plugins/accounting_storage/common/common_as.c
index 67c4d87a08f57bdae93ac000f6080e427312f4e5..8a28e98a390e8f2998235c5ff7c30f47f2fabfc7 100644
--- a/src/plugins/accounting_storage/common/common_as.c
+++ b/src/plugins/accounting_storage/common/common_as.c
@@ -66,7 +66,7 @@ static int _sort_update_object_dec(slurmdb_update_object_t *object_a,
if ((object_a->type == SLURMDB_MODIFY_ASSOC)
&& (object_b->type != SLURMDB_MODIFY_ASSOC))
return 1;
- else if ((object_b->type == SLURMDB_MODIFY_ASSOC)
+ else if((object_b->type == SLURMDB_MODIFY_ASSOC)
&& (object_a->type != SLURMDB_MODIFY_ASSOC))
return -1;
return 0;
@@ -89,7 +89,7 @@ extern int send_accounting_update(List update_list, char *cluster, char *host,
slurm_msg_t resp;
int rc;
- if (rpc_version > SLURMDBD_VERSION) {
+ if(rpc_version > SLURMDBD_VERSION) {
error("%s at %s(%hu) ver %hu > %u, can't update",
cluster, host, port, rpc_version,
SLURMDBD_VERSION);
@@ -105,7 +105,7 @@ extern int send_accounting_update(List update_list, char *cluster, char *host,
slurm_msg_t_init(&req);
slurm_set_addr_char(&req.address, port, host);
req.msg_type = ACCOUNTING_UPDATE_MSG;
- if (slurmdbd_conf)
+ if(slurmdbd_conf)
req.flags = SLURM_GLOBAL_AUTH_KEY;
req.data = &msg;
slurm_msg_t_init(&resp);
@@ -126,7 +126,7 @@ extern int send_accounting_update(List update_list, char *cluster, char *host,
slurm_free_return_code_msg(resp.data);
break;
default:
- if (rc != SLURM_ERROR)
+ if(rc != SLURM_ERROR)
error("Unknown response message %u", resp.msg_type);
rc = SLURM_ERROR;
break;
@@ -150,19 +150,19 @@ addto_update_list(List update_list, slurmdb_update_type_t type, void *object)
{
slurmdb_update_object_t *update_object = NULL;
ListIterator itr = NULL;
- if (!update_list) {
+ if(!update_list) {
error("no update list given");
return SLURM_ERROR;
}
itr = list_iterator_create(update_list);
while((update_object = list_next(itr))) {
- if (update_object->type == type)
+ if(update_object->type == type)
break;
}
list_iterator_destroy(itr);
- if (update_object) {
+ if(update_object) {
/* here we prepend primarly for remove association
since parents need to be removed last, and they are
removed first in the calling code */
@@ -249,7 +249,7 @@ dump_update_list(List update_list)
debug3("========== DUMP UPDATE LIST ==========");
itr = list_iterator_create(update_list);
while((object = list_next(itr))) {
- if (!object->objects || !list_count(object->objects)) {
+ if(!object->objects || !list_count(object->objects)) {
debug3("\tUPDATE OBJECT WITH NO RECORDS, type: %d",
object->type);
continue;
@@ -358,15 +358,15 @@ set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
char *my_usage_table = (*usage_table);
/* Default is going to be the last day */
- if (!end) {
- if (!localtime_r(&my_time, &end_tm)) {
+ if(!end) {
+ if(!localtime_r(&my_time, &end_tm)) {
error("Couldn't get localtime from end %d",
my_time);
return SLURM_ERROR;
}
end_tm.tm_hour = 0;
} else {
- if (!localtime_r(&end, &end_tm)) {
+ if(!localtime_r(&end, &end_tm)) {
error("Couldn't get localtime from user end %d",
end);
return SLURM_ERROR;
@@ -377,8 +377,8 @@ set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
end_tm.tm_isdst = -1;
end = mktime(&end_tm);
- if (!start) {
- if (!localtime_r(&my_time, &start_tm)) {
+ if(!start) {
+ if(!localtime_r(&my_time, &start_tm)) {
error("Couldn't get localtime from start %d",
my_time);
return SLURM_ERROR;
@@ -386,7 +386,7 @@ set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
start_tm.tm_hour = 0;
start_tm.tm_mday--;
} else {
- if (!localtime_r(&start, &start_tm)) {
+ if(!localtime_r(&start, &start_tm)) {
error("Couldn't get localtime from user start %d",
start);
return SLURM_ERROR;
@@ -397,9 +397,9 @@ set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
start_tm.tm_isdst = -1;
start = mktime(&start_tm);
- if (end-start < 3600) {
+ if(end-start < 3600) {
end = start + 3600;
- if (!localtime_r(&end, &end_tm)) {
+ if(!localtime_r(&end, &end_tm)) {
error("2 Couldn't get localtime from user end %d",
end);
return SLURM_ERROR;
@@ -409,7 +409,7 @@ set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
* boundaries other wise use the day table.
*/
//info("%d %d %d", start_tm.tm_hour, end_tm.tm_hour, end-start);
- if (start_tm.tm_hour || end_tm.tm_hour || (end-start < 86400)
+ if(start_tm.tm_hour || end_tm.tm_hour || (end-start < 86400)
|| (end > my_time)) {
switch (type) {
case DBD_GET_ASSOC_USAGE:
@@ -426,7 +426,7 @@ set_usage_information(char **usage_table, slurmdbd_msg_type_t type,
slurmdbd_msg_type_2_str(type, 1));
break;
}
- } else if (start_tm.tm_mday == 0 && end_tm.tm_mday == 0
+ } else if(start_tm.tm_mday == 0 && end_tm.tm_mday == 0
&& (end-start > 86400)) {
switch (type) {
case DBD_GET_ASSOC_USAGE:
@@ -466,21 +466,21 @@ merge_delta_qos_list(List qos_list, List delta_qos_list)
char *new_qos = NULL, *curr_qos = NULL;
while((new_qos = list_next(new_itr))) {
- if (new_qos[0] == '-') {
+ if(new_qos[0] == '-') {
while((curr_qos = list_next(curr_itr))) {
- if (!strcmp(curr_qos, new_qos+1)) {
+ if(!strcmp(curr_qos, new_qos+1)) {
list_delete_item(curr_itr);
break;
}
}
list_iterator_reset(curr_itr);
- } else if (new_qos[0] == '+') {
+ } else if(new_qos[0] == '+') {
while((curr_qos = list_next(curr_itr))) {
- if (!strcmp(curr_qos, new_qos+1)) {
+ if(!strcmp(curr_qos, new_qos+1)) {
break;
}
}
- if (!curr_qos) {
+ if(!curr_qos) {
list_append(qos_list, xstrdup(new_qos+1));
}
list_iterator_reset(curr_itr);
@@ -498,12 +498,12 @@ extern bool is_user_min_admin_level(void *db_conn, uid_t uid,
* THERE IS NO AUTHENTICATION WHEN RUNNNING OUT OF THE
* SLURMDBD!
*/
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
/* We have to check the authentication here in the
* plugin since we don't know what accounts are being
* referenced until after the query.
*/
- if ((uid != slurmdbd_conf->slurm_user_id && uid != 0)
+ if((uid != slurmdbd_conf->slurm_user_id && uid != 0)
&& assoc_mgr_get_admin_level(db_conn, uid) < min_level)
is_admin = 0;
}
@@ -523,7 +523,7 @@ extern bool is_user_coord(slurmdb_user_rec_t *user, char *account)
itr = list_iterator_create(user->coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name, account))
+ if(!strcasecmp(coord->name, account))
break;
}
list_iterator_destroy(itr);
@@ -533,7 +533,7 @@ extern bool is_user_coord(slurmdb_user_rec_t *user, char *account)
extern bool is_user_any_coord(void *db_conn, slurmdb_user_rec_t *user)
{
xassert(user);
- if (assoc_mgr_fill_in_user(db_conn, user, 1, NULL) != SLURM_SUCCESS) {
+ if(assoc_mgr_fill_in_user(db_conn, user, 1, NULL) != SLURM_SUCCESS) {
error("couldn't get information for this user %s(%d)",
user->name, user->uid);
return 0;
diff --git a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
index d803badc7ed886ecb0e16837b4497756beabb035..2b9fbd89426dce85c4fc46f56409f533f1ab66eb 100644
--- a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
+++ b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
@@ -137,7 +137,7 @@ static int _print_record(struct job_record *job_ptr,
{
static int rc=SLURM_SUCCESS;
char *block_id = NULL;
- if (!job_ptr->details) {
+ if(!job_ptr->details) {
error("job_acct: job=%u doesn't exist", job_ptr->job_id);
return SLURM_ERROR;
}
@@ -149,7 +149,7 @@ static int _print_record(struct job_record *job_ptr,
&block_id);
#endif
- if (!block_id)
+ if(!block_id)
block_id = xstrdup("-");
slurm_mutex_lock( &logfile_lock );
@@ -182,7 +182,7 @@ extern int init ( void )
mode_t prot = 0600;
struct stat statbuf;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
fatal("The filetxt plugin should not "
"be run from the slurmdbd. "
"Please use a database plugin");
@@ -193,10 +193,10 @@ extern int init ( void )
* file in append mode stats could fail on it if the file
* isn't world writable.
*/
- if (first && (getuid() == slurm_get_slurm_user_id())) {
+ if(first && (getuid() == slurm_get_slurm_user_id())) {
debug2("slurmdb_init() called");
log_file = slurm_get_accounting_storage_loc();
- if (!log_file)
+ if(!log_file)
log_file = xstrdup(DEFAULT_STORAGE_LOC);
slurm_mutex_lock( &logfile_lock );
if (LOGFILE)
@@ -526,7 +526,7 @@ extern int jobacct_storage_p_job_start(void *db_conn,
long priority;
int track_steps = 0;
- if (!storage_init) {
+ if(!storage_init) {
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
@@ -563,7 +563,7 @@ extern int jobacct_storage_p_job_start(void *db_conn,
else
nodes = "(null)";
- if (job_ptr->batch_flag)
+ if(job_ptr->batch_flag)
track_steps = 1;
job_ptr->requid = -1; /* force to -1 for stats to know this
@@ -591,7 +591,7 @@ extern int jobacct_storage_p_job_complete(void *db_conn,
uint16_t job_state;
int duration;
- if (!storage_init) {
+ if(!storage_init) {
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
@@ -639,20 +639,20 @@ extern int jobacct_storage_p_step_start(void *db_conn,
float float_tmp = 0;
char *account;
- if (!storage_init) {
+ if(!storage_init) {
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
#ifdef HAVE_BG
- if (step_ptr->job_ptr->details)
+ if(step_ptr->job_ptr->details)
cpus = step_ptr->job_ptr->details->min_cpus;
else
cpus = step_ptr->job_ptr->cpu_cnt;
select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
- if (ionodes) {
+ if(ionodes) {
snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
@@ -661,7 +661,7 @@ extern int jobacct_storage_p_step_start(void *db_conn,
step_ptr->job_ptr->nodes);
#else
- if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
+ if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
cpus = step_ptr->job_ptr->total_cpus;
snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
} else {
@@ -753,7 +753,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
char *account;
uint32_t exit_code;
- if (!storage_init) {
+ if(!storage_init) {
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
@@ -779,14 +779,14 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
comp_status = JOB_COMPLETE;
#ifdef HAVE_BG
- if (step_ptr->job_ptr->details)
+ if(step_ptr->job_ptr->details)
cpus = step_ptr->job_ptr->details->min_cpus;
else
cpus = step_ptr->job_ptr->cpu_cnt;
select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
- if (ionodes) {
+ if(ionodes) {
snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
@@ -795,7 +795,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
step_ptr->job_ptr->nodes);
#else
- if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
+ if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
cpus = step_ptr->job_ptr->total_cpus;
snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
@@ -806,7 +806,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
}
#endif
/* figure out the ave of the totals sent */
- if (cpus > 0) {
+ if(cpus > 0) {
ave_vsize = jobacct->tot_vsize;
ave_vsize /= cpus;
ave_rss = jobacct->tot_rss;
@@ -817,7 +817,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
ave_cpu /= cpus;
}
- if (jobacct->min_cpu != (uint32_t)NO_VAL) {
+ if(jobacct->min_cpu != (uint32_t)NO_VAL) {
ave_cpu2 = jobacct->min_cpu;
}
@@ -892,13 +892,13 @@ extern int jobacct_storage_p_suspend(void *db_conn,
static time_t now = 0;
static time_t temp = 0;
int elapsed;
- if (!storage_init) {
+ if(!storage_init) {
debug("jobacct init was not called or it failed");
return SLURM_ERROR;
}
/* tell what time has passed */
- if (!now)
+ if(!now)
now = job_ptr->start_time;
temp = now;
now = time(NULL);
diff --git a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
index 19f3e2554174829881e7b58a24737024e6d21849..03110b9249cbc63db38822bf84947b26469dc0cf 100644
--- a/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
+++ b/src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c
@@ -203,7 +203,7 @@ enum { F_TOT_ELAPSED = HEADER_LENGTH,
static void _destroy_exp(void *object)
{
expired_rec_t *exp_rec = (expired_rec_t *)object;
- if (exp_rec) {
+ if(exp_rec) {
xfree(exp_rec->line);
xfree(exp_rec);
}
@@ -212,7 +212,7 @@ static void _destroy_exp(void *object)
static void _free_filetxt_header(void *object)
{
filetxt_header_t *header = (filetxt_header_t *)object;
- if (header) {
+ if(header) {
xfree(header->partition);
#ifdef HAVE_BG
xfree(header->blockid);
@@ -224,7 +224,7 @@ static void _destroy_filetxt_job_rec(void *object)
{
filetxt_job_rec_t *job = (filetxt_job_rec_t *)object;
if (job) {
- if (job->steps)
+ if(job->steps)
list_destroy(job->steps);
_free_filetxt_header(&job->header);
xfree(job->jobname);
@@ -255,7 +255,7 @@ static slurmdb_step_rec_t *_slurmdb_create_step_rec(
slurmdb_step->end = filetxt_step->header.timestamp;
slurmdb_step->exitcode = filetxt_step->exitcode;
slurmdb_step->ncpus = filetxt_step->ncpus;
- if (filetxt_step->nodes) {
+ if(filetxt_step->nodes) {
hostlist_t hl = hostlist_create(filetxt_step->nodes);
slurmdb_step->nnodes = hostlist_count(hl);
hostlist_destroy(hl);
@@ -286,7 +286,7 @@ static slurmdb_job_rec_t *_slurmdb_create_job_rec(
ListIterator itr = NULL;
filetxt_step_rec_t *filetxt_step = NULL;
- if (!job_cond)
+ if(!job_cond)
goto no_cond;
if (job_cond->state_list
@@ -321,7 +321,7 @@ no_cond:
slurmdb_job->partition = xstrdup(filetxt_job->header.partition);
slurmdb_job->req_cpus = filetxt_job->ncpus;
slurmdb_job->alloc_cpus = filetxt_job->ncpus;
- if (filetxt_job->nodes) {
+ if(filetxt_job->nodes) {
hostlist_t hl = hostlist_create(filetxt_job->nodes);
slurmdb_job->alloc_nodes = hostlist_count(hl);
hostlist_destroy(hl);
@@ -337,14 +337,14 @@ no_cond:
slurmdb_job->state = filetxt_job->status;
slurmdb_job->steps = list_create(slurmdb_destroy_step_rec);
- if (filetxt_job->steps) {
+ if(filetxt_job->steps) {
itr = list_iterator_create(filetxt_job->steps);
while((filetxt_step = list_next(itr))) {
slurmdb_step_rec_t *step =
_slurmdb_create_step_rec(filetxt_step);
- if (step) {
+ if(step) {
step->job_ptr = slurmdb_job;
- if (!slurmdb_job->first_step_ptr)
+ if(!slurmdb_job->first_step_ptr)
slurmdb_job->first_step_ptr = step;
list_append(slurmdb_job->steps, step);
}
@@ -487,7 +487,7 @@ static int _cmp_jrec(const void *a1, const void *a2) {
if (j1->job < j2->job)
return -1;
else if (j1->job == j2->job) {
- if (j1->job_submit == j2->job_submit)
+ if(j1->job_submit == j2->job_submit)
return 0;
else
return 1;
@@ -628,19 +628,19 @@ static filetxt_job_rec_t *_find_job_record(List job_list,
while((job = (filetxt_job_rec_t *)list_next(itr)) != NULL) {
if (job->header.jobnum == header.jobnum) {
- if (job->header.job_submit == 0 && type == JOB_START) {
+ if(job->header.job_submit == 0 && type == JOB_START) {
list_remove(itr);
_destroy_filetxt_job_rec(job);
job = NULL;
break;
}
- if (job->header.job_submit == BATCH_JOB_TIMESTAMP) {
+ if(job->header.job_submit == BATCH_JOB_TIMESTAMP) {
job->header.job_submit = header.job_submit;
break;
}
- if (job->header.job_submit == header.job_submit)
+ if(job->header.job_submit == header.job_submit)
break;
else {
/* If we're looking for a later
@@ -664,7 +664,7 @@ static filetxt_step_rec_t *_find_step_record(filetxt_job_rec_t *job,
filetxt_step_rec_t *step = NULL;
ListIterator itr = NULL;
- if (!list_count(job->steps))
+ if(!list_count(job->steps))
return step;
itr = list_iterator_create(job->steps);
@@ -752,7 +752,7 @@ static int _parse_line(char *f[], void **data, int len)
(*step)->rusage.ru_nvcsw = atoi(f[F_NVCSW]);
(*step)->rusage.ru_nivcsw = atoi(f[F_NIVCSW]);
(*step)->stats.vsize_max = atoi(f[F_MAX_VSIZE]);
- if (len > F_STEPNODES) {
+ if(len > F_STEPNODES) {
(*step)->stats.vsize_max_taskid =
atoi(f[F_MAX_VSIZE_TASK]);
(*step)->stats.vsize_ave = atof(f[F_AVE_VSIZE]);
@@ -785,7 +785,7 @@ static int _parse_line(char *f[], void **data, int len)
(*step)->stepname = NULL;
(*step)->nodes = NULL;
}
- if (len > F_MIN_CPU_NODE) {
+ if(len > F_MIN_CPU_NODE) {
(*step)->stats.vsize_max_nodeid =
atoi(f[F_MAX_VSIZE_NODE]);
(*step)->stats.rss_max_nodeid =
@@ -800,9 +800,9 @@ static int _parse_line(char *f[], void **data, int len)
(*step)->stats.pages_max_nodeid = NO_VAL;
(*step)->stats.cpu_min_nodeid = NO_VAL;
}
- if (len > F_STEP_ACCOUNT)
+ if(len > F_STEP_ACCOUNT)
(*step)->account = xstrdup(f[F_STEP_ACCOUNT]);
- if (len > F_STEP_REQUID)
+ if(len > F_STEP_REQUID)
(*step)->requid = atoi(f[F_STEP_REQUID]);
break;
case JOB_SUSPEND:
@@ -810,9 +810,9 @@ static int _parse_line(char *f[], void **data, int len)
*job = _create_filetxt_job_rec(header);
(*job)->elapsed = atoi(f[F_TOT_ELAPSED]);
(*job)->status = atoi(f[F_STATUS]);
- if (len > F_JOB_REQUID)
+ if(len > F_JOB_REQUID)
(*job)->requid = atoi(f[F_JOB_REQUID]);
- if (len > F_JOB_EXITCODE)
+ if(len > F_JOB_EXITCODE)
(*job)->exitcode = atoi(f[F_JOB_EXITCODE]);
break;
default:
@@ -915,7 +915,7 @@ static void _process_step(List job_list, char *f[], int lc,
step = temp;
temp = NULL;
list_append(job->steps, step);
- if (!job->track_steps) {
+ if(!job->track_steps) {
/* If we don't have track_steps we want to see
if we have multiple steps. If we only have
1 step check the job name against the step
@@ -923,19 +923,19 @@ static void _process_step(List job_list, char *f[], int lc,
different. If it is different print out
the step separate.
*/
- if (list_count(job->steps) > 1)
+ if(list_count(job->steps) > 1)
job->track_steps = 1;
- else if (step && step->stepname && job->jobname) {
- if (strcmp(step->stepname, job->jobname))
+ else if(step && step->stepname && job->jobname) {
+ if(strcmp(step->stepname, job->jobname))
job->track_steps = 1;
}
}
- if (job->header.timestamp == 0)
+ if(job->header.timestamp == 0)
job->header.timestamp = step->header.timestamp;
job->job_step_seen = 1;
job->ntasks += step->ntasks;
- if (!job->nodes || !strcmp(job->nodes, "(unknown)")) {
+ if(!job->nodes || !strcmp(job->nodes, "(unknown)")) {
xfree(job->nodes);
job->nodes = xstrdup(step->nodes);
}
@@ -1017,7 +1017,7 @@ static void _process_terminated(List job_list, char *f[], int lc,
job->status = temp->status;
job->requid = temp->requid;
job->exitcode = temp->exitcode;
- if (list_count(job->steps) > 1)
+ if(list_count(job->steps) > 1)
job->track_steps = 1;
job->show_full = show_full;
@@ -1053,10 +1053,10 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
add this extra field to the structure since it only applies
to this plugin.
*/
- if (job_cond) {
+ if(job_cond) {
fdump_flag = job_cond->duplicates & FDUMP_FLAG;
job_cond->duplicates &= (~FDUMP_FLAG);
- if (!job_cond->duplicates)
+ if(!job_cond->duplicates)
itr2 = list_iterator_create(ret_job_list);
}
@@ -1079,7 +1079,7 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
}
f[++i] = 0;
- if (i < HEADER_LENGTH) {
+ if(i < HEADER_LENGTH) {
continue;
}
@@ -1088,12 +1088,12 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
uid = atoi(f[F_UID]);
gid = atoi(f[F_GID]);
- if (rec_type == JOB_STEP)
+ if(rec_type == JOB_STEP)
step_id = atoi(f[F_JOBSTEP]);
else
step_id = NO_VAL;
- if (!job_cond) {
+ if(!job_cond) {
show_full = 1;
goto no_cond;
}
@@ -1133,7 +1133,7 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
if (selected_step->jobid != job_id)
continue;
/* job matches; does the step? */
- if (selected_step->stepid == NO_VAL) {
+ if(selected_step->stepid == NO_VAL) {
show_full = 1;
list_iterator_destroy(itr);
goto foundjob;
@@ -1173,21 +1173,21 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
/* Build suitable tables with all the data */
switch(rec_type) {
case JOB_START:
- if (i < F_JOB_ACCOUNT) {
+ if(i < F_JOB_ACCOUNT) {
error("Bad data on a Job Start");
_show_rec(f);
} else
_process_start(job_list, f, lc, show_full, i);
break;
case JOB_STEP:
- if (i < F_MAX_VSIZE) {
+ if(i < F_MAX_VSIZE) {
error("Bad data on a Step entry");
_show_rec(f);
} else
_process_step(job_list, f, lc, show_full, i);
break;
case JOB_SUSPEND:
- if (i < F_JOB_REQUID) {
+ if(i < F_JOB_REQUID) {
error("Bad data on a Suspend entry");
_show_rec(f);
} else
@@ -1195,7 +1195,7 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
show_full, i);
break;
case JOB_TERMINATED:
- if (i < F_JOB_REQUID) {
+ if(i < F_JOB_REQUID) {
error("Bad data on a Job Term");
_show_rec(f);
} else
@@ -1220,9 +1220,9 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
while((filetxt_job = list_next(itr))) {
slurmdb_job_rec_t *slurmdb_job =
_slurmdb_create_job_rec(filetxt_job, job_cond);
- if (slurmdb_job) {
+ if(slurmdb_job) {
slurmdb_job_rec_t *curr_job = NULL;
- if (itr2) {
+ if(itr2) {
list_iterator_reset(itr2);
while((curr_job = list_next(itr2))) {
if (curr_job->jobid ==
@@ -1238,7 +1238,7 @@ extern List filetxt_jobacct_process_get_jobs(slurmdb_job_cond_t *job_cond)
}
}
- if (itr2)
+ if(itr2)
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
@@ -1283,14 +1283,14 @@ extern int filetxt_jobacct_process_archive(slurmdb_archive_cond_t *arch_cond)
/* Figure out our expiration date */
time_t expiry;
- if (!arch_cond || !arch_cond->job_cond) {
+ if(!arch_cond || !arch_cond->job_cond) {
error("no job_cond was given for archive");
return SLURM_ERROR;
}
job_cond = arch_cond->job_cond;
- if (!arch_cond->archive_script)
+ if(!arch_cond->archive_script)
filein = slurm_get_accounting_storage_loc();
else
filein = arch_cond->archive_script;
@@ -1370,7 +1370,7 @@ extern int filetxt_jobacct_process_archive(slurmdb_archive_cond_t *arch_cond)
break;
list_iterator_destroy(itr);
- if (!object)
+ if(!object)
continue; /* no match */
}
@@ -1399,7 +1399,7 @@ extern int filetxt_jobacct_process_archive(slurmdb_archive_cond_t *arch_cond)
if (new_file) { /* By default, the expired file looks like the log */
chmod(logfile_name, prot);
- if (chown(logfile_name, uid, gid) == -1)
+ if(chown(logfile_name, uid, gid) == -1)
error("Couldn't change ownership of %s to %u:%u",
logfile_name, uid, gid);
}
@@ -1414,7 +1414,7 @@ extern int filetxt_jobacct_process_archive(slurmdb_archive_cond_t *arch_cond)
goto finished;
}
chmod(logfile_name, prot); /* preserve file protection */
- if (chown(logfile_name, uid, gid) == -1)/* and ownership */
+ if(chown(logfile_name, uid, gid) == -1)/* and ownership */
error("2 Couldn't change ownership of %s to %u:%u",
logfile_name, uid, gid);
/* Use line buffering to allow us to safely write
@@ -1441,7 +1441,7 @@ extern int filetxt_jobacct_process_archive(slurmdb_archive_cond_t *arch_cond)
while((exp_rec = list_next(itr))) {
itr2 = list_iterator_create(other_list);
while((exp_rec2 = list_next(itr2))) {
- if ((exp_rec2->job != exp_rec->job)
+ if((exp_rec2->job != exp_rec->job)
|| (exp_rec2->job_submit != exp_rec->job_submit))
continue;
if (fputs(exp_rec2->line, expired_logfile)<0) {
@@ -1470,7 +1470,7 @@ extern int filetxt_jobacct_process_archive(slurmdb_archive_cond_t *arch_cond)
while((exp_rec = list_next(itr))) {
itr2 = list_iterator_create(other_list);
while((exp_rec2 = list_next(itr2))) {
- if (exp_rec2->job != exp_rec->job)
+ if(exp_rec2->job != exp_rec->job)
continue;
if (fputs(exp_rec2->line, new_logfile)<0) {
perror("writing keep_logfile");
diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index ddfca4458b3b40c3bd4816a6421d752ace652985..8a6911e67bc3e6281fbb64a4f28b44e96f21d990 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -148,7 +148,7 @@ static List _get_cluster_names(MYSQL *db_conn)
char *query = xstrdup_printf("select name from %s where deleted=0",
cluster_table);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
return ret_list;
}
@@ -156,7 +156,7 @@ static List _get_cluster_names(MYSQL *db_conn)
ret_list = list_create(slurm_destroy_char);
while((row = mysql_fetch_row(result))) {
- if (row[0] && row[0][0])
+ if(row[0] && row[0][0])
list_append(ret_list, xstrdup(row[0]));
}
mysql_free_result(result);
@@ -171,13 +171,13 @@ static int _set_qos_cnt(MYSQL *db_conn)
MYSQL_ROW row;
char *query = xstrdup_printf("select MAX(id) from %s", qos_table);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(row = mysql_fetch_row(result))) {
+ if(!(row = mysql_fetch_row(result))) {
mysql_free_result(result);
return SLURM_ERROR;
}
@@ -200,7 +200,7 @@ static void _process_running_jobs_result(char *cluster_name,
char *object;
while((row = mysql_fetch_row(result))) {
- if (!row[JASSOC_USER][0]) {
+ if(!row[JASSOC_USER][0]) {
/* This should never happen */
error("How did we get a job running on an association "
"that isn't a user assocation job %s cluster "
@@ -212,7 +212,7 @@ static void _process_running_jobs_result(char *cluster_name,
"JobID = %-10s C = %-10s A = %-10s U = %-9s",
row[JASSOC_JOB], cluster_name, row[JASSOC_ACCT],
row[JASSOC_USER]);
- if (row[JASSOC_PART][0])
+ if(row[JASSOC_PART][0])
// see if there is a partition name
xstrfmtcat(object, " P = %s", row[JASSOC_PART]);
list_append(ret_list, object);
@@ -243,7 +243,7 @@ static bool _check_jobs_before_remove(mysql_conn_t *mysql_conn,
"t1.user",
"t1.partition"
};
- if (ret_list) {
+ if(ret_list) {
xstrcat(object, jassoc_req_inx[0]);
for(i=1; i<JASSOC_COUNT; i++)
xstrfmtcat(object, ", %s", jassoc_req_inx[i]);
@@ -276,23 +276,23 @@ static bool _check_jobs_before_remove(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return rc;
}
xfree(query);
- if (mysql_num_rows(result)) {
+ if(mysql_num_rows(result)) {
debug4("We have jobs for this combo");
rc = true;
- if (ret_list && !(*already_flushed)) {
+ if(ret_list && !(*already_flushed)) {
list_flush(ret_list);
(*already_flushed) = 1;
reset_mysql_conn(mysql_conn);
}
}
- if (ret_list)
+ if(ret_list)
_process_running_jobs_result(cluster_name, result, ret_list);
mysql_free_result(result);
@@ -320,7 +320,7 @@ static bool _check_jobs_before_remove_assoc(mysql_conn_t *mysql_conn,
"t2.partition"
};
- if (ret_list) {
+ if(ret_list) {
xstrcat(object, jassoc_req_inx[0]);
for(i=1; i<JASSOC_COUNT; i++)
xstrfmtcat(object, ", %s", jassoc_req_inx[i]);
@@ -344,24 +344,24 @@ static bool _check_jobs_before_remove_assoc(mysql_conn_t *mysql_conn,
}
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return rc;
}
xfree(query);
- if (mysql_num_rows(result)) {
+ if(mysql_num_rows(result)) {
debug4("We have jobs for this combo");
rc = true;
- if (ret_list && !(*already_flushed)) {
+ if(ret_list && !(*already_flushed)) {
list_flush(ret_list);
(*already_flushed) = 1;
reset_mysql_conn(mysql_conn);
}
}
- if (ret_list)
+ if(ret_list)
_process_running_jobs_result(cluster_name, result, ret_list);
mysql_free_result(result);
@@ -383,14 +383,14 @@ static bool _check_jobs_before_remove_without_assoctable(
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return rc;
}
xfree(query);
- if (mysql_num_rows(result)) {
+ if(mysql_num_rows(result)) {
debug4("We have jobs for this combo");
rc = true;
}
@@ -403,7 +403,7 @@ static mysql_db_info_t *_as_mysql_acct_create_db_info()
{
mysql_db_info_t *db_info = xmalloc(sizeof(mysql_db_info_t));
db_info->port = slurm_get_accounting_storage_port();
- if (!db_info->port) {
+ if(!db_info->port) {
db_info->port = DEFAULT_MYSQL_PORT;
slurm_set_accounting_storage_port(db_info->port);
}
@@ -583,7 +583,7 @@ static int _as_mysql_acct_check_tables(MYSQL *db_conn)
/* Make the cluster table first since we build other tables
built off this one */
- if (mysql_db_create_table(db_conn, cluster_table,
+ if(mysql_db_create_table(db_conn, cluster_table,
cluster_table_fields,
", primary key (name(20)))") == SLURM_ERROR)
return SLURM_ERROR;
@@ -591,12 +591,12 @@ static int _as_mysql_acct_check_tables(MYSQL *db_conn)
/* This table needs to be made before conversions also since
we add a cluster column.
*/
- if (mysql_db_create_table(db_conn, txn_table, txn_table_fields,
+ if(mysql_db_create_table(db_conn, txn_table, txn_table_fields,
", primary key (id))") == SLURM_ERROR)
return SLURM_ERROR;
slurm_mutex_lock(&as_mysql_cluster_list_lock);
- if (!(as_mysql_cluster_list = _get_cluster_names(db_conn))) {
+ if(!(as_mysql_cluster_list = _get_cluster_names(db_conn))) {
error("issue getting contents of %s", cluster_table);
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
return SLURM_ERROR;
@@ -606,32 +606,32 @@ static int _as_mysql_acct_check_tables(MYSQL *db_conn)
* lock */
itr = list_iterator_create(as_mysql_cluster_list);
while((cluster_name = list_next(itr))) {
- if ((rc = create_cluster_tables(db_conn, cluster_name))
+ if((rc = create_cluster_tables(db_conn, cluster_name))
!= SLURM_SUCCESS)
break;
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
return rc;
/* DEF_TIMERS; */
/* START_TIMER; */
- if (as_mysql_convert_tables(db_conn) != SLURM_SUCCESS)
+ if(as_mysql_convert_tables(db_conn) != SLURM_SUCCESS)
return SLURM_ERROR;
/* END_TIMER; */
/* info("conversion took %s", TIME_STR); */
- if (mysql_db_create_table(db_conn, acct_coord_table,
+ if(mysql_db_create_table(db_conn, acct_coord_table,
acct_coord_table_fields,
", primary key (acct(20), user(20)))")
== SLURM_ERROR)
return SLURM_ERROR;
- if (mysql_db_create_table(db_conn, acct_table, acct_table_fields,
+ if(mysql_db_create_table(db_conn, acct_table, acct_table_fields,
", primary key (name(20)))") == SLURM_ERROR)
return SLURM_ERROR;
- if (mysql_db_create_table(db_conn, qos_table,
+ if(mysql_db_create_table(db_conn, qos_table,
qos_table_fields,
", primary key (id), "
"unique index (name(20)))")
@@ -639,7 +639,7 @@ static int _as_mysql_acct_check_tables(MYSQL *db_conn)
return SLURM_ERROR;
else {
int qos_id = 0;
- if (slurmdbd_conf && slurmdbd_conf->default_qos) {
+ if(slurmdbd_conf && slurmdbd_conf->default_qos) {
List char_list = list_create(slurm_destroy_char);
char *qos = NULL;
ListIterator itr = NULL;
@@ -663,7 +663,7 @@ static int _as_mysql_acct_check_tables(MYSQL *db_conn)
"id=LAST_INSERT_ID(id), deleted=0;",
qos_table, now, now, qos);
qos_id = mysql_insert_ret_id(db_conn, query);
- if (!qos_id)
+ if(!qos_id)
fatal("problem added qos '%s", qos);
xstrfmtcat(default_qos_str, ",%d", qos_id);
xfree(query);
@@ -681,18 +681,18 @@ static int _as_mysql_acct_check_tables(MYSQL *db_conn)
qos_table, now, now);
//debug3("%s", query);
qos_id = mysql_insert_ret_id(db_conn, query);
- if (!qos_id)
+ if(!qos_id)
fatal("problem added qos 'normal");
xstrfmtcat(default_qos_str, ",%d", qos_id);
xfree(query);
}
- if (_set_qos_cnt(db_conn) != SLURM_SUCCESS)
+ if(_set_qos_cnt(db_conn) != SLURM_SUCCESS)
return SLURM_ERROR;
}
- if (mysql_db_create_table(db_conn, user_table, user_table_fields,
+ if(mysql_db_create_table(db_conn, user_table, user_table_fields,
", primary key (name(20)))") == SLURM_ERROR)
return SLURM_ERROR;
@@ -728,13 +728,13 @@ static int _as_mysql_acct_check_tables(MYSQL *db_conn)
*/
extern int check_connection(mysql_conn_t *mysql_conn)
{
- if (!mysql_conn) {
+ if(!mysql_conn) {
error("We need a connection to run this");
errno = SLURM_ERROR;
return SLURM_ERROR;
- } else if (!mysql_conn->db_conn
+ } else if(!mysql_conn->db_conn
|| mysql_db_ping(mysql_conn->db_conn) != 0) {
- if (mysql_get_db_connection(&mysql_conn->db_conn,
+ if(mysql_get_db_connection(&mysql_conn->db_conn,
mysql_db_name, mysql_db_info)
!= SLURM_SUCCESS) {
error("unable to re-connect to as_mysql database");
@@ -742,12 +742,12 @@ extern int check_connection(mysql_conn_t *mysql_conn)
return ESLURM_DB_CONNECTION;
} else {
int rc;
- if (mysql_conn->rollback)
+ if(mysql_conn->rollback)
mysql_autocommit(mysql_conn->db_conn, 0);
rc = mysql_db_query(mysql_conn->db_conn,
"SET session "
"sql_mode='ANSI_QUOTES';");
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("couldn't set sql_mode on reconnect");
acct_storage_p_close_connection(&mysql_conn);
errno = ESLURM_DB_CONNECTION;
@@ -756,7 +756,7 @@ extern int check_connection(mysql_conn_t *mysql_conn)
}
}
- if (mysql_conn->cluster_deleted) {
+ if(mysql_conn->cluster_deleted) {
errno = ESLURM_CLUSTER_DELETED;
return ESLURM_CLUSTER_DELETED;
}
@@ -778,7 +778,7 @@ extern int last_affected_rows(MYSQL *mysql_db)
else
if (mysql_field_count(mysql_db) == 0) {
status = mysql_affected_rows(mysql_db);
- if (status > 0)
+ if(status > 0)
rows = status;
}
if ((status = mysql_next_result(mysql_db)) > 0)
@@ -790,7 +790,7 @@ extern int last_affected_rows(MYSQL *mysql_db)
extern void reset_mysql_conn(mysql_conn_t *mysql_conn)
{
- if (mysql_conn->rollback) {
+ if(mysql_conn->rollback) {
mysql_db_rollback(mysql_conn->db_conn);
}
xfree(mysql_conn->pre_commit_query);
@@ -997,7 +997,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, assoc_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
assoc_table_fields,
", primary key (id_assoc), "
" unique index (user(20), acct(20), "
@@ -1007,7 +1007,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, assoc_day_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
assoc_usage_table_fields,
", primary key (id_assoc, "
"time_start))")
@@ -1016,7 +1016,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, assoc_hour_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
assoc_usage_table_fields,
", primary key (id_assoc, "
"time_start))")
@@ -1025,7 +1025,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, assoc_month_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
assoc_usage_table_fields,
", primary key (id_assoc, "
"time_start))")
@@ -1034,7 +1034,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, cluster_day_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
cluster_usage_table_fields,
", primary key (time_start))")
== SLURM_ERROR)
@@ -1042,7 +1042,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, cluster_hour_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
cluster_usage_table_fields,
", primary key (time_start))")
== SLURM_ERROR)
@@ -1050,7 +1050,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, cluster_month_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
cluster_usage_table_fields,
", primary key (time_start))")
== SLURM_ERROR)
@@ -1058,7 +1058,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, event_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
event_table_fields,
", primary key (node_name(20), "
"time_start))")
@@ -1067,7 +1067,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, job_table);
- if (mysql_db_create_table(db_conn, table_name, job_table_fields,
+ if(mysql_db_create_table(db_conn, table_name, job_table_fields,
", primary key (job_db_inx), "
"unique index (id_job, "
"id_assoc, time_submit))")
@@ -1076,7 +1076,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, last_ran_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
last_ran_table_fields,
")")
== SLURM_ERROR)
@@ -1084,7 +1084,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, resv_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
resv_table_fields,
", primary key (id_resv, time_start))")
== SLURM_ERROR)
@@ -1092,7 +1092,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, step_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
step_table_fields,
", primary key (job_db_inx, id_step))")
== SLURM_ERROR)
@@ -1100,14 +1100,14 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, suspend_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
suspend_table_fields,
")") == SLURM_ERROR)
return SLURM_ERROR;
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, wckey_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
wckey_table_fields,
", primary key (id_wckey), "
" unique index (wckey_name(20), "
@@ -1117,7 +1117,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, wckey_day_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
wckey_usage_table_fields,
", primary key (id_wckey, "
"time_start))")
@@ -1126,7 +1126,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, wckey_hour_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
wckey_usage_table_fields,
", primary key (id_wckey, "
"time_start))")
@@ -1135,7 +1135,7 @@ extern int create_cluster_tables(MYSQL *db_conn, char *cluster_name)
snprintf(table_name, sizeof(table_name), "\"%s_%s\"",
cluster_name, wckey_month_table);
- if (mysql_db_create_table(db_conn, table_name,
+ if(mysql_db_create_table(db_conn, table_name,
wckey_usage_table_fields,
", primary key (id_wckey, "
"time_start))")
@@ -1155,14 +1155,14 @@ extern int remove_cluster_tables(mysql_conn_t *mysql_conn, char *cluster_name)
cluster_name, assoc_table);
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
error("no result given when querying cluster %s", cluster_name);
return SLURM_ERROR;
}
xfree(query);
- if (mysql_num_rows(result)) {
+ if(mysql_num_rows(result)) {
mysql_free_result(result);
/* If there were any associations removed fix it up
here since the table isn't going to be deleted. */
@@ -1210,10 +1210,10 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
char **extra, qos_level_t qos_level,
bool get_fs)
{
- if (!assoc)
+ if(!assoc)
return SLURM_ERROR;
- if ((int32_t)assoc->shares_raw >= 0) {
+ if((int32_t)assoc->shares_raw >= 0) {
xstrcat(*cols, ", shares");
xstrfmtcat(*vals, ", %u", assoc->shares_raw);
xstrfmtcat(*extra, ", shares=%u", assoc->shares_raw);
@@ -1224,11 +1224,11 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
assoc->shares_raw = 1;
}
- if (assoc->grp_cpu_mins == (uint64_t)INFINITE) {
+ if(assoc->grp_cpu_mins == (uint64_t)INFINITE) {
xstrcat(*cols, ", grp_cpu_mins");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_cpu_mins=NULL");
- } else if ((assoc->grp_cpu_mins != (uint64_t)NO_VAL)
+ } else if((assoc->grp_cpu_mins != (uint64_t)NO_VAL)
&& ((int64_t)assoc->grp_cpu_mins >= 0)) {
xstrcat(*cols, ", grp_cpu_mins");
xstrfmtcat(*vals, ", %llu", assoc->grp_cpu_mins);
@@ -1236,44 +1236,44 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
assoc->grp_cpu_mins);
}
- if (assoc->grp_cpus == INFINITE) {
+ if(assoc->grp_cpus == INFINITE) {
xstrcat(*cols, ", grp_cpus");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_cpus=NULL");
- } else if ((assoc->grp_cpus != NO_VAL)
+ } else if((assoc->grp_cpus != NO_VAL)
&& ((int32_t)assoc->grp_cpus >= 0)) {
xstrcat(*cols, ", grp_cpus");
xstrfmtcat(*vals, ", %u", assoc->grp_cpus);
xstrfmtcat(*extra, ", grp_cpus=%u", assoc->grp_cpus);
}
- if (assoc->grp_jobs == INFINITE) {
+ if(assoc->grp_jobs == INFINITE) {
xstrcat(*cols, ", grp_jobs");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_jobs=NULL");
- } else if ((assoc->grp_jobs != NO_VAL)
+ } else if((assoc->grp_jobs != NO_VAL)
&& ((int32_t)assoc->grp_jobs >= 0)) {
xstrcat(*cols, ", grp_jobs");
xstrfmtcat(*vals, ", %u", assoc->grp_jobs);
xstrfmtcat(*extra, ", grp_jobs=%u", assoc->grp_jobs);
}
- if (assoc->grp_nodes == INFINITE) {
+ if(assoc->grp_nodes == INFINITE) {
xstrcat(*cols, ", grp_nodes");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_nodes=NULL");
- } else if ((assoc->grp_nodes != NO_VAL)
+ } else if((assoc->grp_nodes != NO_VAL)
&& ((int32_t)assoc->grp_nodes >= 0)) {
xstrcat(*cols, ", grp_nodes");
xstrfmtcat(*vals, ", %u", assoc->grp_nodes);
xstrfmtcat(*extra, ", grp_nodes=%u", assoc->grp_nodes);
}
- if (assoc->grp_submit_jobs == INFINITE) {
+ if(assoc->grp_submit_jobs == INFINITE) {
xstrcat(*cols, ", grp_submit_jobs");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_submit_jobs=NULL");
- } else if ((assoc->grp_submit_jobs != NO_VAL)
+ } else if((assoc->grp_submit_jobs != NO_VAL)
&& ((int32_t)assoc->grp_submit_jobs >= 0)) {
xstrcat(*cols, ", grp_submit_jobs");
xstrfmtcat(*vals, ", %u", assoc->grp_submit_jobs);
@@ -1281,22 +1281,22 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
assoc->grp_submit_jobs);
}
- if (assoc->grp_wall == INFINITE) {
+ if(assoc->grp_wall == INFINITE) {
xstrcat(*cols, ", grp_wall");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_wall=NULL");
- } else if ((assoc->grp_wall != NO_VAL)
+ } else if((assoc->grp_wall != NO_VAL)
&& ((int32_t)assoc->grp_wall >= 0)) {
xstrcat(*cols, ", grp_wall");
xstrfmtcat(*vals, ", %u", assoc->grp_wall);
xstrfmtcat(*extra, ", grp_wall=%u", assoc->grp_wall);
}
- if (assoc->max_cpu_mins_pj == (uint64_t)INFINITE) {
+ if(assoc->max_cpu_mins_pj == (uint64_t)INFINITE) {
xstrcat(*cols, ", max_cpu_mins_pj");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_cpu_mins_pj=NULL");
- } else if ((assoc->max_cpu_mins_pj != (uint64_t)NO_VAL)
+ } else if((assoc->max_cpu_mins_pj != (uint64_t)NO_VAL)
&& ((int64_t)assoc->max_cpu_mins_pj >= 0)) {
xstrcat(*cols, ", max_cpu_mins_pj");
xstrfmtcat(*vals, ", %llu", assoc->max_cpu_mins_pj);
@@ -1304,44 +1304,44 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
assoc->max_cpu_mins_pj);
}
- if (assoc->max_cpus_pj == INFINITE) {
+ if(assoc->max_cpus_pj == INFINITE) {
xstrcat(*cols, ", max_cpus_pj");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_cpus_pj=NULL");
- } else if ((assoc->max_cpus_pj != NO_VAL)
+ } else if((assoc->max_cpus_pj != NO_VAL)
&& ((int32_t)assoc->max_cpus_pj >= 0)) {
xstrcat(*cols, ", max_cpus_pj");
xstrfmtcat(*vals, ", %u", assoc->max_cpus_pj);
xstrfmtcat(*extra, ", max_cpus_pj=%u", assoc->max_cpus_pj);
}
- if (assoc->max_jobs == INFINITE) {
+ if(assoc->max_jobs == INFINITE) {
xstrcat(*cols, ", max_jobs");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_jobs=NULL");
- } else if ((assoc->max_jobs != NO_VAL)
+ } else if((assoc->max_jobs != NO_VAL)
&& ((int32_t)assoc->max_jobs >= 0)) {
xstrcat(*cols, ", max_jobs");
xstrfmtcat(*vals, ", %u", assoc->max_jobs);
xstrfmtcat(*extra, ", max_jobs=%u", assoc->max_jobs);
}
- if (assoc->max_nodes_pj == INFINITE) {
+ if(assoc->max_nodes_pj == INFINITE) {
xstrcat(*cols, ", max_nodes_pj");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_nodes_pj=NULL");
- } else if ((assoc->max_nodes_pj != NO_VAL)
+ } else if((assoc->max_nodes_pj != NO_VAL)
&& ((int32_t)assoc->max_nodes_pj >= 0)) {
xstrcat(*cols, ", max_nodes_pj");
xstrfmtcat(*vals, ", %u", assoc->max_nodes_pj);
xstrfmtcat(*extra, ", max_nodes_pj=%u", assoc->max_nodes_pj);
}
- if (assoc->max_submit_jobs == INFINITE) {
+ if(assoc->max_submit_jobs == INFINITE) {
xstrcat(*cols, ", max_submit_jobs");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_submit_jobs=NULL");
- } else if ((assoc->max_submit_jobs != NO_VAL)
+ } else if((assoc->max_submit_jobs != NO_VAL)
&& ((int32_t)assoc->max_submit_jobs >= 0)) {
xstrcat(*cols, ", max_submit_jobs");
xstrfmtcat(*vals, ", %u", assoc->max_submit_jobs);
@@ -1349,24 +1349,24 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
assoc->max_submit_jobs);
}
- if (assoc->max_wall_pj == INFINITE) {
+ if(assoc->max_wall_pj == INFINITE) {
xstrcat(*cols, ", max_wall_pj");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_wall_pj=NULL");
- } else if ((assoc->max_wall_pj != NO_VAL)
+ } else if((assoc->max_wall_pj != NO_VAL)
&& ((int32_t)assoc->max_wall_pj >= 0)) {
xstrcat(*cols, ", max_wall_pj");
xstrfmtcat(*vals, ", %u", assoc->max_wall_pj);
xstrfmtcat(*extra, ", max_wall_pj=%u", assoc->max_wall_pj);
}
- if (assoc->def_qos_id == INFINITE) {
+ if(assoc->def_qos_id == INFINITE) {
xstrcat(*cols, ", def_qos_id");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", def_qos_id=NULL");
/* 0 is the no def_qos_id, so it that way */
assoc->def_qos_id = 0;
- } else if ((assoc->def_qos_id != NO_VAL)
+ } else if((assoc->def_qos_id != NO_VAL)
&& ((int32_t)assoc->def_qos_id > 0)) {
xstrcat(*cols, ", def_qos_id");
xstrfmtcat(*vals, ", %u", assoc->def_qos_id);
@@ -1375,10 +1375,10 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
/* when modifying the qos it happens in the actual function
since we have to wait until we hear about the parent first. */
- if (qos_level == QOS_LEVEL_MODIFY)
+ if(qos_level == QOS_LEVEL_MODIFY)
goto end_qos;
- if (assoc->qos_list && list_count(assoc->qos_list)) {
+ if(assoc->qos_list && list_count(assoc->qos_list)) {
char *qos_type = "qos";
char *qos_val = NULL;
char *tmp_char = NULL;
@@ -1388,10 +1388,10 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
while((tmp_char = list_next(qos_itr))) {
/* we don't want to include blank names */
- if (!tmp_char[0])
+ if(!tmp_char[0])
continue;
- if (!set) {
- if (tmp_char[0] == '+' || tmp_char[0] == '-')
+ if(!set) {
+ if(tmp_char[0] == '+' || tmp_char[0] == '-')
qos_type = "delta_qos";
set = 1;
}
@@ -1399,18 +1399,18 @@ extern int setup_association_limits(slurmdb_association_rec_t *assoc,
}
list_iterator_destroy(qos_itr);
- if (qos_val) {
+ if(qos_val) {
xstrfmtcat(*cols, ", %s", qos_type);
xstrfmtcat(*vals, ", '%s'", qos_val);
xstrfmtcat(*extra, ", %s='%s'", qos_type, qos_val);
xfree(qos_val);
}
- } else if ((qos_level == QOS_LEVEL_SET) && default_qos_str) {
+ } else if((qos_level == QOS_LEVEL_SET) && default_qos_str) {
/* Add default qos to the account */
xstrcat(*cols, ", qos");
xstrfmtcat(*vals, ", '%s'", default_qos_str);
xstrfmtcat(*extra, ", qos='%s'", default_qos_str);
- if (!assoc->qos_list)
+ if(!assoc->qos_list)
assoc->qos_list = list_create(slurm_destroy_char);
slurm_addto_char_list(assoc->qos_list, default_qos_str);
} else {
@@ -1444,15 +1444,15 @@ extern int modify_common(mysql_conn_t *mysql_conn,
bool cluster_centric = true;
/* figure out which tables we need to append the cluster name to */
- if ((table == cluster_table) || (table == acct_coord_table)
+ if((table == cluster_table) || (table == acct_coord_table)
|| (table == acct_table) || (table == qos_table)
|| (table == txn_table) || (table == user_table))
cluster_centric = false;
- if (vals[1])
+ if(vals[1])
tmp_vals = slurm_add_slash_to_quotes(vals+2);
- if (cluster_centric) {
+ if(cluster_centric) {
xassert(cluster_name);
xstrfmtcat(query,
"update \"%s_%s\" set mod_time=%d%s "
@@ -1484,7 +1484,7 @@ extern int modify_common(mysql_conn_t *mysql_conn,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
reset_mysql_conn(mysql_conn);
return SLURM_ERROR;
}
@@ -1516,7 +1516,7 @@ extern int remove_common(mysql_conn_t *mysql_conn,
uint32_t smallest_lft = 0xFFFFFFFF;
/* figure out which tables we need to append the cluster name to */
- if ((table == cluster_table) || (table == acct_coord_table)
+ if((table == cluster_table) || (table == acct_coord_table)
|| (table == acct_table) || (table == qos_table)
|| (table == txn_table) || (table == user_table))
cluster_centric = false;
@@ -1525,16 +1525,16 @@ extern int remove_common(mysql_conn_t *mysql_conn,
* really delete it for accounting purposes. This is for
* corner cases most of the time this won't matter.
*/
- if (table == acct_coord_table) {
+ if(table == acct_coord_table) {
/* This doesn't apply for these tables since we are
* only looking for association type tables.
*/
- } else if ((table == qos_table) || (table == wckey_table)) {
+ } else if((table == qos_table) || (table == wckey_table)) {
has_jobs = _check_jobs_before_remove_without_assoctable(
mysql_conn, cluster_name, assoc_char);
- } else if (table != assoc_table) {
+ } else if(table != assoc_table) {
/* first check to see if we are running jobs now */
- if (_check_jobs_before_remove(
+ if(_check_jobs_before_remove(
mysql_conn, cluster_name, assoc_char,
ret_list, jobs_running) || (*jobs_running))
return SLURM_SUCCESS;
@@ -1543,7 +1543,7 @@ extern int remove_common(mysql_conn_t *mysql_conn,
mysql_conn, cluster_name, assoc_char, NULL, NULL);
} else {
/* first check to see if we are running jobs now */
- if (_check_jobs_before_remove_assoc(
+ if(_check_jobs_before_remove_assoc(
mysql_conn, cluster_name, name_char,
ret_list, jobs_running) || (*jobs_running))
return SLURM_SUCCESS;
@@ -1554,8 +1554,8 @@ extern int remove_common(mysql_conn_t *mysql_conn,
NULL, NULL);
}
/* we want to remove completely all that is less than a day old */
- if (!has_jobs && table != assoc_table) {
- if (cluster_centric) {
+ if(!has_jobs && table != assoc_table) {
+ if(cluster_centric) {
query = xstrdup_printf("delete from \"%s_%s\" where "
"creation_time>%d && (%s);",
cluster_name, table, day_old,
@@ -1577,8 +1577,8 @@ extern int remove_common(mysql_conn_t *mysql_conn,
}
}
- if (table != assoc_table) {
- if (cluster_centric)
+ if(table != assoc_table) {
+ if(cluster_centric)
xstrfmtcat(query,
"update \"%s_%s\" set mod_time=%d, "
"deleted=1 where deleted=0 && (%s);",
@@ -1595,12 +1595,12 @@ extern int remove_common(mysql_conn_t *mysql_conn,
time. The assoc_char has the actual ids of the assocs
which never change.
*/
- if (type == DBD_REMOVE_ASSOCS && assoc_char)
+ if(type == DBD_REMOVE_ASSOCS && assoc_char)
tmp_name_char = slurm_add_slash_to_quotes(assoc_char);
else
tmp_name_char = slurm_add_slash_to_quotes(name_char);
- if (cluster_centric)
+ if(cluster_centric)
xstrfmtcat(query,
"insert into %s (timestamp, action, name, "
"actor, cluster) values (%d, %d, '%s', '%s', '%s');",
@@ -1619,20 +1619,20 @@ extern int remove_common(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
reset_mysql_conn(mysql_conn);
return SLURM_ERROR;
- } else if ((table == acct_coord_table)
+ } else if((table == acct_coord_table)
|| (table == qos_table)
|| (table == wckey_table))
return SLURM_SUCCESS;
/* mark deleted=1 or remove completely the accounting tables
*/
- if (table != assoc_table) {
- if (!assoc_char) {
+ if(table != assoc_table) {
+ if(!assoc_char) {
error("no assoc_char");
- if (mysql_conn->rollback) {
+ if(mysql_conn->rollback) {
mysql_db_rollback(mysql_conn->db_conn);
}
list_flush(mysql_conn->update_list);
@@ -1651,10 +1651,10 @@ extern int remove_common(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (mysql_conn->rollback) {
+ if(mysql_conn->rollback) {
mysql_db_rollback(mysql_conn->db_conn);
}
list_flush(mysql_conn->update_list);
@@ -1666,14 +1666,14 @@ extern int remove_common(mysql_conn_t *mysql_conn,
loc_assoc_char = NULL;
while((row = mysql_fetch_row(result))) {
slurmdb_association_rec_t *rem_assoc = NULL;
- if (loc_assoc_char)
+ if(loc_assoc_char)
xstrcat(loc_assoc_char, " || ");
xstrfmtcat(loc_assoc_char, "id_assoc=%s", row[0]);
rem_assoc = xmalloc(sizeof(slurmdb_association_rec_t));
rem_assoc->id = atoi(row[0]);
rem_assoc->cluster = xstrdup(cluster_name);
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_REMOVE_ASSOC,
rem_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
@@ -1682,7 +1682,7 @@ extern int remove_common(mysql_conn_t *mysql_conn,
} else
loc_assoc_char = assoc_char;
- if (!loc_assoc_char) {
+ if(!loc_assoc_char) {
debug2("No associations with object being deleted\n");
return rc;
}
@@ -1702,7 +1702,7 @@ extern int remove_common(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query, strlen(query));
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
reset_mysql_conn(mysql_conn);
return SLURM_ERROR;
}
@@ -1711,7 +1711,7 @@ extern int remove_common(mysql_conn_t *mysql_conn,
* removing the associations. Since we may want them for
* reports in the future since jobs had ran.
*/
- if (has_jobs)
+ if(has_jobs)
goto just_update;
/* remove completely all the associations for this added in the last
@@ -1725,7 +1725,7 @@ extern int remove_common(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
reset_mysql_conn(mysql_conn);
@@ -1748,14 +1748,14 @@ extern int remove_common(mysql_conn_t *mysql_conn,
cluster_name, assoc_table, row[0]);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
break;
}
xfree(query);
- if (!(row2 = mysql_fetch_row(result2))) {
+ if(!(row2 = mysql_fetch_row(result2))) {
mysql_free_result(result2);
continue;
}
@@ -1773,7 +1773,7 @@ extern int remove_common(mysql_conn_t *mysql_conn,
cluster_name, assoc_table, row2[2], row2[1]);
lft = atoi(row2[0]);
- if (lft < smallest_lft)
+ if(lft < smallest_lft)
smallest_lft = lft;
mysql_free_result(result2);
@@ -1782,18 +1782,18 @@ extern int remove_common(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("couldn't remove assoc");
break;
}
}
mysql_free_result(result);
- if (rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
rc = as_mysql_get_modified_lfts(mysql_conn,
cluster_name, smallest_lft);
- if (rc == SLURM_ERROR) {
+ if(rc == SLURM_ERROR) {
reset_mysql_conn(mysql_conn);
return rc;
}
@@ -1816,21 +1816,21 @@ just_update:
/* if we are removing a cluster table this is handled in
remove_cluster_tables if table still exists. */
- if (table != cluster_table) {
+ if(table != cluster_table) {
/* Make sure the next id we get doesn't create holes
* in the ids. */
xstrfmtcat(mysql_conn->pre_commit_query,
"alter table \"%s_%s\" AUTO_INCREMENT=0;",
cluster_name, assoc_table);
}
- if (table != assoc_table)
+ if(table != assoc_table)
xfree(loc_assoc_char);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
reset_mysql_conn(mysql_conn);
}
@@ -1850,12 +1850,12 @@ extern int init ( void )
/* since this can be loaded from many different places
only tell us once. */
- if (!first)
+ if(!first)
return SLURM_SUCCESS;
first = 0;
- if (!slurmdbd_conf) {
+ if(!slurmdbd_conf) {
char *cluster_name = NULL;
if (!(cluster_name = slurm_get_cluster_name()))
fatal("%s requires ClusterName in slurm.conf",
@@ -1866,12 +1866,12 @@ extern int init ( void )
mysql_db_info = _as_mysql_acct_create_db_info();
location = slurm_get_accounting_storage_loc();
- if (!location)
+ if(!location)
mysql_db_name = xstrdup(DEFAULT_ACCOUNTING_DB);
else {
int i = 0;
while(location[i]) {
- if (location[i] == '.' || location[i] == '/') {
+ if(location[i] == '.' || location[i] == '/') {
debug("%s doesn't look like a database "
"name using %s",
location, DEFAULT_ACCOUNTING_DB);
@@ -1879,7 +1879,7 @@ extern int init ( void )
}
i++;
}
- if (location[i]) {
+ if(location[i]) {
mysql_db_name = xstrdup(DEFAULT_ACCOUNTING_DB);
xfree(location);
} else
@@ -1888,7 +1888,7 @@ extern int init ( void )
debug2("mysql_connect() called for db %s", mysql_db_name);
- if (mysql_get_db_connection(&db_conn, mysql_db_name, mysql_db_info)
+ if(mysql_get_db_connection(&db_conn, mysql_db_name, mysql_db_info)
!= SLURM_SUCCESS)
fatal("The database must be up when starting "
"the MYSQL plugin.");
@@ -1897,18 +1897,18 @@ extern int init ( void )
mysql_autocommit(db_conn, 0);
rc = mysql_db_query(db_conn,
"SET session sql_mode='ANSI_QUOTES';");
- if (rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
rc = _as_mysql_acct_check_tables(db_conn);
- if (rc == SLURM_SUCCESS) {
- if (mysql_db_commit(db_conn)) {
+ if(rc == SLURM_SUCCESS) {
+ if(mysql_db_commit(db_conn)) {
error("commit failed, meaning %s failed", plugin_name);
rc = SLURM_ERROR;
} else
verbose("%s loaded", plugin_name);
} else {
verbose("%s failed", plugin_name);
- if (mysql_db_rollback(db_conn))
+ if(mysql_db_rollback(db_conn))
error("rollback failed");
}
@@ -1931,7 +1931,7 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
{
mysql_conn_t *mysql_conn = xmalloc(sizeof(mysql_conn_t));
- if (!mysql_db_info)
+ if(!mysql_db_info)
init();
debug2("acct_storage_p_get_connection: request new connection %d",
@@ -1946,13 +1946,13 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
mysql_get_db_connection(&mysql_conn->db_conn,
mysql_db_name, mysql_db_info);
- if (mysql_conn->db_conn) {
+ if(mysql_conn->db_conn) {
int rc;
- if (rollback)
+ if(rollback)
mysql_autocommit(mysql_conn->db_conn, 0);
rc = mysql_db_query(mysql_conn->db_conn,
"SET session sql_mode='ANSI_QUOTES';");
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("couldn't set sql_mode");
acct_storage_p_close_connection(&mysql_conn);
errno = rc;
@@ -1964,7 +1964,7 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
extern int acct_storage_p_close_connection(mysql_conn_t **mysql_conn)
{
- if (!mysql_conn || !(*mysql_conn))
+ if(!mysql_conn || !(*mysql_conn))
return SLURM_SUCCESS;
acct_storage_p_commit((*mysql_conn), 0);
@@ -1979,14 +1979,14 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
int rc = check_connection(mysql_conn);
/* always reset this here */
mysql_conn->cluster_deleted = 0;
- if ((rc != SLURM_SUCCESS) && (rc != ESLURM_CLUSTER_DELETED))
+ if((rc != SLURM_SUCCESS) && (rc != ESLURM_CLUSTER_DELETED))
return rc;
debug4("got %d commits", list_count(mysql_conn->update_list));
- if (mysql_conn->rollback) {
- if (!commit) {
- if (mysql_db_rollback(mysql_conn->db_conn))
+ if(mysql_conn->rollback) {
+ if(!commit) {
+ if(mysql_db_rollback(mysql_conn->db_conn))
error("rollback failed");
} else {
int rc = SLURM_SUCCESS;
@@ -1996,7 +1996,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
AUTO_INCREMENT will make it so you can't
rollback, save it until right at the end.
*/
- if (mysql_conn->pre_commit_query) {
+ if(mysql_conn->pre_commit_query) {
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__,
mysql_conn->pre_commit_query);
@@ -2005,17 +2005,17 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
mysql_conn->pre_commit_query);
}
- if (rc != SLURM_SUCCESS) {
- if (mysql_db_rollback(mysql_conn->db_conn))
+ if(rc != SLURM_SUCCESS) {
+ if(mysql_db_rollback(mysql_conn->db_conn))
error("rollback failed");
} else {
- if (mysql_db_commit(mysql_conn->db_conn))
+ if(mysql_db_commit(mysql_conn->db_conn))
error("commit failed");
}
}
}
- if (commit && list_count(mysql_conn->update_list)) {
+ if(commit && list_count(mysql_conn->update_list)) {
int rc;
char *query = NULL;
MYSQL_RES *result = NULL;
@@ -2029,7 +2029,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
"name, rpc_version "
"from %s where deleted=0 && control_port != 0",
cluster_table);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
goto skip;
@@ -2048,7 +2048,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
itr2 = list_iterator_create(as_mysql_cluster_list);
itr = list_iterator_create(mysql_conn->update_list);
while((object = list_next(itr))) {
- if (!object->objects || !list_count(object->objects))
+ if(!object->objects || !list_count(object->objects))
continue;
/* We only care about clusters removed here. */
switch(object->type) {
@@ -2057,7 +2057,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
while((rem_cluster = list_next(itr3))) {
while((cluster_name =
list_next(itr2))) {
- if (!strcmp(cluster_name,
+ if(!strcmp(cluster_name,
rem_cluster)) {
list_delete_item(itr2);
break;
@@ -2075,7 +2075,7 @@ extern int acct_storage_p_commit(mysql_conn_t *mysql_conn, bool commit)
list_iterator_destroy(itr2);
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
- if (get_qos_count)
+ if(get_qos_count)
_set_qos_cnt(mysql_conn->db_conn);
}
xfree(mysql_conn->pre_commit_query);
@@ -2273,20 +2273,20 @@ extern List acct_storage_p_get_problems(mysql_conn_t *mysql_conn, uint32_t uid,
{
List ret_list = NULL;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
ret_list = list_create(slurmdb_destroy_association_rec);
- if (as_mysql_acct_no_assocs(mysql_conn, assoc_cond, ret_list)
+ if(as_mysql_acct_no_assocs(mysql_conn, assoc_cond, ret_list)
!= SLURM_SUCCESS)
goto end_it;
- if (as_mysql_acct_no_users(mysql_conn, assoc_cond, ret_list)
+ if(as_mysql_acct_no_users(mysql_conn, assoc_cond, ret_list)
!= SLURM_SUCCESS)
goto end_it;
- if (as_mysql_user_no_assocs_or_no_uid(mysql_conn, assoc_cond, ret_list)
+ if(as_mysql_user_no_assocs_or_no_uid(mysql_conn, assoc_cond, ret_list)
!= SLURM_SUCCESS)
goto end_it;
@@ -2345,7 +2345,7 @@ extern int clusteracct_storage_p_node_down(mysql_conn_t *mysql_conn,
time_t event_time, char *reason,
uint32_t reason_uid)
{
- if (!mysql_conn->cluster_name) {
+ if(!mysql_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -2358,7 +2358,7 @@ extern int clusteracct_storage_p_node_up(mysql_conn_t *mysql_conn,
struct node_record *node_ptr,
time_t event_time)
{
- if (!mysql_conn->cluster_name) {
+ if(!mysql_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -2372,7 +2372,7 @@ extern int clusteracct_storage_p_node_up(mysql_conn_t *mysql_conn,
extern int clusteracct_storage_p_register_ctld(mysql_conn_t *mysql_conn,
uint16_t port)
{
- if (!mysql_conn->cluster_name) {
+ if(!mysql_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -2386,7 +2386,7 @@ extern int clusteracct_storage_p_cluster_cpus(mysql_conn_t *mysql_conn,
uint32_t cpus,
time_t event_time)
{
- if (!mysql_conn->cluster_name) {
+ if(!mysql_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -2451,7 +2451,7 @@ extern List jobacct_storage_p_get_jobs_cond(mysql_conn_t *mysql_conn,
{
List job_list = NULL;
- if (check_connection(mysql_conn) != SLURM_SUCCESS) {
+ if(check_connection(mysql_conn) != SLURM_SUCCESS) {
return NULL;
}
job_list = as_mysql_jobacct_process_get_jobs(mysql_conn, uid, job_cond);
@@ -2465,7 +2465,7 @@ extern List jobacct_storage_p_get_jobs_cond(mysql_conn_t *mysql_conn,
extern int jobacct_storage_p_archive(mysql_conn_t *mysql_conn,
slurmdb_archive_cond_t *arch_cond)
{
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
return as_mysql_jobacct_process_archive(mysql_conn, arch_cond);
@@ -2477,7 +2477,7 @@ extern int jobacct_storage_p_archive(mysql_conn_t *mysql_conn,
extern int jobacct_storage_p_archive_load(mysql_conn_t *mysql_conn,
slurmdb_archive_rec_t *arch_rec)
{
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
return as_mysql_jobacct_process_archive_load(mysql_conn, arch_rec);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_acct.c b/src/plugins/accounting_storage/mysql/as_mysql_acct.c
index 6b292fe814d959f3606014bf03a0eafe712da522..aea5f3cd6faad4615cf0f8e76a526a6ce12e6651 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_acct.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_acct.c
@@ -53,19 +53,19 @@ static int _get_account_coords(mysql_conn_t *mysql_conn,
MYSQL_ROW row;
ListIterator itr;
- if (!acct) {
+ if(!acct) {
error("We need a account to fill in.");
return SLURM_ERROR;
}
- if (!acct->coordinators)
+ if(!acct->coordinators)
acct->coordinators = list_create(slurmdb_destroy_coord_rec);
query = xstrdup_printf(
"select user from %s where acct='%s' && deleted=0",
acct_coord_table, acct->name);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -82,7 +82,7 @@ static int _get_account_coords(mysql_conn_t *mysql_conn,
slurm_mutex_lock(&as_mysql_cluster_list_lock);
itr = list_iterator_create(as_mysql_cluster_list);
while((cluster_name = list_next(itr))) {
- if (query)
+ if(query)
xstrcat(query, " union ");
xstrfmtcat(query,
"select distinct t0.user from %s as t0, "
@@ -98,13 +98,13 @@ static int _get_account_coords(mysql_conn_t *mysql_conn,
list_iterator_destroy(itr);
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
- if (!query) {
+ if(!query) {
error("No clusters defined? How could there be accts?");
return SLURM_SUCCESS;
}
xstrcat(query, ";");
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
@@ -132,13 +132,13 @@ extern int as_mysql_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
int affect_rows = 0;
List assoc_list = list_create(slurmdb_destroy_association_rec);
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(acct_list);
while((object = list_next(itr))) {
- if (!object->name || !object->name[0]
+ if(!object->name || !object->name[0]
|| !object->description || !object->description[0]
|| !object->organization || !object->organization[0]) {
error("We need an account name, description, and "
@@ -167,7 +167,7 @@ extern int as_mysql_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(cols);
xfree(vals);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add acct");
xfree(extra);
continue;
@@ -175,7 +175,7 @@ extern int as_mysql_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
affect_rows = last_affected_rows(mysql_conn->db_conn);
/* debug3("affected %d", affect_rows); */
- if (!affect_rows) {
+ if(!affect_rows) {
debug3("nothing changed");
xfree(extra);
continue;
@@ -184,7 +184,7 @@ extern int as_mysql_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
/* we always have a ', ' as the first 2 chars */
tmp_extra = slurm_add_slash_to_quotes(extra+2);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %u, '%s', '%s', '%s')",
now, DBD_ADD_ACCOUNTS, object->name,
@@ -200,7 +200,7 @@ extern int as_mysql_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(tmp_extra);
xfree(extra);
- if (!object->assoc_list)
+ if(!object->assoc_list)
continue;
list_transfer(assoc_list, object->assoc_list);
@@ -208,13 +208,13 @@ extern int as_mysql_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xfree(user_name);
- if (rc != SLURM_ERROR) {
- if (txn_query) {
+ if(rc != SLURM_ERROR) {
+ if(txn_query) {
xstrcat(txn_query, ";");
rc = mysql_db_query(mysql_conn->db_conn,
txn_query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
rc = SLURM_SUCCESS;
}
@@ -222,8 +222,8 @@ extern int as_mysql_add_accts(mysql_conn_t *mysql_conn, uint32_t uid,
} else
xfree(txn_query);
- if (list_count(assoc_list)) {
- if (as_mysql_add_assocs(mysql_conn, uid, assoc_list)
+ if(list_count(assoc_list)) {
+ if(as_mysql_add_assocs(mysql_conn, uid, assoc_list)
== SLURM_ERROR) {
error("Problem adding user associations");
rc = SLURM_ERROR;
@@ -249,23 +249,23 @@ extern List as_mysql_modify_accts(mysql_conn_t *mysql_conn, uint32_t uid,
MYSQL_RES *result = NULL;
MYSQL_ROW row;
- if (!acct_cond || !acct) {
+ if(!acct_cond || !acct) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
xstrcat(extra, "where deleted=0");
- if (acct_cond->assoc_cond
+ if(acct_cond->assoc_cond
&& acct_cond->assoc_cond->acct_list
&& list_count(acct_cond->assoc_cond->acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -274,13 +274,13 @@ extern List as_mysql_modify_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (acct_cond->description_list
+ if(acct_cond->description_list
&& list_count(acct_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->description_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description='%s'", object);
set = 1;
@@ -289,13 +289,13 @@ extern List as_mysql_modify_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (acct_cond->organization_list
+ if(acct_cond->organization_list
&& list_count(acct_cond->organization_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->organization_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "organization='%s'", object);
set = 1;
@@ -304,12 +304,12 @@ extern List as_mysql_modify_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (acct->description)
+ if(acct->description)
xstrfmtcat(vals, ", description='%s'", acct->description);
- if (acct->organization)
+ if(acct->organization)
xstrfmtcat(vals, ", organization='%s'", acct->organization);
- if (!extra || !vals) {
+ if(!extra || !vals) {
errno = SLURM_NO_CHANGE_IN_DATA;
error("Nothing to change");
return NULL;
@@ -319,7 +319,7 @@ extern List as_mysql_modify_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
xfree(vals);
@@ -331,7 +331,7 @@ extern List as_mysql_modify_accts(mysql_conn_t *mysql_conn, uint32_t uid,
while((row = mysql_fetch_row(result))) {
object = xstrdup(row[0]);
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "(name='%s'", object);
rc = 1;
} else {
@@ -341,7 +341,7 @@ extern List as_mysql_modify_accts(mysql_conn_t *mysql_conn, uint32_t uid,
}
mysql_free_result(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(query);
@@ -385,25 +385,25 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
MYSQL_ROW row;
bool jobs_running = 0;
- if (!acct_cond) {
+ if(!acct_cond) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
xstrcat(extra, "where deleted=0");
- if (acct_cond->assoc_cond
+ if(acct_cond->assoc_cond
&& acct_cond->assoc_cond->acct_list
&& list_count(acct_cond->assoc_cond->acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -412,13 +412,13 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (acct_cond->description_list
+ if(acct_cond->description_list
&& list_count(acct_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->description_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description='%s'", object);
set = 1;
@@ -427,13 +427,13 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (acct_cond->organization_list
+ if(acct_cond->organization_list
&& list_count(acct_cond->organization_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->organization_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "organization='%s'", object);
set = 1;
@@ -442,14 +442,14 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (!extra) {
+ if(!extra) {
error("Nothing to remove");
return NULL;
}
query = xstrdup_printf("select name from %s %s;", acct_table, extra);
xfree(extra);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -460,7 +460,7 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
while((row = mysql_fetch_row(result))) {
char *object = xstrdup(row[0]);
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
xstrfmtcat(assoc_char, "t2.acct='%s'", object);
rc = 1;
@@ -471,7 +471,7 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
}
mysql_free_result(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(query);
@@ -482,7 +482,7 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
/* We need to remove these accounts from the coord's that have it */
coord_list = as_mysql_remove_coord(
mysql_conn, uid, ret_list, NULL);
- if (coord_list)
+ if(coord_list)
list_destroy(coord_list);
user_name = uid_to_string((uid_t) uid);
@@ -490,7 +490,7 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
slurm_mutex_lock(&as_mysql_cluster_list_lock);
itr = list_iterator_create(as_mysql_cluster_list);
while((object = list_next(itr))) {
- if ((rc = remove_common(mysql_conn, DBD_REMOVE_ACCOUNTS, now,
+ if((rc = remove_common(mysql_conn, DBD_REMOVE_ACCOUNTS, now,
user_name, acct_table, name_char,
assoc_char, object, ret_list,
&jobs_running))
@@ -508,7 +508,7 @@ extern List as_mysql_remove_accts(mysql_conn_t *mysql_conn, uint32_t uid,
return NULL;
}
- if (jobs_running)
+ if(jobs_running)
errno = ESLURM_JOBS_RUNNING_ON_ASSOC;
else
errno = SLURM_SUCCESS;
@@ -544,7 +544,7 @@ extern List as_mysql_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
SLURMDB_REQ_COUNT
};
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
@@ -553,9 +553,9 @@ extern List as_mysql_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
private_data = slurm_get_private_data();
if (private_data & PRIVATE_DATA_ACCOUNTS) {
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR))) {
- if (!is_user_any_coord(mysql_conn, &user)) {
+ if(!is_user_any_coord(mysql_conn, &user)) {
error("Only admins/coordinators "
"can look at account usage");
errno = ESLURM_ACCESS_DENIED;
@@ -564,24 +564,24 @@ extern List as_mysql_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
}
}
- if (!acct_cond) {
+ if(!acct_cond) {
xstrcat(extra, "where deleted=0");
goto empty;
}
- if (acct_cond->with_deleted)
+ if(acct_cond->with_deleted)
xstrcat(extra, "where (deleted=0 || deleted=1)");
else
xstrcat(extra, "where deleted=0");
- if (acct_cond->assoc_cond
+ if(acct_cond->assoc_cond
&& acct_cond->assoc_cond->acct_list
&& list_count(acct_cond->assoc_cond->acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -590,13 +590,13 @@ extern List as_mysql_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (acct_cond->description_list
+ if(acct_cond->description_list
&& list_count(acct_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->description_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description='%s'", object);
set = 1;
@@ -605,13 +605,13 @@ extern List as_mysql_get_accts(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (acct_cond->organization_list
+ if(acct_cond->organization_list
&& list_count(acct_cond->organization_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(acct_cond->organization_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "organization='%s'", object);
set = 1;
@@ -632,12 +632,12 @@ empty:
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
- if (!is_admin && (private_data & PRIVATE_DATA_ACCOUNTS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_ACCOUNTS)) {
slurmdb_coord_rec_t *coord = NULL;
set = 0;
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (set) {
+ if(set) {
xstrfmtcat(extra, " || name='%s'",
coord->name);
} else {
@@ -647,7 +647,7 @@ empty:
}
}
list_iterator_destroy(itr);
- if (set)
+ if(set)
xstrcat(extra,")");
}
@@ -657,7 +657,7 @@ empty:
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -666,12 +666,12 @@ empty:
acct_list = list_create(slurmdb_destroy_account_rec);
- if (acct_cond && acct_cond->with_assocs) {
+ if(acct_cond && acct_cond->with_assocs) {
/* We are going to be freeing the inners of
this list in the acct->name so we don't
free it here
*/
- if (acct_cond->assoc_cond->acct_list)
+ if(acct_cond->assoc_cond->acct_list)
list_destroy(acct_cond->assoc_cond->acct_list);
acct_cond->assoc_cond->acct_list = list_create(NULL);
}
@@ -684,12 +684,12 @@ empty:
acct->description = xstrdup(row[SLURMDB_REQ_DESC]);
acct->organization = xstrdup(row[SLURMDB_REQ_ORG]);
- if (acct_cond && acct_cond->with_coords) {
+ if(acct_cond && acct_cond->with_coords) {
_get_account_coords(mysql_conn, acct);
}
- if (acct_cond && acct_cond->with_assocs) {
- if (!acct_cond->assoc_cond) {
+ if(acct_cond && acct_cond->with_assocs) {
+ if(!acct_cond->assoc_cond) {
acct_cond->assoc_cond = xmalloc(
sizeof(slurmdb_association_cond_t));
}
@@ -700,7 +700,7 @@ empty:
}
mysql_free_result(result);
- if (acct_cond && acct_cond->with_assocs
+ if(acct_cond && acct_cond->with_assocs
&& list_count(acct_cond->assoc_cond->acct_list)) {
ListIterator assoc_itr = NULL;
slurmdb_account_rec_t *acct = NULL;
@@ -708,7 +708,7 @@ empty:
List assoc_list = as_mysql_get_assocs(
mysql_conn, uid, acct_cond->assoc_cond);
- if (!assoc_list) {
+ if(!assoc_list) {
error("no associations");
return acct_list;
}
@@ -717,17 +717,17 @@ empty:
assoc_itr = list_iterator_create(assoc_list);
while((acct = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if (strcmp(assoc->acct, acct->name))
+ if(strcmp(assoc->acct, acct->name))
continue;
- if (!acct->assoc_list)
+ if(!acct->assoc_list)
acct->assoc_list = list_create(
slurmdb_destroy_association_rec);
list_append(acct->assoc_list, assoc);
list_remove(assoc_itr);
}
list_iterator_reset(assoc_itr);
- if (!acct->assoc_list)
+ if(!acct->assoc_list)
list_remove(itr);
}
list_iterator_destroy(itr);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_archive.c b/src/plugins/accounting_storage/mysql/as_mysql_archive.c
index 07b633adbfbaac2af2b081a5cd44798569c72a10..92af7e102f71982b9cdce40a320a7ef3a6e13b26 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_archive.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_archive.c
@@ -547,19 +547,19 @@ static time_t _setup_end_time(time_t last_submit, uint32_t purge)
struct tm time_tm;
int16_t units;
- if (purge == NO_VAL) {
+ if(purge == NO_VAL) {
error("Invalid purge set");
return 0;
}
units = SLURMDB_PURGE_GET_UNITS(purge);
- if (units < 0) {
+ if(units < 0) {
error("invalid units from purge '%d'", units);
return 0;
}
/* use localtime to avoid any daylight savings issues */
- if (!localtime_r(&last_submit, &time_tm)) {
+ if(!localtime_r(&last_submit, &time_tm)) {
error("Couldn't get localtime from first "
"suspend start %d",
last_submit);
@@ -569,12 +569,12 @@ static time_t _setup_end_time(time_t last_submit, uint32_t purge)
time_tm.tm_sec = 0;
time_tm.tm_min = 0;
- if (SLURMDB_PURGE_IN_HOURS(purge))
+ if(SLURMDB_PURGE_IN_HOURS(purge))
time_tm.tm_hour -= units;
- else if (SLURMDB_PURGE_IN_DAYS(purge)) {
+ else if(SLURMDB_PURGE_IN_DAYS(purge)) {
time_tm.tm_hour = 0;
time_tm.tm_mday -= units;
- } else if (SLURMDB_PURGE_IN_MONTHS(purge)) {
+ } else if(SLURMDB_PURGE_IN_MONTHS(purge)) {
time_tm.tm_hour = 0;
time_tm.tm_mday = 1;
time_tm.tm_mon -= units;
@@ -607,21 +607,21 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
bool new_cluster = 0;
while(data_in[i]) {
- if (!strncmp("insert into ", data_in+i, 12)) {
+ if(!strncmp("insert into ", data_in+i, 12)) {
beginning = xstrndup(data_in+i, 11);
break;
- } else if (!strncmp("delete from ", data_in+i, 12)) {
+ } else if(!strncmp("delete from ", data_in+i, 12)) {
beginning = xstrndup(data_in+i, 11);
delete = 1;
break;
- } else if (!strncmp("drop table ", data_in+i, 11)) {
+ } else if(!strncmp("drop table ", data_in+i, 11)) {
start = i;
i+=11;
while(data_in[i] && data_in[i-1] != ';')
i++;
xstrncat(data_out, data_in+start, i-start);
goto end_it;
- } else if (!strncmp("truncate table ", data_in+i, 15)) {
+ } else if(!strncmp("truncate table ", data_in+i, 15)) {
start = i;
i+=15;
while(data_in[i] && data_in[i-1] != ';')
@@ -632,7 +632,7 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
i++;
}
- if (!data_in[i])
+ if(!data_in[i])
goto end_it;
beginning = xstrndup(data_in+i, 11);
@@ -640,34 +640,34 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
//info("processing %s", data_in);
/* get table name */
- if (!strncmp("cluster_event_table", data_in+i, 19)) {
+ if(!strncmp("cluster_event_table", data_in+i, 19)) {
i+=19;
table = event_table;
- } else if (!strncmp("job_table", data_in+i, 9)) {
+ } else if(!strncmp("job_table", data_in+i, 9)) {
i+=9;
table = job_table;
- } else if (!strncmp("step_table", data_in+i, 10)) {
+ } else if(!strncmp("step_table", data_in+i, 10)) {
i+=10;
table = step_table;
- } else if (!strncmp("suspend_table", data_in+i, 13)) {
+ } else if(!strncmp("suspend_table", data_in+i, 13)) {
i+=13;
table = suspend_table;
- } else if (!strncmp("cluster_day_usage_table", data_in+i, 23)) {
+ } else if(!strncmp("cluster_day_usage_table", data_in+i, 23)) {
i+=23;
table = cluster_day_table;
- } else if (!strncmp("cluster_hour_usage_table", data_in+i, 24)) {
+ } else if(!strncmp("cluster_hour_usage_table", data_in+i, 24)) {
i+=24;
table = cluster_hour_table;
- } else if (!strncmp("cluster_month_usage_table", data_in+i, 25)) {
+ } else if(!strncmp("cluster_month_usage_table", data_in+i, 25)) {
i+=25;
table = cluster_month_table;
- } else if (!strncmp("assoc_day_usage_table", data_in+i, 21)) {
+ } else if(!strncmp("assoc_day_usage_table", data_in+i, 21)) {
i+=21;
table = assoc_day_table;
- } else if (!strncmp("assoc_hour_usage_table", data_in+i, 22)) {
+ } else if(!strncmp("assoc_hour_usage_table", data_in+i, 22)) {
i+=22;
table = assoc_hour_table;
- } else if (!strncmp("assoc_month_usage_table", data_in+i, 23)) {
+ } else if(!strncmp("assoc_month_usage_table", data_in+i, 23)) {
i+=23;
table = assoc_month_table;
} else {
@@ -676,7 +676,7 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
goto end_it;
}
/* get to the columns */
- if (!delete)
+ if(!delete)
while(data_in[i] && data_in[i-1] != '(' && data_in[i-1] != ';')
i++;
else
@@ -684,75 +684,75 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
i++;
//info("table is %s '%s'", table, data_in+i);
while(data_in[i] && data_in[i] != ')') {
- if (delete && !strncmp("where ", data_in+i, 6)) {
+ if(delete && !strncmp("where ", data_in+i, 6)) {
i+=6;
continue;
- } else if (!strncmp("period_start", data_in+i, 12)) {
+ } else if(!strncmp("period_start", data_in+i, 12)) {
xstrcat(fields, "time_start");
i+=12;
- } else if (!strncmp("period_end", data_in+i, 10)) {
+ } else if(!strncmp("period_end", data_in+i, 10)) {
xstrcat(fields, "time_end");
i+=10;
- } else if (!strncmp("jobid", data_in+i, 5)) {
+ } else if(!strncmp("jobid", data_in+i, 5)) {
xstrcat(fields, "id_job");
i+=5;
- } else if (!strncmp("stepid", data_in+i, 6)) {
+ } else if(!strncmp("stepid", data_in+i, 6)) {
xstrcat(fields, "id_step");
i+=6;
- } else if (!strncmp("associd", data_in+i, 7)) {
+ } else if(!strncmp("associd", data_in+i, 7)) {
xstrcat(fields, "id_assoc");
i+=7;
- } else if (!strncmp("blockid", data_in+i, 7)) {
+ } else if(!strncmp("blockid", data_in+i, 7)) {
xstrcat(fields, "id_block");
i+=7;
- } else if (!strncmp("wckeyid", data_in+i, 7)) {
+ } else if(!strncmp("wckeyid", data_in+i, 7)) {
xstrcat(fields, "id_wckey");
i+=7;
- } else if (!strncmp("qos", data_in+i, 3)) {
+ } else if(!strncmp("qos", data_in+i, 3)) {
xstrcat(fields, "id_qos");
i+=3;
- } else if (!strncmp("uid", data_in+i, 3)) {
+ } else if(!strncmp("uid", data_in+i, 3)) {
xstrcat(fields, "id_user");
i+=3;
- } else if (!strncmp("gid", data_in+i, 3)) {
+ } else if(!strncmp("gid", data_in+i, 3)) {
xstrcat(fields, "id_group");
i+=3;
- } else if (!strncmp("submit", data_in+i, 6)) {
+ } else if(!strncmp("submit", data_in+i, 6)) {
xstrcat(fields, "time_submit");
i+=6;
- } else if (!strncmp("eligible", data_in+i, 8)) {
+ } else if(!strncmp("eligible", data_in+i, 8)) {
xstrcat(fields, "time_eligible");
i+=8;
- } else if (!strncmp("start", data_in+i, 5)) {
+ } else if(!strncmp("start", data_in+i, 5)) {
xstrcat(fields, "time_start");
i+=5;
- } else if (!strncmp("suspended", data_in+i, 9)) {
+ } else if(!strncmp("suspended", data_in+i, 9)) {
xstrcat(fields, "time_suspended");
i+=9;
- } else if (!strncmp("end", data_in+i, 3)) {
+ } else if(!strncmp("end", data_in+i, 3)) {
xstrcat(fields, "time_end");
i+=3;
- } else if (!strncmp("comp_code", data_in+i, 9)) {
+ } else if(!strncmp("comp_code", data_in+i, 9)) {
xstrcat(fields, "exit_code");
i+=9;
- } else if (!strncmp("alloc_cpus", data_in+i, 10)) {
+ } else if(!strncmp("alloc_cpus", data_in+i, 10)) {
xstrcat(fields, "cpus_alloc");
i+=10;
- } else if (!strncmp("req_cpus", data_in+i, 8)) {
+ } else if(!strncmp("req_cpus", data_in+i, 8)) {
xstrcat(fields, "cpus_req");
i+=8;
- } else if (!strncmp("alloc_nodes", data_in+i, 11)) {
+ } else if(!strncmp("alloc_nodes", data_in+i, 11)) {
xstrcat(fields, "nodes_alloc");
i+=11;
- } else if (!strncmp("name", data_in+i, 4)) {
- if (table == job_table)
+ } else if(!strncmp("name", data_in+i, 4)) {
+ if(table == job_table)
xstrcat(fields, "job_name");
- else if (table == step_table)
+ else if(table == step_table)
xstrcat(fields, "step_name");
i+=4;
- } else if (!strncmp("id", data_in+i, 2)) {
+ } else if(!strncmp("id", data_in+i, 2)) {
i+=2;
- if ((table == assoc_day_table)
+ if((table == assoc_day_table)
|| (table == assoc_hour_table)
|| (table == assoc_month_table)) {
char *id_assoc = NULL;
@@ -765,12 +765,12 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
&& data_in[i] != ';') {
i++;
}
- if (!data_in[i]) {
+ if(!data_in[i]) {
error("returning at id_assoc");
rc = SLURM_ERROR;
goto end_it;
}
- if (data_in[i] == ' ') {
+ if(data_in[i] == ' ') {
while(data_in[i] && data_in[i] == ' ')
i++;
while(data_in[i] && data_in[i] == '|')
@@ -779,22 +779,22 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
i++;
}
xstrncat(id_assoc, data_in+start, (i-start));
- if (!fields)
+ if(!fields)
xstrcat(fields, "where ");
xstrfmtcat(fields, "id_assoc=%s", id_assoc);
xfree(id_assoc);
} else
xstrcat(fields, "job_db_inx");
- } else if (!strncmp("cluster_nodes", data_in+i, 13)) {
+ } else if(!strncmp("cluster_nodes", data_in+i, 13)) {
/* this is here just to make it easier to
handle the cluster field. */
xstrcat(fields, "cluster_nodes");
i+=13;
- } else if (!strncmp("cluster", data_in+i, 7)) {
+ } else if(!strncmp("cluster", data_in+i, 7)) {
i+=7;
- if (!delete) {
+ if(!delete) {
cluster_inx = cnt;
- if (cnt)
+ if(cnt)
fields[strlen(fields)-2] = '\0';
} else {
while(data_in[i] && data_in[i-1] != '\'')
@@ -802,7 +802,7 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
start = i;
while(data_in[i] && data_in[i] != '\'')
i++;
- if (!data_in[i]) {
+ if(!data_in[i]) {
error("returning here cluster");
rc = SLURM_ERROR;
goto end_it;
@@ -818,20 +818,20 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
&& data_in[i] != ',' && data_in[i] != ')') {
i++;
}
- if (!data_in[i]) {
+ if(!data_in[i]) {
error("returning here end");
rc = SLURM_ERROR;
goto end_it;
}
xstrncat(fields, data_in+start, (i-start));
}
- if (data_in[i]) {
- if (!delete || ((table != assoc_day_table)
+ if(data_in[i]) {
+ if(!delete || ((table != assoc_day_table)
&& (table != assoc_hour_table)
&& (table != assoc_month_table))) {
- if (data_in[i] == ',')
+ if(data_in[i] == ',')
xstrcat(fields, ", ");
- else if (data_in[i] == ')'
+ else if(data_in[i] == ')'
|| data_in[i] == ';') {
break;
} else {
@@ -841,7 +841,7 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
}
i++;
} else {
- if (data_in[i] == ';')
+ if(data_in[i] == ';')
break;
}
while(data_in[i] && data_in[i] == ' ')
@@ -850,97 +850,97 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
cnt++;
}
- if (data_in[i] && data_in[i] == ')') {
+ if(data_in[i] && data_in[i] == ')') {
ending_end = i;
ending_start = 0;
while(data_in[ending_end] && data_in[ending_end-1] != ';') {
- if (!strncmp(data_in+ending_end,
+ if(!strncmp(data_in+ending_end,
"on duplicate key", 16)) {
ending_start = ending_end;
}
- if (ending_start) {
- if (!strncmp("period_start",
+ if(ending_start) {
+ if(!strncmp("period_start",
data_in+ending_end, 12)) {
xstrcat(ending, "time_start");
ending_end+=12;
- } else if (!strncmp("period_end",
+ } else if(!strncmp("period_end",
data_in+ending_end, 10)) {
xstrcat(ending, "time_end");
ending_end+=10;
- } else if (!strncmp("jobid",
+ } else if(!strncmp("jobid",
data_in+ending_end, 5)) {
xstrcat(ending, "id_job");
ending_end+=5;
- } else if (!strncmp("stepid",
+ } else if(!strncmp("stepid",
data_in+ending_end, 6)) {
xstrcat(ending, "id_step");
ending_end+=6;
- } else if (!strncmp("associd",
+ } else if(!strncmp("associd",
data_in+ending_end, 7)) {
xstrcat(ending, "id_assoc");
ending_end+=7;
- } else if (!strncmp("blockid",
+ } else if(!strncmp("blockid",
data_in+ending_end, 7)) {
xstrcat(ending, "id_block");
ending_end+=7;
- } else if (!strncmp("wckeyid",
+ } else if(!strncmp("wckeyid",
data_in+ending_end, 7)) {
xstrcat(ending, "id_wckey");
ending_end+=7;
- } else if (!strncmp("uid",
+ } else if(!strncmp("uid",
data_in+ending_end, 3)) {
xstrcat(ending, "id_user");
ending_end+=3;
- } else if (!strncmp("gid",
+ } else if(!strncmp("gid",
data_in+ending_end, 3)) {
xstrcat(ending, "id_group");
ending_end+=3;
- } else if (!strncmp("submit",
+ } else if(!strncmp("submit",
data_in+ending_end, 6)) {
xstrcat(ending, "time_submit");
ending_end+=6;
- } else if (!strncmp("eligible",
+ } else if(!strncmp("eligible",
data_in+ending_end, 8)) {
xstrcat(ending, "time_eligible");
ending_end+=8;
- } else if (!strncmp("start",
+ } else if(!strncmp("start",
data_in+ending_end, 5)) {
xstrcat(ending, "time_start");
ending_end+=5;
- } else if (!strncmp("suspended",
+ } else if(!strncmp("suspended",
data_in+ending_end, 9)) {
xstrcat(ending, "time_suspended");
ending_end+=9;
- } else if (!strncmp("end",
+ } else if(!strncmp("end",
data_in+ending_end, 3)) {
xstrcat(ending, "time_end");
ending_end+=3;
- } else if (!strncmp("comp_code",
+ } else if(!strncmp("comp_code",
data_in+ending_end, 9)) {
xstrcat(ending, "exit_code");
ending_end+=9;
- } else if (!strncmp("alloc_cpus",
+ } else if(!strncmp("alloc_cpus",
data_in+ending_end, 10)) {
xstrcat(ending, "cpus_alloc");
ending_end+=10;
- } else if (!strncmp("req_cpus",
+ } else if(!strncmp("req_cpus",
data_in+ending_end, 8)) {
xstrcat(ending, "cpus_req");
ending_end+=8;
- } else if (!strncmp("alloc_nodes",
+ } else if(!strncmp("alloc_nodes",
data_in+ending_end, 11)) {
xstrcat(ending, "nodes_alloc");
ending_end+=11;
- } else if (!strncmp("name",
+ } else if(!strncmp("name",
data_in+ending_end, 4)) {
- if (table == job_table)
+ if(table == job_table)
xstrcat(ending, "job_name");
- else if (table == step_table)
+ else if(table == step_table)
xstrcat(ending, "step_name");
ending_end+=4;
- } else if (!strncmp("id",
+ } else if(!strncmp("id",
data_in+ending_end, 2)) {
- if ((table == assoc_day_table)
+ if((table == assoc_day_table)
|| (table == assoc_hour_table)
|| (table == assoc_month_table))
xstrcat(ending, "id_assoc");
@@ -949,7 +949,7 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
ending_end+=2;
}
- if (data_in[ending_end])
+ if(data_in[ending_end])
xstrcatchar(ending,
data_in[ending_end]);
}
@@ -971,17 +971,17 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
&& data_in[i] != ')') {
i++;
}
- if (!data_in[i]) {
+ if(!data_in[i]) {
rc = SLURM_ERROR;
goto end_it;
}
- if (cnt == cluster_inx) {
+ if(cnt == cluster_inx) {
/* get the cluster name and remove the
ticks */
xstrncat(new_cluster_name,
data_in+start+1, (i-start-2));
- if (cluster_name) {
- if (strcmp(cluster_name,
+ if(cluster_name) {
+ if(strcmp(cluster_name,
new_cluster_name))
new_cluster = 1;
else
@@ -993,10 +993,10 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
} else {
xstrncat(new_vals, data_in+start,
(i-start));
- if (data_in[i]) {
- if (data_in[i] == ',')
+ if(data_in[i]) {
+ if(data_in[i] == ',')
xstrcat(new_vals, ", ");
- else if (data_in[i] == ')'
+ else if(data_in[i] == ')'
|| data_in[i] == ';') {
i++;
break;
@@ -1014,7 +1014,7 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
i++;
cnt++;
}
- if (new_cluster) {
+ if(new_cluster) {
/* info("new cluster, adding insert\n%s " */
/* "\"%s_%s\" (%s) values %s %s", */
/* beginning, cluster_name, table, */
@@ -1030,8 +1030,8 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
new_cluster_name = NULL;
}
- if (new_vals) {
- if (vals)
+ if(new_vals) {
+ if(vals)
xstrfmtcat(vals, ", (%s)", new_vals);
else
xstrfmtcat(vals, "(%s)", new_vals);
@@ -1041,19 +1041,19 @@ static int _process_old_sql_line(const char *data_in, char **data_full_out)
i = ending_end;
}
- if (!cluster_name) {
+ if(!cluster_name) {
error("No cluster given for %s", table);
goto end_it;
}
- if (!delete) {
+ if(!delete) {
/* info("adding insert\n%s \"%s_%s\" (%s) values %s %s",
beginning, cluster_name, table, fields, vals, ending); */
xstrfmtcat(data_out, "%s \"%s_%s\" (%s) values %s %s",
beginning, cluster_name, table, fields,
vals, ending);
} else {
- if (fields) {
+ if(fields) {
/* info("adding delete\n%s \"%s_%s\" %s", */
/* beginning, cluster_name, table, fields); */
xstrfmtcat(data_out, "%s \"%s_%s\" %s",
@@ -1074,7 +1074,7 @@ end_it:
xfree(vals);
*data_full_out = data_out;
//info("returning\n%s", data_out);
- if (rc == SLURM_ERROR)
+ if(rc == SLURM_ERROR)
return -1;
return i;
}
@@ -1087,14 +1087,14 @@ static int _process_old_sql(char **data)
int rc = SLURM_SUCCESS;
while(data_in[i]) {
- if ((rc = _process_old_sql_line(data_in+i, &data_out)) == -1)
+ if((rc = _process_old_sql_line(data_in+i, &data_out)) == -1)
break;
i += rc;
}
//rc = -1;
xfree(data_in);
- if (rc == -1)
+ if(rc == -1)
xfree(data_out);
//info("returning\n%s", data_out);
*data = data_out;
@@ -1114,8 +1114,8 @@ static char *_make_archive_name(time_t period_start, time_t period_end,
time_tm.tm_min = 0;
/* set up the start time based off the period we are purging */
- if (SLURMDB_PURGE_IN_HOURS(archive_period)) {
- } else if (SLURMDB_PURGE_IN_DAYS(archive_period)) {
+ if(SLURMDB_PURGE_IN_HOURS(archive_period)) {
+ } else if(SLURMDB_PURGE_IN_DAYS(archive_period)) {
time_tm.tm_hour = 0;
} else {
time_tm.tm_hour = 0;
@@ -1243,13 +1243,13 @@ static uint32_t _archive_events(mysql_conn_t *mysql_conn, char *cluster_name,
// START_TIMER;
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(cnt = mysql_num_rows(result))) {
+ if(!(cnt = mysql_num_rows(result))) {
mysql_free_result(result);
return 0;
}
@@ -1262,7 +1262,7 @@ static uint32_t _archive_events(mysql_conn_t *mysql_conn, char *cluster_name,
pack32(cnt, buffer);
while((row = mysql_fetch_row(result))) {
- if (!period_start)
+ if(!period_start)
period_start = atoi(row[EVENT_REQ_START]);
memset(&event, 0, sizeof(local_event_t));
@@ -1288,7 +1288,7 @@ static uint32_t _archive_events(mysql_conn_t *mysql_conn, char *cluster_name,
arch_dir, "event", archive_period);
free_buf(buffer);
- if (error_code != SLURM_SUCCESS)
+ if(error_code != SLURM_SUCCESS)
return error_code;
return cnt;
@@ -1313,14 +1313,14 @@ static char *_load_events(uint16_t rpc_version, Buf buffer,
xstrcat(format, ")");
for(i=0; i<rec_cnt; i++) {
memset(&object, 0, sizeof(local_event_t));
- if (_unpack_local_event(&object, rpc_version, buffer)
+ if(_unpack_local_event(&object, rpc_version, buffer)
!= SLURM_SUCCESS) {
error("issue unpacking");
xfree(format);
xfree(insert);
break;
}
- if (i)
+ if(i)
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
@@ -1371,13 +1371,13 @@ static uint32_t _archive_jobs(mysql_conn_t *mysql_conn, char *cluster_name,
// START_TIMER;
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(cnt = mysql_num_rows(result))) {
+ if(!(cnt = mysql_num_rows(result))) {
mysql_free_result(result);
return 0;
}
@@ -1390,7 +1390,7 @@ static uint32_t _archive_jobs(mysql_conn_t *mysql_conn, char *cluster_name,
pack32(cnt, buffer);
while((row = mysql_fetch_row(result))) {
- if (!period_start)
+ if(!period_start)
period_start = atoi(row[JOB_REQ_SUBMIT]);
memset(&job, 0, sizeof(local_job_t));
@@ -1437,7 +1437,7 @@ static uint32_t _archive_jobs(mysql_conn_t *mysql_conn, char *cluster_name,
arch_dir, "job", archive_period);
free_buf(buffer);
- if (error_code != SLURM_SUCCESS)
+ if(error_code != SLURM_SUCCESS)
return error_code;
return cnt;
@@ -1462,14 +1462,14 @@ static char *_load_jobs(uint16_t rpc_version, Buf buffer,
xstrcat(format, ")");
for(i=0; i<rec_cnt; i++) {
memset(&object, 0, sizeof(local_job_t));
- if (_unpack_local_job(&object, rpc_version, buffer)
+ if(_unpack_local_job(&object, rpc_version, buffer)
!= SLURM_SUCCESS) {
error("issue unpacking");
xfree(format);
xfree(insert);
break;
}
- if (i)
+ if(i)
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
@@ -1541,13 +1541,13 @@ static uint32_t _archive_steps(mysql_conn_t *mysql_conn, char *cluster_name,
// START_TIMER;
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(cnt = mysql_num_rows(result))) {
+ if(!(cnt = mysql_num_rows(result))) {
mysql_free_result(result);
return 0;
}
@@ -1560,7 +1560,7 @@ static uint32_t _archive_steps(mysql_conn_t *mysql_conn, char *cluster_name,
pack32(cnt, buffer);
while((row = mysql_fetch_row(result))) {
- if (!period_start)
+ if(!period_start)
period_start = atoi(row[STEP_REQ_START]);
memset(&step, 0, sizeof(local_step_t));
@@ -1613,7 +1613,7 @@ static uint32_t _archive_steps(mysql_conn_t *mysql_conn, char *cluster_name,
arch_dir, "event", archive_period);
free_buf(buffer);
- if (error_code != SLURM_SUCCESS)
+ if(error_code != SLURM_SUCCESS)
return error_code;
return cnt;
@@ -1638,14 +1638,14 @@ static char *_load_steps(uint16_t rpc_version, Buf buffer,
xstrcat(format, ")");
for(i=0; i<rec_cnt; i++) {
memset(&object, 0, sizeof(local_step_t));
- if (_unpack_local_step(&object, rpc_version, buffer)
+ if(_unpack_local_step(&object, rpc_version, buffer)
!= SLURM_SUCCESS) {
error("issue unpacking");
xfree(format);
xfree(insert);
break;
}
- if (i)
+ if(i)
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
@@ -1723,13 +1723,13 @@ static uint32_t _archive_suspend(mysql_conn_t *mysql_conn, char *cluster_name,
// START_TIMER;
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(cnt = mysql_num_rows(result))) {
+ if(!(cnt = mysql_num_rows(result))) {
mysql_free_result(result);
return 0;
}
@@ -1742,7 +1742,7 @@ static uint32_t _archive_suspend(mysql_conn_t *mysql_conn, char *cluster_name,
pack32(cnt, buffer);
while((row = mysql_fetch_row(result))) {
- if (!period_start)
+ if(!period_start)
period_start = atoi(row[SUSPEND_REQ_START]);
memset(&suspend, 0, sizeof(local_suspend_t));
@@ -1764,7 +1764,7 @@ static uint32_t _archive_suspend(mysql_conn_t *mysql_conn, char *cluster_name,
arch_dir, "suspend", archive_period);
free_buf(buffer);
- if (error_code != SLURM_SUCCESS)
+ if(error_code != SLURM_SUCCESS)
return error_code;
return cnt;
@@ -1789,14 +1789,14 @@ static char *_load_suspend(uint16_t rpc_version, Buf buffer,
xstrcat(format, ")");
for(i=0; i<rec_cnt; i++) {
memset(&object, 0, sizeof(local_suspend_t));
- if (_unpack_local_suspend(&object, rpc_version, buffer)
+ if(_unpack_local_suspend(&object, rpc_version, buffer)
!= SLURM_SUCCESS) {
error("issue unpacking");
xfree(format);
xfree(insert);
break;
}
- if (i)
+ if(i)
xstrcat(insert, ", ");
xstrfmtcat(insert, format,
@@ -1854,8 +1854,8 @@ static int _archive_script(slurmdb_archive_cond_t *arch_cond,
env_array_append_fmt(&env, "SLURM_ARCHIVE_CLUSTER", "%s",
cluster_name);
- if (arch_cond->purge_event != NO_VAL) {
- if (!(curr_end = _setup_end_time(
+ if(arch_cond->purge_event != NO_VAL) {
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_event))) {
error("Parsing purge events");
return SLURM_ERROR;
@@ -1868,8 +1868,8 @@ static int _archive_script(slurmdb_archive_cond_t *arch_cond,
curr_end);
}
- if (arch_cond->purge_job != NO_VAL) {
- if (!(curr_end = _setup_end_time(
+ if(arch_cond->purge_job != NO_VAL) {
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_job))) {
error("Parsing purge job");
return SLURM_ERROR;
@@ -1882,8 +1882,8 @@ static int _archive_script(slurmdb_archive_cond_t *arch_cond,
curr_end);
}
- if (arch_cond->purge_step != NO_VAL) {
- if (!(curr_end = _setup_end_time(
+ if(arch_cond->purge_step != NO_VAL) {
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_step))) {
error("Parsing purge step");
return SLURM_ERROR;
@@ -1896,8 +1896,8 @@ static int _archive_script(slurmdb_archive_cond_t *arch_cond,
curr_end);
}
- if (arch_cond->purge_suspend != NO_VAL) {
- if (!(curr_end = _setup_end_time(
+ if(arch_cond->purge_suspend != NO_VAL) {
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_suspend))) {
error("Parsing purge suspend");
return SLURM_ERROR;
@@ -1931,18 +1931,18 @@ static int _execute_archive(mysql_conn_t *mysql_conn,
time_t curr_end;
time_t last_submit = time(NULL);
- if (arch_cond->archive_script)
+ if(arch_cond->archive_script)
return _archive_script(arch_cond, cluster_name, last_submit);
- else if (!arch_cond->archive_dir) {
+ else if(!arch_cond->archive_dir) {
error("No archive dir given, can't process");
return SLURM_ERROR;
}
- if (arch_cond->purge_event != NO_VAL) {
+ if(arch_cond->purge_event != NO_VAL) {
/* remove all data from event table that was older than
* period_start * arch_cond->purge_event.
*/
- if (!(curr_end = _setup_end_time(
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_event))) {
error("Parsing purge event");
return SLURM_ERROR;
@@ -1951,13 +1951,13 @@ static int _execute_archive(mysql_conn_t *mysql_conn,
debug4("Purging event entries before %d for %s",
curr_end, cluster_name);
- if (SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_event)) {
+ if(SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_event)) {
rc = _archive_events(mysql_conn, cluster_name,
curr_end, arch_cond->archive_dir,
arch_cond->purge_event);
- if (!rc)
+ if(!rc)
goto exit_events;
- else if (rc == SLURM_ERROR)
+ else if(rc == SLURM_ERROR)
return rc;
}
query = xstrdup_printf("delete from \"%s_%s\" where "
@@ -1967,7 +1967,7 @@ static int _execute_archive(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't remove old event data");
return SLURM_ERROR;
}
@@ -1975,11 +1975,11 @@ static int _execute_archive(mysql_conn_t *mysql_conn,
exit_events:
- if (arch_cond->purge_suspend != NO_VAL) {
+ if(arch_cond->purge_suspend != NO_VAL) {
/* remove all data from suspend table that was older than
* period_start * arch_cond->purge_suspend.
*/
- if (!(curr_end = _setup_end_time(
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_suspend))) {
error("Parsing purge suspend");
return SLURM_ERROR;
@@ -1988,13 +1988,13 @@ exit_events:
debug4("Purging suspend entries before %d for %s",
curr_end, cluster_name);
- if (SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_suspend)) {
+ if(SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_suspend)) {
rc = _archive_suspend(mysql_conn, cluster_name,
curr_end, arch_cond->archive_dir,
arch_cond->purge_suspend);
- if (!rc)
+ if(!rc)
goto exit_suspend;
- else if (rc == SLURM_ERROR)
+ else if(rc == SLURM_ERROR)
return rc;
}
query = xstrdup_printf("delete from \"%s_%s\" where "
@@ -2004,7 +2004,7 @@ exit_events:
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't remove old suspend data");
return SLURM_ERROR;
}
@@ -2012,11 +2012,11 @@ exit_events:
exit_suspend:
- if (arch_cond->purge_step != NO_VAL) {
+ if(arch_cond->purge_step != NO_VAL) {
/* remove all data from step table that was older than
* start * arch_cond->purge_step.
*/
- if (!(curr_end = _setup_end_time(
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_step))) {
error("Parsing purge step");
return SLURM_ERROR;
@@ -2025,13 +2025,13 @@ exit_suspend:
debug4("Purging step entries before %d for %s",
curr_end, cluster_name);
- if (SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_step)) {
+ if(SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_step)) {
rc = _archive_steps(mysql_conn, cluster_name,
curr_end, arch_cond->archive_dir,
arch_cond->purge_step);
- if (!rc)
+ if(!rc)
goto exit_steps;
- else if (rc == SLURM_ERROR)
+ else if(rc == SLURM_ERROR)
return rc;
}
@@ -2042,18 +2042,18 @@ exit_suspend:
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't remove old step data");
return SLURM_ERROR;
}
}
exit_steps:
- if (arch_cond->purge_job != NO_VAL) {
+ if(arch_cond->purge_job != NO_VAL) {
/* remove all data from job table that was older than
* last_submit * arch_cond->purge_job.
*/
- if (!(curr_end = _setup_end_time(
+ if(!(curr_end = _setup_end_time(
last_submit, arch_cond->purge_job))) {
error("Parsing purge job");
return SLURM_ERROR;
@@ -2062,13 +2062,13 @@ exit_steps:
debug4("Purging job entires before %d for %s",
curr_end, cluster_name);
- if (SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_job)) {
+ if(SLURMDB_PURGE_ARCHIVE_SET(arch_cond->purge_job)) {
rc = _archive_jobs(mysql_conn, cluster_name,
curr_end, arch_cond->archive_dir,
arch_cond->purge_job);
- if (!rc)
+ if(!rc)
goto exit_jobs;
- else if (rc == SLURM_ERROR)
+ else if(rc == SLURM_ERROR)
return rc;
}
@@ -2080,7 +2080,7 @@ exit_steps:
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't remove old job data");
return SLURM_ERROR;
}
@@ -2099,12 +2099,12 @@ extern int as_mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
// DEF_TIMERS;
- if (!arch_cond) {
+ if(!arch_cond) {
error("No arch_cond was given to archive from. returning");
return SLURM_ERROR;
}
- if (arch_cond->job_cond && arch_cond->job_cond->cluster_list
+ if(arch_cond->job_cond && arch_cond->job_cond->cluster_list
&& list_count(arch_cond->job_cond->cluster_list))
use_cluster_list = arch_cond->job_cond->cluster_list;
else
@@ -2112,12 +2112,12 @@ extern int as_mysql_jobacct_process_archive(mysql_conn_t *mysql_conn,
itr = list_iterator_create(use_cluster_list);
while((cluster_name = list_next(itr))) {
- if ((rc = _execute_archive(mysql_conn, cluster_name, arch_cond))
+ if((rc = _execute_archive(mysql_conn, cluster_name, arch_cond))
!= SLURM_SUCCESS)
break;
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
return rc;
@@ -2133,14 +2133,14 @@ extern int as_mysql_jobacct_process_archive_load(
uint16_t type = 0, ver = 0;
uint32_t data_size = 0, rec_cnt = 0, tmp32 = 0;
- if (!arch_rec) {
+ if(!arch_rec) {
error("We need a slurmdb_archive_rec to load anything.");
return SLURM_ERROR;
}
- if (arch_rec->insert) {
+ if(arch_rec->insert) {
data = xstrdup(arch_rec->insert);
- } else if (arch_rec->archive_file) {
+ } else if(arch_rec->archive_file) {
int data_allocated, data_read = 0;
int state_fd = open(arch_rec->archive_file, O_RDONLY);
if (state_fd < 0) {
@@ -2169,7 +2169,7 @@ extern int as_mysql_jobacct_process_archive_load(
}
close(state_fd);
}
- if (error_code != SLURM_SUCCESS) {
+ if(error_code != SLURM_SUCCESS) {
xfree(data);
return error_code;
}
@@ -2179,14 +2179,14 @@ extern int as_mysql_jobacct_process_archive_load(
return SLURM_ERROR;
}
- if (!data) {
+ if(!data) {
error("It doesn't appear we have anything to load.");
return SLURM_ERROR;
}
/* this is the old version of an archive file where the file
was straight sql. */
- if ((strlen(data) >= 12)
+ if((strlen(data) >= 12)
&& (!strncmp("insert into ", data, 12)
|| !strncmp("delete from ", data, 12)
|| !strncmp("drop table ", data, 11)
@@ -2213,7 +2213,7 @@ extern int as_mysql_jobacct_process_archive_load(
unpackstr_ptr(&cluster_name, &tmp32, buffer);
safe_unpack32(&rec_cnt, buffer);
- if (!rec_cnt) {
+ if(!rec_cnt) {
error("we didn't get any records from this file of type '%s'",
slurmdbd_msg_type_2_str(type, 0));
free_buf(buffer);
@@ -2240,7 +2240,7 @@ extern int as_mysql_jobacct_process_archive_load(
free_buf(buffer);
got_sql:
- if (!data) {
+ if(!data) {
error("No data to load");
return SLURM_ERROR;
}
@@ -2248,7 +2248,7 @@ got_sql:
mysql_conn->conn, THIS_FILE, __LINE__, data);
error_code = mysql_db_query_check_after(mysql_conn->db_conn, data);
xfree(data);
- if (error_code != SLURM_SUCCESS) {
+ if(error_code != SLURM_SUCCESS) {
unpack_error:
error("Couldn't load old data");
return SLURM_ERROR;
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_assoc.c b/src/plugins/accounting_storage/mysql/as_mysql_assoc.c
index 15549cd9380eeb26ecc57d06c9dd1fa6992aee53..c1211655c9b02173c8b549dd44e76415c603600e 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_assoc.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_assoc.c
@@ -209,13 +209,13 @@ static int _move_account(mysql_conn_t *mysql_conn, uint32_t *lft, uint32_t *rgt,
cluster, assoc_table, parent);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(row = mysql_fetch_row(result))) {
+ if(!(row = mysql_fetch_row(result))) {
debug4("Can't move a none existant association");
mysql_free_result(result);
return ESLURM_INVALID_PARENT_ACCOUNT;
@@ -225,7 +225,7 @@ static int _move_account(mysql_conn_t *mysql_conn, uint32_t *lft, uint32_t *rgt,
diff = ((par_left + 1) - *lft);
- if (diff == 0) {
+ if(diff == 0) {
debug3("Trying to move association to the same position? "
"Nothing to do.");
return ESLURM_SAME_PARENT_ACCOUNT;
@@ -279,12 +279,12 @@ static int _move_account(mysql_conn_t *mysql_conn, uint32_t *lft, uint32_t *rgt,
cluster, assoc_table, id);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
debug4("lft and rgt were %u %u and now is %s %s",
*lft, *rgt, row[0], row[1]);
*lft = atoi(row[0]);
@@ -323,14 +323,14 @@ static int _move_parent(mysql_conn_t *mysql_conn, uid_t uid,
new_parent);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
uint32_t child_lft = atoi(row[1]), child_rgt = atoi(row[2]);
debug4("%s(%s) %s,%s is a child of %s",
@@ -341,7 +341,7 @@ static int _move_parent(mysql_conn_t *mysql_conn, uid_t uid,
mysql_free_result(result);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
return rc;
/* now move the one we wanted to move in the first place
@@ -353,14 +353,14 @@ static int _move_parent(mysql_conn_t *mysql_conn, uid_t uid,
cluster, assoc_table, id);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
*lft = atoi(row[0]);
*rgt = atoi(row[1]);
rc = _move_account(mysql_conn, lft, rgt,
@@ -391,14 +391,14 @@ static uint32_t _get_parent_id(
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
xfree(query);
return 0;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
- if (row[0])
+ if((row = mysql_fetch_row(result))) {
+ if(row[0])
parent_id = atoi(row[0]);
} else
error("no association for parent %s on cluster %s",
@@ -425,16 +425,16 @@ static int _set_assoc_lft_rgt(
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
xfree(query);
return 0;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
- if (row[0])
+ if((row = mysql_fetch_row(result))) {
+ if(row[0])
assoc->lft = atoi(row[0]);
- if (row[1])
+ if(row[1])
assoc->rgt = atoi(row[1]);
rc = SLURM_SUCCESS;
} else
@@ -468,9 +468,9 @@ static int _set_assoc_limits_for_add(
xassert(assoc);
- if (assoc->parent_acct)
+ if(assoc->parent_acct)
parent = assoc->parent_acct;
- else if (assoc->user)
+ else if(assoc->user)
parent = assoc->acct;
else
return SLURM_SUCCESS;
@@ -481,46 +481,46 @@ static int _set_assoc_limits_for_add(
get_parent_limits_select);
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 1))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(row = mysql_fetch_row(result)))
+ if(!(row = mysql_fetch_row(result)))
goto end_it;
- if (row[ASSOC2_REQ_DEF_QOS] && assoc->def_qos_id == NO_VAL)
+ if(row[ASSOC2_REQ_DEF_QOS] && assoc->def_qos_id == NO_VAL)
assoc->def_qos_id = atoi(row[ASSOC2_REQ_DEF_QOS]);
- else if (assoc->def_qos_id == NO_VAL)
+ else if(assoc->def_qos_id == NO_VAL)
assoc->def_qos_id = 0;
- if (row[ASSOC2_REQ_MJ] && assoc->max_jobs == NO_VAL)
+ if(row[ASSOC2_REQ_MJ] && assoc->max_jobs == NO_VAL)
assoc->max_jobs = atoi(row[ASSOC2_REQ_MJ]);
- if (row[ASSOC2_REQ_MSJ] && assoc->max_submit_jobs == NO_VAL)
+ if(row[ASSOC2_REQ_MSJ] && assoc->max_submit_jobs == NO_VAL)
assoc->max_submit_jobs = atoi(row[ASSOC2_REQ_MSJ]);
- if (row[ASSOC2_REQ_MCPJ] && assoc->max_cpus_pj == NO_VAL)
+ if(row[ASSOC2_REQ_MCPJ] && assoc->max_cpus_pj == NO_VAL)
assoc->max_cpus_pj = atoi(row[ASSOC2_REQ_MCPJ]);
- if (row[ASSOC2_REQ_MNPJ] && assoc->max_nodes_pj == NO_VAL)
+ if(row[ASSOC2_REQ_MNPJ] && assoc->max_nodes_pj == NO_VAL)
assoc->max_nodes_pj = atoi(row[ASSOC2_REQ_MNPJ]);
- if (row[ASSOC2_REQ_MWPJ] && assoc->max_wall_pj == NO_VAL)
+ if(row[ASSOC2_REQ_MWPJ] && assoc->max_wall_pj == NO_VAL)
assoc->max_wall_pj = atoi(row[ASSOC2_REQ_MWPJ]);
- if (row[ASSOC2_REQ_MCMPJ] && assoc->max_cpu_mins_pj == (uint64_t)NO_VAL)
+ if(row[ASSOC2_REQ_MCMPJ] && assoc->max_cpu_mins_pj == (uint64_t)NO_VAL)
assoc->max_cpu_mins_pj = atoll(row[ASSOC2_REQ_MCMPJ]);
- if (row[ASSOC2_REQ_MCRM] && assoc->max_cpu_run_mins == (uint64_t)NO_VAL)
+ if(row[ASSOC2_REQ_MCRM] && assoc->max_cpu_run_mins == (uint64_t)NO_VAL)
assoc->max_cpu_run_mins = atoll(row[ASSOC2_REQ_MCRM]);
- if (assoc->qos_list) {
+ if(assoc->qos_list) {
int set = 0;
char *tmp_char = NULL;
ListIterator qos_itr = list_iterator_create(assoc->qos_list);
while((tmp_char = list_next(qos_itr))) {
/* we don't want to include blank names */
- if (!tmp_char[0])
+ if(!tmp_char[0])
continue;
- if (!set) {
- if (tmp_char[0] != '+' && tmp_char[0] != '-')
+ if(!set) {
+ if(tmp_char[0] != '+' && tmp_char[0] != '-')
break;
set = 1;
}
@@ -528,7 +528,7 @@ static int _set_assoc_limits_for_add(
}
list_iterator_destroy(qos_itr);
- if (tmp_char) {
+ if(tmp_char) {
/* we have the qos here nothing from parents
needed */
goto end_it;
@@ -537,13 +537,13 @@ static int _set_assoc_limits_for_add(
} else
assoc->qos_list = list_create(slurm_destroy_char);
- if (row[ASSOC2_REQ_QOS][0])
+ if(row[ASSOC2_REQ_QOS][0])
slurm_addto_char_list(assoc->qos_list, row[ASSOC2_REQ_QOS]+1);
- if (row[ASSOC2_REQ_DELTA_QOS][0])
+ if(row[ASSOC2_REQ_DELTA_QOS][0])
slurm_addto_char_list(assoc->qos_list,
row[ASSOC2_REQ_DELTA_QOS]+1);
- if (qos_delta) {
+ if(qos_delta) {
slurm_addto_char_list(assoc->qos_list, qos_delta+1);
xfree(qos_delta);
}
@@ -611,7 +611,7 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
xassert(assoc);
xassert(assoc->cluster);
- if (!ret_list || !acct)
+ if(!ret_list || !acct)
return SLURM_ERROR;
xstrcat(object, assoc_req_inx[0]);
@@ -630,7 +630,7 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
xfree(object);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -646,55 +646,55 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
mod_assoc->id = atoi(row[ASSOC_ID]);
mod_assoc->cluster = xstrdup(assoc->cluster);
- if (!row[ASSOC_DEF_QOS] && assoc->def_qos_id != NO_VAL) {
+ if(!row[ASSOC_DEF_QOS] && assoc->def_qos_id != NO_VAL) {
mod_assoc->def_qos_id = assoc->def_qos_id;
modified = 1;
}
- if (!row[ASSOC_MJ] && assoc->max_jobs != NO_VAL) {
+ if(!row[ASSOC_MJ] && assoc->max_jobs != NO_VAL) {
mod_assoc->max_jobs = assoc->max_jobs;
modified = 1;
}
- if (!row[ASSOC_MSJ] && assoc->max_submit_jobs != NO_VAL) {
+ if(!row[ASSOC_MSJ] && assoc->max_submit_jobs != NO_VAL) {
mod_assoc->max_submit_jobs = assoc->max_submit_jobs;
modified = 1;
}
- if (!row[ASSOC_MNPJ] && assoc->max_nodes_pj != NO_VAL) {
+ if(!row[ASSOC_MNPJ] && assoc->max_nodes_pj != NO_VAL) {
mod_assoc->max_nodes_pj = assoc->max_nodes_pj;
modified = 1;
}
- if (!row[ASSOC_MCPJ] && assoc->max_cpus_pj != NO_VAL) {
+ if(!row[ASSOC_MCPJ] && assoc->max_cpus_pj != NO_VAL) {
mod_assoc->max_cpus_pj = assoc->max_cpus_pj;
modified = 1;
}
- if (!row[ASSOC_MWPJ] && assoc->max_wall_pj != NO_VAL) {
+ if(!row[ASSOC_MWPJ] && assoc->max_wall_pj != NO_VAL) {
mod_assoc->max_wall_pj = assoc->max_wall_pj;
modified = 1;
}
- if (!row[ASSOC_MCMPJ]
+ if(!row[ASSOC_MCMPJ]
&& assoc->max_cpu_mins_pj != (uint64_t)NO_VAL) {
mod_assoc->max_cpu_mins_pj = assoc->max_cpu_mins_pj;
modified = 1;
}
- if (!row[ASSOC_MCRM]
+ if(!row[ASSOC_MCRM]
&& assoc->max_cpu_run_mins != (uint64_t)NO_VAL) {
mod_assoc->max_cpu_run_mins = assoc->max_cpu_run_mins;
modified = 1;
}
- if (!row[ASSOC_QOS][0] && assoc->qos_list) {
+ if(!row[ASSOC_QOS][0] && assoc->qos_list) {
List delta_qos_list = NULL;
char *qos_char = NULL, *delta_char = NULL;
ListIterator delta_itr = NULL;
ListIterator qos_itr =
list_iterator_create(assoc->qos_list);
- if (row[ASSOC_DELTA_QOS][0]) {
+ if(row[ASSOC_DELTA_QOS][0]) {
delta_qos_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(delta_qos_list,
@@ -709,27 +709,27 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
it to the parent.
*/
while((qos_char = list_next(qos_itr))) {
- if (delta_itr && qos_char[0] != '=') {
+ if(delta_itr && qos_char[0] != '=') {
while((delta_char =
list_next(delta_itr))) {
- if ((qos_char[0]
+ if((qos_char[0]
!= delta_char[0])
&& (!strcmp(qos_char+1,
delta_char+1)))
break;
}
list_iterator_reset(delta_itr);
- if (delta_char)
+ if(delta_char)
continue;
}
list_append(mod_assoc->qos_list,
xstrdup(qos_char));
}
list_iterator_destroy(qos_itr);
- if (delta_itr)
+ if(delta_itr)
list_iterator_destroy(delta_itr);
- if (list_count(mod_assoc->qos_list)
+ if(list_count(mod_assoc->qos_list)
|| !list_count(assoc->qos_list))
modified = 1;
else {
@@ -739,11 +739,11 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
}
/* We only want to add those that are modified here */
- if (modified) {
+ if(modified) {
/* Since we aren't really changing this non
* user association we don't want to send it.
*/
- if (!row[ASSOC_USER][0]) {
+ if(!row[ASSOC_USER][0]) {
/* This is a sub account so run it
* through as if it is a parent.
*/
@@ -758,7 +758,7 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
}
/* We do want to send all user accounts though */
mod_assoc->shares_raw = NO_VAL;
- if (row[ASSOC_PART][0]) {
+ if(row[ASSOC_PART][0]) {
// see if there is a partition name
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s P = %s",
@@ -774,10 +774,10 @@ static int _modify_unset_users(mysql_conn_t *mysql_conn,
list_append(ret_list, object);
- if (moved_parent)
+ if(moved_parent)
slurmdb_destroy_association_rec(mod_assoc);
else
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_MODIFY_ASSOC,
mod_assoc)
!= SLURM_SUCCESS)
@@ -803,14 +803,14 @@ static char *_setup_association_cond_qos(slurmdb_association_cond_t *assoc_cond,
char *prefix = "t1";
char *extra = NULL;
- if (!assoc_cond)
+ if(!assoc_cond)
return NULL;
/* we need to check this first so we can update the
with_sub_accts if needed since this the qos_list is a
parent thing
*/
- if (assoc_cond->qos_list && list_count(assoc_cond->qos_list)) {
+ if(assoc_cond->qos_list && list_count(assoc_cond->qos_list)) {
/* we have to do the same thing as with_sub_accts does
first since we are looking for something that is
really most likely a parent thing */
@@ -822,7 +822,7 @@ static char *_setup_association_cond_qos(slurmdb_association_cond_t *assoc_cond,
set = 0;
itr = list_iterator_create(assoc_cond->qos_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra,
"(%s.qos like '%%,%s' "
@@ -835,7 +835,7 @@ static char *_setup_association_cond_qos(slurmdb_association_cond_t *assoc_cond,
}
list_iterator_destroy(itr);
xstrcat(extra, ") &&");
- } else if (assoc_cond->with_sub_accts) {
+ } else if(assoc_cond->with_sub_accts) {
prefix = "t2";
xstrfmtcat(extra, ", \"%s_%s\" as t2 where "
"(t1.lft between t2.lft and t2.rgt) &&",
@@ -854,21 +854,21 @@ static int _setup_association_cond_limits(
ListIterator itr = NULL;
char *object = NULL;
- if (!assoc_cond)
+ if(!assoc_cond)
return 0;
- if (assoc_cond->with_deleted)
+ if(assoc_cond->with_deleted)
xstrfmtcat(*extra, " (%s.deleted=0 || %s.deleted=1)",
prefix, prefix);
else
xstrfmtcat(*extra, " %s.deleted=0", prefix);
- if (assoc_cond->acct_list && list_count(assoc_cond->acct_list)) {
+ if(assoc_cond->acct_list && list_count(assoc_cond->acct_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.acct='%s'", prefix, object);
set = 1;
@@ -877,13 +877,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->def_qos_id_list
+ if(assoc_cond->def_qos_id_list
&& list_count(assoc_cond->def_qos_id_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->def_qos_id_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.def_qos_id='%s'",
prefix, object);
@@ -893,13 +893,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->fairshare_list
+ if(assoc_cond->fairshare_list
&& list_count(assoc_cond->fairshare_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->fairshare_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.shares='%s'",
prefix, object);
@@ -909,13 +909,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->grp_cpu_mins_list
+ if(assoc_cond->grp_cpu_mins_list
&& list_count(assoc_cond->grp_cpu_mins_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_cpu_mins_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_cpu_mins='%s'",
prefix, object);
@@ -925,13 +925,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->grp_cpu_run_mins_list
+ if(assoc_cond->grp_cpu_run_mins_list
&& list_count(assoc_cond->grp_cpu_run_mins_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_cpu_run_mins_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_cpu_run_mins='%s'",
prefix, object);
@@ -941,13 +941,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->grp_cpus_list
+ if(assoc_cond->grp_cpus_list
&& list_count(assoc_cond->grp_cpus_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_cpus_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_cpus='%s'",
prefix, object);
@@ -957,13 +957,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->grp_jobs_list
+ if(assoc_cond->grp_jobs_list
&& list_count(assoc_cond->grp_jobs_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_jobs_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_jobs='%s'",
prefix, object);
@@ -973,13 +973,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->grp_nodes_list
+ if(assoc_cond->grp_nodes_list
&& list_count(assoc_cond->grp_nodes_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_nodes_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_nodes='%s'",
prefix, object);
@@ -989,13 +989,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->grp_submit_jobs_list
+ if(assoc_cond->grp_submit_jobs_list
&& list_count(assoc_cond->grp_submit_jobs_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_submit_jobs_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_submit_jobs='%s'",
prefix, object);
@@ -1005,13 +1005,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->grp_wall_list
+ if(assoc_cond->grp_wall_list
&& list_count(assoc_cond->grp_wall_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->grp_wall_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.grp_wall='%s'",
prefix, object);
@@ -1021,13 +1021,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->max_cpu_mins_pj_list
+ if(assoc_cond->max_cpu_mins_pj_list
&& list_count(assoc_cond->max_cpu_mins_pj_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_cpu_mins_pj_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.max_cpu_mins_pj='%s'",
prefix, object);
@@ -1037,13 +1037,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->max_cpu_run_mins_list
+ if(assoc_cond->max_cpu_run_mins_list
&& list_count(assoc_cond->max_cpu_run_mins_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_cpu_run_mins_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.max_cpu_run_mins='%s'",
prefix, object);
@@ -1053,13 +1053,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->max_cpus_pj_list
+ if(assoc_cond->max_cpus_pj_list
&& list_count(assoc_cond->max_cpus_pj_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_cpus_pj_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.max_cpus_pj='%s'",
prefix, object);
@@ -1069,13 +1069,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->max_jobs_list
+ if(assoc_cond->max_jobs_list
&& list_count(assoc_cond->max_jobs_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_jobs_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.max_jobs='%s'",
prefix, object);
@@ -1085,13 +1085,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->max_nodes_pj_list
+ if(assoc_cond->max_nodes_pj_list
&& list_count(assoc_cond->max_nodes_pj_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_nodes_pj_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.max_nodes_pj='%s'",
prefix, object);
@@ -1101,13 +1101,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->max_submit_jobs_list
+ if(assoc_cond->max_submit_jobs_list
&& list_count(assoc_cond->max_submit_jobs_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_submit_jobs_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.max_submit_jobs='%s'",
prefix, object);
@@ -1117,13 +1117,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->max_wall_pj_list
+ if(assoc_cond->max_wall_pj_list
&& list_count(assoc_cond->max_wall_pj_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->max_wall_pj_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra,
"%s.max_wall_pj='%s'",
@@ -1134,31 +1134,31 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->user_list && list_count(assoc_cond->user_list)) {
+ if(assoc_cond->user_list && list_count(assoc_cond->user_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->user_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.user='%s'", prefix, object);
set = 1;
}
list_iterator_destroy(itr);
xstrcat(*extra, ")");
- } else if (assoc_cond->user_list) {
+ } else if(assoc_cond->user_list) {
/* we want all the users, but no non-user associations */
set = 1;
xstrfmtcat(*extra, " && (%s.user!='')", prefix);
}
- if (assoc_cond->partition_list
+ if(assoc_cond->partition_list
&& list_count(assoc_cond->partition_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->partition_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.partition='%s'",
prefix, object);
@@ -1168,12 +1168,12 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->id_list && list_count(assoc_cond->id_list)) {
+ if(assoc_cond->id_list && list_count(assoc_cond->id_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->id_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.id_assoc=%s", prefix, object);
set = 1;
@@ -1182,13 +1182,13 @@ static int _setup_association_cond_limits(
xstrcat(*extra, ")");
}
- if (assoc_cond->parent_acct_list
+ if(assoc_cond->parent_acct_list
&& list_count(assoc_cond->parent_acct_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->parent_acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.parent_acct='%s'",
prefix, object);
@@ -1219,7 +1219,7 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
xassert(result);
- if (!mysql_num_rows(result))
+ if(!mysql_num_rows(result))
return SLURM_SUCCESS;
vals = xstrdup(sent_vals);
@@ -1246,15 +1246,15 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
* association so account is really the parent
* of the user a coord can change that all day long.
*/
- if (row[MASSOC_PACCT][0])
+ if(row[MASSOC_PACCT][0])
account = row[MASSOC_PACCT];
else
account = row[MASSOC_ACCT];
- if (!is_admin) {
+ if(!is_admin) {
slurmdb_coord_rec_t *coord = NULL;
- if (!user->coord_accts) { // This should never
+ if(!user->coord_accts) { // This should never
// happen
error("We are here with no coord accts.");
rc = ESLURM_ACCESS_DENIED;
@@ -1262,13 +1262,13 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
}
itr = list_iterator_create(user->coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name, account))
+ if(!strcasecmp(coord->name, account))
break;
}
list_iterator_destroy(itr);
- if (!coord) {
- if (row[MASSOC_PACCT][0])
+ if(!coord) {
+ if(row[MASSOC_PACCT][0])
error("User %s(%d) can not modify "
"account (%s) because they "
"are not coordinators of "
@@ -1288,20 +1288,20 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
}
}
- if (row[MASSOC_PART][0]) {
+ if(row[MASSOC_PART][0]) {
// see if there is a partition name
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s P = %s",
cluster_name, row[MASSOC_ACCT],
row[MASSOC_USER], row[MASSOC_PART]);
- } else if (row[MASSOC_USER][0]){
+ } else if(row[MASSOC_USER][0]){
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s",
cluster_name, row[MASSOC_ACCT],
row[MASSOC_USER]);
} else {
- if (assoc->parent_acct) {
- if (!strcasecmp(row[MASSOC_ACCT],
+ if(assoc->parent_acct) {
+ if(!strcasecmp(row[MASSOC_ACCT],
assoc->parent_acct)) {
error("You can't make an account be a "
"child of it's self");
@@ -1315,15 +1315,15 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
row[MASSOC_PACCT],
assoc->parent_acct,
now);
- if ((rc == ESLURM_INVALID_PARENT_ACCOUNT)
+ if((rc == ESLURM_INVALID_PARENT_ACCOUNT)
|| (rc == ESLURM_SAME_PARENT_ACCOUNT)) {
continue;
- } else if (rc != SLURM_SUCCESS)
+ } else if(rc != SLURM_SUCCESS)
break;
moved_parent = 1;
}
- if (row[MASSOC_PACCT][0]) {
+ if(row[MASSOC_PACCT][0]) {
object = xstrdup_printf(
"C = %-10s A = %s of %s",
cluster_name, row[MASSOC_ACCT],
@@ -1338,7 +1338,7 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
list_append(ret_list, object);
added++;
- if (name_char)
+ if(name_char)
xstrfmtcat(name_char, " || id_assoc=%s",
row[MASSOC_ID]);
else
@@ -1354,41 +1354,41 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
get_parent_limits_select);
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 1))) {
xfree(query);
break;
}
xfree(query);
- if ((row2 = mysql_fetch_row(result2))) {
- if (!assoc->def_qos_id && row2[ASSOC2_REQ_DEF_QOS])
+ if((row2 = mysql_fetch_row(result2))) {
+ if(!assoc->def_qos_id && row2[ASSOC2_REQ_DEF_QOS])
assoc->def_qos_id =
atoi(row2[ASSOC2_REQ_DEF_QOS]);
- if ((assoc->max_jobs == INFINITE) && row2[ASSOC2_REQ_MJ])
+ if((assoc->max_jobs == INFINITE) && row2[ASSOC2_REQ_MJ])
assoc->max_jobs = atoi(row2[ASSOC2_REQ_MJ]);
- if ((assoc->max_submit_jobs == INFINITE)
+ if((assoc->max_submit_jobs == INFINITE)
&& row2[ASSOC2_REQ_MSJ])
assoc->max_submit_jobs =
atoi(row2[ASSOC2_REQ_MSJ]);
- if ((assoc->max_cpus_pj == INFINITE)
+ if((assoc->max_cpus_pj == INFINITE)
&& row2[ASSOC2_REQ_MCPJ])
assoc->max_cpus_pj =
atoi(row2[ASSOC2_REQ_MCPJ]);
- if ((assoc->max_nodes_pj == INFINITE)
+ if((assoc->max_nodes_pj == INFINITE)
&& row2[ASSOC2_REQ_MNPJ])
assoc->max_nodes_pj =
atoi(row2[ASSOC2_REQ_MNPJ]);
- if ((assoc->max_wall_pj == INFINITE)
+ if((assoc->max_wall_pj == INFINITE)
&& row2[ASSOC2_REQ_MWPJ])
assoc->max_wall_pj =
atoi(row2[ASSOC2_REQ_MWPJ]);
- if ((assoc->max_cpu_mins_pj == (uint64_t)INFINITE)
+ if((assoc->max_cpu_mins_pj == (uint64_t)INFINITE)
&& row2[ASSOC2_REQ_MCMPJ])
assoc->max_cpu_mins_pj =
atoll(row2[ASSOC2_REQ_MCMPJ]);
- if ((assoc->max_cpu_run_mins == (uint64_t)INFINITE)
+ if((assoc->max_cpu_run_mins == (uint64_t)INFINITE)
&& row2[ASSOC2_REQ_MCRM])
assoc->max_cpu_run_mins =
atoll(row2[ASSOC2_REQ_MCRM]);
@@ -1423,9 +1423,9 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
/* no need to get the parent id since if we moved
* parent id's we will get it when we send the total list */
- if (!row[MASSOC_USER][0])
+ if(!row[MASSOC_USER][0])
mod_assoc->parent_acct = xstrdup(assoc->parent_acct);
- if (assoc->qos_list && list_count(assoc->qos_list)) {
+ if(assoc->qos_list && list_count(assoc->qos_list)) {
ListIterator new_qos_itr =
list_iterator_create(assoc->qos_list);
char *new_qos = NULL, *tmp_qos = NULL;
@@ -1433,38 +1433,38 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
mod_assoc->qos_list = list_create(slurm_destroy_char);
while((new_qos = list_next(new_qos_itr))) {
- if (new_qos[0] == '-' || new_qos[0] == '+') {
+ if(new_qos[0] == '-' || new_qos[0] == '+') {
list_append(mod_assoc->qos_list,
xstrdup(new_qos));
- } else if (new_qos[0]) {
+ } else if(new_qos[0]) {
list_append(mod_assoc->qos_list,
xstrdup_printf("=%s",
new_qos));
}
- if (set_qos_vals)
+ if(set_qos_vals)
continue;
/* Now we can set up the values and
make sure we aren't over writing
things that are really from the
parent
*/
- if (new_qos[0] == '-') {
+ if(new_qos[0] == '-') {
xstrfmtcat(vals,
- ", qos=if (qos='', '', "
+ ", qos=if(qos='', '', "
"replace(qos, ',%s', ''))"
- ", delta_qos=if (qos='', "
+ ", delta_qos=if(qos='', "
"concat(replace(replace("
"delta_qos, ',+%s', ''), "
"',-%s', ''), ',%s'), '')",
new_qos+1, new_qos+1,
new_qos+1, new_qos);
- } else if (new_qos[0] == '+') {
+ } else if(new_qos[0] == '+') {
xstrfmtcat(vals,
- ", qos=if (qos='', '', "
+ ", qos=if(qos='', '', "
"concat_ws(',', "
"replace(qos, ',%s', ''), "
- "'%s')), delta_qos=if ("
+ "'%s')), delta_qos=if("
"qos='', concat("
"replace(replace("
"delta_qos, ',+%s', ''), "
@@ -1472,7 +1472,7 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
new_qos+1, new_qos+1,
new_qos+1, new_qos+1,
new_qos);
- } else if (new_qos[0])
+ } else if(new_qos[0])
xstrfmtcat(tmp_qos, ",%s", new_qos);
else
xstrcat(tmp_qos, "");
@@ -1480,7 +1480,7 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
}
list_iterator_destroy(new_qos_itr);
- if (!set_qos_vals && tmp_qos)
+ if(!set_qos_vals && tmp_qos)
xstrfmtcat(vals, ", qos='%s', delta_qos=''",
tmp_qos);
xfree(tmp_qos);
@@ -1488,11 +1488,11 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
set_qos_vals=1;
}
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_MODIFY_ASSOC,
mod_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
- if (account_type)
+ if(account_type)
_modify_unset_users(mysql_conn,
mod_assoc,
row[MASSOC_ACCT],
@@ -1503,17 +1503,17 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
xstrcat(name_char, ")");
- if (assoc->parent_acct) {
- if (((rc == ESLURM_INVALID_PARENT_ACCOUNT)
+ if(assoc->parent_acct) {
+ if(((rc == ESLURM_INVALID_PARENT_ACCOUNT)
|| (rc == ESLURM_SAME_PARENT_ACCOUNT))
&& added)
rc = SLURM_SUCCESS;
}
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
- if (vals) {
+ if(vals) {
char *user_name = uid_to_string((uid_t) user->uid);
rc = modify_common(mysql_conn, DBD_MODIFY_ASSOCS, now,
user_name, assoc_table, name_char, vals,
@@ -1525,7 +1525,7 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
}
}
- if (moved_parent) {
+ if(moved_parent) {
List local_assoc_list = NULL;
ListIterator local_itr = NULL;
slurmdb_association_rec_t *local_assoc = NULL;
@@ -1548,7 +1548,7 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
local_assoc_list = as_mysql_get_assocs(
mysql_conn, user->uid, &local_assoc_cond);
list_destroy(local_assoc_cond.cluster_list);
- if (!local_assoc_list)
+ if(!local_assoc_list)
goto end_it;
/* NOTE: you can not use list_pop, or list_push
anywhere either, since as_mysql is
@@ -1560,7 +1560,7 @@ static int _process_modify_assoc_results(mysql_conn_t *mysql_conn,
*/
local_itr = list_iterator_create(local_assoc_list);
while((local_assoc = list_next(local_itr))) {
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_MODIFY_ASSOC,
local_assoc) == SLURM_SUCCESS)
list_remove(local_itr);
@@ -1593,16 +1593,16 @@ static int _process_remove_assoc_results(mysql_conn_t *mysql_conn,
uint32_t smallest_lft = 0xFFFFFFFF;
xassert(result);
- if (*jobs_running)
+ if(*jobs_running)
goto skip_process;
while((row = mysql_fetch_row(result))) {
slurmdb_association_rec_t *rem_assoc = NULL;
uint32_t lft;
- if (!is_admin) {
+ if(!is_admin) {
slurmdb_coord_rec_t *coord = NULL;
- if (!user->coord_accts) { // This should never
+ if(!user->coord_accts) { // This should never
// happen
error("We are here with no coord accts");
rc = ESLURM_ACCESS_DENIED;
@@ -1610,13 +1610,13 @@ static int _process_remove_assoc_results(mysql_conn_t *mysql_conn,
}
itr = list_iterator_create(user->coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name,
+ if(!strcasecmp(coord->name,
row[RASSOC_ACCT]))
break;
}
list_iterator_destroy(itr);
- if (!coord) {
+ if(!coord) {
error("User %s(%d) does not have the "
"ability to change this account (%s)",
user->name, user->uid, row[RASSOC_ACCT]);
@@ -1624,19 +1624,19 @@ static int _process_remove_assoc_results(mysql_conn_t *mysql_conn,
goto end_it;
}
}
- if (row[RASSOC_PART][0]) {
+ if(row[RASSOC_PART][0]) {
// see if there is a partition name
object = xstrdup_printf(
"C = %-10s A = %-10s U = %-9s P = %s",
cluster_name, row[RASSOC_ACCT],
row[RASSOC_USER], row[RASSOC_PART]);
- } else if (row[RASSOC_USER][0]){
+ } else if(row[RASSOC_USER][0]){
object = xstrdup_printf(
"C = %-10s A = %-10s U = %-9s",
cluster_name, row[RASSOC_ACCT],
row[RASSOC_USER]);
} else {
- if (row[RASSOC_PACCT][0]) {
+ if(row[RASSOC_PACCT][0]) {
object = xstrdup_printf(
"C = %-10s A = %s of %s",
cluster_name, row[RASSOC_ACCT],
@@ -1648,7 +1648,7 @@ static int _process_remove_assoc_results(mysql_conn_t *mysql_conn,
}
}
list_append(ret_list, object);
- if (assoc_char)
+ if(assoc_char)
xstrfmtcat(assoc_char, " || id_assoc=%s",
row[RASSOC_ID]);
else
@@ -1658,14 +1658,14 @@ static int _process_remove_assoc_results(mysql_conn_t *mysql_conn,
the modified lfts after it.
*/
lft = atoi(row[RASSOC_LFT]);
- if (lft < smallest_lft)
+ if(lft < smallest_lft)
smallest_lft = lft;
rem_assoc = xmalloc(sizeof(slurmdb_association_rec_t));
slurmdb_init_association_rec(rem_assoc);
rem_assoc->id = atoi(row[RASSOC_ID]);
rem_assoc->cluster = xstrdup(cluster_name);
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_REMOVE_ASSOC,
rem_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
@@ -1727,7 +1727,7 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
uint16_t with_usage = 0;
uint16_t with_raw_qos = 0;
- if (assoc_cond) {
+ if(assoc_cond) {
with_raw_qos = assoc_cond->with_raw_qos;
with_usage = assoc_cond->with_usage;
without_parent_limits = assoc_cond->without_parent_limits;
@@ -1738,11 +1738,11 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
- if (!is_admin && (private_data & PRIVATE_DATA_USERS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_USERS)) {
int set = 0;
query = xstrdup_printf("select lft from %s where user='%s'",
assoc_table, user->name);
- if (user->coord_accts) {
+ if(user->coord_accts) {
slurmdb_coord_rec_t *coord = NULL;
itr = list_iterator_create(user->coord_accts);
while((coord = list_next(itr))) {
@@ -1753,7 +1753,7 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
}
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(extra);
xfree(query);
@@ -1762,7 +1762,7 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
xfree(query);
set = 0;
while((row = mysql_fetch_row(result))) {
- if (set) {
+ if(set) {
xstrfmtcat(extra,
" || (%s between lft and rgt)",
row[0]);
@@ -1773,7 +1773,7 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
row[0]);
}
}
- if (set)
+ if(set)
xstrcat(extra,")");
mysql_free_result(result);
}
@@ -1790,17 +1790,17 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
xfree(extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (mysql_errno(mysql_conn->db_conn) == ER_NO_SUCH_TABLE)
+ if(mysql_errno(mysql_conn->db_conn) == ER_NO_SUCH_TABLE)
return SLURM_SUCCESS;
else
return SLURM_ERROR;
}
xfree(query);
- if (!mysql_num_rows(result)) {
+ if(!mysql_num_rows(result)) {
mysql_free_result(result);
return SLURM_SUCCESS;
}
@@ -1819,65 +1819,65 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
assoc->lft = atoi(row[ASSOC_REQ_LFT]);
assoc->rgt = atoi(row[ASSOC_REQ_RGT]);
- if (row[ASSOC_REQ_USER][0])
+ if(row[ASSOC_REQ_USER][0])
assoc->user = xstrdup(row[ASSOC_REQ_USER]);
assoc->acct = xstrdup(row[ASSOC_REQ_ACCT]);
assoc->cluster = xstrdup(cluster_name);
- if (row[ASSOC_REQ_GJ])
+ if(row[ASSOC_REQ_GJ])
assoc->grp_jobs = atoi(row[ASSOC_REQ_GJ]);
else
assoc->grp_jobs = INFINITE;
- if (row[ASSOC_REQ_GSJ])
+ if(row[ASSOC_REQ_GSJ])
assoc->grp_submit_jobs = atoi(row[ASSOC_REQ_GSJ]);
else
assoc->grp_submit_jobs = INFINITE;
- if (row[ASSOC_REQ_GC])
+ if(row[ASSOC_REQ_GC])
assoc->grp_cpus = atoi(row[ASSOC_REQ_GC]);
else
assoc->grp_cpus = INFINITE;
- if (row[ASSOC_REQ_GN])
+ if(row[ASSOC_REQ_GN])
assoc->grp_nodes = atoi(row[ASSOC_REQ_GN]);
else
assoc->grp_nodes = INFINITE;
- if (row[ASSOC_REQ_GW])
+ if(row[ASSOC_REQ_GW])
assoc->grp_wall = atoi(row[ASSOC_REQ_GW]);
else
assoc->grp_wall = INFINITE;
- if (row[ASSOC_REQ_GCM])
+ if(row[ASSOC_REQ_GCM])
assoc->grp_cpu_mins = atoll(row[ASSOC_REQ_GCM]);
else
assoc->grp_cpu_mins = INFINITE;
- if (row[ASSOC_REQ_GCRM])
+ if(row[ASSOC_REQ_GCRM])
assoc->grp_cpu_run_mins = atoll(row[ASSOC_REQ_GCRM]);
else
assoc->grp_cpu_run_mins = INFINITE;
parent_acct = row[ASSOC_REQ_ACCT];
- if (!without_parent_info
+ if(!without_parent_info
&& row[ASSOC_REQ_PARENT][0]) {
assoc->parent_acct = xstrdup(row[ASSOC_REQ_PARENT]);
parent_acct = row[ASSOC_REQ_PARENT];
- } else if (!assoc->user) {
+ } else if(!assoc->user) {
/* This is the root association so we have no
parent id */
parent_acct = NULL;
parent_id = 0;
}
- if (row[ASSOC_REQ_PART][0])
+ if(row[ASSOC_REQ_PART][0])
assoc->partition = xstrdup(row[ASSOC_REQ_PART]);
- if (row[ASSOC_REQ_FS])
+ if(row[ASSOC_REQ_FS])
assoc->shares_raw = atoi(row[ASSOC_REQ_FS]);
else
assoc->shares_raw = 1;
- if (!without_parent_info && parent_acct &&
+ if(!without_parent_info && parent_acct &&
(!last_acct || !last_cluster
|| strcmp(parent_acct, last_acct)
|| strcmp(cluster_name, last_cluster))) {
@@ -1890,75 +1890,75 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
get_parent_limits_select);
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 1))) {
xfree(query);
break;
}
xfree(query);
- if (!(row2 = mysql_fetch_row(result2))) {
+ if(!(row2 = mysql_fetch_row(result2))) {
parent_id = 0;
goto no_parent_limits;
}
parent_id = atoi(row2[ASSOC2_REQ_PARENT_ID]);
- if (!without_parent_limits) {
- if (row2[ASSOC2_REQ_DEF_QOS])
+ if(!without_parent_limits) {
+ if(row2[ASSOC2_REQ_DEF_QOS])
parent_def_qos_id =
atoi(row2[ASSOC2_REQ_DEF_QOS]);
else
parent_def_qos_id = 0;
- if (row2[ASSOC2_REQ_MJ])
+ if(row2[ASSOC2_REQ_MJ])
parent_mj = atoi(row2[ASSOC2_REQ_MJ]);
else
parent_mj = INFINITE;
- if (row2[ASSOC2_REQ_MSJ])
+ if(row2[ASSOC2_REQ_MSJ])
parent_msj = atoi(row2[ASSOC2_REQ_MSJ]);
else
parent_msj = INFINITE;
- if (row2[ASSOC2_REQ_MCPJ])
+ if(row2[ASSOC2_REQ_MCPJ])
parent_mcpj =
atoi(row2[ASSOC2_REQ_MCPJ]);
else
parent_mcpj = INFINITE;
- if (row2[ASSOC2_REQ_MNPJ])
+ if(row2[ASSOC2_REQ_MNPJ])
parent_mnpj =
atoi(row2[ASSOC2_REQ_MNPJ]);
else
parent_mnpj = INFINITE;
- if (row2[ASSOC2_REQ_MWPJ])
+ if(row2[ASSOC2_REQ_MWPJ])
parent_mwpj =
atoi(row2[ASSOC2_REQ_MWPJ]);
else
parent_mwpj = INFINITE;
- if (row2[ASSOC2_REQ_MCMPJ])
+ if(row2[ASSOC2_REQ_MCMPJ])
parent_mcmpj =
atoll(row2[ASSOC2_REQ_MCMPJ]);
else
parent_mcmpj = INFINITE;
- if (row2[ASSOC2_REQ_MCRM])
+ if(row2[ASSOC2_REQ_MCRM])
parent_mcrm =
atoll(row2[ASSOC2_REQ_MCRM]);
else
parent_mcrm = (uint64_t)INFINITE;
xfree(parent_qos);
- if (row2[ASSOC2_REQ_QOS][0])
+ if(row2[ASSOC2_REQ_QOS][0])
parent_qos =
xstrdup(row2[ASSOC2_REQ_QOS]);
else
parent_qos = NULL;
xfree(parent_delta_qos);
- if (row2[ASSOC2_REQ_DELTA_QOS][0])
+ if(row2[ASSOC2_REQ_DELTA_QOS][0])
parent_delta_qos = xstrdup(
row2[ASSOC2_REQ_DELTA_QOS]);
else
@@ -1970,42 +1970,42 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
mysql_free_result(result2);
}
- if (row[ASSOC_REQ_DEF_QOS])
+ if(row[ASSOC_REQ_DEF_QOS])
assoc->def_qos_id = atoi(row[ASSOC_REQ_DEF_QOS]);
else
assoc->def_qos_id = parent_def_qos_id;
- if (row[ASSOC_REQ_MJ])
+ if(row[ASSOC_REQ_MJ])
assoc->max_jobs = atoi(row[ASSOC_REQ_MJ]);
else
assoc->max_jobs = parent_mj;
- if (row[ASSOC_REQ_MSJ])
+ if(row[ASSOC_REQ_MSJ])
assoc->max_submit_jobs = atoi(row[ASSOC_REQ_MSJ]);
else
assoc->max_submit_jobs = parent_msj;
- if (row[ASSOC_REQ_MCPJ])
+ if(row[ASSOC_REQ_MCPJ])
assoc->max_cpus_pj = atoi(row[ASSOC_REQ_MCPJ]);
else
assoc->max_cpus_pj = parent_mcpj;
- if (row[ASSOC_REQ_MNPJ])
+ if(row[ASSOC_REQ_MNPJ])
assoc->max_nodes_pj = atoi(row[ASSOC_REQ_MNPJ]);
else
assoc->max_nodes_pj = parent_mnpj;
- if (row[ASSOC_REQ_MWPJ])
+ if(row[ASSOC_REQ_MWPJ])
assoc->max_wall_pj = atoi(row[ASSOC_REQ_MWPJ]);
else
assoc->max_wall_pj = parent_mwpj;
- if (row[ASSOC_REQ_MCMPJ])
+ if(row[ASSOC_REQ_MCMPJ])
assoc->max_cpu_mins_pj = atoll(row[ASSOC_REQ_MCMPJ]);
else
assoc->max_cpu_mins_pj = parent_mcmpj;
- if (row[ASSOC_REQ_MCRM])
+ if(row[ASSOC_REQ_MCRM])
assoc->max_cpu_run_mins = atoll(row[ASSOC_REQ_MCRM]);
else
assoc->max_cpu_run_mins = parent_mcrm;
@@ -2018,7 +2018,7 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
* about the delta.
*/
- if (row[ASSOC_REQ_QOS][0])
+ if(row[ASSOC_REQ_QOS][0])
slurm_addto_char_list(assoc->qos_list,
row[ASSOC_REQ_QOS]+1);
else {
@@ -2027,17 +2027,17 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
*/
/* add the parents first */
- if (parent_qos)
+ if(parent_qos)
slurm_addto_char_list(assoc->qos_list,
parent_qos+1);
/* then add the parents delta */
- if (parent_delta_qos)
+ if(parent_delta_qos)
slurm_addto_char_list(delta_qos_list,
parent_delta_qos+1);
/* now add the associations */
- if (row[ASSOC_REQ_DELTA_QOS][0])
+ if(row[ASSOC_REQ_DELTA_QOS][0])
slurm_addto_char_list(
delta_qos_list,
row[ASSOC_REQ_DELTA_QOS]+1);
@@ -2047,10 +2047,10 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
the database instead of a complete list. This will
give it to us.
*/
- if (with_raw_qos && list_count(delta_qos_list)) {
+ if(with_raw_qos && list_count(delta_qos_list)) {
list_transfer(assoc->qos_list, delta_qos_list);
list_flush(delta_qos_list);
- } else if (list_count(delta_qos_list)) {
+ } else if(list_count(delta_qos_list)) {
ListIterator curr_qos_itr =
list_iterator_create(assoc->qos_list);
ListIterator new_qos_itr =
@@ -2058,10 +2058,10 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
char *new_qos = NULL, *curr_qos = NULL;
while((new_qos = list_next(new_qos_itr))) {
- if (new_qos[0] == '-') {
+ if(new_qos[0] == '-') {
while((curr_qos =
list_next(curr_qos_itr))) {
- if (!strcmp(curr_qos,
+ if(!strcmp(curr_qos,
new_qos+1)) {
list_delete_item(
curr_qos_itr);
@@ -2069,15 +2069,15 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
}
}
list_iterator_reset(curr_qos_itr);
- } else if (new_qos[0] == '+') {
+ } else if(new_qos[0] == '+') {
while((curr_qos =
list_next(curr_qos_itr))) {
- if (!strcmp(curr_qos,
+ if(!strcmp(curr_qos,
new_qos+1)) {
break;
}
}
- if (!curr_qos) {
+ if(!curr_qos) {
list_append(assoc->qos_list,
xstrdup(new_qos+1));
}
@@ -2102,7 +2102,7 @@ static int _cluster_get_assocs(mysql_conn_t *mysql_conn,
xfree(parent_delta_qos);
xfree(parent_qos);
- if (with_usage && assoc_list && list_count(assoc_list))
+ if(with_usage && assoc_list && list_count(assoc_list))
get_usage_for_list(mysql_conn, DBD_GET_ASSOC_USAGE,
assoc_list, cluster_name,
assoc_cond->usage_start,
@@ -2124,7 +2124,7 @@ extern int as_mysql_get_modified_lfts(mysql_conn_t *mysql_conn,
debug3("%d(%d) query\n%s",
mysql_conn->conn, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
error("couldn't query the database for modified lfts");
@@ -2139,7 +2139,7 @@ extern int as_mysql_get_modified_lfts(mysql_conn_t *mysql_conn,
assoc->id = atoi(row[0]);
assoc->lft = atoi(row[1]);
assoc->cluster = xstrdup(cluster_name);
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_MODIFY_ASSOC,
assoc) != SLURM_SUCCESS)
slurmdb_destroy_association_rec(assoc);
@@ -2172,12 +2172,12 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
char *last_parent = NULL, *last_cluster = NULL;
List local_cluster_list = NULL;
- if (!association_list) {
+ if(!association_list) {
error("No association list given");
return SLURM_ERROR;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
local_cluster_list = list_create(NULL);
@@ -2187,7 +2187,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
itr = list_iterator_create(association_list);
while((object = list_next(itr))) {
- if (!object->cluster || !object->cluster[0]
+ if(!object->cluster || !object->cluster[0]
|| !object->acct || !object->acct[0]) {
error("We need a association cluster and "
"acct to add one.");
@@ -2197,9 +2197,9 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
list_append(local_cluster_list, object->cluster);
- if (object->parent_acct) {
+ if(object->parent_acct) {
parent = object->parent_acct;
- } else if (object->user) {
+ } else if(object->user) {
parent = object->acct;
} else {
parent = "root";
@@ -2212,7 +2212,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
xstrfmtcat(extra, ", mod_time=%d, acct='%s'",
now, object->acct);
- if (!object->user) {
+ if(!object->user) {
xstrcat(cols, ", parent_acct");
xstrfmtcat(vals, ", '%s'", parent);
xstrfmtcat(extra, ", parent_acct='%s', user=''",
@@ -2228,7 +2228,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
/* We need to give a partition whether it be
* '' or the actual partition name given
*/
- if (!part)
+ if(!part)
part = "";
xstrcat(cols, ", partition");
xstrfmtcat(vals, ", '%s'", part);
@@ -2250,7 +2250,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(tmp_char);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
xfree(cols);
@@ -2264,7 +2264,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(query);
assoc_id = 0;
- if (!(row = mysql_fetch_row(result))) {
+ if(!(row = mysql_fetch_row(result))) {
/* This code speeds up the add process quite a bit
* here we are only doing an update when we are done
* adding to a specific group (cluster/account) other
@@ -2275,7 +2275,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
* loop to catch everything on the last spin of the
* while.
*/
- if (!old_parent || !old_cluster
+ if(!old_parent || !old_cluster
|| strcasecmp(parent, old_parent)
|| strcasecmp(object->cluster, old_cluster)) {
char *sel_query = xstrdup_printf(
@@ -2286,7 +2286,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
parent);
MYSQL_RES *sel_result = NULL;
- if (incr) {
+ if(incr) {
char *up_query = xstrdup_printf(
"UPDATE \"%s_%s\" SET "
"rgt = rgt+%d "
@@ -2310,7 +2310,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_conn->db_conn,
up_query);
xfree(up_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't do update");
xfree(cols);
xfree(vals);
@@ -2323,7 +2323,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
debug3("%d(%s:%d) query\n%s", mysql_conn->conn,
THIS_FILE, __LINE__, sel_query);
- if (!(sel_result = mysql_db_query_ret(
+ if(!(sel_result = mysql_db_query_ret(
mysql_conn->db_conn,
sel_query, 0))) {
xfree(cols);
@@ -2335,7 +2335,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
break;
}
- if (!(row = mysql_fetch_row(sel_result))) {
+ if(!(row = mysql_fetch_row(sel_result))) {
error("Couldn't get left from query\n",
sel_query);
mysql_free_result(sel_result);
@@ -2384,7 +2384,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
/* "values (%s, @myLeft+1, @myLeft+2);", */
/* assoc_table, cols, */
/* vals); */
- } else if (!atoi(row[AASSOC_DELETED])) {
+ } else if(!atoi(row[AASSOC_DELETED])) {
/* We don't need to do anything here */
debug("This account was added already");
xfree(cols);
@@ -2403,12 +2403,12 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
* check for the parent and move if needed.
*/
assoc_id = atoi(row[AASSOC_ID]);
- if (object->parent_acct
+ if(object->parent_acct
&& strcasecmp(object->parent_acct,
row[AASSOC_PACCT])) {
/* We need to move the parent! */
- if (_move_parent(mysql_conn, uid,
+ if(_move_parent(mysql_conn, uid,
&lft, &rgt,
object->cluster,
row[AASSOC_ID],
@@ -2438,7 +2438,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add assoc");
xfree(extra);
break;
@@ -2446,7 +2446,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
/* see if this was an insert or update. On an update
* the assoc_id will already be set
*/
- if (!assoc_id) {
+ if(!assoc_id) {
affect_rows = last_affected_rows(mysql_conn->db_conn);
assoc_id = mysql_insert_id(mysql_conn->db_conn);
//info("last id was %d", assoc_id);
@@ -2457,12 +2457,12 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
/* get the parent id only if we haven't moved the
* parent since we get the total list if that has
* happened */
- if (!moved_parent &&
+ if(!moved_parent &&
(!last_parent || !last_cluster
|| strcmp(parent, last_parent)
|| strcmp(object->cluster, last_cluster))) {
uint32_t tmp32 = 0;
- if ((tmp32 = _get_parent_id(mysql_conn,
+ if((tmp32 = _get_parent_id(mysql_conn,
parent,
object->cluster))) {
my_par_id = tmp32;
@@ -2473,13 +2473,13 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
}
object->parent_id = my_par_id;
- if (!moved_parent) {
+ if(!moved_parent) {
_set_assoc_limits_for_add(mysql_conn, object);
- if (!object->lft)
+ if(!object->lft)
_set_assoc_lft_rgt(mysql_conn, object);
}
- if (addto_update_list(mysql_conn->update_list, SLURMDB_ADD_ASSOC,
+ if(addto_update_list(mysql_conn->update_list, SLURMDB_ADD_ASSOC,
object) == SLURM_SUCCESS) {
list_remove(itr);
}
@@ -2487,7 +2487,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
/* we always have a ', ' as the first 2 chars */
tmp_extra = slurm_add_slash_to_quotes(extra+2);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %d, 'id_assoc=%d', "
"'%s', '%s', '%s')",
@@ -2508,10 +2508,10 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xfree(user_name);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
- if (incr) {
+ if(incr) {
char *up_query = xstrdup_printf(
"UPDATE \"%s_%s\" SET rgt = rgt+%d "
"WHERE rgt > %d && deleted < 2;"
@@ -2529,26 +2529,26 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_conn->conn, THIS_FILE, __LINE__, up_query);
rc = mysql_db_query(mysql_conn->db_conn, up_query);
xfree(up_query);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
error("Couldn't do update 2");
}
- if (!moved_parent) {
+ if(!moved_parent) {
slurmdb_update_object_t *update_object = NULL;
itr = list_iterator_create(
mysql_conn->update_list);;
while((update_object = list_next(itr))) {
- if (!update_object->objects
+ if(!update_object->objects
|| !list_count(update_object->objects))
continue;
- if (update_object->type == SLURMDB_ADD_ASSOC)
+ if(update_object->type == SLURMDB_ADD_ASSOC)
break;
}
list_iterator_destroy(itr);
- if (update_object && update_object->objects
+ if(update_object && update_object->objects
&& list_count(update_object->objects)) {
char *cluster_name;
ListIterator itr2 =
@@ -2559,7 +2559,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
while((cluster_name = list_next(itr))) {
uint32_t smallest_lft = 0xFFFFFFFF;
while((object = list_next(itr2))) {
- if (object->lft < smallest_lft
+ if(object->lft < smallest_lft
&& !strcmp(object->cluster,
cluster_name))
smallest_lft = object->lft;
@@ -2567,7 +2567,7 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_reset(itr2);
/* now get the lowest lft from the
added files by cluster */
- if (smallest_lft != 0xFFFFFFFF)
+ if(smallest_lft != 0xFFFFFFFF)
rc = as_mysql_get_modified_lfts(
mysql_conn, cluster_name,
smallest_lft);
@@ -2579,8 +2579,8 @@ extern int as_mysql_add_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
}
end_it:
- if (rc != SLURM_ERROR) {
- if (txn_query) {
+ if(rc != SLURM_ERROR) {
+ if(txn_query) {
xstrcat(txn_query, ";");
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE,
@@ -2588,12 +2588,12 @@ end_it:
rc = mysql_db_query(mysql_conn->db_conn,
txn_query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
rc = SLURM_SUCCESS;
}
}
- if (moved_parent) {
+ if(moved_parent) {
List assoc_list = NULL;
ListIterator itr = NULL;
slurmdb_association_rec_t *assoc = NULL;
@@ -2611,7 +2611,7 @@ end_it:
memset(&assoc_cond, 0,
sizeof(slurmdb_association_cond_t));
assoc_cond.cluster_list = local_cluster_list;
- if (!(assoc_list =
+ if(!(assoc_list =
as_mysql_get_assocs(mysql_conn, uid, NULL))) {
list_destroy(local_cluster_list);
return rc;
@@ -2626,7 +2626,7 @@ end_it:
*/
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_MODIFY_ASSOC,
assoc) == SLURM_SUCCESS)
list_remove(itr);
@@ -2659,20 +2659,20 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
char *prefix = "t1";
List use_cluster_list = as_mysql_cluster_list;
- if (!assoc_cond || !assoc) {
+ if(!assoc_cond || !assoc) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = uid;
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR))) {
- if (!is_user_any_coord(mysql_conn, &user)) {
+ if(!is_user_any_coord(mysql_conn, &user)) {
error("Only admins/coordinators can "
"modify associations");
errno = ESLURM_ACCESS_DENIED;
@@ -2680,7 +2680,7 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
}
}
- if ((assoc_cond->qos_list && list_count(assoc_cond->qos_list))
+ if((assoc_cond->qos_list && list_count(assoc_cond->qos_list))
|| assoc_cond->with_sub_accts)
prefix = "t2";
@@ -2702,7 +2702,7 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(tmp_char1);
xfree(tmp_char2);
- if (!extra || (!vals && !assoc->parent_acct
+ if(!extra || (!vals && !assoc->parent_acct
&& (!assoc->qos_list || !list_count(assoc->qos_list)))) {
xfree(vals);
errno = SLURM_NO_CHANGE_IN_DATA;
@@ -2716,7 +2716,7 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
ret_list = list_create(slurm_destroy_char);
- if (assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
+ if(assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
use_cluster_list = assoc_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -2734,10 +2734,10 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(qos_extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (mysql_errno(mysql_conn->db_conn)
+ if(mysql_errno(mysql_conn->db_conn)
!= ER_NO_SUCH_TABLE) {
list_destroy(ret_list);
ret_list = NULL;
@@ -2750,23 +2750,23 @@ extern List as_mysql_modify_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
is_admin, ret_list);
mysql_free_result(result);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
list_destroy(ret_list);
ret_list = NULL;
break;
}
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
xfree(vals);
xfree(object);
xfree(extra);
- if (!ret_list) {
+ if(!ret_list) {
reset_mysql_conn(mysql_conn);
return NULL;
- } else if (!list_count(ret_list)) {
+ } else if(!list_count(ret_list)) {
reset_mysql_conn(mysql_conn);
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything");
@@ -2792,20 +2792,20 @@ extern List as_mysql_remove_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
List use_cluster_list = as_mysql_cluster_list;
bool jobs_running = 0;
- if (!assoc_cond) {
+ if(!assoc_cond) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = uid;
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR))) {
- if (!is_user_any_coord(mysql_conn, &user)) {
+ if(!is_user_any_coord(mysql_conn, &user)) {
error("Only admins/coordinators can "
"remove associations");
errno = ESLURM_ACCESS_DENIED;
@@ -2813,7 +2813,7 @@ extern List as_mysql_remove_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
}
}
- if ((assoc_cond->qos_list && list_count(assoc_cond->qos_list))
+ if((assoc_cond->qos_list && list_count(assoc_cond->qos_list))
|| assoc_cond->with_sub_accts)
prefix = "t2";
@@ -2825,7 +2825,7 @@ extern List as_mysql_remove_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
ret_list = list_create(slurm_destroy_char);
- if (assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
+ if(assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
use_cluster_list = assoc_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -2843,10 +2843,10 @@ extern List as_mysql_remove_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(qos_extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (mysql_errno(mysql_conn->db_conn)
+ if(mysql_errno(mysql_conn->db_conn)
!= ER_NO_SUCH_TABLE) {
list_destroy(ret_list);
ret_list = NULL;
@@ -2855,13 +2855,13 @@ extern List as_mysql_remove_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
}
xfree(query);
- if (!mysql_num_rows(result)) {
+ if(!mysql_num_rows(result)) {
mysql_free_result(result);
continue;
}
while((row = mysql_fetch_row(result))) {
- if (name_char)
+ if(name_char)
xstrfmtcat(name_char,
" || lft between %s and %s",
row[0], row[1]);
@@ -2878,7 +2878,7 @@ extern List as_mysql_remove_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
cluster_name, assoc_table, name_char);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
xfree(name_char);
@@ -2895,28 +2895,28 @@ extern List as_mysql_remove_assocs(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(name_char);
mysql_free_result(result);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
list_destroy(ret_list);
ret_list = NULL;
break;
}
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
xfree(object);
xfree(extra);
- if (!ret_list) {
+ if(!ret_list) {
reset_mysql_conn(mysql_conn);
return NULL;
- } else if (!list_count(ret_list)) {
+ } else if(!list_count(ret_list)) {
reset_mysql_conn(mysql_conn);
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything");
return ret_list;
}
- if (jobs_running)
+ if(jobs_running)
errno = ESLURM_JOBS_RUNNING_ON_ASSOC;
else
errno = SLURM_SUCCESS;
@@ -2939,12 +2939,12 @@ extern List as_mysql_get_assocs(mysql_conn_t *mysql_conn, uid_t uid,
List use_cluster_list = as_mysql_cluster_list;
char *cluster_name = NULL;
- if (!assoc_cond) {
+ if(!assoc_cond) {
xstrcat(extra, " where deleted=0");
goto empty;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
@@ -2952,12 +2952,12 @@ extern List as_mysql_get_assocs(mysql_conn_t *mysql_conn, uid_t uid,
private_data = slurm_get_private_data();
if (private_data & PRIVATE_DATA_USERS) {
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR)))
is_user_any_coord(mysql_conn, &user);
}
- if ((assoc_cond->qos_list && list_count(assoc_cond->qos_list))
+ if((assoc_cond->qos_list && list_count(assoc_cond->qos_list))
|| assoc_cond->with_sub_accts)
prefix = "t2";
@@ -2971,7 +2971,7 @@ empty:
}
assoc_list = list_create(slurmdb_destroy_association_rec);
- if (assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
+ if(assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
use_cluster_list = assoc_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -2979,7 +2979,7 @@ empty:
itr = list_iterator_create(use_cluster_list);
while((cluster_name = list_next(itr))) {
int rc;
- if ((rc = _cluster_get_assocs(mysql_conn, &user, assoc_cond,
+ if((rc = _cluster_get_assocs(mysql_conn, &user, assoc_cond,
cluster_name, tmp, extra,
is_admin, assoc_list))
!= SLURM_SUCCESS) {
@@ -2989,7 +2989,7 @@ empty:
}
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
xfree(tmp);
xfree(extra);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_cluster.c b/src/plugins/accounting_storage/mysql/as_mysql_cluster.c
index bdc1b0fb24ed9d6a0e677157ab1a9289464659d5..c236c4a45f70317859cd6676a629bdecdf41833a 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_cluster.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_cluster.c
@@ -50,21 +50,21 @@ static int _setup_cluster_cond_limits(slurmdb_cluster_cond_t *cluster_cond,
ListIterator itr = NULL;
char *object = NULL;
- if (!cluster_cond)
+ if(!cluster_cond)
return 0;
- if (cluster_cond->with_deleted)
+ if(cluster_cond->with_deleted)
xstrcat(*extra, " where (deleted=0 || deleted=1)");
else
xstrcat(*extra, " where deleted=0");
- if (cluster_cond->cluster_list
+ if(cluster_cond->cluster_list
&& list_count(cluster_cond->cluster_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(cluster_cond->cluster_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "name='%s'", object);
set = 1;
@@ -73,13 +73,13 @@ static int _setup_cluster_cond_limits(slurmdb_cluster_cond_t *cluster_cond,
xstrcat(*extra, ")");
}
- if (cluster_cond->plugin_id_select_list
+ if(cluster_cond->plugin_id_select_list
&& list_count(cluster_cond->plugin_id_select_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(cluster_cond->plugin_id_select_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "plugin_id_select='%s'", object);
set = 1;
@@ -88,13 +88,13 @@ static int _setup_cluster_cond_limits(slurmdb_cluster_cond_t *cluster_cond,
xstrcat(*extra, ")");
}
- if (cluster_cond->rpc_version_list
+ if(cluster_cond->rpc_version_list
&& list_count(cluster_cond->rpc_version_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(cluster_cond->rpc_version_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "rpc_version='%s'", object);
set = 1;
@@ -103,12 +103,12 @@ static int _setup_cluster_cond_limits(slurmdb_cluster_cond_t *cluster_cond,
xstrcat(*extra, ")");
}
- if (cluster_cond->classification) {
+ if(cluster_cond->classification) {
xstrfmtcat(*extra, " && (classification & %u)",
cluster_cond->classification);
}
- if (cluster_cond->flags != NO_VAL) {
+ if(cluster_cond->flags != NO_VAL) {
xstrfmtcat(*extra, " && (flags & %u)",
cluster_cond->flags);
}
@@ -131,7 +131,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
List assoc_list = NULL;
slurmdb_association_rec_t *assoc = NULL;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
assoc_list = list_create(slurmdb_destroy_association_rec);
@@ -139,7 +139,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(cluster_list);
while((object = list_next(itr))) {
- if (!object->name || !object->name[0]) {
+ if(!object->name || !object->name[0]) {
error("We need a cluster name to add.");
rc = SLURM_ERROR;
continue;
@@ -149,7 +149,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
xstrfmtcat(vals, "%d, %d, 'root'",
now, now, object->name);
xstrfmtcat(extra, ", mod_time=%d", now);
- if (object->root_assoc)
+ if(object->root_assoc)
setup_association_limits(object->root_assoc, &cols,
&vals, &extra,
QOS_LEVEL_SET, 1);
@@ -167,7 +167,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add cluster %s", object->name);
xfree(extra);
xfree(cols);
@@ -178,7 +178,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
affect_rows = last_affected_rows(mysql_conn->db_conn);
- if (!affect_rows) {
+ if(!affect_rows) {
debug2("nothing changed %d", affect_rows);
xfree(extra);
xfree(cols);
@@ -186,7 +186,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
continue;
}
- if ((rc = create_cluster_tables(mysql_conn->db_conn,
+ if((rc = create_cluster_tables(mysql_conn->db_conn,
object->name))
!= SLURM_SUCCESS) {
xfree(extra);
@@ -212,7 +212,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add cluster root assoc");
xfree(extra);
added=0;
@@ -235,7 +235,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
} else {
added++;
@@ -259,7 +259,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
assoc->user = xstrdup("root");
assoc->acct = xstrdup("root");
- if (as_mysql_add_assocs(mysql_conn, uid, assoc_list)
+ if(as_mysql_add_assocs(mysql_conn, uid, assoc_list)
== SLURM_ERROR) {
error("Problem adding root user association");
rc = SLURM_ERROR;
@@ -270,7 +270,7 @@ extern int as_mysql_add_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
list_destroy(assoc_list);
- if (!added) {
+ if(!added) {
reset_mysql_conn(mysql_conn);
}
@@ -298,70 +298,70 @@ extern List as_mysql_modify_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
* the controller when it loads
*/
- if (!cluster_cond || !cluster) {
+ if(!cluster_cond || !cluster) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
/* force to only do non-deleted clusters */
cluster_cond->with_deleted = 0;
_setup_cluster_cond_limits(cluster_cond, &extra);
- if (cluster_cond->cluster_list
+ if(cluster_cond->cluster_list
&& list_count(cluster_cond->cluster_list)) {
- if (!mysql_conn->cluster_name)
+ if(!mysql_conn->cluster_name)
mysql_conn->cluster_name =
list_peek(cluster_cond->cluster_list);
}
set = 0;
- if (cluster->control_host) {
+ if(cluster->control_host) {
xstrfmtcat(vals, ", control_host='%s'", cluster->control_host);
set++;
clust_reg = true;
}
- if (cluster->control_port) {
+ if(cluster->control_port) {
xstrfmtcat(vals, ", control_port=%u", cluster->control_port);
set++;
clust_reg = true;
}
- if (cluster->rpc_version) {
+ if(cluster->rpc_version) {
xstrfmtcat(vals, ", rpc_version=%u", cluster->rpc_version);
set++;
clust_reg = true;
}
- if (cluster->dimensions) {
+ if(cluster->dimensions) {
xstrfmtcat(vals, ", dimensions=%u", cluster->dimensions);
clust_reg = true;
}
- if (cluster->plugin_id_select) {
+ if(cluster->plugin_id_select) {
xstrfmtcat(vals, ", plugin_id_select=%u",
cluster->plugin_id_select);
clust_reg = true;
}
- if (cluster->flags != NO_VAL) {
+ if(cluster->flags != NO_VAL) {
xstrfmtcat(vals, ", flags=%u", cluster->flags);
clust_reg = true;
}
- if (cluster->classification) {
+ if(cluster->classification) {
xstrfmtcat(vals, ", classification=%u",
cluster->classification);
}
- if (!vals) {
+ if(!vals) {
xfree(extra);
errno = SLURM_NO_CHANGE_IN_DATA;
error("Nothing to change");
return NULL;
- } else if (clust_reg && (set != 3)) {
+ } else if(clust_reg && (set != 3)) {
xfree(vals);
xfree(extra);
errno = EFAULT;
@@ -376,7 +376,7 @@ extern List as_mysql_modify_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
xfree(vals);
@@ -392,7 +392,7 @@ extern List as_mysql_modify_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
object = xstrdup(row[0]);
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
rc = 1;
} else {
@@ -401,7 +401,7 @@ extern List as_mysql_modify_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
}
mysql_free_result(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(vals);
@@ -410,7 +410,7 @@ extern List as_mysql_modify_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
}
xfree(query);
- if (vals) {
+ if(vals) {
send_char = xstrdup_printf("(%s)", name_char);
user_name = uid_to_string((uid_t) uid);
rc = modify_common(mysql_conn, DBD_MODIFY_CLUSTERS, now,
@@ -450,26 +450,26 @@ extern List as_mysql_remove_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
MYSQL_ROW row;
bool jobs_running = 0;
- if (!cluster_cond) {
+ if(!cluster_cond) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
/* force to only do non-deleted clusters */
cluster_cond->with_deleted = 0;
_setup_cluster_cond_limits(cluster_cond, &extra);
- if (!extra) {
+ if(!extra) {
error("Nothing to remove");
return NULL;
}
query = xstrdup_printf("select name from %s%s;", cluster_table, extra);
xfree(extra);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -477,7 +477,7 @@ extern List as_mysql_remove_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
rc = 0;
ret_list = list_create(slurm_destroy_char);
- if (!mysql_num_rows(result)) {
+ if(!mysql_num_rows(result)) {
mysql_free_result(result);
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
@@ -491,12 +491,12 @@ extern List as_mysql_remove_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
user_name = uid_to_string((uid_t) uid);
while((row = mysql_fetch_row(result))) {
char *object = xstrdup(row[0]);
- if (!jobs_running)
+ if(!jobs_running)
list_append(ret_list, object);
xfree(name_char);
xstrfmtcat(name_char, "name='%s'", object);
- if (jobs_running)
+ if(jobs_running)
xfree(object);
/* We should not need to delete any cluster usage just set it
* to deleted */
@@ -509,7 +509,7 @@ extern List as_mysql_remove_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
object, cluster_day_table, now,
object, cluster_hour_table, now,
object, cluster_month_table, now);
- if ((rc = remove_common(mysql_conn, DBD_REMOVE_CLUSTERS, now,
+ if((rc = remove_common(mysql_conn, DBD_REMOVE_CLUSTERS, now,
user_name, cluster_table,
name_char, assoc_char, object,
ret_list, &jobs_running))
@@ -525,12 +525,12 @@ extern List as_mysql_remove_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
list_destroy(ret_list);
return NULL;
}
- if (!jobs_running) {
+ if(!jobs_running) {
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
reset_mysql_conn(mysql_conn);
list_destroy(ret_list);
return NULL;
@@ -540,23 +540,23 @@ extern List as_mysql_remove_clusters(mysql_conn_t *mysql_conn, uint32_t uid,
memset(&wckey_cond, 0, sizeof(slurmdb_wckey_cond_t));
wckey_cond.cluster_list = ret_list;
tmp_list = as_mysql_remove_wckeys(mysql_conn, uid, &wckey_cond);
- if (tmp_list)
+ if(tmp_list)
list_destroy(tmp_list);
itr = list_iterator_create(ret_list);
while((object = list_next(itr))) {
- if ((rc = remove_cluster_tables(mysql_conn, object))
+ if((rc = remove_cluster_tables(mysql_conn, object))
!= SLURM_SUCCESS)
break;
cluster_name = xstrdup(object);
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_REMOVE_CLUSTER,
cluster_name) != SLURM_SUCCESS)
xfree(cluster_name);
}
list_iterator_destroy(itr);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
reset_mysql_conn(mysql_conn);
list_destroy(ret_list);
errno = rc;
@@ -609,11 +609,11 @@ extern List as_mysql_get_clusters(mysql_conn_t *mysql_conn, uid_t uid,
CLUSTER_REQ_COUNT
};
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
- if (!cluster_cond) {
+ if(!cluster_cond) {
xstrcat(extra, " where deleted=0");
goto empty;
}
@@ -636,7 +636,7 @@ empty:
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -647,7 +647,7 @@ empty:
memset(&assoc_cond, 0, sizeof(slurmdb_association_cond_t));
- if (cluster_cond) {
+ if(cluster_cond) {
/* I don't think we want the with_usage flag here.
* We do need the with_deleted though. */
//assoc_cond.with_usage = cluster_cond->with_usage;
@@ -667,7 +667,7 @@ empty:
list_append(assoc_cond.cluster_list, cluster->name);
/* get the usage if requested */
- if (cluster_cond && cluster_cond->with_usage) {
+ if(cluster_cond && cluster_cond->with_usage) {
as_mysql_get_usage(
mysql_conn, uid, cluster,
DBD_GET_CLUSTER_USAGE,
@@ -689,22 +689,22 @@ empty:
cluster->name, event_table);
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
continue;
}
xfree(query);
- if ((row2 = mysql_fetch_row(result2))) {
+ if((row2 = mysql_fetch_row(result2))) {
cluster->cpu_count = atoi(row2[0]);
- if (row2[1] && row2[1][0])
+ if(row2[1] && row2[1][0])
cluster->nodes = xstrdup(row2[1]);
}
mysql_free_result(result2);
}
mysql_free_result(result);
- if (!list_count(assoc_cond.cluster_list)) {
+ if(!list_count(assoc_cond.cluster_list)) {
list_destroy(assoc_cond.cluster_list);
return cluster_list;
}
@@ -720,17 +720,17 @@ empty:
list_destroy(assoc_cond.acct_list);
list_destroy(assoc_cond.user_list);
- if (!assoc_list)
+ if(!assoc_list)
return cluster_list;
itr = list_iterator_create(cluster_list);
assoc_itr = list_iterator_create(assoc_list);
while((cluster = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if (strcmp(assoc->cluster, cluster->name))
+ if(strcmp(assoc->cluster, cluster->name))
continue;
- if (cluster->root_assoc) {
+ if(cluster->root_assoc) {
debug("This cluster %s already has "
"an association.");
continue;
@@ -742,7 +742,7 @@ empty:
}
list_iterator_destroy(itr);
list_iterator_destroy(assoc_itr);
- if (list_count(assoc_list))
+ if(list_count(assoc_list))
error("I have %d left over associations",
list_count(assoc_list));
list_destroy(assoc_list);
@@ -790,19 +790,19 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
EVENT_REQ_COUNT
};
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
- if (!event_cond)
+ if(!event_cond)
goto empty;
- if (event_cond->cpus_min) {
- if (extra)
+ if(event_cond->cpus_min) {
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
- if (event_cond->cpus_max) {
+ if(event_cond->cpus_max) {
xstrfmtcat(extra, "cpu_count between %u and %u)",
event_cond->cpus_min, event_cond->cpus_max);
@@ -817,7 +817,7 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
case SLURMDB_EVENT_ALL:
break;
case SLURMDB_EVENT_CLUSTER:
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
@@ -825,7 +825,7 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
break;
case SLURMDB_EVENT_NODE:
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
@@ -837,16 +837,16 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
break;
}
- if (event_cond->node_list
+ if(event_cond->node_list
&& list_count(event_cond->node_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(event_cond->node_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "node_name='%s'", object);
set = 1;
@@ -855,11 +855,11 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (event_cond->period_start) {
- if (!event_cond->period_end)
+ if(event_cond->period_start) {
+ if(!event_cond->period_end)
event_cond->period_end = now;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
@@ -870,16 +870,16 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
event_cond->period_end, event_cond->period_start);
}
- if (event_cond->reason_list
+ if(event_cond->reason_list
&& list_count(event_cond->reason_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(event_cond->reason_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "reason like '%%%s%%'", object);
set = 1;
@@ -888,16 +888,16 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (event_cond->reason_uid_list
+ if(event_cond->reason_uid_list
&& list_count(event_cond->reason_uid_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(event_cond->reason_uid_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "reason_uid='%s'", object);
set = 1;
@@ -906,16 +906,16 @@ extern List as_mysql_get_cluster_events(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (event_cond->state_list
+ if(event_cond->state_list
&& list_count(event_cond->state_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(event_cond->state_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "state='%s'", object);
set = 1;
@@ -932,7 +932,7 @@ empty:
xstrfmtcat(tmp, ", %s", event_req_inx[i]);
}
- if (event_cond->cluster_list && list_count(event_cond->cluster_list))
+ if(event_cond->cluster_list && list_count(event_cond->cluster_list))
use_cluster_list = event_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -943,15 +943,15 @@ empty:
while((object = list_next(itr))) {
query = xstrdup_printf("select %s from \"%s_%s\"",
tmp, object, event_table);
- if (extra)
+ if(extra)
xstrfmtcat(query, " %s", extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (mysql_errno(mysql_conn->db_conn)
+ if(mysql_errno(mysql_conn->db_conn)
!= ER_NO_SUCH_TABLE) {
list_destroy(ret_list);
ret_list = NULL;
@@ -968,7 +968,7 @@ empty:
event->cluster = xstrdup(object);
- if (row[EVENT_REQ_NODE] && row[EVENT_REQ_NODE][0]) {
+ if(row[EVENT_REQ_NODE] && row[EVENT_REQ_NODE][0]) {
event->node_name = xstrdup(row[EVENT_REQ_NODE]);
event->event_type = SLURMDB_EVENT_NODE;
} else
@@ -979,11 +979,11 @@ empty:
event->period_start = atoi(row[EVENT_REQ_START]);
event->period_end = atoi(row[EVENT_REQ_END]);
- if (row[EVENT_REQ_REASON] && row[EVENT_REQ_REASON][0])
+ if(row[EVENT_REQ_REASON] && row[EVENT_REQ_REASON][0])
event->reason = xstrdup(row[EVENT_REQ_REASON]);
event->reason_uid = atoi(row[EVENT_REQ_REASON_UID]);
- if (row[EVENT_REQ_CNODES] && row[EVENT_REQ_CNODES][0])
+ if(row[EVENT_REQ_CNODES] && row[EVENT_REQ_CNODES][0])
event->cluster_nodes =
xstrdup(row[EVENT_REQ_CNODES]);
}
@@ -993,7 +993,7 @@ empty:
xfree(tmp);
xfree(extra);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
return ret_list;
@@ -1009,10 +1009,10 @@ extern int as_mysql_node_down(mysql_conn_t *mysql_conn,
char *query = NULL;
char *my_reason;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
- if (!node_ptr) {
+ if(!node_ptr) {
error("No node_ptr given!");
return SLURM_ERROR;
}
@@ -1067,7 +1067,7 @@ extern int as_mysql_node_up(mysql_conn_t *mysql_conn,
char* query;
int rc = SLURM_SUCCESS;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
query = xstrdup_printf(
@@ -1091,14 +1091,14 @@ extern int as_mysql_register_ctld(mysql_conn_t *mysql_conn,
time_t now = time(NULL);
uint32_t flags = slurmdb_setup_cluster_flags();
- if (slurmdbd_conf)
+ if(slurmdbd_conf)
fatal("clusteracct_storage_g_register_ctld "
"should never be called from the slurmdbd.");
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
- if (!mysql_conn->cluster_name)
+ if(!mysql_conn->cluster_name)
mysql_conn->cluster_name = xstrdup(cluster);
info("Registering slurmctld for cluster %s at port %u in database.",
@@ -1106,7 +1106,7 @@ extern int as_mysql_register_ctld(mysql_conn_t *mysql_conn,
gethostname(hostname, sizeof(hostname));
/* check if we are running on the backup controller */
- if (slurmctld_conf.backup_controller
+ if(slurmctld_conf.backup_controller
&& !strcmp(slurmctld_conf.backup_controller, hostname)) {
address = slurmctld_conf.backup_addr;
} else
@@ -1143,7 +1143,7 @@ extern int as_mysql_cluster_cpus(mysql_conn_t *mysql_conn,
MYSQL_RES *result = NULL;
MYSQL_ROW row;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
/* Record the processor count */
@@ -1151,10 +1151,10 @@ extern int as_mysql_cluster_cpus(mysql_conn_t *mysql_conn,
"select cpu_count, cluster_nodes from \"%s_%s\" where "
"time_end=0 and node_name='' limit 1",
mysql_conn->cluster_name, event_table);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (mysql_errno(mysql_conn->db_conn) == ER_NO_SUCH_TABLE)
+ if(mysql_errno(mysql_conn->db_conn) == ER_NO_SUCH_TABLE)
rc = ESLURM_ACCESS_DENIED;
else
rc = SLURM_ERROR;
@@ -1163,7 +1163,7 @@ extern int as_mysql_cluster_cpus(mysql_conn_t *mysql_conn,
xfree(query);
/* we only are checking the first one here */
- if (!(row = mysql_fetch_row(result))) {
+ if(!(row = mysql_fetch_row(result))) {
debug("We don't have an entry for this machine %s "
"most likely a first time running.",
mysql_conn->cluster_name);
@@ -1180,12 +1180,12 @@ extern int as_mysql_cluster_cpus(mysql_conn_t *mysql_conn,
goto add_it;
}
- if (atoi(row[0]) == cpus) {
+ if(atoi(row[0]) == cpus) {
debug3("we have the same cpu count as before for %s, "
"no need to update the database.",
mysql_conn->cluster_name);
- if (cluster_nodes) {
- if (!row[1][0]) {
+ if(cluster_nodes) {
+ if(!row[1][0]) {
debug("Adding cluster nodes '%s' to "
"last instance of cluster '%s'.",
cluster_nodes, mysql_conn->cluster_name);
@@ -1197,7 +1197,7 @@ extern int as_mysql_cluster_cpus(mysql_conn_t *mysql_conn,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
goto end_it;
- } else if (!strcmp(cluster_nodes, row[1])) {
+ } else if(!strcmp(cluster_nodes, row[1])) {
debug3("we have the same nodes in the cluster "
"as before no need to "
"update the database.");
@@ -1218,7 +1218,7 @@ extern int as_mysql_cluster_cpus(mysql_conn_t *mysql_conn,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
first = 1;
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
add_it:
query = xstrdup_printf(
@@ -1231,7 +1231,7 @@ add_it:
xfree(query);
end_it:
mysql_free_result(result);
- if (first && rc == SLURM_SUCCESS)
+ if(first && rc == SLURM_SUCCESS)
rc = ACCOUNTING_FIRST_REG;
return rc;
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_convert.c b/src/plugins/accounting_storage/mysql/as_mysql_convert.c
index c93ea0deca5a07d505dc0fab42f8e976fdf3e982..61ebf459e25678bcaa56a99394b4796deb9b02bc 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_convert.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_convert.c
@@ -62,10 +62,10 @@ static void *_convert_cluster_tables(void *arg)
mysql_conn.rollback = 1;
/* each thread needs it's own connection */
rc = check_connection(&mysql_conn);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
db_conn = mysql_conn.db_conn;
- if (assocs) {
+ if(assocs) {
int diff;
info("Converting old association tables for %s, "
"this may take some time, please do not restart.",
@@ -96,7 +96,7 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update assoc table correctly");
goto end_it;
}
@@ -104,14 +104,14 @@ static void *_convert_cluster_tables(void *arg)
query = xstrdup_printf("select lft from \"%s_%s\" "
"where acct='root' and user=''",
cluster_name, assoc_table);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
goto end_it;
}
xfree(query);
- if (!(row = mysql_fetch_row(result))) {
+ if(!(row = mysql_fetch_row(result))) {
mysql_free_result(result);
error("Couldn't find root association "
"for cluster %s", cluster_name);
@@ -120,7 +120,7 @@ static void *_convert_cluster_tables(void *arg)
}
diff = atoi(row[0]) - 1;
mysql_free_result(result);
- if (diff < 0) {
+ if(diff < 0) {
error("lft was %s that can't happen!", diff+1);
rc = SLURM_ERROR;
goto end_it;
@@ -137,7 +137,7 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update assoc table correctly");
goto end_it;
}
@@ -194,14 +194,14 @@ static void *_convert_cluster_tables(void *arg)
THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update assoc usage "
"table correctly");
goto end_it;
}
}
- if (events) {
+ if(events) {
info("Converting old event table for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -220,13 +220,13 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update event table correctly");
goto end_it;
}
}
- if (jobs) {
+ if(jobs) {
info("Converting old job table for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -256,13 +256,13 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update job table correctly");
goto end_it;
}
}
- if (last_ran) {
+ if(last_ran) {
info("Converting old last ran table for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -279,13 +279,13 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update last ran table correctly");
goto end_it;
}
}
- if (resvs) {
+ if(resvs) {
info("Converting old reservation table for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -306,14 +306,14 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update reserve "
"table correctly");
goto end_it;
}
}
- if (steps) {
+ if(steps) {
info("Converting old step table for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -350,13 +350,13 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update step table correctly");
goto end_it;
}
}
- if (suspends) {
+ if(suspends) {
info("Converting old suspend table for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -373,14 +373,14 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update suspend "
"table correctly");
goto end_it;
}
}
- if (usage) {
+ if(usage) {
info("Converting old usage tables for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -438,14 +438,14 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update cluster usage "
"tables correctly");
goto end_it;
}
}
- if (wckeys) {
+ if(wckeys) {
info("Converting old wckey tables for %s, "
"this may take some time, please do not restart.",
cluster_name);
@@ -463,7 +463,7 @@ static void *_convert_cluster_tables(void *arg)
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update wckey table correctly");
goto end_it;
}
@@ -525,7 +525,7 @@ static void *_convert_cluster_tables(void *arg)
THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update wckey usage "
"table correctly");
goto end_it;
@@ -534,8 +534,8 @@ static void *_convert_cluster_tables(void *arg)
}
end_it:
- if (rc == SLURM_SUCCESS) {
- if (mysql_db_commit(db_conn)) {
+ if(rc == SLURM_SUCCESS) {
+ if(mysql_db_commit(db_conn)) {
error("Commit failed, didn't update cluster %s",
cluster_name);
rc = SLURM_ERROR;
@@ -543,7 +543,7 @@ end_it:
verbose("Cluster %s updated", cluster_name);
} else {
verbose("Cluster %s update failed", cluster_name);
- if (db_conn && mysql_db_rollback(db_conn))
+ if(db_conn && mysql_db_rollback(db_conn))
error("rollback failed");
}
@@ -768,34 +768,34 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup_printf("show tables like '%s';", assoc_table);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, assoc_table,
+ if(mysql_db_create_table(db_conn, assoc_table,
assoc_table_fields_2_1,
", primary key (id), "
" unique index (user(20), acct(20), "
"cluster(20), partition(20)))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "assoc_day_usage_table",
+ if(mysql_db_create_table(db_conn, "assoc_day_usage_table",
assoc_usage_table_fields_2_1,
", primary key (id, period_start))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "assoc_hour_usage_table",
+ if(mysql_db_create_table(db_conn, "assoc_hour_usage_table",
assoc_usage_table_fields_2_1,
", primary key (id, period_start))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "assoc_month_usage_table",
+ if(mysql_db_create_table(db_conn, "assoc_month_usage_table",
assoc_usage_table_fields_2_1,
", primary key (id, period_start))")
== SLURM_ERROR)
@@ -809,15 +809,15 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
/* now do events */
query = xstrdup_printf("show tables like 'cluster_event_table';");
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, "cluster_event_table",
+ if(mysql_db_create_table(db_conn, "cluster_event_table",
event_table_fields_2_1,
", primary key (node_name(20), "
"cluster(20), period_start))")
@@ -832,15 +832,15 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup_printf("show tables like '%s';", job_table);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, job_table,
+ if(mysql_db_create_table(db_conn, job_table,
job_table_fields_2_1,
", primary key (id), "
"unique index (jobid, "
@@ -856,15 +856,15 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup_printf("show tables like '%s';", last_ran_table);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, last_ran_table,
+ if(mysql_db_create_table(db_conn, last_ran_table,
last_ran_table_fields_2_1,
")") == SLURM_ERROR)
goto end_it;
@@ -877,15 +877,15 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup_printf("show tables like '%s';", resv_table);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, resv_table,
+ if(mysql_db_create_table(db_conn, resv_table,
resv_table_fields_2_1,
", primary key (id, start, "
"cluster(20)))")
@@ -900,15 +900,15 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup_printf("show tables like '%s';", step_table);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, step_table,
+ if(mysql_db_create_table(db_conn, step_table,
step_table_fields_2_1,
", primary key (id, stepid))")
== SLURM_ERROR)
@@ -922,15 +922,15 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup_printf("show tables like '%s';", suspend_table);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, suspend_table,
+ if(mysql_db_create_table(db_conn, suspend_table,
suspend_table_fields_2_1,
")")
== SLURM_ERROR)
@@ -944,29 +944,29 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup("show tables like 'cluster_hour_usage_table';");
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, "cluster_day_usage_table",
+ if(mysql_db_create_table(db_conn, "cluster_day_usage_table",
cluster_usage_table_fields_2_1,
", primary key (cluster(20), "
"period_start))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "cluster_hour_usage_table",
+ if(mysql_db_create_table(db_conn, "cluster_hour_usage_table",
cluster_usage_table_fields_2_1,
", primary key (cluster(20), "
"period_start))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "cluster_month_usage_table",
+ if(mysql_db_create_table(db_conn, "cluster_month_usage_table",
cluster_usage_table_fields_2_1,
", primary key (cluster(20), "
"period_start))")
@@ -982,34 +982,34 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
query = xstrdup_printf("show tables like '%s';", wckey_table);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
/* make it up to date */
- if (mysql_db_create_table(db_conn, wckey_table,
+ if(mysql_db_create_table(db_conn, wckey_table,
wckey_table_fields_2_1,
", primary key (id), "
" unique index (name(20), user(20), "
"cluster(20)))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "wckey_day_usage_table",
+ if(mysql_db_create_table(db_conn, "wckey_day_usage_table",
wckey_usage_table_fields_2_1,
", primary key (id, period_start))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "wckey_hour_usage_table",
+ if(mysql_db_create_table(db_conn, "wckey_hour_usage_table",
wckey_usage_table_fields_2_1,
", primary key (id, period_start))")
== SLURM_ERROR)
goto end_it;
- if (mysql_db_create_table(db_conn, "wckey_month_usage_table",
+ if(mysql_db_create_table(db_conn, "wckey_month_usage_table",
wckey_usage_table_fields_2_1,
", primary key (id, period_start))")
== SLURM_ERROR)
@@ -1021,7 +1021,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
rc = SLURM_SUCCESS;
- if (!assocs && !events && !jobs && !last_ran && !resvs
+ if(!assocs && !events && !jobs && !last_ran && !resvs
&& !steps && !suspends && !usage && !wckeys)
goto end_it;
@@ -1049,7 +1049,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
list_iterator_reset(itr);
while((cluster_name = list_next(itr))) {
char *txn_ids = NULL;
- if (assocs) {
+ if(assocs) {
/* Since there isn't a cluster name in the
assoc usage tables we need to get all the ids from
the assoc_table and query against that. Since
@@ -1063,16 +1063,16 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
"where cluster='%s'",
assoc_table, cluster_name);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
goto end_it;
}
xfree(query);
- if (mysql_num_rows(result)) {
+ if(mysql_num_rows(result)) {
while((row = mysql_fetch_row(result))) {
- if (txn_ids)
+ if(txn_ids)
xstrcat(txn_ids, " || ");
else
xstrcat(txn_ids, "(");
@@ -1087,7 +1087,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
mysql_free_result(result);
result = NULL;
- if (txn_ids) {
+ if(txn_ids) {
query = xstrdup_printf(
"update %s set cluster='%s' where "
"(action= %d || action = %d "
@@ -1100,7 +1100,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update assoc "
"txn's correctly");
goto end_it;
@@ -1108,7 +1108,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
}
}
- if (wckeys) {
+ if(wckeys) {
/* Since there isn't a cluster name in the
wckey usage tables we need to get all the ids from
the wckey_table query against that. Since
@@ -1122,16 +1122,16 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
"cluster='%s'",
wckey_table, cluster_name);
debug4("(%s:%d) query\n%s", THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
goto end_it;
}
xfree(query);
- if (mysql_num_rows(result)) {
+ if(mysql_num_rows(result)) {
while((row = mysql_fetch_row(result))) {
- if (txn_ids)
+ if(txn_ids)
xstrcat(txn_ids, " || ");
else
xstrcat(txn_ids, "(");
@@ -1145,7 +1145,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
}
mysql_free_result(result);
result = NULL;
- if (txn_ids) {
+ if(txn_ids) {
query = xstrdup_printf(
"update %s set cluster='%s' where "
"(action= %d || action = %d "
@@ -1158,7 +1158,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
THIS_FILE, __LINE__, query);
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't update wckey "
"txn's correctly");
goto end_it;
@@ -1170,7 +1170,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
/* Now make some sort of destinction as to what an id is. */
- if (assocs) {
+ if(assocs) {
xstrfmtcat(query, "update %s set name=replace(name, 'id=', "
"'id_assoc=') where (action = %d || action = %d);",
txn_table, DBD_MODIFY_ASSOCS, DBD_REMOVE_ASSOCS);
@@ -1180,7 +1180,7 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
"where action = %d;",
txn_table, DBD_ADD_ASSOCS);
}
- if (wckeys) {
+ if(wckeys) {
xstrfmtcat(query, "update %s set name=replace(name, 'id=', "
"'id_wckey=') where (action = %d || action = %d);",
txn_table, DBD_MODIFY_WCKEYS, DBD_REMOVE_WCKEYS);
@@ -1191,10 +1191,10 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
txn_table, DBD_ADD_WCKEYS);
}
- if (query) {
+ if(query) {
rc = mysql_db_query(db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't replace id='s in txn table");
goto end_it;
}
@@ -1209,12 +1209,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
slurm_mutex_destroy(&converted_lock);
pthread_cond_destroy(&converted_cond);
- if (assocs) {
- if (!drop_query)
+ if(assocs) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1235,12 +1235,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
"assoc_month_usage_table");
}
- if (events) {
- if (!drop_query)
+ if(events) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1249,12 +1249,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
"cluster_event_table to cluster_event_table_old");
}
- if (jobs) {
- if (!drop_query)
+ if(jobs) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1262,12 +1262,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
xstrfmtcat(query, "%s to %s_old", job_table, job_table);
}
- if (last_ran) {
- if (!drop_query)
+ if(last_ran) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1276,12 +1276,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
last_ran_table, last_ran_table);
}
- if (resvs) {
- if (!drop_query)
+ if(resvs) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1289,12 +1289,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
xstrfmtcat(query, "%s to %s_old", resv_table, resv_table);
}
- if (steps) {
- if (!drop_query)
+ if(steps) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1302,12 +1302,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
xstrfmtcat(query, "%s to %s_old", step_table, step_table);
}
- if (suspends) {
- if (!drop_query)
+ if(suspends) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1315,12 +1315,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
xstrfmtcat(query, "%s to %s_old", suspend_table, suspend_table);
}
- if (usage) {
- if (!drop_query)
+ if(usage) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1338,12 +1338,12 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
"cluster_month_usage_table");
}
- if (wckeys) {
- if (!drop_query)
+ if(wckeys) {
+ if(!drop_query)
drop_query = xstrdup("drop table if exists ");
else
xstrcat(drop_query, ", ");
- if (!query)
+ if(!query)
query = xstrdup("rename table ");
else
xstrcat(query, ", ");
@@ -1364,20 +1364,20 @@ extern int as_mysql_convert_tables(MYSQL *db_conn)
"wckey_month_usage_table");
}
- if (query) {
+ if(query) {
xstrfmtcat(drop_query, ";%s;", query);
xfree(query);
info("Renaming old tables with _old behind them.");
rc = mysql_db_query(db_conn, drop_query);
xfree(drop_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't rename tables");
goto end_it;
}
}
end_it:
- if (result)
+ if(result)
mysql_free_result(result);
return rc;
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_job.c b/src/plugins/accounting_storage/mysql/as_mysql_job.c
index 6f7c59130ab2c106e3de2f60fc3bc32d8bfe2d50..44c17221415f0f31edf21f323057a46d1b1a7128 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_job.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_job.c
@@ -58,14 +58,14 @@ static int _get_db_index(mysql_conn_t *mysql_conn,
mysql_conn->cluster_name, job_table,
(int)submit, jobid, associd);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return 0;
}
xfree(query);
row = mysql_fetch_row(result);
- if (!row) {
+ if(!row) {
mysql_free_result(result);
debug4("We can't get a db_index for this combo, "
"time_submit=%d and id_job=%u and id_assoc=%u. "
@@ -100,14 +100,14 @@ static char *_get_user_from_associd(mysql_conn_t *mysql_conn,
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
}
xfree(query);
- if ((row = mysql_fetch_row(result)))
+ if((row = mysql_fetch_row(result)))
user = xstrdup(row[0]);
mysql_free_result(result);
@@ -120,7 +120,7 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
{
uint32_t wckeyid = 0;
- if (slurm_get_track_wckey()) {
+ if(slurm_get_track_wckey()) {
/* Here we are looking for the wckeyid if it doesn't
* exist we will create one. We don't need to check
* if it is good or not. Right now this is the only
@@ -135,18 +135,18 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
/* since we are unable to rely on uids here (someone could
not have there uid in the system yet) we must
first get the user name from the associd */
- if (!(user = _get_user_from_associd(
+ if(!(user = _get_user_from_associd(
mysql_conn, cluster, associd))) {
error("No user for associd %u", associd);
goto no_wckeyid;
}
/* get the default key */
- if (!*name) {
+ if(!*name) {
slurmdb_user_rec_t user_rec;
memset(&user_rec, 0, sizeof(slurmdb_user_rec_t));
user_rec.uid = NO_VAL;
user_rec.name = user;
- if (assoc_mgr_fill_in_user(mysql_conn, &user_rec,
+ if(assoc_mgr_fill_in_user(mysql_conn, &user_rec,
1, NULL) != SLURM_SUCCESS) {
error("No user by name of %s assoc %u",
user, associd);
@@ -154,7 +154,7 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
goto no_wckeyid;
}
- if (user_rec.default_wckey)
+ if(user_rec.default_wckey)
*name = xstrdup_printf("*%s",
user_rec.default_wckey);
else
@@ -166,7 +166,7 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
wckey_rec.uid = NO_VAL;
wckey_rec.user = user;
wckey_rec.cluster = cluster;
- if (assoc_mgr_fill_in_wckey(mysql_conn, &wckey_rec,
+ if(assoc_mgr_fill_in_wckey(mysql_conn, &wckey_rec,
ACCOUNTING_ENFORCE_WCKEYS,
NULL) != SLURM_SUCCESS) {
List wckey_list = NULL;
@@ -185,7 +185,7 @@ static uint32_t _get_wckeyid(mysql_conn_t *mysql_conn, char **name,
/* we have already checked to make
sure this was the slurm user before
calling this */
- if (as_mysql_add_wckeys(mysql_conn,
+ if(as_mysql_add_wckeys(mysql_conn,
slurm_get_slurm_user_id(),
wckey_list)
== SLURM_SUCCESS)
@@ -228,7 +228,7 @@ extern int as_mysql_job_start(mysql_conn_t *mysql_conn,
return SLURM_ERROR;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
debug2("as_mysql_slurmdb_job_start() called");
@@ -239,9 +239,9 @@ extern int as_mysql_job_start(mysql_conn_t *mysql_conn,
* removed. This is most likely the only time we are going to
* be notified of the change also so make the state without
* the resize. */
- if (IS_JOB_RESIZING(job_ptr)) {
+ if(IS_JOB_RESIZING(job_ptr)) {
/* If we have a db_index lets end the previous record. */
- if (job_ptr->db_index)
+ if(job_ptr->db_index)
as_mysql_job_complete(mysql_conn, job_ptr);
else
error("We don't have a db_index for job %u, "
@@ -273,7 +273,7 @@ extern int as_mysql_job_start(mysql_conn_t *mysql_conn,
check_time = submit_time;
slurm_mutex_lock(&rollup_lock);
- if (check_time < global_last_rollup) {
+ if(check_time < global_last_rollup) {
MYSQL_RES *result = NULL;
MYSQL_ROW row;
@@ -289,14 +289,14 @@ extern int as_mysql_job_start(mysql_conn_t *mysql_conn,
submit_time, begin_time, start_time);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
slurm_mutex_unlock(&rollup_lock);
return SLURM_ERROR;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
mysql_free_result(result);
debug4("revieved an update for a "
"job (%u) already known about",
@@ -306,13 +306,13 @@ extern int as_mysql_job_start(mysql_conn_t *mysql_conn,
}
mysql_free_result(result);
- if (job_ptr->start_time)
+ if(job_ptr->start_time)
debug("Need to reroll usage from %sJob %u "
"from %s started then and we are just "
"now hearing about it.",
ctime(&check_time),
job_ptr->job_id, mysql_conn->cluster_name);
- else if (begin_time)
+ else if(begin_time)
debug("Need to reroll usage from %sJob %u "
"from %s became eligible then and we are just "
"now hearing about it.",
@@ -359,17 +359,17 @@ no_rollup_change:
else
nodes = "None assigned";
- if (job_ptr->batch_flag)
+ if(job_ptr->batch_flag)
track_steps = 1;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
block_id = xstrdup(job_ptr->comment);
node_cnt = job_ptr->total_nodes;
node_inx = job_ptr->network;
} else {
char temp_bit[BUF_SIZE];
- if (job_ptr->node_bitmap) {
+ if(job_ptr->node_bitmap) {
node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
job_ptr->node_bitmap);
}
@@ -387,15 +387,15 @@ no_rollup_change:
/* If there is a start_time get the wckeyid. If the job is
* cancelled before the job starts we also want to grab it. */
- if (job_ptr->assoc_id
+ if(job_ptr->assoc_id
&& (job_ptr->start_time || IS_JOB_CANCELLED(job_ptr)))
wckeyid = _get_wckeyid(mysql_conn, &job_ptr->wckey,
job_ptr->user_id,
mysql_conn->cluster_name,
job_ptr->assoc_id);
- if (!job_ptr->db_index) {
- if (!begin_time)
+ if(!job_ptr->db_index) {
+ if(!begin_time)
begin_time = submit_time;
query = xstrdup_printf(
"insert into \"%s_%s\" "
@@ -406,15 +406,15 @@ no_rollup_change:
"cpus_alloc, nodes_alloc",
mysql_conn->cluster_name, job_table);
- if (job_ptr->account)
+ if(job_ptr->account)
xstrcat(query, ", account");
- if (job_ptr->partition)
+ if(job_ptr->partition)
xstrcat(query, ", partition");
- if (block_id)
+ if(block_id)
xstrcat(query, ", id_block");
- if (job_ptr->wckey)
+ if(job_ptr->wckey)
xstrcat(query, ", wckey");
- if (node_inx)
+ if(node_inx)
xstrcat(query, ", node_inx");
xstrfmtcat(query,
@@ -429,15 +429,15 @@ no_rollup_change:
job_ptr->priority, job_ptr->details->min_cpus,
job_ptr->total_cpus, node_cnt);
- if (job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, ", '%s'", job_ptr->account);
- if (job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, ", '%s'", job_ptr->partition);
- if (block_id)
+ if(block_id)
xstrfmtcat(query, ", '%s'", block_id);
- if (job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, ", '%s'", job_ptr->wckey);
- if (node_inx)
+ if(node_inx)
xstrfmtcat(query, ", '%s'", node_inx);
xstrfmtcat(query,
@@ -456,24 +456,24 @@ no_rollup_change:
job_ptr->priority, job_ptr->details->min_cpus,
job_ptr->total_cpus, node_cnt);
- if (job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, ", account='%s'", job_ptr->account);
- if (job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, ", partition='%s'",
job_ptr->partition);
- if (block_id)
+ if(block_id)
xstrfmtcat(query, ", id_block='%s'", block_id);
- if (job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, ", wckey='%s'", job_ptr->wckey);
- if (node_inx)
+ if(node_inx)
xstrfmtcat(query, ", node_inx='%s'", node_inx);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
try_again:
- if (!(job_ptr->db_index = mysql_insert_ret_id(
+ if(!(job_ptr->db_index = mysql_insert_ret_id(
mysql_conn->db_conn, query))) {
- if (!reinit) {
+ if(!reinit) {
error("It looks like the storage has gone "
"away trying to reconnect");
mysql_close_db_connection(
@@ -490,16 +490,16 @@ no_rollup_change:
mysql_conn->cluster_name,
job_table, nodes);
- if (job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, "account='%s', ", job_ptr->account);
- if (job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, "partition='%s', ",
job_ptr->partition);
- if (block_id)
+ if(block_id)
xstrfmtcat(query, "id_block='%s', ", block_id);
- if (job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, "wckey='%s', ", job_ptr->wckey);
- if (node_inx)
+ if(node_inx)
xstrfmtcat(query, "node_inx='%s', ", node_inx);
xstrfmtcat(query, "time_start=%d, job_name='%s', state=%u, "
@@ -520,8 +520,8 @@ no_rollup_change:
xfree(query);
/* now we will reset all the steps */
- if (IS_JOB_RESIZING(job_ptr)) {
- if (IS_JOB_SUSPENDED(job_ptr))
+ if(IS_JOB_RESIZING(job_ptr)) {
+ if(IS_JOB_SUSPENDED(job_ptr))
as_mysql_suspend(mysql_conn, job_db_inx, job_ptr);
/* Here we aren't sure how many cpus are being changed here in
the step since we don't have that information from the
@@ -559,7 +559,7 @@ extern int as_mysql_job_complete(mysql_conn_t *mysql_conn,
return SLURM_ERROR;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
debug2("as_mysql_slurmdb_job_complete() called");
@@ -584,7 +584,7 @@ extern int as_mysql_job_complete(mysql_conn_t *mysql_conn,
}
slurm_mutex_lock(&rollup_lock);
- if (end_time < global_last_rollup) {
+ if(end_time < global_last_rollup) {
global_last_rollup = job_ptr->end_time;
slurm_mutex_unlock(&rollup_lock);
@@ -605,8 +605,8 @@ extern int as_mysql_job_complete(mysql_conn_t *mysql_conn,
else
nodes = "None assigned";
- if (!job_ptr->db_index) {
- if (!(job_ptr->db_index =
+ if(!job_ptr->db_index) {
+ if(!(job_ptr->db_index =
_get_db_index(mysql_conn,
submit_time,
job_ptr->job_id,
@@ -614,7 +614,7 @@ extern int as_mysql_job_complete(mysql_conn_t *mysql_conn,
/* If we get an error with this just fall
* through to avoid an infinite loop
*/
- if (as_mysql_job_start(
+ if(as_mysql_job_start(
mysql_conn, job_ptr) == SLURM_ERROR) {
error("couldn't add job %u at job completion",
job_ptr->job_id);
@@ -664,16 +664,16 @@ extern int as_mysql_step_start(mysql_conn_t *mysql_conn,
if (step_ptr->job_ptr->resize_time) {
submit_time = start_time = step_ptr->job_ptr->resize_time;
- if (step_ptr->start_time > submit_time)
+ if(step_ptr->start_time > submit_time)
start_time = step_ptr->start_time;
} else {
start_time = step_ptr->start_time;
submit_time = step_ptr->job_ptr->details->submit_time;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
tasks = step_ptr->job_ptr->details->num_tasks;
cpus = step_ptr->cpu_count;
snprintf(node_list, BUFFER_SIZE, "%s",
@@ -684,7 +684,7 @@ extern int as_mysql_step_start(mysql_conn_t *mysql_conn,
} else {
char temp_bit[BUF_SIZE];
- if (step_ptr->step_node_bitmap) {
+ if(step_ptr->step_node_bitmap) {
node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
step_ptr->step_node_bitmap);
}
@@ -693,7 +693,7 @@ extern int as_mysql_step_start(mysql_conn_t *mysql_conn,
select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
- if (ionodes) {
+ if(ionodes) {
snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
@@ -704,7 +704,7 @@ extern int as_mysql_step_start(mysql_conn_t *mysql_conn,
SELECT_JOBDATA_NODE_CNT,
&nodes);
#else
- if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
+ if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
tasks = cpus = step_ptr->job_ptr->total_cpus;
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
@@ -720,8 +720,8 @@ extern int as_mysql_step_start(mysql_conn_t *mysql_conn,
#endif
}
- if (!step_ptr->job_ptr->db_index) {
- if (!(step_ptr->job_ptr->db_index =
+ if(!step_ptr->job_ptr->db_index) {
+ if(!(step_ptr->job_ptr->db_index =
_get_db_index(mysql_conn,
submit_time,
step_ptr->job_ptr->job_id,
@@ -729,7 +729,7 @@ extern int as_mysql_step_start(mysql_conn_t *mysql_conn,
/* If we get an error with this just fall
* through to avoid an infinite loop
*/
- if (as_mysql_job_start(mysql_conn, step_ptr->job_ptr)
+ if(as_mysql_job_start(mysql_conn, step_ptr->job_ptr)
== SLURM_ERROR) {
error("couldn't add job %u at step start",
step_ptr->job_ptr->job_id);
@@ -792,7 +792,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
if (step_ptr->job_ptr->resize_time) {
submit_time = start_time = step_ptr->job_ptr->resize_time;
- if (step_ptr->start_time > submit_time)
+ if(step_ptr->start_time > submit_time)
start_time = step_ptr->start_time;
} else {
start_time = step_ptr->start_time;
@@ -805,10 +805,10 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
jobacct = &dummy_jobacct;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
now = step_ptr->job_ptr->end_time;
tasks = step_ptr->job_ptr->details->num_tasks;
cpus = step_ptr->cpu_count;
@@ -818,7 +818,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
tasks = cpus = step_ptr->job_ptr->details->min_cpus;
#else
- if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
+ if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
tasks = cpus = step_ptr->job_ptr->total_cpus;
else {
cpus = step_ptr->cpu_count;
@@ -840,7 +840,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
comp_status = JOB_COMPLETE;
/* figure out the ave of the totals sent */
- if (cpus > 0) {
+ if(cpus > 0) {
ave_vsize = (double)jobacct->tot_vsize;
ave_vsize /= (double)cpus;
ave_rss = (double)jobacct->tot_rss;
@@ -851,12 +851,12 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
ave_cpu /= (double)cpus;
}
- if (jobacct->min_cpu != NO_VAL) {
+ if(jobacct->min_cpu != NO_VAL) {
ave_cpu2 = (double)jobacct->min_cpu;
}
- if (!step_ptr->job_ptr->db_index) {
- if (!(step_ptr->job_ptr->db_index =
+ if(!step_ptr->job_ptr->db_index) {
+ if(!(step_ptr->job_ptr->db_index =
_get_db_index(mysql_conn,
submit_time,
step_ptr->job_ptr->job_id,
@@ -864,7 +864,7 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
/* If we get an error with this just fall
* through to avoid an infinite loop
*/
- if (as_mysql_job_start(mysql_conn, step_ptr->job_ptr)
+ if(as_mysql_job_start(mysql_conn, step_ptr->job_ptr)
== SLURM_ERROR) {
error("couldn't add job %u "
"at step completion",
@@ -934,7 +934,7 @@ extern int as_mysql_suspend(mysql_conn_t *mysql_conn,
time_t submit_time;
uint32_t job_db_inx;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
if (job_ptr->resize_time)
@@ -942,8 +942,8 @@ extern int as_mysql_suspend(mysql_conn_t *mysql_conn,
else
submit_time = job_ptr->details->submit_time;
- if (!job_ptr->db_index) {
- if (!(job_ptr->db_index =
+ if(!job_ptr->db_index) {
+ if(!(job_ptr->db_index =
_get_db_index(mysql_conn,
submit_time,
job_ptr->job_id,
@@ -951,7 +951,7 @@ extern int as_mysql_suspend(mysql_conn_t *mysql_conn,
/* If we get an error with this just fall
* through to avoid an infinite loop
*/
- if (as_mysql_job_start(
+ if(as_mysql_job_start(
mysql_conn, job_ptr) == SLURM_ERROR) {
error("couldn't suspend job %u",
job_ptr->job_id);
@@ -960,8 +960,8 @@ extern int as_mysql_suspend(mysql_conn_t *mysql_conn,
}
}
- if (IS_JOB_RESIZING(job_ptr)) {
- if (!old_db_inx) {
+ if(IS_JOB_RESIZING(job_ptr)) {
+ if(!old_db_inx) {
error("No old db inx given for job %u cluster %s, "
"can't update suspend table.",
job_ptr->job_id, mysql_conn->cluster_name);
@@ -987,7 +987,7 @@ extern int as_mysql_suspend(mysql_conn_t *mysql_conn,
(int)job_ptr->suspend_time,
job_ptr->job_state & JOB_STATE_BASE,
job_db_inx);
- if (IS_JOB_SUSPENDED(job_ptr))
+ if(IS_JOB_SUSPENDED(job_ptr))
xstrfmtcat(query,
"insert into \"%s_%s\" (job_db_inx, id_assoc, "
"time_start, time_end) values (%u, %u, %d, 0);",
@@ -1006,7 +1006,7 @@ extern int as_mysql_suspend(mysql_conn_t *mysql_conn,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_ERROR) {
+ if(rc != SLURM_ERROR) {
xstrfmtcat(query,
"update \"%s_%s\" set "
"time_suspended=%u-time_suspended, "
@@ -1032,7 +1032,7 @@ extern int as_mysql_flush_jobs_on_cluster(
char *id_char = NULL;
char *suspended_char = NULL;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
/* First we need to get the job_db_inx's and states so we can clean up
@@ -1044,7 +1044,7 @@ extern int as_mysql_flush_jobs_on_cluster(
mysql_conn->cluster_name, job_table);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -1053,8 +1053,8 @@ extern int as_mysql_flush_jobs_on_cluster(
while((row = mysql_fetch_row(result))) {
int state = atoi(row[1]);
- if (state == JOB_SUSPENDED) {
- if (suspended_char)
+ if(state == JOB_SUSPENDED) {
+ if(suspended_char)
xstrfmtcat(suspended_char,
" || job_db_inx=%s", row[0]);
else
@@ -1062,14 +1062,14 @@ extern int as_mysql_flush_jobs_on_cluster(
row[0]);
}
- if (id_char)
+ if(id_char)
xstrfmtcat(id_char, " || job_db_inx=%s", row[0]);
else
xstrfmtcat(id_char, "job_db_inx=%s", row[0]);
}
mysql_free_result(result);
- if (suspended_char) {
+ if(suspended_char) {
xstrfmtcat(query,
"update \"%s_%s\" set "
"time_suspended=%d-time_suspended "
@@ -1089,7 +1089,7 @@ extern int as_mysql_flush_jobs_on_cluster(
event_time, suspended_char);
xfree(suspended_char);
}
- if (id_char) {
+ if(id_char) {
xstrfmtcat(query,
"update \"%s_%s\" set state=%d, "
"time_end=%u where %s;",
@@ -1103,7 +1103,7 @@ extern int as_mysql_flush_jobs_on_cluster(
xfree(id_char);
}
- if (query) {
+ if(query) {
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c b/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c
index d96666dc0949d6ffcffb24275383c3ea1dda97ac..10bedc7895b6c1cc19c8abb67d35bdfe324701e0 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c
@@ -206,15 +206,15 @@ static void _state_time_string(char **extra, uint32_t state,
{
int base_state = state & JOB_STATE_BASE;
- if (!start && !end) {
+ if(!start && !end) {
xstrfmtcat(*extra, "t1.state='%u'", state);
return;
}
switch(base_state) {
case JOB_PENDING:
- if (start) {
- if (!end) {
+ if(start) {
+ if(!end) {
xstrfmtcat(*extra,
"(t1.time_eligible && "
"(!t1.time_start || (%d between "
@@ -241,8 +241,8 @@ static void _state_time_string(char **extra, uint32_t state,
/* FIX ME: this should do something with the suspended
table, but it doesn't right now. */
case JOB_RUNNING:
- if (start) {
- if (!end) {
+ if(start) {
+ if(!end) {
xstrfmtcat(*extra,
"(t1.time_start && "
"((!t1.time_end && t1.state=%d) || "
@@ -271,8 +271,8 @@ static void _state_time_string(char **extra, uint32_t state,
case JOB_NODE_FAIL:
default:
xstrfmtcat(*extra, "(t1.state='%u' && (t1.time_end && ", state);
- if (start) {
- if (!end) {
+ if(start) {
+ if(!end) {
xstrfmtcat(*extra, "(t1.time_end >= %d)))",
start);
} else {
@@ -280,7 +280,7 @@ static void _state_time_string(char **extra, uint32_t state,
"(t1.time_end between %d and %d)))",
start, end);
}
- } else if (end) {
+ } else if(end) {
xstrfmtcat(*extra, "(t1.time_end <= %d)))", end);
}
break;
@@ -292,8 +292,8 @@ static void _state_time_string(char **extra, uint32_t state,
static void _destroy_local_cluster(void *object)
{
local_cluster_t *local_cluster = (local_cluster_t *)object;
- if (local_cluster) {
- if (local_cluster->hl)
+ if(local_cluster) {
+ if(local_cluster->hl)
hostlist_destroy(local_cluster->hl);
FREE_NULL_BITMAP(local_cluster->asked_bitmap);
xfree(local_cluster);
@@ -330,11 +330,11 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
- if (!is_admin && (private_data & PRIVATE_DATA_JOBS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_JOBS)) {
query = xstrdup_printf("select lft from \"%s_%s\" "
"where user='%s'",
cluster_name, assoc_table, user->name);
- if (user->coord_accts) {
+ if(user->coord_accts) {
slurmdb_coord_rec_t *coord = NULL;
itr = list_iterator_create(user->coord_accts);
while((coord = list_next(itr))) {
@@ -345,7 +345,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
}
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(extra);
xfree(query);
@@ -355,13 +355,13 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
xfree(query);
set = 0;
while((row = mysql_fetch_row(result))) {
- if (set) {
+ if(set) {
xstrfmtcat(extra,
" || (%s between %s.lft and %s.rgt)",
row[0], prefix, prefix);
} else {
set = 1;
- if (extra)
+ if(extra)
xstrfmtcat(extra,
" && ((%s between %s.lft "
"and %s.rgt)",
@@ -375,7 +375,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
prefix);
}
}
- if (set)
+ if(set)
xstrcat(extra,")");
mysql_free_result(result);
}
@@ -388,7 +388,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
"on t1.id_assoc=t2.id_assoc",
job_fields, cluster_name, job_table,
cluster_name, assoc_table);
- if (extra) {
+ if(extra) {
xstrcat(query, extra);
xfree(extra);
}
@@ -401,7 +401,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
goto end_it;
@@ -415,14 +415,14 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
curr_id = atoi(row[JOB_REQ_JOBID]);
- if (job_cond && !job_cond->duplicates
+ if(job_cond && !job_cond->duplicates
&& (curr_id == last_id)
&& (atoi(row[JOB_REQ_STATE]) != JOB_RESIZING))
continue;
/* check the bitmap to see if this is one of the jobs
we are looking for */
- if (!good_nodes_from_inx(local_cluster_list,
+ if(!good_nodes_from_inx(local_cluster_list,
(void **)&curr_cluster,
row[JOB_REQ_NODE_INX], submit)) {
last_id = curr_id;
@@ -432,7 +432,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job = slurmdb_create_job_rec();
job->state = atoi(row[JOB_REQ_STATE]);
last_state = job->state;
- if (curr_id == last_id)
+ if(curr_id == last_id)
/* put in reverse so we order by the submit getting
larger which it is given to us in reverse
order from the database */
@@ -449,26 +449,26 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job->cluster = xstrdup(cluster_name);
/* we want a blank wckey if the name is null */
- if (row[JOB_REQ_WCKEY])
+ if(row[JOB_REQ_WCKEY])
job->wckey = xstrdup(row[JOB_REQ_WCKEY]);
else
job->wckey = xstrdup("");
job->wckeyid = atoi(row[JOB_REQ_WCKEYID]);
- if (row[JOB_REQ_USER_NAME])
+ if(row[JOB_REQ_USER_NAME])
job->user = xstrdup(row[JOB_REQ_USER_NAME]);
else
job->uid = atoi(row[JOB_REQ_UID]);
- if (row[JOB_REQ_LFT])
+ if(row[JOB_REQ_LFT])
job->lft = atoi(row[JOB_REQ_LFT]);
- if (row[JOB_REQ_ACCOUNT] && row[JOB_REQ_ACCOUNT][0])
+ if(row[JOB_REQ_ACCOUNT] && row[JOB_REQ_ACCOUNT][0])
job->account = xstrdup(row[JOB_REQ_ACCOUNT]);
- else if (row[JOB_REQ_ACCOUNT1] && row[JOB_REQ_ACCOUNT1][0])
+ else if(row[JOB_REQ_ACCOUNT1] && row[JOB_REQ_ACCOUNT1][0])
job->account = xstrdup(row[JOB_REQ_ACCOUNT1]);
- if (row[JOB_REQ_BLOCKID])
+ if(row[JOB_REQ_BLOCKID])
job->blockid = xstrdup(row[JOB_REQ_BLOCKID]);
job->eligible = atoi(row[JOB_REQ_ELIGIBLE]);
@@ -478,26 +478,26 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job->timelimit = atoi(row[JOB_REQ_TIMELIMIT]);
/* since the job->end could be set later end it here */
- if (job->end) {
+ if(job->end) {
job_ended = 1;
- if (!job->start || (job->start > job->end))
+ if(!job->start || (job->start > job->end))
job->start = job->end;
}
- if (job_cond && !job_cond->without_usage_truncation
+ if(job_cond && !job_cond->without_usage_truncation
&& job_cond->usage_start) {
- if (job->start && (job->start < job_cond->usage_start))
+ if(job->start && (job->start < job_cond->usage_start))
job->start = job_cond->usage_start;
- if (!job->end || job->end > job_cond->usage_end)
+ if(!job->end || job->end > job_cond->usage_end)
job->end = job_cond->usage_end;
- if (!job->start)
+ if(!job->start)
job->start = job->end;
job->elapsed = job->end - job->start;
- if (row[JOB_REQ_SUSPENDED]) {
+ if(row[JOB_REQ_SUSPENDED]) {
MYSQL_RES *result2 = NULL;
MYSQL_ROW row2;
/* get the suspended time for this job */
@@ -515,7 +515,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE,
__LINE__, query);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn,
query, 0))) {
list_destroy(job_list);
@@ -529,15 +529,15 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
int local_end =
atoi(row2[1]);
- if (!local_start)
+ if(!local_start)
continue;
- if (job->start > local_start)
+ if(job->start > local_start)
local_start = job->start;
- if (job->end < local_end)
+ if(job->end < local_end)
local_end = job->end;
- if ((local_end - local_start) < 1)
+ if((local_end - local_start) < 1)
continue;
job->elapsed -=
@@ -552,11 +552,11 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job->suspended = atoi(row[JOB_REQ_SUSPENDED]);
/* fix the suspended number to be correct */
- if (job->state == JOB_SUSPENDED)
+ if(job->state == JOB_SUSPENDED)
job->suspended = now - job->suspended;
- if (!job->start) {
+ if(!job->start) {
job->elapsed = 0;
- } else if (!job->end) {
+ } else if(!job->end) {
job->elapsed = now - job->start;
} else {
job->elapsed = job->end - job->start;
@@ -565,7 +565,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job->elapsed -= job->suspended;
}
- if ((int)job->elapsed < 0)
+ if((int)job->elapsed < 0)
job->elapsed = 0;
job->jobid = curr_id;
@@ -573,10 +573,10 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job->gid = atoi(row[JOB_REQ_GID]);
job->exitcode = atoi(row[JOB_REQ_COMP_CODE]);
- if (row[JOB_REQ_PARTITION])
+ if(row[JOB_REQ_PARTITION])
job->partition = xstrdup(row[JOB_REQ_PARTITION]);
- if (row[JOB_REQ_NODELIST])
+ if(row[JOB_REQ_NODELIST])
job->nodes = xstrdup(row[JOB_REQ_NODELIST]);
if (!job->nodes || !strcmp(job->nodes, "(null)")) {
@@ -591,15 +591,15 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job->qosid = atoi(row[JOB_REQ_QOS]);
job->show_full = 1;
- if (only_pending || (job_cond && job_cond->without_steps))
+ if(only_pending || (job_cond && job_cond->without_steps))
goto skip_steps;
- if (job_cond && job_cond->step_list
+ if(job_cond && job_cond->step_list
&& list_count(job_cond->step_list)) {
set = 0;
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if (selected_step->jobid != job->jobid) {
+ if(selected_step->jobid != job->jobid) {
continue;
} else if (selected_step->stepid
== (uint32_t)NO_VAL) {
@@ -607,7 +607,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
break;
}
- if (set)
+ if(set)
xstrcat(extra, " || ");
else
xstrcat(extra, " && (");
@@ -618,14 +618,14 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
job->show_full = 0;
}
list_iterator_destroy(itr);
- if (set)
+ if(set)
xstrcat(extra, ")");
}
query = xstrdup_printf("select %s from \"%s_%s\" as t1 "
"where t1.job_db_inx=%s",
step_fields, cluster_name,
step_table, id);
- if (extra) {
+ if(extra) {
xstrcat(query, extra);
xfree(extra);
}
@@ -633,7 +633,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(step_result = mysql_db_query_ret(
+ if(!(step_result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
@@ -648,7 +648,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
while ((step_row = mysql_fetch_row(step_result))) {
/* check the bitmap to see if this is one of the steps
we are looking for */
- if (!good_nodes_from_inx(local_cluster_list,
+ if(!good_nodes_from_inx(local_cluster_list,
(void **)&curr_cluster,
step_row[STEP_REQ_NODE_INX],
submit))
@@ -658,7 +658,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
step->tot_cpu_sec = 0;
step->tot_cpu_usec = 0;
step->job_ptr = job;
- if (!job->first_step_ptr)
+ if(!job->first_step_ptr)
job->first_step_ptr = step;
list_append(job->steps, step);
step->stepid = atoi(step_row[STEP_REQ_STEPID]);
@@ -671,42 +671,42 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
step->ntasks = atoi(step_row[STEP_REQ_TASKS]);
step->task_dist = atoi(step_row[STEP_REQ_TASKDIST]);
- if (!step->ntasks)
+ if(!step->ntasks)
step->ntasks = step->ncpus;
step->start = atoi(step_row[STEP_REQ_START]);
step->end = atoi(step_row[STEP_REQ_END]);
/* if the job has ended end the step also */
- if (!step->end && job_ended) {
+ if(!step->end && job_ended) {
step->end = job->end;
step->state = job->state;
}
- if (job_cond && !job_cond->without_usage_truncation
+ if(job_cond && !job_cond->without_usage_truncation
&& job_cond->usage_start) {
- if (step->start
+ if(step->start
&& (step->start < job_cond->usage_start))
step->start = job_cond->usage_start;
- if (!step->start && step->end)
+ if(!step->start && step->end)
step->start = step->end;
- if (!step->end
+ if(!step->end
|| (step->end > job_cond->usage_end))
step->end = job_cond->usage_end;
}
/* figure this out by start stop */
step->suspended = atoi(step_row[STEP_REQ_SUSPENDED]);
- if (!step->end) {
+ if(!step->end) {
step->elapsed = now - step->start;
} else {
step->elapsed = step->end - step->start;
}
step->elapsed -= step->suspended;
- if ((int)step->elapsed < 0)
+ if((int)step->elapsed < 0)
step->elapsed = 0;
step->user_cpu_sec = atoi(step_row[STEP_REQ_USER_SEC]);
@@ -756,7 +756,7 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
}
mysql_free_result(step_result);
- if (!job->track_steps) {
+ if(!job->track_steps) {
/* If we don't have track_steps we want to see
if we have multiple steps. If we only have
1 step check the job name against the step
@@ -764,10 +764,10 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
different. If it is different print out
the step separate.
*/
- if (list_count(job->steps) > 1)
+ if(list_count(job->steps) > 1)
job->track_steps = 1;
- else if (step && step->stepname && job->jobname) {
- if (strcmp(step->stepname, job->jobname))
+ else if(step && step->stepname && job->jobname) {
+ if(strcmp(step->stepname, job->jobname))
job->track_steps = 1;
}
}
@@ -778,10 +778,10 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
mysql_free_result(result);
end_it:
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
- if (rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
list_transfer(sent_list, job_list);
list_destroy(job_list);
@@ -800,10 +800,10 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
hostlist_iterator_t h_itr = NULL;
char *query = NULL;
- if (!job_cond || !job_cond->used_nodes)
+ if(!job_cond || !job_cond->used_nodes)
return NULL;
- if (!job_cond->cluster_list || list_count(job_cond->cluster_list) != 1) {
+ if(!job_cond->cluster_list || list_count(job_cond->cluster_list) != 1) {
error("If you are doing a query against nodes "
"you must only have 1 cluster "
"you are asking for.");
@@ -811,7 +811,7 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
}
temp_hl = hostlist_create(job_cond->used_nodes);
- if (!hostlist_count(temp_hl)) {
+ if(!hostlist_count(temp_hl)) {
error("we didn't get any real hosts to look for.");
goto no_hosts;
}
@@ -822,8 +822,8 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
"&& cluster_nodes !=''",
list_peek(job_cond->cluster_list), event_table);
- if (job_cond->usage_start) {
- if (!job_cond->usage_end)
+ if(job_cond->usage_start) {
+ if(!job_cond->usage_end)
job_cond->usage_end = now;
xstrfmtcat(query,
@@ -834,7 +834,7 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
hostlist_destroy(temp_hl);
return NULL;
@@ -853,15 +853,15 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
local_cluster->asked_bitmap =
bit_alloc(hostlist_count(local_cluster->hl));
while((host = hostlist_next(h_itr))) {
- if ((loc = hostlist_find(
+ if((loc = hostlist_find(
local_cluster->hl, host)) != -1)
bit_set(local_cluster->asked_bitmap, loc);
free(host);
}
hostlist_iterator_reset(h_itr);
- if (bit_ffs(local_cluster->asked_bitmap) != -1) {
+ if(bit_ffs(local_cluster->asked_bitmap) != -1) {
list_append(local_cluster_list, local_cluster);
- if (local_cluster->end == 0) {
+ if(local_cluster->end == 0) {
local_cluster->end = now;
(*curr_cluster) = local_cluster;
}
@@ -870,7 +870,7 @@ extern List setup_cluster_list_with_inx(mysql_conn_t *mysql_conn,
}
mysql_free_result(result);
hostlist_iterator_destroy(h_itr);
- if (!list_count(local_cluster_list)) {
+ if(!list_count(local_cluster_list)) {
hostlist_destroy(temp_hl);
list_destroy(local_cluster_list);
return NULL;
@@ -890,30 +890,30 @@ extern int good_nodes_from_inx(List local_cluster_list,
/* check the bitmap to see if this is one of the jobs
we are looking for */
- if (*curr_cluster) {
+ if(*curr_cluster) {
bitstr_t *job_bitmap = NULL;
- if (!node_inx || !node_inx[0])
+ if(!node_inx || !node_inx[0])
return 0;
- if ((submit < (*curr_cluster)->start)
+ if((submit < (*curr_cluster)->start)
|| (submit > (*curr_cluster)->end)) {
local_cluster_t *local_cluster = NULL;
ListIterator itr =
list_iterator_create(local_cluster_list);
while((local_cluster = list_next(itr))) {
- if ((submit >= local_cluster->start)
+ if((submit >= local_cluster->start)
&& (submit <= local_cluster->end)) {
*curr_cluster = local_cluster;
break;
}
}
list_iterator_destroy(itr);
- if (!local_cluster)
+ if(!local_cluster)
return 0;
}
job_bitmap = bit_alloc(hostlist_count((*curr_cluster)->hl));
bit_unfmt(job_bitmap, node_inx);
- if (!bit_overlap((*curr_cluster)->asked_bitmap, job_bitmap)) {
+ if(!bit_overlap((*curr_cluster)->asked_bitmap, job_bitmap)) {
FREE_NULL_BITMAP(job_bitmap);
return 0;
}
@@ -930,12 +930,12 @@ extern char *setup_job_cluster_cond_limits(mysql_conn_t *mysql_conn,
ListIterator itr = NULL;
char *object = NULL;
- if (!job_cond)
+ if(!job_cond)
return NULL;
/* this must be done before resvid_list since we set
resvid_list up here */
- if (job_cond->resv_list && list_count(job_cond->resv_list)) {
+ if(job_cond->resv_list && list_count(job_cond->resv_list)) {
char *query = xstrdup_printf(
"select distinct job_db_inx from \"%s_%s\" where (",
cluster_name, job_table);
@@ -945,21 +945,21 @@ extern char *setup_job_cluster_cond_limits(mysql_conn_t *mysql_conn,
itr = list_iterator_create(job_cond->resv_list);
while((object = list_next(itr))) {
- if (my_set)
+ if(my_set)
xstrcat(query, " || ");
xstrfmtcat(query, "resv_name='%s'", object);
my_set = 1;
}
list_iterator_destroy(itr);
xstrcat(query, ")");
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
error("couldn't query the database");
goto no_resv;
}
xfree(query);
- if (!job_cond->resvid_list)
+ if(!job_cond->resvid_list)
job_cond->resvid_list = list_create(slurm_destroy_char);
while((row = mysql_fetch_row(result))) {
list_append(job_cond->resvid_list, xstrdup(row[0]));
@@ -968,15 +968,15 @@ extern char *setup_job_cluster_cond_limits(mysql_conn_t *mysql_conn,
}
no_resv:
- if (job_cond->resvid_list && list_count(job_cond->resvid_list)) {
+ if(job_cond->resvid_list && list_count(job_cond->resvid_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->resvid_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.id_resv='%s'", object);
set = 1;
@@ -997,18 +997,18 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
char *object = NULL;
slurmdb_selected_step_t *selected_step = NULL;
- if (!job_cond)
+ if(!job_cond)
return 0;
- if (job_cond->acct_list && list_count(job_cond->acct_list)) {
+ if(job_cond->acct_list && list_count(job_cond->acct_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.account='%s'", object);
set = 1;
@@ -1017,15 +1017,15 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
}
- if (job_cond->associd_list && list_count(job_cond->associd_list)) {
+ if(job_cond->associd_list && list_count(job_cond->associd_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->associd_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.id_assoc='%s'", object);
set = 1;
@@ -1034,16 +1034,16 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
}
- if (job_cond->userid_list && list_count(job_cond->userid_list)) {
+ if(job_cond->userid_list && list_count(job_cond->userid_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->userid_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.id_user='%s'", object);
set = 1;
@@ -1052,15 +1052,15 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
}
- if (job_cond->groupid_list && list_count(job_cond->groupid_list)) {
+ if(job_cond->groupid_list && list_count(job_cond->groupid_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->groupid_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.id_group='%s'", object);
set = 1;
@@ -1069,15 +1069,15 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
}
- if (job_cond->partition_list && list_count(job_cond->partition_list)) {
+ if(job_cond->partition_list && list_count(job_cond->partition_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->partition_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.partition='%s'", object);
set = 1;
@@ -1086,15 +1086,15 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
}
- if (job_cond->qos_list && list_count(job_cond->qos_list)) {
+ if(job_cond->qos_list && list_count(job_cond->qos_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->qos_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.id_qos='%s'", object);
set = 1;
@@ -1103,15 +1103,15 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
}
- if (job_cond->step_list && list_count(job_cond->step_list)) {
+ if(job_cond->step_list && list_count(job_cond->step_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.id_job=%u",
selected_step->jobid);
@@ -1121,13 +1121,13 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
xstrcat(*extra, ")");
}
- if (job_cond->cpus_min) {
- if (*extra)
+ if(job_cond->cpus_min) {
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
- if (job_cond->cpus_max) {
+ if(job_cond->cpus_max) {
xstrfmtcat(*extra, "(t1.alloc_cpus between %u and %u))",
job_cond->cpus_min, job_cond->cpus_max);
@@ -1138,13 +1138,13 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
}
}
- if (job_cond->nodes_min) {
- if (*extra)
+ if(job_cond->nodes_min) {
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
- if (job_cond->nodes_max) {
+ if(job_cond->nodes_max) {
xstrfmtcat(*extra,
"(t1.alloc_nodes between %u and %u))",
job_cond->nodes_min, job_cond->nodes_max);
@@ -1156,13 +1156,13 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
}
}
- if (job_cond->timelimit_min) {
- if (*extra)
+ if(job_cond->timelimit_min) {
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
- if (job_cond->timelimit_max) {
+ if(job_cond->timelimit_max) {
xstrfmtcat(*extra, "(t1.timelimit between %u and %u))",
job_cond->timelimit_min,
job_cond->timelimit_max);
@@ -1174,16 +1174,16 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
}
}
- if (job_cond->state_list && list_count(job_cond->state_list)) {
+ if(job_cond->state_list && list_count(job_cond->state_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->state_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
_state_time_string(extra, (uint32_t)atoi(object),
job_cond->usage_start,
@@ -1195,13 +1195,13 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
} else {
/* Only do this (default of all eligible jobs) if no
state is given */
- if (job_cond->usage_start) {
- if (*extra)
+ if(job_cond->usage_start) {
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
- if (!job_cond->usage_end)
+ if(!job_cond->usage_end)
xstrfmtcat(*extra,
"(t1.time_end >= %d "
"|| t1.time_end = 0))",
@@ -1213,8 +1213,8 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
"|| t1.time_end = 0)))",
job_cond->usage_end,
job_cond->usage_start);
- } else if (job_cond->usage_end) {
- if (*extra)
+ } else if(job_cond->usage_end) {
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
@@ -1224,16 +1224,16 @@ extern int setup_job_cond_limits(mysql_conn_t *mysql_conn,
}
}
- if (job_cond->wckey_list && list_count(job_cond->wckey_list)) {
+ if(job_cond->wckey_list && list_count(job_cond->wckey_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(job_cond->wckey_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "t1.wckey='%s'", object);
set = 1;
@@ -1267,7 +1267,7 @@ extern List as_mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn,
private_data = slurm_get_private_data();
if (private_data & PRIVATE_DATA_JOBS) {
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR)))
is_user_any_coord(mysql_conn, &user);
}
@@ -1279,14 +1279,14 @@ extern List as_mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn,
things work. This should go before the setup of conds
since we could update the start/end time.
*/
- if (job_cond && job_cond->used_nodes) {
+ if(job_cond && job_cond->used_nodes) {
local_cluster_list = setup_cluster_list_with_inx(
mysql_conn, job_cond, (void **)&curr_cluster);
- if (!local_cluster_list)
+ if(!local_cluster_list)
return NULL;
}
- if (job_cond->state_list && (list_count(job_cond->state_list) == 1)
+ if(job_cond->state_list && (list_count(job_cond->state_list) == 1)
&& (atoi(list_peek(job_cond->state_list)) == JOB_PENDING))
only_pending = 1;
@@ -1304,7 +1304,7 @@ extern List as_mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn,
xstrfmtcat(tmp2, ", %s", step_req_inx[i]);
}
- if (job_cond->cluster_list && list_count(job_cond->cluster_list))
+ if(job_cond->cluster_list && list_count(job_cond->cluster_list))
use_cluster_list = job_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -1313,7 +1313,7 @@ extern List as_mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn,
itr = list_iterator_create(use_cluster_list);
while((cluster_name = list_next(itr))) {
int rc;
- if ((rc = _cluster_get_jobs(mysql_conn, &user, job_cond,
+ if((rc = _cluster_get_jobs(mysql_conn, &user, job_cond,
cluster_name, tmp, tmp2, extra,
is_admin, only_pending, job_list))
!= SLURM_SUCCESS) {
@@ -1324,7 +1324,7 @@ extern List as_mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn,
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
xfree(tmp);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_problems.c b/src/plugins/accounting_storage/mysql/as_mysql_problems.c
index 0b72ae306ba3436aeedeae0e1d7bfdd597dfb88a..271a9d7bd379ae580eef375155bd2f195f830ff3 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_problems.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_problems.c
@@ -50,15 +50,15 @@ static int _setup_association_cond_limits(slurmdb_association_cond_t *assoc_cond
xstrfmtcat(*extra, "where deleted=0");
- if (!assoc_cond)
+ if(!assoc_cond)
return 0;
- if (assoc_cond->acct_list && list_count(assoc_cond->acct_list)) {
+ if(assoc_cond->acct_list && list_count(assoc_cond->acct_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "acct='%s'", object);
set = 1;
@@ -67,31 +67,31 @@ static int _setup_association_cond_limits(slurmdb_association_cond_t *assoc_cond
xstrcat(*extra, ")");
}
- if (assoc_cond->user_list && list_count(assoc_cond->user_list)) {
+ if(assoc_cond->user_list && list_count(assoc_cond->user_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->user_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "user='%s'", object);
set = 1;
}
list_iterator_destroy(itr);
xstrcat(*extra, ")");
- } else if (user_query) {
+ } else if(user_query) {
/* we want all the users, but no non-user associations */
set = 1;
xstrcat(*extra, " && (user!='')");
}
- if (assoc_cond->partition_list
+ if(assoc_cond->partition_list
&& list_count(assoc_cond->partition_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(assoc_cond->partition_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "partition='%s'", object);
set = 1;
@@ -120,7 +120,7 @@ extern int as_mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
query = xstrdup_printf("select name from %s where deleted=0",
acct_table);
- if (assoc_cond &&
+ if(assoc_cond &&
assoc_cond->acct_list && list_count(assoc_cond->acct_list)) {
int set = 0;
ListIterator itr = NULL;
@@ -128,7 +128,7 @@ extern int as_mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
xstrcat(query, " && (");
itr = list_iterator_create(assoc_cond->acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(query, " || ");
xstrfmtcat(query, "name='%s'", object);
set = 1;
@@ -137,14 +137,14 @@ extern int as_mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
xstrcat(query, ")");
}
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (assoc_cond &&
+ if(assoc_cond &&
assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
use_cluster_list = assoc_cond->cluster_list;
else
@@ -158,7 +158,7 @@ extern int as_mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
/* See if we have at least 1 association in the system */
while((cluster_name = list_next(itr))) {
- if (query)
+ if(query)
xstrcat(query, " union ");
xstrfmtcat(query,
"select distinct id_assoc from \"%s_%s\" "
@@ -168,7 +168,7 @@ extern int as_mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
}
list_iterator_reset(itr);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
@@ -179,7 +179,7 @@ extern int as_mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
cnt = mysql_num_rows(result2);
mysql_free_result(result2);
- if (cnt)
+ if(cnt)
continue;
assoc = xmalloc(sizeof(slurmdb_association_rec_t));
@@ -191,7 +191,7 @@ extern int as_mysql_acct_no_assocs(mysql_conn_t *mysql_conn,
mysql_free_result(result);
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
return rc;
@@ -238,7 +238,7 @@ extern int as_mysql_acct_no_users(mysql_conn_t *mysql_conn,
xstrfmtcat(tmp, ", %s", assoc_req_inx[i]);
}
- if (assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
+ if(assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
use_cluster_list = assoc_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -246,7 +246,7 @@ extern int as_mysql_acct_no_users(mysql_conn_t *mysql_conn,
itr = list_iterator_create(use_cluster_list);
while((cluster_name = list_next(itr))) {
/* only get the account associations */
- if (query)
+ if(query)
xstrcat(query, " union ");
xstrfmtcat(query, "select distinct %s, '%s' as cluster "
"from \"%s_%s\" %s && user='' && lft=(rgt-1) ",
@@ -254,17 +254,17 @@ extern int as_mysql_acct_no_users(mysql_conn_t *mysql_conn,
assoc_table, extra);
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
- if (query)
+ if(query)
xstrcat(query, " order by cluster, acct;");
xfree(tmp);
xfree(extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -279,15 +279,15 @@ extern int as_mysql_acct_no_users(mysql_conn_t *mysql_conn,
assoc->id = SLURMDB_PROBLEM_ACCT_NO_USERS;
- if (row[ASSOC_REQ_USER][0])
+ if(row[ASSOC_REQ_USER][0])
assoc->user = xstrdup(row[ASSOC_REQ_USER]);
assoc->acct = xstrdup(row[ASSOC_REQ_ACCT]);
assoc->cluster = xstrdup(row[ASSOC_REQ_COUNT]);
- if (row[ASSOC_REQ_PARENT][0])
+ if(row[ASSOC_REQ_PARENT][0])
assoc->parent_acct = xstrdup(row[ASSOC_REQ_PARENT]);
- if (row[ASSOC_REQ_PART][0])
+ if(row[ASSOC_REQ_PART][0])
assoc->partition = xstrdup(row[ASSOC_REQ_PART]);
}
mysql_free_result(result);
@@ -311,14 +311,14 @@ extern int as_mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
query = xstrdup_printf("select name from %s where deleted=0",
user_table);
- if (assoc_cond &&
+ if(assoc_cond &&
assoc_cond->user_list && list_count(assoc_cond->user_list)) {
int set = 0;
char *object = NULL;
xstrcat(query, " && (");
itr = list_iterator_create(assoc_cond->user_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(query, " || ");
xstrfmtcat(query, "name='%s'", object);
set = 1;
@@ -327,14 +327,14 @@ extern int as_mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
xstrcat(query, ")");
}
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (assoc_cond &&
+ if(assoc_cond &&
assoc_cond->cluster_list && list_count(assoc_cond->cluster_list))
use_cluster_list = assoc_cond->cluster_list;
else
@@ -359,7 +359,7 @@ extern int as_mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
/* See if we have at least 1 association in the system */
while((cluster_name = list_next(itr))) {
- if (query)
+ if(query)
xstrcat(query, " union ");
xstrfmtcat(query,
"select distinct id_assoc from \"%s_%s\" "
@@ -369,7 +369,7 @@ extern int as_mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
}
list_iterator_reset(itr);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
@@ -380,7 +380,7 @@ extern int as_mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
cnt = mysql_num_rows(result2);
mysql_free_result(result2);
- if (cnt)
+ if(cnt)
continue;
assoc = xmalloc(sizeof(slurmdb_association_rec_t));
@@ -392,7 +392,7 @@ extern int as_mysql_user_no_assocs_or_no_uid(mysql_conn_t *mysql_conn,
mysql_free_result(result);
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
return rc;
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_qos.c b/src/plugins/accounting_storage/mysql/as_mysql_qos.c
index eb3c5aaf9c7edeb8606e2bce490eed53c8aaf0fe..16584ea50c489e786685ae1fc541da3c2e46779b 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_qos.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_qos.c
@@ -49,7 +49,7 @@ static int _preemption_loop(mysql_conn_t *mysql_conn, int begin_qosid,
/* check in the preempt list for all qos's preempted */
for(i=0; i<bit_size(preempt_bitstr); i++) {
- if (!bit_test(preempt_bitstr, i))
+ if(!bit_test(preempt_bitstr, i))
continue;
memset(&qos_rec, 0, sizeof(qos_rec));
@@ -59,16 +59,16 @@ static int _preemption_loop(mysql_conn_t *mysql_conn, int begin_qosid,
NULL);
/* check if the begin_qosid is preempted by this qos
* if so we have a loop */
- if (qos_rec.preempt_bitstr
+ if(qos_rec.preempt_bitstr
&& bit_test(qos_rec.preempt_bitstr, begin_qosid)) {
error("QOS id %d has a loop at QOS %s",
begin_qosid, qos_rec.name);
rc = 1;
break;
- } else if (qos_rec.preempt_bitstr) {
+ } else if(qos_rec.preempt_bitstr) {
/* check this qos' preempt list and make sure
no loops exist there either */
- if ((rc = _preemption_loop(mysql_conn, begin_qosid,
+ if((rc = _preemption_loop(mysql_conn, begin_qosid,
qos_rec.preempt_bitstr)))
break;
}
@@ -80,21 +80,21 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
char **cols, char **vals,
char **extra, char **added_preempt)
{
- if (!qos)
+ if(!qos)
return SLURM_ERROR;
- if (qos->description) {
+ if(qos->description) {
xstrcat(*cols, ", description");
xstrfmtcat(*vals, ", '%s'", qos->description);
xstrfmtcat(*extra, ", description='%s'",
qos->description);
}
- if (qos->grp_cpu_mins == (uint64_t)INFINITE) {
+ if(qos->grp_cpu_mins == (uint64_t)INFINITE) {
xstrcat(*cols, ", grp_cpu_mins");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_cpu_mins=NULL");
- } else if ((qos->grp_cpu_mins != (uint64_t)NO_VAL)
+ } else if((qos->grp_cpu_mins != (uint64_t)NO_VAL)
&& ((int64_t)qos->grp_cpu_mins >= 0)) {
xstrcat(*cols, ", grp_cpu_mins");
xstrfmtcat(*vals, ", %llu", qos->grp_cpu_mins);
@@ -102,11 +102,11 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->grp_cpu_mins);
}
- if (qos->grp_cpu_run_mins == (uint64_t)INFINITE) {
+ if(qos->grp_cpu_run_mins == (uint64_t)INFINITE) {
xstrcat(*cols, ", grp_cpu_run_mins");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_cpu_run_mins=NULL");
- } else if ((qos->grp_cpu_run_mins != (uint64_t)NO_VAL)
+ } else if((qos->grp_cpu_run_mins != (uint64_t)NO_VAL)
&& (int64_t)qos->grp_cpu_run_mins >= 0) {
xstrcat(*cols, ", grp_cpu_run_mins");
xstrfmtcat(*vals, ", %llu", qos->grp_cpu_run_mins);
@@ -114,44 +114,44 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->grp_cpu_run_mins);
}
- if (qos->grp_cpus == INFINITE) {
+ if(qos->grp_cpus == INFINITE) {
xstrcat(*cols, ", grp_cpus");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_cpus=NULL");
- } else if ((qos->grp_cpus != NO_VAL)
+ } else if((qos->grp_cpus != NO_VAL)
&& ((int32_t)qos->grp_cpus >= 0)) {
xstrcat(*cols, ", grp_cpus");
xstrfmtcat(*vals, ", %u", qos->grp_cpus);
xstrfmtcat(*extra, ", grp_cpus=%u", qos->grp_cpus);
}
- if (qos->grp_jobs == INFINITE) {
+ if(qos->grp_jobs == INFINITE) {
xstrcat(*cols, ", grp_jobs");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_jobs=NULL");
- } else if ((qos->grp_jobs != NO_VAL)
+ } else if((qos->grp_jobs != NO_VAL)
&& ((int32_t)qos->grp_jobs >= 0)) {
xstrcat(*cols, ", grp_jobs");
xstrfmtcat(*vals, ", %u", qos->grp_jobs);
xstrfmtcat(*extra, ", grp_jobs=%u", qos->grp_jobs);
}
- if (qos->grp_nodes == INFINITE) {
+ if(qos->grp_nodes == INFINITE) {
xstrcat(*cols, ", grp_nodes");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_nodes=NULL");
- } else if ((qos->grp_nodes != NO_VAL)
+ } else if((qos->grp_nodes != NO_VAL)
&& ((int32_t)qos->grp_nodes >= 0)) {
xstrcat(*cols, ", grp_nodes");
xstrfmtcat(*vals, ", %u", qos->grp_nodes);
xstrfmtcat(*extra, ", grp_nodes=%u", qos->grp_nodes);
}
- if (qos->grp_submit_jobs == INFINITE) {
+ if(qos->grp_submit_jobs == INFINITE) {
xstrcat(*cols, ", grp_submit_jobs");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_submit_jobs=NULL");
- } else if ((qos->grp_submit_jobs != NO_VAL)
+ } else if((qos->grp_submit_jobs != NO_VAL)
&& ((int32_t)qos->grp_submit_jobs >= 0)) {
xstrcat(*cols, ", grp_submit_jobs");
xstrfmtcat(*vals, ", %u", qos->grp_submit_jobs);
@@ -159,22 +159,22 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->grp_submit_jobs);
}
- if (qos->grp_wall == INFINITE) {
+ if(qos->grp_wall == INFINITE) {
xstrcat(*cols, ", grp_wall");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", grp_wall=NULL");
- } else if ((qos->grp_wall != NO_VAL)
+ } else if((qos->grp_wall != NO_VAL)
&& ((int32_t)qos->grp_wall >= 0)) {
xstrcat(*cols, ", grp_wall");
xstrfmtcat(*vals, ", %u", qos->grp_wall);
xstrfmtcat(*extra, ", grp_wall=%u", qos->grp_wall);
}
- if (qos->max_cpu_mins_pj == (uint64_t)INFINITE) {
+ if(qos->max_cpu_mins_pj == (uint64_t)INFINITE) {
xstrcat(*cols, ", max_cpu_mins_per_job");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_cpu_mins_per_job=NULL");
- } else if ((qos->max_cpu_mins_pj != (uint64_t)NO_VAL)
+ } else if((qos->max_cpu_mins_pj != (uint64_t)NO_VAL)
&& ((int64_t)qos->max_cpu_mins_pj >= 0)) {
xstrcat(*cols, ", max_cpu_mins_per_job");
xstrfmtcat(*vals, ", %llu", qos->max_cpu_mins_pj);
@@ -182,11 +182,11 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->max_cpu_mins_pj);
}
- if (qos->max_cpu_run_mins_pu == (uint64_t)INFINITE) {
+ if(qos->max_cpu_run_mins_pu == (uint64_t)INFINITE) {
xstrcat(*cols, ", max_cpu_run_mins_per_user");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_cpu_run_mins_per_user=NULL");
- } else if ((qos->max_cpu_run_mins_pu != (uint64_t)NO_VAL)
+ } else if((qos->max_cpu_run_mins_pu != (uint64_t)NO_VAL)
&& ((int64_t)qos->max_cpu_run_mins_pu >= 0)) {
xstrcat(*cols, ", max_cpu_run_mins_per_user");
xstrfmtcat(*vals, ", %llu", qos->max_cpu_run_mins_pu);
@@ -194,33 +194,33 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->max_cpu_run_mins_pu);
}
- if (qos->max_cpus_pj == INFINITE) {
+ if(qos->max_cpus_pj == INFINITE) {
xstrcat(*cols, ", max_cpus_per_job");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_cpus_per_job=NULL");
- } else if ((qos->max_cpus_pj != NO_VAL)
+ } else if((qos->max_cpus_pj != NO_VAL)
&& ((int32_t)qos->max_cpus_pj >= 0)) {
xstrcat(*cols, ", max_cpus_per_job");
xstrfmtcat(*vals, ", %u", qos->max_cpus_pj);
xstrfmtcat(*extra, ", max_cpus_per_job=%u", qos->max_cpus_pj);
}
- if (qos->max_jobs_pu == INFINITE) {
+ if(qos->max_jobs_pu == INFINITE) {
xstrcat(*cols, ", max_jobs_per_user");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_jobs_per_user=NULL");
- } else if ((qos->max_jobs_pu != NO_VAL)
+ } else if((qos->max_jobs_pu != NO_VAL)
&& ((int32_t)qos->max_jobs_pu >= 0)) {
xstrcat(*cols, ", max_jobs_per_user");
xstrfmtcat(*vals, ", %u", qos->max_jobs_pu);
xstrfmtcat(*extra, ", max_jobs_per_user=%u", qos->max_jobs_pu);
}
- if (qos->max_nodes_pj == INFINITE) {
+ if(qos->max_nodes_pj == INFINITE) {
xstrcat(*cols, ", max_nodes_per_job");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_nodes_per_job=NULL");
- } else if ((qos->max_nodes_pj != NO_VAL)
+ } else if((qos->max_nodes_pj != NO_VAL)
&& ((int32_t)qos->max_nodes_pj >= 0)) {
xstrcat(*cols, ", max_nodes_per_job");
xstrfmtcat(*vals, ", %u", qos->max_nodes_pj);
@@ -228,11 +228,11 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->max_nodes_pj);
}
- if (qos->max_submit_jobs_pu == INFINITE) {
+ if(qos->max_submit_jobs_pu == INFINITE) {
xstrcat(*cols, ", max_submit_jobs_per_user");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_submit_jobs_per_user=NULL");
- } else if ((qos->max_submit_jobs_pu != NO_VAL)
+ } else if((qos->max_submit_jobs_pu != NO_VAL)
&& ((int32_t)qos->max_submit_jobs_pu >= 0)) {
xstrcat(*cols, ", max_submit_jobs_per_user");
xstrfmtcat(*vals, ", %u", qos->max_submit_jobs_pu);
@@ -240,19 +240,19 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
qos->max_submit_jobs_pu);
}
- if ((qos->max_wall_pj != NO_VAL)
+ if((qos->max_wall_pj != NO_VAL)
&& ((int32_t)qos->max_wall_pj >= 0)) {
xstrcat(*cols, ", max_wall_duration_per_job");
xstrfmtcat(*vals, ", %u", qos->max_wall_pj);
xstrfmtcat(*extra, ", max_wall_duration_per_job=%u",
qos->max_wall_pj);
- } else if (qos->max_wall_pj == INFINITE) {
+ } else if(qos->max_wall_pj == INFINITE) {
xstrcat(*cols, ", max_wall_duration_per_job");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", max_wall_duration_per_job=NULL");
}
- if (qos->preempt_list && list_count(qos->preempt_list)) {
+ if(qos->preempt_list && list_count(qos->preempt_list)) {
char *preempt_val = NULL;
char *tmp_char = NULL, *begin_preempt = NULL;
ListIterator preempt_itr =
@@ -263,26 +263,26 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
begin_preempt = xstrdup("preempt");
while((tmp_char = list_next(preempt_itr))) {
- if (tmp_char[0] == '-') {
+ if(tmp_char[0] == '-') {
xstrfmtcat(preempt_val,
"replace(%s, ',%s', '')",
begin_preempt, tmp_char+1);
xfree(begin_preempt);
begin_preempt = preempt_val;
- } else if (tmp_char[0] == '+') {
+ } else if(tmp_char[0] == '+') {
xstrfmtcat(preempt_val,
"concat("
"replace(%s, ',%s', ''), ',%s')",
begin_preempt,
tmp_char+1, tmp_char+1);
- if (added_preempt)
+ if(added_preempt)
xstrfmtcat(*added_preempt, ",%s",
tmp_char+1);
xfree(begin_preempt);
begin_preempt = preempt_val;
- } else if (tmp_char[0]) {
+ } else if(tmp_char[0]) {
xstrfmtcat(preempt_val, ",%s", tmp_char);
- if (added_preempt)
+ if(added_preempt)
xstrfmtcat(*added_preempt, ",%s",
tmp_char);
} else
@@ -295,7 +295,7 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
xfree(preempt_val);
}
- if ((qos->usage_factor != (int16_t)NO_VAL)
+ if((qos->usage_factor != (int16_t)NO_VAL)
&& ((int16_t)qos->preempt_mode >= 0)) {
qos->preempt_mode &= (~PREEMPT_MODE_GANG);
xstrcat(*cols, ", preempt_mode");
@@ -307,18 +307,18 @@ static int _setup_qos_limits(slurmdb_qos_rec_t *qos,
xstrcat(*cols, ", priority");
xstrcat(*vals, ", NULL");
xstrcat(*extra, ", priority=NULL");
- } else if ((qos->priority != NO_VAL)
+ } else if((qos->priority != NO_VAL)
&& ((int32_t)qos->priority >= 0)) {
xstrcat(*cols, ", priority");
xstrfmtcat(*vals, ", %u", qos->priority);
xstrfmtcat(*extra, ", priority=%u", qos->priority);
}
- if (qos->usage_factor == INFINITE) {
+ if(qos->usage_factor == INFINITE) {
xstrcat(*cols, ", usage_factor");
xstrcat(*vals, ", 1");
xstrcat(*extra, ", usage_factor=1");
- } else if ((qos->usage_factor != NO_VAL)
+ } else if((qos->usage_factor != NO_VAL)
&& ((int32_t)qos->usage_factor >= 0)) {
xstrcat(*cols, ", usage_factor");
xstrfmtcat(*vals, ", %f", qos->usage_factor);
@@ -343,13 +343,13 @@ extern int as_mysql_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
int added = 0;
char *added_preempt = NULL;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(qos_list);
while((object = list_next(itr))) {
- if (!object->name || !object->name[0]) {
+ if(!object->name || !object->name[0]) {
error("We need a qos name to add.");
rc = SLURM_ERROR;
continue;
@@ -360,7 +360,7 @@ extern int as_mysql_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrfmtcat(extra, ", mod_time=%d", now);
_setup_qos_limits(object, &cols, &vals, &extra, &added_preempt);
- if (added_preempt) {
+ if(added_preempt) {
object->preempt_bitstr = bit_alloc(g_qos_count);
bit_unfmt(object->preempt_bitstr, added_preempt+1);
xfree(added_preempt);
@@ -377,7 +377,7 @@ extern int as_mysql_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_conn->conn, THIS_FILE, __LINE__, query);
object->id = mysql_insert_ret_id(mysql_conn->db_conn, query);
xfree(query);
- if (!object->id) {
+ if(!object->id) {
error("Couldn't add qos %s", object->name);
added=0;
xfree(cols);
@@ -388,7 +388,7 @@ extern int as_mysql_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
affect_rows = last_affected_rows(mysql_conn->db_conn);
- if (!affect_rows) {
+ if(!affect_rows) {
debug2("nothing changed %d", affect_rows);
xfree(cols);
xfree(extra);
@@ -414,10 +414,10 @@ extern int as_mysql_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
debug4("query\n%s",query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
} else {
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_ADD_QOS,
object) == SLURM_SUCCESS)
list_remove(itr);
@@ -428,7 +428,7 @@ extern int as_mysql_add_qos(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xfree(user_name);
- if (!added) {
+ if(!added) {
reset_mysql_conn(mysql_conn);
}
@@ -453,23 +453,23 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
bitstr_t *preempt_bitstr = NULL;
char *added_preempt = NULL;
- if (!qos_cond || !qos) {
+ if(!qos_cond || !qos) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
xstrcat(extra, "where deleted=0");
- if (qos_cond->description_list
+ if(qos_cond->description_list
&& list_count(qos_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->description_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description='%s'", object);
set = 1;
@@ -478,13 +478,13 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (qos_cond->id_list
+ if(qos_cond->id_list
&& list_count(qos_cond->id_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->id_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id='%s'", object);
set = 1;
@@ -493,13 +493,13 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (qos_cond->name_list
+ if(qos_cond->name_list
&& list_count(qos_cond->name_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->name_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -509,7 +509,7 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
}
_setup_qos_limits(qos, &tmp_char1, &tmp_char2, &vals, &added_preempt);
- if (added_preempt) {
+ if(added_preempt) {
preempt_bitstr = bit_alloc(g_qos_count);
bit_unfmt(preempt_bitstr, added_preempt+1);
xfree(added_preempt);
@@ -517,7 +517,7 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(tmp_char1);
xfree(tmp_char2);
- if (!extra || !vals) {
+ if(!extra || !vals) {
errno = SLURM_NO_CHANGE_IN_DATA;
FREE_NULL_BITMAP(preempt_bitstr);
error("Nothing to change");
@@ -526,7 +526,7 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
query = xstrdup_printf("select name, preempt, id from %s %s;",
qos_table, extra);
xfree(extra);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
FREE_NULL_BITMAP(preempt_bitstr);
return NULL;
@@ -537,13 +537,13 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
while((row = mysql_fetch_row(result))) {
slurmdb_qos_rec_t *qos_rec = NULL;
int id = atoi(row[2]);
- if (preempt_bitstr) {
- if (_preemption_loop(mysql_conn, id, preempt_bitstr))
+ if(preempt_bitstr) {
+ if(_preemption_loop(mysql_conn, id, preempt_bitstr))
break;
}
object = xstrdup(row[0]);
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "(name='%s'", object);
rc = 1;
} else {
@@ -572,25 +572,25 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
qos_rec->preempt_mode = qos->preempt_mode;
qos_rec->priority = qos->priority;
- if (qos->preempt_list) {
+ if(qos->preempt_list) {
ListIterator new_preempt_itr =
list_iterator_create(qos->preempt_list);
char *new_preempt = NULL;
qos_rec->preempt_bitstr = bit_alloc(g_qos_count);
- if (row[1] && row[1][0])
+ if(row[1] && row[1][0])
bit_unfmt(qos_rec->preempt_bitstr, row[1]+1);
while((new_preempt = list_next(new_preempt_itr))) {
bool cleared = 0;
- if (new_preempt[0] == '-') {
+ if(new_preempt[0] == '-') {
bit_clear(qos_rec->preempt_bitstr,
atoi(new_preempt+1));
- } else if (new_preempt[0] == '+') {
+ } else if(new_preempt[0] == '+') {
bit_set(qos_rec->preempt_bitstr,
atoi(new_preempt+1));
} else {
- if (!cleared) {
+ if(!cleared) {
cleared = 1;
bit_nclear(
qos_rec->preempt_bitstr,
@@ -612,7 +612,7 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
FREE_NULL_BITMAP(preempt_bitstr);
- if (row) {
+ if(row) {
xfree(vals);
xfree(name_char);
xfree(query);
@@ -622,7 +622,7 @@ extern List as_mysql_modify_qos(mysql_conn_t *mysql_conn, uint32_t uid,
return ret_list;
}
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(vals);
@@ -662,22 +662,22 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
MYSQL_RES *result = NULL;
MYSQL_ROW row;
- if (!qos_cond) {
+ if(!qos_cond) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
xstrcat(extra, "where deleted=0");
- if (qos_cond->description_list
+ if(qos_cond->description_list
&& list_count(qos_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->description_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description='%s'", object);
set = 1;
@@ -686,15 +686,15 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (qos_cond->id_list
+ if(qos_cond->id_list
&& list_count(qos_cond->id_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->id_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id='%s'", object);
set = 1;
@@ -703,15 +703,15 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (qos_cond->name_list
+ if(qos_cond->name_list
&& list_count(qos_cond->name_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->name_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -720,14 +720,14 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (!extra) {
+ if(!extra) {
error("Nothing to remove");
return NULL;
}
query = xstrdup_printf("select id, name from %s %s;", qos_table, extra);
xfree(extra);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -739,11 +739,11 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
slurmdb_qos_rec_t *qos_rec = NULL;
list_append(ret_list, xstrdup(row[1]));
- if (!name_char)
+ if(!name_char)
xstrfmtcat(name_char, "id='%s'", row[0]);
else
xstrfmtcat(name_char, " || id='%s'", row[0]);
- if (!assoc_char)
+ if(!assoc_char)
xstrfmtcat(assoc_char, "id_qos='%s'", row[0]);
else
xstrfmtcat(assoc_char, " || id_qos='%s'", row[0]);
@@ -761,7 +761,7 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
}
mysql_free_result(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(query);
@@ -777,7 +777,7 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
reset_mysql_conn(mysql_conn);
list_destroy(ret_list);
return NULL;
@@ -788,7 +788,7 @@ extern List as_mysql_remove_qos(mysql_conn_t *mysql_conn, uint32_t uid,
slurm_mutex_lock(&as_mysql_cluster_list_lock);
itr = list_iterator_create(as_mysql_cluster_list);
while((object = list_next(itr))) {
- if ((rc = remove_common(mysql_conn, DBD_REMOVE_QOS, now,
+ if((rc = remove_common(mysql_conn, DBD_REMOVE_QOS, now,
user_name, qos_table, name_char,
assoc_char, object, NULL, NULL))
!= SLURM_SUCCESS)
@@ -871,27 +871,27 @@ extern List as_mysql_get_qos(mysql_conn_t *mysql_conn, uid_t uid,
QOS_REQ_COUNT
};
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
- if (!qos_cond) {
+ if(!qos_cond) {
xstrcat(extra, "where deleted=0");
goto empty;
}
- if (qos_cond->with_deleted)
+ if(qos_cond->with_deleted)
xstrcat(extra, "where (deleted=0 || deleted=1)");
else
xstrcat(extra, "where deleted=0");
- if (qos_cond->description_list
+ if(qos_cond->description_list
&& list_count(qos_cond->description_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->description_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "description='%s'", object);
set = 1;
@@ -900,13 +900,13 @@ extern List as_mysql_get_qos(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (qos_cond->id_list
+ if(qos_cond->id_list
&& list_count(qos_cond->id_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->id_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id='%s'", object);
set = 1;
@@ -915,13 +915,13 @@ extern List as_mysql_get_qos(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (qos_cond->name_list
+ if(qos_cond->name_list
&& list_count(qos_cond->name_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(qos_cond->name_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -944,7 +944,7 @@ empty:
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -957,83 +957,83 @@ empty:
slurmdb_qos_rec_t *qos = xmalloc(sizeof(slurmdb_qos_rec_t));
list_append(qos_list, qos);
- if (row[QOS_REQ_DESC] && row[QOS_REQ_DESC][0])
+ if(row[QOS_REQ_DESC] && row[QOS_REQ_DESC][0])
qos->description = xstrdup(row[QOS_REQ_DESC]);
qos->id = atoi(row[QOS_REQ_ID]);
- if (row[QOS_REQ_NAME] && row[QOS_REQ_NAME][0])
+ if(row[QOS_REQ_NAME] && row[QOS_REQ_NAME][0])
qos->name = xstrdup(row[QOS_REQ_NAME]);
- if (row[QOS_REQ_GCM])
+ if(row[QOS_REQ_GCM])
qos->grp_cpu_mins = atoll(row[QOS_REQ_GCM]);
else
qos->grp_cpu_mins = INFINITE;
- if (row[QOS_REQ_GCRM])
+ if(row[QOS_REQ_GCRM])
qos->grp_cpu_run_mins = atoll(row[QOS_REQ_GCRM]);
else
qos->grp_cpu_run_mins = INFINITE;
- if (row[QOS_REQ_GC])
+ if(row[QOS_REQ_GC])
qos->grp_cpus = atoi(row[QOS_REQ_GC]);
else
qos->grp_cpus = INFINITE;
- if (row[QOS_REQ_GJ])
+ if(row[QOS_REQ_GJ])
qos->grp_jobs = atoi(row[QOS_REQ_GJ]);
else
qos->grp_jobs = INFINITE;
- if (row[QOS_REQ_GN])
+ if(row[QOS_REQ_GN])
qos->grp_nodes = atoi(row[QOS_REQ_GN]);
else
qos->grp_nodes = INFINITE;
- if (row[QOS_REQ_GSJ])
+ if(row[QOS_REQ_GSJ])
qos->grp_submit_jobs = atoi(row[QOS_REQ_GSJ]);
else
qos->grp_submit_jobs = INFINITE;
- if (row[QOS_REQ_GW])
+ if(row[QOS_REQ_GW])
qos->grp_wall = atoi(row[QOS_REQ_GW]);
else
qos->grp_wall = INFINITE;
- if (row[QOS_REQ_MCMPJ])
+ if(row[QOS_REQ_MCMPJ])
qos->max_cpu_mins_pj = atoll(row[QOS_REQ_MCMPJ]);
else
qos->max_cpu_mins_pj = (uint64_t)INFINITE;
- if (row[QOS_REQ_MCRM])
+ if(row[QOS_REQ_MCRM])
qos->max_cpu_run_mins_pu = atoll(row[QOS_REQ_MCRM]);
else
qos->max_cpu_run_mins_pu = (uint64_t)INFINITE;
- if (row[QOS_REQ_MCPJ])
+ if(row[QOS_REQ_MCPJ])
qos->max_cpus_pj = atoi(row[QOS_REQ_MCPJ]);
else
qos->max_cpus_pj = INFINITE;
- if (row[QOS_REQ_MJPU])
+ if(row[QOS_REQ_MJPU])
qos->max_jobs_pu = atoi(row[QOS_REQ_MJPU]);
else
qos->max_jobs_pu = INFINITE;
- if (row[QOS_REQ_MNPJ])
+ if(row[QOS_REQ_MNPJ])
qos->max_nodes_pj = atoi(row[QOS_REQ_MNPJ]);
else
qos->max_nodes_pj = INFINITE;
- if (row[QOS_REQ_MSJPU])
+ if(row[QOS_REQ_MSJPU])
qos->max_submit_jobs_pu = atoi(row[QOS_REQ_MSJPU]);
else
qos->max_submit_jobs_pu = INFINITE;
- if (row[QOS_REQ_MWPJ])
+ if(row[QOS_REQ_MWPJ])
qos->max_wall_pj = atoi(row[QOS_REQ_MWPJ]);
else
qos->max_wall_pj = INFINITE;
- if (row[QOS_REQ_PREE] && row[QOS_REQ_PREE][0]) {
- if (!qos->preempt_bitstr)
+ if(row[QOS_REQ_PREE] && row[QOS_REQ_PREE][0]) {
+ if(!qos->preempt_bitstr)
qos->preempt_bitstr = bit_alloc(g_qos_count);
bit_unfmt(qos->preempt_bitstr, row[QOS_REQ_PREE]+1);
}
- if (row[QOS_REQ_PREEM])
+ if(row[QOS_REQ_PREEM])
qos->preempt_mode = atoi(row[QOS_REQ_PREEM]);
- if (row[QOS_REQ_PRIO])
+ if(row[QOS_REQ_PRIO])
qos->priority = atoi(row[QOS_REQ_PRIO]);
- if (row[QOS_REQ_UF])
+ if(row[QOS_REQ_UF])
qos->usage_factor = atof(row[QOS_REQ_UF]);
}
mysql_free_result(result);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_resv.c b/src/plugins/accounting_storage/mysql/as_mysql_resv.c
index a8dba6f58a5b885845021430be7f6ba64f8e715e..5f7dcc395990b7d3ef24a8a866a6660c088ad334 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_resv.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_resv.c
@@ -46,14 +46,14 @@ static int _setup_resv_limits(slurmdb_reservation_rec_t *resv,
{
/* strip off the action item from the flags */
- if (resv->assocs) {
+ if(resv->assocs) {
int start = 0;
int len = strlen(resv->assocs)-1;
/* strip off extra ,'s */
- if (resv->assocs[0] == ',')
+ if(resv->assocs[0] == ',')
start = 1;
- if (resv->assocs[len] == ',')
+ if(resv->assocs[len] == ',')
resv->assocs[len] = '\0';
xstrcat(*cols, ", assoclist");
@@ -61,43 +61,43 @@ static int _setup_resv_limits(slurmdb_reservation_rec_t *resv,
xstrfmtcat(*extra, ", assoclist='%s'", resv->assocs+start);
}
- if (resv->cpus != (uint32_t)NO_VAL) {
+ if(resv->cpus != (uint32_t)NO_VAL) {
xstrcat(*cols, ", cpus");
xstrfmtcat(*vals, ", %u", resv->cpus);
xstrfmtcat(*extra, ", cpus=%u", resv->cpus);
}
- if (resv->flags != (uint16_t)NO_VAL) {
+ if(resv->flags != (uint16_t)NO_VAL) {
xstrcat(*cols, ", flags");
xstrfmtcat(*vals, ", %u", resv->flags);
xstrfmtcat(*extra, ", flags=%u", resv->flags);
}
- if (resv->name) {
+ if(resv->name) {
xstrcat(*cols, ", resv_name");
xstrfmtcat(*vals, ", '%s'", resv->name);
xstrfmtcat(*extra, ", resv_name='%s'", resv->name);
}
- if (resv->nodes) {
+ if(resv->nodes) {
xstrcat(*cols, ", nodelist");
xstrfmtcat(*vals, ", '%s'", resv->nodes);
xstrfmtcat(*extra, ", nodelist='%s'", resv->nodes);
}
- if (resv->node_inx) {
+ if(resv->node_inx) {
xstrcat(*cols, ", node_inx");
xstrfmtcat(*vals, ", '%s'", resv->node_inx);
xstrfmtcat(*extra, ", node_inx='%s'", resv->node_inx);
}
- if (resv->time_end) {
+ if(resv->time_end) {
xstrcat(*cols, ", time_end");
xstrfmtcat(*vals, ", %u", resv->time_end);
xstrfmtcat(*extra, ", time_end=%u", resv->time_end);
}
- if (resv->time_start) {
+ if(resv->time_start) {
xstrcat(*cols, ", time_start");
xstrfmtcat(*vals, ", %u", resv->time_start);
xstrfmtcat(*extra, ", time_start=%u", resv->time_start);
@@ -115,18 +115,18 @@ static int _setup_resv_cond_limits(slurmdb_reservation_cond_t *resv_cond,
char *prefix = "t1";
time_t now = time(NULL);
- if (!resv_cond)
+ if(!resv_cond)
return 0;
- if (resv_cond->id_list && list_count(resv_cond->id_list)) {
+ if(resv_cond->id_list && list_count(resv_cond->id_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(resv_cond->id_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.id_resv=%s", prefix, object);
set = 1;
@@ -135,15 +135,15 @@ static int _setup_resv_cond_limits(slurmdb_reservation_cond_t *resv_cond,
xstrcat(*extra, ")");
}
- if (resv_cond->name_list && list_count(resv_cond->name_list)) {
+ if(resv_cond->name_list && list_count(resv_cond->name_list)) {
set = 0;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
itr = list_iterator_create(resv_cond->name_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.resv_name='%s'",
prefix, object);
@@ -153,11 +153,11 @@ static int _setup_resv_cond_limits(slurmdb_reservation_cond_t *resv_cond,
xstrcat(*extra, ")");
}
- if (resv_cond->time_start) {
- if (!resv_cond->time_end)
+ if(resv_cond->time_start) {
+ if(!resv_cond->time_end)
resv_cond->time_end = now;
- if (*extra)
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
@@ -165,8 +165,8 @@ static int _setup_resv_cond_limits(slurmdb_reservation_cond_t *resv_cond,
"(t1.time_start < %d "
"&& (t1.time_end >= %d || t1.time_end = 0)))",
resv_cond->time_end, resv_cond->time_start);
- } else if (resv_cond->time_end) {
- if (*extra)
+ } else if(resv_cond->time_end) {
+ if(*extra)
xstrcat(*extra, " && (");
else
xstrcat(*extra, " where (");
@@ -185,20 +185,20 @@ extern int as_mysql_add_resv(mysql_conn_t *mysql_conn,
char *cols = NULL, *vals = NULL, *extra = NULL,
*query = NULL;//, *tmp_extra = NULL;
- if (!resv) {
+ if(!resv) {
error("No reservation was given to edit");
return SLURM_ERROR;
}
- if (!resv->id) {
+ if(!resv->id) {
error("We need an id to edit a reservation.");
return SLURM_ERROR;
}
- if (!resv->time_start) {
+ if(!resv->time_start) {
error("We need a start time to edit a reservation.");
return SLURM_ERROR;
}
- if (!resv->cluster || !resv->cluster[0]) {
+ if(!resv->cluster || !resv->cluster[0]) {
error("We need a cluster name to edit a reservation.");
return SLURM_ERROR;
}
@@ -212,7 +212,7 @@ extern int as_mysql_add_resv(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if ((rc = mysql_db_query(mysql_conn->db_conn, query)
+ if((rc = mysql_db_query(mysql_conn->db_conn, query)
== SLURM_SUCCESS))
rc = mysql_clear_results(mysql_conn->db_conn);
@@ -257,25 +257,25 @@ extern int as_mysql_modify_resv(mysql_conn_t *mysql_conn,
RESV_COUNT
};
- if (!resv) {
+ if(!resv) {
error("No reservation was given to edit");
return SLURM_ERROR;
}
- if (!resv->id) {
+ if(!resv->id) {
error("We need an id to edit a reservation.");
return SLURM_ERROR;
}
- if (!resv->time_start) {
+ if(!resv->time_start) {
error("We need a start time to edit a reservation.");
return SLURM_ERROR;
}
- if (!resv->cluster || !resv->cluster[0]) {
+ if(!resv->cluster || !resv->cluster[0]) {
error("We need a cluster name to edit a reservation.");
return SLURM_ERROR;
}
- if (!resv->time_start_prev) {
+ if(!resv->time_start_prev) {
error("We need a time to check for last "
"start of reservation.");
return SLURM_ERROR;
@@ -299,18 +299,18 @@ extern int as_mysql_modify_resv(mysql_conn_t *mysql_conn,
try_again:
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
rc = SLURM_ERROR;
goto end_it;
}
- if (!(row = mysql_fetch_row(result))) {
+ if(!(row = mysql_fetch_row(result))) {
rc = SLURM_ERROR;
mysql_free_result(result);
error("There is no reservation by id %u, "
"time_start %d, and cluster '%s'", resv->id,
resv->time_start_prev, resv->cluster);
- if (!set && resv->time_end) {
+ if(!set && resv->time_end) {
/* This should never really happen,
but just incase the controller and the
database get out of sync we check
@@ -339,7 +339,7 @@ try_again:
/* check differences here */
- if (!resv->name
+ if(!resv->name
&& row[RESV_NAME] && row[RESV_NAME][0])
// if this changes we just update the
// record, no need to create a new one since
@@ -347,29 +347,29 @@ try_again:
// reservation accounting wise
resv->name = xstrdup(row[RESV_NAME]);
- if (resv->assocs)
+ if(resv->assocs)
set = 1;
- else if (row[RESV_ASSOCS] && row[RESV_ASSOCS][0])
+ else if(row[RESV_ASSOCS] && row[RESV_ASSOCS][0])
resv->assocs = xstrdup(row[RESV_ASSOCS]);
- if (resv->cpus != (uint32_t)NO_VAL)
+ if(resv->cpus != (uint32_t)NO_VAL)
set = 1;
else
resv->cpus = atoi(row[RESV_CPU]);
- if (resv->flags != (uint16_t)NO_VAL)
+ if(resv->flags != (uint16_t)NO_VAL)
set = 1;
else
resv->flags = atoi(row[RESV_FLAGS]);
- if (resv->nodes)
+ if(resv->nodes)
set = 1;
- else if (row[RESV_NODES] && row[RESV_NODES][0]) {
+ else if(row[RESV_NODES] && row[RESV_NODES][0]) {
resv->nodes = xstrdup(row[RESV_NODES]);
resv->node_inx = xstrdup(row[RESV_NODE_INX]);
}
- if (!resv->time_end)
+ if(!resv->time_end)
resv->time_end = atoi(row[RESV_END]);
mysql_free_result(result);
@@ -379,7 +379,7 @@ try_again:
* just incase we have a different one from being out
* of sync
*/
- if ((start > now) || !set) {
+ if((start > now) || !set) {
/* we haven't started the reservation yet, or
we are changing the associations or end
time which we can just update it */
@@ -409,7 +409,7 @@ try_again:
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if ((rc = mysql_db_query(mysql_conn->db_conn, query)
+ if((rc = mysql_db_query(mysql_conn->db_conn, query)
== SLURM_SUCCESS))
rc = mysql_clear_results(mysql_conn->db_conn);
@@ -429,12 +429,12 @@ extern int as_mysql_remove_resv(mysql_conn_t *mysql_conn,
int rc = SLURM_SUCCESS;
char *query = NULL;//, *tmp_extra = NULL;
- if (!resv) {
+ if(!resv) {
error("No reservation was given to edit");
return SLURM_ERROR;
}
- if (!resv->id || !resv->time_start || !resv->cluster) {
+ if(!resv->id || !resv->time_start || !resv->cluster) {
error("We need an id, start time, and cluster "
"name to edit a reservation.");
return SLURM_ERROR;
@@ -460,7 +460,7 @@ extern int as_mysql_remove_resv(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if ((rc = mysql_db_query(mysql_conn->db_conn, query)
+ if((rc = mysql_db_query(mysql_conn->db_conn, query)
== SLURM_SUCCESS))
rc = mysql_clear_results(mysql_conn->db_conn);
@@ -517,17 +517,17 @@ extern List as_mysql_get_resvs(mysql_conn_t *mysql_conn, uid_t uid,
RESV_REQ_COUNT
};
- if (!resv_cond) {
+ if(!resv_cond) {
xstrcat(extra, " where deleted=0");
goto empty;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
private_data = slurm_get_private_data();
if (private_data & PRIVATE_DATA_RESERVATIONS) {
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR))) {
error("Only admins can look at reservations");
errno = ESLURM_ACCESS_DENIED;
@@ -536,14 +536,14 @@ extern List as_mysql_get_resvs(mysql_conn_t *mysql_conn, uid_t uid,
}
memset(&job_cond, 0, sizeof(slurmdb_job_cond_t));
- if (resv_cond->nodes) {
+ if(resv_cond->nodes) {
job_cond.usage_start = resv_cond->time_start;
job_cond.usage_end = resv_cond->time_end;
job_cond.used_nodes = resv_cond->nodes;
job_cond.cluster_list = resv_cond->cluster_list;
local_cluster_list = setup_cluster_list_with_inx(
mysql_conn, &job_cond, (void **)&curr_cluster);
- } else if (with_usage) {
+ } else if(with_usage) {
job_cond.usage_start = resv_cond->time_start;
job_cond.usage_end = resv_cond->time_end;
}
@@ -559,14 +559,14 @@ empty:
xstrfmtcat(tmp, ", t1.%s", resv_req_inx[i]);
}
- if (resv_cond->cluster_list && list_count(resv_cond->cluster_list))
+ if(resv_cond->cluster_list && list_count(resv_cond->cluster_list))
use_cluster_list = resv_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
itr = list_iterator_create(use_cluster_list);
while((cluster_name = list_next(itr))) {
- if (query)
+ if(query)
xstrcat(query, " union ");
//START_TIMER;
xstrfmtcat(query, "select distinct %s,'%s' as cluster "
@@ -574,19 +574,19 @@ empty:
tmp, cluster_name, cluster_name, resv_table, extra);
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
- if (query)
+ if(query)
xstrcat(query, " order by cluster, resv_name;");
xfree(tmp);
xfree(extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
+ if(!(result = mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
return NULL;
}
@@ -600,13 +600,13 @@ empty:
int start = atoi(row[RESV_REQ_START]);
list_append(resv_list, resv);
- if (!good_nodes_from_inx(local_cluster_list, &curr_cluster,
+ if(!good_nodes_from_inx(local_cluster_list, &curr_cluster,
row[RESV_REQ_NODE_INX], start))
continue;
resv->id = atoi(row[RESV_REQ_ID]);
- if (with_usage) {
- if (!job_cond.resvid_list)
+ if(with_usage) {
+ if(!job_cond.resvid_list)
job_cond.resvid_list = list_create(NULL);
list_append(job_cond.resvid_list, row[RESV_REQ_ID]);
}
@@ -620,17 +620,17 @@ empty:
resv->flags = atoi(row[RESV_REQ_FLAGS]);
}
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
- if (with_usage && resv_list && list_count(resv_list)) {
+ if(with_usage && resv_list && list_count(resv_list)) {
List job_list = as_mysql_jobacct_process_get_jobs(
mysql_conn, uid, &job_cond);
ListIterator itr = NULL, itr2 = NULL;
slurmdb_job_rec_t *job = NULL;
slurmdb_reservation_rec_t *resv = NULL;
- if (!job_list || !list_count(job_list))
+ if(!job_list || !list_count(job_list))
goto no_jobs;
itr = list_iterator_create(job_list);
@@ -646,24 +646,24 @@ empty:
have to make sure we get the time
in the correct record.
*/
- if (resv->id != job->resvid)
+ if(resv->id != job->resvid)
continue;
set = 1;
- if (start < resv->time_start)
+ if(start < resv->time_start)
start = resv->time_start;
- if (!end || end > resv->time_end)
+ if(!end || end > resv->time_end)
end = resv->time_end;
- if ((elapsed = (end - start)) < 1)
+ if((elapsed = (end - start)) < 1)
continue;
- if (job->alloc_cpus)
+ if(job->alloc_cpus)
resv->alloc_secs +=
elapsed * job->alloc_cpus;
}
list_iterator_reset(itr2);
- if (!set) {
+ if(!set) {
error("we got a job %u with no reservation "
"associatied with it?", job->jobid);
}
@@ -672,11 +672,11 @@ empty:
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
no_jobs:
- if (job_list)
+ if(job_list)
list_destroy(job_list);
}
- if (job_cond.resvid_list) {
+ if(job_cond.resvid_list) {
list_destroy(job_cond.resvid_list);
job_cond.resvid_list = NULL;
}
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_rollup.c b/src/plugins/accounting_storage/mysql/as_mysql_rollup.c
index b6b5e89e79cd66bb00f9c7c8b206b85a0dc66fa5..f65e434966e333b324595abc0604cb8d694d904e 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_rollup.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_rollup.c
@@ -73,7 +73,7 @@ typedef struct {
static void _destroy_local_id_usage(void *object)
{
local_id_usage_t *a_usage = (local_id_usage_t *)object;
- if (a_usage) {
+ if(a_usage) {
xfree(a_usage);
}
}
@@ -81,7 +81,7 @@ static void _destroy_local_id_usage(void *object)
static void _destroy_local_cluster_usage(void *object)
{
local_cluster_usage_t *c_usage = (local_cluster_usage_t *)object;
- if (c_usage) {
+ if(c_usage) {
xfree(c_usage);
}
}
@@ -89,8 +89,8 @@ static void _destroy_local_cluster_usage(void *object)
static void _destroy_local_resv_usage(void *object)
{
local_resv_usage_t *r_usage = (local_resv_usage_t *)object;
- if (r_usage) {
- if (r_usage->local_assocs)
+ if(r_usage) {
+ if(r_usage->local_assocs)
list_destroy(r_usage->local_assocs);
xfree(r_usage);
}
@@ -108,10 +108,10 @@ static int _process_purge(mysql_conn_t *mysql_conn,
/* if we didn't ask for archive data return here and don't do
anything extra just rollup */
- if (!archive_data)
+ if(!archive_data)
return SLURM_SUCCESS;
- if (!slurmdbd_conf)
+ if(!slurmdbd_conf)
return SLURM_SUCCESS;
memset(&job_cond, 0, sizeof(job_cond));
@@ -119,19 +119,19 @@ static int _process_purge(mysql_conn_t *mysql_conn,
arch_cond.archive_dir = slurmdbd_conf->archive_dir;
arch_cond.archive_script = slurmdbd_conf->archive_script;
- if (purge_period & slurmdbd_conf->purge_event)
+ if(purge_period & slurmdbd_conf->purge_event)
arch_cond.purge_event = slurmdbd_conf->purge_event;
else
arch_cond.purge_event = NO_VAL;
- if (purge_period & slurmdbd_conf->purge_job)
+ if(purge_period & slurmdbd_conf->purge_job)
arch_cond.purge_job = slurmdbd_conf->purge_job;
else
arch_cond.purge_job = NO_VAL;
- if (purge_period & slurmdbd_conf->purge_step)
+ if(purge_period & slurmdbd_conf->purge_step)
arch_cond.purge_step = slurmdbd_conf->purge_step;
else
arch_cond.purge_step = NO_VAL;
- if (purge_period & slurmdbd_conf->purge_suspend)
+ if(purge_period & slurmdbd_conf->purge_suspend)
arch_cond.purge_suspend = slurmdbd_conf->purge_suspend;
else
arch_cond.purge_suspend = NO_VAL;
@@ -304,7 +304,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -316,28 +316,28 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
int row_end = atoi(row[EVENT_REQ_END]);
int row_cpu = atoi(row[EVENT_REQ_CPU]);
- if (row_start < curr_start)
+ if(row_start < curr_start)
row_start = curr_start;
- if (!row_end || row_end > curr_end)
+ if(!row_end || row_end > curr_end)
row_end = curr_end;
/* Don't worry about it if the time is less
* than 1 second.
*/
- if ((row_end - row_start) < 1)
+ if((row_end - row_start) < 1)
continue;
/* this means we are a cluster registration
entry */
- if (!row[EVENT_REQ_NAME][0]) {
+ if(!row[EVENT_REQ_NAME][0]) {
/* if the cpu count changes we will
* only care about the last cpu count but
* we will keep a total of the time for
* all cpus to get the correct cpu time
* for the entire period.
*/
- if (!c_usage) {
+ if(!c_usage) {
c_usage = xmalloc(
sizeof(local_cluster_usage_t));
c_usage->cpu_count = row_cpu;
@@ -360,15 +360,15 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
are looking for. If it was during this
time period we would already have it.
*/
- if (c_usage) {
+ if(c_usage) {
int local_start = row_start;
int local_end = row_end;
- if (c_usage->start > local_start)
+ if(c_usage->start > local_start)
local_start = c_usage->start;
- if (c_usage->end < local_end)
+ if(c_usage->end < local_end)
local_end = c_usage->end;
- if ((local_end - local_start) > 0) {
+ if((local_end - local_start) > 0) {
seconds = (local_end - local_start);
/* info("node %s adds " */
@@ -395,7 +395,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -424,16 +424,16 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
int row_cpu = atoi(row[RESV_REQ_CPU]);
int row_flags = atoi(row[RESV_REQ_FLAGS]);
- if (row_start < curr_start)
+ if(row_start < curr_start)
row_start = curr_start;
- if (!row_end || row_end > curr_end)
+ if(!row_end || row_end > curr_end)
row_end = curr_end;
/* Don't worry about it if the time is less
* than 1 second.
*/
- if ((row_end - row_start) < 1)
+ if((row_end - row_start) < 1)
continue;
r_usage = xmalloc(sizeof(local_resv_usage_t));
@@ -461,9 +461,9 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
registered. This continue should rarely if
ever happen.
*/
- if (!c_usage)
+ if(!c_usage)
continue;
- else if (row_flags & RESERVE_FLAG_MAINT)
+ else if(row_flags & RESERVE_FLAG_MAINT)
c_usage->pd_cpu += r_usage->total_time;
else
c_usage->a_cpu += r_usage->total_time;
@@ -490,7 +490,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -509,21 +509,21 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
int row_rcpu = atoi(row[JOB_REQ_RCPU]);
seconds = 0;
- if (row_start && (row_start < curr_start))
+ if(row_start && (row_start < curr_start))
row_start = curr_start;
- if (!row_start && row_end)
+ if(!row_start && row_end)
row_start = row_end;
- if (!row_end || row_end > curr_end)
+ if(!row_end || row_end > curr_end)
row_end = curr_end;
- if (!row_start || ((row_end - row_start) < 1))
+ if(!row_start || ((row_end - row_start) < 1))
goto calc_cluster;
seconds = (row_end - row_start);
- if (row[JOB_REQ_SUSPENDED]) {
+ if(row[JOB_REQ_SUSPENDED]) {
MYSQL_RES *result2 = NULL;
MYSQL_ROW row2;
/* get the suspended time for this job */
@@ -540,7 +540,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE,
__LINE__, query);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn,
query, 0))) {
xfree(query);
@@ -553,28 +553,28 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
int local_end =
atoi(row2[SUSPEND_REQ_END]);
- if (!local_start)
+ if(!local_start)
continue;
- if (row_start > local_start)
+ if(row_start > local_start)
local_start = row_start;
- if (row_end < local_end)
+ if(row_end < local_end)
local_end = row_end;
- if ((local_end - local_start) < 1)
+ if((local_end - local_start) < 1)
continue;
seconds -= (local_end - local_start);
}
mysql_free_result(result2);
}
- if (seconds < 1) {
+ if(seconds < 1) {
debug4("This job (%u) was suspended "
"the entire hour", job_id);
continue;
}
- if (last_id != assoc_id) {
+ if(last_id != assoc_id) {
a_usage = xmalloc(sizeof(local_id_usage_t));
a_usage->id = assoc_id;
list_append(assoc_usage_list, a_usage);
@@ -583,17 +583,17 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
a_usage->a_cpu += seconds * row_acpu;
- if (!track_wckey)
+ if(!track_wckey)
goto calc_cluster;
/* do the wckey calculation */
- if (last_wckeyid != wckey_id) {
+ if(last_wckeyid != wckey_id) {
list_iterator_reset(w_itr);
while((w_usage = list_next(w_itr)))
- if (w_usage->id == wckey_id)
+ if(w_usage->id == wckey_id)
break;
- if (!w_usage) {
+ if(!w_usage) {
w_usage = xmalloc(
sizeof(local_id_usage_t));
w_usage->id = wckey_id;
@@ -608,8 +608,8 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
calc_cluster:
/* first figure out the reservation */
- if (resv_id) {
- if (seconds <= 0)
+ if(resv_id) {
+ if(seconds <= 0)
continue;
/* Since we have already added the
entire reservation as used time on
@@ -634,16 +634,16 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
sure all the reservations
are checked to see if such
a thing has happened */
- if (r_usage->id == resv_id) {
+ if(r_usage->id == resv_id) {
int temp_end = row_end;
int temp_start = row_start;
- if (r_usage->start > temp_start)
+ if(r_usage->start > temp_start)
temp_start =
r_usage->start;
- if (r_usage->end < temp_end)
+ if(r_usage->end < temp_end)
temp_end = r_usage->end;
- if ((temp_end - temp_start)
+ if((temp_end - temp_start)
> 0) {
r_usage->a_cpu +=
(temp_end
@@ -659,10 +659,10 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
registered. This continue should rarely if
ever happen.
*/
- if (!c_usage)
+ if(!c_usage)
continue;
- if (row_start && (seconds > 0)) {
+ if(row_start && (seconds > 0)) {
/* info("%d assoc %d adds " */
/* "(%d)(%d-%d) * %d = %d " */
/* "to %d", */
@@ -678,15 +678,15 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
}
/* now reserved time */
- if (!row_start || (row_start >= c_usage->start)) {
+ if(!row_start || (row_start >= c_usage->start)) {
row_end = row_start;
row_start = row_eligible;
- if (c_usage->start > row_start)
+ if(c_usage->start > row_start)
row_start = c_usage->start;
- if (c_usage->end < row_end)
+ if(c_usage->end < row_end)
row_end = c_usage->end;
- if ((row_end - row_start) > 0) {
+ if((row_end - row_start) > 0) {
seconds = (row_end - row_start)
* row_rcpu;
@@ -715,7 +715,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
char *assoc = NULL;
ListIterator tmp_itr = NULL;
- if (idle <= 0)
+ if(idle <= 0)
continue;
/* now divide that time by the number of
@@ -728,17 +728,17 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
tmp_itr = list_iterator_create(r_usage->local_assocs);
while((assoc = list_next(tmp_itr))) {
int associd = atoi(assoc);
- if (last_id != associd) {
+ if(last_id != associd) {
list_iterator_reset(a_itr);
while((a_usage = list_next(a_itr))) {
- if (!a_usage->id == associd) {
+ if(!a_usage->id == associd) {
last_id = a_usage->id;
break;
}
}
}
- if (!a_usage) {
+ if(!a_usage) {
a_usage = xmalloc(
sizeof(local_id_usage_t));
a_usage->id = associd;
@@ -758,7 +758,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* sanity check to make sure we don't have more
allocated cpus than possible. */
- if (c_usage->total_time < c_usage->a_cpu) {
+ if(c_usage->total_time < c_usage->a_cpu) {
char *start_char = xstrdup(ctime(&curr_start));
char *end_char = xstrdup(ctime(&curr_end));
start_char[strlen(start_char)-1] = '\0';
@@ -778,7 +778,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* Make sure the total time we care about
doesn't go over the limit */
- if (c_usage->total_time < (total_used)) {
+ if(c_usage->total_time < (total_used)) {
char *start_char = xstrdup(ctime(&curr_start));
char *end_char = xstrdup(ctime(&curr_end));
int64_t overtime;
@@ -802,14 +802,14 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
overtime = (int64_t)(c_usage->total_time -
(c_usage->a_cpu
+ c_usage->d_cpu));
- if (overtime < 0)
+ if(overtime < 0)
c_usage->d_cpu += overtime;
overtime = (int64_t)(c_usage->total_time -
(c_usage->a_cpu
+ c_usage->d_cpu
+ c_usage->pd_cpu));
- if (overtime < 0)
+ if(overtime < 0)
c_usage->pd_cpu += overtime;
total_used = c_usage->a_cpu +
@@ -830,13 +830,13 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
*/
/* info("%s got idle of %lld", c_usage->name, */
/* (int64_t)c_usage->i_cpu); */
- if ((int64_t)c_usage->i_cpu < 0) {
+ if((int64_t)c_usage->i_cpu < 0) {
/* info("got %d %d %d", c_usage->r_cpu, */
/* c_usage->i_cpu, c_usage->o_cpu); */
c_usage->r_cpu += (int64_t)c_usage->i_cpu;
c_usage->o_cpu -= (int64_t)c_usage->i_cpu;
c_usage->i_cpu = 0;
- if ((int64_t)c_usage->r_cpu < 0)
+ if((int64_t)c_usage->r_cpu < 0)
c_usage->r_cpu = 0;
}
@@ -852,7 +852,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* c_usage->total_time, */
/* ctime(&c_usage->start)); */
/* info("to %s", ctime(&c_usage->end)); */
- if (query) {
+ if(query) {
xstrfmtcat(query,
", (%d, %d, %d, %d, "
"%llu, %llu, %llu, "
@@ -889,7 +889,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
all at once in the end proves to be faster. Just FYI
so we don't go testing again and again.
*/
- if (query) {
+ if(query) {
xstrfmtcat(query,
" on duplicate key update "
"mod_time=%d, cpu_count=VALUES(cpu_count), "
@@ -904,7 +904,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add cluster hour rollup");
goto end_it;
}
@@ -915,7 +915,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* info("association (%d) %d alloc %d", */
/* a_usage->id, last_id, */
/* a_usage->a_cpu); */
- if (query) {
+ if(query) {
xstrfmtcat(query,
", (%d, %d, %d, %d, %llu)",
now, now,
@@ -934,7 +934,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
a_usage->a_cpu);
}
}
- if (query) {
+ if(query) {
xstrfmtcat(query,
" on duplicate key update "
"mod_time=%d, "
@@ -945,13 +945,13 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add assoc hour rollup");
goto end_it;
}
}
- if (!track_wckey)
+ if(!track_wckey)
goto end_loop;
list_iterator_reset(w_itr);
@@ -959,7 +959,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
/* info("association (%d) %d alloc %d", */
/* w_usage->id, last_id, */
/* w_usage->a_cpu); */
- if (query) {
+ if(query) {
xstrfmtcat(query,
", (%d, %d, %d, %d, %llu)",
now, now,
@@ -978,7 +978,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
w_usage->a_cpu);
}
}
- if (query) {
+ if(query) {
xstrfmtcat(query,
" on duplicate key update "
"mod_time=%d, "
@@ -989,7 +989,7 @@ extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add wckey hour rollup");
goto end_it;
}
@@ -1023,7 +1023,7 @@ end_it:
/* go check to see if we archive and purge */
- if ( rc == SLURM_SUCCESS)
+ if( rc == SLURM_SUCCESS)
rc = _process_purge(mysql_conn, cluster_name, archive_data,
SLURMDB_PURGE_HOURS);
@@ -1045,7 +1045,7 @@ extern int as_mysql_daily_rollup(mysql_conn_t *mysql_conn,
char *query = NULL;
uint16_t track_wckey = slurm_get_track_wckey();
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from day start %d", curr_start);
return SLURM_ERROR;
}
@@ -1100,7 +1100,7 @@ extern int as_mysql_daily_rollup(mysql_conn_t *mysql_conn,
now, now, curr_start,
cluster_name, cluster_hour_table,
curr_end, curr_start, now);
- if (track_wckey) {
+ if(track_wckey) {
xstrfmtcat(query,
"insert into \"%s_%s\" (creation_time, "
"mod_time, id_wckey, time_start, "
@@ -1119,13 +1119,13 @@ extern int as_mysql_daily_rollup(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add day rollup");
return SLURM_ERROR;
}
curr_start = curr_end;
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from day start %d",
curr_start);
return SLURM_ERROR;
@@ -1159,7 +1159,7 @@ extern int as_mysql_monthly_rollup(mysql_conn_t *mysql_conn,
char *query = NULL;
uint16_t track_wckey = slurm_get_track_wckey();
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from month start %d", curr_start);
return SLURM_ERROR;
}
@@ -1214,7 +1214,7 @@ extern int as_mysql_monthly_rollup(mysql_conn_t *mysql_conn,
now, now, curr_start,
cluster_name, cluster_day_table,
curr_end, curr_start, now);
- if (track_wckey) {
+ if(track_wckey) {
xstrfmtcat(query,
"insert into \"%s_%s\" "
"(creation_time, mod_time, "
@@ -1234,13 +1234,13 @@ extern int as_mysql_monthly_rollup(mysql_conn_t *mysql_conn,
mysql_conn->conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add day rollup");
return SLURM_ERROR;
}
curr_start = curr_end;
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from month start %d",
curr_start);
}
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_txn.c b/src/plugins/accounting_storage/mysql/as_mysql_txn.c
index 498c63d3d12d6ccf48c5ae12a53ddd78faf2b820..912a2bb30184507d346852598b5543e7a1bfa84d 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_txn.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_txn.c
@@ -78,27 +78,27 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
TXN_REQ_COUNT
};
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
- if (!txn_cond)
+ if(!txn_cond)
goto empty;
/* handle query for associations first */
- if (txn_cond->acct_list && list_count(txn_cond->acct_list)) {
+ if(txn_cond->acct_list && list_count(txn_cond->acct_list)) {
set = 0;
- if (assoc_extra)
+ if(assoc_extra)
xstrcat(assoc_extra, " && (");
else
xstrcat(assoc_extra, " where (");
- if (name_extra)
+ if(name_extra)
xstrcat(name_extra, " && (");
else
xstrcat(name_extra, " (");
itr = list_iterator_create(txn_cond->acct_list);
while((object = list_next(itr))) {
- if (set) {
+ if(set) {
xstrcat(assoc_extra, " || ");
xstrcat(name_extra, " || ");
}
@@ -116,16 +116,16 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(name_extra, ")");
}
- if (txn_cond->cluster_list && list_count(txn_cond->cluster_list)) {
+ if(txn_cond->cluster_list && list_count(txn_cond->cluster_list)) {
set = 0;
- if (name_extra)
+ if(name_extra)
xstrcat(name_extra, " && (");
else
xstrcat(name_extra, "(");
itr = list_iterator_create(txn_cond->cluster_list);
while((object = list_next(itr))) {
- if (set) {
+ if(set) {
xstrcat(name_extra, " || ");
}
xstrfmtcat(name_extra, "(cluster='%s' || "
@@ -140,21 +140,21 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
use_cluster_list = txn_cond->cluster_list;
}
- if (txn_cond->user_list && list_count(txn_cond->user_list)) {
+ if(txn_cond->user_list && list_count(txn_cond->user_list)) {
set = 0;
- if (assoc_extra)
+ if(assoc_extra)
xstrcat(assoc_extra, " && (");
else
xstrcat(assoc_extra, " where (");
- if (name_extra)
+ if(name_extra)
xstrcat(name_extra, " && (");
else
xstrcat(name_extra, "(");
itr = list_iterator_create(txn_cond->user_list);
while((object = list_next(itr))) {
- if (set) {
+ if(set) {
xstrcat(assoc_extra, " || ");
xstrcat(name_extra, " || ");
}
@@ -172,8 +172,8 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(name_extra, ")");
}
- if (assoc_extra) {
- if (!locked && (use_cluster_list == as_mysql_cluster_list)) {
+ if(assoc_extra) {
+ if(!locked && (use_cluster_list == as_mysql_cluster_list)) {
slurm_mutex_lock(&as_mysql_cluster_list_lock);
locked = 1;
}
@@ -184,15 +184,15 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
object, assoc_table, assoc_extra);
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
break;
}
xfree(query);
- if (mysql_num_rows(result)) {
- if (extra)
+ if(mysql_num_rows(result)) {
+ if(extra)
xstrfmtcat(extra,
" || (cluster='%s' && (");
else
@@ -202,7 +202,7 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
set = 0;
while((row = mysql_fetch_row(result))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra,
@@ -222,8 +222,8 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xfree(assoc_extra);
}
- if (name_extra) {
- if (extra)
+ if(name_extra) {
+ if(extra)
xstrfmtcat(extra, " && (%s)", name_extra);
else
xstrfmtcat(extra, " where (%s)", name_extra);
@@ -231,15 +231,15 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
}
/*******************************************/
- if (txn_cond->action_list && list_count(txn_cond->action_list)) {
+ if(txn_cond->action_list && list_count(txn_cond->action_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->action_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "action='%s'", object);
set = 1;
@@ -248,15 +248,15 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (txn_cond->actor_list && list_count(txn_cond->actor_list)) {
+ if(txn_cond->actor_list && list_count(txn_cond->actor_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->actor_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "actor='%s'", object);
set = 1;
@@ -265,9 +265,9 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (txn_cond->id_list && list_count(txn_cond->id_list)) {
+ if(txn_cond->id_list && list_count(txn_cond->id_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
@@ -283,7 +283,7 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
goto end_it;
}
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "id=%s", object);
set = 1;
@@ -292,15 +292,15 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (txn_cond->info_list && list_count(txn_cond->info_list)) {
+ if(txn_cond->info_list && list_count(txn_cond->info_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->info_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "info like '%%%s%%'", object);
set = 1;
@@ -309,15 +309,15 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (txn_cond->name_list && list_count(txn_cond->name_list)) {
+ if(txn_cond->name_list && list_count(txn_cond->name_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(txn_cond->name_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name like '%%%s%%'", object);
set = 1;
@@ -326,22 +326,22 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (txn_cond->time_start && txn_cond->time_end) {
- if (extra)
+ if(txn_cond->time_start && txn_cond->time_end) {
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
xstrfmtcat(extra, "timestamp < %d && timestamp >= %d)",
txn_cond->time_end, txn_cond->time_start);
- } else if (txn_cond->time_start) {
- if (extra)
+ } else if(txn_cond->time_start) {
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
xstrfmtcat(extra, "timestamp >= %d)", txn_cond->time_start);
- } else if (txn_cond->time_end) {
- if (extra)
+ } else if(txn_cond->time_end) {
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
@@ -351,12 +351,12 @@ extern List as_mysql_get_txn(mysql_conn_t *mysql_conn, uid_t uid,
/* make sure we can get the max length out of the database
* when grouping the names
*/
- if (txn_cond->with_assoc_info)
+ if(txn_cond->with_assoc_info)
mysql_db_query(mysql_conn->db_conn,
"set session group_concat_max_len=65536;");
empty:
- if (!locked && (use_cluster_list == as_mysql_cluster_list)) {
+ if(!locked && (use_cluster_list == as_mysql_cluster_list)) {
slurm_mutex_lock(&as_mysql_cluster_list_lock);
locked = 1;
}
@@ -369,7 +369,7 @@ empty:
query = xstrdup_printf("select %s from %s", tmp, txn_table);
- if (extra) {
+ if(extra) {
xstrfmtcat(query, "%s", extra);
xfree(extra);
}
@@ -379,7 +379,7 @@ empty:
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
goto end_it;
@@ -401,13 +401,13 @@ empty:
txn->where_query = xstrdup(row[TXN_REQ_NAME]);
txn->clusters = xstrdup(row[TXN_REQ_CLUSTER]);
- if (txn_cond && txn_cond->with_assoc_info
+ if(txn_cond && txn_cond->with_assoc_info
&& (txn->action == DBD_ADD_ASSOCS
|| txn->action == DBD_MODIFY_ASSOCS
|| txn->action == DBD_REMOVE_ASSOCS)) {
MYSQL_RES *result2 = NULL;
MYSQL_ROW row2;
- if (txn->clusters) {
+ if(txn->clusters) {
query = xstrdup_printf(
"select "
"group_concat(distinct user order by user), "
@@ -416,17 +416,17 @@ empty:
txn->clusters, assoc_table, row[TXN_REQ_NAME]);
debug4("%d(%s:%d) query\n%s", mysql_conn->conn,
THIS_FILE, __LINE__, query);
- if (!(result2 = mysql_db_query_ret(
+ if(!(result2 = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
continue;
}
xfree(query);
- if ((row2 = mysql_fetch_row(result2))) {
- if (row2[0] && row2[0][0])
+ if((row2 = mysql_fetch_row(result2))) {
+ if(row2[0] && row2[0][0])
txn->users = xstrdup(row2[0]);
- if (row2[1] && row2[1][0])
+ if(row2[1] && row2[1][0])
txn->accts = xstrdup(row2[1]);
}
mysql_free_result(result2);
@@ -440,7 +440,7 @@ empty:
mysql_free_result(result);
end_it:
- if (locked)
+ if(locked)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
return txn_list;
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_usage.c b/src/plugins/accounting_storage/mysql/as_mysql_usage.c
index 069890350941a2476a8234eb5b5bbf7a29743480..d2d4021b3364a15d31cf6dcf1698b4ce313debda 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_usage.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_usage.c
@@ -102,10 +102,10 @@ static void *_cluster_rollup_usage(void *arg)
* sent from the parent thread. */
rc = check_connection(&mysql_conn);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
- if (!local_rollup->sent_start) {
+ if(!local_rollup->sent_start) {
char *tmp = NULL;
int i=0;
xstrfmtcat(tmp, "%s", update_req_inx[i]);
@@ -119,7 +119,7 @@ static void *_cluster_rollup_usage(void *arg)
debug4("%d(%s:%d) query\n%s", mysql_conn.conn,
THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn.db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
@@ -128,7 +128,7 @@ static void *_cluster_rollup_usage(void *arg)
xfree(query);
row = mysql_fetch_row(result);
- if (row) {
+ if(row) {
last_hour = atoi(row[UPDATE_HOUR]);
last_day = atoi(row[UPDATE_DAY]);
last_month = atoi(row[UPDATE_MONTH]);
@@ -146,16 +146,16 @@ static void *_cluster_rollup_usage(void *arg)
local_rollup->cluster_name, event_table);
debug3("%d(%s:%d) query\n%s", mysql_conn.conn,
THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn.db_conn, query, 0))) {
xfree(query);
rc = SLURM_ERROR;
goto end_it;
}
xfree(query);
- if ((row = mysql_fetch_row(result))) {
+ if((row = mysql_fetch_row(result))) {
time_t check = atoi(row[0]);
- if (check < lowest)
+ if(check < lowest)
lowest = check;
}
mysql_free_result(result);
@@ -176,12 +176,12 @@ static void *_cluster_rollup_usage(void *arg)
THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn.db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
rc = SLURM_ERROR;
goto end_it;
}
- if (lowest == now) {
+ if(lowest == now) {
debug("Cluster %s not registered, "
"not doing rollup",
local_rollup->cluster_name);
@@ -193,7 +193,7 @@ static void *_cluster_rollup_usage(void *arg)
}
}
- if (!my_time)
+ if(!my_time)
my_time = time(NULL);
/* test month gap */
@@ -212,13 +212,13 @@ static void *_cluster_rollup_usage(void *arg)
// last_day = 1197033199;
// last_month = 1204358399;
- if (!localtime_r(&last_hour, &start_tm)) {
+ if(!localtime_r(&last_hour, &start_tm)) {
error("Couldn't get localtime from hour start %d", last_hour);
rc = SLURM_ERROR;
goto end_it;
}
- if (!localtime_r(&my_time, &end_tm)) {
+ if(!localtime_r(&my_time, &end_tm)) {
error("Couldn't get localtime from hour end %d", my_time);
rc = SLURM_ERROR;
goto end_it;
@@ -249,7 +249,7 @@ static void *_cluster_rollup_usage(void *arg)
slurm_mutex_unlock(&rollup_lock);
/* set up the day period */
- if (!localtime_r(&last_day, &start_tm)) {
+ if(!localtime_r(&last_day, &start_tm)) {
error("Couldn't get localtime from day %d", last_day);
rc = SLURM_ERROR;
goto end_it;
@@ -270,7 +270,7 @@ static void *_cluster_rollup_usage(void *arg)
/* info("diff is %d", day_end-day_start); */
/* set up the month period */
- if (!localtime_r(&last_month, &start_tm)) {
+ if(!localtime_r(&last_month, &start_tm)) {
error("Couldn't get localtime from month %d", last_month);
rc = SLURM_ERROR;
goto end_it;
@@ -294,7 +294,7 @@ static void *_cluster_rollup_usage(void *arg)
/* info("month end %s", ctime(&month_end)); */
/* info("diff is %d", month_end-month_start); */
- if ((hour_end - hour_start) > 0) {
+ if((hour_end - hour_start) > 0) {
START_TIMER;
rc = as_mysql_hourly_rollup(&mysql_conn,
local_rollup->cluster_name,
@@ -304,11 +304,11 @@ static void *_cluster_rollup_usage(void *arg)
snprintf(timer_str, sizeof(timer_str),
"hourly_rollup for %s", local_rollup->cluster_name);
END_TIMER3(timer_str, 5000000);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
}
- if ((day_end - day_start) > 0) {
+ if((day_end - day_start) > 0) {
START_TIMER;
rc = as_mysql_daily_rollup(&mysql_conn,
local_rollup->cluster_name,
@@ -318,11 +318,11 @@ static void *_cluster_rollup_usage(void *arg)
snprintf(timer_str, sizeof(timer_str),
"daily_rollup for %s", local_rollup->cluster_name);
END_TIMER3(timer_str, 5000000);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
}
- if ((month_end - month_start) > 0) {
+ if((month_end - month_start) > 0) {
START_TIMER;
rc = as_mysql_monthly_rollup(&mysql_conn,
local_rollup->cluster_name,
@@ -332,13 +332,13 @@ static void *_cluster_rollup_usage(void *arg)
snprintf(timer_str, sizeof(timer_str),
"monthly_rollup for %s", local_rollup->cluster_name);
END_TIMER3(timer_str, 5000000);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
}
- if ((hour_end - hour_start) > 0) {
+ if((hour_end - hour_start) > 0) {
/* If we have a sent_end do not update the last_run_table */
- if (!local_rollup->sent_end)
+ if(!local_rollup->sent_end)
query = xstrdup_printf(
"update \"%s_%s\" set hourly_rollup=%d",
local_rollup->cluster_name,
@@ -347,10 +347,10 @@ static void *_cluster_rollup_usage(void *arg)
debug2("No need to roll cluster %s this hour %d <= %d",
local_rollup->cluster_name, hour_end, hour_start);
- if ((day_end - day_start) > 0) {
- if (query && !local_rollup->sent_end)
+ if((day_end - day_start) > 0) {
+ if(query && !local_rollup->sent_end)
xstrfmtcat(query, ", daily_rollup=%d", day_end);
- else if (!local_rollup->sent_end)
+ else if(!local_rollup->sent_end)
query = xstrdup_printf(
"update \"%s_%s\" set daily_rollup=%d",
local_rollup->cluster_name,
@@ -359,10 +359,10 @@ static void *_cluster_rollup_usage(void *arg)
debug2("No need to roll cluster %s this day %d <= %d",
local_rollup->cluster_name, day_end, day_start);
- if ((month_end - month_start) > 0) {
- if (query && !local_rollup->sent_end)
+ if((month_end - month_start) > 0) {
+ if(query && !local_rollup->sent_end)
xstrfmtcat(query, ", monthly_rollup=%d", month_end);
- else if (!local_rollup->sent_end)
+ else if(!local_rollup->sent_end)
query = xstrdup_printf(
"update \"%s_%s\" set monthly_rollup=%d",
local_rollup->cluster_name,
@@ -371,22 +371,22 @@ static void *_cluster_rollup_usage(void *arg)
debug2("No need to roll cluster %s this month %d <= %d",
local_rollup->cluster_name, month_end, month_start);
- if (query) {
+ if(query) {
debug3("%d(%s:%d) query\n%s",
mysql_conn.conn, THIS_FILE, __LINE__, query);
rc = mysql_db_query(mysql_conn.db_conn, query);
xfree(query);
}
end_it:
- if (rc == SLURM_SUCCESS) {
- if (mysql_db_commit(mysql_conn.db_conn)) {
+ if(rc == SLURM_SUCCESS) {
+ if(mysql_db_commit(mysql_conn.db_conn)) {
error("Couldn't commit rollup of cluster %s",
local_rollup->cluster_name);
rc = SLURM_ERROR;
}
} else {
error("Cluster %s rollup failed", local_rollup->cluster_name);
- if (mysql_conn.db_conn && mysql_db_rollback(mysql_conn.db_conn))
+ if(mysql_conn.db_conn && mysql_db_rollback(mysql_conn.db_conn))
error("rollback failed");
}
@@ -394,7 +394,7 @@ end_it:
slurm_mutex_lock(local_rollup->rolledup_lock);
(*local_rollup->rolledup)++;
- if ((rc != SLURM_SUCCESS) && ((*local_rollup->rc) == SLURM_SUCCESS))
+ if((rc != SLURM_SUCCESS) && ((*local_rollup->rc) == SLURM_SUCCESS))
(*local_rollup->rc) = rc;
pthread_cond_signal(local_rollup->rolledup_cond);
slurm_mutex_unlock(local_rollup->rolledup_lock);
@@ -439,12 +439,12 @@ static int _get_cluster_usage(mysql_conn_t *mysql_conn, uid_t uid,
CLUSTER_COUNT
};
- if (!cluster_rec->name || !cluster_rec->name[0]) {
+ if(!cluster_rec->name || !cluster_rec->name[0]) {
error("We need a cluster name to set data for");
return SLURM_ERROR;
}
- if (set_usage_information(&my_usage_table, type, &start, &end)
+ if(set_usage_information(&my_usage_table, type, &start, &end)
!= SLURM_SUCCESS) {
return SLURM_ERROR;
}
@@ -464,14 +464,14 @@ static int _get_cluster_usage(mysql_conn_t *mysql_conn, uid_t uid,
xfree(tmp);
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!cluster_rec->accounting_list)
+ if(!cluster_rec->accounting_list)
cluster_rec->accounting_list =
list_create(slurmdb_destroy_cluster_accounting_rec);
@@ -529,12 +529,12 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
};
- if (!object_list) {
+ if(!object_list) {
error("We need an object to set data for getting usage");
return SLURM_ERROR;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
switch (type) {
@@ -549,7 +549,7 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
itr = list_iterator_create(object_list);
while((assoc = list_next(itr))) {
- if (id_str)
+ if(id_str)
xstrfmtcat(id_str, " || t3.id_assoc=%d",
assoc->id);
else
@@ -571,7 +571,7 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
itr = list_iterator_create(object_list);
while((wckey = list_next(itr))) {
- if (id_str)
+ if(id_str)
xstrfmtcat(id_str, " || id_wckey=%d",
wckey->id);
else
@@ -588,7 +588,7 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
break;
}
- if (set_usage_information(&my_usage_table, type, &start, &end)
+ if(set_usage_information(&my_usage_table, type, &start, &end)
!= SLURM_SUCCESS) {
xfree(id_str);
return SLURM_ERROR;
@@ -632,7 +632,7 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -661,7 +661,7 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
switch (type) {
case DBD_GET_ASSOC_USAGE:
assoc = (slurmdb_association_rec_t *)object;
- if (!assoc->accounting_list)
+ if(!assoc->accounting_list)
assoc->accounting_list = list_create(
slurmdb_destroy_accounting_rec);
acct_list = assoc->accounting_list;
@@ -669,7 +669,7 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
break;
case DBD_GET_WCKEY_USAGE:
wckey = (slurmdb_wckey_rec_t *)object;
- if (!wckey->accounting_list)
+ if(!wckey->accounting_list)
wckey->accounting_list = list_create(
slurmdb_destroy_accounting_rec);
acct_list = wckey->accounting_list;
@@ -681,11 +681,11 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
}
while((accounting_rec = list_next(u_itr))) {
- if (id == accounting_rec->id) {
+ if(id == accounting_rec->id) {
list_append(acct_list, accounting_rec);
list_remove(u_itr);
found = 1;
- } else if (found) {
+ } else if(found) {
/* here we know the
list is in id order so
if the next record
@@ -704,7 +704,7 @@ extern int get_usage_for_list(mysql_conn_t *mysql_conn,
list_iterator_destroy(itr);
list_iterator_destroy(u_itr);
- if (list_count(usage_list))
+ if(list_count(usage_list))
error("we have %d records not added "
"to the association list",
list_count(usage_list));
@@ -787,15 +787,15 @@ extern int as_mysql_get_usage(mysql_conn_t *mysql_conn, uid_t uid,
break;
}
- if (!id) {
+ if(!id) {
error("We need an id to set data for getting usage");
return SLURM_ERROR;
- } else if (!cluster_name) {
+ } else if(!cluster_name) {
error("We need a cluster_name to set data for getting usage");
return SLURM_ERROR;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
@@ -803,24 +803,24 @@ extern int as_mysql_get_usage(mysql_conn_t *mysql_conn, uid_t uid,
private_data = slurm_get_private_data();
if (private_data & PRIVATE_DATA_USAGE) {
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR))) {
ListIterator itr = NULL;
slurmdb_coord_rec_t *coord = NULL;
is_user_any_coord(mysql_conn, &user);
- if (username && !strcmp(slurmdb_assoc->user, user.name))
+ if(username && !strcmp(slurmdb_assoc->user, user.name))
goto is_user;
- if (type != DBD_GET_ASSOC_USAGE)
+ if(type != DBD_GET_ASSOC_USAGE)
goto bad_user;
- if (!user.coord_accts) {
+ if(!user.coord_accts) {
debug4("This user isn't a coord.");
goto bad_user;
}
- if (!slurmdb_assoc->acct) {
+ if(!slurmdb_assoc->acct) {
debug("No account name given "
"in association.");
goto bad_user;
@@ -828,11 +828,11 @@ extern int as_mysql_get_usage(mysql_conn_t *mysql_conn, uid_t uid,
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr)))
- if (!strcasecmp(coord->name, slurmdb_assoc->acct))
+ if(!strcasecmp(coord->name, slurmdb_assoc->acct))
break;
list_iterator_destroy(itr);
- if (coord)
+ if(coord)
goto is_user;
bad_user:
@@ -842,7 +842,7 @@ extern int as_mysql_get_usage(mysql_conn_t *mysql_conn, uid_t uid,
}
is_user:
- if (set_usage_information(&my_usage_table, type, &start, &end)
+ if(set_usage_information(&my_usage_table, type, &start, &end)
!= SLURM_SUCCESS) {
return SLURM_ERROR;
}
@@ -882,14 +882,14 @@ is_user:
xfree(tmp);
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
xfree(query);
- if (!(*my_list))
+ if(!(*my_list))
(*my_list) = list_create(slurmdb_destroy_accounting_rec);
while((row = mysql_fetch_row(result))) {
@@ -917,7 +917,7 @@ extern int as_mysql_roll_usage(mysql_conn_t *mysql_conn,
pthread_cond_t rolledup_cond;
//DEF_TIMERS;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
slurm_mutex_lock(&usage_rollup_lock);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_user.c b/src/plugins/accounting_storage/mysql/as_mysql_user.c
index 526d2dbead92ddde27f213a963bb2190f9052296..7585da3eeca54a987fcf80499ab160d878ad4658 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_user.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_user.c
@@ -74,7 +74,7 @@ static int _change_user_name(mysql_conn_t *mysql_conn, slurmdb_user_rec_t *user)
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
reset_mysql_conn(mysql_conn);
return rc;
@@ -92,19 +92,19 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, slurmdb_user_rec_t *user)
ListIterator itr = NULL, itr2 = NULL;
char *cluster_name = NULL;
- if (!user) {
+ if(!user) {
error("We need a user to fill in.");
return SLURM_ERROR;
}
- if (!user->coord_accts)
+ if(!user->coord_accts)
user->coord_accts = list_create(slurmdb_destroy_coord_rec);
query = xstrdup_printf(
"select acct from %s where user='%s' && deleted=0",
acct_coord_table, user->name);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -119,7 +119,7 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, slurmdb_user_rec_t *user)
}
mysql_free_result(result);
- if (!list_count(user->coord_accts))
+ if(!list_count(user->coord_accts))
return SLURM_SUCCESS;
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -127,11 +127,11 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, slurmdb_user_rec_t *user)
itr = list_iterator_create(user->coord_accts);
while((cluster_name = list_next(itr2))) {
int set = 0;
- if (query)
+ if(query)
xstrcat(query, " union ");
while((coord = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(query, " || ");
else
xstrfmtcat(query,
@@ -156,10 +156,10 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, slurmdb_user_rec_t *user)
list_iterator_destroy(itr2);
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
- if (query) {
+ if(query) {
debug4("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
@@ -169,11 +169,11 @@ static int _get_user_coords(mysql_conn_t *mysql_conn, slurmdb_user_rec_t *user)
while((row = mysql_fetch_row(result))) {
list_iterator_reset(itr);
while((coord = list_next(itr))) {
- if (!strcmp(coord->name, row[0]))
+ if(!strcmp(coord->name, row[0]))
break;
}
- if (coord)
+ if(coord)
continue;
coord = xmalloc(sizeof(slurmdb_coord_rec_t));
@@ -202,13 +202,13 @@ extern int as_mysql_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
List assoc_list = list_create(slurmdb_destroy_association_rec);
List wckey_list = list_create(slurmdb_destroy_wckey_rec);
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(user_list);
while((object = list_next(itr))) {
- if (!object->name || !object->name[0]
+ if(!object->name || !object->name[0]
|| !object->default_acct || !object->default_acct[0]) {
error("We need a user name and "
"default acct to add.");
@@ -221,7 +221,7 @@ extern int as_mysql_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrfmtcat(extra, ", default_acct='%s'",
object->default_acct);
- if (object->admin_level != SLURMDB_ADMIN_NOTSET) {
+ if(object->admin_level != SLURMDB_ADMIN_NOTSET) {
xstrcat(cols, ", admin_level");
xstrfmtcat(vals, ", %u", object->admin_level);
xstrfmtcat(extra, ", admin_level=%u",
@@ -230,7 +230,7 @@ extern int as_mysql_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrfmtcat(extra, ", admin_level=%u",
SLURMDB_ADMIN_NONE);
- if (object->default_wckey) {
+ if(object->default_wckey) {
xstrcat(cols, ", default_wckey");
xstrfmtcat(vals, ", '%s'", object->default_wckey);
xstrfmtcat(extra, ", default_wckey='%s'",
@@ -249,27 +249,27 @@ extern int as_mysql_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(vals);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add user %s", object->name);
xfree(extra);
continue;
}
affect_rows = last_affected_rows(mysql_conn->db_conn);
- if (!affect_rows) {
+ if(!affect_rows) {
debug("nothing changed");
xfree(extra);
continue;
}
- if (addto_update_list(mysql_conn->update_list, SLURMDB_ADD_USER,
+ if(addto_update_list(mysql_conn->update_list, SLURMDB_ADD_USER,
object) == SLURM_SUCCESS)
list_remove(itr);
/* we always have a ', ' as the first 2 chars */
tmp_extra = slurm_add_slash_to_quotes(extra+2);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %u, '%s', '%s', '%s')",
now, DBD_ADD_USERS, object->name,
@@ -285,22 +285,22 @@ extern int as_mysql_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(tmp_extra);
xfree(extra);
- if (object->assoc_list)
+ if(object->assoc_list)
list_transfer(assoc_list, object->assoc_list);
- if (object->wckey_list)
+ if(object->wckey_list)
list_transfer(wckey_list, object->wckey_list);
}
list_iterator_destroy(itr);
xfree(user_name);
- if (rc != SLURM_ERROR) {
- if (txn_query) {
+ if(rc != SLURM_ERROR) {
+ if(txn_query) {
xstrcat(txn_query, ";");
rc = mysql_db_query(mysql_conn->db_conn,
txn_query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
rc = SLURM_SUCCESS;
}
@@ -308,8 +308,8 @@ extern int as_mysql_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
} else
xfree(txn_query);
- if (list_count(assoc_list)) {
- if (as_mysql_add_assocs(mysql_conn, uid, assoc_list)
+ if(list_count(assoc_list)) {
+ if(as_mysql_add_assocs(mysql_conn, uid, assoc_list)
== SLURM_ERROR) {
error("Problem adding user associations");
rc = SLURM_ERROR;
@@ -317,8 +317,8 @@ extern int as_mysql_add_users(mysql_conn_t *mysql_conn, uint32_t uid,
}
list_destroy(assoc_list);
- if (list_count(wckey_list)) {
- if (as_mysql_add_wckeys(mysql_conn, uid, wckey_list)
+ if(list_count(wckey_list)) {
+ if(as_mysql_add_wckeys(mysql_conn, uid, wckey_list)
== SLURM_ERROR) {
error("Problem adding user wckeys");
rc = SLURM_ERROR;
@@ -339,7 +339,7 @@ extern int as_mysql_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
int rc = SLURM_SUCCESS;
slurmdb_user_rec_t *user_rec = NULL;
- if (!user_cond || !user_cond->assoc_cond
+ if(!user_cond || !user_cond->assoc_cond
|| !user_cond->assoc_cond->user_list
|| !list_count(user_cond->assoc_cond->user_list)
|| !acct_list || !list_count(acct_list)) {
@@ -347,19 +347,19 @@ extern int as_mysql_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
return SLURM_ERROR;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(user_cond->assoc_cond->user_list);
itr2 = list_iterator_create(acct_list);
while((user = list_next(itr))) {
- if (!user[0])
+ if(!user[0])
continue;
while((acct = list_next(itr2))) {
- if (!acct[0])
+ if(!acct[0])
continue;
- if (query)
+ if(query)
xstrfmtcat(query, ", (%d, %d, '%s', '%s')",
now, now, acct, user);
else
@@ -370,7 +370,7 @@ extern int as_mysql_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
acct_coord_table,
now, now, acct, user);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %u, '%s', '%s', '%s')",
now, DBD_ADD_ACCOUNT_COORDS, user,
@@ -392,7 +392,7 @@ extern int as_mysql_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
list_iterator_destroy(itr2);
- if (query) {
+ if(query) {
xstrfmtcat(query,
" on duplicate key update mod_time=%d, deleted=0;%s",
now, txn_query);
@@ -402,7 +402,7 @@ extern int as_mysql_add_coord(mysql_conn_t *mysql_conn, uint32_t uid,
xfree(query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add cluster hour rollup");
return rc;
}
@@ -436,22 +436,22 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
MYSQL_RES *result = NULL;
MYSQL_ROW row;
- if (!user_cond || !user) {
+ if(!user_cond || !user) {
error("we need something to change");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
xstrcat(extra, "where deleted=0");
- if (user_cond->assoc_cond && user_cond->assoc_cond->user_list
+ if(user_cond->assoc_cond && user_cond->assoc_cond->user_list
&& list_count(user_cond->assoc_cond->user_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -460,12 +460,12 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (user_cond->def_acct_list && list_count(user_cond->def_acct_list)) {
+ if(user_cond->def_acct_list && list_count(user_cond->def_acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_acct='%s'", object);
set = 1;
@@ -474,12 +474,12 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
+ if(user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_wckey_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_wckey='%s'", object);
set = 1;
@@ -488,23 +488,23 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
+ if(user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
xstrfmtcat(extra, " && admin_level=%u", user_cond->admin_level);
}
- if (user->default_acct)
+ if(user->default_acct)
xstrfmtcat(vals, ", default_acct='%s'", user->default_acct);
- if (user->default_wckey)
+ if(user->default_wckey)
xstrfmtcat(vals, ", default_wckey='%s'", user->default_wckey);
- if (user->name)
+ if(user->name)
xstrfmtcat(vals, ", name='%s'", user->name);
- if (user->admin_level != SLURMDB_ADMIN_NOTSET)
+ if(user->admin_level != SLURMDB_ADMIN_NOTSET)
xstrfmtcat(vals, ", admin_level=%u", user->admin_level);
- if (!extra || !vals) {
+ if(!extra || !vals) {
errno = SLURM_NO_CHANGE_IN_DATA;
error("Nothing to change");
return NULL;
@@ -512,13 +512,13 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
query = xstrdup_printf("select name from %s %s;",
user_table, extra);
xfree(extra);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
}
- if (user->name && (mysql_num_rows(result) != 1)) {
+ if(user->name && (mysql_num_rows(result) != 1)) {
errno = ESLURM_ONE_CHANGE;
xfree(query);
return NULL;
@@ -531,7 +531,7 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
object = xstrdup(row[0]);
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "(name='%s'", object);
rc = 1;
} else {
@@ -539,12 +539,12 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
}
user_rec = xmalloc(sizeof(slurmdb_user_rec_t));
- if (!user->name)
+ if(!user->name)
user_rec->name = xstrdup(object);
else {
user_rec->name = xstrdup(user->name);
user_rec->old_name = xstrdup(object);
- if (_change_user_name(mysql_conn, user_rec)
+ if(_change_user_name(mysql_conn, user_rec)
!= SLURM_SUCCESS)
break;
}
@@ -557,7 +557,7 @@ extern List as_mysql_modify_users(mysql_conn_t *mysql_conn, uint32_t uid,
}
mysql_free_result(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(vals);
@@ -602,25 +602,25 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
slurmdb_wckey_cond_t wckey_cond;
bool jobs_running = 0;
- if (!user_cond) {
+ if(!user_cond) {
error("we need something to remove");
return NULL;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
xstrcat(extra, "where deleted=0");
- if (user_cond->assoc_cond && user_cond->assoc_cond->user_list
+ if(user_cond->assoc_cond && user_cond->assoc_cond->user_list
&& list_count(user_cond->assoc_cond->user_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -629,14 +629,14 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (user_cond->def_acct_list && list_count(user_cond->def_acct_list)) {
+ if(user_cond->def_acct_list && list_count(user_cond->def_acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_acct_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_acct='%s'", object);
set = 1;
@@ -645,14 +645,14 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
+ if(user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_wckey_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_wckey='%s'", object);
set = 1;
@@ -661,18 +661,18 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
+ if(user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
xstrfmtcat(extra, " && admin_level=%u", user_cond->admin_level);
}
- if (!extra) {
+ if(!extra) {
error("Nothing to remove");
return NULL;
}
query = xstrdup_printf("select name from %s %s;", user_table, extra);
xfree(extra);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -695,7 +695,7 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
list_append(ret_list, object);
list_append(assoc_cond.user_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
xstrfmtcat(assoc_char, "t2.user='%s'", object);
rc = 1;
@@ -711,7 +711,7 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
}
mysql_free_result(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(query);
@@ -723,7 +723,7 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
/* We need to remove these accounts from the coord's that have it */
coord_list = as_mysql_remove_coord(
mysql_conn, uid, NULL, &user_coord_cond);
- if (coord_list)
+ if(coord_list)
list_destroy(coord_list);
/* We need to remove these users from the wckey table */
@@ -731,7 +731,7 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
wckey_cond.user_list = assoc_cond.user_list;
coord_list = as_mysql_remove_wckeys(
mysql_conn, uid, &wckey_cond);
- if (coord_list)
+ if(coord_list)
list_destroy(coord_list);
list_destroy(assoc_cond.user_list);
@@ -740,7 +740,7 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
slurm_mutex_lock(&as_mysql_cluster_list_lock);
itr = list_iterator_create(as_mysql_cluster_list);
while((object = list_next(itr))) {
- if ((rc = remove_common(mysql_conn, DBD_REMOVE_USERS, now,
+ if((rc = remove_common(mysql_conn, DBD_REMOVE_USERS, now,
user_name, user_table, name_char,
assoc_char, object, ret_list,
&jobs_running))
@@ -765,13 +765,13 @@ extern List as_mysql_remove_users(mysql_conn_t *mysql_conn, uint32_t uid,
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't remove user coordinators");
list_destroy(ret_list);
return NULL;
}
- if (jobs_running)
+ if(jobs_running)
errno = ESLURM_JOBS_RUNNING_ON_ASSOC;
else
errno = SLURM_SUCCESS;
@@ -793,21 +793,21 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
MYSQL_ROW row;
slurmdb_user_rec_t user;
- if (!user_cond && !acct_list) {
+ if(!user_cond && !acct_list) {
error("we need something to remove");
return NULL;
- } else if (user_cond && user_cond->assoc_cond)
+ } else if(user_cond && user_cond->assoc_cond)
user_list = user_cond->assoc_cond->user_list;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = uid;
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR))) {
- if (!is_user_any_coord(mysql_conn, &user)) {
+ if(!is_user_any_coord(mysql_conn, &user)) {
error("Only admins/coordinators can "
"remove coordinators");
errno = ESLURM_ACCESS_DENIED;
@@ -817,18 +817,18 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
/* Leave it this way since we are using extra below */
- if (user_list && list_count(user_list)) {
+ if(user_list && list_count(user_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, "(");
itr = list_iterator_create(user_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "user='%s'", object);
set = 1;
@@ -837,18 +837,18 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (acct_list && list_count(acct_list)) {
+ if(acct_list && list_count(acct_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, "(");
itr = list_iterator_create(acct_list);
while((object = list_next(itr))) {
- if (!object[0])
+ if(!object[0])
continue;
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "acct='%s'", object);
set = 1;
@@ -857,7 +857,7 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
xstrcat(extra, ")");
}
- if (!extra) {
+ if(!extra) {
errno = SLURM_ERROR;
debug3("No conditions given");
return NULL;
@@ -869,7 +869,7 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(mysql_conn->db_conn, query, 0))) {
xfree(query);
xfree(extra);
@@ -880,9 +880,9 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
ret_list = list_create(slurm_destroy_char);
user_list = list_create(slurm_destroy_char);
while((row = mysql_fetch_row(result))) {
- if (!is_admin) {
+ if(!is_admin) {
slurmdb_coord_rec_t *coord = NULL;
- if (!user.coord_accts) { // This should never
+ if(!user.coord_accts) { // This should never
// happen
error("We are here with no coord accts");
errno = ESLURM_ACCESS_DENIED;
@@ -894,12 +894,12 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
}
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name, row[1]))
+ if(!strcasecmp(coord->name, row[1]))
break;
}
list_iterator_destroy(itr);
- if (!coord) {
+ if(!coord) {
error("User %s(%d) does not have the "
"ability to change this account (%s)",
user.name, user.uid, row[1]);
@@ -911,7 +911,7 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
return NULL;
}
}
- if (!last_user || strcasecmp(last_user, row[0])) {
+ if(!last_user || strcasecmp(last_user, row[0])) {
list_append(user_list, xstrdup(row[0]));
last_user = row[0];
}
@@ -924,7 +924,7 @@ extern List as_mysql_remove_coord(mysql_conn_t *mysql_conn, uint32_t uid,
slurm_mutex_lock(&as_mysql_cluster_list_lock);
itr = list_iterator_create(as_mysql_cluster_list);
while((object = list_next(itr))) {
- if ((rc = remove_common(mysql_conn, DBD_REMOVE_ACCOUNT_COORDS,
+ if((rc = remove_common(mysql_conn, DBD_REMOVE_ACCOUNT_COORDS,
now, user_name, acct_coord_table,
extra, NULL, object, NULL, NULL))
!= SLURM_SUCCESS)
@@ -988,7 +988,7 @@ extern List as_mysql_get_users(mysql_conn_t *mysql_conn, uid_t uid,
USER_REQ_COUNT
};
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
@@ -996,30 +996,30 @@ extern List as_mysql_get_users(mysql_conn_t *mysql_conn, uid_t uid,
private_data = slurm_get_private_data();
if (private_data & PRIVATE_DATA_USERS) {
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR)))
is_user_any_coord(mysql_conn, &user);
}
- if (!user_cond) {
+ if(!user_cond) {
xstrcat(extra, "where deleted=0");
goto empty;
}
- if (user_cond->with_deleted)
+ if(user_cond->with_deleted)
xstrcat(extra, "where (deleted=0 || deleted=1)");
else
xstrcat(extra, "where deleted=0");
- if (user_cond->assoc_cond &&
+ if(user_cond->assoc_cond &&
user_cond->assoc_cond->user_list
&& list_count(user_cond->assoc_cond->user_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "name='%s'", object);
set = 1;
@@ -1028,12 +1028,12 @@ extern List as_mysql_get_users(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (user_cond->def_acct_list && list_count(user_cond->def_acct_list)) {
+ if(user_cond->def_acct_list && list_count(user_cond->def_acct_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_acct_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_acct='%s'", object);
set = 1;
@@ -1042,12 +1042,12 @@ extern List as_mysql_get_users(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
+ if(user_cond->def_wckey_list && list_count(user_cond->def_wckey_list)) {
set = 0;
xstrcat(extra, " && (");
itr = list_iterator_create(user_cond->def_wckey_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
xstrfmtcat(extra, "default_wckey='%s'", object);
set = 1;
@@ -1056,7 +1056,7 @@ extern List as_mysql_get_users(mysql_conn_t *mysql_conn, uid_t uid,
xstrcat(extra, ")");
}
- if (user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
+ if(user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
xstrfmtcat(extra, " && admin_level=%u",
user_cond->admin_level);
}
@@ -1064,7 +1064,7 @@ empty:
/* This is here to make sure we are looking at only this user
* if this flag is set.
*/
- if (!is_admin && (private_data & PRIVATE_DATA_USERS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_USERS)) {
xstrfmtcat(extra, " && name='%s'", user.name);
}
@@ -1080,7 +1080,7 @@ empty:
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return NULL;
@@ -1096,7 +1096,7 @@ empty:
user->name = xstrdup(row[USER_REQ_NAME]);
user->default_acct = xstrdup(row[USER_REQ_DA]);
- if (row[USER_REQ_DW])
+ if(row[USER_REQ_DW])
user->default_wckey = xstrdup(row[USER_REQ_DW]);
else
user->default_wckey = xstrdup("");
@@ -1112,12 +1112,12 @@ empty:
/* else */
/* user->uid = passwd_ptr->pw_uid; */
- if (user_cond && user_cond->with_coords)
+ if(user_cond && user_cond->with_coords)
_get_user_coords(mysql_conn, user);
}
mysql_free_result(result);
- if (user_cond && user_cond->with_assocs) {
+ if(user_cond && user_cond->with_assocs) {
ListIterator assoc_itr = NULL;
slurmdb_user_rec_t *user = NULL;
slurmdb_association_rec_t *assoc = NULL;
@@ -1126,17 +1126,17 @@ empty:
/* Make sure we don't get any non-user associations
* this is done by at least having a user_list
* defined */
- if (!user_cond->assoc_cond)
+ if(!user_cond->assoc_cond)
user_cond->assoc_cond =
xmalloc(sizeof(slurmdb_association_cond_t));
- if (!user_cond->assoc_cond->user_list)
+ if(!user_cond->assoc_cond->user_list)
user_cond->assoc_cond->user_list = list_create(NULL);
assoc_list = as_mysql_get_assocs(
mysql_conn, uid, user_cond->assoc_cond);
- if (!assoc_list) {
+ if(!assoc_list) {
error("no associations");
goto get_wckeys;
}
@@ -1145,10 +1145,10 @@ empty:
assoc_itr = list_iterator_create(assoc_list);
while((user = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if (strcmp(assoc->user, user->name))
+ if(strcmp(assoc->user, user->name))
continue;
- if (!user->assoc_list)
+ if(!user->assoc_list)
user->assoc_list = list_create(
slurmdb_destroy_association_rec);
list_append(user->assoc_list, assoc);
@@ -1163,7 +1163,7 @@ empty:
}
get_wckeys:
- if (user_cond && user_cond->with_wckeys) {
+ if(user_cond && user_cond->with_wckeys) {
ListIterator wckey_itr = NULL;
slurmdb_user_rec_t *user = NULL;
slurmdb_wckey_rec_t *wckey = NULL;
@@ -1171,7 +1171,7 @@ get_wckeys:
slurmdb_wckey_cond_t wckey_cond;
memset(&wckey_cond, 0, sizeof(slurmdb_wckey_cond_t));
- if (user_cond->assoc_cond) {
+ if(user_cond->assoc_cond) {
wckey_cond.user_list =
user_cond->assoc_cond->user_list;
wckey_cond.cluster_list =
@@ -1180,17 +1180,17 @@ get_wckeys:
wckey_list = as_mysql_get_wckeys(
mysql_conn, uid, &wckey_cond);
- if (!wckey_list)
+ if(!wckey_list)
return user_list;
itr = list_iterator_create(user_list);
wckey_itr = list_iterator_create(wckey_list);
while((user = list_next(itr))) {
while((wckey = list_next(wckey_itr))) {
- if (strcmp(wckey->user, user->name))
+ if(strcmp(wckey->user, user->name))
continue;
- if (!user->wckey_list)
+ if(!user->wckey_list)
user->wckey_list = list_create(
slurmdb_destroy_wckey_rec);
list_append(user->wckey_list, wckey);
diff --git a/src/plugins/accounting_storage/mysql/as_mysql_wckey.c b/src/plugins/accounting_storage/mysql/as_mysql_wckey.c
index 0c8a710fbed17f50998297b11a528ef5387a60a0..30960fb10210c67ef83a0f806a37bf711c471415 100644
--- a/src/plugins/accounting_storage/mysql/as_mysql_wckey.c
+++ b/src/plugins/accounting_storage/mysql/as_mysql_wckey.c
@@ -62,21 +62,21 @@ static int _setup_wckey_cond_limits(slurmdb_wckey_cond_t *wckey_cond, char **ext
ListIterator itr = NULL;
char *object = NULL;
char *prefix = "t1";
- if (!wckey_cond)
+ if(!wckey_cond)
return 0;
- if (wckey_cond->with_deleted)
+ if(wckey_cond->with_deleted)
xstrfmtcat(*extra, " where (%s.deleted=0 || %s.deleted=1)",
prefix, prefix);
else
xstrfmtcat(*extra, " where %s.deleted=0", prefix);
- if (wckey_cond->name_list && list_count(wckey_cond->name_list)) {
+ if(wckey_cond->name_list && list_count(wckey_cond->name_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(wckey_cond->name_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.wckey_name='%s'",
prefix, object);
@@ -86,12 +86,12 @@ static int _setup_wckey_cond_limits(slurmdb_wckey_cond_t *wckey_cond, char **ext
xstrcat(*extra, ")");
}
- if (wckey_cond->id_list && list_count(wckey_cond->id_list)) {
+ if(wckey_cond->id_list && list_count(wckey_cond->id_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(wckey_cond->id_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.id_wckey=%s", prefix, object);
set = 1;
@@ -100,12 +100,12 @@ static int _setup_wckey_cond_limits(slurmdb_wckey_cond_t *wckey_cond, char **ext
xstrcat(*extra, ")");
}
- if (wckey_cond->user_list && list_count(wckey_cond->user_list)) {
+ if(wckey_cond->user_list && list_count(wckey_cond->user_list)) {
set = 0;
xstrcat(*extra, " && (");
itr = list_iterator_create(wckey_cond->user_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*extra, " || ");
xstrfmtcat(*extra, "%s.user='%s'", prefix, object);
set = 1;
@@ -131,13 +131,13 @@ static int _cluster_remove_wckeys(mysql_conn_t *mysql_conn,
char *query = xstrdup_printf("select t1.id_wckey, t1.wckey_name "
"from \"%s_%s\" as t1%s;",
cluster_name, wckey_table, extra);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
return SLURM_ERROR;
}
- if (!mysql_num_rows(result)) {
+ if(!mysql_num_rows(result)) {
mysql_free_result(result);
xfree(query);
return SLURM_SUCCESS;
@@ -147,7 +147,7 @@ static int _cluster_remove_wckeys(mysql_conn_t *mysql_conn,
slurmdb_wckey_rec_t *wckey_rec = NULL;
list_append(ret_list, xstrdup(row[1]));
- if (!assoc_char)
+ if(!assoc_char)
xstrfmtcat(assoc_char, "id_wckey='%s'", row[0]);
else
xstrfmtcat(assoc_char, " || id_wckey='%s'", row[0]);
@@ -162,7 +162,7 @@ static int _cluster_remove_wckeys(mysql_conn_t *mysql_conn,
}
mysql_free_result(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything\n%s", query);
xfree(query);
@@ -197,7 +197,7 @@ static int _cluster_get_wckeys(mysql_conn_t *mysql_conn,
char *query = NULL;
bool with_usage = 0;
- if (wckey_cond)
+ if(wckey_cond)
with_usage = wckey_cond->with_usage;
xstrfmtcat(query, "select distinct %s from \"%s_%s\" as t1%s "
@@ -206,17 +206,17 @@ static int _cluster_get_wckeys(mysql_conn_t *mysql_conn,
debug3("%d(%s:%d) query\n%s",
mysql_conn->conn, THIS_FILE, __LINE__, query);
- if (!(result = mysql_db_query_ret(
+ if(!(result = mysql_db_query_ret(
mysql_conn->db_conn, query, 0))) {
xfree(query);
- if (mysql_errno(mysql_conn->db_conn) == ER_NO_SUCH_TABLE)
+ if(mysql_errno(mysql_conn->db_conn) == ER_NO_SUCH_TABLE)
return SLURM_SUCCESS;
else
return SLURM_ERROR;
}
xfree(query);
- if (!mysql_num_rows(result)) {
+ if(!mysql_num_rows(result)) {
mysql_free_result(result);
return SLURM_SUCCESS;
}
@@ -231,7 +231,7 @@ static int _cluster_get_wckeys(mysql_conn_t *mysql_conn,
wckey->user = xstrdup(row[WCKEY_REQ_USER]);
/* we want a blank wckey if the name is null */
- if (row[WCKEY_REQ_NAME])
+ if(row[WCKEY_REQ_NAME])
wckey->name = xstrdup(row[WCKEY_REQ_NAME]);
else
wckey->name = xstrdup("");
@@ -240,7 +240,7 @@ static int _cluster_get_wckeys(mysql_conn_t *mysql_conn,
}
mysql_free_result(result);
- if (with_usage && wckey_list && list_count(wckey_list))
+ if(with_usage && wckey_list && list_count(wckey_list))
get_usage_for_list(mysql_conn, DBD_GET_WCKEY_USAGE,
wckey_list, cluster_name,
wckey_cond->usage_start,
@@ -265,13 +265,13 @@ extern int as_mysql_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
int affect_rows = 0;
int added = 0;
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(wckey_list);
while((object = list_next(itr))) {
- if (!object->cluster || !object->cluster[0]
+ if(!object->cluster || !object->cluster[0]
|| !object->user || !object->user[0]) {
error("We need a wckey name, cluster, "
"and user to add.");
@@ -284,7 +284,7 @@ extern int as_mysql_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
xstrfmtcat(extra, ", mod_time=%d, user='%s'",
now, object->user);
- if (object->name) {
+ if(object->name) {
xstrcat(cols, ", wckey_name");
xstrfmtcat(vals, ", '%s'", object->name);
xstrfmtcat(extra, ", wckey_name='%s'", object->name);
@@ -300,7 +300,7 @@ extern int as_mysql_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
mysql_conn->conn, THIS_FILE, __LINE__, query);
object->id = mysql_insert_ret_id(mysql_conn->db_conn, query);
xfree(query);
- if (!object->id) {
+ if(!object->id) {
error("Couldn't add wckey %s", object->name);
added=0;
xfree(cols);
@@ -311,7 +311,7 @@ extern int as_mysql_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
affect_rows = last_affected_rows(mysql_conn->db_conn);
- if (!affect_rows) {
+ if(!affect_rows) {
debug2("nothing changed %d", affect_rows);
xfree(cols);
xfree(extra);
@@ -337,10 +337,10 @@ extern int as_mysql_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
debug4("query\n%s",query);
rc = mysql_db_query(mysql_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
} else {
- if (addto_update_list(mysql_conn->update_list,
+ if(addto_update_list(mysql_conn->update_list,
SLURMDB_ADD_WCKEY,
object) == SLURM_SUCCESS)
list_remove(itr);
@@ -351,7 +351,7 @@ extern int as_mysql_add_wckeys(mysql_conn_t *mysql_conn, uint32_t uid,
list_iterator_destroy(itr);
xfree(user_name);
- if (!added) {
+ if(!added) {
reset_mysql_conn(mysql_conn);
}
@@ -378,25 +378,25 @@ extern List as_mysql_remove_wckeys(mysql_conn_t *mysql_conn,
List use_cluster_list = as_mysql_cluster_list;
ListIterator itr;
- if (!wckey_cond) {
+ if(!wckey_cond) {
xstrcat(extra, " where deleted=0");
goto empty;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
set = _setup_wckey_cond_limits(wckey_cond, &extra);
empty:
- if (!extra) {
+ if(!extra) {
error("Nothing to remove");
return NULL;
}
user_name = uid_to_string((uid_t) uid);
- if (wckey_cond->cluster_list && list_count(wckey_cond->cluster_list))
+ if(wckey_cond->cluster_list && list_count(wckey_cond->cluster_list))
use_cluster_list = wckey_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -404,7 +404,7 @@ empty:
ret_list = list_create(slurm_destroy_char);
itr = list_iterator_create(use_cluster_list);
while((object = list_next(itr))) {
- if ((rc = _cluster_remove_wckeys(
+ if((rc = _cluster_remove_wckeys(
mysql_conn, extra, object, user_name, ret_list))
!= SLURM_SUCCESS)
break;
@@ -413,7 +413,7 @@ empty:
xfree(extra);
xfree(user_name);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
if (rc == SLURM_ERROR) {
@@ -439,12 +439,12 @@ extern List as_mysql_get_wckeys(mysql_conn_t *mysql_conn, uid_t uid,
List use_cluster_list = as_mysql_cluster_list;
ListIterator itr;
- if (!wckey_cond) {
+ if(!wckey_cond) {
xstrcat(extra, " where deleted=0");
goto empty;
}
- if (check_connection(mysql_conn) != SLURM_SUCCESS)
+ if(check_connection(mysql_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
@@ -452,7 +452,7 @@ extern List as_mysql_get_wckeys(mysql_conn_t *mysql_conn, uid_t uid,
private_data = slurm_get_private_data();
if (private_data & PRIVATE_DATA_USERS) {
- if (!(is_admin = is_user_min_admin_level(
+ if(!(is_admin = is_user_min_admin_level(
mysql_conn, uid, SLURMDB_ADMIN_OPERATOR)))
is_user_any_coord(mysql_conn, &user);
}
@@ -470,12 +470,12 @@ empty:
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
- if (!is_admin && (private_data & PRIVATE_DATA_USERS))
+ if(!is_admin && (private_data & PRIVATE_DATA_USERS))
xstrfmtcat(extra, " && t1.user='%s'", user.name);
wckey_list = list_create(slurmdb_destroy_wckey_rec);
- if (wckey_cond->cluster_list && list_count(wckey_cond->cluster_list))
+ if(wckey_cond->cluster_list && list_count(wckey_cond->cluster_list))
use_cluster_list = wckey_cond->cluster_list;
else
slurm_mutex_lock(&as_mysql_cluster_list_lock);
@@ -483,7 +483,7 @@ empty:
//START_TIMER;
itr = list_iterator_create(use_cluster_list);
while((cluster_name = list_next(itr))) {
- if (_cluster_get_wckeys(mysql_conn, wckey_cond, tmp, extra,
+ if(_cluster_get_wckeys(mysql_conn, wckey_cond, tmp, extra,
cluster_name, wckey_list)
!= SLURM_SUCCESS) {
list_destroy(wckey_list);
@@ -493,7 +493,7 @@ empty:
}
list_iterator_destroy(itr);
- if (use_cluster_list == as_mysql_cluster_list)
+ if(use_cluster_list == as_mysql_cluster_list)
slurm_mutex_unlock(&as_mysql_cluster_list_lock);
xfree(tmp);
diff --git a/src/plugins/accounting_storage/pgsql/account.c b/src/plugins/accounting_storage/pgsql/account.c
index 8650b6d0114afe8eb93955dfd4da96dcd1ba68b2..9bb2f0d95800d7f68646d4e53a5e6b5bc45986c6 100644
--- a/src/plugins/accounting_storage/pgsql/account.c
+++ b/src/plugins/accounting_storage/pgsql/account.c
@@ -99,12 +99,12 @@ _get_slurmdb_coords(pgsql_conn_t *pg_conn, slurmdb_account_rec_t *acct)
slurmdb_coord_rec_t *coord = NULL;
PGresult *result = NULL;
- if (!acct) {
+ if(!acct) {
error("as/pg: _get_slurmdb_coords: account not given");
return SLURM_ERROR;
}
- if (!acct->coordinators)
+ if(!acct->coordinators)
acct->coordinators = list_create(slurmdb_destroy_coord_rec);
/* get direct coords */
@@ -112,7 +112,7 @@ _get_slurmdb_coords(pgsql_conn_t *pg_conn, slurmdb_account_rec_t *acct)
"WHERE acct='%s' AND deleted=0",
acct_coord_table, acct->name);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -133,7 +133,7 @@ _get_slurmdb_coords(pgsql_conn_t *pg_conn, slurmdb_account_rec_t *acct)
acct_coord_table, assoc_table, assoc_table,
acct->name, acct->name);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -190,7 +190,7 @@ as_p_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
itr = list_iterator_create(acct_list);
while((object = list_next(itr))) {
- if (!object->name || !object->description
+ if(!object->name || !object->description
|| !object->organization) {
error("as/pg: add_accts: We need an account name, "
"description, and organization to add. %s %s %s",
@@ -206,7 +206,7 @@ as_p_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
query = xstrdup_printf("SELECT add_acct(%s);", rec);
xfree(rec);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("as/pg: couldn't add acct");
continue;
}
@@ -214,7 +214,7 @@ as_p_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
info = xstrdup_printf("description='%s', organization='%s'",
object->description,
object->organization);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %u, '%s', '%s', $$%s$$)",
now, DBD_ADD_ACCOUNTS, object->name,
@@ -229,7 +229,7 @@ as_p_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
user_name, info);
xfree(info);
- if (!object->assoc_list)
+ if(!object->assoc_list)
continue;
list_transfer(assoc_list, object->assoc_list);
@@ -237,12 +237,12 @@ as_p_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
list_iterator_destroy(itr);
xfree(user_name);
- if (rc == SLURM_SUCCESS) {
- if (txn_query) {
+ if(rc == SLURM_SUCCESS) {
+ if(txn_query) {
xstrcat(txn_query, ";");
rc = pgsql_db_query(pg_conn->db_conn, txn_query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("as/pg: add_accts: couldn't add txn");
/* TODO: why succees if add txn failed? */
/* rc = SLURM_SUCCESS; */
@@ -251,8 +251,8 @@ as_p_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
} else
xfree(txn_query);
- if (rc == SLURM_SUCCESS && list_count(assoc_list)) {
- if (acct_storage_p_add_associations(pg_conn, uid, assoc_list)
+ if(rc == SLURM_SUCCESS && list_count(assoc_list)) {
+ if(acct_storage_p_add_associations(pg_conn, uid, assoc_list)
!= SLURM_SUCCESS) {
error("as/pg: add_accts: problem adding account "
"associations");
@@ -285,14 +285,14 @@ as_p_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
PGresult *result = NULL;
time_t now = time(NULL);
- if (!acct_cond || !acct) {
+ if(!acct_cond || !acct) {
error("as/pg: modify_accounts: we need something to change");
return NULL;
}
if (check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (acct_cond->assoc_cond)
+ if(acct_cond->assoc_cond)
concat_cond_list(acct_cond->assoc_cond->acct_list,
NULL, "name", &cond);
concat_cond_list(acct_cond->description_list,
@@ -305,11 +305,11 @@ as_p_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
return NULL;
}
- if (acct->description)
+ if(acct->description)
xstrfmtcat(vals, ", description='%s'", acct->description);
- if (acct->organization)
+ if(acct->organization)
xstrfmtcat(vals, ", organization='%s'", acct->organization);
- if (!vals) {
+ if(!vals) {
xfree(cond);
errno = SLURM_NO_CHANGE_IN_DATA;
error("as/pg: modify_accounts: no new values given");
@@ -321,7 +321,7 @@ as_p_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
acct_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
xfree(vals);
return NULL;
}
@@ -331,7 +331,7 @@ as_p_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
FOR_EACH_ROW {
object = xstrdup(ROW(0));
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "(name='%s'", object);
rc = 1;
} else {
@@ -341,7 +341,7 @@ as_p_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: modify_accounts: didn't effect anything");
xfree(vals);
@@ -385,21 +385,21 @@ as_p_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
PGresult *result = NULL;
time_t now = time(NULL);
- if (!acct_cond) {
+ if(!acct_cond) {
error("as/pg: remove_accts: we need something to remove");
return NULL;
}
if (check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (acct_cond->assoc_cond)
+ if(acct_cond->assoc_cond)
concat_cond_list(acct_cond->assoc_cond->acct_list,
NULL, "name", &cond);
concat_cond_list(acct_cond->description_list,
NULL, "description", &cond);
concat_cond_list(acct_cond->organization_list,
NULL, "organization", &cond);
- if (!cond) {
+ if(!cond) {
error("as/pg: remove_accts: nothing to remove");
return NULL;
}
@@ -410,7 +410,7 @@ as_p_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
xfree(cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
rc = 0;
@@ -418,7 +418,7 @@ as_p_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
FOR_EACH_ROW {
char *object = xstrdup(ROW(0));
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
xstrfmtcat(assoc_char, "t1.acct='%s'", object);
rc = 1;
@@ -429,7 +429,7 @@ as_p_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: remove_accts: didn't effect anything");
return ret_list;
@@ -437,7 +437,7 @@ as_p_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
/* remove these accounts from the coord's that have it */
coord_list = acct_storage_p_remove_coord(pg_conn, uid, ret_list, NULL);
- if (coord_list)
+ if(coord_list)
list_destroy(coord_list);
user_name = uid_to_string((uid_t) uid);
@@ -498,17 +498,17 @@ as_p_get_accts(pgsql_conn_t *pg_conn, uid_t uid,
}
}
- if (!acct_cond) {
+ if(!acct_cond) {
xstrcat(cond, "WHERE deleted=0");
goto empty;
}
- if (acct_cond->with_deleted)
+ if(acct_cond->with_deleted)
xstrcat(cond, "WHERE (deleted=0 OR deleted=1)");
else
xstrcat(cond, "WHERE deleted=0");
- if (acct_cond->assoc_cond)
+ if(acct_cond->assoc_cond)
concat_cond_list(acct_cond->assoc_cond->acct_list,
NULL, "name", &cond);
concat_cond_list(acct_cond->description_list,
@@ -517,12 +517,12 @@ as_p_get_accts(pgsql_conn_t *pg_conn, uid_t uid,
NULL, "organization", &cond);
empty:
- if (!is_admin && (private_data & PRIVATE_DATA_ACCOUNTS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_ACCOUNTS)) {
slurmdb_coord_rec_t *coord = NULL;
set = 0;
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (set) {
+ if(set) {
xstrfmtcat(cond, " OR name='%s'",
coord->name);
} else {
@@ -532,7 +532,7 @@ empty:
}
}
list_iterator_destroy(itr);
- if (set)
+ if(set)
xstrcat(cond,")");
}
@@ -545,11 +545,11 @@ empty:
acct_list = list_create(slurmdb_destroy_account_rec);
- if (acct_cond && acct_cond->with_assocs) {
- if (!acct_cond->assoc_cond)
+ if(acct_cond && acct_cond->with_assocs) {
+ if(!acct_cond->assoc_cond)
acct_cond->assoc_cond = xmalloc(
sizeof(slurmdb_association_cond_t));
- else if (acct_cond->assoc_cond->acct_list)
+ else if(acct_cond->assoc_cond->acct_list)
list_destroy(acct_cond->assoc_cond->acct_list);
acct_cond->assoc_cond->acct_list = list_create(NULL);
}
@@ -561,9 +561,9 @@ empty:
acct->name = xstrdup(ROW(GA_NAME));
acct->description = xstrdup(ROW(GA_DESC));
acct->organization = xstrdup(ROW(GA_ORG));
- if (acct_cond && acct_cond->with_coords)
+ if(acct_cond && acct_cond->with_coords)
_get_slurmdb_coords(pg_conn, acct);
- if (acct_cond && acct_cond->with_assocs) {
+ if(acct_cond && acct_cond->with_assocs) {
list_append(acct_cond->assoc_cond->acct_list,
acct->name);
}
@@ -571,7 +571,7 @@ empty:
PQclear(result);
/* get associations */
- if (acct_cond && acct_cond->with_assocs &&
+ if(acct_cond && acct_cond->with_assocs &&
list_count(acct_cond->assoc_cond->acct_list)) {
ListIterator assoc_itr = NULL;
slurmdb_account_rec_t *acct = NULL;
@@ -579,7 +579,7 @@ empty:
List assoc_list = acct_storage_p_get_associations(
pg_conn, uid, acct_cond->assoc_cond);
- if (!assoc_list) {
+ if(!assoc_list) {
error("as/pg: get_accounts: no associations");
return acct_list;
}
@@ -588,17 +588,17 @@ empty:
assoc_itr = list_iterator_create(assoc_list);
while((acct = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if (strcmp(assoc->acct, acct->name))
+ if(strcmp(assoc->acct, acct->name))
continue;
- if (!acct->assoc_list)
+ if(!acct->assoc_list)
acct->assoc_list = list_create(
slurmdb_destroy_association_rec);
list_append(acct->assoc_list, assoc);
list_remove(assoc_itr);
}
list_iterator_reset(assoc_itr);
- if (!acct->assoc_list) /* problem acct */
+ if(!acct->assoc_list) /* problem acct */
list_remove(itr);
}
list_iterator_destroy(itr);
@@ -632,7 +632,7 @@ get_acct_no_assocs(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
concat_cond_list(assoc_q->acct_list, NULL, "name", &query);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -644,7 +644,7 @@ get_acct_no_assocs(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
"acct='%s' LIMIT 1;",
assoc_table, ROW(0));
result2 = DEF_QUERY_RET;
- if (!result2) {
+ if(!result2) {
rc = SLURM_ERROR;
break;
}
@@ -705,7 +705,7 @@ get_acct_no_users(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
}
xstrcat(query, " ORDER BY cluster, acct;");
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -713,13 +713,13 @@ get_acct_no_users(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
xmalloc(sizeof(slurmdb_association_rec_t));
list_append(ret_list, assoc);
assoc->id = SLURMDB_PROBLEM_ACCT_NO_USERS;
-/* if (ROW(GA_USER)[0]) */
+/* if(ROW(GA_USER)[0]) */
/* assoc->user = xstrdup(ROW(GA_USER)); */
assoc->acct = xstrdup(ROW(GA_ACCT));
assoc->cluster = xstrdup(ROW(GA_CLUSTER));
- if (ROW(GA_PARENT)[0])
+ if(ROW(GA_PARENT)[0])
assoc->parent_acct = xstrdup(ROW(GA_PARENT));
-/* if (ROW(GA_PART)[0]) */
+/* if(ROW(GA_PART)[0]) */
/* assoc->partition = xstrdup(ROW(GA_PART)); */
} END_EACH_ROW;
PQclear(result);
diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
index 58c9fca5fc3a4098072d6a2469b8b71c7f61d4b8..68edd0e50f430febfb6d4d7e4f00f6b00e387211 100644
--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
+++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
@@ -95,12 +95,12 @@ static pgsql_db_info_t *_pgsql_acct_create_db_info()
db_info->port = slurm_get_accounting_storage_port();
/* it turns out it is better if using defaults to let postgres
handle them on it's own terms */
- if (!db_info->port) {
+ if(!db_info->port) {
db_info->port = DEFAULT_PGSQL_PORT;
slurm_set_accounting_storage_port(db_info->port);
}
db_info->host = slurm_get_accounting_storage_host();
- if (!db_info->host)
+ if(!db_info->host)
db_info->host = xstrdup("localhost");
db_info->user = slurm_get_accounting_storage_user();
db_info->pass = slurm_get_accounting_storage_pass();
@@ -159,12 +159,12 @@ extern int init ( void )
/* since this can be loaded from many different places
only tell us once. */
- if (!first)
+ if(!first)
return SLURM_SUCCESS;
first = 0;
- if (!slurmdbd_conf) {
+ if(!slurmdbd_conf) {
char *cluster_name = NULL;
if (!(cluster_name = slurm_get_cluster_name()))
fatal("%s requires ClusterName in slurm.conf",
@@ -175,12 +175,12 @@ extern int init ( void )
pgsql_db_info = _pgsql_acct_create_db_info();
location = slurm_get_accounting_storage_loc();
- if (!location)
+ if(!location)
pgsql_db_name = xstrdup(DEFAULT_ACCOUNTING_DB);
else {
int i = 0;
while(location[i]) {
- if (location[i] == '.' || location[i] == '/') {
+ if(location[i] == '.' || location[i] == '/') {
debug("%s doesn't look like a database "
"name using %s",
location, DEFAULT_ACCOUNTING_DB);
@@ -188,7 +188,7 @@ extern int init ( void )
}
i++;
}
- if (location[i]) {
+ if(location[i]) {
pgsql_db_name = xstrdup(DEFAULT_ACCOUNTING_DB);
xfree(location);
} else
@@ -200,7 +200,7 @@ extern int init ( void )
rc = _pgsql_acct_check_tables(acct_pgsql_db, pgsql_db_info->user);
pgsql_close_db_connection(&acct_pgsql_db);
- if (rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
verbose("%s loaded", plugin_name);
else
verbose("%s failed", plugin_name);
@@ -220,7 +220,7 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
{
pgsql_conn_t *pg_conn = xmalloc(sizeof(pgsql_conn_t));
- if (!pgsql_db_info)
+ if(!pgsql_db_info)
init();
debug2("as/pg: get_connection: request new connection");
@@ -234,7 +234,7 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
pgsql_get_db_connection(&pg_conn->db_conn,
pgsql_db_name, pgsql_db_info);
- if (pg_conn->db_conn && rollback) {
+ if(pg_conn->db_conn && rollback) {
pgsql_db_start_transaction(pg_conn->db_conn);
}
return (void *)pg_conn;
@@ -242,7 +242,7 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
extern int acct_storage_p_close_connection(pgsql_conn_t **pg_conn)
{
- if (!pg_conn || !*pg_conn)
+ if(!pg_conn || !*pg_conn)
return SLURM_SUCCESS;
acct_storage_p_commit((*pg_conn), 0); /* discard changes */
@@ -262,14 +262,14 @@ extern int acct_storage_p_commit(pgsql_conn_t *pg_conn, bool commit)
debug4("as/pg: commit: got %d commits",
list_count(pg_conn->update_list));
- if (pg_conn->rollback) {
- if (!commit) {
- if (pgsql_db_rollback(pg_conn->db_conn)) {
+ if(pg_conn->rollback) {
+ if(!commit) {
+ if(pgsql_db_rollback(pg_conn->db_conn)) {
error("as/pg: commit: rollback failed");
return SLURM_ERROR;
}
} else {
- if (pgsql_db_commit(pg_conn->db_conn)) {
+ if(pgsql_db_commit(pg_conn->db_conn)) {
error("as/pg: commit: commit failed");
return SLURM_ERROR;
}
@@ -278,7 +278,7 @@ extern int acct_storage_p_commit(pgsql_conn_t *pg_conn, bool commit)
pgsql_db_start_transaction(pg_conn->db_conn);
}
- if (commit && list_count(pg_conn->update_list)) {
+ if(commit && list_count(pg_conn->update_list)) {
char *query;
PGresult *result;
@@ -523,7 +523,7 @@ extern int acct_storage_p_get_usage(pgsql_conn_t *pg_conn, uid_t uid,
{
int rc = SLURM_SUCCESS;
- if (type == DBD_GET_CLUSTER_USAGE)
+ if(type == DBD_GET_CLUSTER_USAGE)
cs_pg_get_usage(pg_conn, uid, in, type, start, end);
else
as_pg_get_usage(pg_conn, uid, in, type, start, end);
@@ -543,7 +543,7 @@ extern int clusteracct_storage_p_node_down(pgsql_conn_t *pg_conn,
time_t event_time, char *reason,
uint32_t reason_uid)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -555,7 +555,7 @@ extern int clusteracct_storage_p_node_up(pgsql_conn_t *pg_conn,
struct node_record *node_ptr,
time_t event_time)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -566,7 +566,7 @@ extern int clusteracct_storage_p_node_up(pgsql_conn_t *pg_conn,
extern int clusteracct_storage_p_register_ctld(pgsql_conn_t *pg_conn,
uint16_t port)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -579,7 +579,7 @@ extern int clusteracct_storage_p_cluster_cpus(pgsql_conn_t *pg_conn,
uint32_t cpus,
time_t event_time)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -594,7 +594,7 @@ extern int clusteracct_storage_p_cluster_cpus(pgsql_conn_t *pg_conn,
extern int jobacct_storage_p_job_start(pgsql_conn_t *pg_conn,
struct job_record *job_ptr)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -608,7 +608,7 @@ extern int jobacct_storage_p_job_start(pgsql_conn_t *pg_conn,
extern int jobacct_storage_p_job_complete(pgsql_conn_t *pg_conn,
struct job_record *job_ptr)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -622,7 +622,7 @@ extern int jobacct_storage_p_job_complete(pgsql_conn_t *pg_conn,
extern int jobacct_storage_p_step_start(pgsql_conn_t *pg_conn,
struct step_record *step_ptr)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -636,7 +636,7 @@ extern int jobacct_storage_p_step_start(pgsql_conn_t *pg_conn,
extern int jobacct_storage_p_step_complete(pgsql_conn_t *pg_conn,
struct step_record *step_ptr)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
@@ -650,7 +650,7 @@ extern int jobacct_storage_p_step_complete(pgsql_conn_t *pg_conn,
extern int jobacct_storage_p_suspend(pgsql_conn_t *pg_conn,
struct job_record *job_ptr)
{
- if (!pg_conn->cluster_name) {
+ if(!pg_conn->cluster_name) {
error("%s:%d no cluster name", THIS_FILE, __LINE__);
return SLURM_ERROR;
}
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_acct.c b/src/plugins/accounting_storage/pgsql/as_pg_acct.c
index 1e5485ac19c64d617cc11acb43dba71a9d5578fe..607dfb3349c95c3fc53aa7989ee6e0ca172f67f6 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_acct.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_acct.c
@@ -99,12 +99,12 @@ _get_slurmdb_coords(pgsql_conn_t *pg_conn, slurmdb_account_rec_t *acct)
slurmdb_coord_rec_t *coord = NULL;
PGresult *result = NULL;
- if (!acct) {
+ if(!acct) {
error("as/pg: _get_slurmdb_coords: account not given");
return SLURM_ERROR;
}
- if (!acct->coordinators)
+ if(!acct->coordinators)
acct->coordinators = list_create(slurmdb_destroy_coord_rec);
/* get direct coords */
@@ -112,7 +112,7 @@ _get_slurmdb_coords(pgsql_conn_t *pg_conn, slurmdb_account_rec_t *acct)
"WHERE acct='%s' AND deleted=0",
acct_coord_table, acct->name);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -133,7 +133,7 @@ _get_slurmdb_coords(pgsql_conn_t *pg_conn, slurmdb_account_rec_t *acct)
acct_coord_table, assoc_table, assoc_table,
acct->name, acct->name);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -190,7 +190,7 @@ as_pg_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
itr = list_iterator_create(acct_list);
while((object = list_next(itr))) {
- if (!object->name || !object->description
+ if(!object->name || !object->description
|| !object->organization) {
error("as/pg: add_accts: We need an account name, "
"description, and organization to add. %s %s %s",
@@ -206,7 +206,7 @@ as_pg_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
query = xstrdup_printf("SELECT add_acct(%s);", rec);
xfree(rec);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("as/pg: couldn't add acct");
continue;
}
@@ -214,7 +214,7 @@ as_pg_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
info = xstrdup_printf("description='%s', organization='%s'",
object->description,
object->organization);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %u, '%s', '%s', $$%s$$)",
now, DBD_ADD_ACCOUNTS, object->name,
@@ -229,7 +229,7 @@ as_pg_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
user_name, info);
xfree(info);
- if (!object->assoc_list)
+ if(!object->assoc_list)
continue;
list_transfer(assoc_list, object->assoc_list);
@@ -237,12 +237,12 @@ as_pg_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
list_iterator_destroy(itr);
xfree(user_name);
- if (rc == SLURM_SUCCESS) {
- if (txn_query) {
+ if(rc == SLURM_SUCCESS) {
+ if(txn_query) {
xstrcat(txn_query, ";");
rc = pgsql_db_query(pg_conn->db_conn, txn_query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("as/pg: add_accts: couldn't add txn");
/* TODO: why succees if add txn failed? */
/* rc = SLURM_SUCCESS; */
@@ -251,8 +251,8 @@ as_pg_add_accts(pgsql_conn_t *pg_conn, uint32_t uid, List acct_list)
} else
xfree(txn_query);
- if (rc == SLURM_SUCCESS && list_count(assoc_list)) {
- if (acct_storage_p_add_associations(pg_conn, uid, assoc_list)
+ if(rc == SLURM_SUCCESS && list_count(assoc_list)) {
+ if(acct_storage_p_add_associations(pg_conn, uid, assoc_list)
!= SLURM_SUCCESS) {
error("as/pg: add_accts: problem adding account "
"associations");
@@ -285,14 +285,14 @@ as_pg_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
PGresult *result = NULL;
time_t now = time(NULL);
- if (!acct_cond || !acct) {
+ if(!acct_cond || !acct) {
error("as/pg: modify_accounts: we need something to change");
return NULL;
}
if (check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (acct_cond->assoc_cond)
+ if(acct_cond->assoc_cond)
concat_cond_list(acct_cond->assoc_cond->acct_list,
NULL, "name", &cond);
concat_cond_list(acct_cond->description_list,
@@ -305,11 +305,11 @@ as_pg_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
return NULL;
}
- if (acct->description)
+ if(acct->description)
xstrfmtcat(vals, ", description='%s'", acct->description);
- if (acct->organization)
+ if(acct->organization)
xstrfmtcat(vals, ", organization='%s'", acct->organization);
- if (!vals) {
+ if(!vals) {
xfree(cond);
errno = SLURM_NO_CHANGE_IN_DATA;
error("as/pg: modify_accounts: no new values given");
@@ -321,7 +321,7 @@ as_pg_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
acct_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
xfree(vals);
return NULL;
}
@@ -331,7 +331,7 @@ as_pg_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
FOR_EACH_ROW {
object = xstrdup(ROW(0));
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "(name='%s'", object);
rc = 1;
} else {
@@ -341,7 +341,7 @@ as_pg_modify_accounts(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: modify_accounts: didn't effect anything");
xfree(vals);
@@ -385,21 +385,21 @@ as_pg_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
PGresult *result = NULL;
time_t now = time(NULL);
- if (!acct_cond) {
+ if(!acct_cond) {
error("as/pg: remove_accts: we need something to remove");
return NULL;
}
if (check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (acct_cond->assoc_cond)
+ if(acct_cond->assoc_cond)
concat_cond_list(acct_cond->assoc_cond->acct_list,
NULL, "name", &cond);
concat_cond_list(acct_cond->description_list,
NULL, "description", &cond);
concat_cond_list(acct_cond->organization_list,
NULL, "organization", &cond);
- if (!cond) {
+ if(!cond) {
error("as/pg: remove_accts: nothing to remove");
return NULL;
}
@@ -410,7 +410,7 @@ as_pg_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
xfree(cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
rc = 0;
@@ -418,7 +418,7 @@ as_pg_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
FOR_EACH_ROW {
char *object = xstrdup(ROW(0));
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
xstrfmtcat(assoc_char, "t1.acct='%s'", object);
rc = 1;
@@ -429,7 +429,7 @@ as_pg_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: remove_accts: didn't effect anything");
return ret_list;
@@ -437,7 +437,7 @@ as_pg_remove_accts(pgsql_conn_t *pg_conn, uint32_t uid,
/* remove these accounts from the coord's that have it */
coord_list = acct_storage_p_remove_coord(pg_conn, uid, ret_list, NULL);
- if (coord_list)
+ if(coord_list)
list_destroy(coord_list);
user_name = uid_to_string((uid_t) uid);
@@ -498,17 +498,17 @@ as_pg_get_accts(pgsql_conn_t *pg_conn, uid_t uid,
}
}
- if (!acct_cond) {
+ if(!acct_cond) {
xstrcat(cond, "WHERE deleted=0");
goto empty;
}
- if (acct_cond->with_deleted)
+ if(acct_cond->with_deleted)
xstrcat(cond, "WHERE (deleted=0 OR deleted=1)");
else
xstrcat(cond, "WHERE deleted=0");
- if (acct_cond->assoc_cond)
+ if(acct_cond->assoc_cond)
concat_cond_list(acct_cond->assoc_cond->acct_list,
NULL, "name", &cond);
concat_cond_list(acct_cond->description_list,
@@ -517,12 +517,12 @@ as_pg_get_accts(pgsql_conn_t *pg_conn, uid_t uid,
NULL, "organization", &cond);
empty:
- if (!is_admin && (private_data & PRIVATE_DATA_ACCOUNTS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_ACCOUNTS)) {
slurmdb_coord_rec_t *coord = NULL;
set = 0;
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (set) {
+ if(set) {
xstrfmtcat(cond, " OR name='%s'",
coord->name);
} else {
@@ -532,7 +532,7 @@ empty:
}
}
list_iterator_destroy(itr);
- if (set)
+ if(set)
xstrcat(cond,")");
}
@@ -545,11 +545,11 @@ empty:
acct_list = list_create(slurmdb_destroy_account_rec);
- if (acct_cond && acct_cond->with_assocs) {
- if (!acct_cond->assoc_cond)
+ if(acct_cond && acct_cond->with_assocs) {
+ if(!acct_cond->assoc_cond)
acct_cond->assoc_cond = xmalloc(
sizeof(slurmdb_association_cond_t));
- else if (acct_cond->assoc_cond->acct_list)
+ else if(acct_cond->assoc_cond->acct_list)
list_destroy(acct_cond->assoc_cond->acct_list);
acct_cond->assoc_cond->acct_list = list_create(NULL);
}
@@ -561,9 +561,9 @@ empty:
acct->name = xstrdup(ROW(GA_NAME));
acct->description = xstrdup(ROW(GA_DESC));
acct->organization = xstrdup(ROW(GA_ORG));
- if (acct_cond && acct_cond->with_coords)
+ if(acct_cond && acct_cond->with_coords)
_get_slurmdb_coords(pg_conn, acct);
- if (acct_cond && acct_cond->with_assocs) {
+ if(acct_cond && acct_cond->with_assocs) {
list_append(acct_cond->assoc_cond->acct_list,
acct->name);
}
@@ -571,7 +571,7 @@ empty:
PQclear(result);
/* get associations */
- if (acct_cond && acct_cond->with_assocs &&
+ if(acct_cond && acct_cond->with_assocs &&
list_count(acct_cond->assoc_cond->acct_list)) {
ListIterator assoc_itr = NULL;
slurmdb_account_rec_t *acct = NULL;
@@ -579,7 +579,7 @@ empty:
List assoc_list = acct_storage_p_get_associations(
pg_conn, uid, acct_cond->assoc_cond);
- if (!assoc_list) {
+ if(!assoc_list) {
error("as/pg: get_accounts: no associations");
return acct_list;
}
@@ -588,17 +588,17 @@ empty:
assoc_itr = list_iterator_create(assoc_list);
while((acct = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if (strcmp(assoc->acct, acct->name))
+ if(strcmp(assoc->acct, acct->name))
continue;
- if (!acct->assoc_list)
+ if(!acct->assoc_list)
acct->assoc_list = list_create(
slurmdb_destroy_association_rec);
list_append(acct->assoc_list, assoc);
list_remove(assoc_itr);
}
list_iterator_reset(assoc_itr);
- if (!acct->assoc_list) /* problem acct */
+ if(!acct->assoc_list) /* problem acct */
list_remove(itr);
}
list_iterator_destroy(itr);
@@ -632,7 +632,7 @@ get_acct_no_assocs(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
concat_cond_list(assoc_q->acct_list, NULL, "name", &query);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -644,7 +644,7 @@ get_acct_no_assocs(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
"acct='%s' LIMIT 1;",
assoc_table, ROW(0));
result2 = DEF_QUERY_RET;
- if (!result2) {
+ if(!result2) {
rc = SLURM_ERROR;
break;
}
@@ -705,7 +705,7 @@ get_acct_no_users(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
}
xstrcat(query, " ORDER BY cluster, acct;");
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -713,13 +713,13 @@ get_acct_no_users(pgsql_conn_t *pg_conn, slurmdb_association_cond_t *assoc_q,
xmalloc(sizeof(slurmdb_association_rec_t));
list_append(ret_list, assoc);
assoc->id = SLURMDB_PROBLEM_ACCT_NO_USERS;
-/* if (ROW(GA_USER)[0]) */
+/* if(ROW(GA_USER)[0]) */
/* assoc->user = xstrdup(ROW(GA_USER)); */
assoc->acct = xstrdup(ROW(GA_ACCT));
assoc->cluster = xstrdup(ROW(GA_CLUSTER));
- if (ROW(GA_PARENT)[0])
+ if(ROW(GA_PARENT)[0])
assoc->parent_acct = xstrdup(ROW(GA_PARENT));
-/* if (ROW(GA_PART)[0]) */
+/* if(ROW(GA_PART)[0]) */
/* assoc->partition = xstrdup(ROW(GA_PART)); */
} END_EACH_ROW;
PQclear(result);
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_assoc.c b/src/plugins/accounting_storage/pgsql/as_pg_assoc.c
index d20829c08e4ab3fc23b4111a6920ca4b829cd965..6c0486bfc7ccaca2e69854cf22b99b477c71afcd 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_assoc.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_assoc.c
@@ -534,7 +534,7 @@ _make_assoc_rec(slurmdb_association_rec_t *assoc, time_t now, int deleted,
while((tmp = list_next(itr))) {
if (!tmp[0])
continue;
- if (!delta && (tmp[0] == '+' || tmp[0] == '-'))
+ if(!delta && (tmp[0] == '+' || tmp[0] == '-'))
delta = 1;
/* XXX: always with ',' prefix */
xstrfmtcat(qos_val, ",%s", tmp);
@@ -627,7 +627,7 @@ _make_cluster_root_assoc_rec(time_t now, slurmdb_cluster_rec_t *cluster,
while((tmp = list_next(itr))) {
if (!tmp[0])
continue;
- if (!delta && (tmp[0] == '+' || tmp[0] == '-'))
+ if(!delta && (tmp[0] == '+' || tmp[0] == '-'))
delta = 1;
/* XXX: always with ',' prefix */
xstrfmtcat(qos_val, ",%s", tmp);
@@ -850,7 +850,7 @@ _move_parent(pgsql_conn_t *pg_conn, char *id, uint32_t *lft, uint32_t *rgt,
}
PQclear(result);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
return rc;
/*
@@ -859,10 +859,10 @@ _move_parent(pgsql_conn_t *pg_conn, char *id, uint32_t *lft, uint32_t *rgt,
query = xstrdup_printf("SELECT lft, rgt FROM %s WHERE id=%s;",
assoc_table, id);
result = DEF_QUERY_RET;
- if (! result)
+ if(! result)
return SLURM_ERROR;
- if (PQntuples(result) > 0) {
+ if(PQntuples(result) > 0) {
/* move account to destination */
*lft = atoi(PG_VAL(0));
*rgt = atoi(PG_VAL(1));
@@ -893,10 +893,10 @@ _make_assoc_cond(slurmdb_association_cond_t *assoc_cond)
char *prefix = "t1";
int set = 0;
- if (!assoc_cond)
+ if(!assoc_cond)
return NULL;
- if (assoc_cond->qos_list && list_count(assoc_cond->qos_list)) {
+ if(assoc_cond->qos_list && list_count(assoc_cond->qos_list)) {
/*
* QOSLevel applies to all sub-associations in hierarchy.
* So find all sub-associations like WithSubAccounts
@@ -909,7 +909,7 @@ _make_assoc_cond(slurmdb_association_cond_t *assoc_cond)
set = 0;
itr = list_iterator_create(assoc_cond->qos_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(cond, " OR ");
xstrfmtcat(cond,
"(%s.qos ~ ',%s(,.+)?$' "
@@ -919,7 +919,7 @@ _make_assoc_cond(slurmdb_association_cond_t *assoc_cond)
}
list_iterator_destroy(itr);
xstrcat(cond, ") AND");
- } else if (assoc_cond->with_sub_accts) {
+ } else if(assoc_cond->with_sub_accts) {
prefix = "t2";
xstrfmtcat(cond, ", %s AS t2 WHERE "
"(t1.lft BETWEEN t2.lft AND t2.rgt) AND",
@@ -927,7 +927,7 @@ _make_assoc_cond(slurmdb_association_cond_t *assoc_cond)
} else /* No QOS condition, no WithSubAccounts */
xstrcat(cond, " WHERE");
- if (assoc_cond->with_deleted)
+ if(assoc_cond->with_deleted)
xstrfmtcat(cond, " (%s.deleted=0 OR %s.deleted=1)",
prefix, prefix);
else
@@ -974,7 +974,7 @@ _make_assoc_cond(slurmdb_association_cond_t *assoc_cond)
concat_cond_list(assoc_cond->user_list,
prefix, "user_name", &cond);
/* user_name specified */
- } else if (assoc_cond->user_list) {
+ } else if(assoc_cond->user_list) {
/* we want all the users, but no non-user(account)
associations */
debug4("no user specified looking at users");
@@ -996,10 +996,10 @@ _make_assoc_limit_vals(slurmdb_association_rec_t *assoc, char **vals)
{
char *tmp = NULL;
- if (!assoc)
+ if(!assoc)
return SLURM_ERROR;
- if ((int)assoc->shares_raw >= 0) {
+ if((int)assoc->shares_raw >= 0) {
xstrfmtcat(*vals, ", fairshare=%u", assoc->shares_raw);
} else if (((int)assoc->shares_raw == INFINITE)) {
xstrcat(*vals, ", fairshare=1");
@@ -1083,7 +1083,7 @@ _modify_unset_users(pgsql_conn_t *pg_conn, slurmdb_association_rec_t *assoc,
MA_COUNT
};
- if (!ret_list || !acct)
+ if(!ret_list || !acct)
return SLURM_ERROR;
/* We want all the sub accounts and user accounts */
@@ -1094,7 +1094,7 @@ _modify_unset_users(pgsql_conn_t *pg_conn, slurmdb_association_rec_t *assoc,
" ORDER BY lft;",
ma_fields, assoc_table, lft, rgt, acct, acct);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -1106,43 +1106,43 @@ _modify_unset_users(pgsql_conn_t *pg_conn, slurmdb_association_rec_t *assoc,
mod_assoc->id = atoi(ROW(MA_ID));
- if (ISNULL(MA_MJ) && assoc->max_jobs != NO_VAL) {
+ if(ISNULL(MA_MJ) && assoc->max_jobs != NO_VAL) {
mod_assoc->max_jobs = assoc->max_jobs;
modified = 1;
}
- if (ISNULL(MA_MSJ) && assoc->max_submit_jobs != NO_VAL) {
+ if(ISNULL(MA_MSJ) && assoc->max_submit_jobs != NO_VAL) {
mod_assoc->max_submit_jobs = assoc->max_submit_jobs;
modified = 1;
}
- if (ISNULL(MA_MNPJ) && assoc->max_nodes_pj != NO_VAL) {
+ if(ISNULL(MA_MNPJ) && assoc->max_nodes_pj != NO_VAL) {
mod_assoc->max_nodes_pj = assoc->max_nodes_pj;
modified = 1;
}
- if (ISNULL(MA_MCPJ) && assoc->max_cpus_pj != NO_VAL) {
+ if(ISNULL(MA_MCPJ) && assoc->max_cpus_pj != NO_VAL) {
mod_assoc->max_cpus_pj = assoc->max_cpus_pj;
modified = 1;
}
- if (ISNULL(MA_MWPJ) && assoc->max_wall_pj != NO_VAL) {
+ if(ISNULL(MA_MWPJ) && assoc->max_wall_pj != NO_VAL) {
mod_assoc->max_wall_pj = assoc->max_wall_pj;
modified = 1;
}
- if (ISNULL(MA_MCMPJ) && assoc->max_cpu_mins_pj != NO_VAL) {
+ if(ISNULL(MA_MCMPJ) && assoc->max_cpu_mins_pj != NO_VAL) {
mod_assoc->max_cpu_mins_pj = assoc->max_cpu_mins_pj;
modified = 1;
}
- if (ISEMPTY(MA_QOS) && assoc->qos_list) {
+ if(ISEMPTY(MA_QOS) && assoc->qos_list) {
List delta_qos_list = NULL;
char *qos_char = NULL, *delta_char = NULL;
ListIterator delta_itr = NULL;
ListIterator qos_itr =
list_iterator_create(assoc->qos_list);
- if (! ISEMPTY(MA_DELTA_QOS)) {
+ if(! ISEMPTY(MA_DELTA_QOS)) {
delta_qos_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(delta_qos_list,
@@ -1157,27 +1157,27 @@ _modify_unset_users(pgsql_conn_t *pg_conn, slurmdb_association_rec_t *assoc,
it to the parent.
*/
while((qos_char = list_next(qos_itr))) {
- if (delta_itr && qos_char[0] != '=') {
+ if(delta_itr && qos_char[0] != '=') {
while((delta_char =
list_next(delta_itr))) {
- if ((qos_char[0]
+ if((qos_char[0]
!= delta_char[0])
&& (!strcmp(qos_char+1,
delta_char+1)))
break;
}
list_iterator_reset(delta_itr);
- if (delta_char)
+ if(delta_char)
continue;
}
list_append(mod_assoc->qos_list,
xstrdup(qos_char));
}
list_iterator_destroy(qos_itr);
- if (delta_itr)
+ if(delta_itr)
list_iterator_destroy(delta_itr);
- if (list_count(mod_assoc->qos_list)
+ if(list_count(mod_assoc->qos_list)
|| !list_count(assoc->qos_list))
modified = 1;
else {
@@ -1187,11 +1187,11 @@ _modify_unset_users(pgsql_conn_t *pg_conn, slurmdb_association_rec_t *assoc,
}
/* We only want to add those that are modified here */
- if (modified) {
+ if(modified) {
/* Since we aren't really changing this non
* user association we don't want to send it.
*/
- if (ISEMPTY(MA_USER)) {
+ if(ISEMPTY(MA_USER)) {
/* This is a sub account so run it
* through as if it is a parent.
*/
@@ -1206,7 +1206,7 @@ _modify_unset_users(pgsql_conn_t *pg_conn, slurmdb_association_rec_t *assoc,
}
/* We do want to send all user accounts though */
mod_assoc->shares_raw = NO_VAL;
- if (! ISEMPTY(MA_PART)) {
+ if(! ISEMPTY(MA_PART)) {
// see if there is a partition name
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s P = %s",
@@ -1221,10 +1221,10 @@ _modify_unset_users(pgsql_conn_t *pg_conn, slurmdb_association_rec_t *assoc,
list_append(ret_list, object);
- if (moved_parent)
+ if(moved_parent)
slurmdb_destroy_association_rec(mod_assoc);
else
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_MODIFY_ASSOC,
mod_assoc)
!= SLURM_SUCCESS)
@@ -1287,7 +1287,7 @@ _get_parent_limits(pgsql_conn_t *pg_conn, char *cluster,
"SELECT * FROM get_parent_limits('%s', '%s');",
cluster, pacct);
result = DEF_QUERY_RET;
- if (! result)
+ if(! result)
return SLURM_ERROR;
if (PQntuples(result) == 0) {
@@ -1391,7 +1391,7 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
GA_COUNT
};
- if (!assoc_list) {
+ if(!assoc_list) {
error("as/pg: add_associations: no association list given");
return SLURM_ERROR;
}
@@ -1402,7 +1402,7 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(assoc_list);
while((object = list_next(itr))) {
- if (!object->cluster || !object->acct) {
+ if(!object->cluster || !object->acct) {
error("We need an association cluster and "
"acct to add one.");
rc = SLURM_ERROR;
@@ -1431,21 +1431,21 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
"FOR UPDATE;", ga_fields, assoc_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("couldn't query the database");
rc = SLURM_ERROR;
break;
}
- if (PQntuples(result) == 0) { /* assoc not in table */
- if (!old_parent || !old_cluster
+ if(PQntuples(result) == 0) { /* assoc not in table */
+ if(!old_parent || !old_cluster
|| strcasecmp(parent, old_parent)
|| strcasecmp(object->cluster, old_cluster)) {
- if (incr) { /* make space for newly
+ if(incr) { /* make space for newly
* added assocs */
rc = _make_space(pg_conn->db_conn,
p_lft, incr);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't make space");
break;
}
@@ -1473,7 +1473,7 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
_make_assoc_rec(object, now, 2, &rec, &txn);
query = xstrdup_printf("SELECT add_assoc(%s);", rec);
xfree(rec);
- } else if (atoi(PG_VAL(GA_DELETED)) == 0) {
+ } else if(atoi(PG_VAL(GA_DELETED)) == 0) {
/* assoc exists and not deleted */
/* We don't need to do anything here */
debug("This association was added already");
@@ -1483,11 +1483,11 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
uint32_t lft = atoi(PG_VAL(GA_LFT));
uint32_t rgt = atoi(PG_VAL(GA_RGT));
- if (object->parent_acct
+ if(object->parent_acct
&& strcasecmp(object->parent_acct,
PG_VAL(GA_PACCT))) {
/* We need to move the parent! */
- if (_move_parent(pg_conn,
+ if(_move_parent(pg_conn,
PG_VAL(GA_ID),
&lft, &rgt,
object->cluster,
@@ -1531,7 +1531,7 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
object->parent_id = p_id;
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_ADD_ASSOC,
object) == SLURM_SUCCESS) {
list_remove(itr);
@@ -1539,7 +1539,7 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
/* add to txn query string */
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %d, '%d', '%s', $$%s$$)",
now, DBD_ADD_ASSOCS, object->id, user_name,
@@ -1556,39 +1556,39 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
list_iterator_destroy(itr);
xfree(user_name);
- if (rc == SLURM_SUCCESS && incr) {
+ if(rc == SLURM_SUCCESS && incr) {
/* _make_space() change delete=2 => deleted=0 */
rc = _make_space(pg_conn->db_conn, p_lft, incr);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't make space 2");
}
}
- if (rc == SLURM_SUCCESS) {
- if (txn_query) {
+ if(rc == SLURM_SUCCESS) {
+ if(txn_query) {
xstrcat(txn_query, ";");
debug3("as/pg(%s:%d) query\n%s", THIS_FILE,
__LINE__, txn_query);
rc = pgsql_db_query(pg_conn->db_conn, txn_query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
rc = SLURM_SUCCESS;
}
}
- if (moved_parent) {
+ if(moved_parent) {
list_flush(pg_conn->update_list);
List assoc_list = NULL;
ListIterator itr = NULL;
slurmdb_association_rec_t *assoc = NULL;
- if (!(assoc_list =
+ if(!(assoc_list =
acct_storage_p_get_associations(pg_conn,
uid, NULL)))
return rc;
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_MODIFY_ASSOC,
assoc) == SLURM_SUCCESS)
list_remove(itr);
@@ -1598,7 +1598,7 @@ as_pg_add_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
} else {
xfree(txn_query);
- if (pg_conn->rollback) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -1647,7 +1647,7 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
MA_COUNT
};
- if (!assoc_cond || !assoc) {
+ if(!assoc_cond || !assoc) {
error("as/pg: modify_associations: nothing to change");
return NULL;
}
@@ -1682,7 +1682,7 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
_make_assoc_limit_vals(assoc, &vals);
- if ((!vals && !assoc->parent_acct
+ if((!vals && !assoc->parent_acct
&& (!assoc->qos_list || !list_count(assoc->qos_list)))) {
errno = SLURM_NO_CHANGE_IN_DATA;
error("Nothing to change");
@@ -1690,7 +1690,7 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
for(i = 0; i < MA_COUNT; i ++) {
- if (i)
+ if(i)
xstrcat(object, ", ");
xstrfmtcat(object, "t1.%s", ma_fields[i]);
}
@@ -1702,7 +1702,7 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
xfree(object);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
if (! PQntuples(result)) {
@@ -1725,15 +1725,15 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
uint32_t lft = atoi(ROW(MA_LFT));
uint32_t rgt = atoi(ROW(MA_RGT));
- if (!is_admin) {
+ if(!is_admin) {
char *account = ROW(MA_ACCT);
- if (!ISEMPTY(MA_PACCT))
+ if(!ISEMPTY(MA_PACCT))
/* parent_acct != '' => user_name = '' */
account = ROW(MA_PACCT);
if (!is_user_coord(&user, account)) {
- if (!ISEMPTY(MA_PACCT))
+ if(!ISEMPTY(MA_PACCT))
error("User %s(%d) can not modify "
"account (%s) because they "
"are not coordinators of "
@@ -1751,26 +1751,26 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
PQclear(result);
xfree(vals);
list_destroy(ret_list);
- if (pg_conn->rollback) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
return NULL;
}
}
- if (! ISEMPTY(MA_PART)) { /* partition != '' */
+ if(! ISEMPTY(MA_PART)) { /* partition != '' */
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s P = %s",
ROW(MA_CLUSTER), ROW(MA_ACCT),
ROW(MA_USER), ROW(MA_PART));
- } else if (! ISEMPTY(MA_USER)){ /* user != '' */
+ } else if(! ISEMPTY(MA_USER)){ /* user != '' */
object = xstrdup_printf(
"C = %-10s A = %-20s U = %-9s",
ROW(MA_CLUSTER), ROW(MA_ACCT),
ROW(MA_USER));
} else {
- if (assoc->parent_acct) {
- if (!strcasecmp(ROW(MA_ACCT),
+ if(assoc->parent_acct) {
+ if(!strcasecmp(ROW(MA_ACCT),
assoc->parent_acct)) {
error("You can't make an account be "
"child of it's self");
@@ -1791,7 +1791,7 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
moved_parent = 1;
}
- if (! ISEMPTY(MA_PACCT)) {
+ if(! ISEMPTY(MA_PACCT)) {
object = xstrdup_printf(
"C = %-10s A = %s of %s",
ROW(MA_CLUSTER), ROW(MA_ACCT),
@@ -1805,7 +1805,7 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
list_append(ret_list, object);
- if (!set) {
+ if(!set) {
xstrfmtcat(name_char, "(id=%s", ROW(MA_ID));
set = 1;
} else {
@@ -1819,10 +1819,10 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
/* no need to get the parent id since if we moved
* parent id's we will get it when we send the total list */
- if (ISEMPTY(MA_USER))
+ if(ISEMPTY(MA_USER))
mod_assoc->parent_acct = xstrdup(assoc->parent_acct);
- if (assoc->qos_list && list_count(assoc->qos_list)) {
+ if(assoc->qos_list && list_count(assoc->qos_list)) {
ListIterator new_qos_itr =
list_iterator_create(assoc->qos_list);
char *new_qos = NULL, *tmp_qos = NULL;
@@ -1831,11 +1831,11 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
mod_assoc->qos_list = list_create(slurm_destroy_char);
while((new_qos = list_next(new_qos_itr))) {
- if (new_qos[0] == '-' || new_qos[0] == '+') {
+ if(new_qos[0] == '-' || new_qos[0] == '+') {
list_append(mod_assoc->qos_list,
xstrdup(new_qos));
delta = 1;
- } else if (new_qos[0]) {
+ } else if(new_qos[0]) {
list_append(mod_assoc->qos_list,
xstrdup_printf("=%s",
new_qos));
@@ -1897,11 +1897,11 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
list_iterator_destroy(new_qos_itr);
}
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_MODIFY_ASSOC,
mod_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
- if (account_type) { /* propagate change to sub account and users */
+ if(account_type) { /* propagate change to sub account and users */
_modify_unset_users(pg_conn,
mod_assoc,
ROW(MA_ACCT),
@@ -1912,14 +1912,14 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (assoc->parent_acct) {
+ if(assoc->parent_acct) {
if ((rc == ESLURM_INVALID_PARENT_ACCOUNT ||
rc == ESLURM_SAME_PARENT_ACCOUNT) &&
list_count(ret_list))
rc = SLURM_SUCCESS;
- if (rc != SLURM_SUCCESS) {
- if (pg_conn->rollback) {
+ if(rc != SLURM_SUCCESS) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -1931,8 +1931,8 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
- if (!list_count(ret_list)) {
- if (pg_conn->rollback) {
+ if(!list_count(ret_list)) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
errno = SLURM_NO_CHANGE_IN_DATA;
@@ -1942,13 +1942,13 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
xstrcat(name_char, ")");
- if (vals) {
+ if(vals) {
user_name = uid_to_string((uid_t) uid);
rc = pgsql_modify_common(pg_conn, DBD_MODIFY_ASSOCS, now,
user_name, assoc_table, name_char, vals);
xfree(user_name);
if (rc == SLURM_ERROR) {
- if (pg_conn->rollback) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -1958,7 +1958,7 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
goto end_it;
}
}
- if (moved_parent) { /* some assoc parent changed */
+ if(moved_parent) { /* some assoc parent changed */
List local_assoc_list = NULL;
ListIterator local_itr = NULL;
slurmdb_association_rec_t *local_assoc = NULL;
@@ -1976,14 +1976,14 @@ as_pg_modify_associations(pgsql_conn_t *pg_conn, uint32_t uid,
//memset(&local_assoc_cond, 0, sizeof(slurmdb_association_cond_t));
- if (!(local_assoc_list =
+ if(!(local_assoc_list =
acct_storage_p_get_associations(pg_conn,
uid, NULL)))
return ret_list;
local_itr = list_iterator_create(local_assoc_list);
while((local_assoc = list_next(local_itr))) {
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_MODIFY_ASSOC,
local_assoc) == SLURM_SUCCESS)
list_remove(local_itr);
@@ -2036,7 +2036,7 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
RA_COUNT
};
- if (!assoc_cond) {
+ if(!assoc_cond) {
error("as/pg: remove_associations: no condition given");
return NULL;
}
@@ -2058,12 +2058,12 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
assoc_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
rc = 0;
FOR_EACH_ROW {
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "lft BETWEEN %s AND %s",
ROW(0), ROW(1));
rc = 1;
@@ -2074,8 +2074,8 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!name_char) {
- if (pg_conn->rollback) {
+ if(!name_char) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -2089,7 +2089,7 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
ra_fields, assoc_table, name_char);
result = DEF_QUERY_RET;
if (!result) {
- if (pg_conn->rollback) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -2101,17 +2101,17 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
ret_list = list_create(slurm_destroy_char);
FOR_EACH_ROW {
slurmdb_association_rec_t *rem_assoc = NULL;
- if (!is_admin) {
+ if(!is_admin) {
slurmdb_coord_rec_t *coord = NULL;
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name,
+ if(!strcasecmp(coord->name,
ROW(RA_ACCT)))
break;
}
list_iterator_destroy(itr);
- if (!coord) {
+ if(!coord) {
error("User %s(%d) does not have the "
"ability to change this account (%s)",
user.name, user.uid, ROW(RA_ACCT));
@@ -2119,18 +2119,18 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
goto end_it;
}
}
- if (! ISEMPTY(RA_PART)) {
+ if(! ISEMPTY(RA_PART)) {
object = xstrdup_printf(
"C = %-10s A = %-10s U = %-9s P = %s",
ROW(RA_CLUSTER), ROW(RA_ACCT),
ROW(RA_USER), ROW(RA_PART));
- } else if (! ISEMPTY(RA_USER)){
+ } else if(! ISEMPTY(RA_USER)){
object = xstrdup_printf(
"C = %-10s A = %-10s U = %-9s",
ROW(RA_CLUSTER), ROW(RA_ACCT),
ROW(RA_USER));
} else {
- if (! ISEMPTY(RA_PACCT)) {
+ if(! ISEMPTY(RA_PACCT)) {
object = xstrdup_printf(
"C = %-10s A = %s of %s",
ROW(RA_CLUSTER), ROW(RA_ACCT),
@@ -2142,7 +2142,7 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
}
}
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(assoc_char, "id=%s", ROW(RA_ID));
rc = 1;
} else {
@@ -2152,7 +2152,7 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
rem_assoc = xmalloc(sizeof(slurmdb_association_rec_t));
slurmdb_init_association_rec(rem_assoc);
rem_assoc->id = atoi(ROW(RA_ID));
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_REMOVE_ASSOC,
rem_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
@@ -2170,12 +2170,12 @@ as_pg_remove_associations(pgsql_conn_t *pg_conn, uint32_t uid,
return ret_list;
end_it:
- if (pg_conn->rollback) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
- if (ret_list) {
+ if(ret_list) {
list_destroy(ret_list);
ret_list = NULL;
}
@@ -2253,7 +2253,7 @@ as_pg_get_associations(pgsql_conn_t *pg_conn, uid_t uid,
GA_COUNT
};
- if (!assoc_cond) {
+ if(!assoc_cond) {
xstrcat(cond, " WHERE deleted=0");
goto empty;
}
@@ -2281,10 +2281,10 @@ empty:
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
- if (!is_admin && (private_data & PRIVATE_DATA_USERS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_USERS)) {
query = xstrdup_printf("SELECT lft FROM %s WHERE user_name='%s'",
assoc_table, user.name);
- if (user.coord_accts) {
+ if(user.coord_accts) {
slurmdb_coord_rec_t *coord = NULL;
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
@@ -2294,7 +2294,7 @@ empty:
list_iterator_destroy(itr);
}
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
xfree(cond);
return NULL;
}
@@ -2302,7 +2302,7 @@ empty:
set = 0;
FOR_EACH_ROW {
/* TODO: is the condition right, or reversed? */
- if (set) {
+ if(set) {
xstrfmtcat(cond,
" OR (%s BETWEEN lft AND rgt)",
ROW(0));
@@ -2313,7 +2313,7 @@ empty:
ROW(0));
}
} END_EACH_ROW;
- if (set)
+ if(set)
xstrcat(cond,")");
PQclear(result);
}
@@ -2323,7 +2323,7 @@ empty:
ga_fields, assoc_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
assoc_list = list_create(slurmdb_destroy_association_rec);
@@ -2338,9 +2338,9 @@ empty:
assoc->rgt = atoi(ROW(GA_RGT));
assoc->cluster = xstrdup(ROW(GA_CLUSTER));
assoc->acct = xstrdup(ROW(GA_ACCT));
- if (! ISEMPTY(GA_USER))
+ if(! ISEMPTY(GA_USER))
assoc->user = xstrdup(ROW(GA_USER));
- if (! ISEMPTY(GA_PART))
+ if(! ISEMPTY(GA_PART))
assoc->partition = xstrdup(ROW(GA_PART));
assoc->grp_jobs = ISNULL(GA_GJ) ? INFINITE : atoi(ROW(GA_GJ));
@@ -2352,11 +2352,11 @@ empty:
assoc->shares_raw = ISNULL(GA_FS) ? INFINITE : atoi(ROW(GA_FS));
parent_acct = ROW(GA_ACCT);
- if (!without_parent_info
+ if(!without_parent_info
&& !ISEMPTY(GA_PARENT)) {
assoc->parent_acct = xstrdup(ROW(GA_PARENT));
parent_acct = ROW(GA_PARENT);
- } else if (!assoc->user) {
+ } else if(!assoc->user) {
/* (parent_acct='' AND user_name='') => acct='root' */
parent_acct = NULL;
parent_id = 0;
@@ -2364,7 +2364,7 @@ empty:
last_acct = NULL;
}
- if (!without_parent_info && parent_acct &&
+ if(!without_parent_info && parent_acct &&
(!last_acct || !last_cluster
|| strcmp(parent_acct, last_acct)
|| strcmp(ROW(GA_CLUSTER), last_cluster))) {
@@ -2375,8 +2375,8 @@ empty:
parent_id = _get_parent_id(pg_conn->db_conn,
ROW(GA_CLUSTER),
parent_acct);
- if (!without_parent_limits) {
- if (_get_parent_limits(pg_conn, ROW(GA_CLUSTER),
+ if(!without_parent_limits) {
+ if(_get_parent_limits(pg_conn, ROW(GA_CLUSTER),
parent_acct, &p_assoc,
&p_qos, &p_delta)
!= SLURM_SUCCESS) {
@@ -2405,27 +2405,27 @@ empty:
assoc->qos_list = list_create(slurm_destroy_char);
/* alway with a ',' in qos and delta_qos */
- if (! ISEMPTY(GA_QOS))
+ if(! ISEMPTY(GA_QOS))
slurm_addto_char_list(assoc->qos_list,
ROW(GA_QOS)+1);
else {
/* add the parents first */
- if (p_qos)
+ if(p_qos)
slurm_addto_char_list(assoc->qos_list,
p_qos+1);
/* then add the parents delta */
- if (p_delta)
+ if(p_delta)
slurm_addto_char_list(delta_qos_list,
p_delta+1);
/* now add the associations */
- if (! ISEMPTY(GA_DELTA_QOS))
+ if(! ISEMPTY(GA_DELTA_QOS))
slurm_addto_char_list(delta_qos_list,
ROW(GA_DELTA_QOS)+1);
}
- if (with_raw_qos && list_count(delta_qos_list)) {
+ if(with_raw_qos && list_count(delta_qos_list)) {
list_transfer(assoc->qos_list, delta_qos_list);
- } else if (list_count(delta_qos_list)) {
+ } else if(list_count(delta_qos_list)) {
merge_delta_qos_list(assoc->qos_list, delta_qos_list);
}
list_flush(delta_qos_list);
@@ -2437,7 +2437,7 @@ empty:
} END_EACH_ROW;
PQclear(result);
- if (with_usage && assoc_list)
+ if(with_usage && assoc_list)
get_usage_for_assoc_list(pg_conn, assoc_list,
assoc_cond->usage_start,
assoc_cond->usage_end);
@@ -2505,7 +2505,7 @@ find_children_assoc(pgsql_conn_t *pg_conn, char *parent_cond)
" AND (%s);",
assoc_table, assoc_table, parent_cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
return NULL;
}
@@ -2534,7 +2534,7 @@ remove_young_assoc(pgsql_conn_t *pg_conn, time_t now, char *cond)
assoc_table, day_old, cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -2543,7 +2543,7 @@ remove_young_assoc(pgsql_conn_t *pg_conn, time_t now, char *cond)
DEBUG_QUERY;
rc = pgsql_db_query(pg_conn->db_conn, query);
xfree(query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("couldn't remove assoc");
break;
}
@@ -2570,7 +2570,7 @@ get_assoc_ids(pgsql_conn_t *pg_conn, char *cond)
query = xstrdup_printf("SELECT id FROM %s WHERE TRUE %s;",
assoc_table, cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("as/pg: failed to get assoc ids");
return NULL;
}
@@ -2638,7 +2638,7 @@ get_cluster_from_associd(pgsql_conn_t *pg_conn,
query = xstrdup_printf("SELECT cluster FROM %s WHERE id=%u",
assoc_table, associd);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
if (PQntuples(result))
cluster = xstrdup(PG_VAL(0));
@@ -2662,7 +2662,7 @@ get_user_from_associd(pgsql_conn_t *pg_conn,
query = xstrdup_printf("SELECT user_name FROM %s WHERE id=%u",
assoc_table, associd);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
if (PQntuples(result))
user_name = xstrdup(PG_VAL(0));
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_cluster.c b/src/plugins/accounting_storage/pgsql/as_pg_cluster.c
index a97683b38d3b089e9ff0af91c6fe377dc30c0c68..c2be4c419ffb2be1d820384f07d6d471088e50fe 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_cluster.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_cluster.c
@@ -128,7 +128,7 @@ as_pg_add_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(cluster_list);
while((object = list_next(itr))) {
- if (!object->name) {
+ if(!object->name) {
error("as/pg: add_clusters: We need a cluster "
"name to add.");
rc = SLURM_ERROR;
@@ -140,7 +140,7 @@ as_pg_add_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
now, now, object->name,
object->classification);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add cluster %s", object->name);
added = 0; /* rollback modification to DB */
break;
@@ -173,7 +173,7 @@ as_pg_add_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
assoc->cluster = xstrdup(object->name);
assoc->user = xstrdup("root");
assoc->acct = xstrdup("root");
- if (acct_storage_p_add_associations(pg_conn, uid, assoc_list)
+ if(acct_storage_p_add_associations(pg_conn, uid, assoc_list)
== SLURM_ERROR) {
error("Problem adding root user association");
rc = SLURM_ERROR;
@@ -184,8 +184,8 @@ as_pg_add_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
xfree(user_name);
list_destroy(assoc_list);
- if (!added) {
- if (pg_conn->rollback) {
+ if(!added) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -224,48 +224,48 @@ as_pg_modify_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
return NULL;
}
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (!pg_conn->cluster_name
+ if(!pg_conn->cluster_name
&& cluster_cond->cluster_list
&& list_count(cluster_cond->cluster_list))
pg_conn->cluster_name =
xstrdup(list_peek(cluster_cond->cluster_list));
concat_cond_list(cluster_cond->cluster_list, NULL, "name", &cond);
- if (cluster_cond->classification) {
+ if(cluster_cond->classification) {
xstrfmtcat(cond, " AND (classification & %u)",
cluster_cond->classification);
}
set = 0;
- if (cluster->control_host) {
+ if(cluster->control_host) {
xstrfmtcat(vals, ", control_host='%s'", cluster->control_host);
set++;
clust_reg = true;
}
- if (cluster->control_port) {
+ if(cluster->control_port) {
xstrfmtcat(vals, ", control_port=%u", cluster->control_port);
set++;
clust_reg = true;
}
- if (cluster->rpc_version) {
+ if(cluster->rpc_version) {
xstrfmtcat(vals, ", rpc_version=%u", cluster->rpc_version);
set++;
clust_reg = true;
}
- if (cluster->classification) {
+ if(cluster->classification) {
xstrfmtcat(vals, ", classification=%u",
cluster->classification);
}
- if (!vals) {
+ if(!vals) {
xfree(cond);
errno = SLURM_NO_CHANGE_IN_DATA;
error("as/pg: modify_clusters: nothing to change");
return NULL;
- } else if (clust_reg && (set != 3)) {
+ } else if(clust_reg && (set != 3)) {
xfree(vals);
xfree(cond);
errno = EFAULT;
@@ -290,7 +290,7 @@ as_pg_modify_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
FOR_EACH_ROW {
object = xstrdup(ROW(0));
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
rc = 1;
} else {
@@ -299,14 +299,14 @@ as_pg_modify_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: modify_cluster: nothing effected");
xfree(vals);
return ret_list;
}
- if (vals) {
+ if(vals) {
send_char = xstrdup_printf("(%s)", name_char);
user_name = uid_to_string((uid_t) uid);
rc = pgsql_modify_common(pg_conn, DBD_MODIFY_CLUSTERS, now,
@@ -350,16 +350,16 @@ as_pg_remove_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
slurmdb_wckey_cond_t wckey_cond;
PGresult *result = NULL;
- if (!cluster_cond) {
+ if(!cluster_cond) {
error("as/pg: remove_clusters: we need something to remove");
return NULL;
}
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
concat_cond_list(cluster_cond->cluster_list, NULL, "name", &cond);
- if (!cond) {
+ if(!cond) {
error("as/pg: remove_clusters: nothing to remove");
return NULL;
}
@@ -378,7 +378,7 @@ as_pg_remove_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
FOR_EACH_ROW {
char *object = xstrdup(ROW(0));
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
xstrfmtcat(cond, "cluster='%s'", object);
xstrfmtcat(assoc_char, "t1.cluster='%s'", object);
@@ -391,7 +391,7 @@ as_pg_remove_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: remove_clusters: didn't effect anything");
return ret_list;
@@ -401,7 +401,7 @@ as_pg_remove_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
memset(&wckey_cond, 0, sizeof(slurmdb_wckey_cond_t));
wckey_cond.cluster_list = ret_list;
tmp_list = acct_storage_p_remove_wckeys(pg_conn, uid, &wckey_cond);
- if (tmp_list)
+ if(tmp_list)
list_destroy(tmp_list);
/* We should not need to delete any cluster usage just set it
@@ -417,8 +417,8 @@ as_pg_remove_clusters(pgsql_conn_t *pg_conn, uint32_t uid,
cluster_month_table, now, cond);
xfree(cond);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
- if (pg_conn->rollback) {
+ if(rc != SLURM_SUCCESS) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -479,12 +479,12 @@ as_pg_get_clusters(pgsql_conn_t *pg_conn, uid_t uid,
if (check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (!cluster_cond) {
+ if(!cluster_cond) {
xstrcat(cond, "WHERE deleted=0");
goto empty;
}
- if (cluster_cond->with_deleted)
+ if(cluster_cond->with_deleted)
xstrcat(cond, "WHERE (deleted=0 OR deleted=1)");
else
xstrcat(cond, "WHERE deleted=0");
@@ -501,7 +501,7 @@ empty:
cluster_list = list_create(slurmdb_destroy_cluster_rec);
memset(&assoc_cond, 0, sizeof(slurmdb_association_cond_t));
- if (cluster_cond) {
+ if(cluster_cond) {
/* I don't think we want the with_usage flag here.
* We do need the with_deleted though. */
//assoc_cond.with_usage = cluster_cond->with_usage;
@@ -518,7 +518,7 @@ empty:
list_append(assoc_cond.cluster_list, cluster->name);
/* get the usage if requested */
- if (cluster_cond && cluster_cond->with_usage) {
+ if(cluster_cond && cluster_cond->with_usage) {
as_pg_get_usage(pg_conn, uid, cluster,
DBD_GET_CLUSTER_USAGE,
cluster_cond->usage_start,
@@ -534,7 +534,7 @@ empty:
} END_EACH_ROW;
PQclear(result);
- if (!list_count(assoc_cond.cluster_list)) {
+ if(!list_count(assoc_cond.cluster_list)) {
list_destroy(assoc_cond.cluster_list);
return cluster_list;
}
@@ -551,17 +551,17 @@ empty:
list_destroy(assoc_cond.acct_list);
list_destroy(assoc_cond.user_list);
- if (!assoc_list)
+ if(!assoc_list)
return cluster_list;
itr = list_iterator_create(cluster_list);
assoc_itr = list_iterator_create(assoc_list);
while((cluster = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if (strcmp(assoc->cluster, cluster->name))
+ if(strcmp(assoc->cluster, cluster->name))
continue;
- if (cluster->root_assoc) {
+ if(cluster->root_assoc) {
debug("This cluster %s already has "
"an association.");
continue;
@@ -573,7 +573,7 @@ empty:
}
list_iterator_destroy(itr);
list_iterator_destroy(assoc_itr);
- if (list_count(assoc_list))
+ if(list_count(assoc_list))
error("I have %d left over associations",
list_count(assoc_list));
list_destroy(assoc_list);
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_common.c b/src/plugins/accounting_storage/pgsql/as_pg_common.c
index 4a8a47155f9769f22335879e91254535acbad189..61035f644c3ca1519166cb4a18d1efcbdad1b9a1 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_common.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_common.c
@@ -73,11 +73,11 @@ concat_cond_list(List cond_list, char *prefix, char *col, char **cond_str)
char *object;
ListIterator itr = NULL;
- if (cond_list && list_count(cond_list)) {
+ if(cond_list && list_count(cond_list)) {
xstrcat(*cond_str, " AND (");
itr = list_iterator_create(cond_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*cond_str, " OR ");
if (prefix)
xstrfmtcat(*cond_str, "%s.%s='%s'",
@@ -108,11 +108,11 @@ concat_like_cond_list(List cond_list, char *prefix, char *col, char **cond_str)
char *object;
ListIterator itr = NULL;
- if (cond_list && list_count(cond_list)) {
+ if(cond_list && list_count(cond_list)) {
xstrcat(*cond_str, " AND (");
itr = list_iterator_create(cond_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*cond_str, " OR ");
if (prefix)
xstrfmtcat(*cond_str, "%s.%s like '%%%s%%'",
@@ -183,8 +183,8 @@ pgsql_modify_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
if (rc == SLURM_SUCCESS)
rc = add_txn(pg_conn, now, type, name_char, user_name, vals);
- if (rc != SLURM_SUCCESS) {
- if (pg_conn->rollback) {
+ if(rc != SLURM_SUCCESS) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -215,11 +215,11 @@ _check_jobs_before_remove(pgsql_conn_t *pg_conn, char *assoc_char)
job_table, assoc_table, assoc_table, assoc_char);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
return rc;
}
- if (PQntuples(result)) {
+ if(PQntuples(result)) {
debug4("We have jobs for this combo");
rc = true;
}
@@ -249,9 +249,9 @@ _check_jobs_before_remove_assoc(pgsql_conn_t *pg_conn, char *assoc_char)
job_table, assoc_table, assoc_char);
result = DEF_QUERY_RET;
- if (! result)
+ if(! result)
return rc;
- if (PQntuples(result)) {
+ if(PQntuples(result)) {
debug4("We have jobs for this assoc");
rc = true;
}
@@ -279,10 +279,10 @@ _check_jobs_before_remove_without_assoctable(pgsql_conn_t *pg_conn,
job_table, where_char);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return rc;
- if (PQntuples(result)) {
+ if(PQntuples(result)) {
debug4("We have jobs for this combo");
rc = true;
}
@@ -334,12 +334,12 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
}
/* remove completely all that is less than a day old */
- if (!has_jobs && (table != assoc_table)) {
+ if(!has_jobs && (table != assoc_table)) {
query = xstrdup_printf(
"DELETE FROM %s WHERE creation_time>%d AND (%s);",
table, day_old, name_char);
}
- if (table != assoc_table) {
+ if(table != assoc_table) {
xstrfmtcat(query,
"UPDATE %s SET mod_time=%d, deleted=1 "
"WHERE deleted=0 AND (%s);",
@@ -352,7 +352,7 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
if (rc == SLURM_SUCCESS)
add_txn(pg_conn, now, type, name_char, user_name, "");
if (rc != SLURM_SUCCESS) {
- if (pg_conn->rollback) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -361,26 +361,26 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
}
/* done if not assoc related entities */
- if (table == qos_table ||
+ if(table == qos_table ||
table == acct_coord_table ||
table == wckey_table)
return SLURM_SUCCESS;
/* mark deleted=1 or remove completely the accounting tables */
- if (table == assoc_table) { /* children assoc included in assoc_char */
+ if(table == assoc_table) { /* children assoc included in assoc_char */
loc_assoc_char = assoc_char; /* XXX: TODO: assoc_char or name_char? */
} else { /* for other tables, find all children associations */
List assoc_list;
ListIterator itr;
char *id;
- if (!assoc_char) {
+ if(!assoc_char) {
error("as/pg: remove_common: no assoc_char");
rc = SLURM_ERROR;
goto err_out;
}
/* TODO: define */
- if (!(assoc_list = find_children_assoc(pg_conn, assoc_char))) {
+ if(!(assoc_list = find_children_assoc(pg_conn, assoc_char))) {
error("as/pg: remove_common: failed to "
"find children assoc");
goto err_out;
@@ -389,7 +389,7 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
while((id = list_next(itr))) {
slurmdb_association_rec_t *rem_assoc;
- if (!rc) {
+ if(!rc) {
xstrfmtcat(loc_assoc_char, "t1.id=%s", id);
rc = 1;
} else {
@@ -399,7 +399,7 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
slurmdb_init_association_rec(rem_assoc);
rem_assoc->id = atoi(id);
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_REMOVE_ASSOC,
rem_assoc) != SLURM_SUCCESS)
error("couldn't add to the update list");
@@ -408,14 +408,14 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
list_destroy(assoc_list);
}
- if (!loc_assoc_char) {
+ if(!loc_assoc_char) {
debug2("No associations with object being deleted");
return rc;
}
/* mark association usage as deleted */
rc = delete_assoc_usage(pg_conn, now, loc_assoc_char);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
goto err_out;
}
@@ -423,7 +423,7 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
* removing the associations. Since we may want them for
* reports in the future since jobs had ran.
*/
- if (has_jobs)
+ if(has_jobs)
goto just_update;
/* remove completely all the associations for this added in the last
@@ -431,7 +431,7 @@ pgsql_remove_common(pgsql_conn_t *pg_conn, uint16_t type, time_t now,
* the first place.
*/
rc = remove_young_assoc(pg_conn, now, loc_assoc_char);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
goto err_out;
}
@@ -450,7 +450,7 @@ just_update:
assoc_table, now,
loc_assoc_char);
- if (table != assoc_table)
+ if(table != assoc_table)
xfree(loc_assoc_char);
DEBUG_QUERY;
@@ -458,8 +458,8 @@ just_update:
xfree(query);
err_out:
- if (rc != SLURM_SUCCESS) {
- if (pg_conn->rollback) {
+ if(rc != SLURM_SUCCESS) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -482,7 +482,7 @@ check_db_connection(pgsql_conn_t *pg_conn)
error("as/pg: we need a connection to run this");
errno = SLURM_ERROR;
return SLURM_ERROR;
- } else if (!pg_conn->db_conn ||
+ } else if(!pg_conn->db_conn ||
PQstatus(pg_conn->db_conn) != CONNECTION_OK) {
info("as/pg: database connection lost.");
PQreset(pg_conn->db_conn);
@@ -537,11 +537,11 @@ check_table(PGconn *db_conn, char *table, storage_field_t *fields,
if (!tables[i]) {
debug("as/pg: table %s not found, create it", table);
- if (pgsql_db_create_table(db_conn, table, fields, constraint)
+ if(pgsql_db_create_table(db_conn, table, fields, constraint)
== SLURM_ERROR)
return SLURM_ERROR;
} else {
- if (pgsql_db_make_table_current(db_conn, table, fields))
+ if(pgsql_db_make_table_current(db_conn, table, fields))
return SLURM_ERROR;
}
return SLURM_SUCCESS;
@@ -550,8 +550,8 @@ check_table(PGconn *db_conn, char *table, storage_field_t *fields,
static void _destroy_local_cluster(void *object)
{
local_cluster_t *local_cluster = (local_cluster_t *)object;
- if (local_cluster) {
- if (local_cluster->hl)
+ if(local_cluster) {
+ if(local_cluster->hl)
hostlist_destroy(local_cluster->hl);
FREE_NULL_BITMAP(local_cluster->asked_bitmap);
xfree(local_cluster);
@@ -580,10 +580,10 @@ setup_cluster_list_with_inx(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
hostlist_iterator_t h_itr = NULL;
char *object = NULL, *query = NULL;
- if (!job_cond || !job_cond->used_nodes)
+ if(!job_cond || !job_cond->used_nodes)
return NULL;
- if (!job_cond->cluster_list || list_count(job_cond->cluster_list) != 1) {
+ if(!job_cond->cluster_list || list_count(job_cond->cluster_list) != 1) {
error("If you are doing a query against nodes "
"you must only have 1 cluster "
"you are asking for.");
@@ -591,7 +591,7 @@ setup_cluster_list_with_inx(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
}
temp_hl = hostlist_create(job_cond->used_nodes);
- if (!hostlist_count(temp_hl)) {
+ if(!hostlist_count(temp_hl)) {
error("we didn't get any real hosts to look for.");
goto no_hosts;
}
@@ -601,11 +601,11 @@ setup_cluster_list_with_inx(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
"AND cluster_nodes !=''",
event_table);
- if ((object = list_peek(job_cond->cluster_list)))
+ if((object = list_peek(job_cond->cluster_list)))
xstrfmtcat(query, " AND cluster='%s'", object);
- if (job_cond->usage_start) {
- if (!job_cond->usage_end)
+ if(job_cond->usage_start) {
+ if(!job_cond->usage_end)
job_cond->usage_end = now;
xstrfmtcat(query, " AND ((period_start < %d) "
@@ -614,7 +614,7 @@ setup_cluster_list_with_inx(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
}
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
hostlist_destroy(temp_hl);
return NULL;
}
@@ -632,15 +632,15 @@ setup_cluster_list_with_inx(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
local_cluster->asked_bitmap =
bit_alloc(hostlist_count(local_cluster->hl));
while((host = hostlist_next(h_itr))) {
- if ((loc = hostlist_find(
+ if((loc = hostlist_find(
local_cluster->hl, host)) != -1)
bit_set(local_cluster->asked_bitmap, loc);
free(host);
}
hostlist_iterator_reset(h_itr);
- if (bit_ffs(local_cluster->asked_bitmap) != -1) {
+ if(bit_ffs(local_cluster->asked_bitmap) != -1) {
list_append(local_cluster_list, local_cluster);
- if (local_cluster->end == 0) {
+ if(local_cluster->end == 0) {
local_cluster->end = now;
(*curr_cluster) = local_cluster;
}
@@ -649,7 +649,7 @@ setup_cluster_list_with_inx(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
} END_EACH_ROW;
PQclear(result);
hostlist_iterator_destroy(h_itr);
- if (!list_count(local_cluster_list)) {
+ if(!list_count(local_cluster_list)) {
list_destroy(local_cluster_list);
local_cluster_list = NULL;
}
@@ -678,18 +678,18 @@ good_nodes_from_inx(List local_cluster_list, void **object,
/* check the bitmap to see if this is one of the jobs
we are looking for */
/* TODO: curr_cluster only set if end==0 above */
- if (*curr_cluster) {
+ if(*curr_cluster) {
bitstr_t *job_bitmap = NULL;
- if (!node_inx || !node_inx[0])
+ if(!node_inx || !node_inx[0])
return 0;
- if ((submit < (*curr_cluster)->start)
+ if((submit < (*curr_cluster)->start)
|| (submit > (*curr_cluster)->end)) {
local_cluster_t *local_cluster = NULL;
ListIterator itr =
list_iterator_create(local_cluster_list);
while((local_cluster = list_next(itr))) {
- if ((submit >= local_cluster->start)
+ if((submit >= local_cluster->start)
&& (submit <= local_cluster->end)) {
*curr_cluster = local_cluster;
break;
@@ -700,7 +700,7 @@ good_nodes_from_inx(List local_cluster_list, void **object,
}
job_bitmap = bit_alloc(hostlist_count((*curr_cluster)->hl));
bit_unfmt(job_bitmap, node_inx);
- if (!bit_overlap((*curr_cluster)->asked_bitmap, job_bitmap)) {
+ if(!bit_overlap((*curr_cluster)->asked_bitmap, job_bitmap)) {
FREE_NULL_BITMAP(job_bitmap);
return 0;
}
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_event.c b/src/plugins/accounting_storage/pgsql/as_pg_event.c
index 9c0fcd9d3e2b4cbb8f971ab099364bcbbc5084de..5e70997d6c305f7d20a0d9576e760003caff92a7 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_event.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_event.c
@@ -154,7 +154,7 @@ cs_pg_node_down(pgsql_conn_t *pg_conn,
int rc = SLURM_ERROR;
char *query = NULL, *my_reason;
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
if (!node_ptr) {
@@ -198,7 +198,7 @@ cs_pg_node_up(pgsql_conn_t *pg_conn,
char* query;
int rc = SLURM_ERROR;
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
query = xstrdup_printf(
@@ -227,11 +227,11 @@ cs_pg_register_ctld(pgsql_conn_t *pg_conn, char *cluster, uint16_t port)
int rc;
time_t now = time(NULL);
- if (slurmdbd_conf)
+ if(slurmdbd_conf)
fatal("clusteracct_storage_g_register_ctld "
"should never be called from the slurmdbd.");
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
info("Registering slurmctld for cluster %s at port %u in database.",
@@ -239,7 +239,7 @@ cs_pg_register_ctld(pgsql_conn_t *pg_conn, char *cluster, uint16_t port)
gethostname(hostname, sizeof(hostname));
/* check if we are running on the backup controller */
- if (slurmctld_conf.backup_controller
+ if(slurmctld_conf.backup_controller
&& !strcmp(slurmctld_conf.backup_controller, hostname)) {
address = slurmctld_conf.backup_addr;
} else
@@ -278,7 +278,7 @@ cs_pg_cluster_cpus(pgsql_conn_t *pg_conn, char *cluster_nodes,
char* query;
int rc = SLURM_SUCCESS, got_cpus = 0, first = 0;
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
/* Record the processor count */
@@ -287,11 +287,11 @@ cs_pg_cluster_cpus(pgsql_conn_t *pg_conn, char *cluster_nodes,
"AND period_end=0 AND node_name='' LIMIT 1;",
event_table, pg_conn->cluster_name);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
/* we only are checking the first one here */
- if (!PQntuples(result)) {
+ if(!PQntuples(result)) {
debug("We don't have an entry for this machine %s "
"most likely a first time running.",
pg_conn->cluster_name);
@@ -307,12 +307,12 @@ cs_pg_cluster_cpus(pgsql_conn_t *pg_conn, char *cluster_nodes,
goto add_it;
}
got_cpus = atoi(PG_VAL(0));
- if (got_cpus == cpus) {
+ if(got_cpus == cpus) {
debug3("we have the same cpu count as before for %s, "
"no need to update the database.",
pg_conn->cluster_name);
- if (cluster_nodes) {
- if (PG_EMPTY(1)) {
+ if(cluster_nodes) {
+ if(PG_EMPTY(1)) {
debug("Adding cluster nodes '%s' to "
"last instance of cluster '%s'.",
cluster_nodes, pg_conn->cluster_name);
@@ -324,7 +324,7 @@ cs_pg_cluster_cpus(pgsql_conn_t *pg_conn, char *cluster_nodes,
pg_conn->cluster_name);
rc = DEF_QUERY_RET_RC;
goto end_it;
- } else if (!strcmp(cluster_nodes,
+ } else if(!strcmp(cluster_nodes,
PG_VAL(1))) {
debug3("we have the same nodes in the cluster "
"as before no need to "
@@ -346,7 +346,7 @@ cs_pg_cluster_cpus(pgsql_conn_t *pg_conn, char *cluster_nodes,
pg_conn->cluster_name);
rc = DEF_QUERY_RET_RC;
first = 1;
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
add_it:
query = xstrdup_printf(
@@ -394,13 +394,13 @@ cs_pg_get_usage(pgsql_conn_t *pg_conn, uid_t uid,
CU_COUNT
};
- if (!cluster_rec->name) {
+ if(!cluster_rec->name) {
error("We need a cluster name to set data for");
return SLURM_ERROR;
}
usage_table = cluster_day_table;
- if (set_usage_information(&usage_table, type, &start, &end)
+ if(set_usage_information(&usage_table, type, &start, &end)
!= SLURM_SUCCESS)
return SLURM_ERROR;
@@ -409,10 +409,10 @@ cs_pg_get_usage(pgsql_conn_t *pg_conn, uid_t uid,
"AND period_start >= %d) AND cluster='%s'",
cu_fields, usage_table, end, start, cluster_rec->name);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
- if (!cluster_rec->accounting_list)
+ if(!cluster_rec->accounting_list)
cluster_rec->accounting_list =
list_create(slurmdb_destroy_cluster_accounting_rec);
FOR_EACH_ROW {
@@ -467,16 +467,16 @@ as_pg_get_events(pgsql_conn_t *pg_conn, uid_t uid,
GE_COUNT
};
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
cond = xstrdup("WHERE TRUE");
- if (!event_cond)
+ if(!event_cond)
goto empty;
- if (event_cond->cpus_min) {
- if (event_cond->cpus_max) {
+ if(event_cond->cpus_min) {
+ if(event_cond->cpus_max) {
xstrfmtcat(cond, " AND (cpu_count BETWEEN %u AND %u)",
event_cond->cpus_min, event_cond->cpus_max);
@@ -502,8 +502,8 @@ as_pg_get_events(pgsql_conn_t *pg_conn, uid_t uid,
concat_cond_list(event_cond->node_list, NULL, "node_name", &cond);
- if (event_cond->period_start) {
- if (!event_cond->period_end)
+ if(event_cond->period_start) {
+ if(!event_cond->period_end)
event_cond->period_end = now;
xstrfmtcat(cond,
" AND (time_start < %d) "
@@ -533,7 +533,7 @@ empty:
event->cluster = xstrdup(ROW(GE_CLUSTER));
- if (ISEMPTY(GE_NODE)) {
+ if(ISEMPTY(GE_NODE)) {
event->event_type = SLURMDB_EVENT_CLUSTER;
} else
event->node_name = xstrdup(ROW(GE_NODE));
@@ -544,11 +544,11 @@ empty:
event->period_start = atoi(ROW(GE_START));
event->period_end = atoi(ROW(GE_END));
- if (!ISEMPTY(GE_REASON))
+ if(!ISEMPTY(GE_REASON))
event->reason = xstrdup(ROW(GE_REASON));
event->reason_uid = atoi(ROW(GE_REASON_UID));
- if (!ISEMPTY(GE_CNODES))
+ if(!ISEMPTY(GE_CNODES))
event->cluster_nodes =
xstrdup(ROW(GE_CNODES));
} END_EACH_ROW;
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_job.c b/src/plugins/accounting_storage/pgsql/as_pg_job.c
index ef3ebc2164cf538cf1b7177514d3b9002bf2e815..0b06566c179abbdf141890978f7ac3ef182d7eea 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_job.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_job.c
@@ -166,10 +166,10 @@ _get_db_index(pgsql_conn_t *pg_conn, time_t submit, uint32_t jobid,
"jobid=%u AND associd=%u",
job_table, (int)submit, jobid, associd);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return 0;
- if (!PQntuples(result)) {
+ if(!PQntuples(result)) {
debug4("We can't get a db_index for this combo, "
"time_submit=%d and id_job=%u and id_assoc=%u. "
"We must not have heard about the start yet, "
@@ -199,7 +199,7 @@ _check_job_db_index(pgsql_conn_t *pg_conn, struct job_record *job_ptr)
else
submit_time = job_ptr->details->submit_time;
- if (!job_ptr->db_index) {
+ if(!job_ptr->db_index) {
job_ptr->db_index = _get_db_index(
pg_conn,
submit_time,
@@ -209,7 +209,7 @@ _check_job_db_index(pgsql_conn_t *pg_conn, struct job_record *job_ptr)
/* If we get an error with this just fall
* through to avoid an infinite loop
*/
- if (jobacct_storage_p_job_start(pg_conn, job_ptr)
+ if(jobacct_storage_p_job_start(pg_conn, job_ptr)
== SLURM_ERROR) {
error("couldn't add job %u ",
job_ptr->job_id);
@@ -402,7 +402,7 @@ js_pg_job_start(pgsql_conn_t *pg_conn,
* removed. This is most likely the only time we are going to
* be notified of the change also so make the state without
* the resize. */
- if (job_state & JOB_RESIZING) {
+ if(job_state & JOB_RESIZING) {
js_pg_job_complete(pg_conn, job_ptr);
job_state &= (~JOB_RESIZING);
job_ptr->db_index = 0;
@@ -431,7 +431,7 @@ js_pg_job_start(pgsql_conn_t *pg_conn,
check_time = submit_time;
slurm_mutex_lock(&rollup_lock);
- if (check_time < global_last_rollup) {
+ if(check_time < global_last_rollup) {
PGresult *result = NULL;
/* check to see if we are hearing about this time for the
* first time.
@@ -442,7 +442,7 @@ js_pg_job_start(pgsql_conn_t *pg_conn,
job_table, job_ptr->job_id,
submit_time, begin_time, start_time);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
slurm_mutex_unlock(&rollup_lock);
return SLURM_ERROR;
}
@@ -456,13 +456,13 @@ js_pg_job_start(pgsql_conn_t *pg_conn,
}
PQclear(result);
- if (start_time)
+ if(start_time)
debug("Need to reroll usage from %sJob %u "
"from %s started then and we are just "
"now hearing about it.",
ctime(&check_time),
job_ptr->job_id, pg_conn->cluster_name);
- else if (begin_time)
+ else if(begin_time)
debug("Need to reroll usage from %sJob %u "
"from %s became eligible then and we are just "
"now hearing about it.",
@@ -500,17 +500,17 @@ no_rollup_change:
else
nodes = "None assigned";
- if (job_ptr->batch_flag)
+ if(job_ptr->batch_flag)
track_steps = 1;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
block_id = xstrdup(job_ptr->comment);
node_cnt = job_ptr->total_nodes;
node_inx = job_ptr->network;
} else {
char temp_bit[BUF_SIZE];
- if (job_ptr->node_bitmap) {
+ if(job_ptr->node_bitmap) {
node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
job_ptr->node_bitmap);
}
@@ -528,12 +528,12 @@ no_rollup_change:
/* If there is a start_time get the wckeyid. If the job is
* cancelled before the job starts we also want to grab it. */
- if (job_ptr->assoc_id && (start_time || IS_JOB_CANCELLED(job_ptr)))
+ if(job_ptr->assoc_id && (start_time || IS_JOB_CANCELLED(job_ptr)))
wckeyid = get_wckeyid(pg_conn, &job_ptr->wckey,
job_ptr->user_id, pg_conn->cluster_name,
job_ptr->assoc_id);
- if (!job_ptr->db_index) {
+ if(!job_ptr->db_index) {
if (!begin_time)
begin_time = submit_time;
@@ -587,7 +587,7 @@ no_rollup_change:
job_ptr->db_index = pgsql_query_ret_id(pg_conn->db_conn,
query);
if (!job_ptr->db_index) {
- if (!reinit) {
+ if(!reinit) {
error("It looks like the storage has gone "
"away trying to reconnect");
check_db_connection(pg_conn);
@@ -600,17 +600,17 @@ no_rollup_change:
} else {
query = xstrdup_printf("UPDATE %s SET nodelist='%s', ",
job_table, nodes);
- if (job_ptr->account)
+ if(job_ptr->account)
xstrfmtcat(query, "account='%s', ",
job_ptr->account);
- if (job_ptr->partition)
+ if(job_ptr->partition)
xstrfmtcat(query, "partition='%s', ",
job_ptr->partition);
- if (block_id)
+ if(block_id)
xstrfmtcat(query, "blockid='%s', ", block_id);
- if (job_ptr->wckey)
+ if(job_ptr->wckey)
xstrfmtcat(query, "wckey='%s', ", job_ptr->wckey);
- if (node_inx)
+ if(node_inx)
xstrfmtcat(query, "node_inx='%s', ", node_inx);
xstrfmtcat(query, "start=%d, name='%s', state=%u, "
@@ -672,7 +672,7 @@ js_pg_job_complete(pgsql_conn_t *pg_conn,
}
slurm_mutex_lock(&rollup_lock);
- if (end_time < global_last_rollup) {
+ if(end_time < global_last_rollup) {
global_last_rollup = job_ptr->end_time;
slurm_mutex_unlock(&rollup_lock);
@@ -736,15 +736,15 @@ js_pg_step_start(pgsql_conn_t *pg_conn,
return SLURM_ERROR;
}
- if (step_ptr->start_time > step_ptr->job_ptr->resize_time)
+ if(step_ptr->start_time > step_ptr->job_ptr->resize_time)
start_time = step_ptr->start_time;
else
start_time = step_ptr->job_ptr->resize_time;
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
tasks = step_ptr->job_ptr->details->num_tasks;
cpus = step_ptr->cpu_count;
snprintf(node_list, BUFFER_SIZE, "%s",
@@ -755,7 +755,7 @@ js_pg_step_start(pgsql_conn_t *pg_conn,
} else {
char temp_bit[BUF_SIZE];
- if (step_ptr->step_node_bitmap) {
+ if(step_ptr->step_node_bitmap) {
node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
step_ptr->step_node_bitmap);
}
@@ -764,7 +764,7 @@ js_pg_step_start(pgsql_conn_t *pg_conn,
select_g_select_jobinfo_get(step_ptr->job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
- if (ionodes) {
+ if(ionodes) {
snprintf(node_list, BUFFER_SIZE,
"%s[%s]", step_ptr->job_ptr->nodes, ionodes);
xfree(ionodes);
@@ -775,7 +775,7 @@ js_pg_step_start(pgsql_conn_t *pg_conn,
SELECT_JOBDATA_NODE_CNT,
&nodes);
#else
- if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
+ if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
tasks = cpus = step_ptr->job_ptr->total_cpus;
snprintf(node_list, BUFFER_SIZE, "%s",
step_ptr->job_ptr->nodes);
@@ -856,12 +856,12 @@ js_pg_step_complete(pgsql_conn_t *pg_conn,
return SLURM_ERROR;
}
- if (step_ptr->start_time > step_ptr->job_ptr->resize_time)
+ if(step_ptr->start_time > step_ptr->job_ptr->resize_time)
start_time = step_ptr->start_time;
else
start_time = step_ptr->job_ptr->resize_time;
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
if (jobacct == NULL) {
@@ -870,7 +870,7 @@ js_pg_step_complete(pgsql_conn_t *pg_conn,
jobacct = &dummy_jobacct;
}
- if (slurmdbd_conf) {
+ if(slurmdbd_conf) {
now = step_ptr->job_ptr->end_time;
tasks = step_ptr->job_ptr->details->num_tasks;
cpus = step_ptr->cpu_count;
@@ -880,7 +880,7 @@ js_pg_step_complete(pgsql_conn_t *pg_conn,
tasks = cpus = step_ptr->job_ptr->details->min_cpus;
#else
- if (!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
+ if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
tasks = cpus = step_ptr->job_ptr->total_cpus;
else {
cpus = step_ptr->cpu_count;
@@ -902,7 +902,7 @@ js_pg_step_complete(pgsql_conn_t *pg_conn,
comp_status = JOB_COMPLETE;
/* figure out the ave of the totals sent */
- if (cpus > 0) {
+ if(cpus > 0) {
ave_vsize = (double)jobacct->tot_vsize;
ave_vsize /= (double)cpus;
ave_rss = (double)jobacct->tot_rss;
@@ -913,7 +913,7 @@ js_pg_step_complete(pgsql_conn_t *pg_conn,
ave_cpu /= (double)cpus;
}
- if (jobacct->min_cpu != (uint32_t)NO_VAL) {
+ if(jobacct->min_cpu != (uint32_t)NO_VAL) {
ave_cpu2 = (double)jobacct->min_cpu;
}
@@ -982,7 +982,7 @@ js_pg_suspend(pgsql_conn_t *pg_conn, struct job_record *job_ptr)
int rc = SLURM_SUCCESS;
bool suspended = false;
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
if (_check_job_db_index(pg_conn, job_ptr) != SLURM_SUCCESS)
@@ -998,7 +998,7 @@ js_pg_suspend(pgsql_conn_t *pg_conn, struct job_record *job_ptr)
job_ptr->job_state & JOB_STATE_BASE,
job_ptr->db_index);
- if (job_ptr->job_state == JOB_SUSPENDED)
+ if(job_ptr->job_state == JOB_SUSPENDED)
/* XXX: xstrfmtcat() cannot work on non-xmalloc-ed strings */
xstrfmtcat(query,
"INSERT INTO %s (id, associd, start, end) "
@@ -1012,7 +1012,7 @@ js_pg_suspend(pgsql_conn_t *pg_conn, struct job_record *job_ptr)
job_ptr->db_index);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_ERROR) {
+ if(rc != SLURM_ERROR) {
query = xstrdup_printf(
"UPDATE %s SET suspended=%u-suspended, "
"state=%d WHERE id=%u and endtime=0",
@@ -1029,15 +1029,15 @@ static void _state_time_string(char **extra, uint32_t state,
{
int base_state = state & JOB_STATE_BASE;
- if (!start && !end) {
+ if(!start && !end) {
xstrfmtcat(*extra, "t1.state='%u'", state);
return;
}
switch(base_state) {
case JOB_PENDING:
- if (start) {
- if (!end) {
+ if(start) {
+ if(!end) {
xstrfmtcat(*extra,
"(t1.eligible AND (t1.start=0 OR "
"(%d BETWEEN "
@@ -1060,8 +1060,8 @@ static void _state_time_string(char **extra, uint32_t state,
/* FIX ME: this should do something with the suspended
table, but it doesn't right now. */
case JOB_RUNNING:
- if (start) {
- if (!end) {
+ if(start) {
+ if(!end) {
xstrfmtcat(*extra,
"(t1.start AND (t1.endtime=0 OR "
"(%d BETWEEN t1.start AND t1.endtime)))",
@@ -1085,15 +1085,15 @@ static void _state_time_string(char **extra, uint32_t state,
case JOB_NODE_FAIL:
default:
xstrfmtcat(*extra, "(t1.state='%u' AND (t1.endtime AND ", state);
- if (start) {
- if (!end) {
+ if(start) {
+ if(!end) {
xstrfmtcat(*extra, "(t1.endtime >= %d)))", start);
} else {
xstrfmtcat(*extra,
"(t1.endtime BETWEEN %d AND %d)))",
start, end);
}
- } else if (end) {
+ } else if(end) {
xstrfmtcat(*extra, "(t1.endtime <= %d)))", end);
}
break;
@@ -1122,11 +1122,11 @@ _make_job_cond_str(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
xstrcat (*cond, " WHERE TRUE");
- if (!job_cond)
+ if(!job_cond)
return;
/* THIS ASSOCID CHECK ALWAYS NEEDS TO BE FIRST!!!!!!! */
- if (job_cond->associd_list && list_count(job_cond->associd_list)) {
+ if(job_cond->associd_list && list_count(job_cond->associd_list)) {
set = 0;
xstrfmtcat(*extra_table, ", %s AS t3", assoc_table);
table_level = "t3";
@@ -1150,7 +1150,7 @@ _make_job_cond_str(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
/* this must be done before resvid_list since we set
resvid_list up here */
- if (job_cond->resv_list && list_count(job_cond->resv_list)) {
+ if(job_cond->resv_list && list_count(job_cond->resv_list)) {
PGresult *result = NULL;
char *query = xstrdup_printf(
"SELECT DISTINCT id FROM %s WHERE (", resv_table);
@@ -1159,11 +1159,11 @@ _make_job_cond_str(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
concat_cond_list(job_cond->resv_list, NULL, "name", &query);
//xstrcat(query, ";");
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("as/pg: couldn't get resv id");
goto no_resv;
}
- if (!job_cond->resvid_list)
+ if(!job_cond->resvid_list)
job_cond->resvid_list = list_create(slurm_destroy_char);
FOR_EACH_ROW {
list_append(job_cond->resvid_list, xstrdup(ROW(0)));
@@ -1173,12 +1173,12 @@ _make_job_cond_str(pgsql_conn_t *pg_conn, slurmdb_job_cond_t *job_cond,
no_resv:
concat_cond_list(job_cond->resvid_list, "t1", "resvid", cond);
- if (job_cond->step_list && list_count(job_cond->step_list)) {
+ if(job_cond->step_list && list_count(job_cond->step_list)) {
set = 0;
xstrcat(*cond, " AND (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*cond, " OR ");
xstrfmtcat(*cond, "t1.jobid=%u", selected_step->jobid);
set = 1;
@@ -1187,13 +1187,13 @@ no_resv:
xstrcat(*cond, ")");
}
- if (job_cond->state_list && list_count(job_cond->state_list)) {
+ if(job_cond->state_list && list_count(job_cond->state_list)) {
set = 0;
xstrcat(*cond, " AND (");
itr = list_iterator_create(job_cond->state_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*cond, " OR ");
_state_time_string(cond, atoi(object),
job_cond->usage_start,
@@ -1205,10 +1205,10 @@ no_resv:
} else {
/* Only do this (default of all eligible jobs) if no
state is given */
- if (job_cond->usage_start) {
+ if(job_cond->usage_start) {
xstrcat(*cond, " AND (");
- if (!job_cond->usage_end)
+ if(!job_cond->usage_end)
xstrfmtcat(*cond,
"(t1.endtime >= %d OR t1.endtime = 0))",
job_cond->usage_start);
@@ -1218,7 +1218,7 @@ no_resv:
"AND (t1.endtime >= %d OR t1.endtime = 0)))",
job_cond->usage_end,
job_cond->usage_start);
- } else if (job_cond->usage_end) {
+ } else if(job_cond->usage_end) {
xstrcat(*cond, " AND (");
xstrfmtcat(*cond,
"(t1.eligible < %d))", job_cond->usage_end);
@@ -1228,12 +1228,12 @@ no_resv:
concat_cond_list(job_cond->state_list, "t1", "state", cond);
/* we need to put all the associations (t2) stuff together here */
- if (job_cond->cluster_list && list_count(job_cond->cluster_list)) {
+ if(job_cond->cluster_list && list_count(job_cond->cluster_list)) {
set = 0;
xstrcat(*cond, " AND (");
itr = list_iterator_create(job_cond->cluster_list);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*cond, " OR ");
xstrfmtcat(*cond,
"(t1.cluster='%s' OR %s.cluster='%s')",
@@ -1246,9 +1246,9 @@ no_resv:
concat_cond_list(job_cond->wckey_list, "t1", "wckey", cond);
- if (job_cond->cpus_min) {
+ if(job_cond->cpus_min) {
xstrcat(*cond, " AND (");
- if (job_cond->cpus_max) {
+ if(job_cond->cpus_max) {
xstrfmtcat(*cond, "(t1.alloc_cpus BETWEEN %u AND %u))",
job_cond->cpus_min, job_cond->cpus_max);
@@ -1259,10 +1259,10 @@ no_resv:
}
}
- if (job_cond->nodes_min) {
+ if(job_cond->nodes_min) {
xstrcat(*cond, " AND (");
- if (job_cond->nodes_max) {
+ if(job_cond->nodes_max) {
xstrfmtcat(*cond,
"(t1.alloc_nodes BETWEEN %u AND %u))",
job_cond->nodes_min, job_cond->nodes_max);
@@ -1459,7 +1459,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
STEP_REQ_COUNT
};
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
@@ -1479,16 +1479,16 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
things work. This should go before the setup of conds
since we could update the start/end time.
*/
- if (job_cond && job_cond->used_nodes) {
+ if(job_cond && job_cond->used_nodes) {
local_cluster_list = setup_cluster_list_with_inx(
pg_conn, job_cond, (void **)&curr_cluster);
- if (!local_cluster_list) {
+ if(!local_cluster_list) {
list_destroy(job_list);
return NULL;
}
}
- if (job_cond->state_list && (list_count(job_cond->state_list) == 1)
+ if(job_cond->state_list && (list_count(job_cond->state_list) == 1)
&& (atoi(list_peek(job_cond->state_list)) == JOB_PENDING))
only_pending = 1;
@@ -1505,11 +1505,11 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
* if this flag is set. We also include any accounts they may be
* coordinator of.
*/
- if (!is_admin && (private_data & PRIVATE_DATA_JOBS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_JOBS)) {
query = xstrdup_printf(
"SELECT lft FROM %s WHERE user_name='%s'",
assoc_table, user.name);
- if (user.coord_accts) {
+ if(user.coord_accts) {
slurmdb_coord_rec_t *coord = NULL;
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
@@ -1519,18 +1519,18 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
list_iterator_destroy(itr);
}
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
xfree(cond);
xfree(extra_table);
list_destroy(job_list);
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
return NULL;
}
set = 0;
FOR_EACH_ROW {
- if (set) {
+ if(set) {
xstrfmtcat(cond,
" OR (%s BETWEEN %s.lft AND %s.rgt)",
ROW(0), table_level, table_level);
@@ -1543,7 +1543,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
table_level);
}
} END_EACH_ROW;
- if (set)
+ if(set)
xstrcat(cond, ")");
PQclear(result);
}
@@ -1552,7 +1552,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
"ON t1.associd=t2.id",
tmp, job_table, assoc_table);
xfree(tmp);
- if (extra_table) {
+ if(extra_table) {
xstrcat(query, extra_table);
xfree(extra_table);
}
@@ -1562,15 +1562,15 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
/* Here we want to order them this way in such a way so it is
easy to look for duplicates
*/
- if (job_cond && !job_cond->duplicates)
+ if(job_cond && !job_cond->duplicates)
xstrcat(query, " ORDER BY t1.cluster, jobid, submit DESC;");
else
xstrcat(query, " ORDER BY t1.cluster, submit DESC;");
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
list_destroy(job_list);
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
return NULL;
}
@@ -1584,14 +1584,14 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
submit = atoi(ROW(JOB_REQ_SUBMIT));
curr_id = atoi(ROW(JOB_REQ_JOBID));
- if (job_cond && !job_cond->duplicates && curr_id == last_id)
+ if(job_cond && !job_cond->duplicates && curr_id == last_id)
continue;
last_id = curr_id;
/* check the bitmap to see if this is one of the jobs
we are looking for */
- if (!good_nodes_from_inx(local_cluster_list,
+ if(!good_nodes_from_inx(local_cluster_list,
(void **)&curr_cluster,
ROW(JOB_REQ_NODE_INX), submit))
continue;
@@ -1609,31 +1609,31 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
job->state = atoi(ROW(JOB_REQ_STATE));
/* we want a blank wckey if the name is null */
- if (ROW(JOB_REQ_WCKEY))
+ if(ROW(JOB_REQ_WCKEY))
job->wckey = xstrdup(ROW(JOB_REQ_WCKEY));
else
job->wckey = xstrdup("");
job->wckeyid = atoi(ROW(JOB_REQ_WCKEYID));
- if (! ISEMPTY(JOB_REQ_CLUSTER)) /* ISNULL => ISEMPTY */
+ if(! ISEMPTY(JOB_REQ_CLUSTER)) /* ISNULL => ISEMPTY */
job->cluster = xstrdup(ROW(JOB_REQ_CLUSTER));
- else if (! ISEMPTY(JOB_REQ_CLUSTER1))
+ else if(! ISEMPTY(JOB_REQ_CLUSTER1))
job->cluster = xstrdup(ROW(JOB_REQ_CLUSTER1));
- if (! ISNULL(JOB_REQ_USER_NAME))
+ if(! ISNULL(JOB_REQ_USER_NAME))
job->user = xstrdup(ROW(JOB_REQ_USER_NAME));
else
job->uid = atoi(ROW(JOB_REQ_UID));
- if (! ISNULL(JOB_REQ_LFT))
+ if(! ISNULL(JOB_REQ_LFT))
job->lft = atoi(ROW(JOB_REQ_LFT));
- if (! ISEMPTY(JOB_REQ_ACCOUNT))
+ if(! ISEMPTY(JOB_REQ_ACCOUNT))
job->account = xstrdup(ROW(JOB_REQ_ACCOUNT));
- else if (! ISEMPTY(JOB_REQ_ACCOUNT1))
+ else if(! ISEMPTY(JOB_REQ_ACCOUNT1))
job->account = xstrdup(ROW(JOB_REQ_ACCOUNT1));
- if (! ISNULL(JOB_REQ_BLOCKID))
+ if(! ISNULL(JOB_REQ_BLOCKID))
job->blockid = xstrdup(ROW(JOB_REQ_BLOCKID));
job->eligible = atoi(ROW(JOB_REQ_ELIGIBLE));
@@ -1642,26 +1642,26 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
job->end = atoi(ROW(JOB_REQ_END));
/* since the job->end could be set later end it here */
- if (job->end) {
+ if(job->end) {
job_ended = 1;
- if (!job->start || (job->start > job->end))
+ if(!job->start || (job->start > job->end))
job->start = job->end;
}
- if (job_cond && !job_cond->without_usage_truncation
+ if(job_cond && !job_cond->without_usage_truncation
&& job_cond->usage_start) {
- if (job->start && (job->start < job_cond->usage_start))
+ if(job->start && (job->start < job_cond->usage_start))
job->start = job_cond->usage_start;
- if (!job->end || job->end > job_cond->usage_end)
+ if(!job->end || job->end > job_cond->usage_end)
job->end = job_cond->usage_end;
- if (!job->start)
+ if(!job->start)
job->start = job->end;
job->elapsed = job->end - job->start;
- if (ROW(JOB_REQ_SUSPENDED)) {
+ if(ROW(JOB_REQ_SUSPENDED)) {
int local_start, local_end;
/* get the suspended time for this job */
@@ -1673,7 +1673,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
suspend_table, job_cond->usage_end,
job_cond->usage_start, id);
result2 = DEF_QUERY_RET;
- if (!result2) {
+ if(!result2) {
list_destroy(job_list);
job_list = NULL;
break;
@@ -1681,15 +1681,15 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
FOR_EACH_ROW2 {
local_start = atoi(ROW2(0));
local_end = atoi(ROW2(1));
- if (!local_start)
+ if(!local_start)
continue;
- if (job->start > local_start)
+ if(job->start > local_start)
local_start = job->start;
- if (job->end < local_end)
+ if(job->end < local_end)
local_end = job->end;
- if ((local_end - local_start) < 1)
+ if((local_end - local_start) < 1)
continue;
job->elapsed -=
@@ -1705,9 +1705,9 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
if (job->state == JOB_SUSPENDED)
job->suspended = now - job->suspended;
- if (!job->start) {
+ if(!job->start) {
job->elapsed = 0;
- } else if (!job->end) {
+ } else if(!job->end) {
job->elapsed = now - job->start;
} else {
job->elapsed = job->end - job->start;
@@ -1716,7 +1716,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
job->elapsed -= job->suspended;
}
- if ((int)job->elapsed < 0)
+ if((int)job->elapsed < 0)
job->elapsed = 0;
job->jobid = curr_id;
@@ -1724,10 +1724,10 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
job->gid = atoi(ROW(JOB_REQ_GID));
job->exitcode = atoi(ROW(JOB_REQ_COMP_CODE));
- if (ROW(JOB_REQ_PARTITION))
+ if(ROW(JOB_REQ_PARTITION))
job->partition = xstrdup(ROW(JOB_REQ_PARTITION));
- if (ROW(JOB_REQ_NODELIST))
+ if(ROW(JOB_REQ_NODELIST))
job->nodes = xstrdup(ROW(JOB_REQ_NODELIST));
if (!job->nodes || !strcmp(job->nodes, "(null)")) {
@@ -1742,15 +1742,15 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
job->qosid = atoi(ROW(JOB_REQ_QOS));
job->show_full = 1;
- if (only_pending || (job_cond && job_cond->without_steps))
+ if(only_pending || (job_cond && job_cond->without_steps))
goto skip_steps;
- if (job_cond && job_cond->step_list
+ if(job_cond && job_cond->step_list
&& list_count(job_cond->step_list)) {
set = 0;
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if (selected_step->jobid != job->jobid) {
+ if(selected_step->jobid != job->jobid) {
continue;
} else if (selected_step->stepid
== (uint32_t)NO_VAL) {
@@ -1758,7 +1758,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
break;
}
- if (set)
+ if(set)
xstrcat(cond, " OR ");
else
xstrcat(cond, " AND (");
@@ -1769,11 +1769,11 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
job->show_full = 0;
}
list_iterator_destroy(itr);
- if (set)
+ if(set)
xstrcat(cond, ")");
}
for(i=0; i<STEP_REQ_COUNT; i++) {
- if (i)
+ if(i)
xstrcat(tmp, ", ");
xstrcat(tmp, step_req_inx[i]);
}
@@ -1781,15 +1781,15 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
tmp, step_table, id);
xfree(tmp);
- if (cond) {
+ if(cond) {
xstrcat(query, cond);
xfree(cond);
}
result2 = DEF_QUERY_RET;
- if (!result2) {
+ if(!result2) {
list_destroy(job_list);
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
return NULL;
}
@@ -1801,7 +1801,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
FOR_EACH_ROW2 {
/* check the bitmap to see if this is one of the steps
we are looking for */
- if (!good_nodes_from_inx(local_cluster_list,
+ if(!good_nodes_from_inx(local_cluster_list,
(void **)&curr_cluster,
ROW2(STEP_REQ_NODE_INX),
submit))
@@ -1811,7 +1811,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
step->tot_cpu_sec = 0;
step->tot_cpu_usec = 0;
step->job_ptr = job;
- if (!job->first_step_ptr)
+ if(!job->first_step_ptr)
job->first_step_ptr = step;
list_append(job->steps, step);
step->stepid = atoi(ROW2(STEP_REQ_STEPID));
@@ -1824,42 +1824,42 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
step->ntasks = atoi(ROW2(STEP_REQ_TASKS));
step->task_dist = atoi(ROW2(STEP_REQ_TASKDIST));
- if (!step->ntasks)
+ if(!step->ntasks)
step->ntasks = step->ncpus;
step->start = atoi(ROW2(STEP_REQ_START));
step->end = atoi(ROW2(STEP_REQ_END));
/* if the job has ended end the step also */
- if (!step->end && job_ended) {
+ if(!step->end && job_ended) {
step->end = job->end;
step->state = job->state;
}
- if (job_cond && !job_cond->without_usage_truncation
+ if(job_cond && !job_cond->without_usage_truncation
&& job_cond->usage_start) {
- if (step->start
+ if(step->start
&& (step->start < job_cond->usage_start))
step->start = job_cond->usage_start;
- if (!step->start && step->end)
+ if(!step->start && step->end)
step->start = step->end;
- if (!step->end
+ if(!step->end
|| (step->end > job_cond->usage_end))
step->end = job_cond->usage_end;
}
/* figure this out by start stop */
step->suspended = atoi(ROW2(STEP_REQ_SUSPENDED));
- if (!step->end) {
+ if(!step->end) {
step->elapsed = now - step->start;
} else {
step->elapsed = step->end - step->start;
}
step->elapsed -= step->suspended;
- if ((int)step->elapsed < 0)
+ if((int)step->elapsed < 0)
step->elapsed = 0;
step->user_cpu_sec = atoi(ROW2(STEP_REQ_USER_SEC));
@@ -1909,7 +1909,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
} END_EACH_ROW2;
PQclear(result2);
- if (!job->track_steps) {
+ if(!job->track_steps) {
/* If we don't have track_steps we want to see
if we have multiple steps. If we only have
1 step check the job name against the step
@@ -1917,10 +1917,10 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
different. If it is different print out
the step separate.
*/
- if (list_count(job->steps) > 1)
+ if(list_count(job->steps) > 1)
job->track_steps = 1;
- else if (step && step->stepname && job->jobname) {
- if (strcmp(step->stepname, job->jobname))
+ else if(step && step->stepname && job->jobname) {
+ if(strcmp(step->stepname, job->jobname))
job->track_steps = 1;
}
}
@@ -1929,7 +1929,7 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
step = NULL;
} END_EACH_ROW;
PQclear(result);
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
return job_list;
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_problem.c b/src/plugins/accounting_storage/pgsql/as_pg_problem.c
index 6fa980bd1a65a15ed7f3fe12eb49e747ef1aa51c..8496122078c55463ecd1d80d4ff9af8f178fdd8e 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_problem.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_problem.c
@@ -55,20 +55,20 @@ as_pg_get_problems(pgsql_conn_t *pg_conn, uid_t uid,
{
List ret_list = NULL;
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
ret_list = list_create(slurmdb_destroy_association_rec);
- if (get_acct_no_assocs(pg_conn, assoc_q, ret_list)
+ if(get_acct_no_assocs(pg_conn, assoc_q, ret_list)
!= SLURM_SUCCESS)
goto end_it;
- if (get_acct_no_users(pg_conn, assoc_q, ret_list)
+ if(get_acct_no_users(pg_conn, assoc_q, ret_list)
!= SLURM_SUCCESS)
goto end_it;
- if (get_user_no_assocs_or_no_uid(pg_conn, assoc_q, ret_list)
+ if(get_user_no_assocs_or_no_uid(pg_conn, assoc_q, ret_list)
!= SLURM_SUCCESS)
goto end_it;
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_qos.c b/src/plugins/accounting_storage/pgsql/as_pg_qos.c
index 53679373b81dfeca279fc5b3c8e54ed0b21304c7..74c8025d4bfd60d0f185d3d78ee07bc4ec761442 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_qos.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_qos.c
@@ -195,7 +195,7 @@ _make_qos_record_for_add(slurmdb_qos_rec_t *object, time_t now,
}
/* priority, default 0 */
- if ((int)object->priority >= 0) {
+ if((int)object->priority >= 0) {
xstrfmtcat(*rec, "%d, ", object->priority);
xstrfmtcat(*txn, "priority=%d, ", object->priority);
} else if ((int)object->priority == INFINITE) {
@@ -264,7 +264,7 @@ _make_qos_vals_for_modify(slurmdb_qos_rec_t *qos, char **vals,
concat_limit("grp_wall", qos->grp_wall, NULL, vals);
concat_limit("grp_cpu_mins", qos->grp_cpu_mins, NULL, vals);
- if (qos->preempt_list && list_count(qos->preempt_list)) {
+ if(qos->preempt_list && list_count(qos->preempt_list)) {
char *preempt_val = NULL;
char *tmp_char = NULL, *begin_preempt = NULL;
ListIterator preempt_itr =
@@ -273,25 +273,25 @@ _make_qos_vals_for_modify(slurmdb_qos_rec_t *qos, char **vals,
begin_preempt = xstrdup("preempt");
while((tmp_char = list_next(preempt_itr))) {
- if (tmp_char[0] == '-') {
+ if(tmp_char[0] == '-') {
xstrfmtcat(preempt_val,
"replace(%s, ',%s', '')",
begin_preempt, tmp_char+1);
xfree(begin_preempt);
begin_preempt = preempt_val;
- } else if (tmp_char[0] == '+') {
+ } else if(tmp_char[0] == '+') {
xstrfmtcat(preempt_val,
"(replace(%s, ',%s', '') || ',%s')",
begin_preempt,
tmp_char+1, tmp_char+1);
- if (added_preempt)
+ if(added_preempt)
xstrfmtcat(*added_preempt, ",%s",
tmp_char+1);
xfree(begin_preempt);
begin_preempt = preempt_val;
- } else if (tmp_char[0]) {
+ } else if(tmp_char[0]) {
xstrfmtcat(preempt_val, ",%s", tmp_char);
- if (added_preempt)
+ if(added_preempt)
xstrfmtcat(*added_preempt, ",%s",
tmp_char);
} else
@@ -304,9 +304,9 @@ _make_qos_vals_for_modify(slurmdb_qos_rec_t *qos, char **vals,
concat_limit("priority", qos->priority, NULL, vals);
- if (qos->usage_factor >= 0) {
+ if(qos->usage_factor >= 0) {
xstrfmtcat(*vals, ", usage_factor=%f", qos->usage_factor);
- } else if ((int)qos->usage_factor == INFINITE) {
+ } else if((int)qos->usage_factor == INFINITE) {
xstrcat(*vals, ", usage_factor=1.0");
}
return;
@@ -331,7 +331,7 @@ _preemption_loop(pgsql_conn_t *pg_conn, int begin_qosid,
/* check in the preempt list for all qos's preempted */
for(i=0; i<bit_size(preempt_bitstr); i++) {
- if (!bit_test(preempt_bitstr, i))
+ if(!bit_test(preempt_bitstr, i))
continue;
memset(&qos_rec, 0, sizeof(qos_rec));
@@ -341,19 +341,19 @@ _preemption_loop(pgsql_conn_t *pg_conn, int begin_qosid,
NULL);
/* check if the begin_qosid is preempted by this qos
* if so we have a loop */
- if (qos_rec.preempt_bitstr
+ if(qos_rec.preempt_bitstr
&& bit_test(qos_rec.preempt_bitstr, begin_qosid)) {
error("QOS id %d has a loop at QOS %s",
begin_qosid, qos_rec.name);
rc = 1;
break;
- } else if (qos_rec.preempt_bitstr) {
+ } else if(qos_rec.preempt_bitstr) {
/*
* qos_rec.preempt_bitstr are also (newly introduced)
* preemptees of begin_qosid.
* i.e., preemption is transitive
*/
- if ((rc = _preemption_loop(pg_conn, begin_qosid,
+ if((rc = _preemption_loop(pg_conn, begin_qosid,
qos_rec.preempt_bitstr)))
break;
}
@@ -370,7 +370,7 @@ _set_qos_cnt(PGconn *db_conn)
result = pgsql_db_query_ret(db_conn, query);
xfree(query);
- if (!result)
+ if(!result)
return SLURM_ERROR;
if (PQntuples(result) == 0) {
PQclear(result);
@@ -411,7 +411,7 @@ check_qos_tables(PGconn *db_conn, char *user)
char *qos = NULL, *desc = NULL, *query = NULL;
time_t now = time(NULL);
- if (slurmdbd_conf && slurmdbd_conf->default_qos) {
+ if(slurmdbd_conf && slurmdbd_conf->default_qos) {
slurm_addto_char_list(char_list,
slurmdbd_conf->default_qos);
desc = "Added as default";
@@ -436,14 +436,14 @@ check_qos_tables(PGconn *db_conn, char *user)
DEBUG_QUERY;
qos_id = pgsql_query_ret_id(db_conn, query);
xfree(query);
- if (!qos_id)
+ if(!qos_id)
fatal("problem add default qos '%s", qos);
xstrfmtcat(default_qos_str, ",%d", qos_id);
}
list_iterator_destroy(itr);
list_destroy(char_list);
- if (_set_qos_cnt(db_conn) != SLURM_SUCCESS)
+ if(_set_qos_cnt(db_conn) != SLURM_SUCCESS)
return SLURM_ERROR;
}
return rc;
@@ -472,7 +472,7 @@ as_pg_add_qos(pgsql_conn_t *pg_conn, uint32_t uid, List qos_list)
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(qos_list);
while((object = list_next(itr))) {
- if (!object->name) {
+ if(!object->name) {
error("as/pg: add_qos: We need a qos name to add.");
rc = SLURM_ERROR;
continue;
@@ -488,7 +488,7 @@ as_pg_add_qos(pgsql_conn_t *pg_conn, uint32_t uid, List qos_list)
DEBUG_QUERY;
object->id = pgsql_query_ret_id(pg_conn->db_conn, query);
xfree(query);
- if (!object->id) {
+ if(!object->id) {
error("as/pg: couldn't add qos %s", object->name);
added=0;
break;
@@ -496,10 +496,10 @@ as_pg_add_qos(pgsql_conn_t *pg_conn, uint32_t uid, List qos_list)
rc = add_txn(pg_conn, now, DBD_ADD_QOS, object->name,
user_name, txn);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
} else {
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_ADD_QOS,
object) == SLURM_SUCCESS)
list_remove(itr);
@@ -509,8 +509,8 @@ as_pg_add_qos(pgsql_conn_t *pg_conn, uint32_t uid, List qos_list)
list_iterator_destroy(itr);
xfree(user_name);
- if (!added) {
- if (pg_conn->rollback) {
+ if(!added) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -539,15 +539,15 @@ as_pg_modify_qos(pgsql_conn_t *pg_conn, uint32_t uid,
time_t now = time(NULL);
int rc = SLURM_SUCCESS, loop = 0;
- if (!qos_cond || !qos) {
+ if(!qos_cond || !qos) {
error("as/pg: modify_qos: we need something to change");
return NULL;
}
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
_make_qos_vals_for_modify(qos, &vals, &added_preempt);
- if (!vals) {
+ if(!vals) {
errno = SLURM_NO_CHANGE_IN_DATA;
error("Nothing to change");
return NULL;
@@ -569,7 +569,7 @@ as_pg_modify_qos(pgsql_conn_t *pg_conn, uint32_t uid,
"WHERE deleted=0 %s;", qos_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
xfree (vals);
return NULL;
}
@@ -587,7 +587,7 @@ as_pg_modify_qos(pgsql_conn_t *pg_conn, uint32_t uid,
}
object = xstrdup(ROW(0));
list_append(ret_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "(name='%s'", object);
rc = 1;
} else {
@@ -612,7 +612,7 @@ as_pg_modify_qos(pgsql_conn_t *pg_conn, uint32_t uid,
qos_rec->priority = qos->priority;
- if (qos->preempt_list) {
+ if(qos->preempt_list) {
ListIterator new_preempt_itr =
list_iterator_create(qos->preempt_list);
char *preempt = ROW(0);
@@ -620,18 +620,18 @@ as_pg_modify_qos(pgsql_conn_t *pg_conn, uint32_t uid,
int cleared = 0;
qos_rec->preempt_bitstr = bit_alloc(g_qos_count);
- if (preempt && preempt[0])
+ if(preempt && preempt[0])
bit_unfmt(qos->preempt_bitstr, preempt+1);
while((new_preempt = list_next(new_preempt_itr))) {
- if (new_preempt[0] == '-') {
+ if(new_preempt[0] == '-') {
bit_clear(qos_rec->preempt_bitstr,
atoi(new_preempt+1));
- } else if (new_preempt[0] == '+') {
+ } else if(new_preempt[0] == '+') {
bit_set(qos_rec->preempt_bitstr,
atoi(new_preempt+1));
} else {
- if (!cleared) {
+ if(!cleared) {
cleared = 1;
bit_nclear(
qos_rec->preempt_bitstr,
@@ -658,7 +658,7 @@ as_pg_modify_qos(pgsql_conn_t *pg_conn, uint32_t uid,
return NULL;
}
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything");
xfree(vals);
@@ -700,16 +700,16 @@ as_pg_remove_qos(pgsql_conn_t *pg_conn, uint32_t uid,
char *qos = NULL, *delta_qos = NULL, *tmp = NULL;
time_t now = time(NULL);
- if (!qos_cond) {
+ if(!qos_cond) {
error("as/pg: remove_qos: we need something to remove");
return NULL;
}
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
cond = _make_qos_cond(qos_cond);
- if (!cond) {
+ if(!cond) {
error("Nothing to remove");
return NULL;
}
@@ -718,7 +718,7 @@ as_pg_remove_qos(pgsql_conn_t *pg_conn, uint32_t uid,
qos_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
name_char = NULL;
@@ -731,11 +731,11 @@ as_pg_remove_qos(pgsql_conn_t *pg_conn, uint32_t uid,
char *name = ROW(1);
list_append(ret_list, xstrdup(name));
- if (!name_char)
+ if(!name_char)
xstrfmtcat(name_char, "id='%s'", id);
else
xstrfmtcat(name_char, " OR id='%s'", id);
- if (!assoc_char)
+ if(!assoc_char)
xstrfmtcat(assoc_char, "t1.qos='%s'", id);
else
xstrfmtcat(assoc_char, " OR t1.qos='%s'", id);
@@ -757,7 +757,7 @@ as_pg_remove_qos(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything");
return ret_list;
@@ -770,8 +770,8 @@ as_pg_remove_qos(pgsql_conn_t *pg_conn, uint32_t uid,
xfree(qos);
xfree(delta_qos);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
- if (pg_conn->rollback) {
+ if(rc != SLURM_SUCCESS) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -836,15 +836,15 @@ as_pg_get_qos(pgsql_conn_t *pg_conn, uid_t uid,
GQ_COUNT
};
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (!qos_cond) {
+ if(!qos_cond) {
query = xstrdup_printf("SELECT %s FROM %s WHERE deleted=0;",
gq_fields, qos_table);
} else {
cond = _make_qos_cond(qos_cond);
- if (qos_cond->with_deleted)
+ if(qos_cond->with_deleted)
query = xstrdup_printf("SELECT %s FROM %s WHERE "
"(deleted=0 OR deleted=1) %s",
gq_fields, qos_table,
@@ -866,73 +866,73 @@ as_pg_get_qos(pgsql_conn_t *pg_conn, uid_t uid,
slurmdb_qos_rec_t *qos = xmalloc(sizeof(slurmdb_qos_rec_t));
list_append(qos_list, qos);
- if (! ISEMPTY(GQ_DESC))
+ if(! ISEMPTY(GQ_DESC))
qos->description = xstrdup(ROW(GQ_DESC));
qos->id = atoi(ROW(GQ_ID));
- if (! ISEMPTY(GQ_NAME))
+ if(! ISEMPTY(GQ_NAME))
qos->name = xstrdup(ROW(GQ_NAME));
- if (! ISNULL(GQ_GCM))
+ if(! ISNULL(GQ_GCM))
qos->grp_cpu_mins = atoll(ROW(GQ_GCM));
else
qos->grp_cpu_mins = INFINITE;
- if (! ISNULL(GQ_GC))
+ if(! ISNULL(GQ_GC))
qos->grp_cpus = atoi(ROW(GQ_GC));
else
qos->grp_cpus = INFINITE;
- if (! ISNULL(GQ_GJ))
+ if(! ISNULL(GQ_GJ))
qos->grp_jobs = atoi(ROW(GQ_GJ));
else
qos->grp_jobs = INFINITE;
- if (! ISNULL(GQ_GN))
+ if(! ISNULL(GQ_GN))
qos->grp_nodes = atoi(ROW(GQ_GN));
else
qos->grp_nodes = INFINITE;
- if (! ISNULL(GQ_GSJ))
+ if(! ISNULL(GQ_GSJ))
qos->grp_submit_jobs = atoi(ROW(GQ_GSJ));
else
qos->grp_submit_jobs = INFINITE;
- if (! ISNULL(GQ_GW))
+ if(! ISNULL(GQ_GW))
qos->grp_wall = atoi(ROW(GQ_GW));
else
qos->grp_wall = INFINITE;
- if (! ISNULL(GQ_MCMPJ))
+ if(! ISNULL(GQ_MCMPJ))
qos->max_cpu_mins_pj = atoi(ROW(GQ_MCMPJ));
else
qos->max_cpu_mins_pj = INFINITE;
- if (! ISNULL(GQ_MCPJ))
+ if(! ISNULL(GQ_MCPJ))
qos->max_cpus_pj = atoi(ROW(GQ_MCPJ));
else
qos->max_cpus_pj = INFINITE;
- if (! ISNULL(GQ_MJPU))
+ if(! ISNULL(GQ_MJPU))
qos->max_jobs_pu = atoi(ROW(GQ_MJPU));
else
qos->max_jobs_pu = INFINITE;
- if (! ISNULL(GQ_MNPJ))
+ if(! ISNULL(GQ_MNPJ))
qos->max_nodes_pj = atoi(ROW(GQ_MNPJ));
else
qos->max_nodes_pj = INFINITE;
- if (! ISNULL(GQ_MSJPU))
+ if(! ISNULL(GQ_MSJPU))
qos->max_submit_jobs_pu = atoi(ROW(GQ_MSJPU));
else
qos->max_submit_jobs_pu = INFINITE;
- if (! ISNULL(GQ_MWPJ))
+ if(! ISNULL(GQ_MWPJ))
qos->max_wall_pj = atoi(ROW(GQ_MWPJ));
else
qos->max_wall_pj = INFINITE;
- if (! ISEMPTY(GQ_PREE)) {
- if (!qos->preempt_bitstr)
+ if(! ISEMPTY(GQ_PREE)) {
+ if(!qos->preempt_bitstr)
qos->preempt_bitstr = bit_alloc(g_qos_count);
bit_unfmt(qos->preempt_bitstr, ROW(GQ_PREE)+1);
}
- if (! ISNULL(GQ_PRIO))
+ if(! ISNULL(GQ_PRIO))
qos->priority = atoi(ROW(GQ_PRIO));
- if (! ISNULL(GQ_UF))
+ if(! ISNULL(GQ_UF))
qos->usage_factor = atof(ROW(GQ_UF));
} END_EACH_ROW;
PQclear(result);
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_resv.c b/src/plugins/accounting_storage/pgsql/as_pg_resv.c
index c78f0e7d96bde243768dbd3f195762f3543cd678..ec23d8a88ac06912a56d58152996d46e5755bb98 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_resv.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_resv.c
@@ -162,14 +162,14 @@ _make_resv_cond(slurmdb_reservation_cond_t *resv_cond, char **cond)
concat_cond_list(resv_cond->cluster_list, NULL, "cluster", cond);
concat_cond_list(resv_cond->id_list, NULL, "id", cond);
concat_cond_list(resv_cond->name_list, NULL, "name", cond);
- if (resv_cond->time_start) {
- if (!resv_cond->time_end)
+ if(resv_cond->time_start) {
+ if(!resv_cond->time_end)
resv_cond->time_end = now;
xstrfmtcat(*cond, "AND (start < %d "
"AND (endtime >= %d OR endtime = 0))",
resv_cond->time_end, resv_cond->time_start);
- } else if (resv_cond->time_end) {
+ } else if(resv_cond->time_end) {
xstrfmtcat(*cond,
"AND (start < %d)", resv_cond->time_end);
}
@@ -208,19 +208,19 @@ as_pg_add_reservation(pgsql_conn_t *pg_conn, slurmdb_reservation_rec_t *resv)
int rc = SLURM_SUCCESS;
char *query = NULL, *rec = NULL;
- if (!resv) {
+ if(!resv) {
error("as/pg: add_reservation: no reservation given");
return SLURM_ERROR;
}
- if (!resv->id) {
+ if(!resv->id) {
error("as/pg: add_reservation: reservation id not given");
return SLURM_ERROR;
}
- if (!resv->time_start) {
+ if(!resv->time_start) {
error("as/pg: add_reservation: start time not given");
return SLURM_ERROR;
}
- if (!resv->cluster) {
+ if(!resv->cluster) {
error("as/pg: add_reservation: cluster name not given");
return SLURM_ERROR;
}
@@ -265,23 +265,23 @@ as_pg_modify_reservation(pgsql_conn_t *pg_conn,
RESV_COUNT
};
- if (!resv) {
+ if(!resv) {
error("as/pg: modify_reservation: no reservation given");
return SLURM_ERROR;
}
- if (!resv->id) {
+ if(!resv->id) {
error("as/pg: modify_reservation: reservation id not given");
return SLURM_ERROR;
}
- if (!resv->time_start) {
+ if(!resv->time_start) {
error("as/pg: modify_reservation: time_start not given");
return SLURM_ERROR;
}
- if (!resv->cluster) {
+ if(!resv->cluster) {
error("as/pg: modify_reservation: cluster not given");
return SLURM_ERROR;
}
- if (!resv->time_start_prev) {
+ if(!resv->time_start_prev) {
error("as/pg: modify_reservation: time_start_prev not given");
return SLURM_ERROR;
}
@@ -310,7 +310,7 @@ try_again:
error("as/pg: modify_reservation: There is no reservation"
" by id %u, start %d, and cluster '%s'", resv->id,
resv->time_start_prev, resv->cluster);
- if (!set && resv->time_end) {
+ if(!set && resv->time_end) {
/* This should never really happen,
but just incase the controller and the
database get out of sync we check
@@ -335,36 +335,36 @@ try_again:
set = 0;
/* check differences here */
- if (!resv->name && !PG_EMPTY(RESV_NAME))
+ if(!resv->name && !PG_EMPTY(RESV_NAME))
// if this changes we just update the
// record, no need to create a new one since
// this doesn't really effect the
// reservation accounting wise
resv->name = xstrdup(PG_VAL(RESV_NAME));
- if (resv->assocs)
+ if(resv->assocs)
set = 1;
- else if (!PG_EMPTY(RESV_ASSOCS))
+ else if(!PG_EMPTY(RESV_ASSOCS))
resv->assocs = xstrdup(PG_VAL(RESV_ASSOCS));
- if (resv->cpus != (uint32_t)NO_VAL)
+ if(resv->cpus != (uint32_t)NO_VAL)
set = 1;
else
resv->cpus = atoi(PG_VAL(RESV_CPU));
- if (resv->flags != (uint16_t)NO_VAL)
+ if(resv->flags != (uint16_t)NO_VAL)
set = 1;
else
resv->flags = atoi(PG_VAL(RESV_FLAGS));
- if (resv->nodes)
+ if(resv->nodes)
set = 1;
- else if (! PG_EMPTY(RESV_NODES)) {
+ else if(! PG_EMPTY(RESV_NODES)) {
resv->nodes = xstrdup(PG_VAL(RESV_NODES));
resv->node_inx = xstrdup(PG_VAL(RESV_NODE_INX));
}
- if (!resv->time_end)
+ if(!resv->time_end)
resv->time_end = atoi(PG_VAL(RESV_END));
PQclear(result);
@@ -374,7 +374,7 @@ try_again:
* just incase we have a different one from being out
* of sync
*/
- if ((start > now) || !set) {
+ if((start > now) || !set) {
/* we haven't started the reservation yet, or
we are changing the associations or end
time which we can just update it */
@@ -412,11 +412,11 @@ as_pg_remove_reservation(pgsql_conn_t *pg_conn,
int rc = SLURM_SUCCESS;
char *query = NULL;//, *tmp_extra = NULL;
- if (!resv) {
+ if(!resv) {
error("as/pg: remove_reservation: no reservation given");
return SLURM_ERROR;
}
- if (!resv->id || !resv->time_start || !resv->cluster) {
+ if(!resv->id || !resv->time_start || !resv->cluster) {
error("as/pg: remove_reservation: id, start time "
" or cluster not given");
return SLURM_ERROR;
@@ -498,21 +498,21 @@ as_pg_get_reservations(pgsql_conn_t *pg_conn, uid_t uid,
}
}
- if (!resv_cond) {
+ if(!resv_cond) {
goto empty;
}
with_usage = resv_cond->with_usage;
memset(&job_cond, 0, sizeof(slurmdb_job_cond_t));
- if (resv_cond->nodes) {
+ if(resv_cond->nodes) {
job_cond.usage_start = resv_cond->time_start;
job_cond.usage_end = resv_cond->time_end;
job_cond.used_nodes = resv_cond->nodes;
job_cond.cluster_list = resv_cond->cluster_list;
local_cluster_list = setup_cluster_list_with_inx(
pg_conn, &job_cond, (void **)&curr_cluster);
- } else if (with_usage) {
+ } else if(with_usage) {
job_cond.usage_start = resv_cond->time_start;
job_cond.usage_end = resv_cond->time_end;
}
@@ -526,9 +526,9 @@ empty:
gr_fields, resv_table, cond ?: "");
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("as/pg: get_reservations: failed to get resv from db");
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
return NULL;
}
@@ -543,13 +543,13 @@ empty:
list_append(resv_list, resv);
start = atoi(ROW(GR_START));
- if (!good_nodes_from_inx(local_cluster_list, &curr_cluster,
+ if(!good_nodes_from_inx(local_cluster_list, &curr_cluster,
ROW(GR_NODE_INX), start))
continue;
resv->id = atoi(ROW(GR_ID));
- if (with_usage) {
- if (!job_cond.resvid_list)
+ if(with_usage) {
+ if(!job_cond.resvid_list)
job_cond.resvid_list = list_create(NULL);
list_append(job_cond.resvid_list, ROW(GR_ID));
}
@@ -563,17 +563,17 @@ empty:
resv->flags = atoi(ROW(GR_FLAGS));
} END_EACH_ROW;
- if (local_cluster_list)
+ if(local_cluster_list)
list_destroy(local_cluster_list);
- if (with_usage && resv_list && list_count(resv_list)) {
+ if(with_usage && resv_list && list_count(resv_list)) {
ListIterator itr = NULL, itr2 = NULL;
slurmdb_job_rec_t *job = NULL;
slurmdb_reservation_rec_t *resv = NULL;
List job_list = jobacct_storage_p_get_jobs_cond(
pg_conn, uid, &job_cond);
- if (!job_list || !list_count(job_list))
+ if(!job_list || !list_count(job_list))
goto no_jobs;
itr = list_iterator_create(job_list);
@@ -589,24 +589,24 @@ empty:
have to make sure we get the time
in the correct record.
*/
- if (resv->id != job->resvid)
+ if(resv->id != job->resvid)
continue;
set = 1;
- if (start < resv->time_start)
+ if(start < resv->time_start)
start = resv->time_start;
- if (!end || end > resv->time_end)
+ if(!end || end > resv->time_end)
end = resv->time_end;
- if ((elapsed = (end - start)) < 1)
+ if((elapsed = (end - start)) < 1)
continue;
- if (job->alloc_cpus)
+ if(job->alloc_cpus)
resv->alloc_secs +=
elapsed * job->alloc_cpus;
}
list_iterator_reset(itr2);
- if (!set) {
+ if(!set) {
error("we got a job %u with no reservation "
"associatied with it?", job->jobid);
}
@@ -614,11 +614,11 @@ empty:
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
no_jobs:
- if (job_list)
+ if(job_list)
list_destroy(job_list);
}
- if (job_cond.resvid_list) {
+ if(job_cond.resvid_list) {
list_destroy(job_cond.resvid_list);
job_cond.resvid_list = NULL;
}
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_rollup.c b/src/plugins/accounting_storage/pgsql/as_pg_rollup.c
index 305cfb977a029797ed2431427032786cbf596791..c477b8809f0c7132128328e8e610e64e5d9d7c1d 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_rollup.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_rollup.c
@@ -78,14 +78,14 @@ typedef struct {
static void _destroy_local_id_usage(void *object)
{
local_id_usage_t *a_usage = (local_id_usage_t *)object;
- if (a_usage) {
+ if(a_usage) {
xfree(a_usage);
}
}
static void _destroy_local_cluster_usage(void *object)
{
local_cluster_usage_t *c_usage = (local_cluster_usage_t *)object;
- if (c_usage) {
+ if(c_usage) {
xfree(c_usage->name);
xfree(c_usage);
}
@@ -93,9 +93,9 @@ static void _destroy_local_cluster_usage(void *object)
static void _destroy_local_resv_usage(void *object)
{
local_resv_usage_t *r_usage = (local_resv_usage_t *)object;
- if (r_usage) {
+ if(r_usage) {
xfree(r_usage->cluster);
- if (r_usage->local_assocs)
+ if(r_usage->local_assocs)
list_destroy(r_usage->local_assocs);
xfree(r_usage);
}
@@ -150,7 +150,7 @@ _process_event_usage(pgsql_conn_t *pg_conn, time_t start,
" ORDER BY node_name, period_start",
ge_fields, event_table, NODE_STATE_MAINT, end, start);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("failed to get events");
return SLURM_ERROR;
}
@@ -161,15 +161,15 @@ _process_event_usage(pgsql_conn_t *pg_conn, time_t start,
int row_cpu = atoi(ROW(GE_CPU));
char *row_cluster = ROW(GE_CLUSTER);
- if (row_start < start)
+ if(row_start < start)
row_start = start;
- if (!row_end || row_end > end)
+ if(!row_end || row_end > end)
row_end = end;
/* Ignore time less than 1 second. */
- if ((row_end - row_start) < 1)
+ if((row_end - row_start) < 1)
continue;
- if (last_c_usage && !strcmp(last_c_usage->name, row_cluster))
+ if(last_c_usage && !strcmp(last_c_usage->name, row_cluster))
c_usage = last_c_usage;
else {
c_usage = list_find_first(cu_list, _cmp_cluster_name,
@@ -181,14 +181,14 @@ _process_event_usage(pgsql_conn_t *pg_conn, time_t start,
* node_name=='' means cluster registration entry,
* else, node down entry
*/
- if (ISEMPTY(GE_NAME)) {
+ if(ISEMPTY(GE_NAME)) {
/* if the cpu count changes we will
* only care about the last cpu count but
* we will keep a total of the time for
* all cpus to get the correct cpu time
* for the entire period.
*/
- if (!c_usage) {
+ if(!c_usage) {
c_usage = xmalloc(
sizeof(local_cluster_usage_t));
list_append(cu_list, c_usage);
@@ -207,15 +207,15 @@ _process_event_usage(pgsql_conn_t *pg_conn, time_t start,
are looking for. If it was during this
time period we would already have it.
*/
- if (c_usage) {
+ if(c_usage) {
int local_start = row_start;
int local_end = row_end;
- if (c_usage->start > local_start)
+ if(c_usage->start > local_start)
local_start = c_usage->start;
- if (c_usage->end < local_end)
+ if(c_usage->end < local_end)
local_end = c_usage->end;
- if ((local_end - local_start) > 0) {
+ if((local_end - local_start) > 0) {
seconds = (local_end - local_start);
c_usage->d_cpu += seconds * row_cpu;
}
@@ -261,7 +261,7 @@ _process_resv_usage(pgsql_conn_t *pg_conn, time_t start,
"ORDER BY cluster, start",
gr_fields, resv_table, end, start);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("failed to get resv");
return SLURM_ERROR;
}
@@ -283,12 +283,12 @@ _process_resv_usage(pgsql_conn_t *pg_conn, time_t start,
int row_cpu = atoi(ROW(GR_CPU));
int row_flags = atoi(ROW(GR_FLAGS));
- if (row_start < start)
+ if(row_start < start)
row_start = start;
- if (!row_end || row_end > end)
+ if(!row_end || row_end > end)
row_end = end;
/* ignore time less than 1 seconds */
- if ((row_end - row_start) < 1)
+ if((row_end - row_start) < 1)
continue;
r_usage = xmalloc(sizeof(local_resv_usage_t));
@@ -309,7 +309,7 @@ _process_resv_usage(pgsql_conn_t *pg_conn, time_t start,
maintenance then we add the time to planned
down time.
*/
- if (last_c_usage && !strcmp(last_c_usage->name,
+ if(last_c_usage && !strcmp(last_c_usage->name,
r_usage->cluster))
c_usage = last_c_usage;
else {
@@ -323,7 +323,7 @@ _process_resv_usage(pgsql_conn_t *pg_conn, time_t start,
}
last_c_usage = c_usage;
}
- if (row_flags & RESERVE_FLAG_MAINT)
+ if(row_flags & RESERVE_FLAG_MAINT)
c_usage->pd_cpu += r_usage->total_time;
else
c_usage->a_cpu += r_usage->total_time;
@@ -379,7 +379,7 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
" (endtime >= %d OR endtime = 0)) ORDER BY associd, eligible",
gj_fields, job_table, end, start);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("failed to get jobs");
return SLURM_ERROR;
}
@@ -399,36 +399,36 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
char *row_cluster = ROW(GJ_CLUSTER);
seconds = 0;
- if (row_start && (row_start < start))
+ if(row_start && (row_start < start))
row_start = start;
- if (!row_start && row_end)
+ if(!row_start && row_end)
row_start = row_end;
- if (!row_end || row_end > end)
+ if(!row_end || row_end > end)
row_end = end;
- if (!row_start || ((row_end - row_start) < 1))
+ if(!row_start || ((row_end - row_start) < 1))
goto calc_cluster;
seconds = (row_end - row_start);
- if (! ISNULL(GJ_SUSPENDED)) {
+ if(! ISNULL(GJ_SUSPENDED)) {
/* function created in jobacct.c */
query = xstrdup_printf(
"SELECT get_job_suspend_time(%s, %d, %d);",
ROW(GJ_DB_INX), start, end);
result2 = DEF_QUERY_RET;
- if (!result2)
+ if(!result2)
return SLURM_ERROR;
seconds -= atoi(PQgetvalue(result2, 0, 0));
PQclear(result2);
}
- if (seconds < 1) {
+ if(seconds < 1) {
debug4("This job (%u) was suspended "
"the entire hour", job_id);
/* TODO: how about resv usage? */
continue;
}
- if (last_id != assoc_id) { /* ORDER BY associd */
+ if(last_id != assoc_id) { /* ORDER BY associd */
a_usage = xmalloc(sizeof(local_id_usage_t));
a_usage->id = assoc_id;
list_append(au_list, a_usage);
@@ -436,14 +436,14 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
}
a_usage->a_cpu += seconds * row_acpu;
- if (!track_wckey)
+ if(!track_wckey)
goto calc_cluster;
/* do the wckey calculation */
- if (last_wckeyid != wckey_id) {
+ if(last_wckeyid != wckey_id) {
w_usage = list_find_first(wu_list, _cmp_local_id,
&wckey_id);
- if (!w_usage) {
+ if(!w_usage) {
w_usage = xmalloc(sizeof(local_id_usage_t));
w_usage->id = wckey_id;
list_append(wu_list, w_usage);
@@ -454,12 +454,12 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
/* do the cluster allocated calculation */
calc_cluster:
- if (!row_cluster || !row_cluster[0])
+ if(!row_cluster || !row_cluster[0])
continue;
/* first figure out the reservation */
- if (resv_id) {
- if (seconds <= 0)
+ if(resv_id) {
+ if(seconds <= 0)
continue;
/* Since we have already added the
entire reservation as used time on
@@ -484,17 +484,17 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
sure all the reservations
are checked to see if such
a thing has happened */
- if ((r_usage->id == resv_id)
+ if((r_usage->id == resv_id)
&& !strcmp(r_usage->cluster,
row_cluster)) {
int temp_end = row_end;
int temp_start = row_start;
- if (r_usage->start > temp_start)
+ if(r_usage->start > temp_start)
temp_start = r_usage->start;
- if (r_usage->end < temp_end)
+ if(r_usage->end < temp_end)
temp_end = r_usage->end;
- if ((temp_end - temp_start) > 0) {
+ if((temp_end - temp_start) > 0) {
r_usage->a_cpu += row_acpu *
(temp_end - temp_start);
}
@@ -504,7 +504,7 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
continue;
}
- if (last_c_usage && !strcmp(last_c_usage->name,
+ if(last_c_usage && !strcmp(last_c_usage->name,
row_cluster)) {
c_usage = last_c_usage;
} else {
@@ -517,10 +517,10 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
registered. This continue should rarely if
ever happen.
*/
- if (!c_usage)
+ if(!c_usage)
continue;
- if (row_start && (seconds > 0)) {
+ if(row_start && (seconds > 0)) {
/* info("%d assoc %d adds " */
/* "(%d)(%d-%d) * %d = %d " */
/* "to %d", */
@@ -540,15 +540,15 @@ _process_job_usage(pgsql_conn_t *pg_conn, time_t start, time_t end,
* by (start_time - eligible_time) seconds
* large r_cpu means cluster overload or bad scheduling?
*/
- if (!row_start || (row_start >= c_usage->start)) {
+ if(!row_start || (row_start >= c_usage->start)) {
row_end = row_start;
row_start = row_eligible;
- if (c_usage->start > row_start)
+ if(c_usage->start > row_start)
row_start = c_usage->start;
- if (c_usage->end < row_end)
+ if(c_usage->end < row_end)
row_end = c_usage->end;
- if ((row_end - row_start) > 0) {
+ if((row_end - row_start) > 0) {
seconds = (row_end - row_start)
* row_rcpu;
@@ -593,7 +593,7 @@ _process_resv_idle_time(List resv_usage_list, List assoc_usage_list)
ListIterator tmp_itr = NULL;
int64_t idle = r_usage->total_time - r_usage->a_cpu;
- if (idle <= 0)
+ if(idle <= 0)
continue;
/* now divide that time by the number of
@@ -606,12 +606,12 @@ _process_resv_idle_time(List resv_usage_list, List assoc_usage_list)
tmp_itr = list_iterator_create(r_usage->local_assocs);
while((assoc = list_next(tmp_itr))) {
int associd = atoi(assoc);
- if (last_id != associd) {
+ if(last_id != associd) {
a_usage = list_find_first(assoc_usage_list,
_cmp_local_id,
&associd);
}
- if (!a_usage) {
+ if(!a_usage) {
a_usage = xmalloc(sizeof(local_id_usage_t));
a_usage->id = associd;
list_append(assoc_usage_list, a_usage);
@@ -638,7 +638,7 @@ _cluster_usage_sanity_check(local_cluster_usage_t *c_usage,
uint64_t total_used = 0;
/* no more allocated cpus than possible. */
- if (c_usage->total_time < c_usage->a_cpu) {
+ if(c_usage->total_time < c_usage->a_cpu) {
char *start_char = xstrdup(ctime(&curr_start));
char *end_char = xstrdup(ctime(&curr_end));
error("We have more allocated time than is "
@@ -657,7 +657,7 @@ _cluster_usage_sanity_check(local_cluster_usage_t *c_usage,
/* Make sure the total time we care about
doesn't go over the limit */
- if (c_usage->total_time < (total_used)) {
+ if(c_usage->total_time < (total_used)) {
char *start_char = xstrdup(ctime(&curr_start));
char *end_char = xstrdup(ctime(&curr_end));
int64_t overtime;
@@ -680,14 +680,14 @@ _cluster_usage_sanity_check(local_cluster_usage_t *c_usage,
overtime = (int64_t)(c_usage->total_time -
(c_usage->a_cpu
+ c_usage->d_cpu));
- if (overtime < 0)
+ if(overtime < 0)
c_usage->d_cpu += overtime;
overtime = (int64_t)(c_usage->total_time -
(c_usage->a_cpu
+ c_usage->d_cpu
+ c_usage->pd_cpu));
- if (overtime < 0)
+ if(overtime < 0)
c_usage->pd_cpu += overtime;
total_used = c_usage->a_cpu +
@@ -709,13 +709,13 @@ _cluster_usage_sanity_check(local_cluster_usage_t *c_usage,
*/
/* info("%s got idle of %lld", c_usage->name, */
/* (int64_t)c_usage->i_cpu); */
- if ((int64_t)c_usage->i_cpu < 0) {
+ if((int64_t)c_usage->i_cpu < 0) {
/* info("got %d %d %d", c_usage->r_cpu, */
/* c_usage->i_cpu, c_usage->o_cpu); */
c_usage->r_cpu += (int64_t)c_usage->i_cpu;
c_usage->o_cpu -= (int64_t)c_usage->i_cpu;
c_usage->i_cpu = 0;
- if ((int64_t)c_usage->r_cpu < 0)
+ if((int64_t)c_usage->r_cpu < 0)
c_usage->r_cpu = 0;
}
}
@@ -825,26 +825,26 @@ pgsql_hourly_rollup(pgsql_conn_t *pg_conn, time_t start, time_t end)
/* info("association (%d) %d alloc %d", */
/* a_usage->id, last_id, */
/* a_usage->a_cpu); */
- if (usage_recs)
+ if(usage_recs)
xstrcat(usage_recs, ", ");
xstrfmtcat(usage_recs,
"CAST((%d, %d, 0, %d, %d, %llu) AS %s)",
now, now, a_usage->id, curr_start,
a_usage->a_cpu, assoc_hour_table);
}
- if (usage_recs) {
+ if(usage_recs) {
query = xstrdup_printf(
"SELECT add_assoc_hour_usages(ARRAY[%s]);",
usage_recs);
xfree(usage_recs);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add assoc hour rollup");
goto end_it;
}
}
- if (!track_wckey)
+ if(!track_wckey)
goto end_loop;
list_iterator_reset(w_itr);
@@ -852,20 +852,20 @@ pgsql_hourly_rollup(pgsql_conn_t *pg_conn, time_t start, time_t end)
/* info("association (%d) %d alloc %d", */
/* w_usage->id, last_id, */
/* w_usage->a_cpu); */
- if (usage_recs)
+ if(usage_recs)
xstrcat(usage_recs, ", ");
xstrfmtcat(usage_recs,
"CAST((%d, %d, 0, %d, %d, %llu, 0, 0) AS %s)",
now, now, w_usage->id, curr_start,
w_usage->a_cpu, wckey_hour_table);
}
- if (usage_recs) {
+ if(usage_recs) {
query = xstrdup_printf(
"SELECT add_wckey_hour_usages(ARRAY[%s]);",
usage_recs);
xfree(usage_recs);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add wckey hour rollup");
goto end_it;
}
@@ -920,7 +920,7 @@ pgsql_daily_rollup(pgsql_conn_t *pg_conn, time_t start, time_t end,
time_t curr_start = start; /* already aligned to day boundary */
uint16_t track_wckey = slurm_get_track_wckey();
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from day start %d", curr_start);
return SLURM_ERROR;
}
@@ -945,13 +945,13 @@ pgsql_daily_rollup(pgsql_conn_t *pg_conn, time_t start, time_t end,
now, curr_start, curr_end);
}
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add day rollup");
return SLURM_ERROR;
}
curr_start = curr_end;
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from day start %d",
curr_start);
return SLURM_ERROR;
@@ -993,7 +993,7 @@ pgsql_monthly_rollup(pgsql_conn_t *pg_conn,
time_t curr_start = start; /* already aligned to month boundary */
uint16_t track_wckey = slurm_get_track_wckey();
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from month start %d", curr_start);
return SLURM_ERROR;
}
@@ -1021,12 +1021,12 @@ pgsql_monthly_rollup(pgsql_conn_t *pg_conn,
now, curr_start, curr_end);
}
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add month rollup");
return SLURM_ERROR;
}
curr_start = curr_end;
- if (!localtime_r(&curr_start, &start_tm)) {
+ if(!localtime_r(&curr_start, &start_tm)) {
error("Couldn't get localtime from month start %d",
curr_start);
}
@@ -1042,10 +1042,10 @@ pgsql_monthly_rollup(pgsql_conn_t *pg_conn,
/* if we didn't ask for archive data return here and don't do
anything extra just rollup */
- if (!archive_data)
+ if(!archive_data)
return SLURM_SUCCESS;
- if (!slurmdbd_conf)
+ if(!slurmdbd_conf)
return SLURM_SUCCESS;
memset(&arch_cond, 0, sizeof(arch_cond));
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_txn.c b/src/plugins/accounting_storage/pgsql/as_pg_txn.c
index a3c550a96ef02d063b1a45325927c95c2dc1c2eb..a8e8381a5a3a3c67ffb6bd4a0b0e347f5e1e591e 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_txn.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_txn.c
@@ -67,12 +67,12 @@ _concat_txn_cond_list(List cond_list, char *col, char **cond)
char *object;
ListIterator itr;
- if (cond_list && list_count(cond_list)) {
+ if(cond_list && list_count(cond_list)) {
xstrcat(*cond, " AND (");
itr = list_iterator_create(cond_list);
list_iterator_destroy(itr);
while((object = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(*cond, " OR ");
xstrfmtcat(*cond,
"name LIKE '%%%s%%' OR "
@@ -101,11 +101,11 @@ _make_txn_cond(pgsql_conn_t *pg_conn, slurmdb_txn_cond_t *txn_cond)
concat_cond_list(txn_cond->acct_list, NULL, "acct", &assoc_cond);
concat_cond_list(txn_cond->cluster_list, NULL, "cluster", &assoc_cond);
concat_cond_list(txn_cond->user_list, NULL, "user_name", &assoc_cond);
- if (assoc_cond) {
+ if(assoc_cond) {
List assoc_id_list;
ListIterator id_itr;
assoc_id_list = get_assoc_ids(pg_conn, assoc_cond);
- if (assoc_id_list) {
+ if(assoc_id_list) {
id_itr = list_iterator_create(assoc_id_list);
set = 0;
xstrcat(cond, "AND (");
@@ -134,7 +134,7 @@ _make_txn_cond(pgsql_conn_t *pg_conn, slurmdb_txn_cond_t *txn_cond)
concat_like_cond_list(txn_cond->info_list, NULL, "info", &cond);
concat_like_cond_list(txn_cond->name_list, NULL, "name", &cond);
- if (txn_cond->time_start)
+ if(txn_cond->time_start)
xstrfmtcat(cond, " AND (timestamp >= %d) ",
txn_cond->time_start);
if (txn_cond->time_end)
@@ -189,16 +189,16 @@ as_pg_get_txn(pgsql_conn_t *pg_conn, uid_t uid,
if (check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
- if (txn_cond)
+ if(txn_cond)
cond = _make_txn_cond(pg_conn, txn_cond);
query = xstrdup_printf("SELECT %s FROM %s", gt_fields, txn_table);
- if (cond) {
+ if(cond) {
xstrfmtcat(query, " WHERE TRUE %s", cond);
xfree(cond);
}
xstrcat(query, " ORDER BY timestamp;");
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
txn_list = list_create(slurmdb_destroy_txn_rec);
@@ -213,7 +213,7 @@ as_pg_get_txn(pgsql_conn_t *pg_conn, uid_t uid,
txn->timestamp = atoi(ROW(GT_TS));
txn->where_query = xstrdup(ROW(GT_NAME));
- if (txn_cond && txn_cond->with_assoc_info
+ if(txn_cond && txn_cond->with_assoc_info
&& (txn->action == DBD_ADD_ASSOCS
|| txn->action == DBD_MODIFY_ASSOCS
|| txn->action == DBD_REMOVE_ASSOCS)) {
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_usage.c b/src/plugins/accounting_storage/pgsql/as_pg_usage.c
index a41ba3b7b935eb31b0684385f74b88be84501ce1..ea2468e7fb730011abc644c1c68a2760ccef0c8c 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_usage.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_usage.c
@@ -750,7 +750,7 @@ _get_assoc_usage(pgsql_conn_t *pg_conn, uid_t uid,
USAGE_COUNT
};
- if (!slurmdb_assoc->id) {
+ if(!slurmdb_assoc->id) {
error("We need an assoc id to set data for getting usage");
return SLURM_ERROR;
}
@@ -767,27 +767,27 @@ _get_assoc_usage(pgsql_conn_t *pg_conn, uid_t uid,
slurmdb_coord_rec_t *coord = NULL;
assoc_mgr_fill_in_user(pg_conn, &user, 1, NULL);
- if (slurmdb_assoc->user &&
+ if(slurmdb_assoc->user &&
!strcmp(slurmdb_assoc->user, user.name))
goto is_user;
- if (!user.coord_accts) {
+ if(!user.coord_accts) {
debug4("This user isn't a coord.");
goto bad_user;
}
- if (!slurmdb_assoc->acct) {
+ if(!slurmdb_assoc->acct) {
debug("No account name given "
"in association.");
goto bad_user;
}
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name,
+ if(!strcasecmp(coord->name,
slurmdb_assoc->acct))
break;
}
list_iterator_destroy(itr);
- if (coord)
+ if(coord)
goto is_user;
bad_user:
@@ -798,7 +798,7 @@ _get_assoc_usage(pgsql_conn_t *pg_conn, uid_t uid,
is_user:
usage_table = assoc_day_table;
- if (set_usage_information(&usage_table, DBD_GET_ASSOC_USAGE,
+ if(set_usage_information(&usage_table, DBD_GET_ASSOC_USAGE,
&start, &end) != SLURM_SUCCESS)
return SLURM_ERROR;
@@ -812,10 +812,10 @@ is_user:
usage_table, assoc_table, assoc_table,
end, start, slurmdb_assoc->id);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
- if (!slurmdb_assoc->accounting_list)
+ if(!slurmdb_assoc->accounting_list)
slurmdb_assoc->accounting_list =
list_create(slurmdb_destroy_accounting_rec);
@@ -859,7 +859,7 @@ _get_wckey_usage(pgsql_conn_t *pg_conn, uid_t uid,
USAGE_COUNT
};
- if (!slurmdb_wckey->id) {
+ if(!slurmdb_wckey->id) {
error("We need an wckey id to set data for getting usage");
return SLURM_ERROR;
}
@@ -873,7 +873,7 @@ _get_wckey_usage(pgsql_conn_t *pg_conn, uid_t uid,
pg_conn, uid, SLURMDB_ADMIN_OPERATOR);
if (!is_admin) {
assoc_mgr_fill_in_user(pg_conn, &user, 1, NULL);
- if (! slurmdb_wckey->user ||
+ if(! slurmdb_wckey->user ||
strcmp(slurmdb_wckey->user, user.name)) {
errno = ESLURM_ACCESS_DENIED;
return SLURM_ERROR;
@@ -882,7 +882,7 @@ _get_wckey_usage(pgsql_conn_t *pg_conn, uid_t uid,
}
usage_table = wckey_day_table;
- if (set_usage_information(&usage_table, DBD_GET_WCKEY_USAGE,
+ if(set_usage_information(&usage_table, DBD_GET_WCKEY_USAGE,
&start, &end) != SLURM_SUCCESS) {
return SLURM_ERROR;
}
@@ -893,10 +893,10 @@ _get_wckey_usage(pgsql_conn_t *pg_conn, uid_t uid,
"AND id=%d ORDER BY id, period_start;",
usage_table, end, start, slurmdb_wckey->id);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
- if (!slurmdb_wckey->accounting_list)
+ if(!slurmdb_wckey->accounting_list)
slurmdb_wckey->accounting_list =
list_create(slurmdb_destroy_accounting_rec);
@@ -980,17 +980,17 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
RU_COUNT
};
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return ESLURM_DB_CONNECTION;
- if (!sent_start) {
+ if(!sent_start) {
query = xstrdup_printf("SELECT %s FROM %s LIMIT 1",
ru_fields, last_ran_table);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
- if (PQntuples(result)) {
+ if(PQntuples(result)) {
last_hour = atoi(PG_VAL(RU_HOUR));
last_day = atoi(PG_VAL(RU_DAY));
last_month = atoi(PG_VAL(RU_MONTH));
@@ -1000,7 +1000,7 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
PQclear(result);
query = xstrdup_printf("SELECT init_last_ran(%d);", now);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
last_hour = last_day = last_month =
atoi(PG_VAL(0));
@@ -1013,7 +1013,7 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
}
}
- if (!my_time)
+ if(!my_time)
my_time = time(NULL);
/* test month gap */
@@ -1032,11 +1032,11 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
// last_day = 1197033199;
// last_month = 1204358399;
- if (!localtime_r(&last_hour, &start_tm)) {
+ if(!localtime_r(&last_hour, &start_tm)) {
error("Couldn't get localtime from hour start %d", last_hour);
return SLURM_ERROR;
}
- if (!localtime_r(&my_time, &end_tm)) {
+ if(!localtime_r(&my_time, &end_tm)) {
error("Couldn't get localtime from hour end %d", my_time);
return SLURM_ERROR;
}
@@ -1065,14 +1065,14 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
global_last_rollup = end_time;
slurm_mutex_unlock(&rollup_lock);
- if (end_time-start_time > 0) {
+ if(end_time-start_time > 0) {
START_TIMER;
- if ((rc = pgsql_hourly_rollup(pg_conn, start_time, end_time))
+ if((rc = pgsql_hourly_rollup(pg_conn, start_time, end_time))
!= SLURM_SUCCESS)
return rc;
END_TIMER3("hourly_rollup", 5000000);
/* If we have a sent_end do not update the last_run_table */
- if (!sent_end)
+ if(!sent_end)
query = xstrdup_printf("UPDATE %s SET hourly_rollup=%d",
last_ran_table, end_time);
} else {
@@ -1081,7 +1081,7 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
}
- if (!localtime_r(&last_day, &start_tm)) {
+ if(!localtime_r(&last_day, &start_tm)) {
error("Couldn't get localtime from day %d", last_day);
return SLURM_ERROR;
}
@@ -1099,16 +1099,16 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
/* info("day end %s", ctime(&end_time)); */
/* info("diff is %d", end_time-start_time); */
- if (end_time-start_time > 0) {
+ if(end_time-start_time > 0) {
START_TIMER;
- if ((rc = pgsql_daily_rollup(pg_conn, start_time, end_time,
+ if((rc = pgsql_daily_rollup(pg_conn, start_time, end_time,
archive_data))
!= SLURM_SUCCESS)
return rc;
END_TIMER2("daily_rollup");
- if (query && !sent_end)
+ if(query && !sent_end)
xstrfmtcat(query, ", daily_rollup=%d", end_time);
- else if (!sent_end)
+ else if(!sent_end)
query = xstrdup_printf("UPDATE %s SET daily_rollup=%d",
last_ran_table, end_time);
} else {
@@ -1116,7 +1116,7 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
end_time, start_time);
}
- if (!localtime_r(&last_month, &start_tm)) {
+ if(!localtime_r(&last_month, &start_tm)) {
error("Couldn't get localtime from month %d", last_month);
return SLURM_ERROR;
}
@@ -1141,17 +1141,17 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
/* info("month end %s", ctime(&end_time)); */
/* info("diff is %d", end_time-start_time); */
- if (end_time-start_time > 0) {
+ if(end_time-start_time > 0) {
START_TIMER;
- if ((rc = pgsql_monthly_rollup(
+ if((rc = pgsql_monthly_rollup(
pg_conn, start_time, end_time, archive_data))
!= SLURM_SUCCESS)
return rc;
END_TIMER2("monthly_rollup");
- if (query && !sent_end)
+ if(query && !sent_end)
xstrfmtcat(query, ", monthly_rollup=%d", end_time);
- else if (!sent_end)
+ else if(!sent_end)
query = xstrdup_printf(
"UPDATE %s SET monthly_rollup=%d",
last_ran_table, end_time);
@@ -1160,7 +1160,7 @@ as_pg_roll_usage(pgsql_conn_t *pg_conn, time_t sent_start,
end_time, start_time);
}
- if (query) {
+ if(query) {
rc = DEF_QUERY_RET_RC;
}
return rc;
@@ -1193,19 +1193,19 @@ get_usage_for_assoc_list(pgsql_conn_t *pg_conn, List assoc_list,
USAGE_COUNT
};
- if (!assoc_list) {
+ if(!assoc_list) {
error("We need an object to set data for getting usage");
return SLURM_ERROR;
}
usage_table = assoc_day_table;
- if (set_usage_information(&usage_table, DBD_GET_ASSOC_USAGE,
+ if(set_usage_information(&usage_table, DBD_GET_ASSOC_USAGE,
&start, &end) != SLURM_SUCCESS) {
return SLURM_ERROR;
}
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
- if (id_str)
+ if(id_str)
xstrfmtcat(id_str, " OR t3.id=%d", assoc->id);
else
xstrfmtcat(id_str, "t3.id=%d", assoc->id);
@@ -1223,7 +1223,7 @@ get_usage_for_assoc_list(pgsql_conn_t *pg_conn, List assoc_list,
end, start, id_str);
xfree(id_str);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
usage_list = list_create(slurmdb_destroy_accounting_rec);
@@ -1241,16 +1241,16 @@ get_usage_for_assoc_list(pgsql_conn_t *pg_conn, List assoc_list,
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
int found = 0;
- if (!assoc->accounting_list)
+ if(!assoc->accounting_list)
assoc->accounting_list = list_create(
slurmdb_destroy_accounting_rec);
while((accounting_rec = list_next(u_itr))) {
- if (assoc->id == accounting_rec->id) {
+ if(assoc->id == accounting_rec->id) {
list_append(assoc->accounting_list,
accounting_rec);
list_remove(u_itr);
found = 1;
- } else if (found) {
+ } else if(found) {
/* here we know the
list is in id order so
if the next record
@@ -1269,7 +1269,7 @@ get_usage_for_assoc_list(pgsql_conn_t *pg_conn, List assoc_list,
list_iterator_destroy(itr);
list_iterator_destroy(u_itr);
- if (list_count(usage_list))
+ if(list_count(usage_list))
error("we have %d records not added "
"to the association list",
list_count(usage_list));
@@ -1304,20 +1304,20 @@ get_usage_for_wckey_list(pgsql_conn_t *pg_conn, List wckey_list,
USAGE_COUNT
};
- if (!wckey_list) {
+ if(!wckey_list) {
error("We need an object to set data for getting usage");
return SLURM_ERROR;
}
usage_table = wckey_day_table;
- if (set_usage_information(&usage_table, DBD_GET_WCKEY_USAGE,
+ if(set_usage_information(&usage_table, DBD_GET_WCKEY_USAGE,
&start, &end) != SLURM_SUCCESS) {
return SLURM_ERROR;
}
itr = list_iterator_create(wckey_list);
while((wckey = list_next(itr))) {
- if (id_str)
+ if(id_str)
xstrfmtcat(id_str, " OR id=%d", wckey->id);
else
xstrfmtcat(id_str, "id=%d", wckey->id);
@@ -1331,7 +1331,7 @@ get_usage_for_wckey_list(pgsql_conn_t *pg_conn, List wckey_list,
usage_table, end, start, id_str);
xfree(id_str);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
usage_list = list_create(slurmdb_destroy_accounting_rec);
@@ -1349,16 +1349,16 @@ get_usage_for_wckey_list(pgsql_conn_t *pg_conn, List wckey_list,
itr = list_iterator_create(wckey_list);
while((wckey = list_next(itr))) {
int found = 0;
- if (!wckey->accounting_list)
+ if(!wckey->accounting_list)
wckey->accounting_list = list_create(
slurmdb_destroy_accounting_rec);
while((accounting_rec = list_next(u_itr))) {
- if (wckey->id == accounting_rec->id) {
+ if(wckey->id == accounting_rec->id) {
list_append(wckey->accounting_list,
accounting_rec);
list_remove(u_itr);
found = 1;
- } else if (found) {
+ } else if(found) {
/* here we know the
list is in id order so
if the next record
@@ -1377,7 +1377,7 @@ get_usage_for_wckey_list(pgsql_conn_t *pg_conn, List wckey_list,
list_iterator_destroy(itr);
list_iterator_destroy(u_itr);
- if (list_count(usage_list))
+ if(list_count(usage_list))
error("we have %d records not added "
"to the wckey list",
list_count(usage_list));
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_user.c b/src/plugins/accounting_storage/pgsql/as_pg_user.c
index 64242a0269777c935f0dfc273bb76d28103c6f2f..3b34c63a5971528cac1e9996aaa983116e90c64d 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_user.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_user.c
@@ -163,7 +163,7 @@ _make_user_record(slurmdb_user_rec_t *object, time_t now, char **rec, char **txn
now, now, object->name, object->default_acct);
xstrfmtcat(*txn, "default_acct='%s'", object->default_acct);
- if (object->default_wckey) {
+ if(object->default_wckey) {
xstrfmtcat(*rec, ", '%s'", object->default_wckey);
xstrfmtcat(*txn, ", default_wckey='%s'",
object->default_wckey);
@@ -172,7 +172,7 @@ _make_user_record(slurmdb_user_rec_t *object, time_t now, char **rec, char **txn
xstrfmtcat(*rec, ", ''");
}
- if (object->admin_level != SLURMDB_ADMIN_NOTSET) {
+ if(object->admin_level != SLURMDB_ADMIN_NOTSET) {
xstrfmtcat(*rec, ", %u)", object->admin_level);
xstrfmtcat(*txn, ", admin_level=%u",
object->admin_level);
@@ -198,12 +198,12 @@ _get_user_coords(pgsql_conn_t *pg_conn, slurmdb_user_rec_t *user)
PGresult *result = NULL;
ListIterator itr = NULL;
- if (!user) {
+ if(!user) {
error("as/pg: _get_user_coord: user not given.");
return SLURM_ERROR;
}
- if (!user->coord_accts)
+ if(!user->coord_accts)
user->coord_accts = list_create(slurmdb_destroy_coord_rec);
query = xstrdup_printf(
@@ -218,7 +218,7 @@ _get_user_coords(pgsql_conn_t *pg_conn, slurmdb_user_rec_t *user)
list_append(user->coord_accts, coord);
coord->name = xstrdup(ROW(0));
coord->direct = 1;
- if (query)
+ if(query)
xstrcat(query, " OR ");
else
/* strict sub accounts */
@@ -233,21 +233,21 @@ _get_user_coords(pgsql_conn_t *pg_conn, slurmdb_user_rec_t *user)
} END_EACH_ROW;
PQclear(result);
- if (query) {
+ if(query) {
xstrcat(query, ");");
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
itr = list_iterator_create(user->coord_accts);
FOR_EACH_ROW {
char *acct = ROW(0);
while((coord = list_next(itr))) {
- if (!strcmp(coord->name, acct))
+ if(!strcmp(coord->name, acct))
break;
}
list_iterator_reset(itr);
- if (coord) /* already in list */
+ if(coord) /* already in list */
continue;
coord = xmalloc(sizeof(slurmdb_coord_rec_t));
@@ -271,13 +271,13 @@ _get_user_coords(pgsql_conn_t *pg_conn, slurmdb_user_rec_t *user)
static void
_make_user_cond(slurmdb_user_cond_t *user_cond, char **cond)
{
- if (user_cond->assoc_cond) {
+ if(user_cond->assoc_cond) {
concat_cond_list(user_cond->assoc_cond->user_list,
NULL, "name", cond);
}
concat_cond_list(user_cond->def_acct_list, NULL, "default_acct", cond);
concat_cond_list(user_cond->def_wckey_list, NULL, "default_wckey", cond);
- if (user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
+ if(user_cond->admin_level != SLURMDB_ADMIN_NOTSET) {
xstrfmtcat(*cond, " AND admin_level=%u", user_cond->admin_level);
}
}
@@ -330,7 +330,7 @@ as_pg_add_users(pgsql_conn_t *pg_conn, uint32_t uid, List user_list)
itr = list_iterator_create(user_list);
while((object = list_next(itr))) {
- if (!object->name || !object->default_acct) {
+ if(!object->name || !object->default_acct) {
error("as/pg: add_users: we need a user name and "
"default acct to add.");
rc = SLURM_ERROR;
@@ -341,18 +341,18 @@ as_pg_add_users(pgsql_conn_t *pg_conn, uint32_t uid, List user_list)
query = xstrdup_printf("SELECT add_user(%s);", rec);
xfree(rec);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add user %s", object->name);
xfree(info);
continue;
}
/* object moved to update_list, remove from user_list */
- if (addto_update_list(pg_conn->update_list, SLURMDB_ADD_USER,
+ if(addto_update_list(pg_conn->update_list, SLURMDB_ADD_USER,
object) == SLURM_SUCCESS)
list_remove(itr);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %u, '%s', '%s', $$%s$$)",
now, DBD_ADD_USERS, object->name,
@@ -367,20 +367,20 @@ as_pg_add_users(pgsql_conn_t *pg_conn, uint32_t uid, List user_list)
user_name, info);
xfree(info);
- if (object->assoc_list)
+ if(object->assoc_list)
list_transfer(assoc_list, object->assoc_list);
- if (object->wckey_list)
+ if(object->wckey_list)
list_transfer(wckey_list, object->wckey_list);
}
list_iterator_destroy(itr);
xfree(user_name);
- if (rc == SLURM_SUCCESS) {
- if (txn_query) {
+ if(rc == SLURM_SUCCESS) {
+ if(txn_query) {
xstrcat(txn_query, ";");
rc = pgsql_db_query(pg_conn->db_conn, txn_query);
xfree(txn_query);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
/* rc = SLURM_SUCCESS; */
}
@@ -388,8 +388,8 @@ as_pg_add_users(pgsql_conn_t *pg_conn, uint32_t uid, List user_list)
} else
xfree(txn_query);
- if (rc == SLURM_SUCCESS && list_count(assoc_list)) {
- if (acct_storage_p_add_associations(pg_conn, uid, assoc_list)
+ if(rc == SLURM_SUCCESS && list_count(assoc_list)) {
+ if(acct_storage_p_add_associations(pg_conn, uid, assoc_list)
== SLURM_ERROR) {
error("Problem adding user associations");
rc = SLURM_ERROR;
@@ -397,8 +397,8 @@ as_pg_add_users(pgsql_conn_t *pg_conn, uint32_t uid, List user_list)
}
list_destroy(assoc_list);
- if (rc == SLURM_SUCCESS && list_count(wckey_list)) {
- if (acct_storage_p_add_wckeys(pg_conn, uid, wckey_list)
+ if(rc == SLURM_SUCCESS && list_count(wckey_list)) {
+ if(acct_storage_p_add_wckeys(pg_conn, uid, wckey_list)
== SLURM_ERROR) {
error("Problem adding user wckeys");
rc = SLURM_ERROR;
@@ -429,23 +429,23 @@ as_pg_modify_users(pgsql_conn_t *pg_conn, uint32_t uid,
time_t now = time(NULL);
PGresult *result = NULL;
- if (!user_cond || !user) {
+ if(!user_cond || !user) {
error("as/pg: modify_users: we need something to change");
return NULL;
}
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
/* make condition string */
_make_user_cond(user_cond, &cond);
/* make value string */
- if (user->default_acct)
+ if(user->default_acct)
xstrfmtcat(vals, ", default_acct='%s'", user->default_acct);
- if (user->default_wckey)
+ if(user->default_wckey)
xstrfmtcat(vals, ", default_wckey='%s'", user->default_wckey);
- if (user->admin_level != SLURMDB_ADMIN_NOTSET)
+ if(user->admin_level != SLURMDB_ADMIN_NOTSET)
xstrfmtcat(vals, ", admin_level=%u", user->admin_level);
if (!cond || !vals) {
@@ -458,7 +458,7 @@ as_pg_modify_users(pgsql_conn_t *pg_conn, uint32_t uid,
user_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("as/pg: failed to retrieve users to modify");
xfree(vals);
return NULL;
@@ -486,7 +486,7 @@ as_pg_modify_users(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("didn't effect anything");
xfree(vals);
@@ -541,7 +541,7 @@ as_pg_remove_users(pgsql_conn_t *pg_conn, uint32_t uid,
/* make condition string */
_make_user_cond(user_cond, &cond);
- if (!cond) {
+ if(!cond) {
error("Nothing to remove");
return NULL;
}
@@ -550,7 +550,7 @@ as_pg_remove_users(pgsql_conn_t *pg_conn, uint32_t uid,
user_table, cond);
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("as/pg: remove_users: failed to get users to remove");
return NULL;
}
@@ -574,7 +574,7 @@ as_pg_remove_users(pgsql_conn_t *pg_conn, uint32_t uid,
list_append(ret_list, object);
list_append(assoc_cond.user_list, object);
- if (!rc) {
+ if(!rc) {
xstrfmtcat(name_char, "name='%s'", object);
xstrfmtcat(assoc_char, "t1.user_name='%s'", object);
rc = 1;
@@ -589,7 +589,7 @@ as_pg_remove_users(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: remove_users: nothing affected");
list_destroy(assoc_cond.user_list);
@@ -599,12 +599,12 @@ as_pg_remove_users(pgsql_conn_t *pg_conn, uint32_t uid,
/* remove these users from the coord table */
coord_list = acct_storage_p_remove_coord(pg_conn, uid, NULL,
&user_coord_cond);
- if (coord_list)
+ if(coord_list)
list_destroy(coord_list);
/* remove these users from the wckey table */
wckey_cond.user_list = assoc_cond.user_list;
coord_list = acct_storage_p_remove_wckeys(pg_conn, uid, &wckey_cond);
- if (coord_list)
+ if(coord_list)
list_destroy(coord_list);
list_destroy(assoc_cond.user_list);
@@ -627,7 +627,7 @@ as_pg_remove_users(pgsql_conn_t *pg_conn, uint32_t uid,
/* xfree(assoc_char); */
/* rc = pgsql_db_query(pg_conn->db_conn, query); */
/* xfree(query); */
-/* if (rc != SLURM_SUCCESS) { */
+/* if(rc != SLURM_SUCCESS) { */
/* error("Couldn't remove user coordinators"); */
/* list_destroy(ret_list); */
/* return NULL; */
@@ -677,11 +677,11 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
assoc_mgr_fill_in_user(pg_conn, &user, 1, NULL);
}
- if (!user_cond) {
+ if(!user_cond) {
xstrcat(cond, "WHERE deleted=0");
} else {
- if (user_cond->with_deleted)
+ if(user_cond->with_deleted)
xstrcat(cond, "WHERE (deleted=0 OR deleted=1)");
else
xstrcat(cond, "WHERE deleted=0");
@@ -689,7 +689,7 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
}
/* only get the requesting user if this flag is set */
- if (!is_admin && (private_data & PRIVATE_DATA_USERS)) {
+ if(!is_admin && (private_data & PRIVATE_DATA_USERS)) {
xstrfmtcat(cond, " AND name='%s'", user.name);
}
@@ -698,7 +698,7 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
xfree(cond);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return NULL;
user_list = list_create(slurmdb_destroy_user_rec);
@@ -708,7 +708,7 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
user->name = xstrdup(ROW(GU_NAME));
user->default_acct = xstrdup(ROW(GU_DEF_ACCT));
- if (! ISNULL(GU_DEF_WCKEY))
+ if(! ISNULL(GU_DEF_WCKEY))
user->default_wckey = xstrdup(ROW(GU_DEF_WCKEY));
else
user->default_wckey = xstrdup("");
@@ -718,13 +718,13 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
* different machine where this user may not exist or
* may have a different uid
*/
- if (user_cond && user_cond->with_coords)
+ if(user_cond && user_cond->with_coords)
_get_user_coords(pg_conn, user);
} END_EACH_ROW;
PQclear(result);
/* get associations for users */
- if (user_cond && user_cond->with_assocs) {
+ if(user_cond && user_cond->with_assocs) {
ListIterator assoc_itr = NULL;
slurmdb_user_rec_t *user = NULL;
slurmdb_association_rec_t *assoc = NULL;
@@ -733,16 +733,16 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
/* Make sure we don't get any non-user associations
* this is done by at least having a user_list
* defined */
- if (!user_cond->assoc_cond)
+ if(!user_cond->assoc_cond)
user_cond->assoc_cond =
xmalloc(sizeof(slurmdb_association_cond_t));
- if (!user_cond->assoc_cond->user_list)
+ if(!user_cond->assoc_cond->user_list)
user_cond->assoc_cond->user_list = list_create(NULL);
assoc_list = acct_storage_p_get_associations(
pg_conn, uid, user_cond->assoc_cond);
- if (!assoc_list) {
+ if(!assoc_list) {
error("as/pg: gt_users: no associations got");
goto get_wckeys;
}
@@ -751,10 +751,10 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
assoc_itr = list_iterator_create(assoc_list);
while((user = list_next(itr))) {
while((assoc = list_next(assoc_itr))) {
- if (strcmp(assoc->user, user->name))
+ if(strcmp(assoc->user, user->name))
continue;
- if (!user->assoc_list)
+ if(!user->assoc_list)
user->assoc_list = list_create(
slurmdb_destroy_association_rec);
list_append(user->assoc_list, assoc);
@@ -769,7 +769,7 @@ as_pg_get_users(pgsql_conn_t *pg_conn, uid_t uid, slurmdb_user_cond_t *user_cond
get_wckeys:
/* get wckey for users */
- if (user_cond && user_cond->with_wckeys) {
+ if(user_cond && user_cond->with_wckeys) {
ListIterator wckey_itr = NULL;
slurmdb_user_rec_t *user = NULL;
slurmdb_wckey_rec_t *wckey = NULL;
@@ -777,7 +777,7 @@ get_wckeys:
slurmdb_wckey_cond_t wckey_cond;
memset(&wckey_cond, 0, sizeof(slurmdb_wckey_cond_t));
- if (user_cond->assoc_cond) {
+ if(user_cond->assoc_cond) {
wckey_cond.user_list =
user_cond->assoc_cond->user_list;
wckey_cond.cluster_list =
@@ -786,7 +786,7 @@ get_wckeys:
wckey_list = acct_storage_p_get_wckeys(
pg_conn, uid, &wckey_cond);
- if (!wckey_list) {
+ if(!wckey_list) {
error("as/pg: get_users: no wckeys got");
return user_list;
}
@@ -795,10 +795,10 @@ get_wckeys:
wckey_itr = list_iterator_create(wckey_list);
while((user = list_next(itr))) {
while((wckey = list_next(wckey_itr))) {
- if (strcmp(wckey->user, user->name))
+ if(strcmp(wckey->user, user->name))
continue;
- if (!user->wckey_list)
+ if(!user->wckey_list)
user->wckey_list = list_create(
slurmdb_destroy_wckey_rec);
list_append(user->wckey_list, wckey);
@@ -834,7 +834,7 @@ as_pg_add_coord(pgsql_conn_t *pg_conn, uint32_t uid,
int rc = SLURM_SUCCESS;
slurmdb_user_rec_t *user_rec = NULL;
- if (!user_cond || !user_cond->assoc_cond
+ if(!user_cond || !user_cond->assoc_cond
|| !user_cond->assoc_cond->user_list
|| !list_count(user_cond->assoc_cond->user_list)
|| !acct_list || !list_count(acct_list)) {
@@ -856,12 +856,12 @@ as_pg_add_coord(pgsql_conn_t *pg_conn, uint32_t uid,
* acct, user_name
* CAST is required in ARRAY
*/
- if (vals)
+ if(vals)
xstrcat(vals, ", ");
xstrfmtcat(vals, "CAST((%d, %d, 0, '%s', '%s') AS %s)",
now, now, acct, user, acct_coord_table);
- if (txn_query)
+ if(txn_query)
xstrfmtcat(txn_query,
", (%d, %u, '%s', '%s', '%s')",
now, DBD_ADD_ACCOUNT_COORDS, user,
@@ -883,13 +883,13 @@ as_pg_add_coord(pgsql_conn_t *pg_conn, uint32_t uid,
list_iterator_destroy(itr);
list_iterator_destroy(itr2);
- if (vals) {
+ if(vals) {
xstrfmtcat(query, "SELECT add_coords(ARRAY[%s]); %s;",
vals, txn_query);
xfree(vals);
xfree(txn_query);
rc = DEF_QUERY_RET_RC;
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add account coordinator");
return rc;
}
@@ -932,10 +932,10 @@ as_pg_remove_coord(pgsql_conn_t *pg_conn, uint32_t uid,
List ret_list = NULL;
PGresult *result = NULL;
- if (!user_cond && !acct_list) {
+ if(!user_cond && !acct_list) {
error("as/pg: remove_coord: we need something to remove");
return NULL;
- } else if (user_cond && user_cond->assoc_cond)
+ } else if(user_cond && user_cond->assoc_cond)
user_list = user_cond->assoc_cond->user_list;
if (check_db_connection(pg_conn) != SLURM_SUCCESS)
@@ -953,7 +953,7 @@ as_pg_remove_coord(pgsql_conn_t *pg_conn, uint32_t uid,
concat_cond_list(user_list, NULL, "user_name", &cond);
concat_cond_list(acct_list, NULL, "acct", &cond);
- if (!cond) {
+ if(!cond) {
errno = SLURM_ERROR;
debug3("as/pg: remove_coord: No conditions given");
return NULL;
@@ -964,7 +964,7 @@ as_pg_remove_coord(pgsql_conn_t *pg_conn, uint32_t uid,
acct_coord_table, cond);
/* cond used below */
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
xfree(cond);
errno = SLURM_ERROR;
return NULL;
@@ -973,15 +973,15 @@ as_pg_remove_coord(pgsql_conn_t *pg_conn, uint32_t uid,
ret_list = list_create(slurm_destroy_char);
user_list = list_create(slurm_destroy_char);
FOR_EACH_ROW {
- if (!is_admin) {
+ if(!is_admin) {
slurmdb_coord_rec_t *coord = NULL;
itr = list_iterator_create(user.coord_accts);
while((coord = list_next(itr))) {
- if (!strcasecmp(coord->name, ROW(1)))
+ if(!strcasecmp(coord->name, ROW(1)))
break;
}
list_iterator_destroy(itr);
- if (!coord) {
+ if(!coord) {
error("as/pg: remove_coord: User %s(%d) does "
"not have the ability to change this "
"account (%s)",
@@ -995,7 +995,7 @@ as_pg_remove_coord(pgsql_conn_t *pg_conn, uint32_t uid,
}
}
/* record users affected */
- if (!last_user || strcasecmp(last_user, ROW(0))) {
+ if(!last_user || strcasecmp(last_user, ROW(0))) {
list_append(user_list, xstrdup(ROW(0)));
last_user = ROW(0);
}
@@ -1055,11 +1055,11 @@ get_user_no_assocs_or_no_uid(pgsql_conn_t *pg_conn,
query = xstrdup_printf("SELECT name FROM %s WHERE deleted=0",
user_table);
- if (assoc_q)
+ if(assoc_q)
concat_cond_list(assoc_q->user_list, NULL, "name", &query);
result = DEF_QUERY_RET;
- if (!result)
+ if(!result)
return SLURM_ERROR;
FOR_EACH_ROW {
@@ -1081,7 +1081,7 @@ get_user_no_assocs_or_no_uid(pgsql_conn_t *pg_conn,
"SELECT id FROM %s WHERE deleted=0 AND "
"user_name='%s' LIMIT 1;", assoc_table, name);
result2 = DEF_QUERY_RET;
- if (!result2) {
+ if(!result2) {
rc = SLURM_ERROR;
break;
}
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_wckey.c b/src/plugins/accounting_storage/pgsql/as_pg_wckey.c
index 6414edb8df71e038984785d5b07beef0555b81b9..e88c5eed38ef35f75109dd971e9c722b708ef3c0 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_wckey.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_wckey.c
@@ -149,7 +149,7 @@ as_pg_add_wckeys(pgsql_conn_t *pg_conn, uint32_t uid, List wckey_list)
user_name = uid_to_string((uid_t) uid);
itr = list_iterator_create(wckey_list);
while((object = list_next(itr))) {
- if (!object->cluster || !object->user) {
+ if(!object->cluster || !object->user) {
error("as/pg: add_wckeys: we need a wckey name, "
"cluster, and user to add.");
rc = SLURM_ERROR;
@@ -167,7 +167,7 @@ as_pg_add_wckeys(pgsql_conn_t *pg_conn, uint32_t uid, List wckey_list)
DEBUG_QUERY;
object->id = pgsql_query_ret_id(pg_conn->db_conn, query);
xfree(query);
- if (!object->id) {
+ if(!object->id) {
error("Couldn't add wckey %s", object->name);
added=0;
break;
@@ -180,10 +180,10 @@ as_pg_add_wckeys(pgsql_conn_t *pg_conn, uint32_t uid, List wckey_list)
user_name, info);
xfree(id_str);
xfree(info);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
error("Couldn't add txn");
} else {
- if (addto_update_list(pg_conn->update_list,
+ if(addto_update_list(pg_conn->update_list,
SLURMDB_ADD_WCKEY,
object) == SLURM_SUCCESS)
list_remove(itr);
@@ -193,8 +193,8 @@ as_pg_add_wckeys(pgsql_conn_t *pg_conn, uint32_t uid, List wckey_list)
list_iterator_destroy(itr);
xfree(user_name);
- if (!added) {
- if (pg_conn->rollback) {
+ if(!added) {
+ if(pg_conn->rollback) {
pgsql_db_rollback(pg_conn->db_conn);
}
list_flush(pg_conn->update_list);
@@ -239,7 +239,7 @@ as_pg_remove_wckeys(pgsql_conn_t *pg_conn, uint32_t uid,
char *user_name, *assoc_char = NULL;
time_t now = time(NULL);
- if (check_db_connection(pg_conn) != SLURM_SUCCESS)
+ if(check_db_connection(pg_conn) != SLURM_SUCCESS)
return NULL;
/* XXX: remove all wckeys if null condition given? */
@@ -273,13 +273,13 @@ as_pg_remove_wckeys(pgsql_conn_t *pg_conn, uint32_t uid,
FOR_EACH_ROW {
slurmdb_wckey_rec_t *wckey_rec = NULL;
list_append(ret_list, xstrdup(ROW(1)));
- if (!name_char)
+ if(!name_char)
xstrfmtcat(name_char, "id='%s'",
ROW(0));
else
xstrfmtcat(name_char, " OR id='%s'",
ROW(0));
- if (!assoc_char)
+ if(!assoc_char)
xstrfmtcat(assoc_char, "wckeyid='%s'",
ROW(0));
else
@@ -294,7 +294,7 @@ as_pg_remove_wckeys(pgsql_conn_t *pg_conn, uint32_t uid,
} END_EACH_ROW;
PQclear(result);
- if (!list_count(ret_list)) {
+ if(!list_count(ret_list)) {
errno = SLURM_NO_CHANGE_IN_DATA;
debug3("as/pg: remove_wckeys: didn't effect anything");
return ret_list;
@@ -355,7 +355,7 @@ as_pg_get_wckeys(pgsql_conn_t *pg_conn, uid_t uid,
is_admin = is_user_min_admin_level(
pg_conn, uid, SLURMDB_ADMIN_OPERATOR);
if (!is_admin) {
- if (assoc_mgr_fill_in_user(pg_conn, &user, 1, NULL)
+ if(assoc_mgr_fill_in_user(pg_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
error("as/pg: get_wckeys: failed get info "
"for user");
@@ -368,7 +368,7 @@ as_pg_get_wckeys(pgsql_conn_t *pg_conn, uid_t uid,
with_usage = wckey_cond->with_usage;
cond = _make_wckey_cond(wckey_cond);
}
- if (!is_admin && (private_data & PRIVATE_DATA_USERS))
+ if(!is_admin && (private_data & PRIVATE_DATA_USERS))
xstrfmtcat(cond, " AND user_name='%s'", user.name);
//START_TIMER;
@@ -377,7 +377,7 @@ as_pg_get_wckeys(pgsql_conn_t *pg_conn, uid_t uid,
gw_fields, wckey_table, cond ?: "");
xfree(cond);
result = DEF_QUERY_RET;
- if (!result) {
+ if(!result) {
error("as/pg: remove_wckeys: failed to get wckey");
return NULL;
}
@@ -391,7 +391,7 @@ as_pg_get_wckeys(pgsql_conn_t *pg_conn, uid_t uid,
wckey->user = xstrdup(ROW(GW_USER));
/* we want a blank wckey if the name is null */
- if (ROW(GW_NAME))
+ if(ROW(GW_NAME))
wckey->name = xstrdup(ROW(GW_NAME));
else
wckey->name = xstrdup("");
@@ -400,7 +400,7 @@ as_pg_get_wckeys(pgsql_conn_t *pg_conn, uid_t uid,
} END_EACH_ROW;
PQclear(result);
- if (with_usage && wckey_list) {
+ if(with_usage && wckey_list) {
get_usage_for_wckey_list(pg_conn, wckey_list,
wckey_cond->usage_start,
wckey_cond->usage_end);
@@ -442,18 +442,18 @@ get_wckeyid(pgsql_conn_t *pg_conn, char **name,
/* since we are unable to rely on uids here (someone could
not have there uid in the system yet) we must
first get the user name from the associd */
- if (!(user = get_user_from_associd(pg_conn, associd))) {
+ if(!(user = get_user_from_associd(pg_conn, associd))) {
error("No user for associd %u", associd);
return 0;
}
/* get the default key */
- if (!*name) {
+ if(!*name) {
slurmdb_user_rec_t user_rec;
memset(&user_rec, 0, sizeof(slurmdb_user_rec_t));
user_rec.uid = NO_VAL;
user_rec.name = user;
- if (assoc_mgr_fill_in_user(pg_conn, &user_rec,
+ if(assoc_mgr_fill_in_user(pg_conn, &user_rec,
1, NULL) != SLURM_SUCCESS) {
error("No user by name of %s assoc %u",
user, associd);
@@ -461,7 +461,7 @@ get_wckeyid(pgsql_conn_t *pg_conn, char **name,
goto no_wckeyid;
}
- if (user_rec.default_wckey)
+ if(user_rec.default_wckey)
*name = xstrdup_printf("*%s",
user_rec.default_wckey);
else
@@ -473,7 +473,7 @@ get_wckeyid(pgsql_conn_t *pg_conn, char **name,
wckey_rec.uid = NO_VAL;
wckey_rec.user = user;
wckey_rec.cluster = cluster;
- if (assoc_mgr_fill_in_wckey(pg_conn, &wckey_rec,
+ if(assoc_mgr_fill_in_wckey(pg_conn, &wckey_rec,
ACCOUNTING_ENFORCE_WCKEYS,
NULL) != SLURM_SUCCESS) {
List wckey_list = NULL;
@@ -492,7 +492,7 @@ get_wckeyid(pgsql_conn_t *pg_conn, char **name,
/* we have already checked to make
sure this was the slurm user before
calling this */
- if (acct_storage_p_add_wckeys(
+ if(acct_storage_p_add_wckeys(
pg_conn,
slurm_get_slurm_user_id(),
wckey_list)
diff --git a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
index a9ce42c1ee2778ddd3ea9f558ab0d8f36d428b23..ddf39cb732ee7a70f2d021e9871a9a2d62293c3f 100644
--- a/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
+++ b/src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
@@ -168,7 +168,7 @@ static int _setup_job_start_msg(dbd_job_start_msg_t *req,
#else
req->alloc_nodes = job_ptr->total_nodes;
#endif
- if (job_ptr->node_bitmap)
+ if(job_ptr->node_bitmap)
req->node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
job_ptr->node_bitmap);
req->alloc_cpus = job_ptr->total_cpus;
@@ -208,7 +208,7 @@ static void *_set_db_inx_thread(void *no_data)
slurm_mutex_lock(&db_inx_lock);
/* info("in lock db_thread"); */
running_db_inx = 1;
- if (!job_list) {
+ if(!job_list) {
error("No job list, exitting");
break;
}
@@ -222,10 +222,10 @@ static void *_set_db_inx_thread(void *no_data)
lock_slurmctld(job_read_lock);
itr = list_iterator_create(job_list);
while((job_ptr = list_next(itr))) {
- if (!job_ptr->db_index) {
+ if(!job_ptr->db_index) {
dbd_job_start_msg_t *req =
xmalloc(sizeof(dbd_job_start_msg_t));
- if (_setup_job_start_msg(req, job_ptr)
+ if(_setup_job_start_msg(req, job_ptr)
!= SLURM_SUCCESS) {
xfree(req);
continue;
@@ -234,7 +234,7 @@ static void *_set_db_inx_thread(void *no_data)
here not the contents so just do an
xfree on it.
*/
- if (!local_job_list)
+ if(!local_job_list)
local_job_list = list_create(
slurm_destroy_char);
list_append(local_job_list, req);
@@ -243,7 +243,7 @@ static void *_set_db_inx_thread(void *no_data)
list_iterator_destroy(itr);
unlock_slurmctld(job_read_lock);
- if (local_job_list) {
+ if(local_job_list) {
slurmdbd_msg_t req, resp;
dbd_list_msg_t send_msg, *got_msg;
int rc = SLURM_SUCCESS;
@@ -262,7 +262,7 @@ static void *_set_db_inx_thread(void *no_data)
"failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
} else
error("%s", msg->comment);
@@ -278,7 +278,7 @@ static void *_set_db_inx_thread(void *no_data)
lock_slurmctld(job_write_lock);
itr = list_iterator_create(got_msg->my_list);
while((id_ptr = list_next(itr))) {
- if ((job_ptr = find_job_record(
+ if((job_ptr = find_job_record(
id_ptr->job_id)))
job_ptr->db_index = id_ptr->id;
}
@@ -331,7 +331,7 @@ extern int init ( void )
verbose("%s loaded with AuthInfo=%s",
plugin_name, slurmdbd_auth_info);
- if (job_list) {
+ if(job_list) {
/* only do this when job_list is defined
(in the slurmctld)
*/
@@ -363,15 +363,15 @@ extern int init ( void )
extern int fini ( void )
{
- if (running_db_inx)
+ if(running_db_inx)
debug("Waiting for db_inx thread to finish.");
slurm_mutex_lock(&db_inx_lock);
/* cancel the db_inx thread and then join the cleanup thread */
- if (db_inx_handler_thread)
+ if(db_inx_handler_thread)
pthread_cancel(db_inx_handler_thread);
- if (cleanup_handler_thread)
+ if(cleanup_handler_thread)
pthread_join(cleanup_handler_thread, NULL);
slurm_mutex_unlock(&db_inx_lock);
@@ -384,10 +384,10 @@ extern int fini ( void )
extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
bool rollback, char *cluster_name)
{
- if (!slurmdbd_auth_info)
+ if(!slurmdbd_auth_info)
init();
- if (slurm_open_slurmdbd_conn(slurmdbd_auth_info,
+ if(slurm_open_slurmdbd_conn(slurmdbd_auth_info,
make_agent, rollback) == SLURM_SUCCESS)
errno = SLURM_SUCCESS;
/* send something back to make sure we don't run this again */
@@ -396,7 +396,7 @@ extern void *acct_storage_p_get_connection(bool make_agent, int conn_num,
extern int acct_storage_p_close_connection(void **db_conn)
{
- if (db_conn)
+ if(db_conn)
*db_conn = NULL;
return slurm_close_slurmdbd_conn();
}
@@ -417,7 +417,7 @@ extern int acct_storage_p_commit(void *db_conn, bool commit)
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -437,7 +437,7 @@ extern int acct_storage_p_add_users(void *db_conn, uint32_t uid, List user_list)
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -460,7 +460,7 @@ extern int acct_storage_p_add_coord(void *db_conn, uint32_t uid,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -480,7 +480,7 @@ extern int acct_storage_p_add_accts(void *db_conn, uint32_t uid, List acct_list)
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -502,7 +502,7 @@ extern int acct_storage_p_add_clusters(void *db_conn, uint32_t uid,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS) {
+ if(resp_code != SLURM_SUCCESS) {
rc = resp_code;
}
return rc;
@@ -523,7 +523,7 @@ extern int acct_storage_p_add_associations(void *db_conn, uint32_t uid,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -544,7 +544,7 @@ extern int acct_storage_p_add_qos(void *db_conn, uint32_t uid,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -565,7 +565,7 @@ extern int acct_storage_p_add_wckeys(void *db_conn, uint32_t uid,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -587,7 +587,7 @@ extern int acct_storage_p_add_reservation(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -615,7 +615,7 @@ extern List acct_storage_p_modify_users(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_MODIFY_USERS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -658,7 +658,7 @@ extern List acct_storage_p_modify_accts(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_MODIFY_ACCOUNTS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -703,7 +703,7 @@ extern List acct_storage_p_modify_clusters(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_MODIFY_CLUSTERS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -749,7 +749,7 @@ extern List acct_storage_p_modify_associations(
error("slurmdbd: DBD_MODIFY_ASSOCS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -792,7 +792,7 @@ extern List acct_storage_p_modify_qos(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_MODIFY_QOS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -835,7 +835,7 @@ extern List acct_storage_p_modify_wckeys(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_MODIFY_WCKEYS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -872,7 +872,7 @@ extern int acct_storage_p_modify_reservation(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -899,7 +899,7 @@ extern List acct_storage_p_remove_users(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_REMOVE_USERS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -945,7 +945,7 @@ extern List acct_storage_p_remove_coord(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_REMOVE_ACCOUNT_COORDS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -987,7 +987,7 @@ extern List acct_storage_p_remove_accts(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_REMOVE_ACCTS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1031,7 +1031,7 @@ extern List acct_storage_p_remove_clusters(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_REMOVE_CLUSTERS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1077,7 +1077,7 @@ extern List acct_storage_p_remove_associations(
error("slurmdbd: DBD_REMOVE_ASSOCS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1123,7 +1123,7 @@ extern List acct_storage_p_remove_qos(
error("slurmdbd: DBD_REMOVE_QOS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1167,7 +1167,7 @@ extern List acct_storage_p_remove_wckeys(
error("slurmdbd: DBD_REMOVE_WCKEYS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1204,7 +1204,7 @@ extern int acct_storage_p_remove_reservation(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
return rc;
@@ -1230,7 +1230,7 @@ extern List acct_storage_p_get_users(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_USERS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1271,7 +1271,7 @@ extern List acct_storage_p_get_accts(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_ACCOUNTS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1313,7 +1313,7 @@ extern List acct_storage_p_get_clusters(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_CLUSTERS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1350,7 +1350,7 @@ extern List acct_storage_p_get_config(void *db_conn)
error("slurmdbd: DBD_GET_CONFIG failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1391,7 +1391,7 @@ extern List acct_storage_p_get_associations(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_ASSOCS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1432,7 +1432,7 @@ extern List acct_storage_p_get_events(void *db_conn, uint32_t uid,
error("slurmdbd: DBD_GET_EVENTS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1473,7 +1473,7 @@ extern List acct_storage_p_get_problems(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_PROBS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1514,7 +1514,7 @@ extern List acct_storage_p_get_qos(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_QOS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1531,7 +1531,7 @@ extern List acct_storage_p_get_qos(void *db_conn, uid_t uid,
* multiple times, and if we send back and empty list
* instead of no list we will only call this once.
*/
- if (!got_msg->my_list)
+ if(!got_msg->my_list)
ret_list = list_create(NULL);
else
ret_list = got_msg->my_list;
@@ -1562,7 +1562,7 @@ extern List acct_storage_p_get_wckeys(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_WCKEYS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1579,7 +1579,7 @@ extern List acct_storage_p_get_wckeys(void *db_conn, uid_t uid,
* multiple times, and if we send back and empty list
* instead of no list we will only call this once.
*/
- if (!got_msg->my_list)
+ if(!got_msg->my_list)
ret_list = list_create(NULL);
else
ret_list = got_msg->my_list;
@@ -1611,7 +1611,7 @@ extern List acct_storage_p_get_reservations(
error("slurmdbd: DBD_GET_RESVS failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1628,7 +1628,7 @@ extern List acct_storage_p_get_reservations(
* multiple times, and if we send back and empty list
* instead of no list we will only call this once.
*/
- if (!got_msg->my_list)
+ if(!got_msg->my_list)
ret_list = list_create(NULL);
else
ret_list = got_msg->my_list;
@@ -1659,7 +1659,7 @@ extern List acct_storage_p_get_txn(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_TXN failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
ret_list = list_create(NULL);
} else {
@@ -1723,7 +1723,7 @@ extern int acct_storage_p_get_usage(void *db_conn, uid_t uid,
slurmdbd_msg_type_2_str(type, 1));
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
(*my_list) = list_create(NULL);
} else {
@@ -1786,7 +1786,7 @@ extern int acct_storage_p_roll_usage(void *db_conn,
rc = slurm_send_slurmdbd_recv_rc_msg(SLURMDBD_VERSION,
&req, &resp_code);
- if (resp_code != SLURM_SUCCESS)
+ if(resp_code != SLURM_SUCCESS)
rc = resp_code;
else
info("SUCCESS");
@@ -1906,7 +1906,7 @@ extern int jobacct_storage_p_job_start(void *db_conn,
dbd_id_rc_msg_t *resp;
int rc = SLURM_SUCCESS;
- if ((rc = _setup_job_start_msg(&req, job_ptr)) != SLURM_SUCCESS)
+ if((rc = _setup_job_start_msg(&req, job_ptr)) != SLURM_SUCCESS)
return rc;
msg.msg_type = DBD_JOB_START;
@@ -1917,13 +1917,13 @@ extern int jobacct_storage_p_job_start(void *db_conn,
* slurmdbd is down and we are about to remove the job from
* the system.
*/
- if ((req.db_index && !IS_JOB_RESIZING(job_ptr))
+ if((req.db_index && !IS_JOB_RESIZING(job_ptr))
|| (!req.db_index && IS_JOB_FINISHED(job_ptr))) {
/* This is to ensure we don't do this multiple times for the
same job. This can happen when an account is being
deleted and hense the associations dealing with it.
*/
- if (!req.db_index)
+ if(!req.db_index)
job_ptr->db_index = NO_VAL;
if (slurm_send_slurmdbd_msg(SLURMDBD_VERSION, &msg) < 0) {
@@ -2022,7 +2022,7 @@ extern int jobacct_storage_p_step_start(void *db_conn,
#ifdef HAVE_BG
char *ionodes = NULL;
- if (step_ptr->job_ptr->details)
+ if(step_ptr->job_ptr->details)
cpus = step_ptr->job_ptr->details->min_cpus;
else
cpus = step_ptr->job_ptr->cpu_cnt;
@@ -2070,13 +2070,13 @@ extern int jobacct_storage_p_step_start(void *db_conn,
req.job_id = step_ptr->job_ptr->job_id;
req.name = step_ptr->name;
req.nodes = node_list;
- if (step_ptr->step_node_bitmap) {
+ if(step_ptr->step_node_bitmap) {
req.node_inx = bit_fmt(temp_bit, sizeof(temp_bit),
step_ptr->step_node_bitmap);
}
req.node_cnt = nodes;
- if (step_ptr->start_time > step_ptr->job_ptr->resize_time)
+ if(step_ptr->start_time > step_ptr->job_ptr->resize_time)
req.start_time = step_ptr->start_time;
else
req.start_time = step_ptr->job_ptr->resize_time;
@@ -2115,7 +2115,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
#ifdef HAVE_BG
char *ionodes = NULL;
- if (step_ptr->job_ptr->details)
+ if(step_ptr->job_ptr->details)
cpus = step_ptr->job_ptr->details->min_cpus;
else
cpus = step_ptr->job_ptr->cpu_cnt;
@@ -2162,7 +2162,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
req.jobacct = step_ptr->jobacct;
req.job_id = step_ptr->job_ptr->job_id;
req.req_uid = step_ptr->requid;
- if (step_ptr->start_time > step_ptr->job_ptr->resize_time)
+ if(step_ptr->start_time > step_ptr->job_ptr->resize_time)
req.start_time = step_ptr->start_time;
else
req.start_time = step_ptr->job_ptr->resize_time;
@@ -2241,7 +2241,7 @@ extern List jobacct_storage_p_get_jobs_cond(void *db_conn, uid_t uid,
error("slurmdbd: DBD_GET_JOBS_COND failure: %m");
else if (resp.msg_type == DBD_RC) {
dbd_rc_msg_t *msg = resp.data;
- if (msg->return_code == SLURM_SUCCESS) {
+ if(msg->return_code == SLURM_SUCCESS) {
info("%s", msg->comment);
my_job_list = list_create(NULL);
} else {
@@ -2288,7 +2288,7 @@ extern int jobacct_storage_p_archive(void *db_conn,
dbd_rc_msg_t *msg = resp.data;
rc = msg->return_code;
- if (msg->return_code == SLURM_SUCCESS)
+ if(msg->return_code == SLURM_SUCCESS)
info("%s", msg->comment);
else {
slurm_seterrno(msg->return_code);
@@ -2323,7 +2323,7 @@ extern int jobacct_storage_p_archive_load(void *db_conn,
dbd_rc_msg_t *msg = resp.data;
rc = msg->return_code;
- if (msg->return_code == SLURM_SUCCESS)
+ if(msg->return_code == SLURM_SUCCESS)
info("%s", msg->comment);
else {
slurm_seterrno(msg->return_code);
diff --git a/src/plugins/auth/authd/auth_authd.c b/src/plugins/auth/authd/auth_authd.c
index 88906fcd8c5b0c4dd00d86bde9de794a6a7dc7ed..4c044eec341929985ea7716e50619d5f7dc39db3 100644
--- a/src/plugins/auth/authd/auth_authd.c
+++ b/src/plugins/auth/authd/auth_authd.c
@@ -306,7 +306,7 @@ slurm_auth_unpack( Buf buf )
}
safe_unpack32( &version, buf );
- if ( version < min_plug_version ) {
+ if( version < min_plug_version ) {
plugin_errno = SLURM_AUTH_VERSION;
return NULL;
}
diff --git a/src/plugins/job_submit/lua/job_submit_lua.c b/src/plugins/job_submit/lua/job_submit_lua.c
index 701c8aef5903f673fbe5e5420c9b184f769fd720..e5c432faeceea2aeadde52e4d0506e7a13c43981 100644
--- a/src/plugins/job_submit/lua/job_submit_lua.c
+++ b/src/plugins/job_submit/lua/job_submit_lua.c
@@ -242,7 +242,7 @@ static int _check_lua_script_functions()
i = 0;
do {
- if (_check_lua_script_function(fns[i]) < 0) {
+ if(_check_lua_script_function(fns[i]) < 0) {
error("job_submit/lua: %s: "
"missing required function %s",
lua_script_path, fns[i]);
@@ -502,7 +502,7 @@ int init (void)
*/
rc = (int) lua_tonumber(L, -1);
lua_pop (L, 1);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
return rc;
/*
diff --git a/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c b/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c
index 6526d92d3b09b45688d3c01319b4145783e1e52b..cb6373db639049083ce3cba7c8eed3cec55470c8 100644
--- a/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c
+++ b/src/plugins/jobacct_gather/aix/jobacct_gather_aix.c
@@ -198,12 +198,12 @@ static void _get_process_data(void)
ListIterator itr;
ListIterator itr2;
- if (!pgid_plugin && cont_id == (uint32_t)NO_VAL) {
+ if(!pgid_plugin && cont_id == (uint32_t)NO_VAL) {
debug("cont_id hasn't been set yet not running poll");
return;
}
- if (processing) {
+ if(processing) {
debug("already running, returning");
return;
}
@@ -211,16 +211,16 @@ static void _get_process_data(void)
processing = 1;
prec_list = list_create(_destroy_prec);
- if (!pgid_plugin) {
+ if(!pgid_plugin) {
/* get only the processes in the proctrack container */
slurm_container_get_pids(cont_id, &pids, &npids);
- if (!npids) {
+ if(!npids) {
debug4("no pids in this container %d", cont_id);
goto finished;
}
for (i = 0; i < npids; i++) {
pid = pids[i];
- if (!getprocs(&proc, sizeof(proc), 0, 0, &pid, 1))
+ if(!getprocs(&proc, sizeof(proc), 0, 0, &pid, 1))
continue; /* Assume the process went away */
prec = xmalloc(sizeof(prec_t));
list_append(prec_list, prec);
@@ -259,11 +259,11 @@ static void _get_process_data(void)
/* prec->vsize, proc.pi_tsize, proc.pi_dvm, pagesize); */
}
}
- if (!list_count(prec_list))
+ if(!list_count(prec_list))
goto finished;
slurm_mutex_lock(&jobacct_lock);
- if (!task_list || !list_count(task_list)) {
+ if(!task_list || !list_count(task_list)) {
slurm_mutex_unlock(&jobacct_lock);
goto finished;
}
@@ -368,7 +368,7 @@ static void *_watch_tasks(void *arg)
{
while(!jobacct_shutdown) { /* Do this until shutdown is requested */
- if (!jobacct_suspended) {
+ if(!jobacct_suspended) {
_get_process_data(); /* Update the data */
}
sleep(freq);
@@ -393,7 +393,7 @@ static void _destroy_prec(void *object)
extern int init ( void )
{
char *temp = slurm_get_proctrack_type();
- if (!strcasecmp(temp, "proctrack/pgid")) {
+ if(!strcasecmp(temp, "proctrack/pgid")) {
info("WARNING: We will use a much slower algorithm with "
"proctrack/pgid, use Proctracktype=proctrack/aix "
"with %s", plugin_name);
@@ -401,7 +401,7 @@ extern int init ( void )
}
xfree(temp);
temp = slurm_get_accounting_storage_type();
- if (!strcasecmp(temp, ACCOUNTING_STORAGE_TYPE_NONE)) {
+ if(!strcasecmp(temp, ACCOUNTING_STORAGE_TYPE_NONE)) {
error("WARNING: Even though we are collecting accounting "
"information you have asked for it not to be stored "
"(%s) if this is not what you have in mind you will "
@@ -511,7 +511,7 @@ extern int jobacct_gather_p_endpoll()
{
#ifdef HAVE_AIX
slurm_mutex_lock(&jobacct_lock);
- if (task_list)
+ if(task_list)
list_destroy(task_list);
task_list = NULL;
slurm_mutex_unlock(&jobacct_lock);
@@ -524,7 +524,7 @@ extern int jobacct_gather_p_endpoll()
extern void jobacct_gather_p_change_poll(uint16_t frequency)
{
#ifdef HAVE_AIX
- if (freq == 0 && frequency != 0) {
+ if(freq == 0 && frequency != 0) {
pthread_attr_t attr;
pthread_t _watch_tasks_thread_id;
/* create polling thread */
@@ -563,14 +563,14 @@ extern void jobacct_gather_p_resume_poll()
extern int jobacct_gather_p_set_proctrack_container_id(uint32_t id)
{
- if (pgid_plugin)
+ if(pgid_plugin)
return SLURM_SUCCESS;
- if (cont_id != (uint32_t)NO_VAL)
+ if(cont_id != (uint32_t)NO_VAL)
info("Warning: jobacct: set_proctrack_container_id: "
"cont_id is already set to %d you are setting it to %d",
cont_id, id);
- if (id <= 0) {
+ if(id <= 0) {
error("jobacct: set_proctrack_container_id: "
"I was given most likely an unset cont_id %d",
id);
@@ -591,7 +591,7 @@ extern struct jobacctinfo *jobacct_gather_p_stat_task(pid_t pid)
#ifdef HAVE_AIX
_get_process_data();
#endif
- if (pid)
+ if(pid)
return jobacct_common_stat_task(pid, task_list);
else
return NULL;
diff --git a/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c b/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c
index 89324312f143bff6f4921f70cfa2464977a7d8be..6b95dda14d2b100bb2d647d7e4f2061b7199b438 100644
--- a/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c
+++ b/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c
@@ -193,12 +193,12 @@ static void _get_process_data(void)
static int processing = 0;
long hertz;
- if (!pgid_plugin && cont_id == (uint32_t)NO_VAL) {
+ if(!pgid_plugin && cont_id == (uint32_t)NO_VAL) {
debug("cont_id hasn't been set yet not running poll");
return;
}
- if (processing) {
+ if(processing) {
debug("already running, returning");
return;
}
@@ -211,10 +211,10 @@ static void _get_process_data(void)
hertz = 100; /* default on many systems */
}
- if (!pgid_plugin) {
+ if(!pgid_plugin) {
/* get only the processes in the proctrack container */
slurm_container_get_pids(cont_id, &pids, &npids);
- if (!npids) {
+ if(!npids) {
debug4("no pids in this container %d", cont_id);
goto finished;
}
@@ -271,14 +271,14 @@ static void _get_process_data(void)
iptr = slash_proc_entry->d_name;
i = 0;
do {
- if ((*iptr < '0')
+ if((*iptr < '0')
|| ((*optr++ = *iptr++) > '9')) {
i = -1;
break;
}
} while (*iptr);
- if (i == -1)
+ if(i == -1)
continue;
iptr = (char*)"/stat";
@@ -318,7 +318,7 @@ static void _get_process_data(void)
}
slurm_mutex_lock(&jobacct_lock);
- if (!task_list || !list_count(task_list)) {
+ if(!task_list || !list_count(task_list)) {
slurm_mutex_unlock(&jobacct_lock);
goto finished;
}
@@ -543,7 +543,7 @@ static void *_watch_tasks(void *arg)
_task_sleep(1);
while(!jobacct_shutdown) { /* Do this until shutdown is requested */
- if (!jobacct_suspended) {
+ if(!jobacct_suspended) {
_get_process_data(); /* Update the data */
}
_task_sleep(freq);
@@ -566,7 +566,7 @@ static void _destroy_prec(void *object)
extern int init ( void )
{
char *temp = slurm_get_proctrack_type();
- if (!strcasecmp(temp, "proctrack/pgid")) {
+ if(!strcasecmp(temp, "proctrack/pgid")) {
info("WARNING: We will use a much slower algorithm with "
"proctrack/pgid, use Proctracktype=proctrack/linuxproc "
"or Proctracktype=proctrack/rms with %s",
@@ -575,7 +575,7 @@ extern int init ( void )
}
xfree(temp);
temp = slurm_get_accounting_storage_type();
- if (!strcasecmp(temp, ACCOUNTING_STORAGE_TYPE_NONE)) {
+ if(!strcasecmp(temp, ACCOUNTING_STORAGE_TYPE_NONE)) {
error("WARNING: Even though we are collecting accounting "
"information you have asked for it not to be stored "
"(%s) if this is not what you have in mind you will "
@@ -680,7 +680,7 @@ extern int jobacct_gather_p_startpoll(uint16_t frequency)
extern int jobacct_gather_p_endpoll()
{
slurm_mutex_lock(&jobacct_lock);
- if (task_list)
+ if(task_list)
list_destroy(task_list);
task_list = NULL;
slurm_mutex_unlock(&jobacct_lock);
@@ -698,7 +698,7 @@ extern int jobacct_gather_p_endpoll()
extern void jobacct_gather_p_change_poll(uint16_t frequency)
{
- if (freq == 0 && frequency != 0) {
+ if(freq == 0 && frequency != 0) {
pthread_attr_t attr;
pthread_t _watch_tasks_thread_id;
/* create polling thread */
@@ -738,14 +738,14 @@ extern void jobacct_gather_p_resume_poll()
extern int jobacct_gather_p_set_proctrack_container_id(uint32_t id)
{
- if (pgid_plugin)
+ if(pgid_plugin)
return SLURM_SUCCESS;
- if (cont_id != (uint32_t)NO_VAL)
+ if(cont_id != (uint32_t)NO_VAL)
info("Warning: jobacct: set_proctrack_container_id: "
"cont_id is already set to %d you are setting it to %d",
cont_id, id);
- if (id <= 0) {
+ if(id <= 0) {
error("jobacct: set_proctrack_container_id: "
"I was given most likely an unset cont_id %d",
id);
@@ -764,7 +764,7 @@ extern int jobacct_gather_p_add_task(pid_t pid, jobacct_id_t *jobacct_id)
extern struct jobacctinfo *jobacct_gather_p_stat_task(pid_t pid)
{
- if (pid) {
+ if(pid) {
_get_process_data();
return jobacct_common_stat_task(pid, task_list);
} else {
diff --git a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
index 7a7242d94db5359f3de7898702d650e8ff3117ef..014decb0f763d9ffb9b6a0672f747a0db1bd79d0 100644
--- a/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
+++ b/src/plugins/jobcomp/filetxt/filetxt_jobcomp_process.c
@@ -59,7 +59,7 @@ static void _destroy_filetxt_jobcomp_info(void *object)
{
filetxt_jobcomp_info_t *jobcomp_info =
(filetxt_jobcomp_info_t *)object;
- if (jobcomp_info) {
+ if(jobcomp_info) {
xfree(jobcomp_info);
}
}
@@ -106,22 +106,22 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
itr = list_iterator_create(job_info_list);
while((jobcomp_info = list_next(itr))) {
- if (!strcasecmp("JobID", jobcomp_info->name)) {
+ if(!strcasecmp("JobID", jobcomp_info->name)) {
job->jobid = atoi(jobcomp_info->val);
- } else if (!strcasecmp("Partition", jobcomp_info->name)) {
+ } else if(!strcasecmp("Partition", jobcomp_info->name)) {
job->partition = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("StartTime", jobcomp_info->name)) {
+ } else if(!strcasecmp("StartTime", jobcomp_info->name)) {
job->start_time = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("EndTime", jobcomp_info->name)) {
+ } else if(!strcasecmp("EndTime", jobcomp_info->name)) {
job->end_time = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("Userid", jobcomp_info->name)) {
+ } else if(!strcasecmp("Userid", jobcomp_info->name)) {
temp = strstr(jobcomp_info->val, "(");
- if (!temp)
+ if(!temp)
job->uid = atoi(jobcomp_info->val);
*temp++ = 0;
temp2 = temp;
temp = strstr(temp, ")");
- if (!temp) {
+ if(!temp) {
error("problem getting correct uid from %s",
jobcomp_info->val);
} else {
@@ -129,14 +129,14 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
job->uid = atoi(temp2);
job->uid_name = xstrdup(jobcomp_info->val);
}
- } else if (!strcasecmp("GroupId", jobcomp_info->name)) {
+ } else if(!strcasecmp("GroupId", jobcomp_info->name)) {
temp = strstr(jobcomp_info->val, "(");
- if (!temp)
+ if(!temp)
job->gid = atoi(jobcomp_info->val);
*temp++ = 0;
temp2 = temp;
temp = strstr(temp, ")");
- if (!temp) {
+ if(!temp) {
error("problem getting correct gid from %s",
jobcomp_info->val);
} else {
@@ -144,31 +144,31 @@ static jobcomp_job_rec_t *_parse_line(List job_info_list)
job->gid = atoi(temp2);
job->gid_name = xstrdup(jobcomp_info->val);
}
- } else if (!strcasecmp("Name", jobcomp_info->name)) {
+ } else if(!strcasecmp("Name", jobcomp_info->name)) {
job->jobname = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("NodeList", jobcomp_info->name)) {
+ } else if(!strcasecmp("NodeList", jobcomp_info->name)) {
job->nodelist = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("NodeCnt", jobcomp_info->name)) {
+ } else if(!strcasecmp("NodeCnt", jobcomp_info->name)) {
job->node_cnt = atoi(jobcomp_info->val);
- } else if (!strcasecmp("JobState", jobcomp_info->name)) {
+ } else if(!strcasecmp("JobState", jobcomp_info->name)) {
job->state = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("Timelimit", jobcomp_info->name)) {
+ } else if(!strcasecmp("Timelimit", jobcomp_info->name)) {
job->timelimit = xstrdup(jobcomp_info->val);
}
#ifdef HAVE_BG
- else if (!strcasecmp("MaxProcs", jobcomp_info->name)) {
+ else if(!strcasecmp("MaxProcs", jobcomp_info->name)) {
job->max_procs = atoi(jobcomp_info->val);
- } else if (!strcasecmp("Block_Id", jobcomp_info->name)) {
+ } else if(!strcasecmp("Block_Id", jobcomp_info->name)) {
job->blockid = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("Connection", jobcomp_info->name)) {
+ } else if(!strcasecmp("Connection", jobcomp_info->name)) {
job->connection = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("reboot", jobcomp_info->name)) {
+ } else if(!strcasecmp("reboot", jobcomp_info->name)) {
job->reboot = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("rotate", jobcomp_info->name)) {
+ } else if(!strcasecmp("rotate", jobcomp_info->name)) {
job->rotate = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("geometry", jobcomp_info->name)) {
+ } else if(!strcasecmp("geometry", jobcomp_info->name)) {
job->geo = xstrdup(jobcomp_info->val);
- } else if (!strcasecmp("start", jobcomp_info->name)) {
+ } else if(!strcasecmp("start", jobcomp_info->name)) {
job->bg_start_point = xstrdup(jobcomp_info->val);
}
#endif
@@ -204,7 +204,7 @@ extern List filetxt_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
add this extra field to the structure since it only applies
to this plugin.
*/
- if (job_cond) {
+ if(job_cond) {
fdump_flag = job_cond->duplicates & FDUMP_FLAG;
job_cond->duplicates &= (~FDUMP_FLAG);
}
@@ -216,7 +216,7 @@ extern List filetxt_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
lc++;
fptr = line; /* break the record into NULL-
terminated strings */
- if (job_info_list)
+ if(job_info_list)
list_destroy(job_info_list);
jobid = 0;
partition = NULL;
@@ -230,21 +230,21 @@ extern List filetxt_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
*fptr++ = 0;
jobcomp_info->val = fptr;
fptr = strstr(fptr, " ");
- if (!strcasecmp("JobId", jobcomp_info->name))
+ if(!strcasecmp("JobId", jobcomp_info->name))
jobid = atoi(jobcomp_info->val);
- else if (!strcasecmp("Partition",
+ else if(!strcasecmp("Partition",
jobcomp_info->name))
partition = jobcomp_info->val;
- if (!fptr) {
+ if(!fptr) {
fptr = strstr(jobcomp_info->val, "\n");
if (fptr)
*fptr = 0;
break;
} else {
*fptr++ = 0;
- if (*fptr == '\n') {
+ if(*fptr == '\n') {
*fptr = 0;
break;
}
@@ -252,7 +252,7 @@ extern List filetxt_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
}
if (job_cond->step_list && list_count(job_cond->step_list)) {
- if (!jobid)
+ if(!jobid)
continue;
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
@@ -269,7 +269,7 @@ extern List filetxt_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
if (job_cond->partition_list
&& list_count(job_cond->partition_list)) {
- if (!partition)
+ if(!partition)
continue;
itr = list_iterator_create(job_cond->partition_list);
while((selected_part = list_next(itr)))
@@ -290,11 +290,11 @@ extern List filetxt_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
job = _parse_line(job_info_list);
- if (job)
+ if(job)
list_append(job_list, job);
}
- if (job_info_list)
+ if(job_info_list)
list_destroy(job_info_list);
if (ferror(fd)) {
diff --git a/src/plugins/jobcomp/mysql/jobcomp_mysql.c b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
index 0f90011ad6b95681b948741ab4e91468a4536725..0ae69e3452c6d241bfd50553c10467c641817715 100644
--- a/src/plugins/jobcomp/mysql/jobcomp_mysql.c
+++ b/src/plugins/jobcomp/mysql/jobcomp_mysql.c
@@ -131,7 +131,7 @@ static mysql_db_info_t *_mysql_jobcomp_create_db_info()
{
mysql_db_info_t *db_info = xmalloc(sizeof(mysql_db_info_t));
db_info->port = slurm_get_jobcomp_port();
- if (!db_info->port) {
+ if(!db_info->port) {
db_info->port = DEFAULT_MYSQL_PORT;
slurm_set_jobcomp_port(db_info->port);
}
@@ -143,7 +143,7 @@ static mysql_db_info_t *_mysql_jobcomp_create_db_info()
static int _mysql_jobcomp_check_tables()
{
- if (mysql_db_create_table(jobcomp_mysql_db, jobcomp_table,
+ if(mysql_db_create_table(jobcomp_mysql_db, jobcomp_table,
jobcomp_table_fields, ")") == SLURM_ERROR)
return SLURM_ERROR;
@@ -217,7 +217,7 @@ extern int init ( void )
{
static int first = 1;
- if (first) {
+ if(first) {
/* since this can be loaded from many different places
only tell us once. */
verbose("%s loaded", plugin_name);
@@ -245,14 +245,14 @@ extern int slurm_jobcomp_set_location(char *location)
char *db_name = NULL;
int i = 0;
- if (jobcomp_mysql_db && mysql_ping(jobcomp_mysql_db) == 0)
+ if(jobcomp_mysql_db && mysql_ping(jobcomp_mysql_db) == 0)
return SLURM_SUCCESS;
- if (!location)
+ if(!location)
db_name = DEFAULT_JOB_COMP_DB;
else {
while(location[i]) {
- if (location[i] == '.' || location[i] == '/') {
+ if(location[i] == '.' || location[i] == '/') {
debug("%s doesn't look like a database "
"name using %s",
location, DEFAULT_JOB_COMP_DB);
@@ -260,7 +260,7 @@ extern int slurm_jobcomp_set_location(char *location)
}
i++;
}
- if (location[i])
+ if(location[i])
db_name = DEFAULT_JOB_COMP_DB;
else
db_name = location;
@@ -274,7 +274,7 @@ extern int slurm_jobcomp_set_location(char *location)
destroy_mysql_db_info(db_info);
- if (rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
debug("Jobcomp database init finished");
else
debug("Jobcomp database init failed");
@@ -292,9 +292,9 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
char *query = NULL;
uint32_t time_limit, start_time, end_time;
- if (!jobcomp_mysql_db || mysql_ping(jobcomp_mysql_db) != 0) {
+ if(!jobcomp_mysql_db || mysql_ping(jobcomp_mysql_db) != 0) {
char *loc = slurm_get_jobcomp_loc();
- if (slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
+ if(slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
xfree(loc);
return SLURM_ERROR;
}
@@ -357,21 +357,21 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
"starttime, endtime, nodecnt",
jobcomp_table);
- if (job_ptr->nodes)
+ if(job_ptr->nodes)
xstrcat(query, ", nodelist");
- if (connect_type)
+ if(connect_type)
xstrcat(query, ", connect_type");
- if (reboot)
+ if(reboot)
xstrcat(query, ", reboot");
- if (rotate)
+ if(rotate)
xstrcat(query, ", rotate");
- if (job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
+ if(job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
xstrcat(query, ", maxprocs");
- if (geometry)
+ if(geometry)
xstrcat(query, ", geometry");
- if (start)
+ if(start)
xstrcat(query, ", start");
- if (blockid)
+ if(blockid)
xstrcat(query, ", blockid");
xstrfmtcat(query, ") values (%u, %u, '%s', %u, '%s', \"%s\", %d, %u, "
"'%s', \"%s\", %u, %u, %u",
@@ -380,33 +380,33 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
job_state, job_ptr->total_cpus, job_ptr->partition, lim_str,
start_time, end_time, job_ptr->node_cnt);
- if (job_ptr->nodes)
+ if(job_ptr->nodes)
xstrfmtcat(query, ", '%s'", job_ptr->nodes);
- if (connect_type) {
+ if(connect_type) {
xstrfmtcat(query, ", '%s'", connect_type);
xfree(connect_type);
}
- if (reboot) {
+ if(reboot) {
xstrfmtcat(query, ", '%s'", reboot);
xfree(reboot);
}
- if (rotate) {
+ if(rotate) {
xstrfmtcat(query, ", '%s'", rotate);
xfree(rotate);
}
- if (job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
+ if(job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
xstrfmtcat(query, ", '%u'", job_ptr->details->max_cpus);
- if (geometry) {
+ if(geometry) {
xstrfmtcat(query, ", '%s'", geometry);
xfree(geometry);
}
- if (start) {
+ if(start) {
xstrfmtcat(query, ", '%s'", start);
xfree(start);
}
- if (blockid) {
+ if(blockid) {
xstrfmtcat(query, ", '%s'", blockid);
xfree(blockid);
}
@@ -439,9 +439,9 @@ extern List slurm_jobcomp_get_jobs(slurmdb_job_cond_t *job_cond)
{
List job_list = NULL;
- if (!jobcomp_mysql_db || mysql_ping(jobcomp_mysql_db) != 0) {
+ if(!jobcomp_mysql_db || mysql_ping(jobcomp_mysql_db) != 0) {
char *loc = slurm_get_jobcomp_loc();
- if (slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
+ if(slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
xfree(loc);
return job_list;
}
@@ -458,9 +458,9 @@ extern List slurm_jobcomp_get_jobs(slurmdb_job_cond_t *job_cond)
*/
extern int slurm_jobcomp_archive(slurmdb_archive_cond_t *arch_cond)
{
- if (!jobcomp_mysql_db || mysql_ping(jobcomp_mysql_db) != 0) {
+ if(!jobcomp_mysql_db || mysql_ping(jobcomp_mysql_db) != 0) {
char *loc = slurm_get_jobcomp_loc();
- if (slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
+ if(slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
xfree(loc);
return SLURM_ERROR;
}
diff --git a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
index e682faabdc27a4ac6363b28598dd35ca0a736438..e4ea2b40dd249263e7b17d53fd7f7fc2f2270baf 100644
--- a/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
+++ b/src/plugins/jobcomp/mysql/mysql_jobcomp_process.c
@@ -83,17 +83,17 @@ extern List mysql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
add this extra field to the structure since it only applies
to this plugin.
*/
- if (job_cond) {
+ if(job_cond) {
fdump_flag = job_cond->duplicates & FDUMP_FLAG;
job_cond->duplicates &= (~FDUMP_FLAG);
}
- if (job_cond->step_list && list_count(job_cond->step_list)) {
+ if(job_cond->step_list && list_count(job_cond->step_list)) {
set = 0;
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("jobid=%d",
selected_step->jobid);
@@ -105,16 +105,16 @@ extern List mysql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
xstrcat(extra, ")");
}
- if (job_cond->partition_list && list_count(job_cond->partition_list)) {
+ if(job_cond->partition_list && list_count(job_cond->partition_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->partition_list);
while((selected_part = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("partition='%s'",
selected_part);
@@ -128,7 +128,7 @@ extern List mysql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
i = 0;
while(jobcomp_table_fields[i].name) {
- if (i)
+ if(i)
xstrcat(tmp, ", ");
xstrcat(tmp, jobcomp_table_fields[i].name);
i++;
@@ -137,13 +137,13 @@ extern List mysql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
query = xstrdup_printf("select %s from %s", tmp, jobcomp_table);
xfree(tmp);
- if (extra) {
+ if(extra) {
xstrcat(query, extra);
xfree(extra);
}
//info("query = %s", query);
- if (!(result =
+ if(!(result =
mysql_db_query_ret(jobcomp_mysql_db, query, 0))) {
xfree(query);
list_destroy(job_list);
@@ -159,7 +159,7 @@ extern List mysql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
continue;
}
job = xmalloc(sizeof(jobcomp_job_rec_t));
- if (row[JOBCOMP_REQ_JOBID])
+ if(row[JOBCOMP_REQ_JOBID])
job->jobid = atoi(row[JOBCOMP_REQ_JOBID]);
job->partition = xstrdup(row[JOBCOMP_REQ_PARTITION]);
temp_time = atoi(row[JOBCOMP_REQ_STARTTIME]);
@@ -174,22 +174,22 @@ extern List mysql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
sizeof(time_str));
job->end_time = xstrdup(time_str);
- if (row[JOBCOMP_REQ_UID])
+ if(row[JOBCOMP_REQ_UID])
job->uid = atoi(row[JOBCOMP_REQ_UID]);
job->uid_name = xstrdup(row[JOBCOMP_REQ_USER_NAME]);
- if (row[JOBCOMP_REQ_GID])
+ if(row[JOBCOMP_REQ_GID])
job->gid = atoi(row[JOBCOMP_REQ_GID]);
job->gid_name = xstrdup(row[JOBCOMP_REQ_GROUP_NAME]);
job->jobname = xstrdup(row[JOBCOMP_REQ_NAME]);
job->nodelist = xstrdup(row[JOBCOMP_REQ_NODELIST]);
- if (row[JOBCOMP_REQ_NODECNT])
+ if(row[JOBCOMP_REQ_NODECNT])
job->node_cnt = atoi(row[JOBCOMP_REQ_NODECNT]);
- if (row[JOBCOMP_REQ_STATE]) {
+ if(row[JOBCOMP_REQ_STATE]) {
i = atoi(row[JOBCOMP_REQ_STATE]);
job->state = xstrdup(job_state_string(i));
}
job->timelimit = xstrdup(row[JOBCOMP_REQ_TIMELIMIT]);
- if (row[JOBCOMP_REQ_MAXPROCS])
+ if(row[JOBCOMP_REQ_MAXPROCS])
job->max_procs = atoi(row[JOBCOMP_REQ_MAXPROCS]);
job->connection = xstrdup(row[JOBCOMP_REQ_CONNECTION]);
job->reboot = xstrdup(row[JOBCOMP_REQ_REBOOT]);
diff --git a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
index 629d77f01065f35a3b495249dea2d412598af79d..3ec7ceb7061f75adca9db3e6c2c331cfe43a8588 100644
--- a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
+++ b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
@@ -130,7 +130,7 @@ static pgsql_db_info_t *_pgsql_jobcomp_create_db_info()
db_info->port = slurm_get_jobcomp_port();
/* it turns out it is better if using defaults to let postgres
handle them on it's own terms */
- if (!db_info->port) {
+ if(!db_info->port) {
db_info->port = DEFAULT_PGSQL_PORT;
slurm_set_jobcomp_port(db_info->port);
}
@@ -149,7 +149,7 @@ static int _pgsql_jobcomp_check_tables(char *user)
"where tableowner='%s' "
"and tablename !~ '^pg_+'", user);
- if (!(result =
+ if(!(result =
pgsql_db_query_ret(jobcomp_pgsql_db, query))) {
xfree(query);
return SLURM_ERROR;
@@ -157,14 +157,14 @@ static int _pgsql_jobcomp_check_tables(char *user)
xfree(query);
for (i = 0; i < PQntuples(result); i++) {
- if (!job_found
+ if(!job_found
&& !strcmp(jobcomp_table, PQgetvalue(result, i, 0)))
job_found = 1;
}
PQclear(result);
- if (!job_found)
- if (pgsql_db_create_table(jobcomp_pgsql_db, jobcomp_table,
+ if(!job_found)
+ if(pgsql_db_create_table(jobcomp_pgsql_db, jobcomp_table,
jobcomp_table_fields,
")") == SLURM_ERROR)
return SLURM_ERROR;
@@ -239,7 +239,7 @@ extern int init ( void )
{
static int first = 1;
- if (first) {
+ if(first) {
/* since this can be loaded from many different places
only tell us once. */
verbose("%s loaded", plugin_name);
@@ -267,14 +267,14 @@ extern int slurm_jobcomp_set_location(char *location)
char *db_name = NULL;
int i = 0;
- if (jobcomp_pgsql_db && PQstatus(jobcomp_pgsql_db) == CONNECTION_OK)
+ if(jobcomp_pgsql_db && PQstatus(jobcomp_pgsql_db) == CONNECTION_OK)
return SLURM_SUCCESS;
- if (!location)
+ if(!location)
db_name = DEFAULT_JOB_COMP_DB;
else {
while(location[i]) {
- if (location[i] == '.' || location[i] == '/') {
+ if(location[i] == '.' || location[i] == '/') {
debug("%s doesn't look like a database "
"name using %s",
location, DEFAULT_JOB_COMP_DB);
@@ -282,7 +282,7 @@ extern int slurm_jobcomp_set_location(char *location)
}
i++;
}
- if (location[i])
+ if(location[i])
db_name = DEFAULT_JOB_COMP_DB;
else
db_name = location;
@@ -296,7 +296,7 @@ extern int slurm_jobcomp_set_location(char *location)
destroy_pgsql_db_info(db_info);
- if (rc == SLURM_SUCCESS)
+ if(rc == SLURM_SUCCESS)
debug("Jobcomp database init finished");
else
debug("Jobcomp database init failed");
@@ -314,9 +314,9 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
char *query = NULL;
uint32_t time_limit, start_time, end_time;
- if (!jobcomp_pgsql_db || PQstatus(jobcomp_pgsql_db) != CONNECTION_OK) {
+ if(!jobcomp_pgsql_db || PQstatus(jobcomp_pgsql_db) != CONNECTION_OK) {
char *loc = slurm_get_jobcomp_loc();
- if (slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
+ if(slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
xfree(loc);
return SLURM_ERROR;
}
@@ -379,21 +379,21 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
"starttime, endtime, nodecnt",
jobcomp_table);
- if (job_ptr->nodes)
+ if(job_ptr->nodes)
xstrcat(query, ", nodelist");
- if (connect_type)
+ if(connect_type)
xstrcat(query, ", connect_type");
- if (reboot)
+ if(reboot)
xstrcat(query, ", reboot");
- if (rotate)
+ if(rotate)
xstrcat(query, ", rotate");
- if (job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
+ if(job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
xstrcat(query, ", maxprocs");
- if (geometry)
+ if(geometry)
xstrcat(query, ", geometry");
- if (start)
+ if(start)
xstrcat(query, ", start");
- if (blockid)
+ if(blockid)
xstrcat(query, ", blockid");
xstrfmtcat(query, ") values (%u, %u, '%s', %u, '%s', \"%s\", %d, %u, "
@@ -403,32 +403,32 @@ extern int slurm_jobcomp_log_record(struct job_record *job_ptr)
job_state, job_ptr->total_cpus, job_ptr->partition, lim_str,
start_time, end_time, job_ptr->node_cnt);
- if (job_ptr->nodes)
+ if(job_ptr->nodes)
xstrfmtcat(query, ", '%s'", job_ptr->nodes);
- if (connect_type) {
+ if(connect_type) {
xstrfmtcat(query, ", '%s'", connect_type);
xfree(connect_type);
}
- if (reboot) {
+ if(reboot) {
xstrfmtcat(query, ", '%s'", reboot);
xfree(reboot);
}
- if (rotate) {
+ if(rotate) {
xstrfmtcat(query, ", '%s'", rotate);
xfree(rotate);
}
- if (job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
+ if(job_ptr->details && (job_ptr->details->max_cpus != NO_VAL))
xstrfmtcat(query, ", '%u'", job_ptr->details->max_cpus);
- if (geometry) {
+ if(geometry) {
xstrfmtcat(query, ", '%s'", geometry);
xfree(geometry);
}
- if (start) {
+ if(start) {
xstrfmtcat(query, ", '%s'", start);
xfree(start);
}
- if (blockid) {
+ if(blockid) {
xstrfmtcat(query, ", '%s'", blockid);
xfree(blockid);
}
@@ -461,9 +461,9 @@ extern List slurm_jobcomp_get_jobs(slurmdb_job_cond_t *job_cond)
{
List job_list = NULL;
- if (!jobcomp_pgsql_db || PQstatus(jobcomp_pgsql_db) != CONNECTION_OK) {
+ if(!jobcomp_pgsql_db || PQstatus(jobcomp_pgsql_db) != CONNECTION_OK) {
char *loc = slurm_get_jobcomp_loc();
- if (slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
+ if(slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
xfree(loc);
return NULL;
}
@@ -480,9 +480,9 @@ extern List slurm_jobcomp_get_jobs(slurmdb_job_cond_t *job_cond)
*/
extern int slurm_jobcomp_archive(slurmdb_archive_cond_t *arch_cond)
{
- if (!jobcomp_pgsql_db || PQstatus(jobcomp_pgsql_db) != CONNECTION_OK) {
+ if(!jobcomp_pgsql_db || PQstatus(jobcomp_pgsql_db) != CONNECTION_OK) {
char *loc = slurm_get_jobcomp_loc();
- if (slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
+ if(slurm_jobcomp_set_location(loc) == SLURM_ERROR) {
xfree(loc);
return SLURM_ERROR;
}
diff --git a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
index e226a9d60e855048eec8f856ccf9626bdef14dac..73256531a19cea3449d52c1b48cc5ffaf715cbed 100644
--- a/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
+++ b/src/plugins/jobcomp/pgsql/pgsql_jobcomp_process.c
@@ -82,17 +82,17 @@ extern List pgsql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
add this extra field to the structure since it only applies
to this plugin.
*/
- if (job_cond) {
+ if(job_cond) {
fdump_flag = job_cond->duplicates & FDUMP_FLAG;
job_cond->duplicates &= (~FDUMP_FLAG);
}
- if (job_cond->step_list && list_count(job_cond->step_list)) {
+ if(job_cond->step_list && list_count(job_cond->step_list)) {
set = 0;
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("jobid=%d",
selected_step->jobid);
@@ -104,16 +104,16 @@ extern List pgsql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
xstrcat(extra, ")");
}
- if (job_cond->partition_list && list_count(job_cond->partition_list)) {
+ if(job_cond->partition_list && list_count(job_cond->partition_list)) {
set = 0;
- if (extra)
+ if(extra)
xstrcat(extra, " && (");
else
xstrcat(extra, " where (");
itr = list_iterator_create(job_cond->partition_list);
while((selected_part = list_next(itr))) {
- if (set)
+ if(set)
xstrcat(extra, " || ");
tmp = xstrdup_printf("partition='%s'",
selected_part);
@@ -127,7 +127,7 @@ extern List pgsql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
i = 0;
while(jobcomp_table_fields[i].name) {
- if (i)
+ if(i)
xstrcat(tmp, ", ");
xstrcat(tmp, jobcomp_table_fields[i].name);
i++;
@@ -136,13 +136,13 @@ extern List pgsql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
query = xstrdup_printf("select %s from %s", tmp, jobcomp_table);
xfree(tmp);
- if (extra) {
+ if(extra) {
xstrcat(query, extra);
xfree(extra);
}
//info("query = %s", query);
- if (!(result =
+ if(!(result =
pgsql_db_query_ret(jobcomp_pgsql_db, query))) {
xfree(query);
return NULL;
@@ -157,7 +157,7 @@ extern List pgsql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
continue;
}
job = xmalloc(sizeof(jobcomp_job_rec_t));
- if (PQgetvalue(result, i, JOBCOMP_REQ_JOBID))
+ if(PQgetvalue(result, i, JOBCOMP_REQ_JOBID))
job->jobid =
atoi(PQgetvalue(result, i, JOBCOMP_REQ_JOBID));
job->partition =
@@ -174,12 +174,12 @@ extern List pgsql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
sizeof(time_str));
job->end_time = xstrdup(time_str);
- if (PQgetvalue(result, i, JOBCOMP_REQ_UID))
+ if(PQgetvalue(result, i, JOBCOMP_REQ_UID))
job->uid =
atoi(PQgetvalue(result, i, JOBCOMP_REQ_UID));
job->uid_name =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_USER_NAME));
- if (PQgetvalue(result, i, JOBCOMP_REQ_GID))
+ if(PQgetvalue(result, i, JOBCOMP_REQ_GID))
job->gid =
atoi(PQgetvalue(result, i, JOBCOMP_REQ_GID));
job->gid_name =
@@ -188,16 +188,16 @@ extern List pgsql_jobcomp_process_get_jobs(slurmdb_job_cond_t *job_cond)
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_NAME));
job->nodelist =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_NODELIST));
- if (PQgetvalue(result, i, JOBCOMP_REQ_NODECNT))
+ if(PQgetvalue(result, i, JOBCOMP_REQ_NODECNT))
job->node_cnt =
atoi(PQgetvalue(result, i, JOBCOMP_REQ_NODECNT));
- if (PQgetvalue(result, i, JOBCOMP_REQ_STATE)) {
+ if(PQgetvalue(result, i, JOBCOMP_REQ_STATE)) {
int j = atoi(PQgetvalue(result, i, JOBCOMP_REQ_STATE));
job->state = xstrdup(job_state_string(j));
}
job->timelimit =
xstrdup(PQgetvalue(result, i, JOBCOMP_REQ_TIMELIMIT));
- if (PQgetvalue(result, i, JOBCOMP_REQ_MAXPROCS))
+ if(PQgetvalue(result, i, JOBCOMP_REQ_MAXPROCS))
job->max_procs =
atoi(PQgetvalue(result, i,
JOBCOMP_REQ_MAXPROCS));
diff --git a/src/plugins/priority/basic/priority_basic.c b/src/plugins/priority/basic/priority_basic.c
index 94237480a884afce116948831c2e3fae98af5122..4b85ab892f84bef8b04f30727bd63b8874a487bf 100644
--- a/src/plugins/priority/basic/priority_basic.c
+++ b/src/plugins/priority/basic/priority_basic.c
@@ -108,16 +108,16 @@ extern uint32_t priority_p_set(uint32_t last_prio, struct job_record *job_ptr)
{
uint32_t new_prio = 1;
- if (job_ptr->direct_set_prio)
+ if(job_ptr->direct_set_prio)
return job_ptr->priority;
- if (last_prio >= 2)
+ if(last_prio >= 2)
new_prio = (last_prio - 1);
- if (job_ptr->details)
+ if(job_ptr->details)
new_prio -= (job_ptr->details->nice - NICE_OFFSET);
- if (new_prio < 1)
+ if(new_prio < 1)
new_prio = 1;
return new_prio;
diff --git a/src/plugins/priority/multifactor/priority_multifactor.c b/src/plugins/priority/multifactor/priority_multifactor.c
index 672d0b7118c5df1041e998562c89cbe6603965e1..ba49011d02d441a6f62f37f5e67d1a6aa5bd5129 100644
--- a/src/plugins/priority/multifactor/priority_multifactor.c
+++ b/src/plugins/priority/multifactor/priority_multifactor.c
@@ -138,9 +138,9 @@ static int _apply_decay(double decay_factor)
/* continue if decay_factor is 0 or 1 since that doesn't help
us at all. 1 means no decay and 0 will just zero
everything out so don't waste time doing it */
- if (!decay_factor)
+ if(!decay_factor)
return SLURM_ERROR;
- else if (!calc_fairshare)
+ else if(!calc_fairshare)
return SLURM_SUCCESS;
xassert(assoc_mgr_association_list);
@@ -181,7 +181,7 @@ static int _reset_usage()
assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
WRITE_LOCK, NO_LOCK, NO_LOCK };
- if (!calc_fairshare)
+ if(!calc_fairshare)
return SLURM_SUCCESS;
xassert(assoc_mgr_association_list);
@@ -260,7 +260,7 @@ static void _read_last_decay_ran(time_t *last_ran, time_t *last_reset)
safe_unpack_time(last_ran, buffer);
safe_unpack_time(last_reset, buffer);
free_buf(buffer);
- if (priority_debug)
+ if(priority_debug)
info("Last ran decay on jobs at %d", last_ran);
return;
@@ -327,11 +327,11 @@ static int _write_last_decay_ran(time_t last_ran, time_t last_reset)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(state_file, old_file))
+ if(link(state_file, old_file))
debug3("unable to create link for %s -> %s: %m",
state_file, old_file);
(void) unlink(state_file);
- if (link(new_file, state_file))
+ if(link(new_file, state_file))
debug3("unable to create link for %s -> %s: %m",
new_file, state_file);
(void) unlink(new_file);
@@ -361,12 +361,12 @@ static int _set_children_usage_efctv(List childern_list)
slurmdb_association_rec_t *assoc = NULL;
ListIterator itr = NULL;
- if (!childern_list || !list_count(childern_list))
+ if(!childern_list || !list_count(childern_list))
return SLURM_SUCCESS;
itr = list_iterator_create(childern_list);
while((assoc = list_next(itr))) {
- if (assoc->user) {
+ if(assoc->user) {
assoc->usage->usage_efctv = (long double)NO_VAL;
continue;
}
@@ -388,24 +388,24 @@ static double _get_fairshare_priority( struct job_record *job_ptr)
assoc_mgr_lock_t locks = { READ_LOCK, NO_LOCK,
NO_LOCK, NO_LOCK, NO_LOCK };
- if (!calc_fairshare)
+ if(!calc_fairshare)
return 0;
- if (!assoc) {
+ if(!assoc) {
error("Job %u has no association. Unable to "
"compute fairshare.");
return 0;
}
assoc_mgr_lock(&locks);
- if (assoc->usage->usage_efctv == (long double)NO_VAL)
+ if(assoc->usage->usage_efctv == (long double)NO_VAL)
priority_p_set_assoc_usage(assoc);
// Priority is 0 -> 1
priority_fs =
(assoc->usage->shares_norm
- (double)assoc->usage->usage_efctv + 1.0) / 2.0;
- if (priority_debug)
+ if(priority_debug)
info("Fairshare priority for user %s in acct %s"
"((%f - %Lf) + 1) / 2 = %f",
assoc->user, assoc->acct, assoc->usage->shares_norm,
@@ -413,7 +413,7 @@ static double _get_fairshare_priority( struct job_record *job_ptr)
assoc_mgr_unlock(&locks);
- if (priority_debug)
+ if(priority_debug)
info("job %u has a fairshare priority of %f",
job_ptr->job_id, priority_fs);
@@ -433,10 +433,10 @@ static void _get_priority_factors(time_t start_time, struct job_record *job_ptr,
memset(factors, 0, sizeof(priority_factors_object_t));
- if (weight_age) {
+ if(weight_age) {
uint32_t diff = start_time - job_ptr->details->begin_time;
- if (job_ptr->details->begin_time) {
- if (diff < max_age)
+ if(job_ptr->details->begin_time) {
+ if(diff < max_age)
factors->priority_age =
(double)diff / (double)max_age;
else
@@ -444,7 +444,7 @@ static void _get_priority_factors(time_t start_time, struct job_record *job_ptr,
}
}
- if (job_ptr->assoc_ptr && weight_fs) {
+ if(job_ptr->assoc_ptr && weight_fs) {
if (status_only)
factors->priority_fs = job_ptr->priority_fs;
else {
@@ -453,25 +453,25 @@ static void _get_priority_factors(time_t start_time, struct job_record *job_ptr,
}
}
- if (weight_js) {
+ if(weight_js) {
uint32_t cpu_cnt = 0;
/* On the initial run of this we don't have total_cpus
so go off the requesting. After the first shot
total_cpus should be filled in.
*/
- if (job_ptr->total_cpus)
+ if(job_ptr->total_cpus)
cpu_cnt = job_ptr->total_cpus;
- else if (job_ptr->details
+ else if(job_ptr->details
&& (job_ptr->details->max_cpus != NO_VAL))
cpu_cnt = job_ptr->details->max_cpus;
- else if (job_ptr->details && job_ptr->details->min_cpus)
+ else if(job_ptr->details && job_ptr->details->min_cpus)
cpu_cnt = job_ptr->details->min_cpus;
- if (favor_small) {
+ if(favor_small) {
factors->priority_js = (double)(node_record_count
- job_ptr->details->min_nodes)
/ (double)node_record_count;
- if (cpu_cnt) {
+ if(cpu_cnt) {
factors->priority_js +=
(double)(cluster_cpus - cpu_cnt)
/ (double)cluster_cpus;
@@ -481,7 +481,7 @@ static void _get_priority_factors(time_t start_time, struct job_record *job_ptr,
factors->priority_js =
(double)job_ptr->details->min_nodes
/ (double)node_record_count;
- if (cpu_cnt) {
+ if(cpu_cnt) {
factors->priority_js +=
(double)cpu_cnt / (double)cluster_cpus;
factors->priority_js /= 2;
@@ -493,11 +493,11 @@ static void _get_priority_factors(time_t start_time, struct job_record *job_ptr,
factors->priority_js = 1.0;
}
- if (job_ptr->part_ptr && job_ptr->part_ptr->priority && weight_part) {
+ if(job_ptr->part_ptr && job_ptr->part_ptr->priority && weight_part) {
factors->priority_part = job_ptr->part_ptr->norm_priority;
}
- if (qos_ptr && qos_ptr->priority && weight_qos) {
+ if(qos_ptr && qos_ptr->priority && weight_qos) {
factors->priority_qos = qos_ptr->usage->norm_priority;
}
@@ -515,10 +515,10 @@ static uint32_t _get_priority_internal(time_t start_time,
double priority_qos = 0.0;
priority_factors_object_t factors;
- if (job_ptr->direct_set_prio)
+ if(job_ptr->direct_set_prio)
return job_ptr->priority;
- if (!job_ptr->details) {
+ if(!job_ptr->details) {
error("_get_priority_internal: job %u does not have a "
"details symbol set, can't set priority");
return 0;
@@ -526,7 +526,7 @@ static uint32_t _get_priority_internal(time_t start_time,
/*
* This means the job is not eligible yet
*/
- if (!job_ptr->details->begin_time
+ if(!job_ptr->details->begin_time
|| (job_ptr->details->begin_time > start_time))
return 1;
@@ -546,10 +546,10 @@ static uint32_t _get_priority_internal(time_t start_time,
* 0 means the job is held; 1 means system hold
* so 2 is the lowest non-held priority
*/
- if (priority < 2)
+ if(priority < 2)
priority = 2;
- if (priority_debug) {
+ if(priority_debug) {
info("Weighted Age priority is %f * %u = %.2f",
factors.priority_age, weight_age, priority_age);
info("Weighted Fairshare priority is %f * %u = %.2f",
@@ -575,7 +575,7 @@ static time_t _next_reset(uint16_t reset_period, time_t last_reset)
struct tm last_tm;
time_t tmp_time, now = time(NULL);
- if (localtime_r(&last_reset, &last_tm) == NULL)
+ if(localtime_r(&last_reset, &last_tm) == NULL)
return (time_t) 0;
last_tm.tm_sec = 0;
@@ -599,7 +599,7 @@ static time_t _next_reset(uint16_t reset_period, time_t last_reset)
return tmp_time;
case PRIORITY_RESET_MONTHLY:
last_tm.tm_mday = 1;
- if (last_tm.tm_mon < 11)
+ if(last_tm.tm_mon < 11)
last_tm.tm_mon++;
else {
last_tm.tm_mon = 0;
@@ -608,11 +608,11 @@ static time_t _next_reset(uint16_t reset_period, time_t last_reset)
break;
case PRIORITY_RESET_QUARTERLY:
last_tm.tm_mday = 1;
- if (last_tm.tm_mon < 3)
+ if(last_tm.tm_mon < 3)
last_tm.tm_mon = 3;
- else if (last_tm.tm_mon < 6)
+ else if(last_tm.tm_mon < 6)
last_tm.tm_mon = 6;
- else if (last_tm.tm_mon < 9)
+ else if(last_tm.tm_mon < 9)
last_tm.tm_mon = 9;
else {
last_tm.tm_mon = 0;
@@ -651,13 +651,13 @@ static void *_decay_thread(void *no_data)
assoc_mgr_lock_t locks = { WRITE_LOCK, NO_LOCK,
WRITE_LOCK, NO_LOCK, NO_LOCK };
- if (decay_hl > 0)
+ if(decay_hl > 0)
decay_factor = 1 - (0.693 / decay_hl);
(void) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
(void) pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
- if (!localtime_r(&start_time, &tm)) {
+ if(!localtime_r(&start_time, &tm)) {
fatal("_decay_thread: "
"Couldn't get localtime for rollup handler %d",
start_time);
@@ -678,7 +678,7 @@ static void *_decay_thread(void *no_data)
/* If reconfig is called handle all that happens
outside of the loop here */
- if (reconfig) {
+ if(reconfig) {
/* if decay_hl is 0 or less that means no
decay is to be had. This also means we
flush the used time at a certain time
@@ -688,7 +688,7 @@ static void *_decay_thread(void *no_data)
reset_period = slurm_get_priority_reset_period();
next_reset = 0;
decay_hl = (double)slurm_get_priority_decay_hl();
- if (decay_hl > 0)
+ if(decay_hl > 0)
decay_factor = 1 - (0.693 / decay_hl);
else
decay_factor = 1;
@@ -712,11 +712,11 @@ static void *_decay_thread(void *no_data)
case PRIORITY_RESET_MONTHLY:
case PRIORITY_RESET_QUARTERLY:
case PRIORITY_RESET_YEARLY:
- if (next_reset == 0) {
+ if(next_reset == 0) {
next_reset = _next_reset(reset_period,
last_reset);
}
- if (now >= next_reset) {
+ if(now >= next_reset) {
_reset_usage();
last_reset = next_reset;
next_reset = _next_reset(reset_period,
@@ -724,23 +724,23 @@ static void *_decay_thread(void *no_data)
}
}
- if (!last_ran)
+ if(!last_ran)
goto get_usage;
else
run_delta = (start_time - last_ran);
- if (run_delta <= 0)
+ if(run_delta <= 0)
goto get_usage;
real_decay = pow(decay_factor, (double)run_delta);
- if (priority_debug)
+ if(priority_debug)
info("Decay factor over %d seconds goes "
"from %.15f -> %.15f",
run_delta, decay_factor, real_decay);
/* first apply decay to used time */
- if (_apply_decay(real_decay) != SLURM_SUCCESS) {
+ if(_apply_decay(real_decay) != SLURM_SUCCESS) {
error("problem applying decay");
running_decay = 0;
slurm_mutex_unlock(&decay_lock);
@@ -751,7 +751,7 @@ static void *_decay_thread(void *no_data)
itr = list_iterator_create(job_list);
while ((job_ptr = list_next(itr))) {
/* apply new usage */
- if (!IS_JOB_PENDING(job_ptr) &&
+ if(!IS_JOB_PENDING(job_ptr) &&
job_ptr->start_time && job_ptr->assoc_ptr) {
slurmdb_qos_rec_t *qos;
slurmdb_association_rec_t *assoc;
@@ -759,10 +759,10 @@ static void *_decay_thread(void *no_data)
time_t end_period = start_time;
double run_decay = 0;
- if (job_ptr->start_time > start_period)
+ if(job_ptr->start_time > start_period)
start_period = job_ptr->start_time;
- if (job_ptr->end_time
+ if(job_ptr->end_time
&& (end_period > job_ptr->end_time))
end_period = job_ptr->end_time;
@@ -770,10 +770,10 @@ static void *_decay_thread(void *no_data)
/* job already has been accounted for
go to next */
- if (run_delta < 1)
+ if(run_delta < 1)
continue;
- if (priority_debug)
+ if(priority_debug)
info("job %u ran for %d seconds",
job_ptr->job_id, run_delta);
@@ -790,8 +790,8 @@ static void *_decay_thread(void *no_data)
job_ptr->assoc_ptr;
/* now apply the usage factor for this
qos */
- if (qos) {
- if (qos->usage_factor > 0) {
+ if(qos) {
+ if(qos->usage_factor > 0) {
real_decay *= qos->usage_factor;
run_decay *= qos->usage_factor;
}
@@ -811,7 +811,7 @@ static void *_decay_thread(void *no_data)
run_decay;
assoc->usage->usage_raw +=
(long double)real_decay;
- if (priority_debug)
+ if(priority_debug)
info("adding %f new usage to "
"assoc %u (user='%s' "
"acct='%s') raw usage "
@@ -834,7 +834,7 @@ static void *_decay_thread(void *no_data)
* pending. There is no reason to set the
* priority if the job isn't pending.
*/
- if ((job_ptr->priority <= 1) || !IS_JOB_PENDING(job_ptr))
+ if((job_ptr->priority <= 1) || !IS_JOB_PENDING(job_ptr))
continue;
job_ptr->priority =
@@ -926,7 +926,7 @@ static void _internal_setup()
{
uint32_t debug_flags = slurm_get_debug_flags();
- if (debug_flags & DEBUG_FLAG_PRIO)
+ if(debug_flags & DEBUG_FLAG_PRIO)
priority_debug = 1;
else
priority_debug = 0;
@@ -940,7 +940,7 @@ static void _internal_setup()
weight_part = slurm_get_priority_weight_partition();
weight_qos = slurm_get_priority_weight_qos();
- if (priority_debug) {
+ if(priority_debug) {
info("priority: Max Age is %u", max_age);
info("priority: Weight Age is %u", weight_age);
info("priority: Weight Fairshare is %u", weight_fs);
@@ -963,7 +963,7 @@ int init ( void )
/* Check to see if we are running a supported accounting plugin */
temp = slurm_get_accounting_storage_type();
- if (strcasecmp(temp, "accounting_storage/slurmdbd")
+ if(strcasecmp(temp, "accounting_storage/slurmdbd")
&& strcasecmp(temp, "accounting_storage/mysql")) {
error("You are not running a supported "
"accounting_storage plugin\n(%s).\n"
@@ -975,8 +975,8 @@ int init ( void )
temp);
calc_fairshare = 0;
weight_fs = 0;
- } else if (assoc_mgr_root_assoc) {
- if (!cluster_cpus)
+ } else if(assoc_mgr_root_assoc) {
+ if(!cluster_cpus)
fatal("We need to have a cluster cpu count "
"before we can init the priority/multifactor "
"plugin");
@@ -997,7 +997,7 @@ int init ( void )
slurm_attr_destroy(&thread_attr);
} else {
- if (weight_fs)
+ if(weight_fs)
fatal("It appears you don't have any association "
"data from your database. "
"The priority/multifactor plugin requires "
@@ -1016,15 +1016,15 @@ int init ( void )
int fini ( void )
{
/* Daemon termination handled here */
- if (running_decay)
+ if(running_decay)
debug("Waiting for decay thread to finish.");
slurm_mutex_lock(&decay_lock);
/* cancel the decay thread and then join the cleanup thread */
- if (decay_handler_thread)
+ if(decay_handler_thread)
pthread_cancel(decay_handler_thread);
- if (cleanup_handler_thread)
+ if(cleanup_handler_thread)
pthread_join(cleanup_handler_thread, NULL);
slurm_mutex_unlock(&decay_lock);
@@ -1060,7 +1060,7 @@ extern void priority_p_set_assoc_usage(slurmdb_association_rec_t *assoc)
xassert(assoc->usage);
xassert(assoc->usage->parent_assoc_ptr);
- if (assoc->user) {
+ if(assoc->user) {
child = "user";
child_str = assoc->user;
} else {
@@ -1068,7 +1068,7 @@ extern void priority_p_set_assoc_usage(slurmdb_association_rec_t *assoc)
child_str = assoc->acct;
}
- if (assoc_mgr_root_assoc->usage->usage_raw)
+ if(assoc_mgr_root_assoc->usage->usage_raw)
assoc->usage->usage_norm = assoc->usage->usage_raw
/ assoc_mgr_root_assoc->usage->usage_raw;
else
@@ -1078,7 +1078,7 @@ extern void priority_p_set_assoc_usage(slurmdb_association_rec_t *assoc)
*/
assoc->usage->usage_norm = 0;
- if (priority_debug)
+ if(priority_debug)
info("Normalized usage for %s %s off %s %Lf / %Lf = %Lf",
child, child_str, assoc->usage->parent_assoc_ptr->acct,
assoc->usage->usage_raw,
@@ -1092,7 +1092,7 @@ extern void priority_p_set_assoc_usage(slurmdb_association_rec_t *assoc)
if (assoc->usage->parent_assoc_ptr == assoc_mgr_root_assoc) {
assoc->usage->usage_efctv = assoc->usage->usage_norm;
- if (priority_debug)
+ if(priority_debug)
info("Effective usage for %s %s off %s %Lf %Lf",
child, child_str,
assoc->usage->parent_assoc_ptr->acct,
@@ -1104,7 +1104,7 @@ extern void priority_p_set_assoc_usage(slurmdb_association_rec_t *assoc)
assoc->usage->usage_norm) *
assoc->shares_raw /
(long double)assoc->usage->level_shares);
- if (priority_debug)
+ if(priority_debug)
info("Effective usage for %s %s off %s "
"%Lf + ((%Lf - %Lf) * %d / %d) = %Lf",
child, child_str,
@@ -1144,19 +1144,19 @@ extern List priority_p_get_priority_factors_list(
/*
* We are only looking for pending jobs
*/
- if (!IS_JOB_PENDING(job_ptr))
+ if(!IS_JOB_PENDING(job_ptr))
continue;
/*
* This means the job is not eligible yet
*/
- if (!job_ptr->details->begin_time
+ if(!job_ptr->details->begin_time
|| (job_ptr->details->begin_time > start_time))
continue;
/*
* 0 means the job is held; 1 means system hold
*/
- if (job_ptr->priority <= 1)
+ if(job_ptr->priority <= 1)
continue;
if (_filter_job(job_ptr, req_job_list, req_user_list))
diff --git a/src/plugins/proctrack/lua/proctrack_lua.c b/src/plugins/proctrack/lua/proctrack_lua.c
index 16043fcb65d87ab61d8c93f4f31fac7519256b53..7c32548c5ac055ae8fb2c197d603ebd23f531fce 100644
--- a/src/plugins/proctrack/lua/proctrack_lua.c
+++ b/src/plugins/proctrack/lua/proctrack_lua.c
@@ -262,7 +262,7 @@ int init (void)
*/
rc = (int) lua_tonumber (L, -1);
lua_pop (L, 1);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
return rc;
/*
diff --git a/src/plugins/sched/wiki/job_modify.c b/src/plugins/sched/wiki/job_modify.c
index 7658a6a8dc6ee1d928763e816827a1983428c4b7..cbac8773a861679e9a94f66447b95136a968a50e 100644
--- a/src/plugins/sched/wiki/job_modify.c
+++ b/src/plugins/sched/wiki/job_modify.c
@@ -100,7 +100,7 @@ static int _job_modify(uint32_t jobid, char *bank_ptr,
}
if (bank_ptr) {
- if (update_job_account("wiki", job_ptr, bank_ptr)
+ if(update_job_account("wiki", job_ptr, bank_ptr)
!= SLURM_SUCCESS)
return EINVAL;
else
@@ -203,7 +203,7 @@ host_fini: if (rc) {
}
}
- if (update_accounting) {
+ if(update_accounting) {
if (job_ptr->details && job_ptr->details->begin_time) {
/* Update job record in accounting to reflect changes */
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
diff --git a/src/plugins/sched/wiki2/hostlist.c b/src/plugins/sched/wiki2/hostlist.c
index 59da052f68a0791288020cf6f973ca3951fb8394..341fd15df02b0f6a63da67c5ca74164c8873d2c3 100644
--- a/src/plugins/sched/wiki2/hostlist.c
+++ b/src/plugins/sched/wiki2/hostlist.c
@@ -169,7 +169,7 @@ static char * _task_list(struct job_record *job_ptr)
xassert(job_resrcs_ptr);
#ifdef HAVE_BG
- if (job_ptr->node_cnt) {
+ if(job_ptr->node_cnt) {
task_cnt = job_resrcs_ptr->cpu_array_value[0];
} else
task_cnt = 1;
@@ -276,7 +276,7 @@ static char * _task_list_exp(struct job_record *job_ptr)
xassert(job_resrcs_ptr);
#ifdef HAVE_BG
- if (job_ptr->node_cnt) {
+ if(job_ptr->node_cnt) {
task_cnt = job_resrcs_ptr->cpu_array_value[0];
} else
task_cnt = 1;
diff --git a/src/plugins/sched/wiki2/job_modify.c b/src/plugins/sched/wiki2/job_modify.c
index b7b289ee3a2435fd788d3af199447684909a0a92..214bd57046bd4f59303597f35676f6eb34fa2b35 100644
--- a/src/plugins/sched/wiki2/job_modify.c
+++ b/src/plugins/sched/wiki2/job_modify.c
@@ -333,7 +333,7 @@ host_fini: if (rc) {
&cpus_per_node);
}
#endif
- if (!IS_JOB_PENDING(job_ptr) || !job_ptr->details) {
+ if(!IS_JOB_PENDING(job_ptr) || !job_ptr->details) {
error("wiki: MODIFYJOB node count of non-pending "
"job %u", jobid);
return ESLURM_DISABLED;
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index 535c33fbb88bb16669c575763ff2e27c10f4400b..ec715cb05cae513f21156ce31581b3c9e2f038f4 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -217,16 +217,16 @@ static void _destroy_geo(void *object);
extern char *ba_passthroughs_string(uint16_t passthrough)
{
char *pass = NULL;
- if (passthrough & PASS_FOUND_X)
+ if(passthrough & PASS_FOUND_X)
xstrcat(pass, "X");
- if (passthrough & PASS_FOUND_Y) {
- if (pass)
+ if(passthrough & PASS_FOUND_Y) {
+ if(pass)
xstrcat(pass, ",Y");
else
xstrcat(pass, "Y");
}
- if (passthrough & PASS_FOUND_Z) {
- if (pass)
+ if(passthrough & PASS_FOUND_Z) {
+ if(pass)
xstrcat(pass, ",Z");
else
xstrcat(pass, "Z");
@@ -268,7 +268,7 @@ extern int parse_blockreq(void **dest, slurm_parser_enum_t type,
tbl = s_p_hashtbl_create(block_options);
s_p_parse_line(tbl, *leftover, leftover);
- if (!value) {
+ if(!value) {
return 0;
}
n = xmalloc(sizeof(blockreq_t));
@@ -290,7 +290,7 @@ extern int parse_blockreq(void **dest, slurm_parser_enum_t type,
s_p_get_string(&tmp, "Type", tbl);
if (!tmp || !strcasecmp(tmp,"TORUS"))
n->conn_type = SELECT_TORUS;
- else if (!strcasecmp(tmp,"MESH"))
+ else if(!strcasecmp(tmp,"MESH"))
n->conn_type = SELECT_MESH;
else
n->conn_type = SELECT_SMALL;
@@ -326,7 +326,7 @@ extern int parse_blockreq(void **dest, slurm_parser_enum_t type,
extern void destroy_blockreq(void *ptr)
{
blockreq_t *n = (blockreq_t *)ptr;
- if (n) {
+ if(n) {
xfree(n->block);
#ifdef HAVE_BGL
xfree(n->blrtsimage);
@@ -358,20 +358,20 @@ extern int parse_image(void **dest, slurm_parser_enum_t type,
n = xmalloc(sizeof(image_t));
n->name = xstrdup(value);
n->def = false;
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("image %s", n->name);
n->groups = list_create(destroy_image_group_list);
s_p_get_string(&tmp, "Groups", tbl);
- if (tmp) {
+ if(tmp) {
for(i=0; i<strlen(tmp); i++) {
- if ((tmp[i] == ':') || (tmp[i] == ',')) {
+ if((tmp[i] == ':') || (tmp[i] == ',')) {
image_group = xmalloc(sizeof(image_group_t));
image_group->name = xmalloc(i-j+2);
snprintf(image_group->name,
(i-j)+1, "%s", tmp+j);
gid_from_string (image_group->name,
&image_group->gid);
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("adding group %s %d",
image_group->name,
image_group->gid);
@@ -380,7 +380,7 @@ extern int parse_image(void **dest, slurm_parser_enum_t type,
j++;
}
}
- if (j != i) {
+ if(j != i) {
image_group = xmalloc(sizeof(image_group_t));
image_group->name = xmalloc(i-j+2);
snprintf(image_group->name, (i-j)+1, "%s", tmp+j);
@@ -389,7 +389,7 @@ extern int parse_image(void **dest, slurm_parser_enum_t type,
fatal("Invalid bluegene.conf parameter "
"Groups=%s",
image_group->name);
- else if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ else if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("adding group %s %d",
image_group->name,
image_group->gid);
@@ -406,7 +406,7 @@ extern int parse_image(void **dest, slurm_parser_enum_t type,
extern void destroy_image_group_list(void *ptr)
{
image_group_t *image_group = (image_group_t *)ptr;
- if (image_group) {
+ if(image_group) {
xfree(image_group->name);
xfree(image_group);
}
@@ -415,9 +415,9 @@ extern void destroy_image_group_list(void *ptr)
extern void destroy_image(void *ptr)
{
image_t *n = (image_t *)ptr;
- if (n) {
+ if(n) {
xfree(n->name);
- if (n->groups) {
+ if(n->groups) {
list_destroy(n->groups);
n->groups = NULL;
}
@@ -428,7 +428,7 @@ extern void destroy_image(void *ptr)
extern void destroy_ba_node(void *ptr)
{
ba_node_t *ba_node = (ba_node_t *)ptr;
- if (ba_node) {
+ if(ba_node) {
xfree(ba_node);
}
}
@@ -484,11 +484,11 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->elongate_geos = list_create(_destroy_geo);
memcpy(geo, ba_request->geometry, sizeof(geo));
- if (ba_request->deny_pass == (uint16_t)NO_VAL)
+ if(ba_request->deny_pass == (uint16_t)NO_VAL)
ba_request->deny_pass = ba_deny_pass;
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
- if (geo[X] != NO_VAL) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(geo[X] != NO_VAL) {
for (i=0; i<cluster_dims; i++) {
if ((geo[i] < 1) || (geo[i] > DIM_SIZE[i])) {
error("new_ba_request Error, "
@@ -505,7 +505,7 @@ extern int new_ba_request(ba_request_t* ba_request)
return 1;
}
- if (geo[X] != (uint16_t)NO_VAL) {
+ if(geo[X] != (uint16_t)NO_VAL) {
for (i=0; i<cluster_dims; i++){
if ((geo[i] < 1) || (geo[i] > DIM_SIZE[i])) {
error("new_ba_request Error, "
@@ -527,7 +527,7 @@ extern int new_ba_request(ba_request_t* ba_request)
deny_pass = &ba_request->deny_pass;
- if (ba_request->elongate || sz) {
+ if(ba_request->elongate || sz) {
sz=1;
/* decompose the size into a cubic geometry */
ba_request->rotate= 1;
@@ -538,14 +538,14 @@ extern int new_ba_request(ba_request_t* ba_request)
geo[i] = 1;
}
- if (ba_request->size==1) {
+ if(ba_request->size==1) {
_append_geo(geo,
ba_request->elongate_geos,
ba_request->rotate);
goto endit;
}
- if (ba_request->size<=DIM_SIZE[Y]) {
+ if(ba_request->size<=DIM_SIZE[Y]) {
geo[X] = 1;
geo[Y] = ba_request->size;
geo[Z] = 1;
@@ -556,7 +556,7 @@ extern int new_ba_request(ba_request_t* ba_request)
}
i = ba_request->size/4;
- if (!(ba_request->size%2)
+ if(!(ba_request->size%2)
&& i <= DIM_SIZE[Y]
&& i <= DIM_SIZE[Z]
&& i*i == ba_request->size) {
@@ -569,17 +569,17 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->rotate);
}
- if (ba_request->size > total_sz || ba_request->size < 1) {
+ if(ba_request->size > total_sz || ba_request->size < 1) {
return 0;
}
sz = ba_request->size % (DIM_SIZE[Y] * DIM_SIZE[Z]);
- if (!sz) {
+ if(!sz) {
i = ba_request->size / (DIM_SIZE[Y] * DIM_SIZE[Z]);
geo[X] = i;
geo[Y] = DIM_SIZE[Y];
geo[Z] = DIM_SIZE[Z];
sz=ba_request->size;
- if ((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
+ if((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
_append_geo(geo,
ba_request->elongate_geos,
ba_request->rotate);
@@ -607,11 +607,11 @@ extern int new_ba_request(ba_request_t* ba_request)
size2 = ba_request->size;
//messedup:
for (i=picked; i<cluster_dims; i++) {
- if (size2 <= 1)
+ if(size2 <= 1)
break;
sz = size2 % DIM_SIZE[i];
- if (!sz) {
+ if(!sz) {
geo[i] = DIM_SIZE[i];
size2 /= DIM_SIZE[i];
} else if (size2 > DIM_SIZE[i]) {
@@ -623,15 +623,15 @@ extern int new_ba_request(ba_request_t* ba_request)
if (!(size2%i2) && !checked[i2]) {
size2 /= i2;
- if (i==0)
+ if(i==0)
checked[i2]=1;
- if (i2<DIM_SIZE[i]) {
+ if(i2<DIM_SIZE[i]) {
geo[i] = i2;
} else {
goto tryagain;
}
- if ((i2-1)!=1 &&
+ if((i2-1)!=1 &&
i!=(cluster_dims-1))
break;
}
@@ -644,8 +644,8 @@ extern int new_ba_request(ba_request_t* ba_request)
node count the job will never
run.
*/
- if (i2==1) {
- if (!list_count(
+ if(i2==1) {
+ if(!list_count(
ba_request->elongate_geos))
error("Can't make a block of "
"%d into a cube.",
@@ -660,7 +660,7 @@ extern int new_ba_request(ba_request_t* ba_request)
}
}
- if ((geo[X]*geo[Y]) <= DIM_SIZE[Y]) {
+ if((geo[X]*geo[Y]) <= DIM_SIZE[Y]) {
ba_request->geometry[X] = 1;
ba_request->geometry[Y] = geo[X] * geo[Y];
ba_request->geometry[Z] = geo[Z];
@@ -669,7 +669,7 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->rotate);
}
- if ((geo[X]*geo[Z]) <= DIM_SIZE[Y]) {
+ if((geo[X]*geo[Z]) <= DIM_SIZE[Y]) {
ba_request->geometry[X] = 1;
ba_request->geometry[Y] = geo[Y];
ba_request->geometry[Z] = geo[X] * geo[Z];
@@ -681,18 +681,18 @@ extern int new_ba_request(ba_request_t* ba_request)
/* Make sure geo[X] is even and then see if we can get
it into the Y or Z dim. */
- if (!(geo[X]%2) && ((geo[X]/2) <= DIM_SIZE[Y])) {
- if (geo[Y] == 1) {
+ if(!(geo[X]%2) && ((geo[X]/2) <= DIM_SIZE[Y])) {
+ if(geo[Y] == 1) {
ba_request->geometry[Y] = geo[X]/2;
messed_with = 1;
} else
ba_request->geometry[Y] = geo[Y];
- if (!messed_with && geo[Z] == 1) {
+ if(!messed_with && geo[Z] == 1) {
messed_with = 1;
ba_request->geometry[Z] = geo[X]/2;
} else
ba_request->geometry[Z] = geo[Z];
- if (messed_with) {
+ if(messed_with) {
messed_with = 0;
ba_request->geometry[X] = 2;
_append_geo(ba_request->geometry,
@@ -700,10 +700,10 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->rotate);
}
}
- if (geo[X] == DIM_SIZE[X]
+ if(geo[X] == DIM_SIZE[X]
&& (geo[Y] < DIM_SIZE[Y]
|| geo[Z] < DIM_SIZE[Z])) {
- if (DIM_SIZE[Y]<DIM_SIZE[Z]) {
+ if(DIM_SIZE[Y]<DIM_SIZE[Z]) {
i = DIM_SIZE[Y];
DIM_SIZE[Y] = DIM_SIZE[Z];
DIM_SIZE[Z] = i;
@@ -711,11 +711,11 @@ extern int new_ba_request(ba_request_t* ba_request)
ba_request->geometry[X] = geo[X];
ba_request->geometry[Y] = geo[Y];
ba_request->geometry[Z] = geo[Z];
- if (ba_request->geometry[Y] < DIM_SIZE[Y]) {
+ if(ba_request->geometry[Y] < DIM_SIZE[Y]) {
i = (DIM_SIZE[Y] - ba_request->geometry[Y]);
ba_request->geometry[Y] +=i;
}
- if (ba_request->geometry[Z] < DIM_SIZE[Z]) {
+ if(ba_request->geometry[Z] < DIM_SIZE[Z]) {
i = (DIM_SIZE[Z] - ba_request->geometry[Z]);
ba_request->geometry[Z] +=i;
}
@@ -724,13 +724,13 @@ extern int new_ba_request(ba_request_t* ba_request)
i2 = (ba_request->geometry[X]
* ba_request->geometry[Y]
* ba_request->geometry[Z]);
- if (i2 < ba_request->size) {
+ if(i2 < ba_request->size) {
ba_request->geometry[X]++;
messed_with = 1;
break;
}
}
- if (messed_with) {
+ if(messed_with) {
messed_with = 0;
_append_geo(ba_request->geometry,
ba_request->elongate_geos,
@@ -738,7 +738,7 @@ extern int new_ba_request(ba_request_t* ba_request)
}
}
- if ((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
+ if((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
_append_geo(geo,
ba_request->elongate_geos,
ba_request->rotate);
@@ -753,23 +753,23 @@ extern int new_ba_request(ba_request_t* ba_request)
for(i=0;i<cluster_dims-1;i++) {
sz = powf((float)ba_request->size,
(float)1/(cluster_dims-i));
- if (pow(sz,(cluster_dims-i))==ba_request->size)
+ if(pow(sz,(cluster_dims-i))==ba_request->size)
break;
}
- if (i<cluster_dims-1) {
+ if(i<cluster_dims-1) {
/* we found something that looks like a cube! */
i3=i;
for (i=0; i<i3; i++)
geo[i] = 1;
for (i=i3; i<cluster_dims; i++)
- if (sz<=DIM_SIZE[i])
+ if(sz<=DIM_SIZE[i])
geo[i] = sz;
else
goto endit;
- if ((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
+ if((geo[X]*geo[Y]*geo[Z]) == ba_request->size)
_append_geo(geo,
ba_request->elongate_geos,
ba_request->rotate);
@@ -784,7 +784,7 @@ extern int new_ba_request(ba_request_t* ba_request)
}
endit:
- if (!(geo_ptr = list_peek(ba_request->elongate_geos)))
+ if(!(geo_ptr = list_peek(ba_request->elongate_geos)))
return 0;
ba_request->elongate_count++;
@@ -805,9 +805,9 @@ endit:
extern void delete_ba_request(void *arg)
{
ba_request_t *ba_request = (ba_request_t *)arg;
- if (ba_request) {
+ if(ba_request) {
xfree(ba_request->save_name);
- if (ba_request->elongate_geos)
+ if(ba_request->elongate_geos)
list_destroy(ba_request->elongate_geos);
#ifdef HAVE_BGL
xfree(ba_request->blrtsimage);
@@ -893,9 +893,9 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
for (x = 0; x < 62; x++) {
if (y == '[')
y = 'a';
- else if (y == '{')
+ else if(y == '{')
y = '0';
- else if (y == ':')
+ else if(y == ':')
y = 'A';
letters[x] = y;
y++;
@@ -903,7 +903,7 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
z=1;
for (x = 0; x < 6; x++) {
- if (z == 4)
+ if(z == 4)
z++;
colors[x] = z;
z++;
@@ -911,7 +911,7 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
best_count=BEST_COUNT_INIT;
- if (ba_system_ptr)
+ if(ba_system_ptr)
_delete_ba_system();
ba_system_ptr = (ba_system_t *) xmalloc(sizeof(ba_system_t));
@@ -919,8 +919,8 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
ba_system_ptr->num_of_proc = 0;
/* cluster_dims is already set up off of working_cluster_rec */
- if (cluster_dims == 1) {
- if (node_info_ptr) {
+ if(cluster_dims == 1) {
+ if(node_info_ptr) {
REAL_DIM_SIZE[X] = DIM_SIZE[X] =
node_info_ptr->record_count + 1;
ba_system_ptr->num_of_proc =
@@ -929,8 +929,8 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
REAL_DIM_SIZE[Z] = DIM_SIZE[Z] = 1;
}
goto setup_done;
- } else if (working_cluster_rec) {
- if (working_cluster_rec->dim_size) {
+ } else if(working_cluster_rec) {
+ if(working_cluster_rec->dim_size) {
for(i=0; i<working_cluster_rec->dimensions; i++) {
DIM_SIZE[i] = working_cluster_rec->dim_size[i];
REAL_DIM_SIZE[i] = DIM_SIZE[i];
@@ -940,12 +940,12 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
}
- if (node_info_ptr) {
+ if(node_info_ptr) {
for (i = 0; i < node_info_ptr->record_count; i++) {
node_ptr = &node_info_ptr->node_array[i];
number = 0;
- if (!node_ptr->name) {
+ if(!node_ptr->name) {
for (j=0; j<HIGHEST_DIMENSIONS; j++)
DIM_SIZE[j] = 0;
goto node_info_error;
@@ -967,7 +967,7 @@ extern void ba_init(node_info_msg_t *node_info_ptr, bool sanity_check)
number, coords, cluster_dims, cluster_base);
for(j=0; j<cluster_dims; j++) {
- if (DIM_SIZE[j] < coords[j])
+ if(DIM_SIZE[j] < coords[j])
DIM_SIZE[j] = coords[j];
}
}
@@ -997,7 +997,7 @@ node_info_error:
&& (node->nodenames[j+4] == 'x'
|| node->nodenames[j+4] == '-')) {
j+=5;
- } else if ((node->nodenames[j] >= '0'
+ } else if((node->nodenames[j] >= '0'
&& node->nodenames[j] <= '9')
|| (node->nodenames[j] >= 'A'
&& node->nodenames[j] <= 'Z')) {
@@ -1021,7 +1021,7 @@ node_info_error:
DIM_SIZE[k] = MAX(DIM_SIZE[k],
coords[k]);
- if (node->nodenames[j] != ',')
+ if(node->nodenames[j] != ',')
break;
}
}
@@ -1057,7 +1057,7 @@ node_info_error:
REAL_DIM_SIZE[X] = bp_size.X;
REAL_DIM_SIZE[Y] = bp_size.Y;
REAL_DIM_SIZE[Z] = bp_size.Z;
- if ((DIM_SIZE[X] > bp_size.X)
+ if((DIM_SIZE[X] > bp_size.X)
|| (DIM_SIZE[Y] > bp_size.Y)
|| (DIM_SIZE[Z] > bp_size.Z)) {
fatal("You requested a %c%c%c system, "
@@ -1077,7 +1077,7 @@ node_info_error:
#endif
setup_done:
- if (cluster_dims == 1) {
+ if(cluster_dims == 1) {
if (DIM_SIZE[X]==0) {
debug("Setting default system dimensions");
REAL_DIM_SIZE[X] = DIM_SIZE[X]=100;
@@ -1091,7 +1091,7 @@ setup_done:
alpha_num[DIM_SIZE[Z]]);
}
- if (!ba_system_ptr->num_of_proc) {
+ if(!ba_system_ptr->num_of_proc) {
ba_system_ptr->num_of_proc = 1;
for(i=0; i<cluster_dims; i++)
ba_system_ptr->num_of_proc *= DIM_SIZE[i];
@@ -1120,7 +1120,7 @@ extern void init_wires()
{
int x, y, z, i;
ba_node_t *source = NULL;
- if (_wires_initialized)
+ if(_wires_initialized)
return;
for(x=0;x<DIM_SIZE[X];x++) {
@@ -1140,8 +1140,8 @@ extern void init_wires()
}
#ifdef HAVE_BG_FILES
_set_external_wires(0,0,NULL,NULL);
- if (!bp_map_list) {
- if (set_bp_map() == -1) {
+ if(!bp_map_list) {
+ if(set_bp_map() == -1) {
return;
}
}
@@ -1172,7 +1172,7 @@ extern void ba_fini()
best_path = NULL;
}
#ifdef HAVE_BG_FILES
- if (bg)
+ if(bg)
bridge_free_bg(bg);
if (bp_map_list) {
@@ -1226,7 +1226,7 @@ extern void ba_update_node_state(ba_node_t *ba_node, uint16_t state)
#endif
/* basically set the node as used */
- if ((node_base_state == NODE_STATE_DOWN)
+ if((node_base_state == NODE_STATE_DOWN)
|| (node_flags & (NODE_STATE_DRAIN | NODE_STATE_FAIL)))
ba_node->used = true;
else
@@ -1268,9 +1268,9 @@ extern int copy_node_path(List nodes, List *dest_nodes)
int dim;
ba_switch_t *curr_switch = NULL, *new_switch = NULL;
- if (!nodes)
+ if(!nodes)
return SLURM_ERROR;
- if (!*dest_nodes)
+ if(!*dest_nodes)
*dest_nodes = list_create(destroy_ba_node);
itr = list_iterator_create(nodes);
@@ -1284,8 +1284,8 @@ extern int copy_node_path(List nodes, List *dest_nodes)
}
list_iterator_destroy(itr2);
- if (!new_ba_node) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(!new_ba_node) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("adding %c%c%c as a new node",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
@@ -1299,8 +1299,8 @@ extern int copy_node_path(List nodes, List *dest_nodes)
for(dim=0;dim<cluster_dims;dim++) {
curr_switch = &ba_node->axis_switch[dim];
new_switch = &new_ba_node->axis_switch[dim];
- if (curr_switch->int_wire[0].used) {
- if (!_copy_the_path(*dest_nodes,
+ if(curr_switch->int_wire[0].used) {
+ if(!_copy_the_path(*dest_nodes,
curr_switch, new_switch,
0, dim)) {
rc = SLURM_ERROR;
@@ -1374,22 +1374,22 @@ extern int remove_block(List nodes, int new_count, int conn_type)
ba_node->letter = '.';
/* Small blocks don't use wires, and only have 1 node,
so just break. */
- if (conn_type == SELECT_SMALL)
+ if(conn_type == SELECT_SMALL)
break;
for(dim=0;dim<cluster_dims;dim++) {
curr_switch = &ba_node->axis_switch[dim];
- if (curr_switch->int_wire[0].used) {
+ if(curr_switch->int_wire[0].used) {
_reset_the_path(curr_switch, 0, 1, dim);
}
}
}
list_iterator_destroy(itr);
- if (new_count == NO_VAL) {
- } else if (new_count == -1)
+ if(new_count == NO_VAL) {
+ } else if(new_count == -1)
color_count--;
else
color_count=new_count;
- if (color_count < 0)
+ if(color_count < 0)
color_count = 0;
return 1;
}
@@ -1416,14 +1416,14 @@ extern int alter_block(List nodes, int conn_type)
/* for(dim=0;dim<cluster_dims;dim++) { */
/* curr_switch = &ba_node->axis_switch[dim]; */
-/* if (curr_switch->int_wire[0].used) { */
+/* if(curr_switch->int_wire[0].used) { */
/* _reset_the_path(curr_switch, 0, 1, dim); */
/* } */
/* } */
/* size++; */
/* } */
/* list_iterator_destroy(results_i); */
-/* if ((name = _set_internal_wires(nodes, size, conn_type)) == NULL) */
+/* if((name = _set_internal_wires(nodes, size, conn_type)) == NULL) */
/* return SLURM_ERROR; */
/* else { */
/* xfree(name); */
@@ -1442,14 +1442,14 @@ extern int redo_block(List nodes, int *geo, int conn_type, int new_count)
char *name = NULL;
ba_node = list_peek(nodes);
- if (!ba_node)
+ if(!ba_node)
return SLURM_ERROR;
remove_block(nodes, new_count, conn_type);
list_delete_all(nodes, &empty_null_destroy_list, "");
name = set_bg_block(nodes, ba_node->coord, geo, conn_type);
- if (!name)
+ if(!name)
return SLURM_ERROR;
else {
xfree(name);
@@ -1480,7 +1480,7 @@ extern int check_and_set_node_list(List nodes)
ba_node_t *ba_node = NULL, *curr_ba_node = NULL;
ListIterator itr = NULL;
- if (!nodes)
+ if(!nodes)
return rc;
itr = list_iterator_create(nodes);
@@ -1495,7 +1495,7 @@ extern int check_and_set_node_list(List nodes)
[ba_node->coord[Y]]
[ba_node->coord[Z]];
- if (ba_node->used && curr_ba_node->used) {
+ if(ba_node->used && curr_ba_node->used) {
/* Only error if the midplane isn't already
* marked down or in a error state outside of
* the bluegene block.
@@ -1505,7 +1505,7 @@ extern int check_and_set_node_list(List nodes)
node_flags = curr_ba_node->state & NODE_STATE_FLAGS;
if (!(node_flags & (NODE_STATE_DRAIN | NODE_STATE_FAIL))
&& (base_state != NODE_STATE_DOWN)) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("I have already been to "
"this node %c%c%c %s",
alpha_num[ba_node->coord[X]],
@@ -1518,7 +1518,7 @@ extern int check_and_set_node_list(List nodes)
}
}
- if (ba_node->used)
+ if(ba_node->used)
curr_ba_node->used = true;
for(i=0; i<cluster_dims; i++) {
ba_switch = &ba_node->axis_switch[i];
@@ -1528,11 +1528,11 @@ extern int check_and_set_node_list(List nodes)
for(j=0; j<NUM_PORTS_PER_NODE; j++) {
//info("checking port %d", j);
- if (ba_switch->int_wire[j].used
+ if(ba_switch->int_wire[j].used
&& curr_ba_switch->int_wire[j].used
&& j != curr_ba_switch->
int_wire[j].port_tar) {
- if (ba_debug_flags
+ if(ba_debug_flags
& DEBUG_FLAG_BG_ALGO_DEEP)
info("%c%c%c dim %d port %d "
"is already in use to %d",
@@ -1549,7 +1549,7 @@ extern int check_and_set_node_list(List nodes)
rc = SLURM_ERROR;
goto end_it;
}
- if (!ba_switch->int_wire[j].used)
+ if(!ba_switch->int_wire[j].used)
continue;
/* info("setting %c%c%c dim %d port %d -> %d", */
@@ -1596,18 +1596,18 @@ extern char *set_bg_block(List results, int *start,
int found = 0;
- if (cluster_dims == 1) {
- if (start[X]>=DIM_SIZE[X])
+ if(cluster_dims == 1) {
+ if(start[X]>=DIM_SIZE[X])
return NULL;
size = geometry[X];
ba_node = &ba_system_ptr->grid[start[X]][0][0];
} else {
- if (start[X]>=DIM_SIZE[X]
+ if(start[X]>=DIM_SIZE[X]
|| start[Y]>=DIM_SIZE[Y]
|| start[Z]>=DIM_SIZE[Z])
return NULL;
- if (geometry[X] <= 0 || geometry[Y] <= 0 || geometry[Z] <= 0) {
+ if(geometry[X] <= 0 || geometry[Y] <= 0 || geometry[Z] <= 0) {
error("problem with geometry %c%c%c, needs to be "
"at least 111",
alpha_num[geometry[X]],
@@ -1620,27 +1620,27 @@ extern char *set_bg_block(List results, int *start,
ba_node = &ba_system_ptr->grid[start[X]][start[Y]][start[Z]];
}
- if (!ba_node)
+ if(!ba_node)
return NULL;
- if (!results)
+ if(!results)
results = list_create(NULL);
else
send_results = 1;
/* This midplane should have already been checked if it was in
use or not */
list_append(results, ba_node);
- if (conn_type >= SELECT_SMALL) {
+ if(conn_type >= SELECT_SMALL) {
/* adding the ba_node and ending */
ba_node->used = true;
name = xstrdup_printf("%c%c%c",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
- if (ba_node->letter == '.') {
+ if(ba_node->letter == '.') {
ba_node->letter = letters[color_count%62];
ba_node->color = colors[color_count%6];
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("count %d setting letter = %c "
"color = %d",
color_count,
@@ -1656,7 +1656,7 @@ extern char *set_bg_block(List results, int *start,
1,
conn_type, BLOCK_ALGO_FIRST);
- if (!found) {
+ if(!found) {
debug2("trying less efficient code");
remove_block(results, color_count, conn_type);
list_delete_all(results, &empty_null_destroy_list, "");
@@ -1667,8 +1667,8 @@ extern char *set_bg_block(List results, int *start,
1,
conn_type, BLOCK_ALGO_SECOND);
}
- if (found) {
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(found) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
List start_list = NULL;
ListIterator itr;
@@ -1679,7 +1679,7 @@ extern char *set_bg_block(List results, int *start,
}
list_iterator_destroy(itr);
- if (!_fill_in_coords(results,
+ if(!_fill_in_coords(results,
start_list,
geometry,
conn_type)) {
@@ -1696,11 +1696,11 @@ extern char *set_bg_block(List results, int *start,
size,
conn_type);
end_it:
- if (!send_results && results) {
+ if(!send_results && results) {
list_destroy(results);
results = NULL;
}
- if (name!=NULL) {
+ if(name!=NULL) {
debug2("name = %s", name);
} else {
debug2("can't allocate");
@@ -1752,7 +1752,7 @@ extern int removable_set_bps(char *bps)
int start[cluster_dims];
int end[cluster_dims];
- if (!bps)
+ if(!bps)
return SLURM_ERROR;
while(bps[j] != '\0') {
@@ -1774,7 +1774,7 @@ extern int removable_set_bps(char *bps)
for (x = start[X]; x <= end[X]; x++) {
for (y = start[Y]; y <= end[Y]; y++) {
for (z = start[Z]; z <= end[Z]; z++) {
- if (!ba_system_ptr->grid[x][y][z]
+ if(!ba_system_ptr->grid[x][y][z]
.used)
ba_system_ptr->
grid[x][y][z]
@@ -1783,10 +1783,10 @@ extern int removable_set_bps(char *bps)
}
}
- if (bps[j] != ',')
+ if(bps[j] != ',')
break;
j--;
- } else if ((bps[j] >= '0' && bps[j] <= '9')
+ } else if((bps[j] >= '0' && bps[j] <= '9')
|| (bps[j] >= 'A' && bps[j] <= 'Z')) {
number = xstrntol(bps + j, &p, cluster_dims,
cluster_base);
@@ -1796,10 +1796,10 @@ extern int removable_set_bps(char *bps)
y = start[Y];
z = start[Z];
j+=3;
- if (!ba_system_ptr->grid[x][y][z].used)
+ if(!ba_system_ptr->grid[x][y][z].used)
ba_system_ptr->grid[x][y][z].used = 2;
- if (bps[j] != ',')
+ if(bps[j] != ',')
break;
j--;
}
@@ -1820,7 +1820,7 @@ extern int reset_all_removed_bps()
for (x = 0; x < DIM_SIZE[X]; x++) {
for (y = 0; y < DIM_SIZE[Y]; y++)
for (z = 0; z < DIM_SIZE[Z]; z++)
- if (ba_system_ptr->grid[x][y][z].used == 2)
+ if(ba_system_ptr->grid[x][y][z].used == 2)
ba_system_ptr->grid[x][y][z].used = 0;
}
return SLURM_SUCCESS;
@@ -1871,12 +1871,12 @@ extern int set_all_bps_except(char *bps)
for (x = 0; x < DIM_SIZE[X]; x++) {
for (y = 0; y < DIM_SIZE[Y]; y++)
for (z = 0; z < DIM_SIZE[Z]; z++) {
- if (ba_system_ptr->grid[x][y][z].state
+ if(ba_system_ptr->grid[x][y][z].state
& NODE_RESUME) {
/* clear the bit and mark as unused */
ba_system_ptr->grid[x][y][z].state &=
~NODE_RESUME;
- } else if (!ba_system_ptr->grid[x][y][z].used) {
+ } else if(!ba_system_ptr->grid[x][y][z].used) {
ba_system_ptr->grid[x][y][z].used = 2;
}
}
@@ -1898,7 +1898,7 @@ extern void init_grid(node_info_msg_t * node_info_ptr)
for (x = 0; x < DIM_SIZE[X]; x++)
for (y = 0; y < DIM_SIZE[Y]; y++)
for (z = 0; z < DIM_SIZE[Z]; z++) {
- if (node_info_ptr!=NULL) {
+ if(node_info_ptr!=NULL) {
node_ptr =
&node_info_ptr->node_array[i];
ba_system_ptr->grid[x][y][z].color = 7;
@@ -1910,7 +1910,7 @@ extern void init_grid(node_info_msg_t * node_info_ptr)
ba_system_ptr->
grid[x][y][z].letter
= '#';
- if (_initialized) {
+ if(_initialized) {
ba_update_node_state(
&ba_system_ptr->
grid[x][y][z],
@@ -1992,7 +1992,7 @@ extern int set_bp_map(void)
char *bp_id = NULL;
rm_location_t bp_loc;
- if (_bp_map_initialized)
+ if(_bp_map_initialized)
return 1;
bp_map_list = list_create(_bp_map_list_del);
@@ -2011,7 +2011,7 @@ extern int set_bp_map(void)
#endif
if (!bg) {
- if ((rc = bridge_get_bg(&bg)) != STATUS_OK) {
+ if((rc = bridge_get_bg(&bg)) != STATUS_OK) {
error("bridge_get_BG(): %d", rc);
return -1;
}
@@ -2047,7 +2047,7 @@ extern int set_bp_map(void)
continue;
}
- if (!bp_id) {
+ if(!bp_id) {
error("No BP ID was returned from database");
continue;
}
@@ -2084,8 +2084,8 @@ extern int *find_bp_loc(char* bp_id)
ListIterator itr;
char *check = NULL;
- if (!bp_map_list) {
- if (set_bp_map() == -1)
+ if(!bp_map_list) {
+ if(set_bp_map() == -1)
return NULL;
}
@@ -2094,14 +2094,14 @@ extern int *find_bp_loc(char* bp_id)
* R000 to R00-M0 so we now support both formats for each of the
* systems */
#ifdef HAVE_BGL
- if (check[3] == '-') {
- if (check[5]) {
+ if(check[3] == '-') {
+ if(check[5]) {
check[3] = check[5];
check[4] = '\0';
}
}
- if ((check[1] < '0' || check[1] > '9')
+ if((check[1] < '0' || check[1] > '9')
|| (check[2] < '0' || check[2] > '9')
|| (check[3] < '0' || check[3] > '9')) {
error("%s is not a valid Rack-Midplane (i.e. R000)", bp_id);
@@ -2109,13 +2109,13 @@ extern int *find_bp_loc(char* bp_id)
}
#else
- if (check[3] != '-') {
+ if(check[3] != '-') {
xfree(check);
check = xstrdup_printf("R%c%c-M%c",
bp_id[1], bp_id[2], bp_id[3]);
}
- if ((check[1] < '0' || check[1] > '9')
+ if((check[1] < '0' || check[1] > '9')
|| (check[2] < '0' || check[2] > '9')
|| (check[5] < '0' || check[5] > '9')) {
error("%s is not a valid Rack-Midplane (i.e. R00-M0)", bp_id);
@@ -2132,7 +2132,7 @@ extern int *find_bp_loc(char* bp_id)
cleanup:
xfree(check);
- if (bp_map != NULL)
+ if(bp_map != NULL)
return bp_map->coord;
else
return NULL;
@@ -2154,10 +2154,10 @@ extern char *find_bp_rack_mid(char* xyz)
int coord[cluster_dims];
int len = strlen(xyz);
len -= 3;
- if (len<0)
+ if(len<0)
return NULL;
- if ((xyz[len] < '0' || xyz[len] > '9')
+ if((xyz[len] < '0' || xyz[len] > '9')
|| (xyz[len+1] < '0' || xyz[len+1] > '9')
|| (xyz[len+2] < '0' || xyz[len+2] > '9')) {
error("%s is not a valid Location (i.e. 000)", xyz);
@@ -2167,8 +2167,8 @@ extern char *find_bp_rack_mid(char* xyz)
number = xstrntol(xyz + len, &p, cluster_dims, cluster_base);
hostlist_parse_int_to_array(number, coord, cluster_dims, cluster_base);
- if (!bp_map_list) {
- if (set_bp_map() == -1)
+ if(!bp_map_list) {
+ if(set_bp_map() == -1)
return NULL;
}
@@ -2180,7 +2180,7 @@ extern char *find_bp_rack_mid(char* xyz)
break; /* we found it */
list_iterator_destroy(itr);
- if (bp_map != NULL)
+ if(bp_map != NULL)
return bp_map->bp_id;
else
return NULL;
@@ -2208,7 +2208,7 @@ extern int load_block_wiring(char *bg_block_id)
ba_switch_t *ba_switch = NULL;
int *geo = NULL;
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("getting info for block %s", bg_block_id);
if ((rc = bridge_get_block(bg_block_id, &block_ptr)) != STATUS_OK) {
@@ -2224,8 +2224,8 @@ extern int load_block_wiring(char *bg_block_id)
bg_err_str(rc));
return SLURM_ERROR;
}
- if (!switch_cnt) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(!switch_cnt) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("no switch_cnt");
if ((rc = bridge_get_data(block_ptr,
RM_PartitionFirstBP,
@@ -2244,7 +2244,7 @@ extern int load_block_wiring(char *bg_block_id)
}
geo = find_bp_loc(switchid);
- if (!geo) {
+ if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
return SLURM_ERROR;
}
@@ -2252,7 +2252,7 @@ extern int load_block_wiring(char *bg_block_id)
return SLURM_SUCCESS;
}
for (i=0; i<switch_cnt; i++) {
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(block_ptr,
RM_PartitionNextSwitch,
&curr_switch))
@@ -2288,7 +2288,7 @@ extern int load_block_wiring(char *bg_block_id)
}
geo = find_bp_loc(switchid);
- if (!geo) {
+ if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
return SLURM_ERROR;
}
@@ -2299,13 +2299,13 @@ extern int load_block_wiring(char *bg_block_id)
bg_err_str(rc));
return SLURM_ERROR;
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("switch id = %s dim %d conns = %d",
switchid, dim, cnt);
ba_switch = &ba_system_ptr->
grid[geo[X]][geo[Y]][geo[Z]].axis_switch[dim];
for (j=0; j<cnt; j++) {
- if (j) {
+ if(j) {
if ((rc = bridge_get_data(
curr_switch,
RM_SwitchNextConnection,
@@ -2360,8 +2360,8 @@ extern int load_block_wiring(char *bg_block_id)
return SLURM_ERROR;
}
- if (curr_conn.p1 == 1 && dim == X) {
- if (ba_system_ptr->
+ if(curr_conn.p1 == 1 && dim == X) {
+ if(ba_system_ptr->
grid[geo[X]][geo[Y]][geo[Z]].used) {
debug("I have already been to "
"this node %c%c%c",
@@ -2373,11 +2373,11 @@ extern int load_block_wiring(char *bg_block_id)
ba_system_ptr->grid[geo[X]][geo[Y]][geo[Z]].
used = true;
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("connection going from %d -> %d",
curr_conn.p1, curr_conn.p2);
- if (ba_switch->int_wire[curr_conn.p1].used) {
+ if(ba_switch->int_wire[curr_conn.p1].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
alpha_num[geo[X]],
@@ -2391,7 +2391,7 @@ extern int load_block_wiring(char *bg_block_id)
ba_switch->int_wire[curr_conn.p1].port_tar
= curr_conn.p2;
- if (ba_switch->int_wire[curr_conn.p2].used) {
+ if(ba_switch->int_wire[curr_conn.p2].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
alpha_num[geo[X]],
@@ -2438,7 +2438,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
List results = list_create(destroy_ba_node);
ListIterator itr = NULL;
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("getting info for block %s", bg_block_id);
if ((rc = bridge_get_data(block_ptr, RM_PartitionSwitchNum,
@@ -2447,8 +2447,8 @@ extern List get_and_set_block_wiring(char *bg_block_id,
bg_err_str(rc));
goto end_it;
}
- if (!switch_cnt) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(!switch_cnt) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("no switch_cnt");
if ((rc = bridge_get_data(block_ptr,
RM_PartitionFirstBP,
@@ -2467,7 +2467,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
}
geo = find_bp_loc(switchid);
- if (!geo) {
+ if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
goto end_it;
}
@@ -2481,7 +2481,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
return results;
}
for (i=0; i<switch_cnt; i++) {
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(block_ptr,
RM_PartitionNextSwitch,
&curr_switch))
@@ -2517,7 +2517,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
}
geo = find_bp_loc(switchid);
- if (!geo) {
+ if(!geo) {
error("find_bp_loc: bpid %s not known", switchid);
goto end_it;
}
@@ -2528,7 +2528,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
bg_err_str(rc));
goto end_it;
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("switch id = %s dim %d conns = %d",
switchid, dim, cnt);
@@ -2540,7 +2540,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
break; /* we found it */
}
list_iterator_destroy(itr);
- if (!ba_node) {
+ if(!ba_node) {
ba_node = xmalloc(sizeof(ba_node_t));
list_push(results, ba_node);
@@ -2550,7 +2550,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
}
ba_switch = &ba_node->axis_switch[dim];
for (j=0; j<cnt; j++) {
- if (j) {
+ if(j) {
if ((rc = bridge_get_data(
curr_switch,
RM_SwitchNextConnection,
@@ -2605,8 +2605,8 @@ extern List get_and_set_block_wiring(char *bg_block_id,
goto end_it;
}
- if (curr_conn.p1 == 1 && dim == X) {
- if (ba_node->used) {
+ if(curr_conn.p1 == 1 && dim == X) {
+ if(ba_node->used) {
debug("I have already been to "
"this node %c%c%c",
alpha_num[geo[X]],
@@ -2616,11 +2616,11 @@ extern List get_and_set_block_wiring(char *bg_block_id,
}
ba_node->used = true;
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("connection going from %d -> %d",
curr_conn.p1, curr_conn.p2);
- if (ba_switch->int_wire[curr_conn.p1].used) {
+ if(ba_switch->int_wire[curr_conn.p1].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
alpha_num[geo[X]],
@@ -2634,7 +2634,7 @@ extern List get_and_set_block_wiring(char *bg_block_id,
ba_switch->int_wire[curr_conn.p1].port_tar
= curr_conn.p2;
- if (ba_switch->int_wire[curr_conn.p2].used) {
+ if(ba_switch->int_wire[curr_conn.p2].used) {
debug("%c%c%c dim %d port %d "
"is already in use",
alpha_num[geo[X]],
@@ -2663,7 +2663,7 @@ end_it:
extern int validate_coord(int *coord)
{
#ifdef HAVE_BG_FILES
- if (coord[X]>=REAL_DIM_SIZE[X]
+ if(coord[X]>=REAL_DIM_SIZE[X]
|| coord[Y]>=REAL_DIM_SIZE[Y]
|| coord[Z]>=REAL_DIM_SIZE[Z]) {
error("got coord %c%c%c greater than system dims "
@@ -2677,10 +2677,10 @@ extern int validate_coord(int *coord)
return 0;
}
- if (coord[X]>=DIM_SIZE[X]
+ if(coord[X]>=DIM_SIZE[X]
|| coord[Y]>=DIM_SIZE[Y]
|| coord[Z]>=DIM_SIZE[Z]) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("got coord %c%c%c greater than what we are using "
"%c%c%c",
alpha_num[coord[X]],
@@ -2749,7 +2749,7 @@ static int _check_for_options(ba_request_t* ba_request)
int *geo = NULL;
ListIterator itr;
- if (ba_request->rotate) {
+ if(ba_request->rotate) {
rotate_again:
debug2("Rotating! %d",ba_request->rotate_count);
@@ -2760,7 +2760,7 @@ static int _check_for_options(ba_request_t* ba_request)
ba_request->rotate_count++;
set=1;
- } else if (ba_request->rotate_count<(cluster_dims*2)) {
+ } else if(ba_request->rotate_count<(cluster_dims*2)) {
temp=ba_request->geometry[X];
ba_request->geometry[X]=ba_request->geometry[Y];
ba_request->geometry[Y]=ba_request->geometry[Z];
@@ -2769,8 +2769,8 @@ static int _check_for_options(ba_request_t* ba_request)
set=1;
} else
ba_request->rotate = false;
- if (set) {
- if (ba_request->geometry[X]<=DIM_SIZE[X]
+ if(set) {
+ if(ba_request->geometry[X]<=DIM_SIZE[X]
&& ba_request->geometry[Y]<=DIM_SIZE[Y]
&& ba_request->geometry[Z]<=DIM_SIZE[Z])
return 1;
@@ -2780,7 +2780,7 @@ static int _check_for_options(ba_request_t* ba_request)
}
}
}
- if (ba_request->elongate) {
+ if(ba_request->elongate) {
elongate_again:
debug2("Elongating! %d",ba_request->elongate_count);
ba_request->rotate_count=0;
@@ -2791,13 +2791,13 @@ static int _check_for_options(ba_request_t* ba_request)
for(set=0; set<=ba_request->elongate_count; set++)
geo = list_next(itr);
list_iterator_destroy(itr);
- if (geo == NULL)
+ if(geo == NULL)
return 0;
ba_request->elongate_count++;
ba_request->geometry[X] = geo[X];
ba_request->geometry[Y] = geo[Y];
ba_request->geometry[Z] = geo[Z];
- if (ba_request->geometry[X]<=DIM_SIZE[X]
+ if(ba_request->geometry[X]<=DIM_SIZE[X]
&& ba_request->geometry[Y]<=DIM_SIZE[Y]
&& ba_request->geometry[Z]<=DIM_SIZE[Z]) {
return 1;
@@ -2819,7 +2819,7 @@ static int _append_geo(int *geometry, List geos, int rotate)
int temp_geo;
int i, j;
- if (rotate) {
+ if(rotate) {
for (i = (cluster_dims - 1); i >= 0; i--) {
for (j = 1; j <= i; j++) {
if ((geometry[j-1] > geometry[j])
@@ -2834,7 +2834,7 @@ static int _append_geo(int *geometry, List geos, int rotate)
}
itr = list_iterator_create(geos);
while ((geo_ptr = list_next(itr)) != NULL) {
- if (geometry[X] == geo_ptr[X]
+ if(geometry[X] == geo_ptr[X]
&& geometry[Y] == geo_ptr[Y]
&& geometry[Z] == geo_ptr[Z])
break;
@@ -2842,12 +2842,12 @@ static int _append_geo(int *geometry, List geos, int rotate)
}
list_iterator_destroy(itr);
- if (geo_ptr == NULL) {
+ if(geo_ptr == NULL) {
geo = xmalloc(sizeof(int)*cluster_dims);
geo[X] = geometry[X];
geo[Y] = geometry[Y];
geo[Z] = geometry[Z];
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("adding geo %c%c%c",
alpha_num[geo[X]], alpha_num[geo[Y]],
alpha_num[geo[Z]]);
@@ -2885,7 +2885,7 @@ static int _fill_in_coords(List results, List start_list,
ba_switch_t *curr_switch = NULL;
ba_switch_t *next_switch = NULL;
- if (!start_list || !results)
+ if(!start_list || !results)
return 0;
/* go through the start_list and add all the midplanes */
itr = list_iterator_create(start_list);
@@ -2893,12 +2893,12 @@ static int _fill_in_coords(List results, List start_list,
curr_switch = &check_node->axis_switch[X];
for(y=0; y<geometry[Y]; y++) {
- if ((check_node->coord[Y]+y) >= DIM_SIZE[Y]) {
+ if((check_node->coord[Y]+y) >= DIM_SIZE[Y]) {
rc = 0;
goto failed;
}
for(z=0; z<geometry[Z]; z++) {
- if ((check_node->coord[Z]+z) >= DIM_SIZE[Z]) {
+ if((check_node->coord[Z]+z) >= DIM_SIZE[Z]) {
rc = 0;
goto failed;
}
@@ -2907,12 +2907,12 @@ static int _fill_in_coords(List results, List start_list,
[check_node->coord[Y]+y]
[check_node->coord[Z]+z];
- if (ba_node->coord[Y] == check_node->coord[Y]
+ if(ba_node->coord[Y] == check_node->coord[Y]
&& ba_node->coord[Z] == check_node->coord[Z])
continue;
if (!_node_used(ba_node, geometry[X])) {
- if (ba_debug_flags
+ if(ba_debug_flags
& DEBUG_FLAG_BG_ALGO_DEEP)
info("here Adding %c%c%c",
alpha_num[ba_node->
@@ -2946,7 +2946,7 @@ static int _fill_in_coords(List results, List start_list,
itr = list_iterator_create(results);
while((ba_node = (ba_node_t*) list_next(itr))) {
- if (!_find_yz_path(ba_node,
+ if(!_find_yz_path(ba_node,
check_node->coord,
geometry,
conn_type)){
@@ -2955,12 +2955,12 @@ static int _fill_in_coords(List results, List start_list,
}
}
- if (deny_pass) {
- if ((*deny_pass & PASS_DENY_Y)
+ if(deny_pass) {
+ if((*deny_pass & PASS_DENY_Y)
&& (*deny_pass & PASS_FOUND_Y)) {
debug("We don't allow Y passthoughs");
rc = 0;
- } else if ((*deny_pass & PASS_DENY_Z)
+ } else if((*deny_pass & PASS_DENY_Z)
&& (*deny_pass & PASS_FOUND_Z)) {
debug("We don't allow Z passthoughs");
rc = 0;
@@ -3020,8 +3020,8 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
/* follow the path */
node_curr = curr_switch->ext_wire[0].node_tar;
node_tar = curr_switch->ext_wire[port_tar].node_tar;
- if (mark_switch->int_wire[source].used)
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(mark_switch->int_wire[source].used)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("setting dim %d %c%c%c %d-> %c%c%c %d",
dim,
alpha_num[node_curr[X]],
@@ -3033,7 +3033,7 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
alpha_num[node_tar[Z]],
port_tar);
- if (port_tar == 1) {
+ if(port_tar == 1) {
/* found the end of the line */
mark_switch->int_wire[1].used =
curr_switch->int_wire[1].used;
@@ -3045,7 +3045,7 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
mark_node_tar = mark_switch->ext_wire[port_tar].node_tar;
port_tar = curr_switch->ext_wire[port_tar].port_tar;
- if (node_curr[X] == node_tar[X]
+ if(node_curr[X] == node_tar[X]
&& node_curr[Y] == node_tar[Y]
&& node_curr[Z] == node_tar[Z]) {
/* We are going to the same node! this should never
@@ -3063,7 +3063,7 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
/* see what the next switch is going to be */
next_switch = &ba_system_ptr->
grid[node_tar[X]][node_tar[Y]][node_tar[Z]].axis_switch[dim];
- if (!nodes) {
+ if(!nodes) {
/* If no nodes then just get the next switch to fill
in from the main system */
next_mark_switch = &ba_system_ptr->
@@ -3082,7 +3082,7 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
break; /* we found it */
}
list_iterator_destroy(itr);
- if (!ba_node) {
+ if(!ba_node) {
/* If node grab a copy and add it to the list */
ba_node = ba_copy_node(&ba_system_ptr->
grid[mark_node_tar[X]]
@@ -3090,7 +3090,7 @@ static int _copy_the_path(List nodes, ba_switch_t *curr_switch,
[mark_node_tar[Z]]);
_new_ba_node(ba_node, mark_node_tar, false);
list_push(nodes, ba_node);
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("haven't seen %c%c%c adding it",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
@@ -3116,8 +3116,8 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
int count = 0;
for(i2=1;i2<=2;i2++) {
- if (geometry[i2] > 1) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(geometry[i2] > 1) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("%d node %c%c%c port 2 -> ",
i2,
alpha_num[ba_node->coord[X]],
@@ -3125,7 +3125,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
alpha_num[ba_node->coord[Z]]);
dim_curr_switch = &ba_node->axis_switch[i2];
- if (dim_curr_switch->int_wire[2].used) {
+ if(dim_curr_switch->int_wire[2].used) {
debug5("returning here");
return 0;
}
@@ -3135,14 +3135,14 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
next_node = &ba_system_ptr->
grid[node_tar[X]][node_tar[Y]][node_tar[Z]];
dim_next_switch = &next_node->axis_switch[i2];
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("%c%c%c port 5",
alpha_num[next_node->coord[X]],
alpha_num[next_node->coord[Y]],
alpha_num[next_node->coord[Z]]);
- if (dim_next_switch->int_wire[5].used) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(dim_next_switch->int_wire[5].used) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("returning here 2");
return 0;
}
@@ -3157,17 +3157,17 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
* we need then we go through and finish the
* torus if needed
*/
- if (node_tar[i2] < first[i2])
+ if(node_tar[i2] < first[i2])
count = node_tar[i2]+(DIM_SIZE[i2]-first[i2]);
else
count = (node_tar[i2]-first[i2]);
- if (count == geometry[i2]) {
+ if(count == geometry[i2]) {
debug5("found end of me %c%c%c",
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]]);
- if (conn_type == SELECT_TORUS) {
+ if(conn_type == SELECT_TORUS) {
dim_curr_switch->int_wire[0].used = 1;
dim_curr_switch->int_wire[0].port_tar
= 2;
@@ -3176,9 +3176,9 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
= 0;
dim_curr_switch = dim_next_switch;
- if (deny_pass
+ if(deny_pass
&& (node_tar[i2] != first[i2])) {
- if (i2 == 1)
+ if(i2 == 1)
*deny_pass |=
PASS_FOUND_Y;
else
@@ -3186,7 +3186,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
PASS_FOUND_Z;
}
while(node_tar[i2] != first[i2]) {
- if (ba_debug_flags
+ if(ba_debug_flags
& DEBUG_FLAG_BG_ALGO_DEEP)
info("on dim %d at %d "
"looking for %d",
@@ -3194,9 +3194,9 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
node_tar[i2],
first[i2]);
- if (dim_curr_switch->
+ if(dim_curr_switch->
int_wire[2].used) {
- if (ba_debug_flags
+ if(ba_debug_flags
& DEBUG_FLAG_BG_ALGO_DEEP)
info("returning "
"here 3");
@@ -3228,7 +3228,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
axis_switch[i2];
}
- if (ba_debug_flags
+ if(ba_debug_flags
& DEBUG_FLAG_BG_ALGO_DEEP)
info("back to first on dim %d "
"at %d looking for %d",
@@ -3250,7 +3250,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
}
} else if (count < geometry[i2]) {
- if (conn_type == SELECT_TORUS ||
+ if(conn_type == SELECT_TORUS ||
(conn_type == SELECT_MESH &&
(node_tar[i2] != first[i2]))) {
dim_curr_switch->
@@ -3282,7 +3282,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
geometry[i2], i2, count);
return 0;
}
- } else if ((geometry[i2] == 1) && (conn_type == SELECT_TORUS)) {
+ } else if((geometry[i2] == 1) && (conn_type == SELECT_TORUS)) {
/* FIX ME: This is put here because we got
into a state where the Y dim was not being
processed correctly. This will set up the
@@ -3301,7 +3301,7 @@ static int _find_yz_path(ba_node_t *ba_node, int *first,
*/
dim_curr_switch = &ba_node->axis_switch[i2];
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("%d node %c%c%c port 0 -> 1",
i2,
alpha_num[ba_node->coord[X]],
@@ -3322,10 +3322,10 @@ static int _emulate_ext_wiring(ba_node_t ***grid)
{
int x;
ba_node_t *source = NULL, *target = NULL;
- if (cluster_dims == 1) {
+ if(cluster_dims == 1) {
for(x=0;x<DIM_SIZE[X];x++) {
source = &grid[x][0][0];
- if (x<(DIM_SIZE[X]-1))
+ if(x<(DIM_SIZE[X]-1))
target = &grid[x+1][0][0];
else
target = &grid[0][0][0];
@@ -3340,7 +3340,7 @@ static int _emulate_ext_wiring(ba_node_t ***grid)
for(z=0;z<DIM_SIZE[Z];z++) {
source = &grid[x][y][z];
- if (x<(DIM_SIZE[X]-1)) {
+ if(x<(DIM_SIZE[X]-1)) {
target = &grid[x+1][y][z];
} else
target = &grid[0][y][z];
@@ -3348,14 +3348,14 @@ static int _emulate_ext_wiring(ba_node_t ***grid)
_set_external_wires(X, x, source,
target);
- if (y<(DIM_SIZE[Y]-1))
+ if(y<(DIM_SIZE[Y]-1))
target = &grid[x][y+1][z];
else
target = &grid[x][0][z];
_set_external_wires(Y, y, source,
target);
- if (z<(DIM_SIZE[Z]-1))
+ if(z<(DIM_SIZE[Z]-1))
target = &grid[x][y][z+1];
else
target = &grid[x][y][0];
@@ -3379,26 +3379,26 @@ static int _reset_the_path(ba_switch_t *curr_switch, int source,
int port_tar, port_tar1;
ba_switch_t *next_switch = NULL;
- if (source < 0 || source > NUM_PORTS_PER_NODE) {
+ if(source < 0 || source > NUM_PORTS_PER_NODE) {
fatal("source port was %d can only be 0->%d",
source, NUM_PORTS_PER_NODE);
}
- if (target < 0 || target > NUM_PORTS_PER_NODE) {
+ if(target < 0 || target > NUM_PORTS_PER_NODE) {
fatal("target port was %d can only be 0->%d",
target, NUM_PORTS_PER_NODE);
}
/*set the switch to not be used */
- if (!curr_switch->int_wire[source].used) {
+ if(!curr_switch->int_wire[source].used) {
/* This means something overlapping the removing block
already cleared this, or the path just never was
complete in the first place. */
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("I reached the end, the source isn't used");
return 1;
}
curr_switch->int_wire[source].used = 0;
port_tar = curr_switch->int_wire[source].port_tar;
- if (port_tar < 0 || port_tar > NUM_PORTS_PER_NODE) {
+ if(port_tar < 0 || port_tar > NUM_PORTS_PER_NODE) {
fatal("port_tar port was %d can only be 0->%d",
source, NUM_PORTS_PER_NODE);
}
@@ -3407,14 +3407,14 @@ static int _reset_the_path(ba_switch_t *curr_switch, int source,
curr_switch->int_wire[source].port_tar = source;
curr_switch->int_wire[port_tar].used = 0;
curr_switch->int_wire[port_tar].port_tar = port_tar;
- if (port_tar==target) {
+ if(port_tar==target) {
return 1;
}
/* follow the path */
node_curr = curr_switch->ext_wire[0].node_tar;
node_tar = curr_switch->ext_wire[port_tar].node_tar;
port_tar = curr_switch->ext_wire[port_tar].port_tar;
- if (source == port_tar1) {
+ if(source == port_tar1) {
debug("got this bad one %c%c%c %d %d -> %c%c%c %d",
alpha_num[node_curr[X]],
alpha_num[node_curr[Y]],
@@ -3437,7 +3437,7 @@ static int _reset_the_path(ba_switch_t *curr_switch, int source,
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]],
port_tar);
- if (node_curr[X] == node_tar[X]
+ if(node_curr[X] == node_tar[X]
&& node_curr[Y] == node_tar[Y]
&& node_curr[Z] == node_tar[Z]) {
debug5("%d something bad happened!!", dim);
@@ -3455,7 +3455,7 @@ static void _new_ba_node(ba_node_t *ba_node, int *coord, bool track_down_nodes)
int i,j;
uint16_t node_base_state = ba_node->state & NODE_STATE_BASE;
- if (((node_base_state != NODE_STATE_DOWN)
+ if(((node_base_state != NODE_STATE_DOWN)
&& !(ba_node->state & NODE_STATE_DRAIN)) || !track_down_nodes)
ba_node->used = false;
@@ -3464,8 +3464,8 @@ static void _new_ba_node(ba_node_t *ba_node, int *coord, bool track_down_nodes)
for(j=0;j<NUM_PORTS_PER_NODE;j++) {
ba_node->axis_switch[i].int_wire[j].used = 0;
- if (i!=X) {
- if (j==3 || j==4)
+ if(i!=X) {
+ if(j==3 || j==4)
ba_node->axis_switch[i].int_wire[j].
used = 1;
}
@@ -3508,7 +3508,7 @@ static void _delete_ba_system(void)
return;
}
- if (ba_system_ptr->grid) {
+ if(ba_system_ptr->grid) {
for (x=0; x<DIM_SIZE[X]; x++) {
for (y=0; y<DIM_SIZE[Y]; y++)
xfree(ba_system_ptr->grid[x][y]);
@@ -3542,17 +3542,17 @@ static int _find_match(ba_request_t *ba_request, List results)
int startx;
int *geo_ptr;
- if (!(cluster_flags & CLUSTER_FLAG_BG))
+ if(!(cluster_flags & CLUSTER_FLAG_BG))
return 0;
memset(start, 0, sizeof(start));
startx = (start[X]-1);
- if (startx == -1)
+ if(startx == -1)
startx = DIM_SIZE[X]-1;
- if (ba_request->start_req) {
+ if(ba_request->start_req) {
for(x=0;x<cluster_dims;x++) {
- if (ba_request->start[x]>=DIM_SIZE[x])
+ if(ba_request->start[x]>=DIM_SIZE[x])
return 0;
start[x] = ba_request->start[x];
}
@@ -3560,7 +3560,7 @@ static int _find_match(ba_request_t *ba_request, List results)
x=0;
/* set up the geo here */
- if (!(geo_ptr = list_peek(ba_request->elongate_geos)))
+ if(!(geo_ptr = list_peek(ba_request->elongate_geos)))
return 0;
ba_request->rotate_count=0;
ba_request->elongate_count=1;
@@ -3568,26 +3568,26 @@ static int _find_match(ba_request_t *ba_request, List results)
ba_request->geometry[Y] = geo_ptr[Y];
ba_request->geometry[Z] = geo_ptr[Z];
- if (ba_request->geometry[X]>DIM_SIZE[X]
+ if(ba_request->geometry[X]>DIM_SIZE[X]
|| ba_request->geometry[Y]>DIM_SIZE[Y]
|| ba_request->geometry[Z]>DIM_SIZE[Z])
- if (!_check_for_options(ba_request))
+ if(!_check_for_options(ba_request))
return 0;
start_again:
x=0;
- if (x == startx)
+ if(x == startx)
x = startx-1;
while(x!=startx) {
x++;
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("finding %c%c%c try %d",
alpha_num[ba_request->geometry[X]],
alpha_num[ba_request->geometry[Y]],
alpha_num[ba_request->geometry[Z]],
x);
new_node:
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("starting at %c%c%c",
alpha_num[start[X]],
alpha_num[start[Y]],
@@ -3596,7 +3596,7 @@ start_again:
ba_node = &ba_system_ptr->grid[start[X]][start[Y]][start[Z]];
if (!_node_used(ba_node, ba_request->geometry[X])) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("trying this node %c%c%c %c%c%c %d",
alpha_num[start[X]],
alpha_num[start[Y]],
@@ -3609,31 +3609,31 @@ start_again:
start,
ba_request->geometry,
ba_request->conn_type);
- if (name) {
+ if(name) {
ba_request->save_name = xstrdup(name);
xfree(name);
return 1;
}
- if (results) {
+ if(results) {
remove_block(results, color_count,
ba_request->conn_type);
list_delete_all(results,
&empty_null_destroy_list, "");
}
- if (ba_request->start_req)
+ if(ba_request->start_req)
goto requested_end;
//exit(0);
debug2("trying something else");
}
- if ((DIM_SIZE[Z]-start[Z]-1)
+ if((DIM_SIZE[Z]-start[Z]-1)
>= ba_request->geometry[Z])
start[Z]++;
else {
start[Z] = 0;
- if ((DIM_SIZE[Y]-start[Y]-1)
+ if((DIM_SIZE[Y]-start[Y]-1)
>= ba_request->geometry[Y])
start[Y]++;
else {
@@ -3642,9 +3642,9 @@ start_again:
>= ba_request->geometry[X])
start[X]++;
else {
- if (ba_request->size == 1)
+ if(ba_request->size == 1)
goto requested_end;
- if (!_check_for_options(ba_request))
+ if(!_check_for_options(ba_request))
return 0;
else {
start[X]=0;
@@ -3675,7 +3675,7 @@ static bool _node_used(ba_node_t* ba_node, int x_size)
ba_switch_t* ba_switch = NULL;
/* if we've used this node in another block already */
if (!ba_node || ba_node->used) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("node %c%c%c used",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
@@ -3688,7 +3688,7 @@ static bool _node_used(ba_node_t* ba_node, int x_size)
can be set up to do all the dim's if in the future if it is
needed. We only need to check this if we are planning on
using more than 1 midplane in the block creation */
- if (x_size > 1) {
+ if(x_size > 1) {
/* get the switch of the X Dimension */
ba_switch = &ba_node->axis_switch[X];
@@ -3697,8 +3697,8 @@ static bool _node_used(ba_node_t* ba_node, int x_size)
can use since these can not connect to each
other they must be connected to the other ports.
*/
- if (ba_switch->int_wire[3].used && ba_switch->int_wire[5].used) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_switch->int_wire[3].used && ba_switch->int_wire[5].used) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("switch full in the X dim on node %c%c%c!",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
@@ -3767,7 +3767,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
char from_node[NODE_LEN];
char to_node[NODE_LEN];
- if (working_cluster_rec) {
+ if(working_cluster_rec) {
error("Can't do this cross-cluster");
return -1;
}
@@ -3777,7 +3777,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
}
if (!bg) {
- if ((rc = bridge_get_bg(&bg)) != STATUS_OK) {
+ if((rc = bridge_get_bg(&bg)) != STATUS_OK) {
error("bridge_get_BG(): %d", rc);
return -1;
}
@@ -3813,12 +3813,12 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
break;
}
- if (!wire_id) {
+ if(!wire_id) {
error("No Wire ID was returned from database");
continue;
}
- if (wire_id[UNDER_POS] != '_')
+ if(wire_id[UNDER_POS] != '_')
continue;
switch(wire_id[0]) {
case 'X':
@@ -3831,7 +3831,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
dim = Z;
break;
}
- if (strlen(wire_id) < VAL_NAME_LEN) {
+ if(strlen(wire_id) < VAL_NAME_LEN) {
error("Wire_id isn't correct %s",wire_id);
continue;
}
@@ -3864,21 +3864,21 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
}
coord = find_bp_loc(from_node);
- if (!coord) {
+ if(!coord) {
error("1 find_bp_loc: bpid %s not known", from_node);
continue;
}
- if (!validate_coord(coord))
+ if(!validate_coord(coord))
continue;
source = &ba_system_ptr->
grid[coord[X]][coord[Y]][coord[Z]];
coord = find_bp_loc(to_node);
- if (!coord) {
+ if(!coord) {
error("2 find_bp_loc: bpid %s not known", to_node);
continue;
}
- if (!validate_coord(coord))
+ if(!validate_coord(coord))
continue;
target = &ba_system_ptr->
@@ -3889,7 +3889,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
_port_enum(from_port),
_port_enum(to_port));
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("dim %d from %c%c%c %d -> %c%c%c %d",
dim,
alpha_num[source->coord[X]],
@@ -3904,17 +3904,17 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
#else
_switch_config(source, source, dim, 0, 0);
_switch_config(source, source, dim, 1, 1);
- if (dim!=X) {
+ if(dim!=X) {
_switch_config(source, target, dim, 2, 5);
_switch_config(source, source, dim, 3, 3);
_switch_config(source, source, dim, 4, 4);
return 1;
}
- if (cluster_dims == 1) {
- if (count == 0)
+ if(cluster_dims == 1) {
+ if(count == 0)
_switch_config(source, source, dim, 5, 5);
- else if (count < DIM_SIZE[X]-1)
+ else if(count < DIM_SIZE[X]-1)
_switch_config(source, target, dim, 2, 5);
else
_switch_config(source, source, dim, 2, 2);
@@ -3928,8 +3928,8 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
_switch_config(source, target, dim, 2, 5);
/* set up split x */
- if (DIM_SIZE[X] == 1) {
- } else if (DIM_SIZE[X] == 4) {
+ if(DIM_SIZE[X] == 1) {
+ } else if(DIM_SIZE[X] == 4) {
switch(count) {
case 0:
case 3:
@@ -3958,7 +3958,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
count, DIM_SIZE[X]);
break;
}
- } else if (DIM_SIZE[X] == 5) {
+ } else if(DIM_SIZE[X] == 5) {
/* 4 X dim fixes for wires */
switch(count) {
case 0:
@@ -4000,7 +4000,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
count, DIM_SIZE[X]);
break;
}
- } else if (DIM_SIZE[X] == 8) {
+ } else if(DIM_SIZE[X] == 8) {
switch(count) {
case 0:
case 4:
@@ -4053,7 +4053,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
count, DIM_SIZE[X]);
break;
}
- } else if (DIM_SIZE[X] == 9) {
+ } else if(DIM_SIZE[X] == 9) {
switch(count) {
case 0:
case 4:
@@ -4104,7 +4104,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
count, DIM_SIZE[X]);
break;
}
- } else if (DIM_SIZE[X] == 13) {
+ } else if(DIM_SIZE[X] == 13) {
int temp_num = 0;
switch(count) {
@@ -4130,7 +4130,7 @@ static int _set_external_wires(int dim, int count, ba_node_t* source,
* from 4->3 and back again
*/
temp_num = 12 - (count - 1);
- if (temp_num < 5)
+ if(temp_num < 5)
fatal("node %d shouldn't go to %d",
count, temp_num);
@@ -4174,7 +4174,7 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
hostlist_t hostlist;
char temp_name[4];
- if (!nodes)
+ if(!nodes)
return NULL;
name = xmalloc(BUFSIZE);
@@ -4185,7 +4185,7 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
alpha_num[ba_node[count]->coord[X]],
alpha_num[ba_node[count]->coord[Y]],
alpha_num[ba_node[count]->coord[Z]]);
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("name = %s", temp_name);
count++;
hostlist_push(hostlist, temp_name);
@@ -4198,12 +4198,12 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
hostlist_destroy(hostlist);
for(i=0;i<count;i++) {
- if (!ba_node[i]->used) {
+ if(!ba_node[i]->used) {
ba_node[i]->used=1;
- if (ba_node[i]->letter == '.') {
+ if(ba_node[i]->letter == '.') {
ba_node[i]->letter = letters[color_count%62];
ba_node[i]->color = colors[color_count%6];
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("count %d setting letter = %c "
"color = %d",
color_count,
@@ -4221,12 +4221,12 @@ static char *_set_internal_wires(List nodes, int size, int conn_type)
}
}
- if (conn_type == SELECT_TORUS)
+ if(conn_type == SELECT_TORUS)
for(i=0;i<count;i++) {
_set_one_dim(start, end, ba_node[i]->coord);
}
- if (set)
+ if(set)
color_count++;
return name;
@@ -4270,16 +4270,16 @@ static int _find_x_path(List results, ba_node_t *ba_node,
ListIterator itr = NULL;
- if (!ba_node || !results || !start)
+ if(!ba_node || !results || !start)
return 0;
curr_switch = &ba_node->axis_switch[X];
/* we don't need to go any further */
- if (x_size == 1) {
+ if(x_size == 1) {
/* Only set this if Torus since mesh doesn't have any
* connections in this path */
- if (conn_type == SELECT_TORUS) {
+ if(conn_type == SELECT_TORUS) {
curr_switch->int_wire[source_port].used = 1;
curr_switch->int_wire[source_port].port_tar =
target_port;
@@ -4290,10 +4290,10 @@ static int _find_x_path(List results, ba_node_t *ba_node,
return 1;
}
- if (algo == BLOCK_ALGO_FIRST) {
+ if(algo == BLOCK_ALGO_FIRST) {
ports_to_try[0] = 4;
ports_to_try[1] = 2;
- } else if (algo == BLOCK_ALGO_SECOND) {
+ } else if(algo == BLOCK_ALGO_SECOND) {
ports_to_try[0] = 2;
ports_to_try[1] = 4;
} else {
@@ -4301,14 +4301,14 @@ static int _find_x_path(List results, ba_node_t *ba_node,
return 0;
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("Algo(%d) found - %d", algo, found);
/* Check the 2 ports we can leave though in ports_to_try */
for(i=0;i<2;i++) {
/* info("trying port %d", ports_to_try[i]); */
/* check to make sure it isn't used */
- if (!curr_switch->int_wire[ports_to_try[i]].used) {
+ if(!curr_switch->int_wire[ports_to_try[i]].used) {
/* looking at the next node on the switch
and it's port we are going to */
node_tar = curr_switch->
@@ -4326,14 +4326,14 @@ static int _find_x_path(List results, ba_node_t *ba_node,
/* port_tar); */
/* check to see if we are back at the start of the
block */
- if ((node_tar[X] == start[X]
+ if((node_tar[X] == start[X]
&& node_tar[Y] == start[Y]
&& node_tar[Z] == start[Z])) {
broke = 1;
goto broke_it;
}
/* check to see if the port points to itself */
- if ((node_tar[X] == ba_node->coord[X]
+ if((node_tar[X] == ba_node->coord[X]
&& node_tar[Y] == ba_node->coord[Y]
&& node_tar[Z] == ba_node->coord[Z])) {
continue;
@@ -4342,7 +4342,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
already been before */
itr = list_iterator_create(results);
while((next_node = list_next(itr))) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("Algo(%d) looking at %c%c%c "
"and %c%c%c",
algo,
@@ -4352,7 +4352,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]]);
- if ((node_tar[X] == next_node->coord[X]
+ if((node_tar[X] == next_node->coord[X]
&& node_tar[Y] == next_node->coord[Y]
&& node_tar[Z] == next_node->coord[Z])) {
not_first = 1;
@@ -4360,8 +4360,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
}
}
list_iterator_destroy(itr);
- if (not_first && found < DIM_SIZE[X]) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(not_first && found < DIM_SIZE[X]) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) already been there "
"before", algo);
not_first = 0;
@@ -4375,36 +4375,36 @@ static int _find_x_path(List results, ba_node_t *ba_node,
[node_tar[Z]];
next_switch = &next_node->axis_switch[X];
- if ((conn_type == SELECT_MESH) && (found == (x_size))) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if((conn_type == SELECT_MESH) && (found == (x_size))) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) we found the end of "
"the mesh", algo);
return 1;
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("Algo(%d) Broke = %d Found = %d "
"x_size = %d",
algo, broke, found, x_size);
- if (broke && (found == x_size)) {
+ if(broke && (found == x_size)) {
goto found_path;
- } else if (found == x_size) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ } else if(found == x_size) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) finishing the torus!",
algo);
- if (deny_pass && (*deny_pass & PASS_DENY_X)) {
+ if(deny_pass && (*deny_pass & PASS_DENY_X)) {
info("we don't allow passthroughs 1");
return 0;
}
- if (best_path)
+ if(best_path)
list_flush(best_path);
else
best_path =
list_create(_delete_path_list);
- if (path)
+ if(path)
list_flush(path);
else
path = list_create(_delete_path_list);
@@ -4412,8 +4412,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
_finish_torus(results,
curr_switch, 0, X, 0, start);
- if (best_count < BEST_COUNT_INIT) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(best_count < BEST_COUNT_INIT) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) Found a best path "
"with %d steps.",
algo, best_count);
@@ -4422,13 +4422,13 @@ static int _find_x_path(List results, ba_node_t *ba_node,
} else {
return 0;
}
- } else if (broke) {
+ } else if(broke) {
broke = 0;
continue;
}
if (!_node_used(next_node, x_size)) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) found %d looking at "
"%c%c%c %d going to %c%c%c %d",
algo,
@@ -4443,7 +4443,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
port_tar);
itr = list_iterator_create(results);
while((check_node = list_next(itr))) {
- if ((node_tar[X] == check_node->coord[X]
+ if((node_tar[X] == check_node->coord[X]
&& node_tar[Y] ==
check_node->coord[Y]
&& node_tar[Z] ==
@@ -4452,8 +4452,8 @@ static int _find_x_path(List results, ba_node_t *ba_node,
}
}
list_iterator_destroy(itr);
- if (!check_node) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(!check_node) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) add %c%c%c",
algo,
alpha_num[next_node->
@@ -4464,7 +4464,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
coord[Z]]);
list_append(results, next_node);
} else {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) Hey this is "
"already added %c%c%c",
algo,
@@ -4476,7 +4476,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
found++;
/* look for the next closest midplane */
- if (!_find_x_path(results, next_node,
+ if(!_find_x_path(results, next_node,
start, x_size,
found, conn_type, algo)) {
_remove_node(results, next_node->coord);
@@ -4484,7 +4484,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
continue;
} else {
found_path:
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) added node "
"%c%c%c %d %d -> "
"%c%c%c %d %d",
@@ -4528,12 +4528,12 @@ static int _find_x_path(List results, ba_node_t *ba_node,
}
}
- if (algo == BLOCK_ALGO_FIRST) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(algo == BLOCK_ALGO_FIRST) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) couldn't find path", algo);
return 0;
- } else if (algo == BLOCK_ALGO_SECOND) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ } else if(algo == BLOCK_ALGO_SECOND) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) looking for the next free node "
"starting at %c%c%c",
algo,
@@ -4541,25 +4541,25 @@ static int _find_x_path(List results, ba_node_t *ba_node,
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
- if (best_path)
+ if(best_path)
list_flush(best_path);
else
best_path = list_create(_delete_path_list);
- if (path)
+ if(path)
list_flush(path);
else
path = list_create(_delete_path_list);
_find_next_free_using_port_2(curr_switch, 0, results, X, 0);
- if (best_count < BEST_COUNT_INIT) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(best_count < BEST_COUNT_INIT) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) yes found next free %d", algo,
best_count);
node_tar = _set_best_path();
- if (deny_pass && (*deny_pass & PASS_DENY_X)
+ if(deny_pass && (*deny_pass & PASS_DENY_X)
&& (*deny_pass & PASS_FOUND_X)) {
debug("We don't allow X passthoughs.");
return 0;
@@ -4571,7 +4571,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
next_switch = &next_node->axis_switch[X];
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) found %d looking at %c%c%c "
"going to %c%c%c %d",
algo, found,
@@ -4585,7 +4585,7 @@ static int _find_x_path(List results, ba_node_t *ba_node,
list_append(results, next_node);
found++;
- if (_find_x_path(results, next_node,
+ if(_find_x_path(results, next_node,
start, x_size, found,
conn_type, algo)) {
return 1;
@@ -4593,13 +4593,13 @@ static int _find_x_path(List results, ba_node_t *ba_node,
found--;
_reset_the_path(curr_switch, 0, 1, X);
_remove_node(results, next_node->coord);
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) couldn't finish "
"the path off this one", algo);
}
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("Algo(%d) couldn't find path", algo);
return 0;
}
@@ -4618,10 +4618,10 @@ static int _remove_node(List results, int *node_tar)
while((ba_node = (ba_node_t*) list_next(itr))) {
#ifdef HAVE_BG_L_P
- if (node_tar[X] == ba_node->coord[X]
+ if(node_tar[X] == ba_node->coord[X]
&& node_tar[Y] == ba_node->coord[Y]
&& node_tar[Z] == ba_node->coord[Z]) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("removing %c%c%c from list",
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
@@ -4630,8 +4630,8 @@ static int _remove_node(List results, int *node_tar)
break;
}
#else
- if (node_tar[X] == ba_node->coord[X]) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(node_tar[X] == ba_node->coord[X]) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("removing %d from list",
node_tar[X]);
list_remove (itr);
@@ -4674,12 +4674,12 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
path_add->dim = dim;
path_add->in = source_port;
- if (count>=best_count)
+ if(count>=best_count)
goto return_0;
itr = list_iterator_create(nodes);
while((ba_node = (ba_node_t*) list_next(itr))) {
- if (node_tar[X] == ba_node->coord[X]
+ if(node_tar[X] == ba_node->coord[X]
&& node_tar[Y] == ba_node->coord[Y]
&& node_tar[Z] == ba_node->coord[Z]) {
broke = 1;
@@ -4688,16 +4688,16 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
}
list_iterator_destroy(itr);
- if (!broke && count>0 &&
+ if(!broke && count>0 &&
!ba_system_ptr->grid[node_tar[X]][node_tar[Y]][node_tar[Z]].used) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("this one not found %c%c%c",
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]]);
broke = 0;
- if ((source_port%2))
+ if((source_port%2))
target_port=1;
list_flush(best_path);
@@ -4726,15 +4726,15 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
}
used=0;
- if (!curr_switch->int_wire[port_to_try].used) {
+ if(!curr_switch->int_wire[port_to_try].used) {
itr = list_iterator_create(path);
while((path_switch =
(ba_path_switch_t*) list_next(itr))){
- if (((path_switch->geometry[X] == node_src[X])
+ if(((path_switch->geometry[X] == node_src[X])
&& (path_switch->geometry[Y] == node_src[Y])
&& (path_switch->geometry[Z] == node_tar[Z]))) {
- if ( path_switch->out
+ if( path_switch->out
== port_to_try) {
used = 1;
break;
@@ -4744,7 +4744,7 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
list_iterator_destroy(itr);
/* check to see if wire 0 is used with this port */
- if (curr_switch->
+ if(curr_switch->
ext_wire[port_to_try].node_tar[X]
== curr_switch->ext_wire[0].node_tar[X]
&& curr_switch->ext_wire[port_to_try].node_tar[Y]
@@ -4754,7 +4754,7 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
used = 1;
}
- if (!used) {
+ if(!used) {
port_tar = curr_switch->
ext_wire[port_to_try].port_tar;
node_tar = curr_switch->
@@ -4772,7 +4772,7 @@ static int _find_next_free_using_port_2(ba_switch_t *curr_switch,
dim, count);
while((temp_switch = list_pop(path)) != path_add){
xfree(temp_switch);
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("something here 1");
}
}
@@ -4824,17 +4824,17 @@ static int _finish_torus(List results,
path_add->dim = dim;
path_add->in = source_port;
- if (count>=best_count) {
+ if(count>=best_count) {
xfree(path_add);
return 0;
}
- if (node_tar[X] == start[X]
+ if(node_tar[X] == start[X]
&& node_tar[Y] == start[Y]
&& node_tar[Z] == start[Z]) {
- if ((source_port%2))
+ if((source_port%2))
target_port=1;
- if (!curr_switch->int_wire[target_port].used) {
+ if(!curr_switch->int_wire[target_port].used) {
list_flush(best_path);
@@ -4864,22 +4864,22 @@ static int _finish_torus(List results,
}
}
- if (source_port==0 || source_port==3 || source_port==5) {
+ if(source_port==0 || source_port==3 || source_port==5) {
ports_to_try[0] = 4;
ports_to_try[1] = 2;
}
for(i=0;i<2;i++) {
used=0;
- if (!curr_switch->int_wire[ports_to_try[i]].used) {
+ if(!curr_switch->int_wire[ports_to_try[i]].used) {
itr = list_iterator_create(path);
while((path_switch = list_next(itr))){
- if (((path_switch->geometry[X] == node_src[X])
+ if(((path_switch->geometry[X] == node_src[X])
&& (path_switch->geometry[Y] == node_src[Y])
&& (path_switch->geometry[Z]
== node_tar[Z]))) {
- if ( path_switch->out
+ if( path_switch->out
== ports_to_try[i]) {
used = 1;
break;
@@ -4889,7 +4889,7 @@ static int _finish_torus(List results,
list_iterator_destroy(itr);
/* check to see if wire 0 is used with this port */
- if ((curr_switch->
+ if((curr_switch->
ext_wire[ports_to_try[i]].node_tar[X] ==
curr_switch->ext_wire[0].node_tar[X] &&
curr_switch->
@@ -4902,7 +4902,7 @@ static int _finish_torus(List results,
}
- if (!used) {
+ if(!used) {
ba_node_t *next_node = NULL;
port_tar = curr_switch->
ext_wire[ports_to_try[i]].port_tar;
@@ -4917,7 +4917,7 @@ static int _finish_torus(List results,
allow it. */
itr = list_iterator_create(results);
while((next_node = list_next(itr))) {
- if (ba_debug_flags
+ if(ba_debug_flags
& DEBUG_FLAG_BG_ALGO_DEEP)
info("finishing_torus: "
"looking at %c%c%c "
@@ -4931,7 +4931,7 @@ static int _finish_torus(List results,
alpha_num[node_tar[X]],
alpha_num[node_tar[Y]],
alpha_num[node_tar[Z]]);
- if ((node_tar[X] == next_node->coord[X])
+ if((node_tar[X] == next_node->coord[X])
&& (node_tar[Y]
== next_node->coord[Y])
&& (node_tar[Z]
@@ -4940,8 +4940,8 @@ static int _finish_torus(List results,
}
}
list_iterator_destroy(itr);
- if (next_node) {
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO)
+ if(next_node) {
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO)
info("finishing_torus: "
"Can't finish torus with "
"%c%c%c we already were "
@@ -4968,7 +4968,7 @@ static int _finish_torus(List results,
while((temp_switch = list_pop(path))
!= path_add){
xfree(temp_switch);
- if (ba_debug_flags
+ if(ba_debug_flags
& DEBUG_FLAG_BG_ALGO_DEEP)
info("something here 3");
}
@@ -4992,22 +4992,22 @@ static int *_set_best_path()
ba_switch_t *curr_switch = NULL;
int *geo = NULL;
- if (!best_path)
+ if(!best_path)
return NULL;
itr = list_iterator_create(best_path);
while((path_switch = (ba_path_switch_t*) list_next(itr))) {
- if (deny_pass && path_switch->in > 1 && path_switch->out > 1) {
+ if(deny_pass && path_switch->in > 1 && path_switch->out > 1) {
*deny_pass |= PASS_FOUND_X;
debug2("got a passthrough in X");
}
- if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
+ if(ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
info("mapping %c%c%c %d->%d",
alpha_num[path_switch->geometry[X]],
alpha_num[path_switch->geometry[Y]],
alpha_num[path_switch->geometry[Z]],
path_switch->in, path_switch->out);
- if (!geo)
+ if(!geo)
geo = path_switch->geometry;
curr_switch = &ba_system_ptr->grid
[path_switch->geometry[X]]
@@ -5034,11 +5034,11 @@ static int _set_one_dim(int *start, int *end, int *coord)
ba_switch_t *curr_switch = NULL;
for(dim=0;dim<cluster_dims;dim++) {
- if (start[dim]==end[dim]) {
+ if(start[dim]==end[dim]) {
curr_switch = &ba_system_ptr->grid
[coord[X]][coord[Y]][coord[Z]].axis_switch[dim];
- if (!curr_switch->int_wire[0].used
+ if(!curr_switch->int_wire[0].used
&& !curr_switch->int_wire[1].used) {
curr_switch->int_wire[0].used = 1;
curr_switch->int_wire[0].port_tar = 1;
diff --git a/src/plugins/select/bluegene/block_allocator/bridge_linker.c b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
index 5d7a4f942501fef85dd061b9bc44779dedcffcc8..185ae72663e4a66b5f075968e95bf86436c767f5 100644
--- a/src/plugins/select/bluegene/block_allocator/bridge_linker.c
+++ b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
@@ -226,13 +226,13 @@ extern int bridge_init()
int n_syms;
int rc;
- if (initialized)
+ if(initialized)
return 1;
n_syms = sizeof( syms ) / sizeof( char * );
initialized = true;
- if (!_get_syms(n_syms, syms, (void **) &bridge_api))
+ if(!_get_syms(n_syms, syms, (void **) &bridge_api))
return 0;
#ifdef BG_SERIAL
debug("setting the serial to %s", BG_SERIAL);
@@ -249,7 +249,7 @@ extern int bridge_init()
extern int bridge_fini()
{
- if (handle)
+ if(handle)
dlclose(handle);
initialized = false;
@@ -259,7 +259,7 @@ extern int bridge_fini()
extern status_t bridge_get_bg(my_bluegene_t **bg)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -271,7 +271,7 @@ extern status_t bridge_get_bg(my_bluegene_t **bg)
extern status_t bridge_add_block(rm_partition_t *partition)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -285,7 +285,7 @@ extern status_t bridge_get_block(pm_partition_id_t pid,
rm_partition_t **partition)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -299,7 +299,7 @@ extern status_t bridge_get_block_info(pm_partition_id_t pid,
rm_partition_t **partition)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
/* this is here to make sure we don't lock up things with
@@ -307,7 +307,7 @@ extern status_t bridge_get_block_info(pm_partition_id_t pid,
rc = pthread_mutex_trylock(&api_file_mutex);
if (rc == EBUSY)
return rc;
- else if (rc) {
+ else if(rc) {
errno = rc;
error("%s:%d %s: pthread_mutex_trylock(): %m",
__FILE__, __LINE__, __CURRENT_FUNC__);
@@ -324,7 +324,7 @@ extern status_t bridge_modify_block(pm_partition_id_t pid,
enum rm_modify_op op, const void *data)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -337,7 +337,7 @@ extern status_t bridge_modify_block(pm_partition_id_t pid,
extern status_t bridge_set_block_owner(pm_partition_id_t pid, const char *name)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -350,7 +350,7 @@ extern status_t bridge_set_block_owner(pm_partition_id_t pid, const char *name)
extern status_t bridge_add_block_user(pm_partition_id_t pid, const char *name)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -364,7 +364,7 @@ extern status_t bridge_remove_block_user(pm_partition_id_t pid,
const char *name)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -377,7 +377,7 @@ extern status_t bridge_remove_block_user(pm_partition_id_t pid,
extern status_t bridge_remove_block(pm_partition_id_t pid)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -391,7 +391,7 @@ extern status_t bridge_get_blocks(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -405,7 +405,7 @@ extern status_t bridge_get_blocks_info(rm_partition_state_flag_t flag,
rm_partition_list_t **part_list)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -418,7 +418,7 @@ extern status_t bridge_get_blocks_info(rm_partition_state_flag_t flag,
extern status_t bridge_get_job(db_job_id_t dbJobId, rm_job_t **job)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -431,7 +431,7 @@ extern status_t bridge_get_job(db_job_id_t dbJobId, rm_job_t **job)
extern status_t bridge_get_jobs(rm_job_state_flag_t flag, rm_job_list_t **jobs)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -444,7 +444,7 @@ extern status_t bridge_get_jobs(rm_job_state_flag_t flag, rm_job_list_t **jobs)
extern status_t bridge_remove_job(db_job_id_t jid)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -458,7 +458,7 @@ extern status_t bridge_get_nodecards(rm_bp_id_t bpid,
rm_nodecard_list_t **nc_list)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -471,7 +471,7 @@ extern status_t bridge_get_nodecards(rm_bp_id_t bpid,
extern status_t bridge_new_nodecard(rm_nodecard_t **nodecard)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -484,7 +484,7 @@ extern status_t bridge_new_nodecard(rm_nodecard_t **nodecard)
extern status_t bridge_free_nodecard(rm_nodecard_t *nodecard)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -498,7 +498,7 @@ extern status_t bridge_free_nodecard(rm_nodecard_t *nodecard)
extern status_t bridge_new_ionode(rm_ionode_t **ionode)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -511,7 +511,7 @@ extern status_t bridge_new_ionode(rm_ionode_t **ionode)
extern status_t bridge_free_ionode(rm_ionode_t *ionode)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -525,7 +525,7 @@ extern status_t bridge_free_ionode(rm_ionode_t *ionode)
extern status_t bridge_new_block(rm_partition_t **partition)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -538,7 +538,7 @@ extern status_t bridge_new_block(rm_partition_t **partition)
extern status_t bridge_free_block(rm_partition_t *partition)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -551,7 +551,7 @@ extern status_t bridge_free_block(rm_partition_t *partition)
extern status_t bridge_free_job(rm_job_t *job)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -564,7 +564,7 @@ extern status_t bridge_free_job(rm_job_t *job)
extern status_t bridge_free_bg(my_bluegene_t *bg)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -577,7 +577,7 @@ extern status_t bridge_free_bg(my_bluegene_t *bg)
extern status_t bridge_free_block_list(rm_partition_list_t *part_list)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -590,7 +590,7 @@ extern status_t bridge_free_block_list(rm_partition_list_t *part_list)
extern status_t bridge_free_job_list(rm_job_list_t *job_list)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -603,7 +603,7 @@ extern status_t bridge_free_job_list(rm_job_list_t *job_list)
extern status_t bridge_free_nodecard_list(rm_nodecard_list_t *nc_list)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -617,7 +617,7 @@ extern status_t bridge_get_data(rm_element_t* element,
enum rm_specification field, void *data)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -631,7 +631,7 @@ extern status_t bridge_set_data(rm_element_t* element,
enum rm_specification field, void *data)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -645,7 +645,7 @@ extern status_t bridge_set_data(rm_element_t* element,
extern status_t bridge_signal_job(db_job_id_t jid, rm_signal_t sig)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -658,7 +658,7 @@ extern status_t bridge_signal_job(db_job_id_t jid, rm_signal_t sig)
extern status_t bridge_cancel_job(db_job_id_t jid)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -672,7 +672,7 @@ extern status_t bridge_cancel_job(db_job_id_t jid)
extern status_t bridge_create_block(pm_partition_id_t pid)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -686,7 +686,7 @@ extern status_t bridge_create_block(pm_partition_id_t pid)
extern status_t bridge_reboot_block(pm_partition_id_t pid)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -700,7 +700,7 @@ extern status_t bridge_reboot_block(pm_partition_id_t pid)
extern status_t bridge_destroy_block(pm_partition_id_t pid)
{
int rc = CONNECTION_ERROR;
- if (!bridge_init())
+ if(!bridge_init())
return rc;
slurm_mutex_lock(&api_file_mutex);
@@ -716,11 +716,11 @@ extern int bridge_set_log_params(char *api_file_name, unsigned int level)
FILE *fp2 = NULL;
int rc = SLURM_SUCCESS;
- if (!bridge_init())
+ if(!bridge_init())
return SLURM_ERROR;
slurm_mutex_lock(&api_file_mutex);
- if (fp)
+ if(fp)
fp2 = fp;
fp = fopen(api_file_name, "a");
@@ -739,7 +739,7 @@ extern int bridge_set_log_params(char *api_file_name, unsigned int level)
log */
//(void)dup2(fileno(fp), STDERR_FILENO);
- if (fp2)
+ if(fp2)
fclose(fp2);
end_it:
slurm_mutex_unlock(&api_file_mutex);
diff --git a/src/plugins/select/bluegene/block_allocator/wire_test.c b/src/plugins/select/bluegene/block_allocator/wire_test.c
index a444a11ece6de790ef4da0ed23f99c3ea2d7542f..dfe1d3bd63f7f501c1ae686a997cd5e29cea1d08 100644
--- a/src/plugins/select/bluegene/block_allocator/wire_test.c
+++ b/src/plugins/select/bluegene/block_allocator/wire_test.c
@@ -87,7 +87,7 @@ int main(int argc, char** argv)
/* request->conn_type = SELECT_TORUS; */
/* new_ba_request(request); */
/* print_ba_request(request); */
-/* if (!allocate_block(request, results)) { */
+/* if(!allocate_block(request, results)) { */
/* debug("couldn't allocate %c%c%c", */
/* alpha_num[request->geometry[0]], */
/* alpha_num[request->geometry[1]], */
@@ -110,7 +110,7 @@ int main(int argc, char** argv)
/* request->conn_type = SELECT_TORUS; */
/* new_ba_request(request); */
/* print_ba_request(request); */
-/* if (!allocate_block(request, results)) { */
+/* if(!allocate_block(request, results)) { */
/* debug("couldn't allocate %c%c%c", */
/* request->geometry[0], */
/* request->geometry[1], */
@@ -133,7 +133,7 @@ int main(int argc, char** argv)
request->conn_type = SELECT_TORUS;
new_ba_request(request);
print_ba_request(request);
- if (!allocate_block(request, results)) {
+ if(!allocate_block(request, results)) {
debug("couldn't allocate %c%c%c",
request->geometry[0],
request->geometry[1],
diff --git a/src/plugins/select/bluegene/plugin/bg_block_info.c b/src/plugins/select/bluegene/plugin/bg_block_info.c
index 96fecf3aa24d58eb0efeb595be7bc87ed9330701..6570ca4142b3f3c4382dd39a980550c99e167354 100644
--- a/src/plugins/select/bluegene/plugin/bg_block_info.c
+++ b/src/plugins/select/bluegene/plugin/bg_block_info.c
@@ -87,20 +87,20 @@ static int _block_is_deallocating(bg_record_t *bg_record)
int jobid = bg_record->job_running;
char *user_name = NULL;
- if (bg_record->modifying)
+ if(bg_record->modifying)
return SLURM_SUCCESS;
user_name = xstrdup(bg_conf->slurm_user_name);
- if (remove_all_users(bg_record->bg_block_id, NULL)
+ if(remove_all_users(bg_record->bg_block_id, NULL)
== REMOVE_USER_ERR) {
error("Something happened removing "
"users from block %s",
bg_record->bg_block_id);
}
- if (bg_record->target_name && bg_record->user_name) {
- if (!strcmp(bg_record->target_name, user_name)) {
- if (strcmp(bg_record->target_name, bg_record->user_name)
+ if(bg_record->target_name && bg_record->user_name) {
+ if(!strcmp(bg_record->target_name, user_name)) {
+ if(strcmp(bg_record->target_name, bg_record->user_name)
|| (jobid > NO_JOB_RUNNING)) {
kill_job_struct_t *freeit =
xmalloc(sizeof(freeit));
@@ -123,7 +123,7 @@ static int _block_is_deallocating(bg_record_t *bg_record)
"for block %s.",
bg_record->bg_block_id);
}
- } else if (bg_record->user_name) {
+ } else if(bg_record->user_name) {
error("Target Name was not set "
"not set for block %s.",
bg_record->bg_block_id);
@@ -136,7 +136,7 @@ static int _block_is_deallocating(bg_record_t *bg_record)
bg_record->target_name = xstrdup(bg_record->user_name);
}
- if (remove_from_bg_list(bg_lists->job_running, bg_record)
+ if(remove_from_bg_list(bg_lists->job_running, bg_record)
== SLURM_SUCCESS)
num_unused_cpus += bg_record->cpu_cnt;
remove_from_bg_list(bg_lists->booted, bg_record);
@@ -149,7 +149,7 @@ static void _destroy_kill_struct(void *object)
{
kill_job_struct_t *freeit = (kill_job_struct_t *)object;
- if (freeit) {
+ if(freeit) {
xfree(freeit);
}
}
@@ -178,8 +178,8 @@ extern int block_ready(struct job_record *job_ptr)
slurm_mutex_lock(&block_state_mutex);
bg_record = find_bg_record_in_list(bg_lists->main, block_id);
- if (bg_record) {
- if (bg_record->job_running != job_ptr->job_id) {
+ if(bg_record) {
+ if(bg_record->job_running != job_ptr->job_id) {
rc = 0;
} else if ((bg_record->user_uid == job_ptr->user_id)
&& (bg_record->state
@@ -217,7 +217,7 @@ extern int block_ready(struct job_record *job_ptr)
extern void pack_block(bg_record_t *bg_record, Buf buffer,
uint16_t protocol_version)
{
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
packstr(bg_record->bg_block_id, buffer);
#ifdef HAVE_BGL
packstr(bg_record->blrtsimage, buffer);
@@ -257,21 +257,21 @@ extern int update_block_list()
slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
- if (!kill_job_list)
+ if(!kill_job_list)
kill_job_list = list_create(_destroy_kill_struct);
- if (!bg_lists->main)
+ if(!bg_lists->main)
return updated;
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->main);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
- if (!bg_record->bg_block_id)
+ if(!bg_record->bg_block_id)
continue;
name = bg_record->bg_block_id;
if ((rc = bridge_get_block_info(name, &block_ptr))
!= STATUS_OK) {
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
switch(rc) {
case INCONSISTENT_DATA:
debug2("got inconsistent data when "
@@ -294,7 +294,7 @@ extern int update_block_list()
iteration. It usually means something like
rm_get_BG was called which can be a very
long call */
- if (rc == EBUSY) {
+ if(rc == EBUSY) {
debug5("lock was busy, aborting");
break;
}
@@ -313,7 +313,7 @@ extern int update_block_list()
bg_err_str(rc));
updated = -1;
goto next_block;
- } else if (bg_record->node_use != node_use) {
+ } else if(bg_record->node_use != node_use) {
debug("node_use of Block %s was %d "
"and now is %d",
bg_record->bg_block_id,
@@ -323,7 +323,7 @@ extern int update_block_list()
updated = 1;
}
#else
- if ((bg_record->node_cnt < bg_conf->bp_node_cnt)
+ if((bg_record->node_cnt < bg_conf->bp_node_cnt)
|| (bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)) {
char *mode = NULL;
uint16_t conn_type = SELECT_SMALL;
@@ -335,7 +335,7 @@ extern int update_block_list()
"%s", bg_err_str(rc));
updated = -1;
goto next_block;
- } else if (mode) {
+ } else if(mode) {
switch(mode[0]) {
case 's':
conn_type = SELECT_HTC_S;
@@ -356,7 +356,7 @@ extern int update_block_list()
free(mode);
}
- if (bg_record->conn_type != conn_type) {
+ if(bg_record->conn_type != conn_type) {
debug("mode of small Block %s was %u "
"and now is %u",
bg_record->bg_block_id,
@@ -374,7 +374,7 @@ extern int update_block_list()
bg_err_str(rc));
updated = -1;
goto next_block;
- } else if (bg_record->job_running != BLOCK_ERROR_STATE
+ } else if(bg_record->job_running != BLOCK_ERROR_STATE
//plugin set error
&& bg_record->state != state) {
int skipped_dealloc = 0;
@@ -387,11 +387,11 @@ extern int update_block_list()
check to make sure block went
through freeing correctly
*/
- if ((bg_record->state != RM_PARTITION_DEALLOCATING
+ if((bg_record->state != RM_PARTITION_DEALLOCATING
&& bg_record->state != RM_PARTITION_ERROR)
&& state == RM_PARTITION_FREE)
skipped_dealloc = 1;
- else if ((bg_record->state == RM_PARTITION_READY)
+ else if((bg_record->state == RM_PARTITION_READY)
&& (state == RM_PARTITION_CONFIGURING)) {
/* This means the user did a reboot through
mpirun but we missed the state
@@ -404,7 +404,7 @@ extern int update_block_list()
xfree(bg_record->target_name);
bg_record->target_name =
xstrdup(bg_record->user_name);
- } else if ((bg_record->state
+ } else if((bg_record->state
== RM_PARTITION_DEALLOCATING)
&& (state == RM_PARTITION_CONFIGURING))
/* This is a funky state IBM says
@@ -418,11 +418,11 @@ extern int update_block_list()
bg_record->state = state;
- if (bg_record->state == RM_PARTITION_DEALLOCATING
+ if(bg_record->state == RM_PARTITION_DEALLOCATING
|| skipped_dealloc)
_block_is_deallocating(bg_record);
#ifndef HAVE_BGL
- else if (bg_record->state == RM_PARTITION_REBOOTING) {
+ else if(bg_record->state == RM_PARTITION_REBOOTING) {
/* This means the user did a reboot through
mpirun */
debug("Block %s rebooting. "
@@ -434,17 +434,17 @@ extern int update_block_list()
xstrdup(bg_record->user_name);
}
#endif
- else if (bg_record->state == RM_PARTITION_CONFIGURING)
+ else if(bg_record->state == RM_PARTITION_CONFIGURING)
bg_record->boot_state = 1;
- else if (bg_record->state == RM_PARTITION_FREE) {
- if (remove_from_bg_list(bg_lists->job_running,
+ else if(bg_record->state == RM_PARTITION_FREE) {
+ if(remove_from_bg_list(bg_lists->job_running,
bg_record)
== SLURM_SUCCESS)
num_unused_cpus += bg_record->cpu_cnt;
remove_from_bg_list(bg_lists->booted,
bg_record);
- } else if (bg_record->state == RM_PARTITION_ERROR) {
- if (bg_record->boot_state == 1)
+ } else if(bg_record->state == RM_PARTITION_ERROR) {
+ if(bg_record->boot_state == 1)
error("Block %s in an error "
"state while booting.",
bg_record->bg_block_id);
@@ -454,8 +454,8 @@ extern int update_block_list()
remove_from_bg_list(bg_lists->booted,
bg_record);
trigger_block_error();
- } else if (bg_record->state == RM_PARTITION_READY) {
- if (!block_ptr_exist_in_list(bg_lists->booted,
+ } else if(bg_record->state == RM_PARTITION_READY) {
+ if(!block_ptr_exist_in_list(bg_lists->booted,
bg_record))
list_push(bg_lists->booted, bg_record);
}
@@ -468,16 +468,16 @@ extern int update_block_list()
debug3("boot state for block %s is %d",
bg_record->bg_block_id,
bg_record->boot_state);
- if (bg_record->boot_state == 1) {
+ if(bg_record->boot_state == 1) {
switch(bg_record->state) {
case RM_PARTITION_CONFIGURING:
debug3("checking to make sure user %s "
"is the user.",
bg_record->target_name);
- if (update_block_user(bg_record, 0) == 1)
+ if(update_block_user(bg_record, 0) == 1)
last_bg_update = time(NULL);
- if (bg_record->job_ptr) {
+ if(bg_record->job_ptr) {
bg_record->job_ptr->job_state |=
JOB_CONFIGURING;
last_job_update = time(NULL);
@@ -494,9 +494,9 @@ extern int update_block_list()
*/
break;
case RM_PARTITION_FREE:
- if (bg_record->boot_count < RETRY_BOOT_COUNT) {
+ if(bg_record->boot_count < RETRY_BOOT_COUNT) {
slurm_mutex_unlock(&block_state_mutex);
- if ((rc = boot_block(bg_record))
+ if((rc = boot_block(bg_record))
!= SLURM_SUCCESS) {
updated = -1;
}
@@ -519,7 +519,7 @@ extern int update_block_list()
slurm_mutex_lock(&block_state_mutex);
bg_record->boot_state = 0;
bg_record->boot_count = 0;
- if (remove_from_bg_list(
+ if(remove_from_bg_list(
bg_lists->job_running,
bg_record)
== SLURM_SUCCESS) {
@@ -534,13 +534,13 @@ extern int update_block_list()
case RM_PARTITION_READY:
debug("block %s is ready.",
bg_record->bg_block_id);
- if (bg_record->job_ptr) {
+ if(bg_record->job_ptr) {
bg_record->job_ptr->job_state &=
(~JOB_CONFIGURING);
last_job_update = time(NULL);
}
- if (set_block_user(bg_record) == SLURM_ERROR) {
+ if(set_block_user(bg_record) == SLURM_ERROR) {
freeit = xmalloc(
sizeof(kill_job_struct_t));
freeit->jobid = bg_record->job_running;
@@ -582,7 +582,7 @@ extern int update_block_list()
while((freeit = list_pop(kill_job_list))) {
debug2("Trying to requeue job %d", freeit->jobid);
lock_slurmctld(job_write_lock);
- if ((rc = job_requeue(0, freeit->jobid,
+ if((rc = job_requeue(0, freeit->jobid,
-1, (uint16_t)NO_VAL))) {
error("couldn't requeue job %u, failing it: %s",
freeit->jobid,
@@ -608,19 +608,19 @@ extern int update_freeing_block_list()
bg_record_t *bg_record = NULL;
ListIterator itr = NULL;
- if (!bg_lists->freeing)
+ if(!bg_lists->freeing)
return updated;
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->freeing);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
- if (!bg_record->bg_block_id)
+ if(!bg_record->bg_block_id)
continue;
name = bg_record->bg_block_id;
if ((rc = bridge_get_block_info(name, &block_ptr))
!= STATUS_OK) {
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
switch(rc) {
case INCONSISTENT_DATA:
debug2("got inconsistent data when "
@@ -642,7 +642,7 @@ extern int update_freeing_block_list()
iteration. It usually means something like
rm_get_BG was called which can be a very
long call */
- if (rc == EBUSY) {
+ if(rc == EBUSY) {
debug5("lock was busy, aborting");
break;
}
@@ -660,7 +660,7 @@ extern int update_freeing_block_list()
bg_err_str(rc));
updated = -1;
goto next_block;
- } else if (bg_record->state != state) {
+ } else if(bg_record->state != state) {
debug("freeing state of Block %s was %d and now is %d",
bg_record->bg_block_id,
bg_record->state,
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index 1c9f6afcd5497e6ec9d72a5e69a234f97c7839ba..9f0200a61fb6755166de9c9666616f3539f6b923 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -246,7 +246,7 @@ static int _check_images(struct job_record* job_ptr,
allow = _test_image_perms(*mloaderimage,
bg_conf->mloader_list,
job_ptr);
- if (!allow) {
+ if(!allow) {
error("User %u:%u is not allowed "
"to use MloaderImage %s",
job_ptr->user_id, job_ptr->group_id,
@@ -261,7 +261,7 @@ static int _check_images(struct job_record* job_ptr,
allow = _test_image_perms(*ramdiskimage,
bg_conf->ramdisk_list,
job_ptr);
- if (!allow) {
+ if(!allow) {
error("User %u:%u is not allowed "
"to use RamDiskImage %s",
job_ptr->user_id, job_ptr->group_id,
@@ -287,7 +287,7 @@ static bg_record_t *_find_matching_block(List block_list,
ListIterator itr = NULL;
char tmp_char[256];
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("number of blocks to check: %d state %d "
"asking for %u-%u cpus",
list_count(block_list),
@@ -302,19 +302,19 @@ static bg_record_t *_find_matching_block(List block_list,
/* The job running could be reset so set it back up
here if there is a job_ptr
*/
- if (bg_record->job_ptr)
+ if(bg_record->job_ptr)
bg_record->job_running = bg_record->job_ptr->job_id;
/*block is messed up some how (BLOCK_ERROR_STATE)
* ignore it or if state == RM_PARTITION_ERROR */
- if ((bg_record->job_running == BLOCK_ERROR_STATE)
+ if((bg_record->job_running == BLOCK_ERROR_STATE)
|| (bg_record->state == RM_PARTITION_ERROR)) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("block %s is in an error "
"state (can't use)",
bg_record->bg_block_id);
continue;
- } else if ((bg_record->job_running != NO_JOB_RUNNING)
+ } else if((bg_record->job_running != NO_JOB_RUNNING)
&& (bg_record->job_running != job_ptr->job_id)
&& ((bg_conf->layout_mode == LAYOUT_DYNAMIC)
|| ((!SELECT_IS_CHECK_FULL_SET(query_mode)
@@ -327,7 +327,7 @@ static bg_record_t *_find_matching_block(List block_list,
full set because we are seeing if the job
can ever run so look here.
*/
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("block %s in use by %s job %d",
bg_record->bg_block_id,
bg_record->user_name,
@@ -344,7 +344,7 @@ static bg_record_t *_find_matching_block(List block_list,
*/
convert_num_unit((float)bg_record->cpu_cnt, tmp_char,
sizeof(tmp_char), UNIT_NONE);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("block %s CPU count (%s) not suitable",
bg_record->bg_block_id,
tmp_char);
@@ -359,7 +359,7 @@ static bg_record_t *_find_matching_block(List block_list,
* SLURM block not available to this job.
*/
if (!bit_super_set(bg_record->bitmap, slurm_block_bitmap)) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("bg block %s has nodes not "
"usable by this job",
bg_record->bg_block_id);
@@ -372,42 +372,42 @@ static bg_record_t *_find_matching_block(List block_list,
if (job_ptr->details->req_node_bitmap
&& (!bit_super_set(job_ptr->details->req_node_bitmap,
bg_record->bitmap))) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("bg block %s lacks required nodes",
bg_record->bg_block_id);
continue;
}
- if (_check_for_booted_overlapping_blocks(
+ if(_check_for_booted_overlapping_blocks(
block_list, itr, bg_record,
overlap_check, overlapped_list, query_mode))
continue;
- if (check_image) {
+ if(check_image) {
#ifdef HAVE_BGL
- if (request->blrtsimage &&
+ if(request->blrtsimage &&
strcasecmp(request->blrtsimage,
bg_record->blrtsimage)) {
*allow = 1;
continue;
}
#endif
- if (request->linuximage &&
+ if(request->linuximage &&
strcasecmp(request->linuximage,
bg_record->linuximage)) {
*allow = 1;
continue;
}
- if (request->mloaderimage &&
+ if(request->mloaderimage &&
strcasecmp(request->mloaderimage,
bg_record->mloaderimage)) {
*allow = 1;
continue;
}
- if (request->ramdiskimage &&
+ if(request->ramdiskimage &&
strcasecmp(request->ramdiskimage,
bg_record->ramdiskimage)) {
*allow = 1;
@@ -421,19 +421,19 @@ static bg_record_t *_find_matching_block(List block_list,
if ((request->conn_type != bg_record->conn_type)
&& (request->conn_type != SELECT_NAV)) {
#ifndef HAVE_BGL
- if (request->conn_type >= SELECT_SMALL) {
+ if(request->conn_type >= SELECT_SMALL) {
/* we only want to reboot blocks if
they have to be so skip booted
blocks if in small state
*/
- if (check_image
+ if(check_image
&& (bg_record->state
== RM_PARTITION_READY)) {
*allow = 1;
continue;
}
goto good_conn_type;
- } else if (bg_record->conn_type >= SELECT_SMALL) {
+ } else if(bg_record->conn_type >= SELECT_SMALL) {
/* since we already checked to see if
the cpus were good this means we are
looking for a block in a range that
@@ -443,7 +443,7 @@ static bg_record_t *_find_matching_block(List block_list,
goto good_conn_type;
}
#endif
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("bg block %s conn-type not usable "
"asking for %s bg_record is %s",
bg_record->bg_block_id,
@@ -482,7 +482,7 @@ static bg_record_t *_find_matching_block(List block_list,
if (!match)
continue; /* Not usable */
}
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("we found one! %s", bg_record->bg_block_id);
break;
}
@@ -503,7 +503,7 @@ static int _check_for_booted_overlapping_blocks(
bool is_test = SELECT_IS_TEST(query_mode);
/* this test only is for actually picking a block not testing */
- if (is_test && bg_conf->layout_mode == LAYOUT_DYNAMIC)
+ if(is_test && bg_conf->layout_mode == LAYOUT_DYNAMIC)
return rc;
/* Make sure no other blocks are under this block
@@ -513,7 +513,7 @@ static int _check_for_booted_overlapping_blocks(
while ((found_record = (bg_record_t*)list_next(itr)) != NULL) {
if ((!found_record->bg_block_id)
|| (bg_record == found_record)) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("Don't need to look at myself %s %s",
bg_record->bg_block_id,
found_record->bg_block_id);
@@ -524,7 +524,7 @@ static int _check_for_booted_overlapping_blocks(
overlap = blocks_overlap(bg_record, found_record);
slurm_mutex_unlock(&block_state_mutex);
- if (overlap) {
+ if(overlap) {
overlap = 0;
/* make the available time on this block
* (bg_record) the max of this found_record's job
@@ -533,14 +533,14 @@ static int _check_for_booted_overlapping_blocks(
* don't have to remove them since the
* block_list should always be destroyed afterwards.
*/
- if (is_test && overlapped_list
+ if(is_test && overlapped_list
&& found_record->job_ptr
&& bg_record->job_running == NO_JOB_RUNNING) {
ListIterator itr = list_iterator_create(
overlapped_list);
bg_record_t *tmp_rec = NULL;
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("found overlapping block %s "
"overlapped %s with job %u",
@@ -549,15 +549,15 @@ static int _check_for_booted_overlapping_blocks(
found_record->job_ptr->job_id);
while((tmp_rec = list_next(itr))) {
- if (tmp_rec == bg_record)
+ if(tmp_rec == bg_record)
break;
}
list_iterator_destroy(itr);
- if (tmp_rec && tmp_rec->job_ptr->end_time
+ if(tmp_rec && tmp_rec->job_ptr->end_time
< found_record->job_ptr->end_time)
tmp_rec->job_ptr =
found_record->job_ptr;
- else if (!tmp_rec) {
+ else if(!tmp_rec) {
bg_record->job_ptr =
found_record->job_ptr;
list_append(overlapped_list,
@@ -568,28 +568,28 @@ static int _check_for_booted_overlapping_blocks(
* right now so we will if there is another
* overlapping block that ends later
*/
- if (rc)
+ if(rc)
continue;
/* This test is here to check if the block we
* chose is not booted or if there is a block
* overlapping that we could avoid freeing if
* we choose something else
*/
- if (bg_conf->layout_mode == LAYOUT_OVERLAP
+ if(bg_conf->layout_mode == LAYOUT_OVERLAP
&& ((overlap_check == 0 && bg_record->state
!= RM_PARTITION_READY)
|| (overlap_check == 1 && found_record->state
!= RM_PARTITION_FREE))) {
- if (!is_test) {
+ if(!is_test) {
rc = 1;
break;
}
}
- if ((found_record->job_running != NO_JOB_RUNNING)
+ if((found_record->job_running != NO_JOB_RUNNING)
|| (found_record->state == RM_PARTITION_ERROR)) {
- if ((found_record->job_running
+ if((found_record->job_running
== BLOCK_ERROR_STATE)
|| (found_record->state
== RM_PARTITION_ERROR))
@@ -599,7 +599,7 @@ static int _check_for_booted_overlapping_blocks(
bg_record->bg_block_id,
found_record->bg_block_id);
else
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("can't use %s, there is "
"a job (%d) running on "
@@ -609,7 +609,7 @@ static int _check_for_booted_overlapping_blocks(
found_record->job_running,
found_record->bg_block_id);
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
List temp_list = list_create(NULL);
/* this will remove and
* destroy the memory for
@@ -618,8 +618,8 @@ static int _check_for_booted_overlapping_blocks(
list_remove(bg_record_itr);
slurm_mutex_lock(&block_state_mutex);
- if (bg_record->original) {
- if (bg_conf->slurm_debug_flags
+ if(bg_record->original) {
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("This was a copy");
found_record =
@@ -628,7 +628,7 @@ static int _check_for_booted_overlapping_blocks(
bg_lists->main,
found_record);
} else {
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("looking for "
"original");
@@ -638,14 +638,14 @@ static int _check_for_booted_overlapping_blocks(
bg_record);
}
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("Removing unusable block "
"%s from the system.",
bg_record->bg_block_id);
- if (!found_record) {
- if (bg_conf->slurm_debug_flags
+ if(!found_record) {
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("This record %s "
"wasn't found in "
@@ -668,7 +668,7 @@ static int _check_for_booted_overlapping_blocks(
}
rc = 1;
- if (!is_test)
+ if(!is_test)
break;
}
}
@@ -697,27 +697,27 @@ static int _dynamically_request(List block_list, int *blocks_added,
int start_geo[SYSTEM_DIMENSIONS];
memcpy(start_geo, request->geometry, sizeof(int)*SYSTEM_DIMENSIONS);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("going to create %d", request->size);
list_of_lists = list_create(NULL);
/* If preempt is set and we are checking full system it means
we altered the block list so only look at it.
*/
- if (SELECT_IS_PREEMPT_SET(query_mode)
+ if(SELECT_IS_PREEMPT_SET(query_mode)
&& SELECT_IS_CHECK_FULL_SET(query_mode)) {
list_append(list_of_lists, block_list);
- } else if (user_req_nodes)
+ } else if(user_req_nodes)
list_append(list_of_lists, bg_lists->job_running);
else {
list_append(list_of_lists, block_list);
- if (list_count(block_list) != list_count(bg_lists->booted)) {
+ if(list_count(block_list) != list_count(bg_lists->booted)) {
list_append(list_of_lists, bg_lists->booted);
- if (list_count(bg_lists->booted)
+ if(list_count(bg_lists->booted)
!= list_count(bg_lists->job_running))
list_append(list_of_lists,
bg_lists->job_running);
- } else if (list_count(block_list)
+ } else if(list_count(block_list)
!= list_count(bg_lists->job_running)) {
list_append(list_of_lists, bg_lists->job_running);
}
@@ -732,17 +732,17 @@ static int _dynamically_request(List block_list, int *blocks_added,
3- see if we can create one in the non
job running bps
*/
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("trying with %d", create_try);
- if ((new_blocks = create_dynamic_block(block_list,
+ if((new_blocks = create_dynamic_block(block_list,
request, temp_list,
true))) {
bg_record_t *bg_record = NULL;
while((bg_record = list_pop(new_blocks))) {
- if (block_exist_in_list(block_list, bg_record))
+ if(block_exist_in_list(block_list, bg_record))
destroy_bg_record(bg_record);
- else if (SELECT_IS_TEST(query_mode)) {
+ else if(SELECT_IS_TEST(query_mode)) {
/* Here we don't really want
to create the block if we
are testing.
@@ -750,7 +750,7 @@ static int _dynamically_request(List block_list, int *blocks_added,
list_append(block_list, bg_record);
(*blocks_added) = 1;
} else {
- if (configure_block(bg_record)
+ if(configure_block(bg_record)
== SLURM_ERROR) {
destroy_bg_record(bg_record);
error("_dynamically_request: "
@@ -765,7 +765,7 @@ static int _dynamically_request(List block_list, int *blocks_added,
}
}
list_destroy(new_blocks);
- if (!*blocks_added) {
+ if(!*blocks_added) {
memcpy(request->geometry, start_geo,
sizeof(int)*SYSTEM_DIMENSIONS);
rc = SLURM_ERROR;
@@ -787,7 +787,7 @@ static int _dynamically_request(List block_list, int *blocks_added,
}
list_iterator_destroy(itr);
- if (list_of_lists)
+ if(list_of_lists)
list_destroy(list_of_lists);
return rc;
@@ -832,24 +832,24 @@ static int _find_best_block_match(List block_list,
List overlapped_list = NULL;
bool is_test = SELECT_IS_TEST(query_mode);
- if (!total_cpus)
+ if(!total_cpus)
total_cpus = DIM_SIZE[X] * DIM_SIZE[Y] * DIM_SIZE[Z]
* bg_conf->cpus_per_bp;
- if (req_nodes > max_nodes) {
+ if(req_nodes > max_nodes) {
error("can't run this job max bps is %u asking for %u",
max_nodes, req_nodes);
return SLURM_ERROR;
}
- if (!is_test && (req_procs > avail_cpus)) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(!is_test && (req_procs > avail_cpus)) {
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("asking for %u I only got %d",
req_procs, avail_cpus);
return SLURM_ERROR;
}
- if (!block_list) {
+ if(!block_list) {
error("_find_best_block_match: There is no block_list");
return SLURM_ERROR;
}
@@ -862,20 +862,20 @@ static int _find_best_block_match(List block_list,
SELECT_JOBDATA_ROTATE, &rotate);
#ifdef HAVE_BGL
- if ((rc = _check_images(job_ptr, &blrtsimage, &linuximage,
+ if((rc = _check_images(job_ptr, &blrtsimage, &linuximage,
&mloaderimage, &ramdiskimage)) == SLURM_ERROR)
goto end_it;
#else
- if ((rc = _check_images(job_ptr, &linuximage,
+ if((rc = _check_images(job_ptr, &linuximage,
&mloaderimage, &ramdiskimage)) == SLURM_ERROR)
goto end_it;
#endif
- if (req_geometry[X] != 0 && req_geometry[X] != (uint16_t)NO_VAL) {
+ if(req_geometry[X] != 0 && req_geometry[X] != (uint16_t)NO_VAL) {
target_size = 1;
for (i=0; i<SYSTEM_DIMENSIONS; i++)
target_size *= (uint16_t)req_geometry[i];
- if (target_size != min_nodes) {
+ if(target_size != min_nodes) {
debug2("min_nodes not set correctly %u "
"should be %u from %u%u%u",
min_nodes, target_size,
@@ -884,7 +884,7 @@ static int _find_best_block_match(List block_list,
req_geometry[Z]);
min_nodes = target_size;
}
- if (!req_nodes)
+ if(!req_nodes)
req_nodes = min_nodes;
} else {
req_geometry[X] = (uint16_t)NO_VAL;
@@ -914,7 +914,7 @@ static int _find_best_block_match(List block_list,
request.linuximage = linuximage;
request.mloaderimage = mloaderimage;
request.ramdiskimage = ramdiskimage;
- if (job_ptr->details->req_node_bitmap)
+ if(job_ptr->details->req_node_bitmap)
request.avail_node_bitmap = job_ptr->details->req_node_bitmap;
else
request.avail_node_bitmap = slurm_block_bitmap;
@@ -922,7 +922,7 @@ static int _find_best_block_match(List block_list,
/* since we only look at procs after this and not nodes we
* need to set a max_cpus if given
*/
- if (max_cpus == (uint32_t)NO_VAL)
+ if(max_cpus == (uint32_t)NO_VAL)
max_cpus = max_nodes * bg_conf->cpus_per_bp;
while(1) {
@@ -931,7 +931,7 @@ static int _find_best_block_match(List block_list,
* works we will have can look and see the earliest
* the job can start. This doesn't apply to Dynamic mode.
*/
- if (is_test && SELECT_IS_CHECK_FULL_SET(query_mode)
+ if(is_test && SELECT_IS_CHECK_FULL_SET(query_mode)
&& bg_conf->layout_mode != LAYOUT_DYNAMIC)
overlapped_list = list_create(NULL);
@@ -944,13 +944,13 @@ static int _find_best_block_match(List block_list,
overlap_check,
overlapped_list,
query_mode);
- if (!bg_record && overlapped_list
+ if(!bg_record && overlapped_list
&& list_count(overlapped_list)) {
ListIterator itr =
list_iterator_create(overlapped_list);
bg_record_t *tmp_rec = NULL;
while((tmp_rec = list_next(itr))) {
- if (!bg_record ||
+ if(!bg_record ||
(tmp_rec->job_ptr->end_time <
bg_record->job_ptr->end_time))
bg_record = tmp_rec;
@@ -958,13 +958,13 @@ static int _find_best_block_match(List block_list,
list_iterator_destroy(itr);
}
- if (overlapped_list)
+ if(overlapped_list)
list_destroy(overlapped_list);
/* set the bitmap and do other allocation activities */
if (bg_record) {
- if (!is_test) {
- if (check_block_bp_states(
+ if(!is_test) {
+ if(check_block_bp_states(
bg_record->bg_block_id, 1)
!= SLURM_SUCCESS) {
/* check_block_bp_states will
@@ -1003,7 +1003,7 @@ static int _find_best_block_match(List block_list,
}
/* see if we can just reset the image and reboot the block */
- if (allow) {
+ if(allow) {
check_image = 0;
allow = 0;
continue;
@@ -1013,16 +1013,16 @@ static int _find_best_block_match(List block_list,
/* all these assume that the *bg_record is NULL */
- if (bg_conf->layout_mode == LAYOUT_OVERLAP
+ if(bg_conf->layout_mode == LAYOUT_OVERLAP
&& !is_test && overlap_check < 2) {
overlap_check++;
continue;
}
- if (create_try || bg_conf->layout_mode != LAYOUT_DYNAMIC)
+ if(create_try || bg_conf->layout_mode != LAYOUT_DYNAMIC)
goto no_match;
- if ((rc = _dynamically_request(block_list, blocks_added,
+ if((rc = _dynamically_request(block_list, blocks_added,
&request,
job_ptr->details->req_nodes,
query_mode))
@@ -1034,11 +1034,11 @@ static int _find_best_block_match(List block_list,
/* Only look at the full system if we aren't going to
preempt jobs later and look.
*/
- if (is_test && SELECT_IS_CHECK_FULL_SET(query_mode)) {
+ if(is_test && SELECT_IS_CHECK_FULL_SET(query_mode)) {
List new_blocks = NULL;
List job_list = list_create(NULL);
ListIterator itr = NULL;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("trying with empty machine");
/* Here we need to make sure the blocks in the
@@ -1048,7 +1048,7 @@ static int _find_best_block_match(List block_list,
*/
itr = list_iterator_create(block_list);
while((bg_record = list_next(itr))) {
- if (bg_record->job_running != NO_JOB_RUNNING)
+ if(bg_record->job_running != NO_JOB_RUNNING)
list_append(job_list, bg_record);
/* Since the error blocks are at the
end we only really need to look at
@@ -1062,7 +1062,7 @@ static int _find_best_block_match(List block_list,
until the error is removed which
could be a very long time.
*/
- if (bg_record->job_running == BLOCK_ERROR_STATE)
+ if(bg_record->job_running == BLOCK_ERROR_STATE)
break;
}
list_iterator_destroy(itr);
@@ -1078,9 +1078,9 @@ static int _find_best_block_match(List block_list,
for(i=0; i<SYSTEM_DIMENSIONS; i++)
request.geometry[i] = req_geometry[i];
- if ((bg_record = list_pop(job_list))) {
- if (bg_record->job_ptr) {
- if (bg_conf->slurm_debug_flags
+ if((bg_record = list_pop(job_list))) {
+ if(bg_record->job_ptr) {
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("taking off "
"%d(%s) started "
@@ -1108,7 +1108,7 @@ static int _find_best_block_match(List block_list,
*/
bg_record->job_running =
NO_JOB_RUNNING;
- } else if ((bg_record->job_running
+ } else if((bg_record->job_running
== BLOCK_ERROR_STATE)
&& (bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK))
@@ -1124,10 +1124,10 @@ static int _find_best_block_match(List block_list,
node on the system.
*/
track_down_nodes = false;
- if (!(new_blocks = create_dynamic_block(
+ if(!(new_blocks = create_dynamic_block(
block_list, &request, job_list,
track_down_nodes))) {
- if (errno == ESLURM_INTERCONNECT_FAILURE
+ if(errno == ESLURM_INTERCONNECT_FAILURE
|| !list_count(job_list)) {
char *nodes;
if (slurmctld_conf.
@@ -1150,12 +1150,12 @@ static int _find_best_block_match(List block_list,
* about it now
*/
(*found_bg_record) = list_pop(new_blocks);
- if (!(*found_bg_record)) {
- if (bg_conf->slurm_debug_flags
+ if(!(*found_bg_record)) {
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
error("got an empty list back");
list_destroy(new_blocks);
- if (bg_record)
+ if(bg_record)
continue;
else {
rc = SLURM_ERROR;
@@ -1165,7 +1165,7 @@ static int _find_best_block_match(List block_list,
bit_and(slurm_block_bitmap,
(*found_bg_record)->bitmap);
- if (bg_record) {
+ if(bg_record) {
(*found_bg_record)->job_running =
bg_record->job_running;
(*found_bg_record)->job_ptr
@@ -1213,18 +1213,18 @@ static int _sync_block_lists(List full_list, List incomp_list)
/* Make sure we aren't adding any block that doesn't
have a block_id.
*/
- if (!new_record->bg_block_id)
+ if(!new_record->bg_block_id)
continue;
while((bg_record = list_next(itr2))) {
- if (bit_equal(bg_record->bitmap, new_record->bitmap)
+ if(bit_equal(bg_record->bitmap, new_record->bitmap)
&& bit_equal(bg_record->ionode_bitmap,
new_record->ionode_bitmap))
break;
}
- if (!bg_record) {
+ if(!bg_record) {
list_remove(itr);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("sync: adding %s %x",
new_record->bg_block_id, new_record);
list_append(incomp_list, new_record);
@@ -1330,7 +1330,7 @@ static void _build_select_struct(struct job_record *job_ptr,
fatal("bit_copy malloc failure");
job_resrcs_ptr->cpu_array_cnt = 1;
- if (job_ptr->details->min_cpus < bg_conf->cpus_per_bp)
+ if(job_ptr->details->min_cpus < bg_conf->cpus_per_bp)
job_resrcs_ptr->cpu_array_value[0] = job_ptr->details->min_cpus;
else
job_resrcs_ptr->cpu_array_value[0] = bg_conf->cpus_per_bp;
@@ -1370,14 +1370,14 @@ static List _get_preemptables(uint16_t query_mode, bg_record_t *bg_record,
continue;
while((job_ptr = list_next(job_itr))) {
- if (job_ptr == found_record->job_ptr)
+ if(job_ptr == found_record->job_ptr)
break;
}
- if (job_ptr) {
+ if(job_ptr) {
list_push(preempt, job_ptr);
/* info("going to preempt %u running on %s", */
/* job_ptr->job_id, found_record->bg_block_id); */
- } else if (SELECT_IS_MODE_RUN_NOW(query_mode)) {
+ } else if(SELECT_IS_MODE_RUN_NOW(query_mode)) {
error("Job %u running on block %s "
"wasn't in the preempt list, but needs to be "
"preempted for queried job to run on block %s",
@@ -1429,7 +1429,7 @@ static int _remove_preemptables(List block_list, List preempt_jobs)
}
list_iterator_reset(itr);
- if (!found_record)
+ if(!found_record)
error("Job %u wasn't found running anywhere, "
"can't preempt",
job_ptr->job_id);
@@ -1478,7 +1478,7 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
else
local_mode |= SELECT_MODE_CHECK_FULL;
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC)
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
slurm_mutex_lock(&create_dynamic_mutex);
slurm_mutex_lock(&block_state_mutex);
@@ -1487,12 +1487,12 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE, &conn_type);
- if (conn_type == SELECT_NAV) {
- if (bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
+ if(conn_type == SELECT_NAV) {
+ if(bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
conn_type = SELECT_SMALL;
- else if (min_nodes > 1)
+ else if(min_nodes > 1)
conn_type = SELECT_TORUS;
- else if (job_ptr->details->min_cpus < bg_conf->cpus_per_bp)
+ else if(job_ptr->details->min_cpus < bg_conf->cpus_per_bp)
conn_type = SELECT_SMALL;
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
@@ -1500,10 +1500,10 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
&conn_type);
}
- if (slurm_block_bitmap && !bit_set_count(slurm_block_bitmap)) {
+ if(slurm_block_bitmap && !bit_set_count(slurm_block_bitmap)) {
error("no nodes given to place job %u.", job_ptr->job_id);
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC)
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
slurm_mutex_unlock(&create_dynamic_mutex);
return SLURM_ERROR;
@@ -1553,8 +1553,8 @@ preempt:
max_nodes, req_nodes,
&bg_record, local_mode, avail_cpus);
- if (rc == SLURM_SUCCESS) {
- if (bg_record) {
+ if(rc == SLURM_SUCCESS) {
+ if(bg_record) {
/* Here we see if there is a job running since
* some jobs take awhile to finish we need to
* make sure the time of the end is in the
@@ -1562,18 +1562,18 @@ preempt:
* past or current time) we add 5 seconds to
* it so we don't use the block immediately.
*/
- if (bg_record->job_ptr
+ if(bg_record->job_ptr
&& bg_record->job_ptr->end_time) {
- if (bg_record->job_ptr->end_time <= starttime)
+ if(bg_record->job_ptr->end_time <= starttime)
starttime += 5;
else
starttime =
bg_record->job_ptr->end_time;
- } else if (bg_record->job_running == BLOCK_ERROR_STATE)
+ } else if(bg_record->job_running == BLOCK_ERROR_STATE)
starttime = INFINITE;
/* make sure the job is eligible to run */
- if (job_ptr->details->begin_time > starttime)
+ if(job_ptr->details->begin_time > starttime)
starttime = job_ptr->details->begin_time;
job_ptr->start_time = starttime;
@@ -1584,7 +1584,7 @@ preempt:
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
bg_record->ionodes);
- if (!bg_record->bg_block_id) {
+ if(!bg_record->bg_block_id) {
debug("%d can start unassigned job %u "
"at %u on %s",
local_mode, job_ptr->job_id,
@@ -1599,7 +1599,7 @@ preempt:
SELECT_JOBDATA_NODE_CNT,
&bg_record->node_cnt);
} else {
- if ((bg_record->ionodes)
+ if((bg_record->ionodes)
&& (job_ptr->part_ptr->max_share <= 1))
error("Small block used in "
"non-shared partition");
@@ -1619,7 +1619,7 @@ preempt:
/* job_ptr->select_jobinfo, */
/* SELECT_JOBDATA_CONN_TYPE, */
/* &conn_type); */
- if (job_ptr) {
+ if(job_ptr) {
bg_record->job_running =
job_ptr->job_id;
bg_record->job_ptr = job_ptr;
@@ -1644,14 +1644,14 @@ preempt:
slurm_block_bitmap,
bg_record->node_cnt);
/* set up the preempted job list */
- if (SELECT_IS_PREEMPT_SET(local_mode)) {
- if (*preemptee_job_list)
+ if(SELECT_IS_PREEMPT_SET(local_mode)) {
+ if(*preemptee_job_list)
list_destroy(*preemptee_job_list);
*preemptee_job_list = _get_preemptables(
local_mode, bg_record,
preemptee_candidates);
}
- if (!bg_record->bg_block_id) {
+ if(!bg_record->bg_block_id) {
/* This is a fake record so we need to
* destroy it after we get the info from
* it. If it was just testing then
@@ -1661,7 +1661,7 @@ preempt:
* lists. But we don't want to do
* that so we will set blocks_added to
* 0 so it doesn't happen. */
- if (!blocks_added) {
+ if(!blocks_added) {
destroy_bg_record(bg_record);
bg_record = NULL;
}
@@ -1670,8 +1670,8 @@ preempt:
} else {
error("we got a success, but no block back");
}
- } else if (!preempt_done && SELECT_IS_PREEMPT_SET(local_mode)) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ } else if(!preempt_done && SELECT_IS_PREEMPT_SET(local_mode)) {
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("doing preemption");
local_mode |= SELECT_MODE_CHECK_FULL;
avail_cpus += _remove_preemptables(
@@ -1680,9 +1680,9 @@ preempt:
goto preempt;
}
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
slurm_mutex_lock(&block_state_mutex);
- if (blocks_added)
+ if(blocks_added)
_sync_block_lists(block_list, bg_lists->main);
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&create_dynamic_mutex);
diff --git a/src/plugins/select/bluegene/plugin/bg_job_run.c b/src/plugins/select/bluegene/plugin/bg_job_run.c
index 97251b9af0d730fae318ab05e823e87482b3d5ec..fa16a3e6a8f8ad44ecece9d7211c5f92e55ae49c 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_run.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_run.c
@@ -177,20 +177,20 @@ static int _remove_job(db_job_id_t job_id, char *block_id)
job_id, block_id, job_state, is_history);
/* check the state and process accordingly */
- if (is_history) {
+ if(is_history) {
debug2("Job %d on block %s isn't in the "
"active job table anymore, final state was %d",
job_id, block_id, job_state);
return STATUS_OK;
- } else if (job_state == RM_JOB_TERMINATED)
+ } else if(job_state == RM_JOB_TERMINATED)
return STATUS_OK;
- else if (job_state == RM_JOB_DYING) {
- if (count > MAX_POLL_RETRIES)
+ else if(job_state == RM_JOB_DYING) {
+ if(count > MAX_POLL_RETRIES)
error("Job %d on block %s isn't dying, "
"trying for %d seconds", job_id,
block_id, count*POLL_INTERVAL);
continue;
- } else if (job_state == RM_JOB_ERROR) {
+ } else if(job_state == RM_JOB_ERROR) {
error("job %d on block %s is in a error state.",
job_id, block_id);
@@ -219,14 +219,14 @@ static int _remove_job(db_job_id_t job_id, char *block_id)
job_id, block_id);
return STATUS_OK;
}
- if (rc == INCOMPATIBLE_STATE)
+ if(rc == INCOMPATIBLE_STATE)
debug("job %d on block %s is in an "
"INCOMPATIBLE_STATE",
job_id, block_id);
else
error("bridge_signal_job(%d): %s", job_id,
bg_err_str(rc));
- } else if (count > MAX_POLL_RETRIES)
+ } else if(count > MAX_POLL_RETRIES)
error("Job %d on block %s is in state %d and "
"isn't dying, and doesn't appear to be "
"responding to SIGTERM, trying for %d seconds",
@@ -244,15 +244,15 @@ static int _remove_job(db_job_id_t job_id, char *block_id)
static int _reset_block(bg_record_t *bg_record)
{
int rc = SLURM_SUCCESS;
- if (bg_record) {
- if (bg_record->job_running > NO_JOB_RUNNING) {
+ if(bg_record) {
+ if(bg_record->job_running > NO_JOB_RUNNING) {
bg_record->job_running = NO_JOB_RUNNING;
bg_record->job_ptr = NULL;
}
/* remove user from list */
- if (bg_record->target_name) {
- if (strcmp(bg_record->target_name,
+ if(bg_record->target_name) {
+ if(strcmp(bg_record->target_name,
bg_conf->slurm_user_name)) {
xfree(bg_record->target_name);
bg_record->target_name =
@@ -274,8 +274,8 @@ static int _reset_block(bg_record_t *bg_record)
error state could also be in this list and we don't
want to remove them.
*/
- if (bg_record->job_running == NO_JOB_RUNNING)
- if (remove_from_bg_list(bg_lists->job_running,
+ if(bg_record->job_running == NO_JOB_RUNNING)
+ if(remove_from_bg_list(bg_lists->job_running,
bg_record)
== SLURM_SUCCESS) {
num_unused_cpus += bg_record->cpu_cnt;
@@ -302,14 +302,14 @@ static int _make_sure_block_still_exists(bg_update_t *bg_update_ptr,
/* check to make sure this block still exists since
* something could had happened and the block is no
* longer in existance */
- if (!block_ptr_exist_in_list(bg_lists->main, bg_record)) {
+ if(!block_ptr_exist_in_list(bg_lists->main, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
debug("The block %s disappeared while starting "
"job %u requeueing if possible.",
bg_update_ptr->bg_block_id,
bg_update_ptr->job_ptr->job_id);
lock_slurmctld(job_write_lock);
- if ((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
+ if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
-1, (uint16_t)NO_VAL))) {
error("couldn't requeue job %u, failing it: %s",
bg_update_ptr->job_ptr->job_id,
@@ -352,10 +352,10 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
int i, rc;
#endif
- if (!job_list)
+ if(!job_list)
job_cnt = 0;
- if (!block_id) {
+ if(!block_id) {
error("_remove_jobs_on_block_and_reset: no block name given");
return;
}
@@ -380,7 +380,7 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
}
}
- if (!job_elem) {
+ if(!job_elem) {
error("No Job Elem breaking out job count = %d", i);
break;
}
@@ -392,7 +392,7 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
continue;
}
- if (!job_block) {
+ if(!job_block) {
error("No blockID returned from Database");
continue;
}
@@ -414,7 +414,7 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
continue;
}
debug2("got job_id %d",job_id);
- if ((rc = _remove_job(job_id, block_id)) == INTERNAL_ERROR) {
+ if((rc = _remove_job(job_id, block_id)) == INTERNAL_ERROR) {
job_remove_failed = 1;
break;
}
@@ -423,13 +423,13 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
/* remove the block's users */
slurm_mutex_lock(&block_state_mutex);
bg_record = find_bg_record_in_list(bg_lists->main, block_id);
- if (bg_record) {
+ if(bg_record) {
debug("got the record %s user is %s",
bg_record->bg_block_id,
bg_record->user_name);
- if (job_remove_failed) {
- if (bg_record->nodes)
+ if(job_remove_failed) {
+ if(bg_record->nodes)
slurm_drain_nodes(
bg_record->nodes,
"_term_agent: Couldn't remove job",
@@ -444,7 +444,7 @@ static void _remove_jobs_on_block_and_reset(rm_job_list_t *job_list,
debug2("Hopefully we are destroying this block %s "
"since it isn't in the bg_lists->main",
block_id);
- } else if (job_cnt) {
+ } else if(job_cnt) {
error("Could not find block %s previously assigned to job. "
"If this is happening at startup and you just changed "
"your bluegene.conf this is expected. Else you should "
@@ -467,7 +467,7 @@ static void _reset_block_list(List block_list)
int live_states, rc;
#endif
- if (!block_list)
+ if(!block_list)
return;
#ifdef HAVE_BG_FILES
@@ -515,12 +515,12 @@ static void _sync_agent(bg_update_t *bg_update_ptr)
slurm_mutex_lock(&block_state_mutex);
bg_record = find_bg_record_in_list(bg_lists->main,
bg_update_ptr->bg_block_id);
- if (!bg_record) {
+ if(!bg_record) {
int rc;
slurm_mutex_unlock(&block_state_mutex);
error("No block %s", bg_update_ptr->bg_block_id);
lock_slurmctld(job_write_lock);
- if ((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
+ if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
-1, (uint16_t)NO_VAL))) {
error("couldn't requeue job %u, failing it: %s",
bg_update_ptr->job_ptr->job_id,
@@ -538,19 +538,19 @@ static void _sync_agent(bg_update_t *bg_update_ptr)
bg_record->job_running = bg_update_ptr->job_ptr->job_id;
bg_record->job_ptr = bg_update_ptr->job_ptr;
- if (!block_ptr_exist_in_list(bg_lists->job_running, bg_record)) {
+ if(!block_ptr_exist_in_list(bg_lists->job_running, bg_record)) {
list_push(bg_lists->job_running, bg_record);
num_unused_cpus -= bg_record->cpu_cnt;
}
- if (!block_ptr_exist_in_list(bg_lists->booted, bg_record))
+ if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
- if (bg_record->state == RM_PARTITION_READY) {
- if (bg_record->job_ptr) {
+ if(bg_record->state == RM_PARTITION_READY) {
+ if(bg_record->job_ptr) {
bg_record->job_ptr->job_state &= (~JOB_CONFIGURING);
last_job_update = time(NULL);
}
- if (bg_record->user_uid != bg_update_ptr->job_ptr->user_id) {
+ if(bg_record->user_uid != bg_update_ptr->job_ptr->user_id) {
int set_user_rc = SLURM_SUCCESS;
debug("User isn't correct for job %d on %s, "
@@ -563,13 +563,13 @@ static void _sync_agent(bg_update_t *bg_update_ptr)
set_user_rc = set_block_user(bg_record);
slurm_mutex_unlock(&block_state_mutex);
- if (set_user_rc == SLURM_ERROR)
+ if(set_user_rc == SLURM_ERROR)
(void) slurm_fail_job(bg_record->job_running);
} else
slurm_mutex_unlock(&block_state_mutex);
} else {
- if (bg_record->state != RM_PARTITION_CONFIGURING) {
+ if(bg_record->state != RM_PARTITION_CONFIGURING) {
error("Block %s isn't ready and isn't "
"being configured! Starting job again.",
bg_update_ptr->bg_block_id);
@@ -600,7 +600,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_record = find_bg_record_in_list(bg_lists->main,
bg_update_ptr->bg_block_id);
- if (!bg_record) {
+ if(!bg_record) {
slurm_mutex_unlock(&block_state_mutex);
error("block %s not found in bg_lists->main",
bg_update_ptr->bg_block_id);
@@ -611,7 +611,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
incase the fail job isn't ran */
sleep(2);
lock_slurmctld(job_write_lock);
- if ((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
+ if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
-1, (uint16_t)NO_VAL))) {
error("1 couldn't requeue job %u, failing it: %s",
bg_update_ptr->job_ptr->job_id,
@@ -623,7 +623,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
return;
}
- if (bg_record->job_running <= NO_JOB_RUNNING) {
+ if(bg_record->job_running <= NO_JOB_RUNNING) {
// _reset_block(bg_record); should already happened
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
@@ -632,13 +632,13 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_update_ptr->job_ptr->job_id);
return;
}
- if (bg_record->state == RM_PARTITION_DEALLOCATING) {
+ if(bg_record->state == RM_PARTITION_DEALLOCATING) {
debug("Block is in Deallocating state, waiting for free.");
bg_free_block(bg_record, 1, 1);
/* no reason to reboot here since we are already
deallocating */
bg_update_ptr->reboot = 0;
- if (!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
+ if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
return;
@@ -651,14 +651,14 @@ static void _start_agent(bg_update_t *bg_update_ptr)
if ((!found_record) || (bg_record == found_record))
continue;
- if (!blocks_overlap(bg_record, found_record)) {
+ if(!blocks_overlap(bg_record, found_record)) {
debug2("block %s isn't part of %s",
found_record->bg_block_id,
bg_record->bg_block_id);
continue;
}
- if (found_record->job_ptr) {
+ if(found_record->job_ptr) {
error("Trying to start job %u on block %s, "
"but there is a job %u running on an overlapping "
"block %s it will not end until %u. "
@@ -676,12 +676,12 @@ static void _start_agent(bg_update_t *bg_update_ptr)
found_record->bg_block_id,
bg_record->bg_block_id);
list_push(delete_list, found_record);
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC)
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
list_remove(itr);
}
list_iterator_destroy(itr);
- if (requeue_job) {
+ if(requeue_job) {
num_block_to_free = num_block_freed = 0;
list_destroy(delete_list);
@@ -695,7 +695,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
incase the fail job isn't ran */
sleep(2);
lock_slurmctld(job_write_lock);
- if ((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
+ if((rc = job_requeue(0, bg_update_ptr->job_ptr->job_id,
-1, (uint16_t)NO_VAL))) {
error("2 couldn't requeue job %u, failing it: %s",
bg_update_ptr->job_ptr->job_id,
@@ -723,13 +723,13 @@ static void _start_agent(bg_update_t *bg_update_ptr)
num_block_to_free = num_block_freed = 0;
slurm_mutex_lock(&block_state_mutex);
- if (!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
+ if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
return;
}
- if (bg_record->job_running <= NO_JOB_RUNNING) {
+ if(bg_record->job_running <= NO_JOB_RUNNING) {
// _reset_block(bg_record); should already happened
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
@@ -740,7 +740,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
rc = 0;
#ifdef HAVE_BGL
- if (bg_update_ptr->blrtsimage
+ if(bg_update_ptr->blrtsimage
&& strcasecmp(bg_update_ptr->blrtsimage, bg_record->blrtsimage)) {
debug3("changing BlrtsImage from %s to %s",
bg_record->blrtsimage, bg_update_ptr->blrtsimage);
@@ -749,7 +749,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
rc = 1;
}
#else
- if ((bg_update_ptr->conn_type >= SELECT_SMALL)
+ if((bg_update_ptr->conn_type >= SELECT_SMALL)
&& (bg_update_ptr->conn_type != bg_record->conn_type)) {
debug3("changing small block mode from %s to %s",
conn_type_string(bg_record->conn_type),
@@ -763,7 +763,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
#endif
}
#endif
- if (bg_update_ptr->linuximage
+ if(bg_update_ptr->linuximage
&& strcasecmp(bg_update_ptr->linuximage, bg_record->linuximage)) {
#ifdef HAVE_BGL
debug3("changing LinuxImage from %s to %s",
@@ -776,7 +776,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_record->linuximage = xstrdup(bg_update_ptr->linuximage);
rc = 1;
}
- if (bg_update_ptr->mloaderimage
+ if(bg_update_ptr->mloaderimage
&& strcasecmp(bg_update_ptr->mloaderimage,
bg_record->mloaderimage)) {
debug3("changing MloaderImage from %s to %s",
@@ -785,7 +785,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_record->mloaderimage = xstrdup(bg_update_ptr->mloaderimage);
rc = 1;
}
- if (bg_update_ptr->ramdiskimage
+ if(bg_update_ptr->ramdiskimage
&& strcasecmp(bg_update_ptr->ramdiskimage,
bg_record->ramdiskimage)) {
#ifdef HAVE_BGL
@@ -800,12 +800,12 @@ static void _start_agent(bg_update_t *bg_update_ptr)
rc = 1;
}
- if (rc) {
+ if(rc) {
bg_record->modifying = 1;
bg_free_block(bg_record, 1, 1);
- if (!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
+ if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
return;
@@ -848,7 +848,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
error("bridge_modify_block(RM_MODIFY_IoloadImg)",
bg_err_str(rc));
- if (bg_update_ptr->conn_type > SELECT_SMALL) {
+ if(bg_update_ptr->conn_type > SELECT_SMALL) {
char *conn_type = NULL;
switch(bg_update_ptr->conn_type) {
case SELECT_HTC_S:
@@ -885,12 +885,12 @@ static void _start_agent(bg_update_t *bg_update_ptr)
#endif
bg_record->modifying = 0;
- } else if (bg_update_ptr->reboot) {
+ } else if(bg_update_ptr->reboot) {
bg_record->modifying = 1;
bg_free_block(bg_record, 1, 1);
- if (!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
+ if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
return;
@@ -898,9 +898,9 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_record->modifying = 0;
}
- if (bg_record->state == RM_PARTITION_FREE) {
+ if(bg_record->state == RM_PARTITION_FREE) {
slurm_mutex_unlock(&block_state_mutex);
- if ((rc = boot_block(bg_record)) != SLURM_SUCCESS) {
+ if((rc = boot_block(bg_record)) != SLURM_SUCCESS) {
slurm_mutex_lock(&block_state_mutex);
_reset_block(bg_record);
slurm_mutex_unlock(&block_state_mutex);
@@ -911,7 +911,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
to the script initiation do clean up just
incase the fail job isn't ran */
lock_slurmctld(job_write_lock);
- if ((rc = job_requeue(
+ if((rc = job_requeue(
0, bg_update_ptr->job_ptr->job_id,
-1, (uint16_t)NO_VAL))) {
error("3 couldn't requeue job %u, "
@@ -926,7 +926,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
return;
}
slurm_mutex_lock(&block_state_mutex);
- if (!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
+ if(!_make_sure_block_still_exists(bg_update_ptr, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
return;
@@ -935,7 +935,7 @@ static void _start_agent(bg_update_t *bg_update_ptr)
bg_record->boot_state = 1;
- if (bg_record->job_running <= NO_JOB_RUNNING) {
+ if(bg_record->job_running <= NO_JOB_RUNNING) {
slurm_mutex_unlock(&block_state_mutex);
slurm_mutex_unlock(&job_start_mutex);
debug("job %u finished during the start of the boot "
@@ -951,17 +951,17 @@ static void _start_agent(bg_update_t *bg_update_ptr)
debug("setting the target_name for Block %s to %s",
bg_record->bg_block_id, bg_record->target_name);
- if (bg_record->state == RM_PARTITION_READY) {
+ if(bg_record->state == RM_PARTITION_READY) {
debug("block %s is ready.", bg_record->bg_block_id);
set_user_rc = set_block_user(bg_record);
- if (bg_update_ptr->job_ptr) {
+ if(bg_update_ptr->job_ptr) {
bg_update_ptr->job_ptr->job_state &= (~JOB_CONFIGURING);
last_job_update = time(NULL);
}
}
slurm_mutex_unlock(&block_state_mutex);
- if (set_user_rc == SLURM_ERROR) {
+ if(set_user_rc == SLURM_ERROR) {
sleep(2);
/* wait for the slurmd to begin
the batch script, slurm_fail_job()
@@ -1118,7 +1118,7 @@ static List _get_all_allocated_blocks(void)
if (!ret_list)
fatal("malloc error");
- if (bg_lists->main) {
+ if(bg_lists->main) {
itr = list_iterator_create(bg_lists->main);
while ((block_ptr = (bg_record_t *) list_next(itr))) {
if ((block_ptr->user_name == NULL)
@@ -1148,7 +1148,7 @@ static int _excise_block(List block_list, pm_partition_id_t bg_block_id,
ListIterator iter;
bg_record_t *block = NULL;
- if (block_list) {
+ if(block_list) {
iter = list_iterator_create(block_list);
xassert(iter);
while ((block = list_next(iter))) {
@@ -1232,7 +1232,7 @@ extern int start_job(struct job_record *job_ptr)
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_BLRTS_IMAGE,
&(bg_update_ptr->blrtsimage));
- if (!bg_update_ptr->blrtsimage) {
+ if(!bg_update_ptr->blrtsimage) {
bg_update_ptr->blrtsimage =
xstrdup(bg_conf->default_blrtsimage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
@@ -1248,7 +1248,7 @@ extern int start_job(struct job_record *job_ptr)
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_LINUX_IMAGE,
&(bg_update_ptr->linuximage));
- if (!bg_update_ptr->linuximage) {
+ if(!bg_update_ptr->linuximage) {
bg_update_ptr->linuximage =
xstrdup(bg_conf->default_linuximage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
@@ -1258,7 +1258,7 @@ extern int start_job(struct job_record *job_ptr)
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_MLOADER_IMAGE,
&(bg_update_ptr->mloaderimage));
- if (!bg_update_ptr->mloaderimage) {
+ if(!bg_update_ptr->mloaderimage) {
bg_update_ptr->mloaderimage =
xstrdup(bg_conf->default_mloaderimage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
@@ -1268,7 +1268,7 @@ extern int start_job(struct job_record *job_ptr)
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_RAMDISK_IMAGE,
&(bg_update_ptr->ramdiskimage));
- if (!bg_update_ptr->ramdiskimage) {
+ if(!bg_update_ptr->ramdiskimage) {
bg_update_ptr->ramdiskimage =
xstrdup(bg_conf->default_ramdiskimage);
select_g_select_jobinfo_set(job_ptr->select_jobinfo,
@@ -1292,11 +1292,11 @@ extern int start_job(struct job_record *job_ptr)
job_ptr->total_cpus = job_ptr->details->min_cpus = bg_record->cpu_cnt;
bg_record->job_running = bg_update_ptr->job_ptr->job_id;
bg_record->job_ptr = bg_update_ptr->job_ptr;
- if (!block_ptr_exist_in_list(bg_lists->job_running, bg_record)) {
+ if(!block_ptr_exist_in_list(bg_lists->job_running, bg_record)) {
list_push(bg_lists->job_running, bg_record);
num_unused_cpus -= bg_record->cpu_cnt;
}
- if (!block_ptr_exist_in_list(bg_lists->booted, bg_record))
+ if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
slurm_mutex_unlock(&block_state_mutex);
@@ -1356,7 +1356,7 @@ extern int sync_jobs(List job_list)
/* Insure that all running jobs own the specified block */
block_list = _get_all_allocated_blocks();
- if (job_list) {
+ if(job_list) {
job_iterator = list_iterator_create(job_list);
while ((job_ptr = (struct job_record *)
list_next(job_iterator))) {
@@ -1437,7 +1437,7 @@ extern int sync_jobs(List job_list)
return SLURM_ERROR;
}
/* Insure that all other blocks are free of users */
- if (block_list) {
+ if(block_list) {
_reset_block_list(block_list);
list_destroy(block_list);
} else {
@@ -1474,7 +1474,7 @@ extern int boot_block(bg_record_t *bg_record)
!= STATUS_OK) {
error("bridge_create_block(%s): %s",
bg_record->bg_block_id, bg_err_str(rc));
- if (rc == INCOMPATIBLE_STATE) {
+ if(rc == INCOMPATIBLE_STATE) {
char reason[200];
snprintf(reason, sizeof(reason),
"boot_block: "
@@ -1490,13 +1490,13 @@ extern int boot_block(bg_record_t *bg_record)
}
slurm_mutex_lock(&block_state_mutex);
- if (!block_ptr_exist_in_list(bg_lists->booted, bg_record))
+ if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
slurm_mutex_unlock(&block_state_mutex);
rc = 0;
while(rc < 10) {
- if (bg_record->state == RM_PARTITION_CONFIGURING) {
+ if(bg_record->state == RM_PARTITION_CONFIGURING) {
break;
}
sleep(1);
@@ -1506,7 +1506,7 @@ extern int boot_block(bg_record_t *bg_record)
/* reset state right now, don't wait for
* update_block_list() to run or epilog could
* get old/bad data. */
- if (bg_record->state != RM_PARTITION_CONFIGURING)
+ if(bg_record->state != RM_PARTITION_CONFIGURING)
bg_record->state = RM_PARTITION_CONFIGURING;
debug("Setting bootflag for %s", bg_record->bg_block_id);
bg_record->boot_state = 1;
@@ -1515,7 +1515,7 @@ extern int boot_block(bg_record_t *bg_record)
slurm_mutex_unlock(&block_state_mutex);
#else
slurm_mutex_lock(&block_state_mutex);
- if (!block_ptr_exist_in_list(bg_lists->booted, bg_record))
+ if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
bg_record->state = RM_PARTITION_READY;
last_bg_update = time(NULL);
@@ -1528,6 +1528,6 @@ extern int boot_block(bg_record_t *bg_record)
extern void waitfor_block_agents()
{
- if (agent_cnt)
+ if(agent_cnt)
pthread_cond_wait(&agent_cond, &agent_cnt_mutex);
}
diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.c b/src/plugins/select/bluegene/plugin/bg_record_functions.c
index 63eabebe1d629e9cf9fb34d0d565967e3ed0585c..8dcf31f4c71c33099968eb8d31a066015011adb6 100644
--- a/src/plugins/select/bluegene/plugin/bg_record_functions.c
+++ b/src/plugins/select/bluegene/plugin/bg_record_functions.c
@@ -97,7 +97,7 @@ extern void destroy_bg_record(void *object)
xfree(bg_record->ionodes);
xfree(bg_record->user_name);
xfree(bg_record->target_name);
- if (bg_record->bg_block_list) {
+ if(bg_record->bg_block_list) {
list_destroy(bg_record->bg_block_list);
bg_record->bg_block_list = NULL;
}
@@ -124,10 +124,10 @@ extern int block_exist_in_list(List my_list, bg_record_t *bg_record)
while ((found_record = list_next(itr))) {
/* check for full node bitmap compare */
- if (bit_equal(bg_record->bitmap, found_record->bitmap)
+ if(bit_equal(bg_record->bitmap, found_record->bitmap)
&& bit_equal(bg_record->ionode_bitmap,
found_record->ionode_bitmap)) {
- if (bg_record->ionodes)
+ if(bg_record->ionodes)
debug("This block %s[%s] "
"is already in the list %s",
bg_record->nodes,
@@ -154,12 +154,12 @@ extern int block_ptr_exist_in_list(List my_list, bg_record_t *bg_record)
bg_record_t *found_record = NULL;
int rc = 0;
- if (!my_list || !bg_record)
+ if(!my_list || !bg_record)
return rc;
itr = list_iterator_create(my_list);
while ((found_record = list_next(itr))) {
- if (bg_record == found_record) {
+ if(bg_record == found_record) {
rc = 1;
break;
}
@@ -181,15 +181,15 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
ba_node_t* ba_node = NULL;
char *p = '\0';
- if (!bg_record->bg_block_list
+ if(!bg_record->bg_block_list
|| !list_count(bg_record->bg_block_list)) {
- if (!bg_record->bg_block_list) {
+ if(!bg_record->bg_block_list) {
bg_record->bg_block_list =
list_create(destroy_ba_node);
}
memset(&best_start, 0, sizeof(best_start));
bg_record->bp_count = 0;
- if ((bg_record->conn_type >= SELECT_SMALL) && (!startup))
+ if((bg_record->conn_type >= SELECT_SMALL) && (!startup))
error("process_nodes: "
"We shouldn't be here there could be some "
"badness if we use this logic %s",
@@ -217,7 +217,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
HOSTLIST_BASE);
j += 3;
diff = end[X]-start[X];
- if (diff > largest_diff) {
+ if(diff > largest_diff) {
best_start[X] = start[X];
best_start[Y] = start[Y];
best_start[Z] = start[Z];
@@ -232,10 +232,10 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
bg_record,
start,
end);
- if (bg_record->nodes[j] != ',')
+ if(bg_record->nodes[j] != ',')
break;
j--;
- } else if ((bg_record->nodes[j] >= '0'
+ } else if((bg_record->nodes[j] >= '0'
&& bg_record->nodes[j] <= '9')
|| (bg_record->nodes[j] >= 'A'
&& bg_record->nodes[j] <= 'Z')) {
@@ -248,7 +248,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
HOSTLIST_BASE);
j+=3;
diff = 0;
- if (diff > largest_diff) {
+ if(diff > largest_diff) {
best_start[X] = start[X];
best_start[Y] = start[Y];
best_start[Z] = start[Z];
@@ -263,13 +263,13 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
bg_record,
start,
start);
- if (bg_record->nodes[j] != ',')
+ if(bg_record->nodes[j] != ',')
break;
j--;
}
j++;
}
- if (largest_diff == -1)
+ if(largest_diff == -1)
fatal("No hostnames given here");
bg_record->start[X] = best_start[X];
@@ -289,7 +289,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
end[X] = -1;
end[Y] = -1;
end[Z] = -1;
- if (!start_set) {
+ if(!start_set) {
bg_record->start[X] = HOSTLIST_BASE;
bg_record->start[Y] = HOSTLIST_BASE;
bg_record->start[Z] = HOSTLIST_BASE;
@@ -299,7 +299,7 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
itr = list_iterator_create(bg_record->bg_block_list);
while ((ba_node = list_next(itr)) != NULL) {
- if (!ba_node->used)
+ if(!ba_node->used)
continue;
debug4("process_nodes: "
"%c%c%c is included in this block",
@@ -307,26 +307,26 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
- if (ba_node->coord[X]>end[X]) {
+ if(ba_node->coord[X]>end[X]) {
bg_record->geo[X]++;
end[X] = ba_node->coord[X];
}
- if (ba_node->coord[Y]>end[Y]) {
+ if(ba_node->coord[Y]>end[Y]) {
bg_record->geo[Y]++;
end[Y] = ba_node->coord[Y];
}
- if (ba_node->coord[Z]>end[Z]) {
+ if(ba_node->coord[Z]>end[Z]) {
bg_record->geo[Z]++;
end[Z] = ba_node->coord[Z];
}
- if (!start_set) {
- if (ba_node->coord[X]<bg_record->start[X]) {
+ if(!start_set) {
+ if(ba_node->coord[X]<bg_record->start[X]) {
bg_record->start[X] = ba_node->coord[X];
}
- if (ba_node->coord[Y]<bg_record->start[Y]) {
+ if(ba_node->coord[Y]<bg_record->start[Y]) {
bg_record->start[Y] = ba_node->coord[Y];
}
- if (ba_node->coord[Z]<bg_record->start[Z]) {
+ if(ba_node->coord[Z]<bg_record->start[Z]) {
bg_record->start[Z] = ba_node->coord[Z];
}
}
@@ -344,14 +344,14 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
/* This check is for sub midplane systems to figure out what
the largest block can be.
*/
- if ((DIM_SIZE[X] > 1) || (DIM_SIZE[Y] > 1) || (DIM_SIZE[Z] > 1)) {
+ if((DIM_SIZE[X] > 1) || (DIM_SIZE[Y] > 1) || (DIM_SIZE[Z] > 1)) {
/* means we have more than 1 base partition */
if ((bg_record->geo[X] == DIM_SIZE[X])
&& (bg_record->geo[Y] == DIM_SIZE[Y])
&& (bg_record->geo[Z] == DIM_SIZE[Z])) {
bg_record->full_block = 1;
}
- } else if (bg_record->node_cnt == bg_conf->bp_node_cnt)
+ } else if(bg_record->node_cnt == bg_conf->bp_node_cnt)
bg_record->full_block = 1;
if (node_name2bitmap(bg_record->nodes,
@@ -393,7 +393,7 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
ListIterator itr = NULL;
ba_node_t *ba_node = NULL, *new_ba_node = NULL;
- if (!fir_record || !sec_record) {
+ if(!fir_record || !sec_record) {
error("copy_bg_record: "
"given a null for either first record or second record");
return;
@@ -439,23 +439,23 @@ extern void copy_bg_record(bg_record_t *fir_record, bg_record_t *sec_record)
}
FREE_NULL_BITMAP(sec_record->bitmap);
- if (fir_record->bitmap
+ if(fir_record->bitmap
&& (sec_record->bitmap = bit_copy(fir_record->bitmap)) == NULL) {
error("Unable to copy bitmap for %s", fir_record->nodes);
sec_record->bitmap = NULL;
}
FREE_NULL_BITMAP(sec_record->ionode_bitmap);
- if (fir_record->ionode_bitmap
+ if(fir_record->ionode_bitmap
&& (sec_record->ionode_bitmap
= bit_copy(fir_record->ionode_bitmap)) == NULL) {
error("Unable to copy ionode_bitmap for %s",
fir_record->nodes);
sec_record->ionode_bitmap = NULL;
}
- if (sec_record->bg_block_list)
+ if(sec_record->bg_block_list)
list_destroy(sec_record->bg_block_list);
sec_record->bg_block_list = list_create(destroy_ba_node);
- if (fir_record->bg_block_list) {
+ if(fir_record->bg_block_list) {
itr = list_iterator_create(fir_record->bg_block_list);
while((ba_node = list_next(itr))) {
new_ba_node = ba_copy_node(ba_node);
@@ -482,7 +482,7 @@ extern int bg_record_cmpf_inc(bg_record_t* rec_a, bg_record_t* rec_b)
/* We only look at this if we are ordering blocks larger than
* a midplane, order of ionodes is how we order otherwise. */
- if ((size_a >= bg_conf->bp_node_cnt)
+ if((size_a >= bg_conf->bp_node_cnt)
|| (size_b >= bg_conf->bp_node_cnt)) {
if (size_a < size_b)
return -1;
@@ -490,7 +490,7 @@ extern int bg_record_cmpf_inc(bg_record_t* rec_a, bg_record_t* rec_b)
return 1;
}
- if (rec_a->nodes && rec_b->nodes) {
+ if(rec_a->nodes && rec_b->nodes) {
size_a = strcmp(rec_a->nodes, rec_b->nodes);
if (size_a < 0)
return -1;
@@ -498,10 +498,10 @@ extern int bg_record_cmpf_inc(bg_record_t* rec_a, bg_record_t* rec_b)
return 1;
}
- if (!rec_a->ionode_bitmap || !rec_b->ionode_bitmap)
+ if(!rec_a->ionode_bitmap || !rec_b->ionode_bitmap)
return 0;
- if (bit_ffs(rec_a->ionode_bitmap) < bit_ffs(rec_b->ionode_bitmap))
+ if(bit_ffs(rec_a->ionode_bitmap) < bit_ffs(rec_b->ionode_bitmap))
return -1;
else
return 1;
@@ -517,20 +517,20 @@ extern int bg_record_cmpf_inc(bg_record_t* rec_a, bg_record_t* rec_b)
*/
extern int bg_record_sort_aval_inc(bg_record_t* rec_a, bg_record_t* rec_b)
{
- if ((rec_a->job_running == BLOCK_ERROR_STATE)
+ if((rec_a->job_running == BLOCK_ERROR_STATE)
&& (rec_b->job_running != BLOCK_ERROR_STATE))
return 1;
- else if ((rec_a->job_running != BLOCK_ERROR_STATE)
+ else if((rec_a->job_running != BLOCK_ERROR_STATE)
&& (rec_b->job_running == BLOCK_ERROR_STATE))
return -1;
- else if (!rec_a->job_ptr && rec_b->job_ptr)
+ else if(!rec_a->job_ptr && rec_b->job_ptr)
return -1;
- else if (rec_a->job_ptr && !rec_b->job_ptr)
+ else if(rec_a->job_ptr && !rec_b->job_ptr)
return 1;
- else if (rec_a->job_ptr && rec_b->job_ptr) {
- if (rec_a->job_ptr->end_time > rec_b->job_ptr->end_time)
+ else if(rec_a->job_ptr && rec_b->job_ptr) {
+ if(rec_a->job_ptr->end_time > rec_b->job_ptr->end_time)
return 1;
- else if (rec_a->job_ptr->end_time < rec_b->job_ptr->end_time)
+ else if(rec_a->job_ptr->end_time < rec_b->job_ptr->end_time)
return -1;
}
@@ -547,18 +547,18 @@ extern bg_record_t *find_bg_record_in_list(List my_list, char *bg_block_id)
xassert(my_list);
- if (!bg_block_id)
+ if(!bg_block_id)
return NULL;
itr = list_iterator_create(my_list);
while((bg_record = list_next(itr))) {
- if (bg_record->bg_block_id)
+ if(bg_record->bg_block_id)
if (!strcasecmp(bg_record->bg_block_id, bg_block_id))
break;
}
list_iterator_destroy(itr);
- if (bg_record)
+ if(bg_record)
return bg_record;
else
return NULL;
@@ -571,18 +571,18 @@ extern bg_record_t *find_bg_record_in_list(List my_list, char *bg_block_id)
*/
extern int update_block_user(bg_record_t *bg_record, int set)
{
- if (!bg_record->target_name) {
+ if(!bg_record->target_name) {
error("Must set target_name to run update_block_user.");
return -1;
}
- if (!bg_record->user_name) {
+ if(!bg_record->user_name) {
error("No user_name");
bg_record->user_name = xstrdup(bg_conf->slurm_user_name);
}
#ifdef HAVE_BG_FILES
int rc=0;
- if (set) {
- if ((rc = remove_all_users(bg_record->bg_block_id,
+ if(set) {
+ if((rc = remove_all_users(bg_record->bg_block_id,
bg_record->target_name))
== REMOVE_USER_ERR) {
error("1 Something happened removing "
@@ -612,7 +612,7 @@ extern int update_block_user(bg_record_t *bg_record, int set)
}
#endif
- if (strcmp(bg_record->target_name, bg_record->user_name)) {
+ if(strcmp(bg_record->target_name, bg_record->user_name)) {
uid_t pw_uid;
xfree(bg_record->user_name);
bg_record->user_name = xstrdup(bg_record->target_name);
@@ -639,13 +639,13 @@ extern void drain_as_needed(bg_record_t *bg_record, char *reason)
hostlist_t hl;
char *host = NULL;
- if (bg_record->job_running > NO_JOB_RUNNING) {
+ if(bg_record->job_running > NO_JOB_RUNNING) {
int rc;
slurmctld_lock_t job_write_lock = {
NO_LOCK, WRITE_LOCK, WRITE_LOCK, NO_LOCK };
lock_slurmctld(job_write_lock);
debug2("Trying to requeue job %d", bg_record->job_running);
- if ((rc = job_requeue(0, bg_record->job_running,
+ if((rc = job_requeue(0, bg_record->job_running,
-1, (uint16_t)NO_VAL))) {
error("couldn't requeue job %u, failing it: %s",
bg_record->job_running,
@@ -654,7 +654,7 @@ extern void drain_as_needed(bg_record_t *bg_record, char *reason)
}
unlock_slurmctld(job_write_lock);
slurm_mutex_lock(&block_state_mutex);
- if (remove_from_bg_list(bg_lists->job_running, bg_record)
+ if(remove_from_bg_list(bg_lists->job_running, bg_record)
== SLURM_SUCCESS) {
num_unused_cpus += bg_record->cpu_cnt;
}
@@ -662,7 +662,7 @@ extern void drain_as_needed(bg_record_t *bg_record, char *reason)
}
/* small blocks */
- if (bg_record->cpu_cnt < bg_conf->cpus_per_bp) {
+ if(bg_record->cpu_cnt < bg_conf->cpus_per_bp) {
debug2("small block");
goto end_it;
}
@@ -703,7 +703,7 @@ extern int set_ionodes(bg_record_t *bg_record, int io_start, int io_nodes)
{
char bitstring[BITSIZE];
- if (!bg_record)
+ if(!bg_record)
return SLURM_ERROR;
bg_record->ionode_bitmap = bit_alloc(bg_conf->numpsets);
@@ -726,7 +726,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
xassert(bg_conf->slurm_user_name);
- if (!records) {
+ if(!records) {
fatal("add_bg_record: no records list given");
}
bg_record = (bg_record_t*) xmalloc(sizeof(bg_record_t));
@@ -740,8 +740,8 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
bg_record->user_uid = pw_uid;
bg_record->bg_block_list = list_create(destroy_ba_node);
- if (used_nodes) {
- if (copy_node_path(used_nodes, &bg_record->bg_block_list)
+ if(used_nodes) {
+ if(copy_node_path(used_nodes, &bg_record->bg_block_list)
== SLURM_ERROR)
error("add_bg_record: "
"couldn't copy the path for the allocation");
@@ -750,12 +750,12 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
/* bg_record->boot_state = 0; Implicit */
/* bg_record->state = 0; Implicit */
#ifdef HAVE_BGL
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("add_bg_record: asking for %s %d %d %s",
blockreq->block, blockreq->small32, blockreq->small128,
conn_type_string(blockreq->conn_type));
#else
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("add_bg_record: asking for %s %d %d %d %d %d %s",
blockreq->block, blockreq->small256,
blockreq->small128, blockreq->small64,
@@ -775,7 +775,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
|| (blockreq->block[i] > '9' && blockreq->block[i] < 'A')))
i++;
- if (i<len) {
+ if(i<len) {
len -= i;
len += strlen(bg_conf->slurm_node_prefix)+1;
@@ -797,35 +797,35 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
bg_record->job_running = NO_JOB_RUNNING;
#ifdef HAVE_BGL
- if (blockreq->blrtsimage)
+ if(blockreq->blrtsimage)
bg_record->blrtsimage = xstrdup(blockreq->blrtsimage);
else
bg_record->blrtsimage = xstrdup(bg_conf->default_blrtsimage);
#endif
- if (blockreq->linuximage)
+ if(blockreq->linuximage)
bg_record->linuximage = xstrdup(blockreq->linuximage);
else
bg_record->linuximage = xstrdup(bg_conf->default_linuximage);
- if (blockreq->mloaderimage)
+ if(blockreq->mloaderimage)
bg_record->mloaderimage = xstrdup(blockreq->mloaderimage);
else
bg_record->mloaderimage =
xstrdup(bg_conf->default_mloaderimage);
- if (blockreq->ramdiskimage)
+ if(blockreq->ramdiskimage)
bg_record->ramdiskimage = xstrdup(blockreq->ramdiskimage);
else
bg_record->ramdiskimage =
xstrdup(bg_conf->default_ramdiskimage);
- if (bg_record->conn_type != SELECT_SMALL) {
+ if(bg_record->conn_type != SELECT_SMALL) {
/* this needs to be an append so we keep things in the
order we got them, they will be sorted later */
list_append(records, bg_record);
/* this isn't a correct list so we need to set it later for
now we just used it to be the bp number */
- if (!used_nodes) {
+ if(!used_nodes) {
debug4("add_bg_record: "
"we didn't get a request list so we are "
"destroying this bp list");
@@ -835,15 +835,15 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
} else {
List bg_block_list = NULL;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("add_bg_record: adding a small block");
- if (no_check)
+ if(no_check)
goto no_check;
/* if the ionode cnt for small32 is 0 then don't
allow a sub quarter allocation
*/
- if (bg_conf->nodecard_ionode_cnt < 2) {
- if (!bg_conf->nodecard_ionode_cnt && blockreq->small32)
+ if(bg_conf->nodecard_ionode_cnt < 2) {
+ if(!bg_conf->nodecard_ionode_cnt && blockreq->small32)
fatal("add_bg_record: "
"There is an error in your "
"bluegene.conf file.\n"
@@ -852,7 +852,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
"to at least 16)",
bg_conf->numpsets);
#ifndef HAVE_BGL
- if (blockreq->small16)
+ if(blockreq->small16)
fatal("add_bg_record: "
"There is an error in your "
"bluegene.conf file.\n"
@@ -860,7 +860,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
"Numpsets=%u. (Try setting it to "
"at least 32)",
bg_conf->numpsets);
- if ((bg_conf->io_ratio < 0.5) && blockreq->small64)
+ if((bg_conf->io_ratio < 0.5) && blockreq->small64)
fatal("add_bg_record: "
"There is an error in your "
"bluegene.conf file.\n"
@@ -872,7 +872,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
}
#ifdef HAVE_BGL
- if (blockreq->small32==0 && blockreq->small128==0) {
+ if(blockreq->small32==0 && blockreq->small128==0) {
info("add_bg_record: "
"No specs given for this small block, "
"I am spliting this block into 4 128CnBlocks");
@@ -881,7 +881,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
i = (blockreq->small32*bg_conf->nodecard_node_cnt) +
(blockreq->small128*bg_conf->quarter_node_cnt);
- if (i != bg_conf->bp_node_cnt)
+ if(i != bg_conf->bp_node_cnt)
fatal("add_bg_record: "
"There is an error in your bluegene.conf file.\n"
"I am unable to request %d nodes consisting of "
@@ -891,7 +891,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
bg_conf->bp_node_cnt);
small_count = blockreq->small32+blockreq->small128;
#else
- if (!blockreq->small16 && !blockreq->small32
+ if(!blockreq->small16 && !blockreq->small32
&& !blockreq->small64 && !blockreq->small128
&& !blockreq->small256) {
info("add_bg_record: "
@@ -905,7 +905,7 @@ extern int add_bg_record(List records, List used_nodes, blockreq_t *blockreq,
+ (blockreq->small64*64)
+ (blockreq->small128*128)
+ (blockreq->small256*256);
- if (i != bg_conf->bp_node_cnt)
+ if(i != bg_conf->bp_node_cnt)
fatal("add_bg_record: "
"There is an error in your bluegene.conf file.\n"
"I am unable to request %d nodes consisting of "
@@ -978,7 +978,7 @@ extern int handle_small_record_request(List records, blockreq_t *blockreq,
start++;
}
#endif
- if ((ionode_cnt = bg_conf->nodecard_ionode_cnt))
+ if((ionode_cnt = bg_conf->nodecard_ionode_cnt))
ionode_cnt--;
for(i=0; i<blockreq->small32; i++) {
bit_nset(ionodes, start, start+ionode_cnt);
@@ -992,7 +992,7 @@ extern int handle_small_record_request(List records, blockreq_t *blockreq,
}
#ifndef HAVE_BGL
- if ((ionode_cnt = bg_conf->nodecard_ionode_cnt * 2))
+ if((ionode_cnt = bg_conf->nodecard_ionode_cnt * 2))
ionode_cnt--;
for(i=0; i<blockreq->small64; i++) {
bit_nset(ionodes, start, start+ionode_cnt);
@@ -1005,7 +1005,7 @@ extern int handle_small_record_request(List records, blockreq_t *blockreq,
start+=ionode_cnt+1;
}
#endif
- if ((ionode_cnt = bg_conf->quarter_ionode_cnt))
+ if((ionode_cnt = bg_conf->quarter_ionode_cnt))
ionode_cnt--;
for(i=0; i<blockreq->small128; i++) {
bit_nset(ionodes, start, start+ionode_cnt);
@@ -1019,7 +1019,7 @@ extern int handle_small_record_request(List records, blockreq_t *blockreq,
}
#ifndef HAVE_BGL
- if ((ionode_cnt = bg_conf->quarter_ionode_cnt * 2))
+ if((ionode_cnt = bg_conf->quarter_ionode_cnt * 2))
ionode_cnt--;
for(i=0; i<blockreq->small256; i++) {
bit_nset(ionodes, start, start+ionode_cnt);
@@ -1041,7 +1041,7 @@ extern int handle_small_record_request(List records, blockreq_t *blockreq,
extern int format_node_name(bg_record_t *bg_record, char *buf, int buf_size)
{
- if (bg_record->ionodes) {
+ if(bg_record->ionodes) {
snprintf(buf, buf_size, "%s[%s]",
bg_record->nodes,
bg_record->ionodes);
@@ -1074,15 +1074,15 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
xassert(bp_name);
- if (io_cnt == NO_VAL) {
+ if(io_cnt == NO_VAL) {
io_cnt = 1;
/* Translate 1 nodecard count to ionode count */
- if ((io_cnt *= bg_conf->io_ratio))
+ if((io_cnt *= bg_conf->io_ratio))
io_cnt--;
/* make sure we create something that is able to be
created */
- if (bg_conf->smallest_block < bg_conf->nodecard_node_cnt)
+ if(bg_conf->smallest_block < bg_conf->nodecard_node_cnt)
create_size = bg_conf->nodecard_node_cnt;
else
create_size = bg_conf->smallest_block;
@@ -1097,7 +1097,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
/* this is here for sanity check to make sure we don't core on
these bits when we set them below. */
- if (io_start >= bg_conf->numpsets
+ if(io_start >= bg_conf->numpsets
|| (io_start+io_cnt) >= bg_conf->numpsets) {
debug("io %d-%d not configured on this "
"system, only %d ionodes per midplane",
@@ -1127,14 +1127,14 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->main);
while ((bg_record = list_next(itr))) {
- if (!bit_test(bg_record->bitmap, bp_bit))
+ if(!bit_test(bg_record->bitmap, bp_bit))
continue;
- if (!blocks_overlap(bg_record, &tmp_record))
+ if(!blocks_overlap(bg_record, &tmp_record))
continue;
- if (bg_record->job_running > NO_JOB_RUNNING) {
- if (slurmctld_locked)
+ if(bg_record->job_running > NO_JOB_RUNNING) {
+ if(slurmctld_locked)
job_fail(bg_record->job_running);
else
slurm_fail_job(bg_record->job_running);
@@ -1143,9 +1143,9 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
/* If Running Dynamic mode and the the block is
smaller than the create size just continue on.
*/
- if ((bg_conf->layout_mode == LAYOUT_DYNAMIC)
+ if((bg_conf->layout_mode == LAYOUT_DYNAMIC)
&& (bg_record->node_cnt < create_size)) {
- if (!delete_list)
+ if(!delete_list)
delete_list = list_create(NULL);
list_append(delete_list, bg_record);
continue;
@@ -1153,26 +1153,26 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
/* keep track of the smallest size that is at least
the size of create_size. */
- if (!smallest_bg_record ||
+ if(!smallest_bg_record ||
(smallest_bg_record->node_cnt > bg_record->node_cnt))
smallest_bg_record = bg_record;
}
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
- if (bg_conf->layout_mode != LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode != LAYOUT_DYNAMIC) {
debug3("running non-dynamic mode");
/* This should never happen, but just in case... */
- if (delete_list)
+ if(delete_list)
list_destroy(delete_list);
/* If we found a block that is smaller or equal to a
midplane we will just mark it in an error state as
opposed to draining the node.
*/
- if (smallest_bg_record
+ if(smallest_bg_record
&& (smallest_bg_record->node_cnt < bg_conf->bp_node_cnt)){
- if (smallest_bg_record->state == RM_PARTITION_ERROR) {
+ if(smallest_bg_record->state == RM_PARTITION_ERROR) {
rc = SLURM_NO_CHANGE_IN_DATA;
goto cleanup;
}
@@ -1184,8 +1184,8 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
debug("No block under 1 midplane available for this nodecard. "
"Draining the whole node.");
- if (!node_already_down(bp_name)) {
- if (slurmctld_locked)
+ if(!node_already_down(bp_name)) {
+ if(slurmctld_locked)
drain_nodes(bp_name, reason,
slurm_get_slurm_user_id());
else
@@ -1198,7 +1198,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
/* below is only for Dynamic mode */
- if (delete_list) {
+ if(delete_list) {
int cnt_set = 0;
bitstr_t *iobitmap = bit_alloc(bg_conf->numpsets);
/* don't lock here since it is handled inside
@@ -1217,7 +1217,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
}
list_iterator_destroy(itr);
list_destroy(delete_list);
- if (!cnt_set) {
+ if(!cnt_set) {
FREE_NULL_BITMAP(iobitmap);
rc = SLURM_ERROR;
goto cleanup;
@@ -1225,23 +1225,23 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
/* set the start to be the same as the start of the
ionode_bitmap. If no ionodes set (not a small
block) set io_start = 0. */
- if ((io_start = bit_ffs(iobitmap)) == -1) {
+ if((io_start = bit_ffs(iobitmap)) == -1) {
io_start = 0;
- if (create_size > bg_conf->nodecard_node_cnt)
+ if(create_size > bg_conf->nodecard_node_cnt)
blockreq.small128 = 4;
else
blockreq.small32 = 16;
- } else if (create_size <= bg_conf->nodecard_node_cnt)
+ } else if(create_size <= bg_conf->nodecard_node_cnt)
blockreq.small32 = 1;
else
/* this should never happen */
blockreq.small128 = 1;
FREE_NULL_BITMAP(iobitmap);
- } else if (smallest_bg_record) {
+ } else if(smallest_bg_record) {
debug2("smallest dynamic block is %s",
smallest_bg_record->bg_block_id);
- if (smallest_bg_record->state == RM_PARTITION_ERROR) {
+ if(smallest_bg_record->state == RM_PARTITION_ERROR) {
rc = SLURM_NO_CHANGE_IN_DATA;
goto cleanup;
}
@@ -1249,13 +1249,13 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
while(smallest_bg_record->job_running > NO_JOB_RUNNING)
sleep(1);
- if (smallest_bg_record->node_cnt == create_size) {
+ if(smallest_bg_record->node_cnt == create_size) {
rc = put_block_in_error_state(
smallest_bg_record, BLOCK_ERROR_STATE, reason);
goto cleanup;
}
- if (create_size > smallest_bg_record->node_cnt) {
+ if(create_size > smallest_bg_record->node_cnt) {
/* we should never get here. This means we
* have a create_size that is bigger than a
* block that is already made.
@@ -1283,11 +1283,11 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
break;
}
- if (create_size != bg_conf->nodecard_node_cnt) {
+ if(create_size != bg_conf->nodecard_node_cnt) {
blockreq.small128 = blockreq.small32 / 4;
blockreq.small32 = 0;
io_start = 0;
- } else if ((io_start =
+ } else if((io_start =
bit_ffs(smallest_bg_record->ionode_bitmap)) == -1)
/* set the start to be the same as the start of the
ionode_bitmap. If no ionodes set (not a small
@@ -1309,9 +1309,9 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
blockreq.small128 = 4;
break;
case 512:
- if (!node_already_down(bp_name)) {
+ if(!node_already_down(bp_name)) {
char *reason = "select_bluegene: nodecard down";
- if (slurmctld_locked)
+ if(slurmctld_locked)
drain_nodes(bp_name, reason,
slurm_get_slurm_user_id());
else
@@ -1346,7 +1346,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->main);
while((found_record = list_next(itr))) {
- if (!blocks_overlap(bg_record, found_record))
+ if(!blocks_overlap(bg_record, found_record))
continue;
list_push(delete_list, found_record);
list_remove(itr);
@@ -1355,7 +1355,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
slurm_mutex_unlock(&block_state_mutex);
/* we need to add this record since it doesn't exist */
- if (configure_block(bg_record) == SLURM_ERROR) {
+ if(configure_block(bg_record) == SLURM_ERROR) {
destroy_bg_record(bg_record);
error("down_sub_node_blocks: "
"unable to configure block in api");
@@ -1369,7 +1369,7 @@ extern int down_nodecard(char *bp_name, bitoff_t io_start,
slurm_mutex_lock(&block_state_mutex);
list_append(bg_lists->main, bg_record);
slurm_mutex_unlock(&block_state_mutex);
- if (bit_overlap(bg_record->ionode_bitmap,
+ if(bit_overlap(bg_record->ionode_bitmap,
tmp_record.ionode_bitmap)) {
/* here we know the error block doesn't exist
so just set the state here */
@@ -1416,12 +1416,12 @@ extern int up_nodecard(char *bp_name, bitstr_t *ionode_bitmap)
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->main);
while((bg_record = list_next(itr))) {
- if (bg_record->job_running != BLOCK_ERROR_STATE)
+ if(bg_record->job_running != BLOCK_ERROR_STATE)
continue;
- if (!bit_test(bg_record->bitmap, bp_bit))
+ if(!bit_test(bg_record->bitmap, bp_bit))
continue;
- if (!bit_overlap(bg_record->ionode_bitmap, ionode_bitmap)) {
+ if(!bit_overlap(bg_record->ionode_bitmap, ionode_bitmap)) {
continue;
}
resume_block(bg_record);
@@ -1432,9 +1432,9 @@ extern int up_nodecard(char *bp_name, bitstr_t *ionode_bitmap)
/* FIX ME: This needs to call the opposite of
slurm_drain_nodes which does not yet exist.
*/
- if ((ret = node_already_down(bp_name))) {
+ if((ret = node_already_down(bp_name))) {
/* means it was drained */
- if (ret == 2) {
+ if(ret == 2) {
/* debug("node %s put back into service after " */
/* "being in an error state", */
/* bp_name); */
@@ -1454,7 +1454,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
/* only check this if the blocks are created, meaning this
isn't at startup.
*/
- if (blocks_are_created) {
+ if(blocks_are_created) {
/* Since we are putting this block in an error state we need
to wait for the job to be removed. We don't really
need to free the block though since we may just
@@ -1464,7 +1464,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
}
slurm_mutex_lock(&block_state_mutex);
- if (!block_ptr_exist_in_list(bg_lists->main, bg_record)) {
+ if(!block_ptr_exist_in_list(bg_lists->main, bg_record)) {
slurm_mutex_unlock(&block_state_mutex);
error("while trying to put block in "
"error state it disappeared");
@@ -1475,11 +1475,11 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
bg_record->bg_block_id, reason);
/* we add the block to these lists so we don't try to schedule
on them. */
- if (!block_ptr_exist_in_list(bg_lists->job_running, bg_record)) {
+ if(!block_ptr_exist_in_list(bg_lists->job_running, bg_record)) {
list_push(bg_lists->job_running, bg_record);
num_unused_cpus -= bg_record->cpu_cnt;
}
- if (!block_ptr_exist_in_list(bg_lists->booted, bg_record))
+ if(!block_ptr_exist_in_list(bg_lists->booted, bg_record))
list_push(bg_lists->booted, bg_record);
bg_record->job_running = state;
@@ -1497,7 +1497,7 @@ extern int put_block_in_error_state(bg_record_t *bg_record,
/* Only send if reason is set. If it isn't set then
accounting should already know about this error state */
- if (reason)
+ if(reason)
_set_block_nodes_accounting(bg_record, reason);
slurm_mutex_unlock(&block_state_mutex);
@@ -1510,18 +1510,18 @@ extern int resume_block(bg_record_t *bg_record)
{
xassert(bg_record);
- if (bg_record->job_running > NO_JOB_RUNNING)
+ if(bg_record->job_running > NO_JOB_RUNNING)
return SLURM_SUCCESS;
- if (bg_record->state == RM_PARTITION_ERROR)
+ if(bg_record->state == RM_PARTITION_ERROR)
info("Block %s put back into service after "
"being in an error state.",
bg_record->bg_block_id);
- if (remove_from_bg_list(bg_lists->job_running, bg_record)
+ if(remove_from_bg_list(bg_lists->job_running, bg_record)
== SLURM_SUCCESS)
num_unused_cpus += bg_record->cpu_cnt;
- if (bg_record->state != RM_PARTITION_READY)
+ if(bg_record->state != RM_PARTITION_READY)
remove_from_bg_list(bg_lists->booted, bg_record);
bg_record->job_running = NO_JOB_RUNNING;
@@ -1552,7 +1552,7 @@ static int _check_all_blocks_error(int node_inx, time_t event_time,
/* only do this if the node isn't in the DRAINED state.
DRAINING is ok */
- if (IS_NODE_DRAINED(node_ptr))
+ if(IS_NODE_DRAINED(node_ptr))
return rc;
memset(&send_node, 0, sizeof(struct node_record));
@@ -1565,11 +1565,11 @@ static int _check_all_blocks_error(int node_inx, time_t event_time,
itr = list_iterator_create(bg_lists->main);
while((bg_record = list_next(itr))) {
/* only look at other nodes in error state */
- if (bg_record->state != RM_PARTITION_ERROR)
+ if(bg_record->state != RM_PARTITION_ERROR)
continue;
- if (!bit_test(bg_record->bitmap, node_inx))
+ if(!bit_test(bg_record->bitmap, node_inx))
continue;
- if (bg_record->cpu_cnt >= bg_conf->cpus_per_bp) {
+ if(bg_record->cpu_cnt >= bg_conf->cpus_per_bp) {
total_cpus = bg_conf->cpus_per_bp;
break;
} else
@@ -1580,8 +1580,8 @@ static int _check_all_blocks_error(int node_inx, time_t event_time,
send_node.cpus = total_cpus;
config_rec.cpus = total_cpus;
- if (send_node.cpus) {
- if (!reason)
+ if(send_node.cpus) {
+ if(!reason)
reason = "update block: setting partial node down.";
send_node.node_state = NODE_STATE_ERROR;
rc = clusteracct_storage_g_node_down(acct_db_conn,
@@ -1608,7 +1608,7 @@ static int _set_block_nodes_accounting(bg_record_t *bg_record, char *reason)
int i = 0;
for(i = 0; i < node_record_count; i++) {
- if (!bit_test(bg_record->bitmap, i))
+ if(!bit_test(bg_record->bitmap, i))
continue;
rc = _check_all_blocks_error(i, now, reason);
}
diff --git a/src/plugins/select/bluegene/plugin/bg_switch_connections.c b/src/plugins/select/bluegene/plugin/bg_switch_connections.c
index 5473bac0e7291af64055ed52aef757bbe2729724..342f3f5756f4007d3bf119e505fbc7238134ccb9 100644
--- a/src/plugins/select/bluegene/plugin/bg_switch_connections.c
+++ b/src/plugins/select/bluegene/plugin/bg_switch_connections.c
@@ -67,7 +67,7 @@ static int _get_bp_by_location(my_bluegene_t* my_bg, int* curr_coord,
int i, rc;
rm_location_t loc;
- if (!bp_num) {
+ if(!bp_num) {
if ((rc = bridge_get_data(my_bg, RM_BPNum, &bp_num))
!= STATUS_OK) {
fatal("bridge_get_data: RM_BPNum: %s", bg_err_str(rc));
@@ -76,7 +76,7 @@ static int _get_bp_by_location(my_bluegene_t* my_bg, int* curr_coord,
}
for (i=0; i<bp_num; i++){
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(my_bg, RM_NextBP, bp))
!= STATUS_OK) {
fatal("bridge_get_data: RM_NextBP: %s",
@@ -117,7 +117,7 @@ static int _get_switches_by_bpid(
int found_bpid = 0;
char *curr_bpid = NULL;
- if (!switch_num) {
+ if(!switch_num) {
if ((rc = bridge_get_data(my_bg, RM_SwitchNum, &switch_num))
!= STATUS_OK) {
fatal("bridge_get_data: RM_SwitchNum: %s",
@@ -127,7 +127,7 @@ static int _get_switches_by_bpid(
}
for (i=0; i<switch_num; i++) {
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(my_bg, RM_NextSwitch,
&curr_switch))
!= STATUS_OK) {
@@ -150,7 +150,7 @@ static int _get_switches_by_bpid(
bg_err_str(rc));
}
- if (!curr_bpid) {
+ if(!curr_bpid) {
error("No BP ID was returned from database");
continue;
}
@@ -158,7 +158,7 @@ static int _get_switches_by_bpid(
if (!strcasecmp((char *)bpid, (char *)curr_bpid)) {
coord_switch[found_bpid] = curr_switch;
found_bpid++;
- if (found_bpid==SYSTEM_DIMENSIONS) {
+ if(found_bpid==SYSTEM_DIMENSIONS) {
free(curr_bpid);
return SLURM_SUCCESS;
}
@@ -204,7 +204,7 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
break;
}
ba_conn = &ba_switch->int_wire[source];
- if (ba_conn->used && ba_conn->port_tar != source) {
+ if(ba_conn->used && ba_conn->port_tar != source) {
switch(ba_conn->port_tar) {
case 0:
conn[i].p2 = RM_PORT_S0;
@@ -222,7 +222,7 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
break;
}
conn[i].part_state = RM_PARTITION_READY;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("adding %d -> %d", source,
ba_conn->port_tar);
list_push(conn_list, &conn[i]);
@@ -230,7 +230,7 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
}
i = list_count(conn_list);
- if (i) {
+ if(i) {
if ((rc = bridge_set_data(curr_switch, RM_SwitchConnNum, &i))
!= STATUS_OK) {
fatal("bridge_set_data: RM_SwitchConnNum: %s",
@@ -239,7 +239,7 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
return SLURM_ERROR;
}
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("we got a switch with no connections");
list_destroy(conn_list);
return SLURM_ERROR;
@@ -247,7 +247,7 @@ static int _add_switch_conns(rm_switch_t* curr_switch,
/* Now we can add them to the mix */
while((conn_ptr = list_pop(conn_list))) {
- if (firstconnect) {
+ if(firstconnect) {
if ((rc = bridge_set_data(
curr_switch,
RM_SwitchFirstConnection,
@@ -291,13 +291,13 @@ static int _used_switches(ba_node_t* ba_node)
int i = 0, j = 0, switch_count = 0;
int source = 0;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("checking node %c%c%c",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
for(i=0; i<SYSTEM_DIMENSIONS; i++) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("dim %d", i);
ba_switch = &ba_node->axis_switch[i];
for(j=0; j<num_connections; j++) {
@@ -318,9 +318,9 @@ static int _used_switches(ba_node_t* ba_node)
break;
}
ba_conn = &ba_switch->int_wire[source];
- if (ba_conn->used && ba_conn->port_tar != source) {
+ if(ba_conn->used && ba_conn->port_tar != source) {
switch_count++;
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_WIRES)
info("used");
break;
@@ -350,7 +350,7 @@ extern int configure_small_block(bg_record_t *bg_record)
double nc_pos = 0;
#endif
xassert(bg_record->ionode_bitmap);
- if (bg_record->bp_count != 1) {
+ if(bg_record->bp_count != 1) {
error("Requesting small block with %d bps, needs to be 1.",
bg_record->bp_count);
return SLURM_ERROR;
@@ -367,7 +367,7 @@ extern int configure_small_block(bg_record_t *bg_record)
}
num_ncards = bg_record->node_cnt/bg_conf->nodecard_node_cnt;
- if (num_ncards < 1) {
+ if(num_ncards < 1) {
num_ncards = 1;
sub_nodecard = 1;
}
@@ -376,14 +376,14 @@ extern int configure_small_block(bg_record_t *bg_record)
/* find out how many nodecards to get for each ionode */
for(i = 0; i<bg_conf->numpsets; i++) {
- if (bit_test(bg_record->ionode_bitmap, i)) {
- if (bg_conf->nc_ratio > 1) {
+ if(bit_test(bg_record->ionode_bitmap, i)) {
+ if(bg_conf->nc_ratio > 1) {
int j=0;
for(j=0; j<bg_conf->nc_ratio; j++)
use_nc[(int)nc_pos+j] = 1;
} else {
use_nc[(int)nc_pos] = 1;
- if (i%2)
+ if(i%2)
ionode_card = 1;
}
}
@@ -437,7 +437,7 @@ extern int configure_small_block(bg_record_t *bg_record)
}
- if (!bp_id) {
+ if(!bp_id) {
error("No BP ID was returned from database");
return SLURM_ERROR;
}
@@ -452,13 +452,13 @@ extern int configure_small_block(bg_record_t *bg_record)
free(bp_id);
- if ((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
+ if((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
!= STATUS_OK) {
error("bridge_get_data(RM_NodeCardListSize): %s",
bg_err_str(rc));
return SLURM_ERROR;
}
- if (num_ncards > num) {
+ if(num_ncards > num) {
error("You requested more (%d > %d) nodecards "
"than are available on this block %s",
num_ncards, num, bg_record->nodes);
@@ -493,7 +493,7 @@ extern int configure_small_block(bg_record_t *bg_record)
the system happens, but that should be rare.
*/
nc_id = i;
- if (!use_nc[i])
+ if(!use_nc[i])
continue;
#else
if ((rc = bridge_get_data(ncard,
@@ -504,7 +504,7 @@ extern int configure_small_block(bg_record_t *bg_record)
goto cleanup;
}
- if (!nc_char) {
+ if(!nc_char) {
error("No NodeCard ID was returned from database");
rc = SLURM_ERROR;
goto cleanup;
@@ -512,16 +512,16 @@ extern int configure_small_block(bg_record_t *bg_record)
nc_id = atoi((char*)nc_char+1);
- if (!use_nc[nc_id]) {
+ if(!use_nc[nc_id]) {
free(nc_char);
continue;
}
- if (sub_nodecard) {
+ if(sub_nodecard) {
rm_ionode_t *ionode;
char *ionode_id = "J00";
- if ((rc = bridge_new_nodecard(&ncard)) != STATUS_OK) {
+ if((rc = bridge_new_nodecard(&ncard)) != STATUS_OK) {
error("bridge_new_nodecard(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
@@ -550,14 +550,14 @@ extern int configure_small_block(bg_record_t *bg_record)
goto cleanup;
}
- if ((rc = bridge_new_ionode(&ionode)) != STATUS_OK) {
+ if((rc = bridge_new_ionode(&ionode)) != STATUS_OK) {
error("bridge_new_ionode(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
goto cleanup;
}
- if (ionode_card)
+ if(ionode_card)
ionode_id = "J01";
if ((rc = bridge_set_data(ionode,
@@ -582,7 +582,7 @@ extern int configure_small_block(bg_record_t *bg_record)
goto cleanup;
}
- if ((rc = bridge_free_ionode(ionode)) != STATUS_OK) {
+ if((rc = bridge_free_ionode(ionode)) != STATUS_OK) {
error("bridge_free_ionode(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
@@ -620,8 +620,8 @@ extern int configure_small_block(bg_record_t *bg_record)
nc_count++;
#ifndef HAVE_BGL
- if (sub_nodecard) {
- if ((rc = bridge_free_nodecard(ncard)) != STATUS_OK) {
+ if(sub_nodecard) {
+ if((rc = bridge_free_nodecard(ncard)) != STATUS_OK) {
error("bridge_free_nodecard(): %s",
bg_err_str(rc));
rc = SLURM_ERROR;
@@ -629,7 +629,7 @@ extern int configure_small_block(bg_record_t *bg_record)
}
}
#endif
- if (nc_count == num_ncards)
+ if(nc_count == num_ncards)
break;
}
cleanup:
@@ -638,7 +638,7 @@ cleanup:
return SLURM_ERROR;
}
#endif
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("making the small block");
return rc;
}
@@ -659,7 +659,7 @@ extern int configure_block_switches(bg_record_t * bg_record)
rm_BP_t *curr_bp = NULL;
rm_switch_t *coord_switch[SYSTEM_DIMENSIONS];
#endif
- if (!bg_record->bg_block_list) {
+ if(!bg_record->bg_block_list) {
error("There was no block_list given, can't create block");
return SLURM_ERROR;
}
@@ -669,7 +669,7 @@ extern int configure_block_switches(bg_record_t * bg_record)
itr = list_iterator_create(bg_record->bg_block_list);
while ((ba_node = list_next(itr))) {
- if (ba_node->used) {
+ if(ba_node->used) {
bg_record->bp_count++;
}
bg_record->switch_count += _used_switches(ba_node);
@@ -696,9 +696,9 @@ extern int configure_block_switches(bg_record_t * bg_record)
goto cleanup;
}
#endif
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("BP count %d", bg_record->bp_count);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("switch count %d", bg_record->switch_count);
list_iterator_reset(itr);
@@ -710,15 +710,15 @@ extern int configure_block_switches(bg_record_t * bg_record)
goto cleanup;
}
#endif
- if (!ba_node->used) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(!ba_node->used) {
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("%c%c%c is a passthrough, "
"not including in request",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
alpha_num[ba_node->coord[Z]]);
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_WIRES)
info("using node %c%c%c",
alpha_num[ba_node->coord[X]],
alpha_num[ba_node->coord[Y]],
@@ -755,11 +755,11 @@ extern int configure_block_switches(bg_record_t * bg_record)
fatal("bridge_get_data: RM_BPID: %s", bg_err_str(rc));
}
- if (!bpid) {
+ if(!bpid) {
error("No BP ID was returned from database");
continue;
}
- if (_get_switches_by_bpid(bg, bpid, coord_switch)
+ if(_get_switches_by_bpid(bg, bpid, coord_switch)
!= SLURM_SUCCESS) {
error("Didn't get all the switches for bp %s", bpid);
free(bpid);
@@ -767,10 +767,10 @@ extern int configure_block_switches(bg_record_t * bg_record)
}
free(bpid);
for(i=0; i<SYSTEM_DIMENSIONS; i++) {
- if (_add_switch_conns(coord_switch[i],
+ if(_add_switch_conns(coord_switch[i],
&ba_node->axis_switch[i])
== SLURM_SUCCESS) {
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_WIRES)
info("adding switch dim %d", i);
if (first_switch){
diff --git a/src/plugins/select/bluegene/plugin/block_sys.c b/src/plugins/select/bluegene/plugin/block_sys.c
index 0ddc0e92f8790af4468e3ab07f49509f23812731..46c4a2982c8dea7be18813deb1e4ced097321a46 100755
--- a/src/plugins/select/bluegene/plugin/block_sys.c
+++ b/src/plugins/select/bluegene/plugin/block_sys.c
@@ -155,7 +155,7 @@ static void _pre_allocate(bg_record_t *bg_record)
bg_err_str(rc));
/* rc = bg_conf->bp_node_cnt/bg_record->node_cnt; */
-/* if (rc > 1) */
+/* if(rc > 1) */
/* send_psets = bg_conf->numpsets/rc; */
if ((rc = bridge_set_data(bg_record->bg_block, RM_PartitionPsetsPerBP,
@@ -196,7 +196,7 @@ static int _post_allocate(bg_record_t *bg_record)
}
sleep(3);
}
- if (rc == SLURM_ERROR) {
+ if(rc == SLURM_ERROR) {
info("going to free it");
if ((rc = bridge_free_block(bg_record->bg_block))
!= STATUS_OK)
@@ -212,7 +212,7 @@ static int _post_allocate(bg_record_t *bg_record)
error("bridge_get_data(RM_PartitionID): %s", bg_err_str(rc));
bg_record->bg_block_id = xstrdup("UNKNOWN");
} else {
- if (!block_id) {
+ if(!block_id) {
error("No Block ID was returned from database");
return SLURM_ERROR;
}
@@ -244,14 +244,14 @@ static int _post_allocate(bg_record_t *bg_record)
*/
static int block_inx = 0;
int i=0, temp = 0;
- if (bg_record->bg_block_id) {
+ if(bg_record->bg_block_id) {
while(bg_record->bg_block_id[i]
&& (bg_record->bg_block_id[i] > '9'
|| bg_record->bg_block_id[i] < '0'))
i++;
- if (bg_record->bg_block_id[i]) {
+ if(bg_record->bg_block_id[i]) {
temp = atoi(bg_record->bg_block_id+i)+1;
- if (temp > block_inx)
+ if(temp > block_inx)
block_inx = temp;
debug4("first new block inx will now be %d", block_inx);
}
@@ -283,7 +283,7 @@ extern int find_nodecard_num(rm_partition_t *block_ptr, rm_nodecard_t *ncard,
xassert(block_ptr);
xassert(nc_id);
- if ((rc = bridge_get_data(ncard,
+ if((rc = bridge_get_data(ncard,
RM_NodeCardID,
&my_card_name))
!= STATUS_OK) {
@@ -291,7 +291,7 @@ extern int find_nodecard_num(rm_partition_t *block_ptr, rm_nodecard_t *ncard,
bg_err_str(rc));
}
- if ((rc = bridge_get_data(block_ptr,
+ if((rc = bridge_get_data(block_ptr,
RM_PartitionFirstBP,
&curr_bp))
!= STATUS_OK) {
@@ -312,7 +312,7 @@ extern int find_nodecard_num(rm_partition_t *block_ptr, rm_nodecard_t *ncard,
return SLURM_ERROR;
}
free(bp_id);
- if ((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
+ if((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
!= STATUS_OK) {
error("bridge_get_data(RM_NodeCardListSize): %s",
bg_err_str(rc));
@@ -350,7 +350,7 @@ extern int find_nodecard_num(rm_partition_t *block_ptr, rm_nodecard_t *ncard,
rc = SLURM_ERROR;
goto cleanup;
}
- if (strcmp(my_card_name, card_name)) {
+ if(strcmp(my_card_name, card_name)) {
free(card_name);
continue;
}
@@ -373,7 +373,7 @@ extern int configure_block(bg_record_t *bg_record)
#endif
_pre_allocate(bg_record);
- if (bg_record->cpu_cnt < bg_conf->cpus_per_bp)
+ if(bg_record->cpu_cnt < bg_conf->cpus_per_bp)
configure_small_block(bg_record);
else
configure_block_switches(bg_record);
@@ -412,7 +412,7 @@ int read_bg_blocks(List curr_block_list)
set_bp_map();
- if (bg_recover) {
+ if(bg_recover) {
if ((rc = bridge_get_blocks(state, &block_list))
!= STATUS_OK) {
error("2 rm_get_blocks(): %s", bg_err_str(rc));
@@ -462,12 +462,12 @@ int read_bg_blocks(List curr_block_list)
continue;
}
- if (!tmp_char) {
+ if(!tmp_char) {
error("No Block ID was returned from database");
continue;
}
- if (strncmp("RMP", tmp_char, 3)) {
+ if(strncmp("RMP", tmp_char, 3)) {
free(tmp_char);
continue;
}
@@ -491,7 +491,7 @@ int read_bg_blocks(List curr_block_list)
continue;
}
- if (bp_cnt==0)
+ if(bp_cnt==0)
continue;
bg_record->node_cnt = bp_cnt;
@@ -508,7 +508,7 @@ int read_bg_blocks(List curr_block_list)
continue;
}
- if (bp_cnt==0)
+ if(bp_cnt==0)
continue;
bg_record->bp_count = bp_cnt;
@@ -530,7 +530,7 @@ int read_bg_blocks(List curr_block_list)
continue;
}
- if (small) {
+ if(small) {
if ((rc = bridge_get_data(block_ptr,
RM_PartitionOptions,
&tmp_char))
@@ -538,7 +538,7 @@ int read_bg_blocks(List curr_block_list)
error("bridge_get_data(RM_PartitionOptions): "
"%s", bg_err_str(rc));
continue;
- } else if (tmp_char) {
+ } else if(tmp_char) {
switch(tmp_char[0]) {
case 's':
bg_record->conn_type = SELECT_HTC_S;
@@ -561,7 +561,7 @@ int read_bg_blocks(List curr_block_list)
} else
bg_record->conn_type = SELECT_SMALL;
- if ((rc = bridge_get_data(block_ptr,
+ if((rc = bridge_get_data(block_ptr,
RM_PartitionFirstNodeCard,
&ncard))
!= STATUS_OK) {
@@ -571,7 +571,7 @@ int read_bg_blocks(List curr_block_list)
continue;
}
- if ((rc = bridge_get_data(block_ptr,
+ if((rc = bridge_get_data(block_ptr,
RM_PartitionNodeCardNum,
&nc_cnt))
!= STATUS_OK) {
@@ -582,11 +582,11 @@ int read_bg_blocks(List curr_block_list)
}
#ifdef HAVE_BGL
/* Translate nodecard count to ionode count */
- if ((io_cnt = nc_cnt * bg_conf->io_ratio))
+ if((io_cnt = nc_cnt * bg_conf->io_ratio))
io_cnt--;
nc_id = 0;
- if (nc_cnt == 1)
+ if(nc_cnt == 1)
find_nodecard_num(block_ptr, ncard, &nc_id);
bg_record->node_cnt =
@@ -604,7 +604,7 @@ int read_bg_blocks(List curr_block_list)
io_start += bg_conf->nodecard_ionode_cnt * (nc_id%4);
#else
/* Translate nodecard count to ionode count */
- if ((io_cnt = nc_cnt * bg_conf->io_ratio))
+ if((io_cnt = nc_cnt * bg_conf->io_ratio))
io_cnt--;
if ((rc = bridge_get_data(ncard,
@@ -614,7 +614,7 @@ int read_bg_blocks(List curr_block_list)
continue;
}
- if (!tmp_char)
+ if(!tmp_char)
continue;
/* From the first nodecard id we can figure
@@ -623,7 +623,7 @@ int read_bg_blocks(List curr_block_list)
nc_id = atoi((char*)tmp_char+1);
free(tmp_char);
io_start = nc_id * bg_conf->io_ratio;
- if (bg_record->node_cnt < bg_conf->nodecard_node_cnt) {
+ if(bg_record->node_cnt < bg_conf->nodecard_node_cnt) {
rm_ionode_t *ionode;
/* figure out the ionode we are using */
@@ -647,7 +647,7 @@ int read_bg_blocks(List curr_block_list)
continue;
}
- if (!tmp_char)
+ if(!tmp_char)
continue;
/* just add the ionode num to the
* io_start */
@@ -658,7 +658,7 @@ int read_bg_blocks(List curr_block_list)
io_cnt = 0;
}
#endif
- if (set_ionodes(bg_record, io_start, io_cnt)
+ if(set_ionodes(bg_record, io_start, io_cnt)
== SLURM_ERROR)
error("couldn't create ionode_bitmap "
"for ionodes %d to %d",
@@ -691,14 +691,14 @@ int read_bg_blocks(List curr_block_list)
bg_record->bg_block_list = get_and_set_block_wiring(
bg_record->bg_block_id, block_ptr);
- if (!bg_record->bg_block_list)
+ if(!bg_record->bg_block_list)
fatal("couldn't get the wiring info for block %s",
bg_record->bg_block_id);
hostlist = hostlist_create(NULL);
for (i=0; i<bp_cnt; i++) {
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(block_ptr,
RM_PartitionNextBP,
&bp_ptr))
@@ -728,14 +728,14 @@ int read_bg_blocks(List curr_block_list)
break;
}
- if (!bpid) {
+ if(!bpid) {
error("No BP ID was returned from database");
continue;
}
coord = find_bp_loc(bpid);
- if (!coord) {
+ if(!coord) {
fatal("Could not find coordinates for "
"BP ID %s", (char *) bpid);
}
@@ -777,7 +777,7 @@ int read_bg_blocks(List curr_block_list)
error("bridge_get_data(RM_PartitionState): %s",
bg_err_str(rc));
continue;
- } else if (bg_record->state == RM_PARTITION_CONFIGURING)
+ } else if(bg_record->state == RM_PARTITION_CONFIGURING)
bg_record->boot_state = 1;
else
bg_record->boot_state = 0;
@@ -791,7 +791,7 @@ int read_bg_blocks(List curr_block_list)
/* We can stop processing information now since we
don't need to rest of the information to decide if
this is the correct block. */
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
bg_record_t *tmp_record = xmalloc(sizeof(bg_record_t));
copy_bg_record(bg_record, tmp_record);
list_push(bg_lists->main, tmp_record);
@@ -803,7 +803,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
} else {
- if (bp_cnt==0) {
+ if(bp_cnt==0) {
bg_record->user_name =
xstrdup(bg_conf->slurm_user_name);
@@ -822,14 +822,14 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
}
- if (!user_name) {
+ if(!user_name) {
error("No user name was "
"returned from database");
continue;
}
bg_record->user_name = xstrdup(user_name);
- if (!bg_record->boot_state) {
+ if(!bg_record->boot_state) {
bg_record->target_name =
xstrdup(bg_conf->
@@ -860,7 +860,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
}
- if (!user_name) {
+ if(!user_name) {
error("No BlrtsImg was returned from database");
continue;
}
@@ -874,7 +874,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
}
- if (!user_name) {
+ if(!user_name) {
error("No LinuxImg was returned from database");
continue;
}
@@ -888,7 +888,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
}
- if (!user_name) {
+ if(!user_name) {
error("No RamdiskImg was returned from database");
continue;
}
@@ -903,7 +903,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
}
- if (!user_name) {
+ if(!user_name) {
error("No CnloadImg was returned from database");
continue;
}
@@ -917,7 +917,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
}
- if (!user_name) {
+ if(!user_name) {
error("No IoloadImg was returned from database");
continue;
}
@@ -932,7 +932,7 @@ int read_bg_blocks(List curr_block_list)
bg_err_str(rc));
continue;
}
- if (!user_name) {
+ if(!user_name) {
error("No MloaderImg was returned from database");
continue;
}
@@ -972,7 +972,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
ListIterator itr = NULL;
uint16_t protocol_version = (uint16_t)NO_VAL;
- if (!dir_name) {
+ if(!dir_name) {
debug2("Starting bluegene with clean slate");
return SLURM_SUCCESS;
}
@@ -982,7 +982,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
state_file = xstrdup(dir_name);
xstrcat(state_file, "/block_state");
state_fd = open(state_file, O_RDONLY);
- if (state_fd < 0) {
+ if(state_fd < 0) {
error("No block state file (%s) to recover", state_file);
xfree(state_file);
return SLURM_SUCCESS;
@@ -1013,10 +1013,10 @@ extern int load_state_file(List curr_block_list, char *dir_name)
buffer = create_buf(data, data_size);
safe_unpackstr_xmalloc(&ver_str, &ver_str_len, buffer);
debug3("Version string in block_state header is %s", ver_str);
- if (ver_str) {
- if (!strcmp(ver_str, BLOCK_STATE_VERSION)) {
+ if(ver_str) {
+ if(!strcmp(ver_str, BLOCK_STATE_VERSION)) {
protocol_version = SLURM_PROTOCOL_VERSION;
- } else if (!strcmp(ver_str, BLOCK_2_1_STATE_VERSION)) {
+ } else if(!strcmp(ver_str, BLOCK_2_1_STATE_VERSION)) {
protocol_version = SLURM_2_1_PROTOCOL_VERSION;
}
}
@@ -1031,7 +1031,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
return EFAULT;
}
xfree(ver_str);
- if (slurm_unpack_block_info_msg(&block_ptr, buffer, protocol_version)
+ if(slurm_unpack_block_info_msg(&block_ptr, buffer, protocol_version)
== SLURM_ERROR) {
error("select_p_state_restore: problem unpacking block_info");
goto unpack_error;
@@ -1043,9 +1043,9 @@ extern int load_state_file(List curr_block_list, char *dir_name)
/* we only care about the states we need here
* everthing else should have been set up already */
- if (block_info->state == RM_PARTITION_ERROR) {
+ if(block_info->state == RM_PARTITION_ERROR) {
slurm_mutex_lock(&block_state_mutex);
- if ((bg_record = find_bg_record_in_list(
+ if((bg_record = find_bg_record_in_list(
curr_block_list,
block_info->bg_block_id)))
/* put_block_in_error_state should be
@@ -1072,7 +1072,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
itr = list_iterator_create(part_list);
while ((part_ptr = list_next(itr))) {
/* we only want to use bps that are in partitions */
- if (!part_ptr->node_bitmap) {
+ if(!part_ptr->node_bitmap) {
debug4("Partition %s doesn't have any nodes in it.",
part_ptr->name);
continue;
@@ -1082,7 +1082,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
list_iterator_destroy(itr);
bit_not(bitmap);
- if (bit_ffs(bitmap) != -1) {
+ if(bit_ffs(bitmap) != -1) {
fatal("We don't have any nodes in any partitions. "
"Can't create blocks. "
"Please check your slurm.conf.");
@@ -1148,7 +1148,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
bg_record->bp_count = bit_set_count(node_bitmap);
bg_record->node_cnt = block_info->node_cnt;
- if (bg_conf->bp_node_cnt > bg_record->node_cnt) {
+ if(bg_conf->bp_node_cnt > bg_record->node_cnt) {
ionodes = bg_conf->bp_node_cnt
/ bg_record->node_cnt;
bg_record->cpu_cnt = bg_conf->cpus_per_bp / ionodes;
@@ -1188,7 +1188,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
for(j=0; j<SYSTEM_DIMENSIONS; j++)
geo[j] = bg_record->geo[j];
- if ((bg_conf->layout_mode == LAYOUT_OVERLAP)
+ if((bg_conf->layout_mode == LAYOUT_OVERLAP)
|| bg_record->full_block) {
reset_ba_system(false);
}
@@ -1197,7 +1197,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
/* we want the bps that aren't
* in this record to mark them as used
*/
- if (set_all_bps_except(bg_record->nodes)
+ if(set_all_bps_except(bg_record->nodes)
!= SLURM_SUCCESS)
fatal("something happened in "
"the load of %s. "
@@ -1212,7 +1212,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
bg_record->conn_type);
reset_all_removed_bps();
- if (!name) {
+ if(!name) {
error("I was unable to "
"make the "
"requested block.");
@@ -1227,13 +1227,13 @@ extern int load_state_file(List curr_block_list, char *dir_name)
name);
xfree(name);
- if (strcmp(temp, bg_record->nodes)) {
+ if(strcmp(temp, bg_record->nodes)) {
fatal("bad wiring in preserved state "
"(found %s, but allocated %s) "
"YOU MUST COLDSTART",
bg_record->nodes, temp);
}
- if (bg_record->bg_block_list)
+ if(bg_record->bg_block_list)
list_destroy(bg_record->bg_block_list);
bg_record->bg_block_list =
list_create(destroy_ba_node);
@@ -1243,7 +1243,7 @@ extern int load_state_file(List curr_block_list, char *dir_name)
configure_block(bg_record);
blocks++;
list_push(curr_block_list, bg_record);
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
bg_record_t *tmp_record = xmalloc(sizeof(bg_record_t));
copy_bg_record(bg_record, tmp_record);
list_push(bg_lists->main, tmp_record);
diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index 70d4e69f7e19b39f28bf83f5aae2eb8744d64029..30f1558a9b0aed01f4356b6cc690bfff54ba3c95 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -85,7 +85,7 @@ extern int init_bg(void)
{
_set_bg_lists();
- if (!bg_conf)
+ if(!bg_conf)
bg_conf = xmalloc(sizeof(bg_config_t));
xfree(bg_conf->slurm_user_name);
@@ -99,17 +99,17 @@ extern int init_bg(void)
slurm_conf_unlock();
#ifdef HAVE_BGL
- if (bg_conf->blrts_list)
+ if(bg_conf->blrts_list)
list_destroy(bg_conf->blrts_list);
bg_conf->blrts_list = list_create(destroy_image);
#endif
- if (bg_conf->linux_list)
+ if(bg_conf->linux_list)
list_destroy(bg_conf->linux_list);
bg_conf->linux_list = list_create(destroy_image);
- if (bg_conf->mloader_list)
+ if(bg_conf->mloader_list)
list_destroy(bg_conf->mloader_list);
bg_conf->mloader_list = list_create(destroy_image);
- if (bg_conf->ramdisk_list)
+ if(bg_conf->ramdisk_list)
list_destroy(bg_conf->ramdisk_list);
bg_conf->ramdisk_list = list_create(destroy_image);
@@ -123,7 +123,7 @@ extern int init_bg(void)
/* Purge all plugin variables */
extern void fini_bg(void)
{
- if (!agent_fini) {
+ if(!agent_fini) {
error("The agent hasn't been finied yet!");
agent_fini = true;
}
@@ -131,9 +131,9 @@ extern void fini_bg(void)
waitfor_block_agents();
/* wait for the destroy/free threads to finish up */
- if (free_cnt)
+ if(free_cnt)
pthread_cond_wait(&freed_cond, &freed_cnt_mutex);
- if (destroy_cnt)
+ if(destroy_cnt)
pthread_cond_wait(&destroy_cond, &freed_cnt_mutex);
_destroy_bg_config(bg_conf);
@@ -147,11 +147,11 @@ extern void fini_bg(void)
*/
extern bool blocks_overlap(bg_record_t *rec_a, bg_record_t *rec_b)
{
- if ((rec_a->bp_count > 1) && (rec_b->bp_count > 1)) {
+ if((rec_a->bp_count > 1) && (rec_b->bp_count > 1)) {
/* Test for conflicting passthroughs */
reset_ba_system(false);
check_and_set_node_list(rec_a->bg_block_list);
- if (check_and_set_node_list(rec_b->bg_block_list)
+ if(check_and_set_node_list(rec_b->bg_block_list)
== SLURM_ERROR)
return true;
}
@@ -159,7 +159,7 @@ extern bool blocks_overlap(bg_record_t *rec_a, bg_record_t *rec_b)
if (!bit_overlap(rec_a->bitmap, rec_b->bitmap))
return false;
- if ((rec_a->node_cnt >= bg_conf->bp_node_cnt)
+ if((rec_a->node_cnt >= bg_conf->bp_node_cnt)
|| (rec_b->node_cnt >= bg_conf->bp_node_cnt))
return true;
@@ -181,7 +181,7 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
filled in there. This function is very slow but necessary
here to get the correct block count and the users. */
if ((rc = bridge_get_block(bg_block_id, &block_ptr)) != STATUS_OK) {
- if (rc == INCONSISTENT_DATA
+ if(rc == INCONSISTENT_DATA
&& bg_conf->layout_mode == LAYOUT_DYNAMIC)
return REMOVE_USER_FOUND;
@@ -191,7 +191,7 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
return REMOVE_USER_ERR;
}
- if ((rc = bridge_get_data(block_ptr, RM_PartitionUsersNum,
+ if((rc = bridge_get_data(block_ptr, RM_PartitionUsersNum,
&user_count))
!= STATUS_OK) {
error("bridge_get_data(RM_PartitionUsersNum): %s",
@@ -199,10 +199,10 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
returnc = REMOVE_USER_ERR;
user_count = 0;
} else
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("got %d users for %s", user_count, bg_block_id);
for(i=0; i<user_count; i++) {
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(block_ptr,
RM_PartitionNextUser,
&user))
@@ -225,17 +225,17 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
break;
}
}
- if (!user) {
+ if(!user) {
error("No user was returned from database");
continue;
}
- if (!strcmp(user, bg_conf->slurm_user_name)) {
+ if(!strcmp(user, bg_conf->slurm_user_name)) {
free(user);
continue;
}
- if (user_name) {
- if (!strcmp(user, user_name)) {
+ if(user_name) {
+ if(!strcmp(user, user_name)) {
returnc = REMOVE_USER_FOUND;
free(user);
continue;
@@ -265,14 +265,14 @@ extern int remove_all_users(char *bg_block_id, char *user_name)
extern int set_block_user(bg_record_t *bg_record)
{
int rc = 0;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("resetting the boot state flag and "
"counter for block %s.",
bg_record->bg_block_id);
bg_record->boot_state = 0;
bg_record->boot_count = 0;
- if ((rc = update_block_user(bg_record, 1)) == 1) {
+ if((rc = update_block_user(bg_record, 1)) == 1) {
last_bg_update = time(NULL);
rc = SLURM_SUCCESS;
} else if (rc == -1) {
@@ -313,17 +313,17 @@ extern void *block_agent(void *args)
if (difftime(now, last_bg_test) >= BG_POLL_TIME) {
if (agent_fini) /* don't bother */
break; /* quit now */
- if (blocks_are_created) {
+ if(blocks_are_created) {
last_bg_test = now;
- if ((rc = update_block_list()) == 1) {
+ if((rc = update_block_list()) == 1) {
last_bg_update = now;
- } else if (rc == -1)
+ } else if(rc == -1)
error("Error with update_block_list");
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
- if ((rc = update_freeing_block_list())
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if((rc = update_freeing_block_list())
== 1) {
last_bg_update = now;
- } else if (rc == -1)
+ } else if(rc == -1)
error("Error with "
"update_block_list 2");
}
@@ -351,7 +351,7 @@ extern void *state_agent(void *args)
if (difftime(now, last_mmcs_test) >= MMCS_POLL_TIME) {
if (agent_fini) /* don't bother */
break; /* quit now */
- if (blocks_are_created) {
+ if(blocks_are_created) {
/* can run for a while so set the
* time after the call so there is
* always MMCS_POLL_TIME between
@@ -375,14 +375,14 @@ extern int remove_from_bg_list(List my_bg_list, bg_record_t *bg_record)
ListIterator itr;
int rc = SLURM_ERROR;
- if (!bg_record)
+ if(!bg_record)
return rc;
//slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(my_bg_list);
while ((found_record = list_next(itr))) {
- if (found_record)
- if (bg_record == found_record) {
+ if(found_record)
+ if(bg_record == found_record) {
list_remove(itr);
rc = SLURM_SUCCESS;
break;
@@ -405,13 +405,13 @@ extern bg_record_t *find_and_remove_org_from_bg_list(List my_list,
while ((found_record = (bg_record_t *) list_next(itr)) != NULL) {
/* check for full node bitmap compare */
- if (bit_equal(bg_record->bitmap, found_record->bitmap)
+ if(bit_equal(bg_record->bitmap, found_record->bitmap)
&& bit_equal(bg_record->ionode_bitmap,
found_record->ionode_bitmap)) {
- if (!strcmp(bg_record->bg_block_id,
+ if(!strcmp(bg_record->bg_block_id,
found_record->bg_block_id)) {
list_remove(itr);
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_SELECT_TYPE)
info("got the block");
break;
@@ -431,13 +431,13 @@ extern bg_record_t *find_org_in_bg_list(List my_list, bg_record_t *bg_record)
while ((found_record = (bg_record_t *) list_next(itr)) != NULL) {
/* check for full node bitmap compare */
- if (bit_equal(bg_record->bitmap, found_record->bitmap)
+ if(bit_equal(bg_record->bitmap, found_record->bitmap)
&& bit_equal(bg_record->ionode_bitmap,
found_record->ionode_bitmap)) {
- if (!strcmp(bg_record->bg_block_id,
+ if(!strcmp(bg_record->bg_block_id,
found_record->bg_block_id)) {
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_SELECT_TYPE)
info("got the block");
break;
@@ -454,12 +454,12 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
#ifdef HAVE_BG_FILES
int rc;
#endif
- if (!bg_record) {
+ if(!bg_record) {
error("bg_free_block: there was no bg_record");
return SLURM_ERROR;
}
- if (!locked)
+ if(!locked)
first = 0;
while (1) {
@@ -468,22 +468,22 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
* the same block twice. It may
* had already been removed at this point also.
*/
- if (!first)
+ if(!first)
slurm_mutex_lock(&block_state_mutex);
if (bg_record->state != NO_VAL
&& bg_record->state != RM_PARTITION_FREE
&& bg_record->state != RM_PARTITION_DEALLOCATING) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("bridge_destroy %s",
bg_record->bg_block_id);
#ifdef HAVE_BG_FILES
rc = bridge_destroy_block(bg_record->bg_block_id);
if (rc != STATUS_OK) {
- if (rc == PARTITION_NOT_FOUND) {
+ if(rc == PARTITION_NOT_FOUND) {
debug("block %s is not found",
bg_record->bg_block_id);
break;
- } else if (rc == INCOMPATIBLE_STATE) {
+ } else if(rc == INCOMPATIBLE_STATE) {
#ifndef HAVE_BGL
/* If the state is error and
we get an incompatible
@@ -491,11 +491,11 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
we set it ourselves so
break out.
*/
- if (bg_record->state
+ if(bg_record->state
== RM_PARTITION_ERROR)
break;
#endif
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_SELECT_TYPE)
info("bridge_destroy_partition"
"(%s): %s State = %d",
@@ -531,7 +531,7 @@ extern int bg_free_block(bg_record_t *bg_record, bool wait, bool locked)
first = 0;
}
remove_from_bg_list(bg_lists->booted, bg_record);
- if (!locked)
+ if(!locked)
slurm_mutex_unlock(&block_state_mutex);
return SLURM_SUCCESS;
@@ -556,7 +556,7 @@ extern void *mult_free_block(void *args)
usleep(100000);
continue;
}
- if (bg_record->job_ptr) {
+ if(bg_record->job_ptr) {
info("We are freeing a block (%s) that "
"has job %u(%u), This should never happen.",
bg_record->bg_block_id,
@@ -564,10 +564,10 @@ extern void *mult_free_block(void *args)
bg_record->job_running);
term_jobs_on_block(bg_record->bg_block_id);
}
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("freeing the block %s.", bg_record->bg_block_id);
bg_free_block(bg_record, 1, 0);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("done");
slurm_mutex_lock(&freed_cnt_mutex);
num_block_freed++;
@@ -575,7 +575,7 @@ extern void *mult_free_block(void *args)
}
slurm_mutex_lock(&freed_cnt_mutex);
free_cnt--;
- if (free_cnt == 0) {
+ if(free_cnt == 0) {
list_destroy(bg_free_block_list);
bg_free_block_list = NULL;
pthread_cond_signal(&freed_cond);
@@ -621,36 +621,36 @@ extern void *mult_destroy_block(void *args)
* tool such as smap it will be in a nice order
*/
sort_bg_record_inc_size(bg_lists->freeing);
- if (remove_from_bg_list(bg_lists->job_running, bg_record)
+ if(remove_from_bg_list(bg_lists->job_running, bg_record)
== SLURM_SUCCESS) {
num_unused_cpus += bg_record->cpu_cnt;
}
slurm_mutex_unlock(&block_state_mutex);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("removing the jobs on block %s",
bg_record->bg_block_id);
term_jobs_on_block(bg_record->bg_block_id);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("destroying %s", (char *)bg_record->bg_block_id);
- if (bg_free_block(bg_record, 1, 0) == SLURM_ERROR) {
+ if(bg_free_block(bg_record, 1, 0) == SLURM_ERROR) {
debug("there was an error");
goto already_here;
}
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("done destroying");
slurm_mutex_lock(&block_state_mutex);
remove_from_bg_list(bg_lists->freeing, bg_record);
slurm_mutex_unlock(&block_state_mutex);
#ifdef HAVE_BG_FILES
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("removing %s from database",
bg_record->bg_block_id);
rc = bridge_remove_block(bg_record->bg_block_id);
if (rc != STATUS_OK) {
- if (rc == PARTITION_NOT_FOUND) {
+ if(rc == PARTITION_NOT_FOUND) {
debug("block %s is not found",
bg_record->bg_block_id);
} else {
@@ -659,7 +659,7 @@ extern void *mult_destroy_block(void *args)
bg_err_str(rc));
}
} else
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("done %s",
(char *)bg_record->bg_block_id);
#endif
@@ -667,7 +667,7 @@ extern void *mult_destroy_block(void *args)
destroy_bg_record(bg_record);
slurm_mutex_unlock(&block_state_mutex);
last_bg_update = time(NULL);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("destroyed");
already_here:
@@ -678,8 +678,8 @@ extern void *mult_destroy_block(void *args)
}
slurm_mutex_lock(&freed_cnt_mutex);
destroy_cnt--;
- if (destroy_cnt == 0) {
- if (bg_lists->freeing) {
+ if(destroy_cnt == 0) {
+ if(bg_lists->freeing) {
list_destroy(bg_lists->freeing);
bg_lists->freeing = NULL;
}
@@ -701,11 +701,11 @@ extern int free_block_list(List delete_list)
pthread_attr_t attr_agent;
pthread_t thread_agent;
- if (!delete_list || !list_count(delete_list))
+ if(!delete_list || !list_count(delete_list))
return SLURM_SUCCESS;
/* set up which list to push onto */
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
block_list = &bg_destroy_block_list;
count = &destroy_cnt;
} else {
@@ -721,10 +721,10 @@ extern int free_block_list(List delete_list)
while ((found_record = (bg_record_t*)list_pop(delete_list)) != NULL) {
/* push job onto queue in a FIFO */
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("adding %s to be freed",
found_record->bg_block_id);
- if (!block_ptr_exist_in_list(*block_list, found_record)) {
+ if(!block_ptr_exist_in_list(*block_list, found_record)) {
num_block_to_free++;
if (list_push(*block_list, found_record) == NULL)
fatal("malloc failure in _block_op/list_push");
@@ -746,7 +746,7 @@ extern int free_block_list(List delete_list)
PTHREAD_CREATE_DETACHED))
error("pthread_attr_setdetachstate error %m");
retries = 0;
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
while (pthread_create(&thread_agent,
&attr_agent,
mult_destroy_block,
@@ -797,7 +797,7 @@ extern int read_bg_conf(void)
ListIterator itr = NULL;
char* bg_conf_file = NULL;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("Reading the bluegene.conf file");
/* check if config file has changed */
@@ -807,8 +807,8 @@ extern int read_bg_conf(void)
fatal("can't stat bluegene.conf file %s: %m", bg_conf_file);
if (last_config_update) {
_reopen_bridge_log();
- if (last_config_update == config_stat.st_mtime) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(last_config_update == config_stat.st_mtime) {
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("%s unchanged", bg_conf_file);
} else {
info("Restart slurmctld for %s changes "
@@ -825,7 +825,7 @@ extern int read_bg_conf(void)
/* bg_conf defined in bg_node_alloc.h */
tbl = s_p_hashtbl_create(bg_conf_file_options);
- if (s_p_parse_file(tbl, NULL, bg_conf_file) == SLURM_ERROR)
+ if(s_p_parse_file(tbl, NULL, bg_conf_file) == SLURM_ERROR)
fatal("something wrong with opening/reading bluegene "
"conf file");
xfree(bg_conf_file);
@@ -839,7 +839,7 @@ extern int read_bg_conf(void)
}
}
if (!s_p_get_string(&bg_conf->default_blrtsimage, "BlrtsImage", tbl)) {
- if (!list_count(bg_conf->blrts_list))
+ if(!list_count(bg_conf->blrts_list))
fatal("BlrtsImage not configured "
"in bluegene.conf");
itr = list_iterator_create(bg_conf->blrts_list);
@@ -851,7 +851,7 @@ extern int read_bg_conf(void)
"If this isn't correct please set BlrtsImage",
bg_conf->default_blrtsimage);
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("default BlrtsImage %s",
bg_conf->default_blrtsimage);
image = xmalloc(sizeof(image_t));
@@ -870,7 +870,7 @@ extern int read_bg_conf(void)
}
}
if (!s_p_get_string(&bg_conf->default_linuximage, "LinuxImage", tbl)) {
- if (!list_count(bg_conf->linux_list))
+ if(!list_count(bg_conf->linux_list))
fatal("LinuxImage not configured "
"in bluegene.conf");
itr = list_iterator_create(bg_conf->linux_list);
@@ -882,7 +882,7 @@ extern int read_bg_conf(void)
"If this isn't correct please set LinuxImage",
bg_conf->default_linuximage);
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("default LinuxImage %s",
bg_conf->default_linuximage);
image = xmalloc(sizeof(image_t));
@@ -902,7 +902,7 @@ extern int read_bg_conf(void)
}
if (!s_p_get_string(&bg_conf->default_ramdiskimage,
"RamDiskImage", tbl)) {
- if (!list_count(bg_conf->ramdisk_list))
+ if(!list_count(bg_conf->ramdisk_list))
fatal("RamDiskImage not configured "
"in bluegene.conf");
itr = list_iterator_create(bg_conf->ramdisk_list);
@@ -914,7 +914,7 @@ extern int read_bg_conf(void)
"If this isn't correct please set RamDiskImage",
bg_conf->default_ramdiskimage);
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("default RamDiskImage %s",
bg_conf->default_ramdiskimage);
image = xmalloc(sizeof(image_t));
@@ -934,7 +934,7 @@ extern int read_bg_conf(void)
}
}
if (!s_p_get_string(&bg_conf->default_linuximage, "CnloadImage", tbl)) {
- if (!list_count(bg_conf->linux_list))
+ if(!list_count(bg_conf->linux_list))
fatal("CnloadImage not configured "
"in bluegene.conf");
itr = list_iterator_create(bg_conf->linux_list);
@@ -946,7 +946,7 @@ extern int read_bg_conf(void)
"If this isn't correct please set CnloadImage",
bg_conf->default_linuximage);
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("default CnloadImage %s",
bg_conf->default_linuximage);
image = xmalloc(sizeof(image_t));
@@ -966,7 +966,7 @@ extern int read_bg_conf(void)
}
if (!s_p_get_string(&bg_conf->default_ramdiskimage,
"IoloadImage", tbl)) {
- if (!list_count(bg_conf->ramdisk_list))
+ if(!list_count(bg_conf->ramdisk_list))
fatal("IoloadImage not configured "
"in bluegene.conf");
itr = list_iterator_create(bg_conf->ramdisk_list);
@@ -978,7 +978,7 @@ extern int read_bg_conf(void)
"If this isn't correct please set IoloadImage",
bg_conf->default_ramdiskimage);
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("default IoloadImage %s",
bg_conf->default_ramdiskimage);
image = xmalloc(sizeof(image_t));
@@ -999,7 +999,7 @@ extern int read_bg_conf(void)
}
if (!s_p_get_string(&bg_conf->default_mloaderimage,
"MloaderImage", tbl)) {
- if (!list_count(bg_conf->mloader_list))
+ if(!list_count(bg_conf->mloader_list))
fatal("MloaderImage not configured "
"in bluegene.conf");
itr = list_iterator_create(bg_conf->mloader_list);
@@ -1011,7 +1011,7 @@ extern int read_bg_conf(void)
"If this isn't correct please set MloaderImage",
bg_conf->default_mloaderimage);
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("default MloaderImage %s",
bg_conf->default_mloaderimage);
image = xmalloc(sizeof(image_t));
@@ -1029,7 +1029,7 @@ extern int read_bg_conf(void)
bg_conf->bp_node_cnt = 512;
bg_conf->quarter_node_cnt = 128;
} else {
- if (bg_conf->bp_node_cnt <= 0)
+ if(bg_conf->bp_node_cnt <= 0)
fatal("You should have more than 0 nodes "
"per base partition");
@@ -1037,7 +1037,7 @@ extern int read_bg_conf(void)
}
/* bg_conf->cpus_per_bp should had already been set from the
* node_init */
- if (bg_conf->cpus_per_bp < bg_conf->bp_node_cnt) {
+ if(bg_conf->cpus_per_bp < bg_conf->bp_node_cnt) {
fatal("For some reason we have only %u cpus per bp, but "
"have %u cnodes per bp. You need at least the same "
"number of cpus as you have cnodes per bp. "
@@ -1047,7 +1047,7 @@ extern int read_bg_conf(void)
}
bg_conf->cpu_ratio = bg_conf->cpus_per_bp/bg_conf->bp_node_cnt;
- if (!bg_conf->cpu_ratio)
+ if(!bg_conf->cpu_ratio)
fatal("We appear to have less than 1 cpu on a cnode. "
"You specified %u for BasePartitionNodeCnt "
"in the blugene.conf and %u cpus "
@@ -1064,7 +1064,7 @@ extern int read_bg_conf(void)
bg_conf->nodecard_node_cnt = 32;
}
- if (bg_conf->nodecard_node_cnt<=0)
+ if(bg_conf->nodecard_node_cnt<=0)
fatal("You should have more than 0 nodes per nodecard");
bg_conf->bp_nodecard_cnt =
@@ -1073,12 +1073,12 @@ extern int read_bg_conf(void)
if (!s_p_get_uint16(&bg_conf->numpsets, "Numpsets", tbl))
fatal("Warning: Numpsets not configured in bluegene.conf");
- if (bg_conf->numpsets) {
+ if(bg_conf->numpsets) {
bitstr_t *tmp_bitmap = NULL;
int small_size = 1;
/* THIS IS A HACK TO MAKE A 1 NODECARD SYSTEM WORK */
- if (bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt) {
+ if(bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt) {
bg_conf->quarter_ionode_cnt = 2;
bg_conf->nodecard_ionode_cnt = 2;
} else {
@@ -1101,20 +1101,20 @@ extern int read_bg_conf(void)
/* figure out the smallest block we can have on the
system */
#ifdef HAVE_BGL
- if (bg_conf->io_ratio >= 1)
+ if(bg_conf->io_ratio >= 1)
bg_conf->smallest_block=32;
else
bg_conf->smallest_block=128;
#else
- if (bg_conf->io_ratio >= 2)
+ if(bg_conf->io_ratio >= 2)
bg_conf->smallest_block=16;
- else if (bg_conf->io_ratio == 1)
+ else if(bg_conf->io_ratio == 1)
bg_conf->smallest_block=32;
- else if (bg_conf->io_ratio == .5)
+ else if(bg_conf->io_ratio == .5)
bg_conf->smallest_block=64;
- else if (bg_conf->io_ratio == .25)
+ else if(bg_conf->io_ratio == .25)
bg_conf->smallest_block=128;
- else if (bg_conf->io_ratio == .125)
+ else if(bg_conf->io_ratio == .125)
bg_conf->smallest_block=256;
else {
error("unknown ioratio %f. Can't figure out "
@@ -1122,17 +1122,17 @@ extern int read_bg_conf(void)
bg_conf->smallest_block=512;
}
#endif
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("Smallest block possible on this system is %u",
bg_conf->smallest_block);
/* below we are creating all the possible bitmaps for
* each size of small block
*/
- if ((int)bg_conf->nodecard_ionode_cnt < 1) {
+ if((int)bg_conf->nodecard_ionode_cnt < 1) {
bg_conf->nodecard_ionode_cnt = 0;
} else {
bg_lists->valid_small32 = list_create(_destroy_bitmap);
- if ((small_size = bg_conf->nodecard_ionode_cnt))
+ if((small_size = bg_conf->nodecard_ionode_cnt))
small_size--;
i = 0;
while(i<bg_conf->numpsets) {
@@ -1146,11 +1146,11 @@ extern int read_bg_conf(void)
/* If we only have 1 nodecard just jump to the end
since this will never need to happen below.
Pretty much a hack to avoid seg fault;). */
- if (bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
+ if(bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
goto no_calc;
bg_lists->valid_small128 = list_create(_destroy_bitmap);
- if ((small_size = bg_conf->quarter_ionode_cnt))
+ if((small_size = bg_conf->quarter_ionode_cnt))
small_size--;
i = 0;
while(i<bg_conf->numpsets) {
@@ -1162,7 +1162,7 @@ extern int read_bg_conf(void)
#ifndef HAVE_BGL
bg_lists->valid_small64 = list_create(_destroy_bitmap);
- if ((small_size = bg_conf->nodecard_ionode_cnt * 2))
+ if((small_size = bg_conf->nodecard_ionode_cnt * 2))
small_size--;
i = 0;
while(i<bg_conf->numpsets) {
@@ -1173,7 +1173,7 @@ extern int read_bg_conf(void)
}
bg_lists->valid_small256 = list_create(_destroy_bitmap);
- if ((small_size = bg_conf->quarter_ionode_cnt * 2))
+ if((small_size = bg_conf->quarter_ionode_cnt * 2))
small_size--;
i = 0;
while(i<bg_conf->numpsets) {
@@ -1199,13 +1199,13 @@ no_calc:
_reopen_bridge_log();
if (s_p_get_string(&layout, "DenyPassthrough", tbl)) {
- if (strstr(layout, "X"))
+ if(strstr(layout, "X"))
ba_deny_pass |= PASS_DENY_X;
- if (strstr(layout, "Y"))
+ if(strstr(layout, "Y"))
ba_deny_pass |= PASS_DENY_Y;
- if (strstr(layout, "Z"))
+ if(strstr(layout, "Z"))
ba_deny_pass |= PASS_DENY_Z;
- if (!strcasecmp(layout, "ALL"))
+ if(!strcasecmp(layout, "ALL"))
ba_deny_pass |= PASS_DENY_ALL;
bg_conf->deny_pass = ba_deny_pass;
xfree(layout);
@@ -1216,11 +1216,11 @@ no_calc:
"defaulting to STATIC partitioning");
bg_conf->layout_mode = LAYOUT_STATIC;
} else {
- if (!strcasecmp(layout,"STATIC"))
+ if(!strcasecmp(layout,"STATIC"))
bg_conf->layout_mode = LAYOUT_STATIC;
- else if (!strcasecmp(layout,"OVERLAP"))
+ else if(!strcasecmp(layout,"OVERLAP"))
bg_conf->layout_mode = LAYOUT_OVERLAP;
- else if (!strcasecmp(layout,"DYNAMIC"))
+ else if(!strcasecmp(layout,"DYNAMIC"))
bg_conf->layout_mode = LAYOUT_DYNAMIC;
else {
fatal("I don't understand this LayoutMode = %s",
@@ -1230,7 +1230,7 @@ no_calc:
}
/* add blocks defined in file */
- if (bg_conf->layout_mode != LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode != LAYOUT_DYNAMIC) {
if (!s_p_get_array((void ***)&blockreq_array,
&count, "BPs", tbl)) {
info("WARNING: no blocks defined in bluegene.conf, "
@@ -1258,7 +1258,7 @@ extern int validate_current_blocks(char *dir)
bg_record_t *bg_record = NULL;
/* only run on startup */
- if (last_config_update)
+ if(last_config_update)
return SLURM_SUCCESS;
last_config_update = time(NULL);
@@ -1272,7 +1272,7 @@ extern int validate_current_blocks(char *dir)
}
//#endif
/* looking for blocks only I created */
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC) {
init_wires();
info("No blocks created until jobs are submitted");
} else {
@@ -1294,7 +1294,7 @@ extern int validate_current_blocks(char *dir)
no threads are started before this function. */
itr = list_iterator_create(bg_lists->main);
while((bg_record = list_next(itr))) {
- if (bg_record->state == RM_PARTITION_ERROR)
+ if(bg_record->state == RM_PARTITION_ERROR)
put_block_in_error_state(bg_record,
BLOCK_ERROR_STATE, NULL);
}
@@ -1309,16 +1309,16 @@ extern int validate_current_blocks(char *dir)
last_bg_update = time(NULL);
sort_bg_record_inc_size(bg_lists->main);
slurm_mutex_unlock(&block_state_mutex);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("Blocks have finished being created.");
return SLURM_SUCCESS;
}
static void _destroy_bg_config(bg_config_t *bg_conf)
{
- if (bg_conf) {
+ if(bg_conf) {
#ifdef HAVE_BGL
- if (bg_conf->blrts_list) {
+ if(bg_conf->blrts_list) {
list_destroy(bg_conf->blrts_list);
bg_conf->blrts_list = NULL;
}
@@ -1328,17 +1328,17 @@ static void _destroy_bg_config(bg_config_t *bg_conf)
xfree(bg_conf->default_linuximage);
xfree(bg_conf->default_mloaderimage);
xfree(bg_conf->default_ramdiskimage);
- if (bg_conf->linux_list) {
+ if(bg_conf->linux_list) {
list_destroy(bg_conf->linux_list);
bg_conf->linux_list = NULL;
}
- if (bg_conf->mloader_list) {
+ if(bg_conf->mloader_list) {
list_destroy(bg_conf->mloader_list);
bg_conf->mloader_list = NULL;
}
- if (bg_conf->ramdisk_list) {
+ if(bg_conf->ramdisk_list) {
list_destroy(bg_conf->ramdisk_list);
bg_conf->ramdisk_list = NULL;
}
@@ -1350,7 +1350,7 @@ static void _destroy_bg_config(bg_config_t *bg_conf)
static void _destroy_bg_lists(bg_lists_t *bg_lists)
{
- if (bg_lists) {
+ if(bg_lists) {
if (bg_lists->booted) {
list_destroy(bg_lists->booted);
bg_lists->booted = NULL;
@@ -1372,19 +1372,19 @@ static void _destroy_bg_lists(bg_lists_t *bg_lists)
bg_lists->main = NULL;
}
- if (bg_lists->valid_small32) {
+ if(bg_lists->valid_small32) {
list_destroy(bg_lists->valid_small32);
bg_lists->valid_small32 = NULL;
}
- if (bg_lists->valid_small64) {
+ if(bg_lists->valid_small64) {
list_destroy(bg_lists->valid_small64);
bg_lists->valid_small64 = NULL;
}
- if (bg_lists->valid_small128) {
+ if(bg_lists->valid_small128) {
list_destroy(bg_lists->valid_small128);
bg_lists->valid_small128 = NULL;
}
- if (bg_lists->valid_small256) {
+ if(bg_lists->valid_small256) {
list_destroy(bg_lists->valid_small256);
bg_lists->valid_small256 = NULL;
}
@@ -1395,20 +1395,20 @@ static void _destroy_bg_lists(bg_lists_t *bg_lists)
static void _set_bg_lists()
{
- if (!bg_lists)
+ if(!bg_lists)
bg_lists = xmalloc(sizeof(bg_lists_t));
slurm_mutex_lock(&block_state_mutex);
- if (bg_lists->booted)
+ if(bg_lists->booted)
list_destroy(bg_lists->booted);
bg_lists->booted = list_create(NULL);
- if (bg_lists->job_running)
+ if(bg_lists->job_running)
list_destroy(bg_lists->job_running);
bg_lists->job_running = list_create(NULL);
- if (bg_lists->main)
+ if(bg_lists->main)
list_destroy(bg_lists->main);
bg_lists->main = list_create(destroy_bg_record);
@@ -1462,7 +1462,7 @@ static int _validate_config_nodes(List curr_block_list,
that way again ;). */
rc = SLURM_ERROR;
#endif
- if (!bg_recover)
+ if(!bg_recover)
return SLURM_ERROR;
itr_curr = list_iterator_create(curr_block_list);
@@ -1473,7 +1473,7 @@ static int _validate_config_nodes(List curr_block_list,
if (strcasecmp(bg_record->nodes,
init_bg_record->nodes))
continue; /* wrong nodes */
- if (!bit_equal(bg_record->ionode_bitmap,
+ if(!bit_equal(bg_record->ionode_bitmap,
init_bg_record->ionode_bitmap))
continue;
#ifdef HAVE_BGL
@@ -1502,7 +1502,7 @@ static int _validate_config_nodes(List curr_block_list,
tmp_char);
rc = SLURM_ERROR;
} else {
- if (bg_record->full_block)
+ if(bg_record->full_block)
full_created = 1;
list_push(found_block_list, bg_record);
@@ -1512,20 +1512,20 @@ static int _validate_config_nodes(List curr_block_list,
bg_record->bg_block_id,
tmp_char,
conn_type_string(bg_record->conn_type));
- if (((bg_record->state == RM_PARTITION_READY)
+ if(((bg_record->state == RM_PARTITION_READY)
|| (bg_record->state == RM_PARTITION_CONFIGURING))
&& !block_ptr_exist_in_list(bg_lists->booted,
bg_record))
list_push(bg_lists->booted, bg_record);
}
}
- if (bg_conf->layout_mode == LAYOUT_DYNAMIC)
+ if(bg_conf->layout_mode == LAYOUT_DYNAMIC)
goto finished;
- if (!full_created) {
+ if(!full_created) {
list_iterator_reset(itr_curr);
while ((init_bg_record = list_next(itr_curr))) {
- if (init_bg_record->full_block) {
+ if(init_bg_record->full_block) {
list_remove(itr_curr);
bg_record = init_bg_record;
list_append(bg_lists->main, bg_record);
@@ -1536,7 +1536,7 @@ static int _validate_config_nodes(List curr_block_list,
bg_record->bg_block_id,
tmp_char,
conn_type_string(bg_record->conn_type));
- if (((bg_record->state == RM_PARTITION_READY)
+ if(((bg_record->state == RM_PARTITION_READY)
|| (bg_record->state
== RM_PARTITION_CONFIGURING))
&& !block_ptr_exist_in_list(
@@ -1551,7 +1551,7 @@ static int _validate_config_nodes(List curr_block_list,
finished:
list_iterator_destroy(itr_conf);
list_iterator_destroy(itr_curr);
- if (!list_count(curr_block_list))
+ if(!list_count(curr_block_list))
rc = SLURM_SUCCESS;
return rc;
}
@@ -1569,7 +1569,7 @@ static int _delete_old_blocks(List curr_block_list, List found_block_list)
xassert(found_block_list);
info("removing unspecified blocks");
- if (!bg_recover) {
+ if(!bg_recover) {
itr_curr = list_iterator_create(curr_block_list);
while ((init_record = list_next(itr_curr))) {
list_remove(itr_curr);
@@ -1589,7 +1589,7 @@ static int _delete_old_blocks(List curr_block_list, List found_block_list)
}
list_iterator_destroy(itr_found);
- if (found_record == NULL) {
+ if(found_record == NULL) {
list_remove(itr_curr);
list_push(destroy_list, init_record);
}
@@ -1640,7 +1640,7 @@ static int _delete_old_blocks(List curr_block_list, List found_block_list)
/* no need to check for return code here, things
haven't started up yet. */
update_freeing_block_list();
- if (retries==30) {
+ if(retries==30) {
info("Waiting for old blocks to be "
"freed. Have %d of %d",
num_block_freed,
@@ -1691,7 +1691,7 @@ static int _reopen_bridge_log(void)
rc = bridge_set_log_params(bg_conf->bridge_api_file,
bg_conf->bridge_api_verb);
#endif
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("Bridge api file set to %s, verbose level %d",
bg_conf->bridge_api_file, bg_conf->bridge_api_verb);
@@ -1702,7 +1702,7 @@ static void _destroy_bitmap(void *object)
{
bitstr_t *bitstr = (bitstr_t *)object;
- if (bitstr) {
+ if(bitstr) {
FREE_NULL_BITMAP(bitstr);
}
}
diff --git a/src/plugins/select/bluegene/plugin/defined_block.c b/src/plugins/select/bluegene/plugin/defined_block.c
index 12c0246564b1b36346eef0dc6c84463fc0c55523..71c015015a7c000dbafafc55248772bf3956bfd4 100644
--- a/src/plugins/select/bluegene/plugin/defined_block.c
+++ b/src/plugins/select/bluegene/plugin/defined_block.c
@@ -73,7 +73,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
/* we only want to use bps that are in
* partitions
*/
- if (!part_ptr->node_bitmap) {
+ if(!part_ptr->node_bitmap) {
debug4("Partition %s doesn't have any nodes in it.",
part_ptr->name);
continue;
@@ -83,7 +83,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
list_iterator_destroy(itr);
bit_not(bitmap);
- if (bit_ffs(bitmap) != -1) {
+ if(bit_ffs(bitmap) != -1) {
fatal("We don't have any nodes in any partitions. "
"Can't create blocks. "
"Please check your slurm.conf.");
@@ -94,10 +94,10 @@ extern int create_defined_blocks(bg_layout_t overlapped,
slurm_mutex_lock(&block_state_mutex);
reset_ba_system(false);
- if (bg_lists->main) {
+ if(bg_lists->main) {
itr = list_iterator_create(bg_lists->main);
while((bg_record = list_next(itr))) {
- if (bg_found_block_list) {
+ if(bg_found_block_list) {
itr_found = list_iterator_create(
bg_found_block_list);
while ((found_record = (bg_record_t*)
@@ -124,12 +124,12 @@ extern int create_defined_blocks(bg_layout_t overlapped,
error("create_defined_blocks: "
"no bg_found_block_list 1");
}
- if (bg_record->bp_count > 0
+ if(bg_record->bp_count > 0
&& !bg_record->full_block
&& bg_record->cpu_cnt >= bg_conf->cpus_per_bp) {
char *name = NULL;
- if (overlapped == LAYOUT_OVERLAP) {
+ if(overlapped == LAYOUT_OVERLAP) {
reset_ba_system(false);
removable_set_bps(non_usable_nodes);
}
@@ -137,7 +137,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
/* we want the bps that aren't
* in this record to mark them as used
*/
- if (set_all_bps_except(bg_record->nodes)
+ if(set_all_bps_except(bg_record->nodes)
!= SLURM_SUCCESS)
fatal("something happened in "
"the load of %s. "
@@ -156,9 +156,9 @@ extern int create_defined_blocks(bg_layout_t overlapped,
alpha_num[geo[X]],
alpha_num[geo[Y]],
alpha_num[geo[Z]]);
- if (bg_record->bg_block_list
+ if(bg_record->bg_block_list
&& list_count(bg_record->bg_block_list)) {
- if (check_and_set_node_list(
+ if(check_and_set_node_list(
bg_record->bg_block_list)
== SLURM_ERROR) {
debug2("something happened in "
@@ -182,7 +182,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
geo,
bg_record->conn_type);
reset_all_removed_bps();
- if (!name) {
+ if(!name) {
error("I was unable to "
"make the "
"requested block.");
@@ -199,7 +199,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
name);
xfree(name);
- if (strcmp(temp, bg_record->nodes)) {
+ if(strcmp(temp, bg_record->nodes)) {
fatal("given list of %s "
"but allocated %s, "
"your order might be "
@@ -207,7 +207,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
bg_record->nodes,
temp);
}
- if (bg_record->bg_block_list)
+ if(bg_record->bg_block_list)
list_destroy(bg_record->
bg_block_list);
bg_record->bg_block_list =
@@ -218,8 +218,8 @@ extern int create_defined_blocks(bg_layout_t overlapped,
list_destroy(results);
}
}
- if (found_record == NULL) {
- if (bg_record->full_block) {
+ if(found_record == NULL) {
+ if(bg_record->full_block) {
/* if this is defined we need
to remove it since we are
going to try to create it
@@ -235,7 +235,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
list_remove(itr);
continue;
}
- if ((rc = configure_block(bg_record))
+ if((rc = configure_block(bg_record))
== SLURM_ERROR) {
list_iterator_destroy(itr);
slurm_mutex_unlock(&block_state_mutex);
@@ -262,7 +262,7 @@ extern int create_defined_blocks(bg_layout_t overlapped,
slurm_mutex_unlock(&block_state_mutex);
#ifdef _PRINT_BLOCKS_AND_EXIT
- if (bg_lists->main) {
+ if(bg_lists->main) {
itr = list_iterator_create(bg_lists->main);
debug("\n\n");
while ((found_record = (bg_record_t *) list_next(itr))
@@ -300,7 +300,7 @@ extern int create_full_system_block(List bg_found_block_list)
/* we only want to use bps that are in
* partitions
*/
- if (!part_ptr->node_bitmap) {
+ if(!part_ptr->node_bitmap) {
debug4("Partition %s doesn't have any nodes in it.",
part_ptr->name);
continue;
@@ -310,7 +310,7 @@ extern int create_full_system_block(List bg_found_block_list)
list_iterator_destroy(itr);
bit_not(bitmap);
- if (bit_ffs(bitmap) != -1) {
+ if(bit_ffs(bitmap) != -1) {
error("We don't have the entire system covered by partitions, "
"can't create full system block");
FREE_NULL_BITMAP(bitmap);
@@ -329,7 +329,7 @@ extern int create_full_system_block(List bg_found_block_list)
i = (10+strlen(bg_conf->slurm_node_prefix));
name = xmalloc(i);
- if ((geo[X] == 0) && (geo[Y] == 0) && (geo[Z] == 0))
+ if((geo[X] == 0) && (geo[Y] == 0) && (geo[Z] == 0))
snprintf(name, i, "%s000",
bg_conf->slurm_node_prefix);
else
@@ -339,7 +339,7 @@ extern int create_full_system_block(List bg_found_block_list)
alpha_num[geo[Z]]);
- if (bg_found_block_list) {
+ if(bg_found_block_list) {
itr = list_iterator_create(bg_found_block_list);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
if (!strcmp(name, bg_record->nodes)) {
@@ -354,7 +354,7 @@ extern int create_full_system_block(List bg_found_block_list)
error("create_full_system_block: no bg_found_block_list 2");
}
- if (bg_lists->main) {
+ if(bg_lists->main) {
itr = list_iterator_create(bg_lists->main);
while ((bg_record = (bg_record_t *) list_next(itr))
!= NULL) {
@@ -383,7 +383,7 @@ extern int create_full_system_block(List bg_found_block_list)
xfree(name);
bg_record = (bg_record_t *) list_pop(records);
- if (!bg_record) {
+ if(!bg_record) {
error("Nothing was returned from full system create");
rc = SLURM_ERROR;
goto no_total;
@@ -404,7 +404,7 @@ extern int create_full_system_block(List bg_found_block_list)
bg_record->start,
geo,
bg_record->conn_type);
- if (!name) {
+ if(!name) {
error("I was unable to make the full system block.");
list_destroy(results);
list_iterator_destroy(itr);
@@ -412,13 +412,13 @@ extern int create_full_system_block(List bg_found_block_list)
return SLURM_ERROR;
}
xfree(name);
- if (bg_record->bg_block_list)
+ if(bg_record->bg_block_list)
list_destroy(bg_record->bg_block_list);
bg_record->bg_block_list = list_create(destroy_ba_node);
copy_node_path(results, &bg_record->bg_block_list);
list_destroy(results);
- if ((rc = configure_block(bg_record)) == SLURM_ERROR) {
+ if((rc = configure_block(bg_record)) == SLURM_ERROR) {
error("create_full_system_block: "
"unable to configure block in api");
destroy_bg_record(bg_record);
@@ -429,7 +429,7 @@ extern int create_full_system_block(List bg_found_block_list)
list_append(bg_lists->main, bg_record);
no_total:
- if (records)
+ if(records)
list_destroy(records);
slurm_mutex_unlock(&block_state_mutex);
return rc;
diff --git a/src/plugins/select/bluegene/plugin/dynamic_block.c b/src/plugins/select/bluegene/plugin/dynamic_block.c
index 72c01607d249024f073d8627c53bf7f3c81213fc..5625acf69d645e697248f033a17805332b13526e 100644
--- a/src/plugins/select/bluegene/plugin/dynamic_block.c
+++ b/src/plugins/select/bluegene/plugin/dynamic_block.c
@@ -68,7 +68,7 @@ extern List create_dynamic_block(List block_list,
int cnodes = request->procs / bg_conf->cpu_ratio;
char *unusable_nodes = NULL;
- if (cnodes < bg_conf->smallest_block) {
+ if(cnodes < bg_conf->smallest_block) {
error("Can't create this size %d "
"on this system numpsets is %d",
request->procs,
@@ -78,20 +78,20 @@ extern List create_dynamic_block(List block_list,
memset(&blockreq, 0, sizeof(blockreq_t));
slurm_mutex_lock(&block_state_mutex);
- if (my_block_list) {
+ if(my_block_list) {
reset_ba_system(track_down_nodes);
itr = list_iterator_create(my_block_list);
while ((bg_record = list_next(itr))) {
- if (!my_bitmap) {
+ if(!my_bitmap) {
my_bitmap =
bit_alloc(bit_size(bg_record->bitmap));
}
- if (!bit_super_set(bg_record->bitmap, my_bitmap)) {
+ if(!bit_super_set(bg_record->bitmap, my_bitmap)) {
bit_or(my_bitmap, bg_record->bitmap);
for(i=0; i<SYSTEM_DIMENSIONS; i++)
geo[i] = bg_record->geo[i];
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("adding %s(%s) %s %c%c%c "
"%c%c%c %u",
@@ -107,10 +107,10 @@ extern List create_dynamic_block(List block_list,
alpha_num[geo[Z]],
bg_record->node_cnt);
- if (check_and_set_node_list(
+ if(check_and_set_node_list(
bg_record->bg_block_list)
== SLURM_ERROR) {
- if (bg_conf->slurm_debug_flags
+ if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK)
info("something happened in "
"the load of %s",
@@ -120,7 +120,7 @@ extern List create_dynamic_block(List block_list,
rc = SLURM_ERROR;
goto finished;
}
- } else if (bg_conf->slurm_debug_flags
+ } else if(bg_conf->slurm_debug_flags
& DEBUG_FLAG_BG_PICK) {
for(i=0; i<SYSTEM_DIMENSIONS; i++)
geo[i] = bg_record->geo[i];
@@ -144,11 +144,11 @@ extern List create_dynamic_block(List block_list,
FREE_NULL_BITMAP(my_bitmap);
} else {
reset_ba_system(false);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("No list was given");
}
- if (request->avail_node_bitmap) {
+ if(request->avail_node_bitmap) {
bitstr_t *bitmap = bit_alloc(node_record_count);
/* we want the bps that aren't in this partition to
@@ -164,7 +164,7 @@ extern List create_dynamic_block(List block_list,
FREE_NULL_BITMAP(bitmap);
}
- if (request->size==1 && cnodes < bg_conf->bp_node_cnt) {
+ if(request->size==1 && cnodes < bg_conf->bp_node_cnt) {
switch(cnodes) {
#ifdef HAVE_BGL
case 32:
@@ -213,28 +213,28 @@ extern List create_dynamic_block(List block_list,
request->conn_type = SELECT_SMALL;
new_blocks = list_create(destroy_bg_record);
/* check only blocks that are free and small */
- if (_breakup_blocks(block_list, new_blocks,
+ if(_breakup_blocks(block_list, new_blocks,
request, my_block_list,
true, true)
== SLURM_SUCCESS)
goto finished;
/* check only blocks that are free and any size */
- if (_breakup_blocks(block_list, new_blocks,
+ if(_breakup_blocks(block_list, new_blocks,
request, my_block_list,
true, false)
== SLURM_SUCCESS)
goto finished;
/* check usable blocks that are small with any state */
- if (_breakup_blocks(block_list, new_blocks,
+ if(_breakup_blocks(block_list, new_blocks,
request, my_block_list,
false, true)
== SLURM_SUCCESS)
goto finished;
/* check all usable blocks */
- if (_breakup_blocks(block_list, new_blocks,
+ if(_breakup_blocks(block_list, new_blocks,
request, my_block_list,
false, false)
== SLURM_SUCCESS)
@@ -244,16 +244,16 @@ extern List create_dynamic_block(List block_list,
list_sort(block_list, (ListCmpF)bg_record_sort_aval_inc);
list_destroy(new_blocks);
new_blocks = NULL;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("small block not able to be placed inside others");
}
- if (request->conn_type == SELECT_NAV)
+ if(request->conn_type == SELECT_NAV)
request->conn_type = SELECT_TORUS;
//debug("going to create %d", request->size);
- if (!new_ba_request(request)) {
- if (geo[X] == (uint16_t)NO_VAL) {
+ if(!new_ba_request(request)) {
+ if(geo[X] == (uint16_t)NO_VAL) {
error("Problems with request for size %d geo %dx%dx%d",
request->size,
request->geometry[X],
@@ -270,7 +270,7 @@ extern List create_dynamic_block(List block_list,
/* try on free midplanes */
rc = SLURM_SUCCESS;
- if (results)
+ if(results)
list_flush(results);
else
results = list_create(NULL);
@@ -278,20 +278,20 @@ extern List create_dynamic_block(List block_list,
if (allocate_block(request, results))
goto setup_records;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("allocate failure for size %d base "
"partitions of free midplanes",
request->size);
rc = SLURM_ERROR;
- if (!list_count(block_list) || !my_block_list)
+ if(!list_count(block_list) || !my_block_list)
goto finished;
/*Try to put block starting in the smallest of the exisiting blocks*/
itr = list_iterator_create(block_list);
while ((bg_record = (bg_record_t *) list_next(itr)) != NULL) {
/* never check a block with a job running */
- if (bg_record->job_running != NO_JOB_RUNNING)
+ if(bg_record->job_running != NO_JOB_RUNNING)
continue;
/* Here we are only looking for the first
@@ -300,11 +300,11 @@ extern List create_dynamic_block(List block_list,
bg_conf->bp_node_cnt or the first bit is
set in the ionode_bitmap.
*/
- if ((bg_record->node_cnt < bg_conf->bp_node_cnt)
+ if((bg_record->node_cnt < bg_conf->bp_node_cnt)
&& (bit_ffs(bg_record->ionode_bitmap) != 0))
continue;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("removing %s for request %d",
bg_record->nodes, request->size);
remove_block(bg_record->bg_block_list, (int)NO_VAL,
@@ -313,14 +313,14 @@ extern List create_dynamic_block(List block_list,
used */
removable_set_bps(unusable_nodes);
rc = SLURM_SUCCESS;
- if (results)
+ if(results)
list_flush(results);
else
results = list_create(NULL);
if (allocate_block(request, results))
break;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("allocate failure for size %d base partitions",
request->size);
rc = SLURM_ERROR;
@@ -328,7 +328,7 @@ extern List create_dynamic_block(List block_list,
list_iterator_destroy(itr);
setup_records:
- if (rc == SLURM_SUCCESS) {
+ if(rc == SLURM_SUCCESS) {
/*set up bg_record(s) here */
new_blocks = list_create(destroy_bg_record);
@@ -350,11 +350,11 @@ finished:
xfree(unusable_nodes);
xfree(request->save_name);
- if (request->elongate_geos) {
+ if(request->elongate_geos) {
list_destroy(request->elongate_geos);
request->elongate_geos = NULL;
}
- if (results)
+ if(results)
list_destroy(results);
errno = rc;
slurm_mutex_unlock(&block_state_mutex);
@@ -376,10 +376,10 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
found_record->user_name = xstrdup(bg_record->user_name);
found_record->user_uid = bg_record->user_uid;
found_record->bg_block_list = list_create(destroy_ba_node);
- if (bg_record->bg_block_list)
+ if(bg_record->bg_block_list)
ba_node = list_peek(bg_record->bg_block_list);
- if (!ba_node) {
- if (bg_record->nodes) {
+ if(!ba_node) {
+ if(bg_record->nodes) {
hostlist_t hl = hostlist_create(bg_record->nodes);
char *host = hostlist_shift(hl);
hostlist_destroy(hl);
@@ -404,8 +404,8 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
for (i=0; i<SYSTEM_DIMENSIONS; i++){
for(j=0;j<NUM_PORTS_PER_NODE;j++) {
ba_node->axis_switch[i].int_wire[j].used = 0;
- if (i!=X) {
- if (j==3 || j==4)
+ if(i!=X) {
+ if(j==3 || j==4)
ba_node->axis_switch[i].
int_wire[j].
used = 1;
@@ -442,7 +442,7 @@ extern bg_record_t *create_small_record(bg_record_t *bg_record,
found_record->ionode_bitmap = bit_copy(ionodes);
bit_fmt(bitstring, BITSIZE, found_record->ionode_bitmap);
found_record->ionodes = xstrdup(bitstring);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("made small block of %s[%s]",
found_record->nodes, found_record->ionodes);
return found_record;
@@ -613,19 +613,19 @@ static int _split_block(List block_list, List new_blocks,
#endif
}
- if (!full_bp && bg_record->ionode_bitmap) {
- if ((start = bit_ffs(bg_record->ionode_bitmap)) == -1)
+ if(!full_bp && bg_record->ionode_bitmap) {
+ if((start = bit_ffs(bg_record->ionode_bitmap)) == -1)
start = 0;
}
#ifdef HAVE_BGL
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("Asking for %u 32CNBlocks, and %u 128CNBlocks "
"from a %u block, starting at ionode %d.",
blockreq.small32, blockreq.small128,
bg_record->node_cnt, start);
#else
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("Asking for %u 16CNBlocks, %u 32CNBlocks, "
"%u 64CNBlocks, %u 128CNBlocks, and %u 256CNBlocks "
"from a %u block, starting at ionode %d.",
@@ -652,7 +652,7 @@ static int _breakup_blocks(List block_list, List new_blocks,
int cnodes = request->procs / bg_conf->cpu_ratio;
int curr_bp_bit = -1;
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("cpu_count= %d cnodes=%d o_free=%d o_small=%d",
request->procs, cnodes, only_free, only_small);
@@ -684,32 +684,32 @@ static int _breakup_blocks(List block_list, List new_blocks,
itr = list_iterator_create(block_list);
while ((bg_record = list_next(itr))) {
/* never look at a block if a job is running */
- if (bg_record->job_running != NO_JOB_RUNNING)
+ if(bg_record->job_running != NO_JOB_RUNNING)
continue;
/* on the third time through look for just a block
* that isn't used */
/* check for free blocks on the first and second time */
- if (only_free && (bg_record->state != RM_PARTITION_FREE))
+ if(only_free && (bg_record->state != RM_PARTITION_FREE))
continue;
/* check small blocks first */
- if (only_small && (bg_record->node_cnt > bg_conf->bp_node_cnt))
+ if(only_small && (bg_record->node_cnt > bg_conf->bp_node_cnt))
continue;
if (request->avail_node_bitmap &&
!bit_super_set(bg_record->bitmap,
request->avail_node_bitmap)) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("bg block %s has nodes not usable "
"by this job",
bg_record->bg_block_id);
continue;
}
- if (bg_record->node_cnt == cnodes) {
+ if(bg_record->node_cnt == cnodes) {
bg_record_t *new_record = xmalloc(sizeof(bg_record_t));
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("found it here %s, %s",
bg_record->bg_block_id,
bg_record->nodes);
@@ -729,14 +729,14 @@ static int _breakup_blocks(List block_list, List new_blocks,
goto finished;
}
/* lets see if we can combine some small ones */
- if (bg_record->node_cnt < cnodes) {
+ if(bg_record->node_cnt < cnodes) {
char bitstring[BITSIZE];
bitstr_t *bitstr = NULL;
int num_over = 0;
int num_cnodes = bg_record->node_cnt;
int rec_bp_bit = bit_ffs(bg_record->bitmap);
- if (curr_bp_bit != rec_bp_bit) {
+ if(curr_bp_bit != rec_bp_bit) {
/* Got a different node than
* previously, since the list should
* be in order of nodes for small blocks
@@ -751,14 +751,14 @@ static int _breakup_blocks(List block_list, List new_blocks,
overlapping blocks here. If that is the
case only add that which doesn't overlap.
*/
- if ((num_over = bit_overlap(
+ if((num_over = bit_overlap(
ionodes, bg_record->ionode_bitmap))) {
/* Since the smallest block size is
the number of cnodes in an io node,
just multiply the num_over by that to
get the number of cnodes to remove.
*/
- if ((num_cnodes -=
+ if((num_cnodes -=
num_over * bg_conf->smallest_block) <= 0)
continue;
}
@@ -766,14 +766,14 @@ static int _breakup_blocks(List block_list, List new_blocks,
/* check and see if the bits set are a valid
combo */
- if (bit_itr) {
+ if(bit_itr) {
while((bitstr = list_next(bit_itr))) {
- if (bit_super_set(ionodes, bitstr))
+ if(bit_super_set(ionodes, bitstr))
break;
}
list_iterator_reset(bit_itr);
}
- if (!bitstr) {
+ if(!bitstr) {
bit_nclear(ionodes, 0, (bg_conf->numpsets-1));
bit_or(ionodes, bg_record->ionode_bitmap);
total_cnode_cnt = num_cnodes =
@@ -782,19 +782,19 @@ static int _breakup_blocks(List block_list, List new_blocks,
total_cnode_cnt += num_cnodes;
bit_fmt(bitstring, BITSIZE, ionodes);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("combine adding %s %s %d got %d set "
"ionodes %s total is %s",
bg_record->bg_block_id, bg_record->nodes,
num_cnodes, total_cnode_cnt,
bg_record->ionodes, bitstring);
- if (total_cnode_cnt == cnodes) {
+ if(total_cnode_cnt == cnodes) {
request->save_name = xstrdup_printf(
"%c%c%c",
alpha_num[bg_record->start[X]],
alpha_num[bg_record->start[Y]],
alpha_num[bg_record->start[Z]]);
- if (!my_block_list) {
+ if(!my_block_list) {
rc = SLURM_SUCCESS;
goto finished;
}
@@ -813,26 +813,26 @@ static int _breakup_blocks(List block_list, List new_blocks,
break;
}
- if (bg_record) {
+ if(bg_record) {
bg_record_t *found_record = NULL;
- if (bg_record->original) {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_record->original) {
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("This was a copy");
found_record = bg_record->original;
} else {
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK)
info("looking for original");
found_record = find_org_in_bg_list(
bg_lists->main, bg_record);
}
- if (!found_record) {
+ if(!found_record) {
error("this record wasn't found in the list!");
rc = SLURM_ERROR;
goto finished;
}
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK) {
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_BG_PICK) {
format_node_name(bg_record, tmp_char,
sizeof(tmp_char));
info("going to split %s, %s",
@@ -844,7 +844,7 @@ static int _breakup_blocks(List block_list, List new_blocks,
alpha_num[found_record->start[X]],
alpha_num[found_record->start[Y]],
alpha_num[found_record->start[Z]]);
- if (!my_block_list) {
+ if(!my_block_list) {
rc = SLURM_SUCCESS;
goto finished;
}
@@ -854,11 +854,11 @@ static int _breakup_blocks(List block_list, List new_blocks,
}
finished:
- if (bit_itr)
+ if(bit_itr)
list_iterator_destroy(bit_itr);
FREE_NULL_BITMAP(ionodes);
- if (itr)
+ if(itr)
list_iterator_destroy(itr);
return rc;
diff --git a/src/plugins/select/bluegene/plugin/jobinfo.c b/src/plugins/select/bluegene/plugin/jobinfo.c
index a26d07ce6b2bee394a23228d8fd76dae09877559..983742f3da255aa473df6a2de1369ba0bf76f25f 100644
--- a/src/plugins/select/bluegene/plugin/jobinfo.c
+++ b/src/plugins/select/bluegene/plugin/jobinfo.c
@@ -131,7 +131,7 @@ extern int set_select_jobinfo(select_jobinfo_t *jobinfo,
}
/* Make sure the conn type is correct with the new count */
- if ((new_size > 1) && (jobinfo->conn_type == SELECT_SMALL))
+ if((new_size > 1) && (jobinfo->conn_type == SELECT_SMALL))
jobinfo->conn_type = SELECT_TORUS;
break;
case SELECT_JOBDATA_REBOOT:
@@ -160,10 +160,10 @@ extern int set_select_jobinfo(select_jobinfo_t *jobinfo,
jobinfo->node_cnt = *uint32;
#ifdef HAVE_BG_L_P
/* Make sure the conn type is correct with the new count */
- if ((bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
+ if((bg_conf->bp_node_cnt == bg_conf->nodecard_node_cnt)
|| (jobinfo->node_cnt < bg_conf->bp_node_cnt))
jobinfo->conn_type = SELECT_SMALL;
- else if (jobinfo->conn_type == SELECT_SMALL)
+ else if(jobinfo->conn_type == SELECT_SMALL)
jobinfo->conn_type = SELECT_TORUS;
#endif
break;
@@ -349,7 +349,7 @@ extern int pack_select_jobinfo(select_jobinfo_t *jobinfo, Buf buffer,
int dims = working_cluster_rec ?
working_cluster_rec->dimensions : SYSTEM_DIMENSIONS;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
if (jobinfo) {
/* NOTE: If new elements are added here, make sure to
* add equivalant pack of zeros below for NULL
@@ -455,7 +455,7 @@ extern int unpack_select_jobinfo(select_jobinfo_t **jobinfo_pptr, Buf buffer,
*jobinfo_pptr = jobinfo;
jobinfo->magic = JOBINFO_MAGIC;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
for (i=0; i<dims; i++) {
safe_unpack16(&(jobinfo->geometry[i]), buffer);
}
@@ -597,7 +597,7 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
snprintf(buf, size, "%s", jobinfo->bg_block_id);
break;
case SELECT_PRINT_NODES:
- if (jobinfo->ionodes && jobinfo->ionodes[0])
+ if(jobinfo->ionodes && jobinfo->ionodes[0])
snprintf(buf, size, "%s[%s]",
jobinfo->nodes, jobinfo->ionodes);
else
@@ -622,22 +622,22 @@ extern char *sprint_select_jobinfo(select_jobinfo_t *jobinfo,
alpha_num[geometry[2]]);
break;
case SELECT_PRINT_BLRTS_IMAGE:
- if (jobinfo->blrtsimage)
+ if(jobinfo->blrtsimage)
tmp_image = jobinfo->blrtsimage;
snprintf(buf, size, "%s", tmp_image);
break;
case SELECT_PRINT_LINUX_IMAGE:
- if (jobinfo->linuximage)
+ if(jobinfo->linuximage)
tmp_image = jobinfo->linuximage;
snprintf(buf, size, "%s", tmp_image);
break;
case SELECT_PRINT_MLOADER_IMAGE:
- if (jobinfo->mloaderimage)
+ if(jobinfo->mloaderimage)
tmp_image = jobinfo->mloaderimage;
snprintf(buf, size, "%s", tmp_image);
break;
case SELECT_PRINT_RAMDISK_IMAGE:
- if (jobinfo->ramdiskimage)
+ if(jobinfo->ramdiskimage)
tmp_image = jobinfo->ramdiskimage;
snprintf(buf, size, "%s", tmp_image);
break;
@@ -713,7 +713,7 @@ extern char *xstrdup_select_jobinfo(select_jobinfo_t *jobinfo, int mode)
xstrfmtcat(buf, "%s", jobinfo->bg_block_id);
break;
case SELECT_PRINT_NODES:
- if (jobinfo->ionodes && jobinfo->ionodes[0])
+ if(jobinfo->ionodes && jobinfo->ionodes[0])
xstrfmtcat(buf, "%s[%s]",
jobinfo->nodes, jobinfo->ionodes);
else
@@ -738,22 +738,22 @@ extern char *xstrdup_select_jobinfo(select_jobinfo_t *jobinfo, int mode)
alpha_num[geometry[2]]);
break;
case SELECT_PRINT_BLRTS_IMAGE:
- if (jobinfo->blrtsimage)
+ if(jobinfo->blrtsimage)
tmp_image = jobinfo->blrtsimage;
xstrfmtcat(buf, "%s", tmp_image);
break;
case SELECT_PRINT_LINUX_IMAGE:
- if (jobinfo->linuximage)
+ if(jobinfo->linuximage)
tmp_image = jobinfo->linuximage;
xstrfmtcat(buf, "%s", tmp_image);
break;
case SELECT_PRINT_MLOADER_IMAGE:
- if (jobinfo->mloaderimage)
+ if(jobinfo->mloaderimage)
tmp_image = jobinfo->mloaderimage;
xstrfmtcat(buf, "%s", tmp_image);
break;
case SELECT_PRINT_RAMDISK_IMAGE:
- if (jobinfo->ramdiskimage)
+ if(jobinfo->ramdiskimage)
tmp_image = jobinfo->ramdiskimage;
xstrfmtcat(buf, "%s", tmp_image);
break;
diff --git a/src/plugins/select/bluegene/plugin/nodeinfo.c b/src/plugins/select/bluegene/plugin/nodeinfo.c
index 3d5eb8d8453cb0c5f11f4adda821b466e08fd4e5..2622c940a7f0431c4648bd8cc5c230c2f6b1e847 100644
--- a/src/plugins/select/bluegene/plugin/nodeinfo.c
+++ b/src/plugins/select/bluegene/plugin/nodeinfo.c
@@ -45,7 +45,7 @@
static void _free_node_subgrp(void *object)
{
node_subgrp_t *subgrp = (node_subgrp_t *)object;
- if (subgrp) {
+ if(subgrp) {
FREE_NULL_BITMAP(subgrp->bitmap);
xfree(subgrp->str);
xfree(subgrp->inx);
@@ -62,11 +62,11 @@ static node_subgrp_t *_find_subgrp(List subgrp_list, enum node_states state,
xassert(subgrp_list);
itr = list_iterator_create(subgrp_list);
while((subgrp = list_next(itr))) {
- if (subgrp->state == state)
+ if(subgrp->state == state)
break;
}
list_iterator_destroy(itr);
- if (!subgrp) {
+ if(!subgrp) {
subgrp = xmalloc(sizeof(node_subgrp_t));
subgrp->state = state;
subgrp->bitmap = bit_alloc(size);
@@ -80,7 +80,7 @@ static node_subgrp_t *_find_subgrp(List subgrp_list, enum node_states state,
static int _pack_node_subgrp(node_subgrp_t *subgrp, Buf buffer,
uint16_t protocol_version)
{
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack_bit_fmt(subgrp->bitmap, buffer);
pack16(subgrp->node_cnt, buffer);
pack16(subgrp->state, buffer);
@@ -99,7 +99,7 @@ static int _unpack_node_subgrp(node_subgrp_t **subgrp_pptr, Buf buffer,
*subgrp_pptr = subgrp;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&subgrp->str, &uint32_tmp, buffer);
if (!subgrp->str)
subgrp->inx = bitfmt2int("");
@@ -134,15 +134,15 @@ extern int select_nodeinfo_pack(select_nodeinfo_t *nodeinfo, Buf buffer,
node_subgrp_t *subgrp = NULL;
uint16_t count = 0;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack16(nodeinfo->bitmap_size, buffer);
- if (nodeinfo->subgrp_list)
+ if(nodeinfo->subgrp_list)
count = list_count(nodeinfo->subgrp_list);
pack16(count, buffer);
- if (count > 0) {
+ if(count > 0) {
itr = list_iterator_create(nodeinfo->subgrp_list);
while((subgrp = list_next(itr))) {
_pack_node_subgrp(subgrp, buffer,
@@ -161,7 +161,7 @@ extern int select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo, Buf buffer,
select_nodeinfo_t *nodeinfo_ptr = NULL;
uint32_t j = 0;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack16(&size, buffer);
nodeinfo_ptr = select_nodeinfo_alloc((uint32_t)size);
@@ -171,7 +171,7 @@ extern int select_nodeinfo_unpack(select_nodeinfo_t **nodeinfo, Buf buffer,
nodeinfo_ptr->subgrp_list = list_create(_free_node_subgrp);
for(j=0; j<size; j++) {
node_subgrp_t *subgrp = NULL;
- if (_unpack_node_subgrp(&subgrp, buffer,
+ if(_unpack_node_subgrp(&subgrp, buffer,
nodeinfo_ptr->bitmap_size,
protocol_version)
!= SLURM_SUCCESS)
@@ -194,10 +194,10 @@ extern select_nodeinfo_t *select_nodeinfo_alloc(uint32_t size)
select_nodeinfo_t *nodeinfo = xmalloc(sizeof(struct select_nodeinfo));
#ifdef HAVE_BG_L_P
- if (bg_conf && (!size || size == NO_VAL))
+ if(bg_conf && (!size || size == NO_VAL))
size = bg_conf->numpsets;
#else
- if (!size || size == NO_VAL)
+ if(!size || size == NO_VAL)
fatal("we shouldn't be here in select_nodeinfo_alloc %u", size);
#endif
nodeinfo->bitmap_size = size;
@@ -208,13 +208,13 @@ extern select_nodeinfo_t *select_nodeinfo_alloc(uint32_t size)
extern int select_nodeinfo_free(select_nodeinfo_t *nodeinfo)
{
- if (nodeinfo) {
+ if(nodeinfo) {
if (nodeinfo->magic != NODEINFO_MAGIC) {
error("free_nodeinfo: nodeinfo magic bad");
return EINVAL;
}
nodeinfo->magic = 0;
- if (nodeinfo->subgrp_list)
+ if(nodeinfo->subgrp_list)
list_destroy(nodeinfo->subgrp_list);
xfree(nodeinfo);
}
@@ -230,12 +230,12 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
bg_record_t *bg_record = NULL;
static time_t last_set_all = 0;
- if (!blocks_are_created)
+ if(!blocks_are_created)
return SLURM_NO_CHANGE_IN_DATA;
/* only set this once when the last_bg_update is newer than
the last time we set things up. */
- if (last_set_all && (last_bg_update-1 < last_set_all)) {
+ if(last_set_all && (last_bg_update-1 < last_set_all)) {
debug2("Node select info for set all hasn't "
"changed since %d",
last_set_all);
@@ -255,7 +255,7 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
xassert(nodeinfo);
xassert(nodeinfo->subgrp_list);
list_flush(nodeinfo->subgrp_list);
- if (nodeinfo->bitmap_size != bg_conf->numpsets)
+ if(nodeinfo->bitmap_size != bg_conf->numpsets)
nodeinfo->bitmap_size = bg_conf->numpsets;
}
itr = list_iterator_create(bg_lists->main);
@@ -265,15 +265,15 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
select_nodeinfo_t *nodeinfo;
/* Only mark unidle blocks */
- if (bg_record->job_running == NO_JOB_RUNNING)
+ if(bg_record->job_running == NO_JOB_RUNNING)
continue;
- if (bg_record->state == RM_PARTITION_ERROR)
+ if(bg_record->state == RM_PARTITION_ERROR)
state = NODE_STATE_ERROR;
- else if (bg_record->job_running > NO_JOB_RUNNING) {
+ else if(bg_record->job_running > NO_JOB_RUNNING) {
/* we don't need to set the allocated here
* since the whole midplane is allocated */
- if (bg_record->conn_type < SELECT_SMALL)
+ if(bg_record->conn_type < SELECT_SMALL)
continue;
state = NODE_STATE_ALLOCATED;
} else {
@@ -283,7 +283,7 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
}
for(i=0; i<node_record_count; i++) {
- if (!bit_test(bg_record->bitmap, i))
+ if(!bit_test(bg_record->bitmap, i))
continue;
node_ptr = &(node_record_table_ptr[i]);
@@ -296,8 +296,8 @@ extern int select_nodeinfo_set_all(time_t last_query_time)
nodeinfo->subgrp_list,
state, bg_conf->numpsets);
- if (subgrp->node_cnt < bg_conf->bp_node_cnt) {
- if (bg_record->node_cnt < bg_conf->bp_node_cnt) {
+ if(subgrp->node_cnt < bg_conf->bp_node_cnt) {
+ if(bg_record->node_cnt < bg_conf->bp_node_cnt) {
bit_or(subgrp->bitmap,
bg_record->ionode_bitmap);
subgrp->node_cnt += bg_record->node_cnt;
@@ -346,17 +346,17 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
break;
case SELECT_NODEDATA_SUBGRP_SIZE:
*uint16 = 0;
- if (!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
*uint16 = list_count(nodeinfo->subgrp_list);
break;
case SELECT_NODEDATA_SUBCNT:
*uint16 = 0;
- if (!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
itr = list_iterator_create(nodeinfo->subgrp_list);
while((subgrp = list_next(itr))) {
- if (subgrp->state == state) {
+ if(subgrp->state == state) {
*uint16 = subgrp->node_cnt;
break;
}
@@ -365,11 +365,11 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
break;
case SELECT_NODEDATA_BITMAP:
*bitmap = NULL;
- if (!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
itr = list_iterator_create(nodeinfo->subgrp_list);
while((subgrp = list_next(itr))) {
- if (subgrp->state == state) {
+ if(subgrp->state == state) {
*bitmap = bit_copy(subgrp->bitmap);
break;
}
@@ -378,11 +378,11 @@ extern int select_nodeinfo_get(select_nodeinfo_t *nodeinfo,
break;
case SELECT_NODEDATA_STR:
*tmp_char = NULL;
- if (!nodeinfo->subgrp_list)
+ if(!nodeinfo->subgrp_list)
return SLURM_ERROR;
itr = list_iterator_create(nodeinfo->subgrp_list);
while((subgrp = list_next(itr))) {
- if (subgrp->state == state) {
+ if(subgrp->state == state) {
*tmp_char = xstrdup(subgrp->str);
break;
}
diff --git a/src/plugins/select/bluegene/plugin/opts.c b/src/plugins/select/bluegene/plugin/opts.c
index 0cda71180bc653ffabcf426da11cd431897abf97..24781e632392e5e9b3db74d4201781e3f09a4720 100644
--- a/src/plugins/select/bluegene/plugin/opts.c
+++ b/src/plugins/select/bluegene/plugin/opts.c
@@ -78,7 +78,7 @@ void parse_command_line(int argc, char *argv[])
break;
case (int) 'b':
case (int) 'p':
- if (!block_list)
+ if(!block_list)
block_list = list_create(slurm_destroy_char);
slurm_addto_char_list(block_list, optarg);
break;
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index ef0d3b6f903311463c39638ece2d46c21e216e7a..c0968b3475fb36459bc63f1d2c17e16e4a897211 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -192,16 +192,16 @@ static List _get_config(void)
key_pair->value = xstrdup_printf("%u", bg_conf->bridge_api_verb);
list_append(my_list, key_pair);
- if (bg_conf->deny_pass) {
+ if(bg_conf->deny_pass) {
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("DenyPassThrough");
- if (bg_conf->deny_pass & PASS_DENY_X)
+ if(bg_conf->deny_pass & PASS_DENY_X)
xstrcat(key_pair->value, "X,");
- if (bg_conf->deny_pass & PASS_DENY_Y)
+ if(bg_conf->deny_pass & PASS_DENY_Y)
xstrcat(key_pair->value, "Y,");
- if (bg_conf->deny_pass & PASS_DENY_Z)
+ if(bg_conf->deny_pass & PASS_DENY_Z)
xstrcat(key_pair->value, "Z,");
- if (key_pair->value)
+ if(key_pair->value)
key_pair->value[strlen(key_pair->value)-1] = '\0';
list_append(my_list, key_pair);
}
@@ -253,7 +253,7 @@ extern int init ( void )
{
#ifdef HAVE_BG_L_P
- if (bg_recover != NOT_FROM_CONTROLLER) {
+ if(bg_recover != NOT_FROM_CONTROLLER) {
#if (SYSTEM_DIMENSIONS != 3)
fatal("SYSTEM_DIMENSIONS value (%d) invalid for BlueGene",
SYSTEM_DIMENSIONS);
@@ -343,7 +343,7 @@ extern int select_p_state_save(char *dir_name)
* the blocks in an error state
*/
#ifdef HAVE_BG_FILES
- if (bg_record->state != RM_PARTITION_ERROR)
+ if(bg_record->state != RM_PARTITION_ERROR)
continue;
#endif
xassert(bg_record->bg_block_id != NULL);
@@ -396,11 +396,11 @@ extern int select_p_state_save(char *dir_name)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
@@ -447,8 +447,8 @@ extern int select_p_job_init(List job_list)
extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
{
#ifdef HAVE_BG_L_P
- if (node_cnt>0 && bg_conf)
- if (node_ptr->cpus >= bg_conf->bp_node_cnt)
+ if(node_cnt>0 && bg_conf)
+ if(node_ptr->cpus >= bg_conf->bp_node_cnt)
bg_conf->cpus_per_bp = node_ptr->cpus;
return SLURM_SUCCESS;
@@ -467,12 +467,12 @@ extern int select_p_node_init(struct node_record *node_ptr, int node_cnt)
/* select_p_node_init needs to be called before this to set
this up correctly
*/
- if (read_bg_conf() == SLURM_ERROR) {
+ if(read_bg_conf() == SLURM_ERROR) {
fatal("Error, could not read the file");
return SLURM_ERROR;
}
- if (part_list) {
+ if(part_list) {
struct part_record *part_ptr = NULL;
ListIterator itr = list_iterator_create(part_list);
while((part_ptr = list_next(itr))) {
@@ -597,14 +597,14 @@ extern int select_p_pack_select_info(time_t last_query_time, Buf *buffer_ptr,
debug2("Node select info hasn't changed since %d",
last_bg_update);
return SLURM_NO_CHANGE_IN_DATA;
- } else if (blocks_are_created) {
+ } else if(blocks_are_created) {
*buffer_ptr = NULL;
buffer = init_buf(HUGE_BUF_SIZE);
pack32(blocks_packed, buffer);
pack_time(last_bg_update, buffer);
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
- if (bg_lists->main) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(bg_lists->main) {
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->main);
while ((bg_record = list_next(itr))) {
@@ -623,7 +623,7 @@ extern int select_p_pack_select_info(time_t last_query_time, Buf *buffer_ptr,
* get all the blocks we are freeing since they have
* been moved here
*/
- if (bg_lists->freeing) {
+ if(bg_lists->freeing) {
slurm_mutex_lock(&block_state_mutex);
itr = list_iterator_create(bg_lists->freeing);
while ((bg_record = list_next(itr))) {
@@ -755,7 +755,7 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
bg_record_t *bg_record = NULL;
char reason[200];
- if (!block_desc_ptr->bg_block_id) {
+ if(!block_desc_ptr->bg_block_id) {
error("update_block: No name specified");
return ESLURM_INVALID_BLOCK_NAME;
}
@@ -763,17 +763,17 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
slurm_mutex_lock(&block_state_mutex);
bg_record = find_bg_record_in_list(bg_lists->main,
block_desc_ptr->bg_block_id);
- if (!bg_record) {
+ if(!bg_record) {
slurm_mutex_unlock(&block_state_mutex);
return ESLURM_INVALID_BLOCK_NAME;
}
- if (block_desc_ptr->state == RM_PARTITION_CONFIGURING)
+ if(block_desc_ptr->state == RM_PARTITION_CONFIGURING)
snprintf(reason, sizeof(reason),
"update_block: "
"Admin recreated %s.", bg_record->bg_block_id);
- else if (block_desc_ptr->state == RM_PARTITION_NAV) {
- if (bg_record->conn_type < SELECT_SMALL)
+ else if(block_desc_ptr->state == RM_PARTITION_NAV) {
+ if(bg_record->conn_type < SELECT_SMALL)
snprintf(reason, sizeof(reason),
"update_block: "
"Admin removed block %s",
@@ -792,7 +792,7 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
bg_block_state_string(block_desc_ptr->state));
}
/* First fail any job running on this block */
- if (bg_record->job_running > NO_JOB_RUNNING) {
+ if(bg_record->job_running > NO_JOB_RUNNING) {
slurm_fail_job(bg_record->job_running);
/* need to set the job_ptr to NULL
here or we will get error message
@@ -815,13 +815,13 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
if (bg_record == found_record)
continue;
- if (!blocks_overlap(bg_record, found_record)) {
+ if(!blocks_overlap(bg_record, found_record)) {
debug2("block %s isn't part of errored %s",
found_record->bg_block_id,
bg_record->bg_block_id);
continue;
}
- if (found_record->job_running > NO_JOB_RUNNING) {
+ if(found_record->job_running > NO_JOB_RUNNING) {
info("Failing job %u block %s "
"failed because overlapping block %s "
"is in an error state.",
@@ -851,14 +851,14 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
list_destroy(delete_list);
}
- if (block_desc_ptr->state == RM_PARTITION_ERROR) {
+ if(block_desc_ptr->state == RM_PARTITION_ERROR) {
slurm_mutex_unlock(&block_state_mutex);
put_block_in_error_state(bg_record, BLOCK_ERROR_STATE, reason);
- } else if (block_desc_ptr->state == RM_PARTITION_FREE) {
+ } else if(block_desc_ptr->state == RM_PARTITION_FREE) {
bg_free_block(bg_record, 0, 1);
resume_block(bg_record);
slurm_mutex_unlock(&block_state_mutex);
- } else if (block_desc_ptr->state == RM_PARTITION_DEALLOCATING) {
+ } else if(block_desc_ptr->state == RM_PARTITION_DEALLOCATING) {
/* This can't be RM_PARTITION_READY since the enum
changed from BGL to BGP and if we are running cross
cluster it just doesn't work.
@@ -878,7 +878,7 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
list_push(delete_list, bg_record);
/* only do the while loop if we are dealing with a
small block */
- if (bg_record->conn_type < SELECT_SMALL)
+ if(bg_record->conn_type < SELECT_SMALL)
goto large_block;
itr = list_iterator_create(bg_lists->main);
@@ -886,14 +886,14 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
if (bg_record == found_record)
continue;
- if (!bit_equal(bg_record->bitmap,
+ if(!bit_equal(bg_record->bitmap,
found_record->bitmap)) {
debug2("block %s isn't part of to be freed %s",
found_record->bg_block_id,
bg_record->bg_block_id);
continue;
}
- if (found_record->job_running > NO_JOB_RUNNING) {
+ if(found_record->job_running > NO_JOB_RUNNING) {
info("Failing job %u block %s "
"failed because overlapping block %s "
"is in an error state.",
@@ -925,7 +925,7 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
to a normal state in accounting first */
itr = list_iterator_create(delete_list);
while ((found_record = list_next(itr))) {
- if (found_record->state == RM_PARTITION_ERROR)
+ if(found_record->state == RM_PARTITION_ERROR)
resume_block(found_record);
}
list_iterator_destroy(itr);
@@ -941,26 +941,26 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
/* make sure if we are removing a block to put it back
to a normal state in accounting first */
- if (bg_record->state == RM_PARTITION_ERROR)
+ if(bg_record->state == RM_PARTITION_ERROR)
resume_block(bg_record);
term_jobs_on_block(bg_record->bg_block_id);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("select_p_update_block: "
"freeing the block %s.", bg_record->bg_block_id);
bg_free_block(bg_record, 1, 1);
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("select_p_update_block: done");
#ifdef HAVE_BG_FILES
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("select_p_update_block: "
"removing %s from database",
bg_record->bg_block_id);
rc = bridge_remove_block(bg_record->bg_block_id);
if (rc != STATUS_OK) {
- if (rc == PARTITION_NOT_FOUND) {
+ if(rc == PARTITION_NOT_FOUND) {
debug("select_p_update_block: "
"block %s is not found",
bg_record->bg_block_id);
@@ -971,12 +971,12 @@ extern int select_p_update_block(update_block_msg_t *block_desc_ptr)
bg_err_str(rc));
}
} else
- if (bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
+ if(bg_conf->slurm_debug_flags & DEBUG_FLAG_SELECT_TYPE)
info("select_p_update_block: done %s",
(char *)bg_record->bg_block_id);
#endif
xfree(bg_record->bg_block_id);
- if (configure_block(bg_record) == SLURM_ERROR) {
+ if(configure_block(bg_record) == SLURM_ERROR) {
destroy_bg_record(bg_record);
error("select_p_update_block: "
"unable to configure block in api");
@@ -1015,7 +1015,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
bitstr_t *ionode_bitmap = NULL;
char *name = NULL;
- if (bg_conf->layout_mode != LAYOUT_DYNAMIC) {
+ if(bg_conf->layout_mode != LAYOUT_DYNAMIC) {
info("You can't use this call unless you are on a Dynamically "
"allocated system. Please use update BlockName instead");
rc = ESLURM_INVALID_BLOCK_LAYOUT;
@@ -1024,7 +1024,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
memset(coord, 0, sizeof(coord));
memset(ionodes, 0, 128);
- if (!block_desc_ptr->nodes) {
+ if(!block_desc_ptr->nodes) {
error("update_sub_node: No name specified");
rc = ESLURM_INVALID_BLOCK_NAME;
goto end_it;
@@ -1033,12 +1033,12 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
while (name[j] != '\0') {
if (name[j] == '[') {
- if (set<1) {
+ if(set<1) {
rc = SLURM_ERROR;
goto end_it;
}
i = j++;
- if ((name[j] < '0'
+ if((name[j] < '0'
|| name[j] > 'Z'
|| (name[j] > '9'
&& name[j] < 'A'))) {
@@ -1047,11 +1047,11 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
goto end_it;
}
while(name[i] != '\0') {
- if (name[i] == ']')
+ if(name[i] == ']')
break;
i++;
}
- if (name[i] != ']') {
+ if(name[i] != ']') {
error("update_sub_node: "
"No close (']') on sub block");
rc = SLURM_ERROR;
@@ -1061,17 +1061,17 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
strncpy(ionodes, name+j, i-j);
set++;
break;
- } else if ((name[j] >= '0'
+ } else if((name[j] >= '0'
&& name[j] <= '9')
|| (name[j] >= 'A'
&& name[j] <= 'Z')) {
- if (set) {
+ if(set) {
rc = SLURM_ERROR;
goto end_it;
}
/* make sure we are asking for a correct name */
for(i = 0; i < SYSTEM_DIMENSIONS; i++) {
- if ((name[j+i] >= '0'
+ if((name[j+i] >= '0'
&& name[j+i] <= '9')
|| (name[j+i] >= 'A'
&& name[j+i] <= 'Z'))
@@ -1092,7 +1092,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
j++;
}
- if (set != 2) {
+ if(set != 2) {
error("update_sub_node: "
"I didn't get the base partition and the sub part.");
rc = SLURM_ERROR;
@@ -1100,7 +1100,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
}
ionode_bitmap = bit_alloc(bg_conf->numpsets);
bit_unfmt(ionode_bitmap, ionodes);
- if (bit_ffs(ionode_bitmap) == -1) {
+ if(bit_ffs(ionode_bitmap) == -1) {
error("update_sub_node: Invalid ionode '%s' given.", ionodes);
rc = SLURM_ERROR;
FREE_NULL_BITMAP(ionode_bitmap);
@@ -1108,12 +1108,12 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
}
node_name = xstrdup_printf("%s%s", bg_conf->slurm_node_prefix, coord);
/* find out how many nodecards to get for each ionode */
- if (block_desc_ptr->state == RM_PARTITION_ERROR) {
+ if(block_desc_ptr->state == RM_PARTITION_ERROR) {
info("Admin setting %s[%s] in an error state",
node_name, ionodes);
for(i = 0; i<bg_conf->numpsets; i++) {
- if (bit_test(ionode_bitmap, i)) {
- if ((int)nc_pos != (int)last_pos) {
+ if(bit_test(ionode_bitmap, i)) {
+ if((int)nc_pos != (int)last_pos) {
/* find first bit in nc */
int start_io =
(int)nc_pos * bg_conf->io_ratio;
@@ -1123,7 +1123,7 @@ extern int select_p_update_sub_node (update_block_msg_t *block_desc_ptr)
}
nc_pos += bg_conf->nc_ratio;
}
- } else if (block_desc_ptr->state == RM_PARTITION_FREE) {
+ } else if(block_desc_ptr->state == RM_PARTITION_FREE) {
info("Admin setting %s[%s] in an free state",
node_name, ionodes);
up_nodecard(node_name, ionode_bitmap);
@@ -1216,38 +1216,38 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
int i;
uint16_t req_geometry[SYSTEM_DIMENSIONS];
- if (!bg_conf->bp_node_cnt) {
+ if(!bg_conf->bp_node_cnt) {
fatal("select_p_alter_node_cnt: This can't be called "
"before init");
}
switch (type) {
case SELECT_GET_NODE_SCALING:
- if ((*nodes) != INFINITE)
+ if((*nodes) != INFINITE)
(*nodes) = bg_conf->bp_node_cnt;
break;
case SELECT_GET_NODE_CPU_CNT:
- if ((*cpus) != (uint16_t)INFINITE)
+ if((*cpus) != (uint16_t)INFINITE)
(*cpus) = bg_conf->cpu_ratio;
break;
case SELECT_GET_BP_CPU_CNT:
- if ((*nodes) != INFINITE)
+ if((*nodes) != INFINITE)
(*nodes) = bg_conf->cpus_per_bp;
break;
case SELECT_SET_BP_CNT:
- if (((*nodes) == INFINITE) || ((*nodes) == NO_VAL))
+ if(((*nodes) == INFINITE) || ((*nodes) == NO_VAL))
tmp = (*nodes);
- else if ((*nodes) > bg_conf->bp_node_cnt) {
+ else if((*nodes) > bg_conf->bp_node_cnt) {
tmp = (*nodes);
tmp /= bg_conf->bp_node_cnt;
- if (tmp < 1)
+ if(tmp < 1)
tmp = 1;
} else
tmp = 1;
(*nodes) = tmp;
break;
case SELECT_APPLY_NODE_MIN_OFFSET:
- if ((*nodes) == 1) {
+ if((*nodes) == 1) {
/* Job will actually get more than one c-node,
* but we can't be sure exactly how much so we
* don't scale up this value. */
@@ -1256,26 +1256,26 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
(*nodes) *= bg_conf->bp_node_cnt;
break;
case SELECT_APPLY_NODE_MAX_OFFSET:
- if ((*nodes) != INFINITE)
+ if((*nodes) != INFINITE)
(*nodes) *= bg_conf->bp_node_cnt;
break;
case SELECT_SET_NODE_CNT:
get_select_jobinfo(job_desc->select_jobinfo->data,
SELECT_JOBDATA_ALTERED, &tmp);
- if (tmp == 1) {
+ if(tmp == 1) {
return SLURM_SUCCESS;
}
tmp = 1;
set_select_jobinfo(job_desc->select_jobinfo->data,
SELECT_JOBDATA_ALTERED, &tmp);
- if (job_desc->min_nodes == (uint32_t) NO_VAL)
+ if(job_desc->min_nodes == (uint32_t) NO_VAL)
return SLURM_SUCCESS;
get_select_jobinfo(job_desc->select_jobinfo->data,
SELECT_JOBDATA_GEOMETRY, &req_geometry);
- if (req_geometry[0] != 0
+ if(req_geometry[0] != 0
&& req_geometry[0] != (uint16_t)NO_VAL) {
job_desc->min_nodes = 1;
for (i=0; i<SYSTEM_DIMENSIONS; i++)
@@ -1288,7 +1288,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
/* make sure if the user only specified min_cpus to
set min_nodes correctly
*/
- if ((job_desc->min_cpus != NO_VAL)
+ if((job_desc->min_cpus != NO_VAL)
&& (job_desc->min_cpus > job_desc->min_nodes))
job_desc->min_nodes =
job_desc->min_cpus / bg_conf->cpu_ratio;
@@ -1296,26 +1296,26 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
/* initialize min_cpus to the min_nodes */
job_desc->min_cpus = job_desc->min_nodes * bg_conf->cpu_ratio;
- if ((job_desc->max_nodes == (uint32_t) NO_VAL)
+ if((job_desc->max_nodes == (uint32_t) NO_VAL)
|| (job_desc->max_nodes < job_desc->min_nodes))
job_desc->max_nodes = job_desc->min_nodes;
/* See if min_nodes is greater than one base partition */
- if (job_desc->min_nodes > bg_conf->bp_node_cnt) {
+ if(job_desc->min_nodes > bg_conf->bp_node_cnt) {
/*
* if it is make sure it is a factor of
* bg_conf->bp_node_cnt, if it isn't make it
* that way
*/
tmp = job_desc->min_nodes % bg_conf->bp_node_cnt;
- if (tmp > 0)
+ if(tmp > 0)
job_desc->min_nodes +=
(bg_conf->bp_node_cnt-tmp);
}
tmp = job_desc->min_nodes / bg_conf->bp_node_cnt;
/* this means it is greater or equal to one bp */
- if (tmp > 0) {
+ if(tmp > 0) {
set_select_jobinfo(job_desc->select_jobinfo->data,
SELECT_JOBDATA_NODE_CNT,
&job_desc->min_nodes);
@@ -1323,11 +1323,11 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
job_desc->min_cpus = bg_conf->cpus_per_bp * tmp;
} else {
#ifdef HAVE_BGL
- if (job_desc->min_nodes <= bg_conf->nodecard_node_cnt
+ if(job_desc->min_nodes <= bg_conf->nodecard_node_cnt
&& bg_conf->nodecard_ionode_cnt)
job_desc->min_nodes =
bg_conf->nodecard_node_cnt;
- else if (job_desc->min_nodes
+ else if(job_desc->min_nodes
<= bg_conf->quarter_node_cnt)
job_desc->min_nodes =
bg_conf->quarter_node_cnt;
@@ -1346,7 +1346,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
#else
i = bg_conf->smallest_block;
while(i <= bg_conf->bp_node_cnt) {
- if (job_desc->min_nodes <= i) {
+ if(job_desc->min_nodes <= i) {
job_desc->min_nodes = i;
break;
}
@@ -1363,26 +1363,26 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
#endif
}
- if (job_desc->max_nodes > bg_conf->bp_node_cnt) {
+ if(job_desc->max_nodes > bg_conf->bp_node_cnt) {
tmp = job_desc->max_nodes % bg_conf->bp_node_cnt;
- if (tmp > 0)
+ if(tmp > 0)
job_desc->max_nodes +=
(bg_conf->bp_node_cnt-tmp);
}
tmp = job_desc->max_nodes / bg_conf->bp_node_cnt;
- if (tmp > 0) {
+ if(tmp > 0) {
job_desc->max_nodes = tmp;
job_desc->max_cpus =
job_desc->max_nodes * bg_conf->cpus_per_bp;
tmp = NO_VAL;
} else {
#ifdef HAVE_BGL
- if (job_desc->max_nodes <= bg_conf->nodecard_node_cnt
+ if(job_desc->max_nodes <= bg_conf->nodecard_node_cnt
&& bg_conf->nodecard_ionode_cnt)
job_desc->max_nodes =
bg_conf->nodecard_node_cnt;
- else if (job_desc->max_nodes
+ else if(job_desc->max_nodes
<= bg_conf->quarter_node_cnt)
job_desc->max_nodes =
bg_conf->quarter_node_cnt;
@@ -1396,7 +1396,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data)
#else
i = bg_conf->smallest_block;
while(i <= bg_conf->bp_node_cnt) {
- if (job_desc->max_nodes <= i) {
+ if(job_desc->max_nodes <= i) {
job_desc->max_nodes = i;
break;
}
@@ -1425,14 +1425,14 @@ extern int select_p_reconfigure(void)
{
#ifdef HAVE_BG_L_P
slurm_conf_lock();
- if (!slurmctld_conf.slurm_user_name
+ if(!slurmctld_conf.slurm_user_name
|| strcmp(bg_conf->slurm_user_name, slurmctld_conf.slurm_user_name))
error("The slurm user has changed from '%s' to '%s'. "
"If this is really what you "
"want you will need to restart slurm for this "
"change to be enforced in the bluegene plugin.",
bg_conf->slurm_user_name, slurmctld_conf.slurm_user_name);
- if (!slurmctld_conf.node_prefix
+ if(!slurmctld_conf.node_prefix
|| strcmp(bg_conf->slurm_node_prefix, slurmctld_conf.node_prefix))
error("Node Prefix has changed from '%s' to '%s'. "
"If this is really what you "
diff --git a/src/plugins/select/bluegene/plugin/sfree.c b/src/plugins/select/bluegene/plugin/sfree.c
index cfa11d6a4c96c36800ecf34a95643127c2adb966..a920e6d361e38621c2ee12adb7d9cfc8b1c0e283 100644
--- a/src/plugins/select/bluegene/plugin/sfree.c
+++ b/src/plugins/select/bluegene/plugin/sfree.c
@@ -73,7 +73,7 @@ static int _get_new_info_block(block_info_msg_t **block_ptr)
bg_info_ptr = new_bg_ptr;
- if (*block_ptr != bg_info_ptr)
+ if(*block_ptr != bg_info_ptr)
error_code = SLURM_SUCCESS;
*block_ptr = new_bg_ptr;
@@ -91,16 +91,16 @@ static int _check_status()
while(list_count(block_list)) {
info("waiting for %d bgblocks to free...",
list_count(block_list));
- if (_get_new_info_block(&block_ptr)
+ if(_get_new_info_block(&block_ptr)
== SLURM_SUCCESS) {
while((block_name = list_next(itr))) {
for (i=0; i<block_ptr->record_count;
i++) {
- if (!strcmp(block_name,
+ if(!strcmp(block_name,
block_ptr->
block_array[i].
bg_block_id)) {
- if (block_ptr->
+ if(block_ptr->
block_array[i].
state == RM_PARTITION_FREE)
list_delete_item(itr);
@@ -109,7 +109,7 @@ static int _check_status()
}
/* Here if we didn't find the record
it is gone so we just will delete it. */
- if (i >= block_ptr->record_count)
+ if(i >= block_ptr->record_count)
list_delete_item(itr);
}
list_iterator_reset(itr);
@@ -132,16 +132,16 @@ int main(int argc, char *argv[])
parse_command_line(argc, argv);
memset(&msg, 0, sizeof(update_block_msg_t));
- if (!all_blocks && (!block_list || !list_count(block_list))) {
+ if(!all_blocks && (!block_list || !list_count(block_list))) {
error("you need at least one block to remove.");
exit(1);
}
- if (all_blocks) {
+ if(all_blocks) {
int i=0;
block_info_msg_t *block_ptr = NULL;
_get_new_info_block(&block_ptr);
- if (block_list)
+ if(block_list)
list_flush(block_list);
else
block_list = list_create(slurm_destroy_char);
@@ -155,18 +155,18 @@ int main(int argc, char *argv[])
itr = list_iterator_create(block_list);
while((block_name = list_next(itr))) {
- if (remove_blocks)
+ if(remove_blocks)
msg.state = RM_PARTITION_NAV;
else
msg.state = RM_PARTITION_FREE;
msg.bg_block_id = block_name;
rc = slurm_update_block(&msg);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
error("Error trying to free block %s: %s",
block_name, slurm_strerror(rc));
}
list_iterator_destroy(itr);
- if (wait_full)
+ if(wait_full)
_check_status();
list_destroy(block_list);
info("done");
diff --git a/src/plugins/select/bluegene/plugin/slurm_prolog.c b/src/plugins/select/bluegene/plugin/slurm_prolog.c
index 9023576c34a845103587258de1c8ea695878e4ad..d9ab9c6618a81965f2ddd241ff4e66700c49924e 100644
--- a/src/plugins/select/bluegene/plugin/slurm_prolog.c
+++ b/src/plugins/select/bluegene/plugin/slurm_prolog.c
@@ -209,7 +209,7 @@ static int _partitions_dealloc()
return -1;
}
for (i=0; i<new_bg_ptr->record_count; i++) {
- if (new_bg_ptr->block_array[i].state
+ if(new_bg_ptr->block_array[i].state
== RM_PARTITION_DEALLOCATING) {
rc = 1;
break;
diff --git a/src/plugins/select/bluegene/plugin/state_test.c b/src/plugins/select/bluegene/plugin/state_test.c
index 8c1b0cf6cdeaadc33d38b9ecf9e023af5f209916..724cbe6febd6142fbde2c15967d7f4ea5d9f5a1a 100644
--- a/src/plugins/select/bluegene/plugin/state_test.c
+++ b/src/plugins/select/bluegene/plugin/state_test.c
@@ -95,7 +95,7 @@ static void _configure_node_down(rm_bp_id_t bp_id, my_bluegene_t *my_bg)
continue;
}
- if (!bpid) {
+ if(!bpid) {
error("No BPID was returned from database");
continue;
}
@@ -122,7 +122,7 @@ static void _configure_node_down(rm_bp_id_t bp_id, my_bluegene_t *my_bg)
}
/* make sure we have this midplane in the system */
- if (bp_loc.X >= DIM_SIZE[X]
+ if(bp_loc.X >= DIM_SIZE[X]
|| bp_loc.Y >= DIM_SIZE[Y]
|| bp_loc.Z >= DIM_SIZE[Z]) {
debug4("node %s%c%c%c isn't configured",
@@ -164,7 +164,7 @@ static char *_get_bp_node_name(rm_BP_t *bp_ptr)
}
/* make sure we have this midplane in the system */
- if (bp_loc.X >= DIM_SIZE[X]
+ if(bp_loc.X >= DIM_SIZE[X]
|| bp_loc.Y >= DIM_SIZE[Y]
|| bp_loc.Z >= DIM_SIZE[Z]) {
debug4("node %s%c%c%c isn't configured",
@@ -201,7 +201,7 @@ static int _test_nodecard_state(rm_nodecard_t *ncard, int nc_id,
return SLURM_ERROR;
}
- if (state == RM_NODECARD_UP)
+ if(state == RM_NODECARD_UP)
return SLURM_SUCCESS;
if ((rc = bridge_get_data(ncard,
@@ -211,7 +211,7 @@ static int _test_nodecard_state(rm_nodecard_t *ncard, int nc_id,
return SLURM_ERROR;
}
- if (!nc_name) {
+ if(!nc_name) {
error("We didn't get an RM_NodeCardID but rc was STATUS_OK?");
return SLURM_ERROR;
}
@@ -238,9 +238,9 @@ static int _test_nodecard_state(rm_nodecard_t *ncard, int nc_id,
state. To avoid getting a bunch of warnings here just
skip over the ones missing.
*/
- if (io_start >= bg_conf->numpsets) {
+ if(io_start >= bg_conf->numpsets) {
rc = SLURM_SUCCESS;
- if (state == RM_NODECARD_MISSING) {
+ if(state == RM_NODECARD_MISSING) {
debug3("Nodecard %s is missing",
nc_name);
} else {
@@ -252,7 +252,7 @@ static int _test_nodecard_state(rm_nodecard_t *ncard, int nc_id,
goto clean_up;
}
- /* if (!ionode_bitmap) */
+ /* if(!ionode_bitmap) */
/* ionode_bitmap = bit_alloc(bg_conf->numpsets); */
/* info("setting %s start %d of %d", */
/* nc_name, io_start, bg_conf->numpsets); */
@@ -260,7 +260,7 @@ static int _test_nodecard_state(rm_nodecard_t *ncard, int nc_id,
/* we have to handle each nodecard separately to make
sure we don't create holes in the system */
- if (down_nodecard(node_name, io_start, slurmctld_locked)
+ if(down_nodecard(node_name, io_start, slurmctld_locked)
== SLURM_SUCCESS) {
debug("nodecard %s on %s is in an error state",
nc_name, node_name);
@@ -300,7 +300,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr, bool slurmctld_locked)
//int io_cnt = 1;
/* Translate 1 nodecard count to ionode count */
-/* if ((io_cnt *= bg_conf->io_ratio)) */
+/* if((io_cnt *= bg_conf->io_ratio)) */
/* io_cnt--; */
if ((rc = bridge_get_data(bp_ptr, RM_BPID, &bp_id))
@@ -321,12 +321,12 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr, bool slurmctld_locked)
/* The node_name will only be NULL if this system doesn't
really have the node.
*/
- if (!(node_name = _get_bp_node_name(bp_ptr))) {
+ if(!(node_name = _get_bp_node_name(bp_ptr))) {
rc = SLURM_ERROR;
goto clean_up;
}
- if ((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
+ if((rc = bridge_get_data(ncard_list, RM_NodeCardListSize, &num))
!= STATUS_OK) {
error("bridge_get_data(RM_NodeCardListSize): %s",
bg_err_str(rc));
@@ -357,7 +357,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr, bool slurmctld_locked)
}
}
- if (_test_nodecard_state(ncard, i, node_name, slurmctld_locked)
+ if(_test_nodecard_state(ncard, i, node_name, slurmctld_locked)
!= SLURM_SUCCESS)
marked_down++;
}
@@ -369,7 +369,7 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr, bool slurmctld_locked)
bluegene.conf file that gives you an option as to have this
happen or not automatically.
*/
-/* if (ionode_bitmap) { */
+/* if(ionode_bitmap) { */
/* info("got ionode_bitmap"); */
/* bit_not(ionode_bitmap); */
@@ -381,10 +381,10 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr, bool slurmctld_locked)
/* slurm_mutex_lock(&block_state_mutex); */
/* itr = list_iterator_create(bg_lists->main); */
/* while ((bg_record = list_next(itr))) { */
-/* if (bg_record->job_running != BLOCK_ERROR_STATE) */
+/* if(bg_record->job_running != BLOCK_ERROR_STATE) */
/* continue; */
-/* if (!bit_test(bg_record->bitmap, bp_bit)) */
+/* if(!bit_test(bg_record->bitmap, bp_bit)) */
/* continue; */
/* info("bringing %s back to service", */
/* bg_record->bg_block_id); */
@@ -398,9 +398,9 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr, bool slurmctld_locked)
/* /\* FIX ME: This needs to call the opposite of */
/* slurm_drain_nodes which does not yet exist. */
/* *\/ */
-/* if ((ret = node_already_down(node_name))) { */
+/* if((ret = node_already_down(node_name))) { */
/* /\* means it was drained *\/ */
-/* if (ret == 2) { */
+/* if(ret == 2) { */
/* /\* debug("node %s put back into service after " *\/ */
/* /\* "being in an error state", *\/ */
/* /\* node_name); *\/ */
@@ -409,15 +409,15 @@ static int _test_down_nodecards(rm_BP_t *bp_ptr, bool slurmctld_locked)
/* } */
clean_up:
- if (ncard_list)
+ if(ncard_list)
bridge_free_nodecard_list(ncard_list);
xfree(node_name);
-/* if (ionode_bitmap) */
+/* if(ionode_bitmap) */
/* FREE_NULL_BITMAP(ionode_bitmap); */
free(bp_id);
/* If we marked any nodecard down we need to state it here */
- if ((rc == SLURM_SUCCESS) && marked_down)
+ if((rc == SLURM_SUCCESS) && marked_down)
rc = SLURM_ERROR;
return rc;
@@ -504,7 +504,7 @@ static void _test_down_switches(my_bluegene_t *my_bg)
continue;
}
- if (!bp_id) {
+ if(!bp_id) {
error("No BPID was returned from database");
continue;
}
@@ -521,7 +521,7 @@ extern int node_already_down(char *node_name)
struct node_record *node_ptr = find_node_record(node_name);
if (node_ptr) {
- if (IS_NODE_DRAIN(node_ptr))
+ if(IS_NODE_DRAIN(node_ptr))
return 2;
else if (IS_NODE_DOWN(node_ptr))
return 1;
@@ -590,14 +590,14 @@ extern int check_block_bp_states(char *bg_block_id, bool slurmctld_locked)
goto cleanup;
}
- if (small) {
+ if(small) {
rm_nodecard_t *ncard = NULL;
char *node_name = NULL;
/* If this is a small block we can just check the
nodecard list of the block.
*/
- if ((rc = bridge_get_data(block_ptr,
+ if((rc = bridge_get_data(block_ptr,
RM_PartitionNodeCardNum,
&cnt))
!= STATUS_OK) {
@@ -617,14 +617,14 @@ extern int check_block_bp_states(char *bg_block_id, bool slurmctld_locked)
goto cleanup;
}
- if (!(node_name = _get_bp_node_name(bp_ptr))) {
+ if(!(node_name = _get_bp_node_name(bp_ptr))) {
rc = errno;
goto cleanup;
}
for(i=0; i<cnt; i++) {
int nc_id = 0;
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(
block_ptr,
RM_PartitionNextNodeCard,
@@ -656,7 +656,7 @@ extern int check_block_bp_states(char *bg_block_id, bool slurmctld_locked)
break here since we are seeing if we can run. If
any nodecard is down this can't happen.
*/
- if (_test_nodecard_state(
+ if(_test_nodecard_state(
ncard, nc_id, node_name, slurmctld_locked)
!= SLURM_SUCCESS) {
rc = SLURM_ERROR;
@@ -678,7 +678,7 @@ extern int check_block_bp_states(char *bg_block_id, bool slurmctld_locked)
}
for(i=0; i<cnt; i++) {
- if (i) {
+ if(i) {
if ((rc = bridge_get_data(block_ptr,
RM_PartitionNextBP,
&bp_ptr))
@@ -704,7 +704,7 @@ extern int check_block_bp_states(char *bg_block_id, bool slurmctld_locked)
break here since we are seeing if we can run. If
any nodecard is down this can't happen.
*/
- if (_test_down_nodecards(bp_ptr, slurmctld_locked)
+ if(_test_down_nodecards(bp_ptr, slurmctld_locked)
!= SLURM_SUCCESS) {
rc = SLURM_ERROR;
break;
diff --git a/src/plugins/select/cons_res/dist_tasks.c b/src/plugins/select/cons_res/dist_tasks.c
index 0ebfda44ad17f15568e7988b37834cc701223f0a..c02458dbb757ba214127e0679610692530ff287b 100644
--- a/src/plugins/select/cons_res/dist_tasks.c
+++ b/src/plugins/select/cons_res/dist_tasks.c
@@ -39,11 +39,11 @@
#include "select_cons_res.h"
#include "dist_tasks.h"
-#if (0)
+#if(0)
#define CR_DEBUG 1
#endif
-#if (0)
+#if(0)
/* Using CR_SOCKET or CR_SOCKET_MEMORY will not allocate a socket to more
* than one job at a time, but it also will not grant a job access to more
* CPUs on the socket than requested. If ALLOCATE_FULL_SOCKET is defined,
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index 57dfe49cfc3c46b88a43415eb9610f6852900f7d..48cc8e3f5afa869f5eb1251e38215a097dd7e0c0 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -106,7 +106,7 @@
#include "dist_tasks.h"
#include "job_test.h"
-#if (0)
+#if(0)
#define CR_DEBUG 1
#endif
@@ -969,7 +969,7 @@ static int _rm_job_from_res(struct part_res_record *part_record_ptr,
/* reconstruct rows with remaining jobs */
struct part_res_record *p_ptr;
- if (!job_ptr->part_ptr) {
+ if(!job_ptr->part_ptr) {
error("error: 'rm' job %u does not have a "
"partition assigned",
job_ptr->job_id);
@@ -1921,7 +1921,7 @@ extern select_nodeinfo_t *select_p_select_nodeinfo_alloc(uint32_t size)
extern int select_p_select_nodeinfo_free(select_nodeinfo_t *nodeinfo)
{
- if (nodeinfo) {
+ if(nodeinfo) {
if (nodeinfo->magic != NODEINFO_MAGIC) {
error("select_p_select_nodeinfo_free: "
"nodeinfo magic bad");
@@ -1944,7 +1944,7 @@ extern int select_p_select_nodeinfo_set_all(void)
/* only set this once when the last_node_update is newer than
the last time we set things up. */
- if (last_set_all && (last_node_update < last_set_all)) {
+ if(last_set_all && (last_node_update < last_set_all)) {
debug2("Node select info for set all hasn't "
"changed since %d",
last_set_all);
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index f2fff443ed7cef53847376a0336aba9f67d74f91..34ef28c08202d78367e47bf821ab73f8452c57c7 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -2604,7 +2604,7 @@ extern select_nodeinfo_t *select_p_select_nodeinfo_alloc(uint32_t size)
extern int select_p_select_nodeinfo_free(select_nodeinfo_t *nodeinfo)
{
- if (nodeinfo) {
+ if(nodeinfo) {
if (nodeinfo->magic != NODEINFO_MAGIC) {
error("select_p_select_nodeinfo_free: "
"nodeinfo magic bad");
@@ -2624,7 +2624,7 @@ extern int select_p_select_nodeinfo_set_all(time_t last_query_time)
/* only set this once when the last_node_update is newer than
* the last time we set things up. */
- if (last_set_all && (last_node_update < last_set_all)) {
+ if(last_set_all && (last_node_update < last_set_all)) {
debug2("Node select info for set all hasn't "
"changed since %d",
last_set_all);
diff --git a/src/plugins/switch/federation/federation.c b/src/plugins/switch/federation/federation.c
index aaa465c9e5df20228321a8e3c5d99f4df98013da..a2a86b8eb9dd70a036b28f28ea73b1f0e987e9eb 100644
--- a/src/plugins/switch/federation/federation.c
+++ b/src/plugins/switch/federation/federation.c
@@ -268,13 +268,13 @@ _lookup_fed_status_tab(int status)
int i;
for(i = 0; i < sizeof(fed_status_tab) / sizeof(fed_status_t); i++) {
- if (fed_status_tab[i].status_number == status) {
+ if(fed_status_tab[i].status_number == status) {
res = fed_status_tab[i].status_msg;
break;
}
}
- if (!res)
+ if(!res)
res = fed_status_tab[FED_STATUS_UNKNOWN].status_msg;
return res;
@@ -311,11 +311,11 @@ char *fed_sprint_jobinfo(fed_jobinfo_t *j, char *buf,
j->job_desc,
j->window_memory,
j->tables_per_task);
- if (count < 0)
+ if(count < 0)
return buf;
remaining -= count;
tmp += count;
- if (remaining < 1)
+ if(remaining < 1)
return buf;
return buf;
@@ -446,7 +446,7 @@ static int _set_up_adapter(fed_adapter_t *fed_adapter, char *adapter_name)
error_code = ntbl_adapter_resources(NTBL_VERSION,
adapter_name,
&res);
- if (error_code != NTBL_SUCCESS)
+ if(error_code != NTBL_SUCCESS)
return SLURM_ERROR;
strncpy(fed_adapter->name,
adapter_name,
@@ -467,11 +467,11 @@ static int _set_up_adapter(fed_adapter_t *fed_adapter, char *adapter_name)
&win_count,
&status);
umask(fed_umask);
- if (error_code)
+ if(error_code)
slurm_seterrno_ret(ESTATUS);
tmp_winlist = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
res.window_count);
- if (!tmp_winlist)
+ if(!tmp_winlist)
slurm_seterrno_ret(ENOMEM);
for(i = 0; i < res.window_count; i++) {
tmp_winlist[i].id = status->window_id;
@@ -517,7 +517,7 @@ static int _parse_fed_file(hostlist_t *adapter_list)
fed_conf = _get_fed_conf();
tbl = s_p_hashtbl_create(options);
- if (s_p_parse_file(tbl, NULL, fed_conf) == SLURM_ERROR)
+ if(s_p_parse_file(tbl, NULL, fed_conf) == SLURM_ERROR)
fatal("something wrong with opening/reading federation "
"conf file");
@@ -552,7 +552,7 @@ _get_adapters(fed_adapter_t *list, int *count)
adapter_iter = hostlist_iterator_create(adapter_list);
for (i = 0; (adapter = hostlist_next(adapter_iter)); i++) {
- if (_set_up_adapter(list + i, adapter) == SLURM_ERROR)
+ if(_set_up_adapter(list + i, adapter) == SLURM_ERROR)
fatal("Failed to set up adapter %s.", adapter);
free(adapter);
}
@@ -562,7 +562,7 @@ _get_adapters(fed_adapter_t *list, int *count)
*count = i;
info("Number of adapters is = %d", *count);
- if (!*count)
+ if(!*count)
slurm_seterrno_ret(ENOADAPTER);
return 0;
@@ -597,11 +597,11 @@ fed_alloc_nodeinfo(fed_nodeinfo_t **n)
assert(n);
new = (fed_nodeinfo_t *)xmalloc(sizeof(fed_nodeinfo_t));
- if (!new)
+ if(!new)
slurm_seterrno_ret(ENOMEM);
new->adapter_list = (fed_adapter_t *)xmalloc(sizeof(fed_adapter_t)
* FED_MAXADAPTERS);
- if (!new->adapter_list) {
+ if(!new->adapter_list) {
xfree(new);
slurm_seterrno_ret(ENOMEM);
}
@@ -635,7 +635,7 @@ fed_build_nodeinfo(fed_nodeinfo_t *n, char *name)
_lock();
err = _get_adapters(n->adapter_list, &count);
_unlock();
- if (err != 0)
+ if(err != 0)
return err;
n->adapter_count = count;
return 0;
@@ -803,11 +803,11 @@ fed_print_nodeinfo(fed_nodeinfo_t *n, char *buf, size_t size)
count = snprintf(tmp, remaining,
"Node: %s\n",
n->name);
- if (count < 0)
+ if(count < 0)
return buf;
remaining -= count;
tmp += count;
- if (remaining < 1)
+ if(remaining < 1)
return buf;
for(i = 0; i < n->adapter_count; i++) {
a = n->adapter_list + i;
@@ -834,11 +834,11 @@ fed_print_nodeinfo(fed_nodeinfo_t *n, char *buf, size_t size)
a->name,
a->window_count);
#endif
- if (count < 0)
+ if(count < 0)
return buf;
remaining -= count;
tmp += count;
- if (remaining < 1)
+ if(remaining < 1)
return buf;
w = a->window_list;
@@ -847,17 +847,17 @@ fed_print_nodeinfo(fed_nodeinfo_t *n, char *buf, size_t size)
count = _print_window_struct(&w[j], tmp, remaining);
#else
- if (w[j].status != NTBL_UNLOADED_STATE)
+ if(w[j].status != NTBL_UNLOADED_STATE)
count = _print_window_struct(&w[j], tmp,
remaining);
else
count = 0;
#endif
- if (count < 0)
+ if(count < 0)
return buf;
remaining -= count;
tmp += count;
- if (remaining < 1)
+ if(remaining < 1)
return buf;
}
}
@@ -934,7 +934,7 @@ _copy_node(fed_nodeinfo_t *dest, fed_nodeinfo_t *src)
da->window_count = sa->window_count;
da->window_list = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
da->window_count);
- if (!da->window_list) {
+ if(!da->window_list) {
slurm_seterrno_ret(ENOMEM);
}
for(j = 0; j < da->window_count; j++)
@@ -991,7 +991,7 @@ _find_node(fed_libstate_t *lp, char *name)
n = lp->hash_table[i];
while(n) {
assert(n->magic == FED_NODEINFO_MAGIC);
- if (!strncmp(n->name, name, FED_HOSTLEN))
+ if(!strncmp(n->name, name, FED_HOSTLEN))
return n;
n = n->next;
}
@@ -1010,7 +1010,7 @@ _hash_add_nodeinfo(fed_libstate_t *state, fed_nodeinfo_t *node)
assert(state);
assert(state->hash_table);
assert(state->hash_max >= state->node_count);
- if (!strlen(node->name))
+ if(!strlen(node->name))
return;
index = _hash_index(node->name);
node->next = state->hash_table[index];
@@ -1028,7 +1028,7 @@ _hash_rebuild(fed_libstate_t *state)
assert(state);
- if (state->hash_table)
+ if(state->hash_table)
xfree(state->hash_table);
if (state->node_count > state->hash_max || state->hash_max == 0)
state->hash_max += FED_HASHCOUNT;
@@ -1055,25 +1055,25 @@ _alloc_node(fed_libstate_t *lp, char *name)
assert(lp);
- if (name != NULL) {
+ if(name != NULL) {
n = _find_node(lp, name);
- if (n != NULL)
+ if(n != NULL)
return n;
}
fed_need_state_save = true;
- if (lp->node_count >= lp->node_max) {
+ if(lp->node_count >= lp->node_max) {
lp->node_max += FED_NODECOUNT;
new_bufsize = lp->node_max * sizeof(fed_nodeinfo_t);
- if (lp->node_list == NULL)
+ if(lp->node_list == NULL)
lp->node_list = (fed_nodeinfo_t *)xmalloc(new_bufsize);
else
lp->node_list = (fed_nodeinfo_t *)xrealloc(lp->node_list,
new_bufsize);
need_hash_rebuild = true;
}
- if (lp->node_list == NULL) {
+ if(lp->node_list == NULL) {
slurm_seterrno(ENOMEM);
return NULL;
}
@@ -1084,7 +1084,7 @@ _alloc_node(fed_libstate_t *lp, char *name)
n->adapter_list = (fed_adapter_t *)xmalloc(FED_MAXADAPTERS *
sizeof(fed_adapter_t));
- if (name != NULL) {
+ if(name != NULL) {
strncpy(n->name, name, FED_HOSTLEN);
if (need_hash_rebuild || lp->node_count > lp->hash_max)
_hash_rebuild(lp);
@@ -1185,10 +1185,10 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
/* Extract node name from buffer
*/
safe_unpack32(&magic, buf);
- if (magic != FED_NODEINFO_MAGIC)
+ if(magic != FED_NODEINFO_MAGIC)
slurm_seterrno_ret(EBADMAGIC_FEDNODEINFO);
safe_unpackmem_ptr(&name_ptr, &size, buf);
- if (size != FED_HOSTLEN)
+ if(size != FED_HOSTLEN)
goto unpack_error;
memcpy(name, name_ptr, size);
@@ -1229,14 +1229,14 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
/* Update global libstate with this nodes' info.
*/
tmp_n = _alloc_node(fed_state, name);
- if (tmp_n == NULL)
+ if(tmp_n == NULL)
return SLURM_ERROR;
tmp_n->magic = magic;
safe_unpack32(&tmp_n->adapter_count, buf);
for(i = 0; i < tmp_n->adapter_count; i++) {
tmp_a = tmp_n->adapter_list + i;
safe_unpackmem_ptr(&name_ptr, &size, buf);
- if (size != FED_ADAPTERNAME_LEN)
+ if(size != FED_ADAPTERNAME_LEN)
goto unpack_error;
memcpy(tmp_a->name, name_ptr, size);
safe_unpack16(&tmp_a->lid, buf);
@@ -1247,7 +1247,7 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
safe_unpack32(&tmp_a->window_count, buf);
tmp_w = (fed_window_t *)xmalloc(sizeof(fed_window_t) *
tmp_a->window_count);
- if (!tmp_w)
+ if(!tmp_w)
slurm_seterrno_ret(ENOMEM);
for(j = 0; j < tmp_a->window_count; j++) {
safe_unpack16(&tmp_w[j].id, buf);
@@ -1264,8 +1264,8 @@ _unpack_nodeinfo(fed_nodeinfo_t *n, Buf buf, bool believe_window_status)
copy_node:
/* Only copy the node_info structure if the caller wants it */
- if (n != NULL)
- if (_copy_node(n, tmp_n) != SLURM_SUCCESS)
+ if(n != NULL)
+ if(_copy_node(n, tmp_n) != SLURM_SUCCESS)
return SLURM_ERROR;
#if FED_DEBUG
@@ -1302,12 +1302,12 @@ fed_free_nodeinfo(fed_nodeinfo_t *n, bool ptr_into_array)
fed_adapter_t *adapter;
int i;
- if (!n)
+ if(!n)
return;
assert(n->magic == FED_NODEINFO_MAGIC);
- if (n->adapter_list) {
+ if(n->adapter_list) {
adapter = n->adapter_list;
for (i = 0; i < n->adapter_count; i++) {
xfree(adapter[i].window_list);
@@ -1397,7 +1397,7 @@ _allocate_windows_all(int adapter_cnt, fed_tableinfo_t *tableinfo,
assert(hostname);
node = _find_node(fed_state, hostname);
- if (node == NULL) {
+ if(node == NULL) {
error("Failed to find node in node_list: %s", hostname);
return SLURM_ERROR;
}
@@ -1449,7 +1449,7 @@ _allocate_window_single(char *adapter_name, fed_tableinfo_t *tableinfo,
debug("in _allocate_window_single");
node = _find_node(fed_state, hostname);
- if (node == NULL) {
+ if(node == NULL) {
error("Failed to find node in node_list: %s", hostname);
return SLURM_ERROR;
}
@@ -1656,10 +1656,10 @@ _job_step_window_state(fed_jobinfo_t *jp, hostlist_t hl, enum NTBL_RC state)
_lock();
for (i = 0; i < nnodes; i++) {
host = hostlist_next(hi);
- if (!host)
+ if(!host)
error("Failed to get next host");
- if (i < full_node_cnt)
+ if(i < full_node_cnt)
task_cnt = max_procs_per_node;
else
task_cnt = min_procs_per_node;
@@ -1827,7 +1827,7 @@ fed_build_jobinfo(fed_jobinfo_t *jp, hostlist_t hl, int nprocs,
assert(jp->magic == FED_JOBINFO_MAGIC);
assert(!hostlist_is_empty(hl));
- if (nprocs <= 0)
+ if(nprocs <= 0)
slurm_seterrno_ret(EINVAL);
jp->bulk_xfer = (uint8_t) bulk_xfer;
@@ -1879,10 +1879,10 @@ fed_build_jobinfo(fed_jobinfo_t *jp, hostlist_t hl, int nprocs,
_lock();
for (i = 0; i < nnodes; i++) {
host = hostlist_next(hi);
- if (!host)
+ if(!host)
error("Failed to get next host");
- if (i < full_node_cnt)
+ if(i < full_node_cnt)
task_cnt = max_procs_per_node;
else
task_cnt = min_procs_per_node;
@@ -2005,7 +2005,7 @@ fed_unpack_jobinfo(fed_jobinfo_t *j, Buf buf)
assert(j->magic == FED_JOBINFO_MAGIC);
safe_unpack16(&j->job_key, buf);
safe_unpackmem(j->job_desc, &size, buf);
- if (size != DESCLEN)
+ if(size != DESCLEN)
goto unpack_error;
safe_unpack32(&j->window_memory, buf);
safe_unpack8(&j->bulk_xfer, buf);
@@ -2013,7 +2013,7 @@ fed_unpack_jobinfo(fed_jobinfo_t *j, Buf buf)
j->tableinfo = (fed_tableinfo_t *) xmalloc(j->tables_per_task
* sizeof(fed_tableinfo_t));
- if (!j->tableinfo)
+ if(!j->tableinfo)
slurm_seterrno_ret(ENOMEM);
for (i = 0; i < j->tables_per_task; i++) {
if (_unpack_tableinfo(&j->tableinfo[i], buf) != 0)
@@ -2046,7 +2046,7 @@ fed_copy_jobinfo(fed_jobinfo_t *job)
assert(job);
assert(job->magic == FED_JOBINFO_MAGIC);
- if (fed_alloc_jobinfo(&new)) {
+ if(fed_alloc_jobinfo(&new)) {
debug("fed_alloc_jobinfo failed");
goto cleanup1;
}
@@ -2310,10 +2310,10 @@ fed_load_table(fed_jobinfo_t *jp, int uid, int pid)
if (rc != SLURM_SUCCESS)
return rc;
- if (adapter == NULL)
+ if(adapter == NULL)
continue;
winmem = jp->window_memory;
- if (jp->bulk_xfer) {
+ if(jp->bulk_xfer) {
if (i == 0) {
rc = _check_rdma_job_count(adapter);
if (rc != SLURM_SUCCESS)
@@ -2345,7 +2345,7 @@ fed_load_table(fed_jobinfo_t *jp, int uid, int pid)
jp->tableinfo[i].table_length,
jp->tableinfo[i].table);
}
- if (err != NTBL_SUCCESS) {
+ if(err != NTBL_SUCCESS) {
error("unable to load table: [%d] %s",
err, _lookup_fed_status_tab(err));
return SLURM_ERROR;
@@ -2415,7 +2415,7 @@ fed_unload_table(fed_jobinfo_t *jp)
local_lid = _get_lid_from_adapter(adapter_name);
for(j = 0; j < table_length; j++) {
- if (table[j]->lid != local_lid)
+ if(table[j]->lid != local_lid)
continue;
debug3("freeing adapter %s lid %d window %d job_key %d",
adapter_name, table[j]->lid,
@@ -2424,7 +2424,7 @@ fed_unload_table(fed_jobinfo_t *jp)
jp->job_key,
table[j]->window_id,
retry);
- if (err != SLURM_SUCCESS) {
+ if(err != SLURM_SUCCESS) {
rc = err;
slurm_seterrno(EUNLOAD);
retry = 2;
@@ -2440,7 +2440,7 @@ _alloc_libstate(void)
fed_libstate_t *tmp;
tmp = (fed_libstate_t *)xmalloc(sizeof(fed_libstate_t));
- if (!tmp) {
+ if(!tmp) {
slurm_seterrno(ENOMEM);
return NULL;
}
@@ -2465,7 +2465,7 @@ fed_init(void)
fed_libstate_t *tmp;
tmp = _alloc_libstate();
- if (!tmp)
+ if(!tmp)
return SLURM_FAILURE;
_lock();
assert(!fed_state);
@@ -2555,7 +2555,7 @@ _unpack_libstate(fed_libstate_t *lp, Buf buffer)
if (_unpack_nodeinfo(NULL, buffer, false) != SLURM_SUCCESS)
goto unpack_error;
}
- if (lp->node_count != node_count) {
+ if(lp->node_count != node_count) {
error("Failed to recover switch state of all nodes (%d of %u)",
lp->node_count, node_count);
return SLURM_ERROR;
@@ -2578,7 +2578,7 @@ fed_libstate_restore(Buf buffer)
assert(!fed_state);
fed_state = _alloc_libstate();
- if (!fed_state) {
+ if(!fed_state) {
error("fed_libstate_restore fed_state is NULL");
_unlock();
return SLURM_FAILURE;
diff --git a/src/plugins/switch/federation/switch_federation.c b/src/plugins/switch/federation/switch_federation.c
index 82b00f88d3c6cac73db8c609730d13790b2a8386..131888395ace8d5993fd81b2a807c3a918cd7283 100644
--- a/src/plugins/switch/federation/switch_federation.c
+++ b/src/plugins/switch/federation/switch_federation.c
@@ -185,7 +185,7 @@ static int _switch_p_libstate_save ( char * dir_name, bool free_flag )
xstrcat(file_name, "/fed_state");
(void)unlink(file_name);
state_fd = creat(file_name, 0600);
- if (state_fd < 0) {
+ if(state_fd < 0) {
error ("Can't save state, error creating file %s %m",
file_name);
ret = SLURM_ERROR;
@@ -210,7 +210,7 @@ static int _switch_p_libstate_save ( char * dir_name, bool free_flag )
}
xfree(file_name);
- if (buffer)
+ if(buffer)
free_buf(buffer);
return ret;
@@ -307,7 +307,7 @@ int switch_p_clear_node_state(void)
for(i = 0; i < FED_MAXADAPTERS; i++) {
name[3] = i + ZERO;
err = ntbl_adapter_resources(NTBL_VERSION, name, &res);
- if (err != NTBL_SUCCESS)
+ if(err != NTBL_SUCCESS)
continue;
for(j = 0; j < res.window_count; j++)
ntbl_clean_window(NTBL_VERSION, name,
@@ -328,11 +328,11 @@ int switch_p_build_node_info(switch_node_info_t *switch_node)
char hostname[256];
char *tmp;
- if (gethostname(hostname, 256) < 0)
+ if(gethostname(hostname, 256) < 0)
slurm_seterrno_ret(EHOSTNAME);
/* remove the domain portion, if necessary */
tmp = strstr(hostname, ".");
- if (tmp)
+ if(tmp)
*tmp = '\0';
return fed_build_nodeinfo((fed_nodeinfo_t *)switch_node, hostname);
}
@@ -349,7 +349,7 @@ int switch_p_unpack_node_info(switch_node_info_t *switch_node, Buf buffer)
void switch_p_free_node_info(switch_node_info_t **switch_node)
{
- if (switch_node)
+ if(switch_node)
fed_free_nodeinfo((fed_nodeinfo_t *)*switch_node, false);
}
@@ -401,7 +401,7 @@ int switch_p_build_jobinfo(switch_jobinfo_t *switch_job, char *nodelist,
char *adapter_name = NULL;
debug3("network = \"%s\"", network);
- if (strstr(network, "ip") || strstr(network, "IP")) {
+ if(strstr(network, "ip") || strstr(network, "IP")) {
debug2("federation: \"ip\" found in network string, "
"no network tables allocated");
return SLURM_SUCCESS;
@@ -424,7 +424,7 @@ int switch_p_build_jobinfo(switch_jobinfo_t *switch_job, char *nodelist,
}
list = hostlist_create(nodelist);
- if (!list)
+ if(!list)
fatal("hostlist_create(%s): %m", nodelist);
for (i = 0; i < hostlist_count(list); i++)
nprocs += tasks_per_node[i];
@@ -540,7 +540,7 @@ int switch_p_node_init(void)
/* check to make sure the version of the library we compiled with
* matches the one dynamically linked
*/
- if (!_ntbl_version_ok()) {
+ if(!_ntbl_version_ok()) {
slurm_seterrno_ret(EVERSION);
}
@@ -578,7 +578,7 @@ int switch_p_job_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
/*
* Kill all processes in the job's session
*/
- if (pgid) {
+ if(pgid) {
debug2("Sending SIGKILL to pgid %lu",
(unsigned long) pgid);
kill(-pgid, SIGKILL);
@@ -587,7 +587,7 @@ int switch_p_job_postfini(switch_jobinfo_t *jobinfo, uid_t pgid,
step_id, (unsigned long) pgid);
err = fed_unload_table((fed_jobinfo_t *)jobinfo);
- if (err != SLURM_SUCCESS)
+ if(err != SLURM_SUCCESS)
return SLURM_ERROR;
return SLURM_SUCCESS;
diff --git a/src/plugins/task/affinity/dist_tasks.c b/src/plugins/task/affinity/dist_tasks.c
index fb46949046ed4fc439a5171d571cbe05a94935a6..9ad33e3b1d1f25f3a6de894529a78597152c9ad6 100644
--- a/src/plugins/task/affinity/dist_tasks.c
+++ b/src/plugins/task/affinity/dist_tasks.c
@@ -1009,7 +1009,7 @@ static bitstr_t *_lllp_map_abstract_mask(bitstr_t *bitmask)
for (i = 0; i < num_bits; i++) {
if (bit_test(bitmask,i)) {
bit = BLOCK_MAP(i);
- if (bit < bit_size(newmask))
+ if(bit < bit_size(newmask))
bit_set(newmask, bit);
else
error("_lllp_map_abstract_mask: can't go from "
diff --git a/src/plugins/topology/3d_torus/hilbert.c b/src/plugins/topology/3d_torus/hilbert.c
index 55471e9f3cca9bf93107a467683eb8873da4ab9a..6a26e722f3d4289f95198625f04dc59e6df8295b 100644
--- a/src/plugins/topology/3d_torus/hilbert.c
+++ b/src/plugins/topology/3d_torus/hilbert.c
@@ -53,9 +53,9 @@ int n) // I dimension
{
P = Q - 1;
for( i = n-1; i; i-- )
- if ( X[i] & Q ) X[0] ^= P; // invert
+ if( X[i] & Q ) X[0] ^= P; // invert
else{ t = (X[0] ^ X[i]) & P; X[0] ^= t; X[i] ^= t; } // exchange
- if ( X[0] & Q ) X[0] ^= P; // invert
+ if( X[0] & Q ) X[0] ^= P; // invert
}
}
extern void AxestoTranspose(
@@ -70,9 +70,9 @@ int n) // I dimension
for( Q = 1 << (b - 1); Q > 1; Q >>= 1 )
{
P = Q - 1;
- if ( X[0] & Q ) X[0] ^= P; // invert
+ if( X[0] & Q ) X[0] ^= P; // invert
for( i = 1; i < n; i++ )
- if ( X[i] & Q ) X[0] ^= P; // invert
+ if( X[i] & Q ) X[0] ^= P; // invert
else{ t = (X[0] ^ X[i]) & P; X[0] ^= t; X[i] ^= t; } // exchange
}
diff --git a/src/sacct/options.c b/src/sacct/options.c
index 9905443e2adf90a0deb114dce24cd49ea01fa2e1..ff7f48f515894091f78fe03e1535c146ca1650f7 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -65,7 +65,7 @@ void _help_fields_msg(void)
for (i = 0; fields[i].name; i++) {
if (i & 3)
printf(" ");
- else if (i)
+ else if(i)
printf("\n");
printf("%-13s", fields[i].name);
}
@@ -75,7 +75,7 @@ void _help_fields_msg(void)
static char *_convert_to_id(char *name, bool gid)
{
- if (gid) {
+ if(gid) {
struct group *grp;
if (!(grp=getgrnam(name))) {
fprintf(stderr, "Invalid group id: %s\n", name);
@@ -105,13 +105,13 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -120,12 +120,12 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
@@ -135,11 +135,11 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -148,7 +148,7 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -157,7 +157,7 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
@@ -166,11 +166,11 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -191,13 +191,13 @@ static int _addto_state_char_list(List char_list, char *names)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -206,12 +206,12 @@ static int _addto_state_char_list(List char_list, char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
c = job_state_num(name);
@@ -222,11 +222,11 @@ static int _addto_state_char_list(List char_list, char *names)
name = xstrdup_printf("%d", c);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -235,7 +235,7 @@ static int _addto_state_char_list(List char_list, char *names)
}
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -244,7 +244,7 @@ static int _addto_state_char_list(List char_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
c = job_state_num(name);
@@ -254,11 +254,11 @@ static int _addto_state_char_list(List char_list, char *names)
name = xstrdup_printf("%d", c);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -282,13 +282,13 @@ static int _addto_step_list(List step_list, char *names)
int quote = 0;
int count = 0;
- if (!step_list) {
+ if(!step_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(step_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -297,12 +297,12 @@ static int _addto_step_list(List step_list, char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
char *dot = NULL;
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
@@ -322,7 +322,7 @@ static int _addto_step_list(List step_list, char *names)
xfree(name);
while((curr_step = list_next(itr))) {
- if ((curr_step->jobid
+ if((curr_step->jobid
== selected_step->jobid)
&& (curr_step->stepid
== selected_step->
@@ -330,7 +330,7 @@ static int _addto_step_list(List step_list, char *names)
break;
}
- if (!curr_step) {
+ if(!curr_step) {
list_append(step_list,
selected_step);
count++;
@@ -344,7 +344,7 @@ static int _addto_step_list(List step_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
@@ -362,13 +362,13 @@ static int _addto_step_list(List step_list, char *names)
xfree(name);
while((curr_step = list_next(itr))) {
- if ((curr_step->jobid == selected_step->jobid)
+ if((curr_step->jobid == selected_step->jobid)
&& (curr_step->stepid
== selected_step->stepid))
break;
}
- if (!curr_step) {
+ if(!curr_step) {
list_append(step_list, selected_step);
count++;
} else
@@ -531,7 +531,7 @@ int get_data(void)
ListIterator itr_step = NULL;
slurmdb_job_cond_t *job_cond = params.job_cond;
- if (params.opt_completion) {
+ if(params.opt_completion) {
jobs = g_slurm_jobcomp_get_jobs(job_cond);
return SLURM_SUCCESS;
} else {
@@ -541,18 +541,18 @@ int get_data(void)
if (params.opt_fdump)
return SLURM_SUCCESS;
- if (!jobs)
+ if(!jobs)
return SLURM_ERROR;
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
- if (job->user) {
+ if(job->user) {
struct passwd *pw = NULL;
if ((pw=getpwnam(job->user)))
job->uid = pw->pw_uid;
}
- if (!job->steps || !list_count(job->steps))
+ if(!job->steps || !list_count(job->steps))
continue;
itr_step = list_iterator_create(job->steps);
@@ -560,7 +560,7 @@ int get_data(void)
/* now aggregate the aggregatable */
job->alloc_cpus = MAX(job->alloc_cpus, step->ncpus);
- if (step->state < JOB_COMPLETE)
+ if(step->state < JOB_COMPLETE)
continue;
job->tot_cpu_sec += step->tot_cpu_sec;
job->tot_cpu_usec += step->tot_cpu_usec;
@@ -662,7 +662,7 @@ void parse_command_line(int argc, char **argv)
all_users = 1;
break;
case 'A':
- if (!job_cond->acct_list)
+ if(!job_cond->acct_list)
job_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->acct_list, optarg);
@@ -674,12 +674,12 @@ void parse_command_line(int argc, char **argv)
params.opt_completion = 1;
break;
case 'C':
- if (!strcasecmp(optarg, "-1")) {
+ if(!strcasecmp(optarg, "-1")) {
all_clusters = 1;
break;
}
all_clusters=0;
- if (!job_cond->cluster_list)
+ if(!job_cond->cluster_list)
job_cond->cluster_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->cluster_list, optarg);
@@ -703,7 +703,7 @@ void parse_command_line(int argc, char **argv)
params.opt_filein = xstrdup(optarg);
break;
case 'g':
- if (!job_cond->groupid_list)
+ if(!job_cond->groupid_list)
job_cond->groupid_list =
list_create(slurm_destroy_char);
_addto_id_char_list(job_cond->groupid_list, optarg, 1);
@@ -748,7 +748,7 @@ void parse_command_line(int argc, char **argv)
exit(1);
}
- if (!job_cond->step_list)
+ if(!job_cond->step_list)
job_cond->step_list = list_create(
slurmdb_destroy_selected_step);
_addto_step_list(job_cond->step_list, optarg);
@@ -763,7 +763,7 @@ void parse_command_line(int argc, char **argv)
print_fields_have_header = 0;
break;
case 'N':
- if (job_cond->used_nodes) {
+ if(job_cond->used_nodes) {
error("Aleady asked for nodes '%s'",
job_cond->used_nodes);
break;
@@ -797,20 +797,20 @@ void parse_command_line(int argc, char **argv)
PRINT_FIELDS_PARSABLE_NO_ENDING;
break;
case 'q':
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = slurmdb_qos_get(
acct_db_conn, NULL);
- if (!job_cond->qos_list)
+ if(!job_cond->qos_list)
job_cond->qos_list =
list_create(slurm_destroy_char);
- if (!slurmdb_addto_qos_char_list(job_cond->qos_list,
+ if(!slurmdb_addto_qos_char_list(job_cond->qos_list,
g_qos_list, optarg, 0))
fatal("problem processing qos list");
break;
case 'r':
- if (!job_cond->partition_list)
+ if(!job_cond->partition_list)
job_cond->partition_list =
list_create(slurm_destroy_char);
@@ -818,7 +818,7 @@ void parse_command_line(int argc, char **argv)
optarg);
break;
case 's':
- if (!job_cond->state_list)
+ if(!job_cond->state_list)
job_cond->state_list =
list_create(slurm_destroy_char);
@@ -836,12 +836,12 @@ void parse_command_line(int argc, char **argv)
params.opt_help = 3;
break;
case 'u':
- if (!strcmp(optarg, "-1")) {
+ if(!strcmp(optarg, "-1")) {
all_users = 1;
break;
}
all_users = 0;
- if (!job_cond->userid_list)
+ if(!job_cond->userid_list)
job_cond->userid_list =
list_create(slurm_destroy_char);
_addto_id_char_list(job_cond->userid_list, optarg, 0);
@@ -852,7 +852,7 @@ void parse_command_line(int argc, char **argv)
verbosity++;
break;
case 'W':
- if (!job_cond->wckey_list)
+ if(!job_cond->wckey_list)
job_cond->wckey_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->wckey_list, optarg);
@@ -861,7 +861,7 @@ void parse_command_line(int argc, char **argv)
print_slurm_version();
exit(0);
case 'x':
- if (!job_cond->associd_list)
+ if(!job_cond->associd_list)
job_cond->associd_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->associd_list, optarg);
@@ -893,12 +893,12 @@ void parse_command_line(int argc, char **argv)
job_cond->duplicates = params.opt_dup;
job_cond->without_steps = params.opt_allocs;
- if (!job_cond->usage_start && !job_cond->step_list) {
+ if(!job_cond->usage_start && !job_cond->step_list) {
job_cond->usage_start = time(NULL);
- if (!job_cond->state_list) {
+ if(!job_cond->state_list) {
struct tm start_tm;
- if (!localtime_r(&job_cond->usage_start, &start_tm)) {
+ if(!localtime_r(&job_cond->usage_start, &start_tm)) {
error("Couldn't get localtime from %d",
job_cond->usage_start);
return;
@@ -911,13 +911,13 @@ void parse_command_line(int argc, char **argv)
}
}
- if (verbosity > 0) {
+ if(verbosity > 0) {
char *start_char =NULL, *end_char = NULL;
start_char = xstrdup(ctime(&job_cond->usage_start));
/* remove the new line */
start_char[strlen(start_char)-1] = '\0';
- if (job_cond->usage_end) {
+ if(job_cond->usage_end) {
end_char = xstrdup(ctime(&job_cond->usage_end));
/* remove the new line */
end_char[strlen(end_char)-1] = '\0';
@@ -944,7 +944,7 @@ void parse_command_line(int argc, char **argv)
params.opt_help,
params.opt_allocs);
- if (params.opt_completion) {
+ if(params.opt_completion) {
g_slurm_jobcomp_init(params.opt_filein);
acct_type = slurm_get_jobcomp_type();
@@ -966,15 +966,15 @@ void parse_command_line(int argc, char **argv)
}
xfree(acct_type);
acct_db_conn = slurmdb_connection_get();
- if (errno != SLURM_SUCCESS) {
+ if(errno != SLURM_SUCCESS) {
error("Problem talking to the database: %m");
exit(1);
}
}
/* specific clusters requested? */
- if (all_clusters) {
- if (job_cond->cluster_list
+ if(all_clusters) {
+ if(job_cond->cluster_list
&& list_count(job_cond->cluster_list)) {
list_destroy(job_cond->cluster_list);
job_cond->cluster_list = NULL;
@@ -987,12 +987,12 @@ void parse_command_line(int argc, char **argv)
while((start = list_next(itr)))
debug2("\t: %s", start);
list_iterator_destroy(itr);
- } else if (!job_cond->cluster_list
+ } else if(!job_cond->cluster_list
|| !list_count(job_cond->cluster_list)) {
- if (!job_cond->cluster_list)
+ if(!job_cond->cluster_list)
job_cond->cluster_list =
list_create(slurm_destroy_char);
- if ((start = slurm_get_cluster_name())) {
+ if((start = slurm_get_cluster_name())) {
list_append(job_cond->cluster_list, start);
debug2("Clusters requested:\t%s", start);
}
@@ -1000,17 +1000,17 @@ void parse_command_line(int argc, char **argv)
/* if any jobs or nodes are specified set to look for all users if none
are set */
- if (!job_cond->userid_list || !list_count(job_cond->userid_list))
- if ((job_cond->step_list && list_count(job_cond->step_list))
+ if(!job_cond->userid_list || !list_count(job_cond->userid_list))
+ if((job_cond->step_list && list_count(job_cond->step_list))
|| job_cond->used_nodes)
all_users=1;
/* set all_users for user root if not requesting any */
- if (!job_cond->userid_list && !params.opt_uid)
+ if(!job_cond->userid_list && !params.opt_uid)
all_users = 1;
- if (all_users) {
- if (job_cond->userid_list && list_count(job_cond->userid_list)) {
+ if(all_users) {
+ if(job_cond->userid_list && list_count(job_cond->userid_list)) {
list_destroy(job_cond->userid_list);
job_cond->userid_list = NULL;
}
@@ -1021,9 +1021,9 @@ void parse_command_line(int argc, char **argv)
while((start = list_next(itr)))
debug2("\t: %s", start);
list_iterator_destroy(itr);
- } else if (!job_cond->userid_list
+ } else if(!job_cond->userid_list
|| !list_count(job_cond->userid_list)) {
- if (!job_cond->userid_list)
+ if(!job_cond->userid_list)
job_cond->userid_list = list_create(slurm_destroy_char);
start = xstrdup_printf("%u", params.opt_uid);
list_append(job_cond->userid_list, start);
@@ -1059,7 +1059,7 @@ void parse_command_line(int argc, char **argv)
debug2("Jobs requested:");
itr = list_iterator_create(job_cond->step_list);
while((selected_step = list_next(itr))) {
- if (selected_step->stepid != NO_VAL)
+ if(selected_step->stepid != NO_VAL)
debug2("\t: %d.%d",
selected_step->jobid,
selected_step->stepid);
@@ -1093,7 +1093,7 @@ void parse_command_line(int argc, char **argv)
char time_str[128], tmp1[32], tmp2[32];
mins2time_str(job_cond->timelimit_min, tmp1, sizeof(tmp1));
sprintf(time_str, "%s", tmp1);
- if (job_cond->timelimit_max) {
+ if(job_cond->timelimit_max) {
int len = strlen(tmp1);
mins2time_str(job_cond->timelimit_max,
tmp2, sizeof(tmp2));
@@ -1103,8 +1103,8 @@ void parse_command_line(int argc, char **argv)
}
/* select the output fields */
- if (brief_output) {
- if (params.opt_completion)
+ if(brief_output) {
+ if(params.opt_completion)
dot = BRIEF_COMP_FIELDS;
else
dot = BRIEF_FIELDS;
@@ -1112,8 +1112,8 @@ void parse_command_line(int argc, char **argv)
xstrfmtcat(params.opt_field_list, "%s,", dot);
}
- if (long_output) {
- if (params.opt_completion)
+ if(long_output) {
+ if(params.opt_completion)
dot = LONG_COMP_FIELDS;
else
dot = LONG_FIELDS;
@@ -1124,7 +1124,7 @@ void parse_command_line(int argc, char **argv)
if (params.opt_field_list==NULL) {
if (params.opt_dump)
goto endopt;
- if (params.opt_completion)
+ if(params.opt_completion)
dot = DEFAULT_COMP_FIELDS;
else
dot = DEFAULT_FIELDS;
@@ -1141,10 +1141,10 @@ void parse_command_line(int argc, char **argv)
*end = 0;
while (isspace(*start))
start++; /* discard whitespace */
- if (!(int)*start)
+ if(!(int)*start)
continue;
- if ((tmp_char = strstr(start, "\%"))) {
+ if((tmp_char = strstr(start, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -1158,7 +1158,7 @@ void parse_command_line(int argc, char **argv)
error("Invalid field requested: \"%s\"", start);
exit(1);
foundfield:
- if (newlen)
+ if(newlen)
fields[i].len = newlen;
list_append(print_fields_list, &fields[i]);
start = end + 1;
@@ -1199,10 +1199,10 @@ void do_dump(void)
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
- if (job->stats.cpu_min == NO_VAL)
+ if(job->stats.cpu_min == NO_VAL)
job->stats.cpu_min = 0;
- if (list_count(job->steps)) {
+ if(list_count(job->steps)) {
job->stats.cpu_ave /= list_count(job->steps);
job->stats.rss_ave /= list_count(job->steps);
job->stats.vsize_ave /= list_count(job->steps);
@@ -1251,7 +1251,7 @@ void do_dump(void)
(int)job->submit,
job->blockid, /* block id */
"-"); /* reserved 1 */
- if (step->end == 0)
+ if(step->end == 0)
step->end = job->end;
gmtime_r(&step->end, &ts);
@@ -1371,7 +1371,7 @@ void do_dump_completion(void)
job->gid_name, job->node_cnt, job->nodelist,
job->jobname, job->state,
job->timelimit);
- if (job->blockid)
+ if(job->blockid)
printf(" %s %s %s %s %u %s %s",
job->blockid, job->connection, job->reboot,
job->rotate, job->max_procs, job->geo,
@@ -1414,15 +1414,15 @@ void do_list(void)
slurmdb_job_rec_t *job = NULL;
slurmdb_step_rec_t *step = NULL;
- if (!jobs)
+ if(!jobs)
return;
itr = list_iterator_create(jobs);
while((job = list_next(itr))) {
- if (job->stats.cpu_min == NO_VAL)
+ if(job->stats.cpu_min == NO_VAL)
job->stats.cpu_min = 0;
- if (list_count(job->steps)) {
+ if(list_count(job->steps)) {
int cnt = list_count(job->steps);
job->stats.cpu_ave /= (double)cnt;
job->stats.rss_ave /= (double)cnt;
@@ -1437,7 +1437,7 @@ void do_list(void)
&& (job->track_steps || !job->show_full)) {
itr_step = list_iterator_create(job->steps);
while((step = list_next(itr_step))) {
- if (step->end == 0)
+ if(step->end == 0)
step->end = job->end;
print_fields(JOBSTEP, step);
}
@@ -1460,7 +1460,7 @@ void do_list_completion(void)
ListIterator itr = NULL;
jobcomp_job_rec_t *job = NULL;
- if (!jobs)
+ if(!jobs)
return;
itr = list_iterator_create(jobs);
@@ -1479,16 +1479,16 @@ void sacct_init()
void sacct_fini()
{
- if (print_fields_itr)
+ if(print_fields_itr)
list_iterator_destroy(print_fields_itr);
- if (print_fields_list)
+ if(print_fields_list)
list_destroy(print_fields_list);
- if (jobs)
+ if(jobs)
list_destroy(jobs);
- if (g_qos_list)
+ if(g_qos_list)
list_destroy(g_qos_list);
- if (params.opt_completion)
+ if(params.opt_completion)
g_slurm_jobcomp_fini();
else {
slurmdb_connection_close(&acct_db_conn);
diff --git a/src/sacct/print.c b/src/sacct/print.c
index d7ecaf3626df84eadc9f64431d9bb4bef99630c0..7d20546a28aeb2c24016d8bb696197b1088efa47 100644
--- a/src/sacct/print.c
+++ b/src/sacct/print.c
@@ -50,7 +50,7 @@ char *_elapsed_time(long secs, long usecs)
long subsec = 0;
char *str = NULL;
- if (secs < 0 || secs == (long)NO_VAL)
+ if(secs < 0 || secs == (long)NO_VAL)
return NULL;
@@ -58,7 +58,7 @@ char *_elapsed_time(long secs, long usecs)
secs++;
usecs -= 1E6;
}
- if (usecs > 0) {
+ if(usecs > 0) {
/* give me 3 significant digits to tack onto the sec */
subsec = (usecs/1000);
}
@@ -73,7 +73,7 @@ char *_elapsed_time(long secs, long usecs)
else if (hours)
str = xstrdup_printf("%2.2ld:%2.2ld:%2.2ld",
hours, minutes, seconds);
- else if (subsec)
+ else if(subsec)
str = xstrdup_printf("%2.2ld:%2.2ld.%3.3ld",
minutes, seconds, subsec);
else
@@ -88,17 +88,17 @@ static char *_find_qos_name_from_list(
ListIterator itr = NULL;
slurmdb_qos_rec_t *qos = NULL;
- if (!qos_list || qosid == NO_VAL)
+ if(!qos_list || qosid == NO_VAL)
return NULL;
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
- if (qosid == qos->id)
+ if(qosid == qos->id)
break;
}
list_iterator_destroy(itr);
- if (qos)
+ if(qos)
return qos->name;
else
return "Unknown";
@@ -120,13 +120,13 @@ void print_fields(type_t type, void *object)
switch(type) {
case JOB:
step = NULL;
- if (!job->track_steps)
+ if(!job->track_steps)
step = (slurmdb_step_rec_t *)job->first_step_ptr;
/* set this to avoid printing out info for things that
don't mean anything. Like an allocation that never
ran anything.
*/
- if (!step)
+ if(!step)
job->track_steps = 1;
break;
@@ -147,7 +147,7 @@ void print_fields(type_t type, void *object)
case JOB:
tmp_int = job->alloc_cpus;
// we want to use the step info
- if (!step)
+ if(!step)
break;
case JOBSTEP:
tmp_int = step->ncpus;
@@ -198,7 +198,7 @@ void print_fields(type_t type, void *object)
case PRINT_AVECPU:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_dub = job->stats.cpu_ave;
break;
case JOBSTEP:
@@ -208,7 +208,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
- if (tmp_dub != (double)NO_VAL)
+ if(tmp_dub != (double)NO_VAL)
tmp_char = _elapsed_time((long)tmp_dub, 0);
field->print_routine(field,
@@ -219,7 +219,7 @@ void print_fields(type_t type, void *object)
case PRINT_AVEPAGES:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_dub = job->stats.pages_ave;
break;
case JOBSTEP:
@@ -229,7 +229,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
- if (tmp_dub != (double)NO_VAL)
+ if(tmp_dub != (double)NO_VAL)
convert_num_unit((float)tmp_dub,
outbuf, sizeof(outbuf),
UNIT_KILO);
@@ -241,7 +241,7 @@ void print_fields(type_t type, void *object)
case PRINT_AVERSS:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_dub = job->stats.rss_ave;
break;
case JOBSTEP:
@@ -251,7 +251,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
- if (tmp_dub != (double)NO_VAL)
+ if(tmp_dub != (double)NO_VAL)
convert_num_unit((float)tmp_dub,
outbuf, sizeof(outbuf),
UNIT_KILO);
@@ -263,7 +263,7 @@ void print_fields(type_t type, void *object)
case PRINT_AVEVSIZE:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_dub = job->stats.vsize_ave;
break;
case JOBSTEP:
@@ -273,7 +273,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
- if (tmp_dub != (double)NO_VAL)
+ if(tmp_dub != (double)NO_VAL)
convert_num_unit((float)tmp_dub,
outbuf, sizeof(outbuf),
UNIT_KILO);
@@ -517,7 +517,7 @@ void print_fields(type_t type, void *object)
case JOB:
/* below really should be step. It is
not a typo */
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_char = slurm_step_layout_type_name(
step->task_dist);
break;
@@ -538,7 +538,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXPAGES:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_int = job->stats.pages_max;
break;
case JOBSTEP:
@@ -548,7 +548,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
- if (tmp_int != NO_VAL)
+ if(tmp_int != NO_VAL)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
@@ -560,7 +560,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXPAGESNODE:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_char = find_hostname(
job->stats.pages_max_nodeid,
job->nodes);
@@ -583,7 +583,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXPAGESTASK:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_int =
job->stats.pages_max_taskid;
break;
@@ -602,7 +602,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXRSS:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_int = job->stats.rss_max;
break;
case JOBSTEP:
@@ -612,7 +612,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
- if (tmp_int != NO_VAL)
+ if(tmp_int != NO_VAL)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
@@ -624,7 +624,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXRSSNODE:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_char = find_hostname(
job->stats.rss_max_nodeid,
job->nodes);
@@ -647,7 +647,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXRSSTASK:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_int = job->stats.rss_max_taskid;
break;
case JOBSTEP:
@@ -665,7 +665,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXVSIZE:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_int = job->stats.vsize_max;
break;
case JOBSTEP:
@@ -676,7 +676,7 @@ void print_fields(type_t type, void *object)
tmp_int = NO_VAL;
break;
}
- if (tmp_int != NO_VAL)
+ if(tmp_int != NO_VAL)
convert_num_unit((float)tmp_int,
outbuf, sizeof(outbuf),
UNIT_KILO);
@@ -688,7 +688,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXVSIZENODE:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_char = find_hostname(
job->stats.vsize_max_nodeid,
job->nodes);
@@ -711,7 +711,7 @@ void print_fields(type_t type, void *object)
case PRINT_MAXVSIZETASK:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_int =
job->stats.vsize_max_taskid;
break;
@@ -730,7 +730,7 @@ void print_fields(type_t type, void *object)
case PRINT_MINCPU:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_dub = job->stats.cpu_min;
break;
case JOBSTEP:
@@ -740,7 +740,7 @@ void print_fields(type_t type, void *object)
default:
break;
}
- if (tmp_dub != (double)NO_VAL)
+ if(tmp_dub != (double)NO_VAL)
tmp_char = _elapsed_time((long)tmp_dub, 0);
field->print_routine(field,
tmp_char,
@@ -750,7 +750,7 @@ void print_fields(type_t type, void *object)
case PRINT_MINCPUNODE:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_char = find_hostname(
job->stats.cpu_min_nodeid,
job->nodes);
@@ -773,7 +773,7 @@ void print_fields(type_t type, void *object)
case PRINT_MINCPUTASK:
switch(type) {
case JOB:
- if (!job->track_steps)
+ if(!job->track_steps)
tmp_int = job->stats.cpu_min_taskid;
break;
case JOBSTEP:
@@ -824,7 +824,7 @@ void print_fields(type_t type, void *object)
break;
}
- if (!tmp_int) {
+ if(!tmp_int) {
hostlist_t hl = hostlist_create(tmp_char);
tmp_int = hostlist_count(hl);
hostlist_destroy(hl);
@@ -838,10 +838,10 @@ void print_fields(type_t type, void *object)
case PRINT_NTASKS:
switch(type) {
case JOB:
- if (!job->track_steps && !step)
+ if(!job->track_steps && !step)
tmp_int = job->alloc_cpus;
// we want to use the step info
- if (!step)
+ if(!step)
break;
case JOBSTEP:
tmp_int = step->ntasks;
@@ -908,7 +908,7 @@ void print_fields(type_t type, void *object)
break;
}
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = slurmdb_qos_get(
acct_db_conn, NULL);
@@ -959,7 +959,7 @@ void print_fields(type_t type, void *object)
case PRINT_RESV:
switch(type) {
case JOB:
- if (job->start)
+ if(job->start)
tmp_int = job->start - job->eligible;
else
tmp_int = time(NULL) - job->eligible;
@@ -980,7 +980,7 @@ void print_fields(type_t type, void *object)
case PRINT_RESV_CPU:
switch(type) {
case JOB:
- if (job->start)
+ if(job->start)
tmp_int = (job->start - job->eligible)
* job->req_cpus;
else
@@ -1003,7 +1003,7 @@ void print_fields(type_t type, void *object)
case PRINT_RESV_CPU_RAW:
switch(type) {
case JOB:
- if (job->start)
+ if(job->start)
tmp_int = (job->start - job->eligible)
* job->req_cpus;
else
@@ -1066,11 +1066,11 @@ void print_fields(type_t type, void *object)
"%s by %d",
job_state_string(tmp_int),
tmp_int2);
- else if (tmp_int != NO_VAL)
+ else if(tmp_int != NO_VAL)
snprintf(outbuf, FORMAT_STRING_SIZE,
"%s",
job_state_string(tmp_int));
- else if (tmp_char)
+ else if(tmp_char)
snprintf(outbuf, FORMAT_STRING_SIZE,
"%s",
tmp_char);
@@ -1148,7 +1148,7 @@ void print_fields(type_t type, void *object)
tmp_char = "UNLIMITED";
else if (job->timelimit == NO_VAL)
tmp_char = "Partition_Limit";
- else if (job->timelimit) {
+ else if(job->timelimit) {
char tmp1[128];
mins2time_str(job->timelimit,
tmp1, sizeof(tmp1));
@@ -1195,7 +1195,7 @@ void print_fields(type_t type, void *object)
case PRINT_UID:
switch(type) {
case JOB:
- if (job->user) {
+ if(job->user) {
if ((pw=getpwnam(job->user)))
tmp_int = pw->pw_uid;
} else
@@ -1218,9 +1218,9 @@ void print_fields(type_t type, void *object)
case PRINT_USER:
switch(type) {
case JOB:
- if (job->user)
+ if(job->user)
tmp_char = job->user;
- else if (job->uid != -1) {
+ else if(job->uid != -1) {
if ((pw=getpwuid(job->uid)))
tmp_char = pw->pw_name;
}
diff --git a/src/sacct/process.c b/src/sacct/process.c
index fe9b6f5ece3fb81580e15d47f622296bccc5e39e..f81d28edefaf8bf999dbe54faccf3ac071202070 100644
--- a/src/sacct/process.c
+++ b/src/sacct/process.c
@@ -46,12 +46,12 @@ char *find_hostname(uint32_t pos, char *hosts)
hostlist_t hostlist = NULL;
char *temp = NULL, *host = NULL;
- if (!hosts || (pos == (uint32_t)NO_VAL))
+ if(!hosts || (pos == (uint32_t)NO_VAL))
return NULL;
hostlist = hostlist_create(hosts);
temp = hostlist_nth(hostlist, pos);
- if (temp) {
+ if(temp) {
host = xstrdup(temp);
free(temp);
}
@@ -61,28 +61,28 @@ char *find_hostname(uint32_t pos, char *hosts)
void aggregate_stats(slurmdb_stats_t *dest, slurmdb_stats_t *from)
{
- if (dest->vsize_max < from->vsize_max) {
+ if(dest->vsize_max < from->vsize_max) {
dest->vsize_max = from->vsize_max;
dest->vsize_max_nodeid = from->vsize_max_nodeid;
dest->vsize_max_taskid = from->vsize_max_taskid;
}
dest->vsize_ave += from->vsize_ave;
- if (dest->rss_max < from->rss_max) {
+ if(dest->rss_max < from->rss_max) {
dest->rss_max = from->rss_max;
dest->rss_max_nodeid = from->rss_max_nodeid;
dest->rss_max_taskid = from->rss_max_taskid;
}
dest->rss_ave += from->rss_ave;
- if (dest->pages_max < from->pages_max) {
+ if(dest->pages_max < from->pages_max) {
dest->pages_max = from->pages_max;
dest->pages_max_nodeid = from->pages_max_nodeid;
dest->pages_max_taskid = from->pages_max_taskid;
}
dest->pages_ave += from->pages_ave;
- if ((dest->cpu_min > from->cpu_min)
+ if((dest->cpu_min > from->cpu_min)
|| (dest->cpu_min == NO_VAL)) {
dest->cpu_min = from->cpu_min;
dest->cpu_min_nodeid = from->cpu_min_nodeid;
diff --git a/src/sacct/sacct.c b/src/sacct/sacct.c
index d2450c329f62fc0a3bf452cf6fbc91f1d4d47fae..d234e0d9feccab8eb75470c6f0e3ef91cc2d5e9b 100644
--- a/src/sacct/sacct.c
+++ b/src/sacct/sacct.c
@@ -134,22 +134,22 @@ int main(int argc, char **argv)
switch (op) {
case SACCT_DUMP:
- if (get_data() == SLURM_ERROR)
+ if(get_data() == SLURM_ERROR)
exit(errno);
- if (params.opt_completion)
+ if(params.opt_completion)
do_dump_completion();
else
do_dump();
break;
case SACCT_FDUMP:
- if (get_data() == SLURM_ERROR)
+ if(get_data() == SLURM_ERROR)
exit(errno);
break;
case SACCT_LIST:
print_fields_header(print_fields_list);
- if (get_data() == SLURM_ERROR)
+ if(get_data() == SLURM_ERROR)
exit(errno);
- if (params.opt_completion)
+ if(params.opt_completion)
do_list_completion();
else
do_list();
diff --git a/src/sacctmgr/account_functions.c b/src/sacctmgr/account_functions.c
index 67a2258feaff7da463566b28b25b0bdfac43f07c..d75c1920223db74d603b7c2cde1be4842f5a4150 100644
--- a/src/sacctmgr/account_functions.c
+++ b/src/sacctmgr/account_functions.c
@@ -51,13 +51,13 @@ static int _set_cond(int *start, int argc, char *argv[],
int command_len = 0;
int option = 0;
- if (!acct_cond) {
+ if(!acct_cond) {
exit_code=1;
fprintf(stderr, "No acct_cond given");
return -1;
}
- if (!acct_cond->assoc_cond) {
+ if(!acct_cond->assoc_cond) {
acct_cond->assoc_cond =
xmalloc(sizeof(slurmdb_association_cond_t));
}
@@ -66,11 +66,11 @@ static int _set_cond(int *start, int argc, char *argv[],
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
@@ -81,67 +81,67 @@ static int _set_cond(int *start, int argc, char *argv[],
break;
} else if (!end &&
!strncasecmp(argv[i], "WithAssoc",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
acct_cond->with_assocs = 1;
} else if (!end &&
!strncasecmp(argv[i], "WithCoordinators",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
acct_cond->with_coords = 1;
} else if (!end &&
!strncasecmp(argv[i], "WithDeleted",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
acct_cond->with_deleted = 1;
assoc_cond->with_deleted = 1;
} else if (!end &&
!strncasecmp(argv[i], "WithRawQOSLevel",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
assoc_cond->with_raw_qos = 1;
} else if (!end && !strncasecmp(argv[i], "WOPLimits",
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
assoc_cond->without_parent_limits = 1;
- } else if (!end && !strncasecmp(argv[i], "where",
- MAX(command_len, 5))) {
+ } else if(!end && !strncasecmp(argv[i], "where",
+ MAX(command_len, 5))) {
continue;
- } else if (!end
- || !strncasecmp(argv[i], "Names",
+ } else if(!end
+ || !strncasecmp(argv[i], "Names",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Accounts",
+ || !strncasecmp(argv[i], "Accounts",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Acct",
+ || !strncasecmp(argv[i], "Acct",
MAX(command_len, 4))) {
- if (!assoc_cond->acct_list) {
+ if(!assoc_cond->acct_list) {
assoc_cond->acct_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(
- assoc_cond->acct_list,
- argv[i]+end))
+ if(slurm_addto_char_list(
+ assoc_cond->acct_list,
+ argv[i]+end))
u_set = 1;
} else if (!strncasecmp(argv[i], "Descriptions",
- MAX(command_len, 1))) {
- if (!acct_cond->description_list) {
+ MAX(command_len, 1))) {
+ if(!acct_cond->description_list) {
acct_cond->description_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(acct_cond->description_list,
- argv[i]+end))
+ if(slurm_addto_char_list(acct_cond->description_list,
+ argv[i]+end))
u_set = 1;
} else if (!strncasecmp(argv[i], "Format",
- MAX(command_len, 1))) {
- if (format_list)
+ MAX(command_len, 1))) {
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
} else if (!strncasecmp(argv[i], "Organizations",
- MAX(command_len, 1))) {
- if (!acct_cond->organization_list) {
+ MAX(command_len, 1))) {
+ if(!acct_cond->organization_list) {
acct_cond->organization_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(acct_cond->organization_list,
- argv[i]+end))
+ if(slurm_addto_char_list(acct_cond->organization_list,
+ argv[i]+end))
u_set = 1;
- } else if (!(a_set = sacctmgr_set_association_cond(
- assoc_cond, argv[i], argv[i]+end,
- command_len))) {
+ } else if(!(a_set = sacctmgr_set_association_cond(
+ assoc_cond, argv[i], argv[i]+end,
+ command_len))) {
exit_code=1;
fprintf(stderr, " Unknown condition: %s\n"
" Use keyword 'set' to modify value\n",
@@ -151,11 +151,11 @@ static int _set_cond(int *start, int argc, char *argv[],
(*start) = i;
- if (u_set && a_set)
+ if(u_set && a_set)
return 3;
- else if (a_set)
+ else if(a_set)
return 2;
- else if (u_set)
+ else if(u_set)
return 1;
return 0;
@@ -176,11 +176,11 @@ static int _set_rec(int *start, int argc, char *argv[],
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
@@ -189,17 +189,17 @@ static int _set_rec(int *start, int argc, char *argv[],
if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))) {
i--;
break;
- } else if (!end && !strncasecmp(argv[i], "set",
- MAX(command_len, 3))) {
+ } else if(!end && !strncasecmp(argv[i], "set",
+ MAX(command_len, 3))) {
continue;
- } else if (!end
- || !strncasecmp(argv[i], "Account",
+ } else if(!end
+ || !strncasecmp(argv[i], "Account",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Names",
+ || !strncasecmp(argv[i], "Names",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Acct",
+ || !strncasecmp(argv[i], "Acct",
MAX(command_len, 4))) {
- if (acct_list)
+ if(acct_list)
slurm_addto_char_list(acct_list, argv[i]+end);
else {
exit_code=1;
@@ -208,8 +208,8 @@ static int _set_rec(int *start, int argc, char *argv[],
"of an account\n");
}
} else if (!strncasecmp(argv[i], "Cluster",
- MAX(command_len, 1))) {
- if (cluster_list)
+ MAX(command_len, 1))) {
+ if(cluster_list)
slurm_addto_char_list(cluster_list,
argv[i]+end);
else {
@@ -219,17 +219,17 @@ static int _set_rec(int *start, int argc, char *argv[],
"of an account\n");
}
} else if (!strncasecmp(argv[i], "Description",
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
acct->description = strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
} else if (!strncasecmp(argv[i], "Organization",
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
acct->organization = strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
- } else if (!assoc ||
- (assoc && !(a_set = sacctmgr_set_association_rec(
- assoc, argv[i], argv[i]+end,
- command_len, option)))) {
+ } else if(!assoc ||
+ (assoc && !(a_set = sacctmgr_set_association_rec(
+ assoc, argv[i], argv[i]+end,
+ command_len, option)))) {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n"
" Use keyword 'where' to modify condition\n",
@@ -239,11 +239,11 @@ static int _set_rec(int *start, int argc, char *argv[],
(*start) = i;
- if (u_set && a_set)
+ if(u_set && a_set)
return 3;
- else if (a_set)
+ else if(a_set)
return 2;
- else if (u_set)
+ else if(u_set)
return 1;
return 0;
@@ -255,14 +255,14 @@ static int _isdefault(List acct_list)
slurmdb_user_cond_t user_cond;
List ret_list = NULL;
- if (!acct_list || !list_count(acct_list))
+ if(!acct_list || !list_count(acct_list))
return rc;
memset(&user_cond, 0, sizeof(slurmdb_user_cond_t));
user_cond.def_acct_list = acct_list;
ret_list = acct_storage_g_get_users(db_conn, my_uid, &user_cond);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
ListIterator itr = list_iterator_create(ret_list);
slurmdb_user_rec_t *user = NULL;
fprintf(stderr," Users listed below have these "
@@ -275,7 +275,7 @@ static int _isdefault(List acct_list)
rc = 1;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
return rc;
@@ -315,10 +315,10 @@ extern int sacctmgr_add_account(int argc, char *argv[])
limit_set += _set_rec(&i, argc, argv, name_list, cluster_list,
start_acct, start_assoc);
}
- if (exit_code)
+ if(exit_code)
return SLURM_ERROR;
- if (!name_list || !list_count(name_list)) {
+ if(!name_list || !list_count(name_list)) {
list_destroy(name_list);
list_destroy(cluster_list);
slurmdb_destroy_association_rec(start_assoc);
@@ -338,7 +338,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
db_conn, my_uid, &account_cond);
}
- if (!local_account_list) {
+ if(!local_account_list) {
exit_code=1;
fprintf(stderr, " Problem getting accounts from database. "
"Contact your admin.\n");
@@ -349,14 +349,14 @@ extern int sacctmgr_add_account(int argc, char *argv[])
return SLURM_ERROR;
}
- if (!start_assoc->parent_acct)
+ if(!start_assoc->parent_acct)
start_assoc->parent_acct = xstrdup("root");
- if (!cluster_list || !list_count(cluster_list)) {
+ if(!cluster_list || !list_count(cluster_list)) {
slurmdb_cluster_rec_t *cluster_rec = NULL;
List tmp_list =
acct_storage_g_get_clusters(db_conn, my_uid, NULL);
- if (!tmp_list) {
+ if(!tmp_list) {
exit_code=1;
fprintf(stderr,
" Problem getting clusters from database. "
@@ -369,7 +369,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
return SLURM_ERROR;
}
- if (!list_count(tmp_list)) {
+ if(!list_count(tmp_list)) {
exit_code=1;
fprintf(stderr,
" Can't add accounts, no cluster "
@@ -382,7 +382,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
list_destroy(local_account_list);
return SLURM_ERROR;
}
- if (!cluster_list)
+ if(!cluster_list)
list_create(slurm_destroy_char);
else
list_flush(cluster_list);
@@ -410,10 +410,10 @@ extern int sacctmgr_add_account(int argc, char *argv[])
list_iterator_reset(itr);
while((cluster_rec = list_next(itr))) {
- if (!strcasecmp(cluster_rec->name, cluster))
+ if(!strcasecmp(cluster_rec->name, cluster))
break;
}
- if (!cluster_rec) {
+ if(!cluster_rec) {
exit_code=1;
fprintf(stderr, " This cluster '%s' "
"doesn't exist.\n"
@@ -427,7 +427,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
list_iterator_destroy(itr_c);
list_destroy(temp_list);
- if (!list_count(cluster_list)) {
+ if(!list_count(cluster_list)) {
slurmdb_destroy_association_rec(start_assoc);
slurmdb_destroy_account_rec(start_acct);
list_destroy(local_account_list);
@@ -452,7 +452,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
local_assoc_list = acct_storage_g_get_associations(
db_conn, my_uid, &assoc_cond);
list_destroy(assoc_cond.acct_list);
- if (!local_assoc_list) {
+ if(!local_assoc_list) {
exit_code=1;
fprintf(stderr, " Problem getting associations from database. "
"Contact your admin.\n");
@@ -466,7 +466,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
itr = list_iterator_create(name_list);
while((name = list_next(itr))) {
- if (!name[0]) {
+ if(!name[0]) {
exit_code=1;
fprintf(stderr, " No blank names are "
"allowed when adding.\n");
@@ -475,21 +475,21 @@ extern int sacctmgr_add_account(int argc, char *argv[])
}
acct = NULL;
- if (!sacctmgr_find_account_from_list(local_account_list, name)) {
+ if(!sacctmgr_find_account_from_list(local_account_list, name)) {
acct = xmalloc(sizeof(slurmdb_account_rec_t));
acct->assoc_list =
list_create(slurmdb_destroy_association_rec);
acct->name = xstrdup(name);
- if (start_acct->description)
+ if(start_acct->description)
acct->description =
xstrdup(start_acct->description);
else
acct->description = xstrdup(name);
- if (start_acct->organization)
+ if(start_acct->organization)
acct->organization =
xstrdup(start_acct->organization);
- else if (strcmp(start_assoc->parent_acct, "root"))
+ else if(strcmp(start_assoc->parent_acct, "root"))
acct->organization =
xstrdup(start_assoc->parent_acct);
else
@@ -501,14 +501,14 @@ extern int sacctmgr_add_account(int argc, char *argv[])
itr_c = list_iterator_create(cluster_list);
while((cluster = list_next(itr_c))) {
- if (sacctmgr_find_account_base_assoc_from_list(
- local_assoc_list, name, cluster)) {
+ if(sacctmgr_find_account_base_assoc_from_list(
+ local_assoc_list, name, cluster)) {
//printf(" already have this assoc\n");
continue;
}
- if (!sacctmgr_find_account_base_assoc_from_list(
- local_assoc_list, start_assoc->parent_acct,
- cluster)) {
+ if(!sacctmgr_find_account_base_assoc_from_list(
+ local_assoc_list, start_assoc->parent_acct,
+ cluster)) {
exit_code=1;
fprintf(stderr, " Parent account '%s' "
"doesn't exist on "
@@ -542,7 +542,7 @@ extern int sacctmgr_add_account(int argc, char *argv[])
assoc->qos_list = copy_char_list(start_assoc->qos_list);
- if (acct)
+ if(acct)
list_append(acct->assoc_list, assoc);
else
list_append(assoc_list, assoc);
@@ -560,25 +560,25 @@ extern int sacctmgr_add_account(int argc, char *argv[])
list_destroy(local_assoc_list);
- if (!list_count(acct_list) && !list_count(assoc_list)) {
+ if(!list_count(acct_list) && !list_count(assoc_list)) {
printf(" Nothing new added.\n");
goto end_it;
- } else if (!assoc_str) {
+ } else if(!assoc_str) {
exit_code=1;
fprintf(stderr, " No associations created.\n");
goto end_it;
}
- if (acct_str) {
+ if(acct_str) {
printf(" Adding Account(s)\n%s", acct_str);
printf(" Settings\n");
- if (start_acct->description)
+ if(start_acct->description)
printf(" Description = %s\n",
start_acct->description);
else
printf(" Description = %s\n", "Account Name");
- if (start_acct->organization)
+ if(start_acct->organization)
printf(" Organization = %s\n",
start_acct->organization);
else
@@ -588,23 +588,23 @@ extern int sacctmgr_add_account(int argc, char *argv[])
xfree(acct_str);
}
- if (assoc_str) {
+ if(assoc_str) {
printf(" Associations\n%s", assoc_str);
xfree(assoc_str);
}
- if (limit_set) {
+ if(limit_set) {
printf(" Settings\n");
sacctmgr_print_assoc_limits(start_assoc);
}
notice_thread_init();
- if (list_count(acct_list))
+ if(list_count(acct_list))
rc = acct_storage_g_add_accounts(db_conn, my_uid, acct_list);
- if (rc == SLURM_SUCCESS) {
- if (list_count(assoc_list))
+ if(rc == SLURM_SUCCESS) {
+ if(list_count(assoc_list))
rc = acct_storage_g_add_associations(db_conn, my_uid,
assoc_list);
} else {
@@ -617,8 +617,8 @@ extern int sacctmgr_add_account(int argc, char *argv[])
}
notice_thread_fini();
- if (rc == SLURM_SUCCESS) {
- if (commit_check("Would you like to commit changes?")) {
+ if(rc == SLURM_SUCCESS) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
@@ -704,28 +704,28 @@ extern int sacctmgr_list_account(int argc, char *argv[])
cond_set = MAX(cond_set, prev_set);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_account_cond(acct_cond);
list_destroy(format_list);
return SLURM_ERROR;
- } else if (!list_count(format_list)) {
+ } else if(!list_count(format_list)) {
slurm_addto_char_list(format_list, "A,Des,O");
- if (acct_cond->with_assocs)
+ if(acct_cond->with_assocs)
slurm_addto_char_list(format_list,
"Cl,ParentN,U,Shares,GrpJ,GrpN,"
"GrpCPUs,GrpS,GrpWall,GrpCPUMins,"
"MaxJ,MaxN,MaxCPUs,MaxS,MaxW,"
"MaxCPUMins,QOS,DefaultQOS");
- if (acct_cond->with_coords)
+ if(acct_cond->with_coords)
slurm_addto_char_list(format_list, "Coord");
}
- if (!acct_cond->with_assocs && cond_set > 1) {
- if (!commit_check("You requested options that are only vaild "
- "when querying with the withassoc option.\n"
- "Are you sure you want to continue?")) {
+ if(!acct_cond->with_assocs && cond_set > 1) {
+ if(!commit_check("You requested options that are only vaild "
+ "when querying with the withassoc option.\n"
+ "Are you sure you want to continue?")) {
printf("Aborted\n");
list_destroy(format_list);
slurmdb_destroy_account_cond(acct_cond);
@@ -740,7 +740,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -748,157 +748,157 @@ extern int sacctmgr_list_account(int argc, char *argv[])
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Account", object, MAX(command_len, 1))
- || !strncasecmp("Acct", object, MAX(command_len, 4))
- || !strncasecmp("Name", object, MAX(command_len, 2))) {
+ if(!strncasecmp("Account", object, MAX(command_len, 1))
+ || !strncasecmp("Acct", object, MAX(command_len, 4))
+ || !strncasecmp("Name", object, MAX(command_len, 2))) {
field->type = PRINT_ACCOUNT;
field->name = xstrdup("Account");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Cluster", object,
+ MAX(command_len, 2))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Coordinators", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Coordinators", object,
+ MAX(command_len, 2))) {
field->type = PRINT_COORDS;
field->name = xstrdup("Coordinators");
field->len = 20;
field->print_routine = sacctmgr_print_coord_list;
- } else if (!strncasecmp("DefaultQOS", object,
- MAX(command_len, 3))) {
+ } else if(!strncasecmp("DefaultQOS", object,
+ MAX(command_len, 3))) {
field->type = PRINT_DQOS;
field->name = xstrdup("Def QOS");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Description", object,
- MAX(command_len, 3))) {
+ } else if(!strncasecmp("Description", object,
+ MAX(command_len, 3))) {
field->type = PRINT_DESC;
field->name = xstrdup("Descr");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("FairShare", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("FairShare", object,
+ MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpCPUMins", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPUMins", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPCM;
field->name = xstrdup("GrpCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("GrpCPUs", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPUs", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpNodes", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpNodes", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpWall", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpWall", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPW;
field->name = xstrdup("GrpWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("ID", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("ID", object, MAX(command_len, 1))) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxCPUMinsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUMinsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXCM;
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("MaxCPUsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxNodesPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxNodesPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxWallDurationPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxWallDurationPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("Organization", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("Organization", object,
+ MAX(command_len, 1))) {
field->type = PRINT_ORG;
field->name = xstrdup("Org");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("QOSRAWLevel", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("QOSRAWLevel", object,
+ MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
field->len = 10;
field->print_routine = print_fields_char_list;
- } else if (!strncasecmp("QOSLevel", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("QOSLevel", object,
+ MAX(command_len, 1))) {
field->type = PRINT_QOS;
field->name = xstrdup("QOS");
field->len = 20;
field->print_routine = sacctmgr_print_qos_list;
- } else if (!strncasecmp("ParentID", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("ParentID", object,
+ MAX(command_len, 7))) {
field->type = PRINT_PID;
field->name = xstrdup("Par ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("ParentName", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("ParentName", object,
+ MAX(command_len, 7))) {
field->type = PRINT_PNAME;
field->name = xstrdup("Par Name");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Shares", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("Shares", object,
+ MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("Shares");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("User", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("User", object, MAX(command_len, 1))) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 10;
@@ -910,7 +910,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -918,7 +918,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_account_cond(acct_cond);
list_destroy(print_fields_list);
return SLURM_ERROR;
@@ -927,7 +927,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
acct_list = acct_storage_g_get_accounts(db_conn, my_uid, acct_cond);
slurmdb_destroy_account_cond(acct_cond);
- if (!acct_list) {
+ if(!acct_list) {
exit_code=1;
fprintf(stderr, " Problem with query.\n");
list_destroy(print_fields_list);
@@ -941,7 +941,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field_count = list_count(print_fields_list);
while((acct = list_next(itr))) {
- if (acct->assoc_list) {
+ if(acct->assoc_list) {
ListIterator itr3 =
list_iterator_create(acct->assoc_list);
while((assoc = list_next(itr3))) {
@@ -968,7 +968,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field_count));
break;
case PRINT_DQOS:
- if (!g_qos_list) {
+ if(!g_qos_list) {
g_qos_list =
acct_storage_g_get_qos(
db_conn,
@@ -1097,7 +1097,7 @@ extern int sacctmgr_list_account(int argc, char *argv[])
field_count));
break;
case PRINT_QOS:
- if (!g_qos_list) {
+ if(!g_qos_list) {
g_qos_list =
acct_storage_g_get_qos(
db_conn,
@@ -1273,21 +1273,21 @@ extern int sacctmgr_modify_account(int argc, char *argv[])
}
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_account_cond(acct_cond);
slurmdb_destroy_account_rec(acct);
slurmdb_destroy_association_rec(assoc);
return SLURM_ERROR;
- } else if (!rec_set) {
+ } else if(!rec_set) {
exit_code=1;
fprintf(stderr, " You didn't give me anything to set\n");
slurmdb_destroy_account_cond(acct_cond);
slurmdb_destroy_account_rec(acct);
slurmdb_destroy_association_rec(assoc);
return SLURM_ERROR;
- } else if (!cond_set) {
- if (!commit_check("You didn't set any conditions with 'WHERE'.\n"
- "Are you sure you want to continue?")) {
+ } else if(!cond_set) {
+ if(!commit_check("You didn't set any conditions with 'WHERE'.\n"
+ "Are you sure you want to continue?")) {
printf("Aborted\n");
slurmdb_destroy_account_cond(acct_cond);
slurmdb_destroy_account_rec(acct);
@@ -1297,8 +1297,8 @@ extern int sacctmgr_modify_account(int argc, char *argv[])
}
notice_thread_init();
- if (rec_set == 3 || rec_set == 1) { // process the account changes
- if (cond_set == 2) {
+ if(rec_set == 3 || rec_set == 1) { // process the account changes
+ if(cond_set == 2) {
exit_code=1;
fprintf(stderr,
" There was a problem with your "
@@ -1308,7 +1308,7 @@ extern int sacctmgr_modify_account(int argc, char *argv[])
}
ret_list = acct_storage_g_modify_accounts(
db_conn, my_uid, acct_cond, acct);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Modified accounts...\n");
@@ -1317,7 +1317,7 @@ extern int sacctmgr_modify_account(int argc, char *argv[])
}
list_iterator_destroy(itr);
set = 1;
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing modified\n");
rc = SLURM_ERROR;
} else {
@@ -1328,13 +1328,13 @@ extern int sacctmgr_modify_account(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
}
assoc_start:
- if (rec_set == 3 || rec_set == 2) { // process the association changes
- if (cond_set == 1 && !acct_cond->assoc_cond->acct_list) {
+ if(rec_set == 3 || rec_set == 2) { // process the association changes
+ if(cond_set == 1 && !acct_cond->assoc_cond->acct_list) {
rc = SLURM_ERROR;
exit_code=1;
fprintf(stderr,
@@ -1343,10 +1343,10 @@ assoc_start:
goto assoc_end;
}
- if (assoc->parent_acct) {
+ if(assoc->parent_acct) {
slurmdb_account_rec_t *acct_rec =
sacctmgr_find_account(assoc->parent_acct);
- if (!acct_rec) {
+ if(!acct_rec) {
exit_code=1;
fprintf(stderr,
" Parent Account %s doesn't exist.\n",
@@ -1359,7 +1359,7 @@ assoc_start:
ret_list = acct_storage_g_modify_associations(
db_conn, my_uid, acct_cond->assoc_cond, assoc);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Modified account associations...\n");
@@ -1368,7 +1368,7 @@ assoc_start:
}
list_iterator_destroy(itr);
set = 1;
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing modified\n");
} else {
exit_code=1;
@@ -1378,15 +1378,15 @@ assoc_start:
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
}
assoc_end:
notice_thread_fini();
- if (set) {
- if (commit_check("Would you like to commit changes?"))
+ if(set) {
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -1419,7 +1419,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
cond_set = MAX(cond_set, prev_set);
}
- if (!cond_set) {
+ if(!cond_set) {
exit_code=1;
fprintf(stderr,
" No conditions given to remove, not executing.\n");
@@ -1427,24 +1427,24 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
return SLURM_ERROR;
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_account_cond(acct_cond);
return SLURM_ERROR;
}
/* check to see if person is trying to remove root account. This is
* bad, and should not be allowed outside of deleting a cluster.
*/
- if (acct_cond->assoc_cond
- && acct_cond->assoc_cond->acct_list
- && list_count(acct_cond->assoc_cond->acct_list)) {
+ if(acct_cond->assoc_cond
+ && acct_cond->assoc_cond->acct_list
+ && list_count(acct_cond->assoc_cond->acct_list)) {
char *tmp_char = NULL;
itr = list_iterator_create(acct_cond->assoc_cond->acct_list);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, "root"))
+ if(!strcasecmp(tmp_char, "root"))
break;
}
list_iterator_destroy(itr);
- if (tmp_char) {
+ if(tmp_char) {
exit_code=1;
fprintf(stderr, " You are not allowed to remove "
"the root account.\n"
@@ -1455,10 +1455,10 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
}
notice_thread_init();
- if (cond_set == 1) {
+ if(cond_set == 1) {
ret_list = acct_storage_g_remove_accounts(
db_conn, my_uid, acct_cond);
- } else if (cond_set == 2 || cond_set == 3) {
+ } else if(cond_set == 2 || cond_set == 3) {
ret_list = acct_storage_g_remove_associations(
db_conn, my_uid, acct_cond->assoc_cond);
}
@@ -1466,7 +1466,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
notice_thread_fini();
slurmdb_destroy_account_cond(acct_cond);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = NULL;
@@ -1474,7 +1474,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
* account of a user. _isdefault only works with the
* output from acct_storage_g_remove_accounts btw.
*/
- if ((cond_set == 1) && _isdefault(ret_list)) {
+ if((cond_set == 1) && _isdefault(ret_list)) {
exit_code=1;
fprintf(stderr, " Please either remove accounts listed "
"above from list and resubmit,\n"
@@ -1489,7 +1489,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
/* If there were jobs running with an association to
be deleted, don't.
*/
- if (rc == ESLURM_JOBS_RUNNING_ON_ASSOC) {
+ if(rc == ESLURM_JOBS_RUNNING_ON_ASSOC) {
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(rc));
while((object = list_next(itr))) {
@@ -1500,22 +1500,22 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
return rc;
}
- if (cond_set == 1) {
+ if(cond_set == 1) {
printf(" Deleting accounts...\n");
- } else if (cond_set == 2 || cond_set == 3) {
+ } else if(cond_set == 2 || cond_set == 3) {
printf(" Deleting account associations...\n");
}
while((object = list_next(itr))) {
printf(" %s\n", object);
}
list_iterator_destroy(itr);
- if (commit_check("Would you like to commit changes?")) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
acct_storage_g_commit(db_conn, 0);
}
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing deleted\n");
} else {
exit_code=1;
@@ -1525,7 +1525,7 @@ extern int sacctmgr_delete_account(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
return rc;
diff --git a/src/sacctmgr/archive_functions.c b/src/sacctmgr/archive_functions.c
index db2d57a09e06ca81f4552b07985e3a96907371bb..d102b061780b3b2b0e839a518e8658c4033d9887 100644
--- a/src/sacctmgr/archive_functions.c
+++ b/src/sacctmgr/archive_functions.c
@@ -52,13 +52,13 @@ extern int _addto_uid_char_list(List char_list, char *names)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -67,12 +67,12 @@ extern int _addto_uid_char_list(List char_list, char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
@@ -91,11 +91,11 @@ extern int _addto_uid_char_list(List char_list, char *names)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -104,7 +104,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
}
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -113,7 +113,7 @@ extern int _addto_uid_char_list(List char_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
@@ -130,11 +130,11 @@ extern int _addto_uid_char_list(List char_list, char *names)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -156,88 +156,88 @@ static int _set_cond(int *start, int argc, char *argv[],
uint32_t tmp;
slurmdb_job_cond_t *job_cond = NULL;
- if (!arch_cond) {
+ if(!arch_cond) {
error("No arch_cond given");
return -1;
}
- if (!arch_cond->job_cond)
+ if(!arch_cond->job_cond)
arch_cond->job_cond = xmalloc(sizeof(slurmdb_job_cond_t));
job_cond = arch_cond->job_cond;
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "where",
+ if(!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if (!end && !strncasecmp(argv[i], "events",
+ } else if(!end && !strncasecmp(argv[i], "events",
MAX(command_len, 1))) {
arch_cond->purge_step |= SLURMDB_PURGE_ARCHIVE;
set = 1;
- } else if (!end && !strncasecmp(argv[i], "jobs",
+ } else if(!end && !strncasecmp(argv[i], "jobs",
MAX(command_len, 1))) {
arch_cond->purge_job |= SLURMDB_PURGE_ARCHIVE;
set = 1;
- } else if (!end && !strncasecmp(argv[i], "steps",
+ } else if(!end && !strncasecmp(argv[i], "steps",
MAX(command_len, 1))) {
arch_cond->purge_step |= SLURMDB_PURGE_ARCHIVE;
set = 1;
- } else if (!end && !strncasecmp(argv[i], "suspend",
+ } else if(!end && !strncasecmp(argv[i], "suspend",
MAX(command_len, 1))) {
arch_cond->purge_suspend |= SLURMDB_PURGE_ARCHIVE;
set = 1;
- } else if (!end
- || !strncasecmp(argv[i], "Clusters",
+ } else if(!end
+ || !strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(job_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))) {
- if (!job_cond->acct_list)
+ if(!job_cond->acct_list)
job_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->acct_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Associations",
+ } else if (!strncasecmp (argv[i], "Associations",
MAX(command_len, 2))) {
- if (!job_cond->associd_list)
+ if(!job_cond->associd_list)
job_cond->associd_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->associd_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Directory",
+ } else if (!strncasecmp (argv[i], "Directory",
MAX(command_len, 2))) {
arch_cond->archive_dir =
strip_quotes(argv[i]+end, NULL, 0);
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
job_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Gid", MAX(command_len, 2))) {
- if (!job_cond->groupid_list)
+ } else if (!strncasecmp (argv[i], "Gid", MAX(command_len, 2))) {
+ if(!job_cond->groupid_list)
job_cond->groupid_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->groupid_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Jobs",
+ } else if (!strncasecmp (argv[i], "Jobs",
MAX(command_len, 1))) {
char *end_char = NULL, *start_char = argv[i]+end;
slurmdb_selected_step_t *selected_step = NULL;
char *dot = NULL;
- if (!job_cond->step_list)
+ if(!job_cond->step_list)
job_cond->step_list =
list_create(slurm_destroy_char);
@@ -246,7 +246,7 @@ static int _set_cond(int *start, int argc, char *argv[],
*end_char = 0;
while (isspace(*start_char))
start_char++; /* discard whitespace */
- if (!(int)*start_char)
+ if(!(int)*start_char)
continue;
selected_step = xmalloc(
sizeof(slurmdb_selected_step_t));
@@ -265,15 +265,15 @@ static int _set_cond(int *start, int argc, char *argv[],
}
set = 1;
- } else if (!strncasecmp(argv[i], "Partitions",
+ } else if (!strncasecmp (argv[i], "Partitions",
MAX(command_len, 2))) {
- if (!job_cond->partition_list)
+ if(!job_cond->partition_list)
job_cond->partition_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->partition_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "PurgeEventAfter",
+ } else if (!strncasecmp (argv[i], "PurgeEventAfter",
MAX(command_len, 10))) {
if ((tmp = slurmdb_parse_purge(argv[i]+end))
== NO_VAL) {
@@ -282,7 +282,7 @@ static int _set_cond(int *start, int argc, char *argv[],
arch_cond->purge_event |= tmp;
set = 1;
}
- } else if (!strncasecmp(argv[i], "PurgeJobAfter",
+ } else if (!strncasecmp (argv[i], "PurgeJobAfter",
MAX(command_len, 10))) {
if ((tmp = slurmdb_parse_purge(argv[i]+end))
== NO_VAL) {
@@ -291,7 +291,7 @@ static int _set_cond(int *start, int argc, char *argv[],
arch_cond->purge_job |= tmp;
set = 1;
}
- } else if (!strncasecmp(argv[i], "PurgeStepAfter",
+ } else if (!strncasecmp (argv[i], "PurgeStepAfter",
MAX(command_len, 10))) {
if ((tmp = slurmdb_parse_purge(argv[i]+end))
== NO_VAL) {
@@ -300,7 +300,7 @@ static int _set_cond(int *start, int argc, char *argv[],
arch_cond->purge_step |= tmp;
set = 1;
}
- } else if (!strncasecmp(argv[i], "PurgeSuspendAfter",
+ } else if (!strncasecmp (argv[i], "PurgeSuspendAfter",
MAX(command_len, 10))) {
if ((tmp = slurmdb_parse_purge(argv[i]+end))
== NO_VAL) {
@@ -309,7 +309,7 @@ static int _set_cond(int *start, int argc, char *argv[],
arch_cond->purge_suspend |= tmp;
set = 1;
}
- } else if (!strncasecmp(argv[i], "PurgeEventMonths",
+ } else if (!strncasecmp (argv[i], "PurgeEventMonths",
MAX(command_len, 6))) {
if (get_uint(argv[i]+end, &tmp, "PurgeEventMonths")
!= SLURM_SUCCESS) {
@@ -319,7 +319,7 @@ static int _set_cond(int *start, int argc, char *argv[],
arch_cond->purge_event |= SLURMDB_PURGE_MONTHS;
set = 1;
}
- } else if (!strncasecmp(argv[i], "PurgeJobMonths",
+ } else if (!strncasecmp (argv[i], "PurgeJobMonths",
MAX(command_len, 6))) {
if (get_uint(argv[i]+end, &tmp, "PurgeJobMonths")
!= SLURM_SUCCESS) {
@@ -329,7 +329,7 @@ static int _set_cond(int *start, int argc, char *argv[],
arch_cond->purge_job |= SLURMDB_PURGE_MONTHS;
set = 1;
}
- } else if (!strncasecmp(argv[i], "PurgeStepMonths",
+ } else if (!strncasecmp (argv[i], "PurgeStepMonths",
MAX(command_len, 7))) {
if (get_uint(argv[i]+end, &tmp, "PurgeStepMonths")
!= SLURM_SUCCESS) {
@@ -339,7 +339,7 @@ static int _set_cond(int *start, int argc, char *argv[],
arch_cond->purge_step |= SLURMDB_PURGE_MONTHS;
set = 1;
}
- } else if (!strncasecmp(argv[i], "PurgeSuspendMonths",
+ } else if (!strncasecmp (argv[i], "PurgeSuspendMonths",
MAX(command_len, 7))) {
if (get_uint(argv[i]+end, &tmp, "PurgeSuspendMonths")
!= SLURM_SUCCESS) {
@@ -350,18 +350,18 @@ static int _set_cond(int *start, int argc, char *argv[],
|= SLURMDB_PURGE_MONTHS;
set = 1;
}
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 2))) {
job_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Script",
+ } else if (!strncasecmp (argv[i], "Script",
MAX(command_len, 2))) {
arch_cond->archive_script =
strip_quotes(argv[i]+end, NULL, 0);
set = 1;
- } else if (!strncasecmp(argv[i], "Users",
+ } else if (!strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
- if (!job_cond->userid_list)
+ if(!job_cond->userid_list)
job_cond->userid_list =
list_create(slurm_destroy_char);
_addto_uid_char_list(job_cond->userid_list,
@@ -388,28 +388,28 @@ extern int sacctmgr_archive_dump(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
_set_cond(&i, argc, argv, arch_cond);
}
- if (!arch_cond->purge_event)
+ if(!arch_cond->purge_event)
arch_cond->purge_event = NO_VAL;
- if (!arch_cond->purge_job)
+ if(!arch_cond->purge_job)
arch_cond->purge_job = NO_VAL;
- if (!arch_cond->purge_step)
+ if(!arch_cond->purge_step)
arch_cond->purge_step = NO_VAL;
- if (!arch_cond->purge_suspend)
+ if(!arch_cond->purge_suspend)
arch_cond->purge_suspend = NO_VAL;
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_archive_cond(arch_cond);
return SLURM_ERROR;
}
if (arch_cond->archive_dir) {
- if (stat(arch_cond->archive_dir, &st) < 0) {
+ if(stat(arch_cond->archive_dir, &st) < 0) {
exit_code = errno;
fprintf(stderr, " dump: Failed to stat %s: %m\n "
"Note: For archive dump, "
@@ -437,7 +437,7 @@ extern int sacctmgr_archive_dump(int argc, char *argv[])
}
if (arch_cond->archive_script) {
- if (stat(arch_cond->archive_script, &st) < 0) {
+ if(stat(arch_cond->archive_script, &st) < 0) {
exit_code = errno;
fprintf(stderr, " dump: Failed to stat %s: %m\n "
"Note: For archive dump, the script must be on "
@@ -463,8 +463,8 @@ extern int sacctmgr_archive_dump(int argc, char *argv[])
}
rc = jobacct_storage_g_archive(db_conn, arch_cond);
- if (rc == SLURM_SUCCESS) {
- if (commit_check("Would you like to commit changes?")) {
+ if(rc == SLURM_SUCCESS) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
@@ -491,21 +491,21 @@ extern int sacctmgr_archive_load(int argc, char *argv[])
for (i=0; i<argc; i++) {
int end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end
- || !strncasecmp(argv[i], "File", MAX(command_len, 1))) {
+ if(!end
+ || !strncasecmp (argv[i], "File", MAX(command_len, 1))) {
arch_rec->archive_file =
strip_quotes(argv[i]+end, NULL, 0);
- } else if (!strncasecmp(argv[i], "Insert",
+ } else if (!strncasecmp (argv[i], "Insert",
MAX(command_len, 2))) {
arch_rec->insert = strip_quotes(argv[i]+end, NULL, 1);
} else {
@@ -514,7 +514,7 @@ extern int sacctmgr_archive_load(int argc, char *argv[])
}
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_archive_rec(arch_rec);
return SLURM_ERROR;
}
@@ -533,7 +533,7 @@ extern int sacctmgr_archive_load(int argc, char *argv[])
arch_rec->archive_file = fullpath;
}
- if (stat(arch_rec->archive_file, &st) < 0) {
+ if(stat(arch_rec->archive_file, &st) < 0) {
exit_code = errno;
fprintf(stderr, " load: Failed to stat %s: %m\n "
"Note: For archive load, the file must be on "
@@ -544,8 +544,8 @@ extern int sacctmgr_archive_load(int argc, char *argv[])
}
rc = jobacct_storage_g_archive_load(db_conn, arch_rec);
- if (rc == SLURM_SUCCESS) {
- if (commit_check("Would you like to commit changes?")) {
+ if(rc == SLURM_SUCCESS) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
diff --git a/src/sacctmgr/association_functions.c b/src/sacctmgr/association_functions.c
index 1f1f7679dae90b00b95c0354176dd3fbb61c811d..de84259cc546fb9dcfa105f02aed838f472fcf0a 100644
--- a/src/sacctmgr/association_functions.c
+++ b/src/sacctmgr/association_functions.c
@@ -60,35 +60,35 @@ static int _set_cond(int *start, int argc, char *argv[],
}
}
- if (!end && !strncasecmp(argv[i], "Tree",
+ if (!end && !strncasecmp (argv[i], "Tree",
MAX(command_len, 4))) {
tree_display = 1;
- } else if (!end && !strncasecmp(argv[i], "WithDeleted",
+ } else if (!end && !strncasecmp (argv[i], "WithDeleted",
MAX(command_len, 5))) {
assoc_cond->with_deleted = 1;
} else if (!end &&
- !strncasecmp(argv[i], "WithRawQOSLevel",
+ !strncasecmp (argv[i], "WithRawQOSLevel",
MAX(command_len, 5))) {
assoc_cond->with_raw_qos = 1;
} else if (!end &&
- !strncasecmp(argv[i], "WithSubAccounts",
+ !strncasecmp (argv[i], "WithSubAccounts",
MAX(command_len, 5))) {
assoc_cond->with_sub_accts = 1;
- } else if (!end && !strncasecmp(argv[i], "WOPInfo",
+ } else if (!end && !strncasecmp (argv[i], "WOPInfo",
MAX(command_len, 4))) {
assoc_cond->without_parent_info = 1;
- } else if (!end && !strncasecmp(argv[i], "WOPLimits",
+ } else if (!end && !strncasecmp (argv[i], "WOPLimits",
MAX(command_len, 4))) {
assoc_cond->without_parent_limits = 1;
- } else if (!end && !strncasecmp(argv[i], "WOLimits",
+ } else if (!end && !strncasecmp (argv[i], "WOLimits",
MAX(command_len, 3))) {
assoc_cond->without_parent_limits = 1;
} else if (!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if (!end || !strncasecmp(argv[i], "Ids",
+ } else if (!end || !strncasecmp (argv[i], "Ids",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Associations",
+ || !strncasecmp (argv[i], "Associations",
MAX(command_len, 2))) {
ListIterator itr = NULL;
char *temp = NULL;
@@ -110,12 +110,12 @@ static int _set_cond(int *start, int argc, char *argv[],
}
list_iterator_destroy(itr);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
if (format_list)
slurm_addto_char_list(format_list,
argv[i]+end);
- } else if (!(set = sacctmgr_set_association_cond(
+ } else if(!(set = sacctmgr_set_association_cond(
assoc_cond, argv[i], argv[i]+end,
command_len)) || exit_code) {
exit_code = 1;
@@ -137,8 +137,8 @@ extern int sacctmgr_set_association_cond(slurmdb_association_cond_t *assoc_cond,
xassert(assoc_cond);
xassert(type);
- if (!strncasecmp(type, "Account", MAX(command_len, 2))
- || !strncasecmp(type, "Acct", MAX(command_len, 4))) {
+ if (!strncasecmp (type, "Account", MAX(command_len, 2))
+ || !strncasecmp (type, "Acct", MAX(command_len, 4))) {
if (!assoc_cond->acct_list)
assoc_cond->acct_list = list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->acct_list, value))
@@ -162,13 +162,13 @@ extern int sacctmgr_set_association_cond(slurmdb_association_cond_t *assoc_cond,
}
list_iterator_destroy(itr);
set = 1;
- } else if (!strncasecmp(type, "Clusters", MAX(command_len, 1))) {
+ } else if (!strncasecmp (type, "Clusters", MAX(command_len, 1))) {
if (!assoc_cond->cluster_list)
assoc_cond->cluster_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->cluster_list, value))
set = 1;
- } else if (!strncasecmp(type, "DefaultQOS", MAX(command_len, 8))) {
+ } else if (!strncasecmp (type, "DefaultQOS", MAX(command_len, 8))) {
if (!assoc_cond->def_qos_id_list)
assoc_cond->def_qos_id_list =
list_create(slurm_destroy_char);
@@ -183,61 +183,61 @@ extern int sacctmgr_set_association_cond(slurmdb_association_cond_t *assoc_cond,
set = 1;
else
exit_code = 1;
- } else if (!strncasecmp(type, "FairShare", MAX(command_len, 1))
- || !strncasecmp(type, "Shares", MAX(command_len, 1))) {
+ } else if (!strncasecmp (type, "FairShare", MAX(command_len, 1))
+ || !strncasecmp (type, "Shares", MAX(command_len, 1))) {
if (!assoc_cond->fairshare_list)
assoc_cond->fairshare_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->fairshare_list, value))
set = 1;
- } else if (!strncasecmp(type, "GrpCPUMins", MAX(command_len, 7))) {
+ } else if (!strncasecmp (type, "GrpCPUMins", MAX(command_len, 7))) {
if (!assoc_cond->grp_cpu_mins_list)
assoc_cond->grp_cpu_mins_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->grp_cpu_mins_list, value))
set = 1;
- } else if (!strncasecmp(type, "GrpCPURunMins", MAX(command_len, 7))) {
+ } else if (!strncasecmp (type, "GrpCPURunMins", MAX(command_len, 7))) {
if (!assoc_cond->grp_cpu_run_mins_list)
assoc_cond->grp_cpu_run_mins_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->grp_cpu_run_mins_list,
value))
set = 1;
- } else if (!strncasecmp(type, "GrpCpus", MAX(command_len, 7))) {
+ } else if (!strncasecmp (type, "GrpCpus", MAX(command_len, 7))) {
if (!assoc_cond->grp_cpus_list)
assoc_cond->grp_cpus_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->grp_cpus_list,
value))
set = 1;
- } else if (!strncasecmp(type, "GrpJobs", MAX(command_len, 4))) {
+ } else if (!strncasecmp (type, "GrpJobs", MAX(command_len, 4))) {
if (!assoc_cond->grp_jobs_list)
assoc_cond->grp_jobs_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->grp_jobs_list,
value))
set = 1;
- } else if (!strncasecmp(type, "GrpNodes", MAX(command_len, 4))) {
+ } else if (!strncasecmp (type, "GrpNodes", MAX(command_len, 4))) {
if (!assoc_cond->grp_nodes_list)
assoc_cond->grp_nodes_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->grp_nodes_list,
value))
set = 1;
- } else if (!strncasecmp(type, "GrpSubmitJobs", MAX(command_len, 4))) {
+ } else if (!strncasecmp (type, "GrpSubmitJobs", MAX(command_len, 4))) {
if (!assoc_cond->grp_submit_jobs_list)
assoc_cond->grp_submit_jobs_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->grp_submit_jobs_list,
value))
set = 1;
- } else if (!strncasecmp(type, "GrpWall", MAX(command_len, 4))) {
+ } else if (!strncasecmp (type, "GrpWall", MAX(command_len, 4))) {
if (!assoc_cond->grp_wall_list)
assoc_cond->grp_wall_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->grp_wall_list, value))
set = 1;
- } else if (!strncasecmp(type, "MaxCPUMinsPerJob",
+ } else if (!strncasecmp (type, "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
if (!assoc_cond->max_cpu_mins_pj_list)
assoc_cond->max_cpu_mins_pj_list =
@@ -245,46 +245,46 @@ extern int sacctmgr_set_association_cond(slurmdb_association_cond_t *assoc_cond,
if (slurm_addto_char_list(assoc_cond->max_cpu_mins_pj_list,
value))
set = 1;
- } else if (!strncasecmp(type, "MaxCPURunMins", MAX(command_len, 7))) {
+ } else if (!strncasecmp (type, "MaxCPURunMins", MAX(command_len, 7))) {
if (!assoc_cond->max_cpu_run_mins_list)
assoc_cond->max_cpu_run_mins_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->max_cpu_run_mins_list,
value))
set = 1;
- } else if (!strncasecmp(type, "MaxCpusPerJob", MAX(command_len, 7))) {
+ } else if (!strncasecmp (type, "MaxCpusPerJob", MAX(command_len, 7))) {
if (!assoc_cond->max_cpus_pj_list)
assoc_cond->max_cpus_pj_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->max_cpus_pj_list, value))
set = 1;
- } else if (!strncasecmp(type, "MaxJobs", MAX(command_len, 4))) {
+ } else if (!strncasecmp (type, "MaxJobs", MAX(command_len, 4))) {
if (!assoc_cond->max_jobs_list)
assoc_cond->max_jobs_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->max_jobs_list, value))
set = 1;
- } else if (!strncasecmp(type, "MaxNodesPerJob", MAX(command_len, 4))) {
+ } else if (!strncasecmp (type, "MaxNodesPerJob", MAX(command_len, 4))) {
if (!assoc_cond->max_nodes_pj_list)
assoc_cond->max_nodes_pj_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->max_nodes_pj_list, value))
set = 1;
- } else if (!strncasecmp(type, "MaxSubmitJobs", MAX(command_len, 4))) {
+ } else if (!strncasecmp (type, "MaxSubmitJobs", MAX(command_len, 4))) {
if (!assoc_cond->max_submit_jobs_list)
assoc_cond->max_submit_jobs_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->max_submit_jobs_list,
value))
set = 1;
- } else if (!strncasecmp(type, "MaxWallDurationPerJob",
+ } else if (!strncasecmp (type, "MaxWallDurationPerJob",
MAX(command_len, 4))) {
if (!assoc_cond->max_wall_pj_list)
assoc_cond->max_wall_pj_list =
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->max_wall_pj_list, value))
set = 1;
- } else if (!strncasecmp(type, "Partition", MAX(command_len, 3))) {
+ } else if (!strncasecmp (type, "Partition", MAX(command_len, 3))) {
if (!assoc_cond->partition_list)
assoc_cond->partition_list =
list_create(slurm_destroy_char);
@@ -296,7 +296,7 @@ extern int sacctmgr_set_association_cond(slurmdb_association_cond_t *assoc_cond,
list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->parent_acct_list, value))
set = 1;
- } else if (!strncasecmp(type, "Users", MAX(command_len, 1))) {
+ } else if (!strncasecmp (type, "Users", MAX(command_len, 1))) {
if (!assoc_cond->user_list)
assoc_cond->user_list = list_create(slurm_destroy_char);
if (slurm_addto_char_list(assoc_cond->user_list, value))
@@ -316,18 +316,18 @@ extern int sacctmgr_set_association_rec(slurmdb_association_rec_t *assoc,
if (!assoc)
return set;
- if (!strncasecmp(type, "DefaultQOS", MAX(command_len, 8))) {
- if (!g_qos_list)
+ if (!strncasecmp (type, "DefaultQOS", MAX(command_len, 8))) {
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
- if (atoi(value) == -1)
+ if(atoi(value) == -1)
assoc->def_qos_id = -1;
else
assoc->def_qos_id = str_2_slurmdb_qos(
g_qos_list, value);
- if (assoc->def_qos_id == NO_VAL) {
+ if(assoc->def_qos_id == NO_VAL) {
fprintf(stderr,
"You gave a bad qos '%s'. "
"Use 'list qos' to get "
@@ -521,7 +521,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
field = xmalloc(sizeof(print_field_t));
if (!strncasecmp("Account", object, MAX(command_len, 1))
- || !strncasecmp("Acct", object, MAX(command_len, 4))) {
+ || !strncasecmp("Acct", object, MAX(command_len, 4))) {
field->type = PRINT_ACCOUNT;
field->name = xstrdup("Account");
if (tree_display)
@@ -530,55 +530,55 @@ extern int sacctmgr_list_association(int argc, char *argv[])
field->len = 10;
field->print_routine = print_fields_str;
} else if (!strncasecmp("Cluster", object,
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
} else if (!strncasecmp("DefaultQOS", object,
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
field->type = PRINT_DQOS;
field->name = xstrdup("Def QOS");
field->len = 9;
field->print_routine = print_fields_str;
} else if (!strncasecmp("FairShare", object,
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("GrpCPUMins", object,
- MAX(command_len, 8))) {
+ MAX(command_len, 8))) {
field->type = PRINT_GRPCM;
field->name = xstrdup("GrpCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
} else if (!strncasecmp("GrpCPUs", object,
- MAX(command_len, 8))) {
+ MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("GrpJobs", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("GrpNodes", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("GrpSubmitJobs", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("GrpWall", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_GRPW;
field->name = xstrdup("GrpWall");
field->len = 11;
@@ -594,67 +594,67 @@ extern int sacctmgr_list_association(int argc, char *argv[])
field->len = 6;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("MaxCPUMinsPerJob", object,
- MAX(command_len, 7))) {
+ MAX(command_len, 7))) {
field->type = PRINT_MAXCM;
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
} else if (!strncasecmp("MaxCPUsPerJob", object,
- MAX(command_len, 7))) {
+ MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("MaxJobs", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("MaxNodesPerJob", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("MaxSubmitJobs", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("MaxWallDurationPerJob", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_fields_time;
} else if (!strncasecmp("QOSRAWLevel", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
field->len = 10;
field->print_routine = print_fields_char_list;
} else if (!strncasecmp("QOSLevel", object,
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
field->type = PRINT_QOS;
field->name = xstrdup("QOS");
field->len = 20;
field->print_routine = sacctmgr_print_qos_list;
} else if (!strncasecmp("ParentID", object,
- MAX(command_len, 7))) {
+ MAX(command_len, 7))) {
field->type = PRINT_PID;
field->name = xstrdup("Par ID");
field->len = 6;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("ParentName", object,
- MAX(command_len, 7))) {
+ MAX(command_len, 7))) {
field->type = PRINT_PNAME;
field->name = xstrdup("Par Name");
field->len = 10;
field->print_routine = print_fields_str;
} else if (!strncasecmp("Partition", object,
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
field->type = PRINT_PART;
field->name = xstrdup("Partition");
field->len = 10;
@@ -665,7 +665,7 @@ extern int sacctmgr_list_association(int argc, char *argv[])
field->len = 6;
field->print_routine = print_fields_uint;
} else if (!strncasecmp("Shares", object,
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("Shares");
field->len = 9;
diff --git a/src/sacctmgr/cluster_functions.c b/src/sacctmgr/cluster_functions.c
index 5e610af6d750b051382458410e98d26203d2b270..01521092f31fe1b3c1a82a5211d86d07385959e8 100644
--- a/src/sacctmgr/cluster_functions.c
+++ b/src/sacctmgr/cluster_functions.c
@@ -60,11 +60,11 @@ static int _set_cond(int *start, int argc, char *argv[],
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
@@ -73,57 +73,57 @@ static int _set_cond(int *start, int argc, char *argv[],
if (!strncasecmp(argv[i], "Set", MAX(command_len, 3))) {
i--;
break;
- } else if (!end && !strncasecmp(argv[i], "where",
- MAX(command_len, 5))) {
+ } else if(!end && !strncasecmp(argv[i], "where",
+ MAX(command_len, 5))) {
continue;
} else if (!end &&
!strncasecmp(argv[i], "WithDeleted",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
with_deleted = 1;
} else if (!end && !strncasecmp(argv[i], "WOLimits",
- MAX(command_len, 3))) {
+ MAX(command_len, 3))) {
without_limits = 1;
- } else if (!end || !strncasecmp(argv[i], "Names",
+ } else if(!end || !strncasecmp(argv[i], "Names",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Clusters",
+ || !strncasecmp(argv[i], "Clusters",
MAX(command_len, 3))) {
- if (!cluster_cond->cluster_list)
+ if(!cluster_cond->cluster_list)
cluster_cond->cluster_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(cluster_cond->cluster_list,
- argv[i]+end))
+ if(slurm_addto_char_list(cluster_cond->cluster_list,
+ argv[i]+end))
a_set = 1;
} else if (!strncasecmp(argv[i], "Classification",
- MAX(command_len, 3))) {
+ MAX(command_len, 3))) {
cluster_cond->classification =
str_2_classification(argv[i]+end);
- if (cluster_cond->classification)
+ if(cluster_cond->classification)
c_set = 1;
} else if (!strncasecmp(argv[i], "flags",
- MAX(command_len, 2))) {
+ MAX(command_len, 2))) {
cluster_cond->flags = slurmdb_str_2_cluster_flags(
argv[i]+end);
c_set = 1;
} else if (!strncasecmp(argv[i], "Format",
- MAX(command_len, 2))) {
- if (format_list)
+ MAX(command_len, 2))) {
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!end || !strncasecmp(argv[i], "PluginIDSelect",
+ } else if(!end || !strncasecmp(argv[i], "PluginIDSelect",
MAX(command_len, 1))) {
- if (!cluster_cond->plugin_id_select_list)
+ if(!cluster_cond->plugin_id_select_list)
cluster_cond->plugin_id_select_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(
- cluster_cond->plugin_id_select_list,
- argv[i]+end))
+ if(slurm_addto_char_list(
+ cluster_cond->plugin_id_select_list,
+ argv[i]+end))
c_set = 1;
- } else if (!end || !strncasecmp(argv[i], "RPCVersions",
+ } else if(!end || !strncasecmp(argv[i], "RPCVersions",
MAX(command_len, 1))) {
- if (!cluster_cond->rpc_version_list)
+ if(!cluster_cond->rpc_version_list)
cluster_cond->rpc_version_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(cluster_cond->rpc_version_list,
- argv[i]+end))
+ if(slurm_addto_char_list(cluster_cond->rpc_version_list,
+ argv[i]+end))
c_set = 1;
} else {
exit_code=1;
@@ -135,11 +135,11 @@ static int _set_cond(int *start, int argc, char *argv[],
}
(*start) = i;
- if (c_set && a_set)
+ if(c_set && a_set)
return 3;
- else if (a_set) {
+ else if(a_set) {
return 2;
- } else if (c_set)
+ } else if(c_set)
return 1;
return 0;
}
@@ -157,11 +157,11 @@ static int _set_rec(int *start, int argc, char *argv[],
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
@@ -170,40 +170,40 @@ static int _set_rec(int *start, int argc, char *argv[],
if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))) {
i--;
break;
- } else if (!end && !strncasecmp(argv[i], "set",
- MAX(command_len, 3))) {
+ } else if(!end && !strncasecmp(argv[i], "set",
+ MAX(command_len, 3))) {
continue;
- } else if (!end
- || !strncasecmp(argv[i], "Names",
+ } else if(!end
+ || !strncasecmp(argv[i], "Names",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Clusters",
+ || !strncasecmp(argv[i], "Clusters",
MAX(command_len, 3))) {
- if (name_list)
+ if(name_list)
slurm_addto_char_list(name_list,
argv[i]+end);
} else if (!strncasecmp(argv[i], "Classification",
- MAX(command_len, 3))) {
- if (classification) {
+ MAX(command_len, 3))) {
+ if(classification) {
*classification =
str_2_classification(argv[i]+end);
- if (*classification)
+ if(*classification)
set = 1;
}
} else if (!strncasecmp(argv[i], "GrpCPUMins",
- MAX(command_len, 7))) {
+ MAX(command_len, 7))) {
exit_code=1;
fprintf(stderr, "GrpCPUMins is not a valid option "
"for the root association of a cluster.\n");
break;
} else if (!strncasecmp(argv[i], "GrpWall",
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
exit_code=1;
fprintf(stderr, "GrpWall is not a valid option "
"for the root association of a cluster.\n");
- } else if (!assoc ||
- (assoc && !(set = sacctmgr_set_association_rec(
- assoc, argv[i], argv[i]+end,
- command_len, option)))) {
+ } else if(!assoc ||
+ (assoc && !(set = sacctmgr_set_association_rec(
+ assoc, argv[i], argv[i]+end,
+ command_len, option)))) {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n"
" Use keyword 'where' to modify condition\n",
@@ -241,10 +241,10 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
limit_set += _set_rec(&i, argc, argv,
name_list, &start_assoc, &class);
}
- if (exit_code) {
+ if(exit_code) {
list_destroy(name_list);
return SLURM_ERROR;
- } else if (!list_count(name_list)) {
+ } else if(!list_count(name_list)) {
list_destroy(name_list);
exit_code=1;
fprintf(stderr, " Need name of cluster to add.\n");
@@ -259,7 +259,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
temp_list = acct_storage_g_get_clusters(db_conn, my_uid,
&cluster_cond);
- if (!temp_list) {
+ if(!temp_list) {
exit_code=1;
fprintf(stderr,
" Problem getting clusters from database. "
@@ -274,10 +274,10 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
list_iterator_reset(itr);
while((cluster_rec = list_next(itr))) {
- if (!strcasecmp(cluster_rec->name, name))
+ if(!strcasecmp(cluster_rec->name, name))
break;
}
- if (cluster_rec) {
+ if(cluster_rec) {
printf(" This cluster %s already exists. "
"Not adding.\n", name);
list_delete_item(itr_c);
@@ -286,7 +286,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
list_iterator_destroy(itr);
list_iterator_destroy(itr_c);
list_destroy(temp_list);
- if (!list_count(name_list)) {
+ if(!list_count(name_list)) {
list_destroy(name_list);
return SLURM_ERROR;
}
@@ -296,7 +296,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
cluster_list = list_create(slurmdb_destroy_cluster_rec);
itr = list_iterator_create(name_list);
while((name = list_next(itr))) {
- if (!name[0]) {
+ if(!name[0]) {
exit_code=1;
fprintf(stderr, " No blank names are "
"allowed when adding.\n");
@@ -314,7 +314,7 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
xmalloc(sizeof(slurmdb_association_rec_t));
slurmdb_init_association_rec(cluster->root_assoc);
printf(" Name = %s\n", cluster->name);
- if (cluster->classification)
+ if(cluster->classification)
printf(" Classification= %s\n",
get_classification_str(cluster->classification));
@@ -341,14 +341,14 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(name_list);
- if (limit_set) {
+ if(limit_set) {
printf(" Default Limits\n");
sacctmgr_print_assoc_limits(&start_assoc);
- if (start_assoc.qos_list)
+ if(start_assoc.qos_list)
list_destroy(start_assoc.qos_list);
}
- if (!list_count(cluster_list)) {
+ if(!list_count(cluster_list)) {
printf(" Nothing new added.\n");
goto end_it;
}
@@ -357,11 +357,11 @@ extern int sacctmgr_add_cluster(int argc, char *argv[])
rolled back. So we ask before hand if they are serious
about it so we can rollback if needed.
*/
- if (commit_check("Would you like to commit changes?")) {
+ if(commit_check("Would you like to commit changes?")) {
notice_thread_init();
rc = acct_storage_g_add_clusters(db_conn, my_uid, cluster_list);
notice_thread_fini();
- if (rc == SLURM_SUCCESS) {
+ if(rc == SLURM_SUCCESS) {
acct_storage_g_commit(db_conn, 1);
} else {
exit_code=1;
@@ -441,7 +441,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
_set_cond(&i, argc, argv, cluster_cond, format_list);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_cluster_cond(cluster_cond);
list_destroy(format_list);
return SLURM_ERROR;
@@ -449,10 +449,10 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- if (!list_count(format_list)) {
+ if(!list_count(format_list)) {
slurm_addto_char_list(format_list,
"Cl,Controlh,Controlp,RPC");
- if (!without_limits)
+ if(!without_limits)
slurm_addto_char_list(format_list,
"Fa,GrpJ,GrpN,GrpS,MaxJ,MaxN,"
"MaxS,MaxW,QOS,DefaultQOS");
@@ -465,7 +465,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -473,151 +473,151 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Cluster", object, MAX(command_len, 2))
- || !strncasecmp("Name", object, MAX(command_len, 2))) {
+ if(!strncasecmp("Cluster", object, MAX(command_len, 2))
+ || !strncasecmp("Name", object, MAX(command_len, 2))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("ControlHost", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("ControlHost", object,
+ MAX(command_len, 8))) {
field->type = PRINT_CHOST;
field->name = xstrdup("ControlHost");
field->len = 15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("ControlPort", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("ControlPort", object,
+ MAX(command_len, 8))) {
field->type = PRINT_CPORT;
field->name = xstrdup("ControlPort");
field->len = 12;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Classification", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Classification", object,
+ MAX(command_len, 2))) {
field->type = PRINT_CPUS;
field->name = xstrdup("Class");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("CPUCount", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("CPUCount", object,
+ MAX(command_len, 2))) {
field->type = PRINT_CPUS;
field->name = xstrdup("CPUCount");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("DefaultQOS", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("DefaultQOS", object,
+ MAX(command_len, 8))) {
field->type = PRINT_DEF_QOS;
field->name = xstrdup("Def QOS");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("FairShare", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("FairShare", object,
+ MAX(command_len, 2))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Flags", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Flags", object,
+ MAX(command_len, 2))) {
field->type = PRINT_FLAGS;
field->name = xstrdup("Flags");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("GrpCPUs", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPUs", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpNodes", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpNodes", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxCPUMinsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUMinsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXCM;
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("MaxCPUsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxNodesPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxNodesPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxWallDurationPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxWallDurationPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("NodeCount", object,
- MAX(command_len, 5))) {
+ } else if(!strncasecmp("NodeCount", object,
+ MAX(command_len, 5))) {
field->type = PRINT_NODECNT;
field->name = xstrdup("NodeCount");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("NodeNames", object,
- MAX(command_len, 5))) {
+ } else if(!strncasecmp("NodeNames", object,
+ MAX(command_len, 5))) {
field->type = PRINT_NODES;
field->name = xstrdup("NodeNames");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("QOSRAWLevel", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("QOSRAWLevel", object,
+ MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
field->len = 10;
field->print_routine = print_fields_char_list;
- } else if (!strncasecmp("QOSLevel", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("QOSLevel", object,
+ MAX(command_len, 1))) {
field->type = PRINT_QOS;
field->name = xstrdup("QOS");
field->len = 20;
field->print_routine = sacctmgr_print_qos_list;
- } else if (!strncasecmp("RPC", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("RPC", object, MAX(command_len, 1))) {
field->type = PRINT_RPC_VERSION;
field->name = xstrdup("RPC");
field->len = 3;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Shares", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Shares", object,
+ MAX(command_len, 2))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("Shares");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("PluginIDSelect", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("PluginIDSelect", object,
+ MAX(command_len, 2))) {
field->type = PRINT_SELECT;
field->name = xstrdup("PluginIDSelect");
field->len = 14;
@@ -629,7 +629,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -637,7 +637,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_cluster_cond(cluster_cond);
list_destroy(print_fields_list);
return SLURM_ERROR;
@@ -647,7 +647,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
cluster_cond);
slurmdb_destroy_cluster_cond(cluster_cond);
- if (!cluster_list) {
+ if(!cluster_list) {
exit_code=1;
fprintf(stderr, " Problem with query.\n");
list_destroy(print_fields_list);
@@ -699,7 +699,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
break;
}
case PRINT_DEF_QOS:
- if (!g_qos_list) {
+ if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(
db_conn,
my_uid,
@@ -786,7 +786,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
{
hostlist_t hl = hostlist_create(cluster->nodes);
int cnt = 0;
- if (hl) {
+ if(hl) {
cnt = hostlist_count(hl);
hostlist_destroy(hl);
}
@@ -803,7 +803,7 @@ extern int sacctmgr_list_cluster(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_QOS:
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -889,36 +889,36 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
}
}
- if (!rec_set) {
+ if(!rec_set) {
exit_code=1;
fprintf(stderr, " You didn't give me anything to set\n");
rc = SLURM_ERROR;
goto end_it;
- } else if (!cond_set) {
- if (!commit_check("You didn't set any conditions with 'WHERE'.\n"
- "Are you sure you want to continue?")) {
+ } else if(!cond_set) {
+ if(!commit_check("You didn't set any conditions with 'WHERE'.\n"
+ "Are you sure you want to continue?")) {
printf("Aborted\n");
rc = SLURM_SUCCESS;
goto end_it;
}
- } else if (exit_code) {
+ } else if(exit_code) {
rc = SLURM_ERROR;
goto end_it;
}
- if (cond_set == 1 || cond_set == 3) {
+ if(cond_set == 1 || cond_set == 3) {
List temp_list = NULL;
temp_list = acct_storage_g_get_clusters(db_conn, my_uid,
&cluster_cond);
- if (!temp_list) {
+ if(!temp_list) {
exit_code=1;
fprintf(stderr,
" Problem getting clusters from database. "
"Contact your admin.\n");
rc = SLURM_ERROR;
goto end_it;
- } else if (!list_count(temp_list)) {
+ } else if(!list_count(temp_list)) {
fprintf(stderr,
" Query didn't return any clusters.\n");
rc = SLURM_ERROR;
@@ -927,16 +927,16 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
/* we are only looking for the clusters returned from
this query, so we free the cluster_list and replace
it */
- if (assoc_cond->cluster_list)
+ if(assoc_cond->cluster_list)
list_destroy(assoc_cond->cluster_list);
assoc_cond->cluster_list = temp_list;
}
printf(" Setting\n");
- if (rec_set) {
+ if(rec_set) {
printf(" Default Limits =\n");
sacctmgr_print_assoc_limits(assoc);
- if (class_rec)
+ if(class_rec)
printf(" Cluster Classification = %s\n",
get_classification_str(class_rec));
}
@@ -946,7 +946,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
ret_list = acct_storage_g_modify_associations(
db_conn, my_uid, assoc_cond, assoc);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Modified cluster defaults for associations...\n");
@@ -955,7 +955,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
}
list_iterator_destroy(itr);
set = 1;
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing modified\n");
} else {
exit_code=1;
@@ -964,10 +964,10 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
- if (class_rec) {
+ if(class_rec) {
slurmdb_cluster_rec_t cluster_rec;
slurmdb_init_cluster_rec(&cluster_rec);
@@ -978,7 +978,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
ret_list = acct_storage_g_modify_clusters(
db_conn, my_uid, &cluster_cond, &cluster_rec);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Modified cluster classifications...\n");
@@ -987,7 +987,7 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
}
list_iterator_destroy(itr);
set = 1;
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing modified\n");
} else {
exit_code=1;
@@ -996,14 +996,14 @@ extern int sacctmgr_modify_cluster(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
}
notice_thread_fini();
- if (set) {
- if (commit_check("Would you like to commit changes?"))
+ if(set) {
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -1038,10 +1038,10 @@ extern int sacctmgr_delete_cluster(int argc, char *argv[])
cond_set = MAX(cond_set, prev_set);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_cluster_cond(cluster_cond);
return SLURM_ERROR;
- } else if (!cond_set) {
+ } else if(!cond_set) {
exit_code=1;
fprintf(stderr,
" No conditions given to remove, not executing.\n");
@@ -1049,8 +1049,8 @@ extern int sacctmgr_delete_cluster(int argc, char *argv[])
return SLURM_ERROR;
}
- if (!list_count(cluster_cond->cluster_list)
- && !cluster_cond->classification) {
+ if(!list_count(cluster_cond->cluster_list)
+ && !cluster_cond->classification) {
exit_code=1;
fprintf(stderr,
"problem with delete request. "
@@ -1066,13 +1066,13 @@ extern int sacctmgr_delete_cluster(int argc, char *argv[])
slurmdb_destroy_cluster_cond(cluster_cond);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
/* If there were jobs running with an association to
be deleted, don't.
*/
- if (rc == ESLURM_JOBS_RUNNING_ON_ASSOC) {
+ if(rc == ESLURM_JOBS_RUNNING_ON_ASSOC) {
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(rc));
while((object = list_next(itr))) {
@@ -1087,13 +1087,13 @@ extern int sacctmgr_delete_cluster(int argc, char *argv[])
printf(" %s\n", object);
}
list_iterator_destroy(itr);
- if (commit_check("Would you like to commit changes?")) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
acct_storage_g_commit(db_conn, 0);
}
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing deleted\n");
} else {
exit_code=1;
@@ -1102,7 +1102,7 @@ extern int sacctmgr_delete_cluster(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
return rc;
@@ -1131,18 +1131,18 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
int end = parse_option_end(argv[i]);
int option = 0;
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end || !strncasecmp(argv[i], "Cluster",
+ if(!end || !strncasecmp(argv[i], "Cluster",
MAX(command_len, 1))) {
- if (cluster_name) {
+ if(cluster_name) {
exit_code=1;
fprintf(stderr,
" Can only do one cluster at a time. "
@@ -1151,8 +1151,8 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
}
cluster_name = xstrdup(argv[i]+end);
} else if (!strncasecmp(argv[i], "File",
- MAX(command_len, 1))) {
- if (file_name) {
+ MAX(command_len, 1))) {
+ if(file_name) {
exit_code=1;
fprintf(stderr,
" File name already set to %s\n",
@@ -1166,7 +1166,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
}
}
- if (!cluster_name) {
+ if(!cluster_name) {
exit_code=1;
fprintf(stderr, " We need a cluster to dump.\n");
return SLURM_ERROR;
@@ -1182,7 +1182,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
temp_list = acct_storage_g_get_clusters(db_conn, my_uid,
&cluster_cond);
list_destroy(cluster_cond.cluster_list);
- if (!temp_list) {
+ if(!temp_list) {
exit_code=1;
fprintf(stderr,
" Problem getting clusters from database. "
@@ -1192,7 +1192,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
}
cluster_rec = list_peek(temp_list);
- if (!cluster_rec) {
+ if(!cluster_rec) {
exit_code=1;
fprintf(stderr, " Cluster %s doesn't exist.\n",
cluster_name);
@@ -1204,7 +1204,7 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
list_destroy(temp_list);
}
- if (!file_name) {
+ if(!file_name) {
file_name = xstrdup_printf("./%s.cfg", cluster_name);
printf(" No filename given, using %s.\n", file_name);
}
@@ -1224,25 +1224,25 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
user_list = acct_storage_g_get_users(db_conn, my_uid, &user_cond);
/* make sure this person running is an admin */
user_name = uid_to_string(my_uid);
- if (!(user = sacctmgr_find_user_from_list(user_list, user_name))) {
+ if(!(user = sacctmgr_find_user_from_list(user_list, user_name))) {
exit_code=1;
fprintf(stderr, " Your uid (%u) is not in the "
"accounting system, can't dump cluster.\n", my_uid);
xfree(cluster_name);
xfree(user_name);
- if (user_list)
+ if(user_list)
list_destroy(user_list);
list_destroy(assoc_cond.cluster_list);
return SLURM_ERROR;
} else {
- if (my_uid != slurm_get_slurm_user_id() && my_uid != 0
- && user->admin_level < SLURMDB_ADMIN_SUPER_USER) {
+ if(my_uid != slurm_get_slurm_user_id() && my_uid != 0
+ && user->admin_level < SLURMDB_ADMIN_SUPER_USER) {
exit_code=1;
fprintf(stderr, " Your user does not have sufficient "
"privileges to dump clusters.\n");
xfree(cluster_name);
- if (user_list)
+ if(user_list)
list_destroy(user_list);
xfree(user_name);
list_destroy(assoc_cond.cluster_list);
@@ -1256,12 +1256,12 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
&assoc_cond);
list_destroy(assoc_cond.cluster_list);
- if (!assoc_list) {
+ if(!assoc_list) {
exit_code=1;
fprintf(stderr, " Problem with query.\n");
xfree(cluster_name);
return SLURM_ERROR;
- } else if (!list_count(assoc_list)) {
+ } else if(!list_count(assoc_list)) {
exit_code=1;
fprintf(stderr, " Cluster %s returned nothing.\n",
cluster_name);
@@ -1277,31 +1277,31 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
fd = fopen(file_name, "w");
/* Add header */
- if (fprintf(fd,
- "# To edit this file start with a cluster line "
- "for the new cluster\n"
- "# Cluster - cluster_name:MaxNodesPerJob=50\n"
- "# Followed by Accounts you want in this fashion "
- "(root is created by default)...\n"
- "# Parent - root\n"
- "# Account - cs:MaxNodesPerJob=5:MaxJobs=4:"
- "MaxProcSecondsPerJob=20:FairShare=399:"
- "MaxWallDurationPerJob=40:Description='Computer Science':"
- "Organization='LC'\n"
- "# Any of the options after a ':' can be left out and "
- "they can be in any order.\n"
- "# If you want to add any sub accounts just list the "
- "Parent THAT HAS ALREADY \n"
- "# BEEN CREATED before the account line in this fashion...\n"
- "# Parent - cs\n"
- "# Account - test:MaxNodesPerJob=1:MaxJobs=1:"
- "MaxProcSecondsPerJob=1:FairShare=1:MaxWallDurationPerJob=1:"
- "Description='Test Account':Organization='Test'\n"
- "# To add users to a account add a line like this after a "
- "Parent - line\n"
- "# User - lipari:MaxNodesPerJob=2:MaxJobs=3:"
- "MaxProcSecondsPerJob=4:FairShare=1:"
- "MaxWallDurationPerJob=1\n") < 0) {
+ if(fprintf(fd,
+ "# To edit this file start with a cluster line "
+ "for the new cluster\n"
+ "# Cluster - cluster_name:MaxNodesPerJob=50\n"
+ "# Followed by Accounts you want in this fashion "
+ "(root is created by default)...\n"
+ "# Parent - root\n"
+ "# Account - cs:MaxNodesPerJob=5:MaxJobs=4:"
+ "MaxProcSecondsPerJob=20:FairShare=399:"
+ "MaxWallDurationPerJob=40:Description='Computer Science':"
+ "Organization='LC'\n"
+ "# Any of the options after a ':' can be left out and "
+ "they can be in any order.\n"
+ "# If you want to add any sub accounts just list the "
+ "Parent THAT HAS ALREADY \n"
+ "# BEEN CREATED before the account line in this fashion...\n"
+ "# Parent - cs\n"
+ "# Account - test:MaxNodesPerJob=1:MaxJobs=1:"
+ "MaxProcSecondsPerJob=1:FairShare=1:MaxWallDurationPerJob=1:"
+ "Description='Test Account':Organization='Test'\n"
+ "# To add users to a account add a line like this after a "
+ "Parent - line\n"
+ "# User - lipari:MaxNodesPerJob=2:MaxJobs=3:"
+ "MaxProcSecondsPerJob=4:FairShare=1:"
+ "MaxWallDurationPerJob=1\n") < 0) {
exit_code=1;
fprintf(stderr, "Can't write to file");
xfree(cluster_name);
@@ -1310,18 +1310,18 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
line = xstrdup_printf("Cluster - %s", cluster_name);
- if (class_str)
+ if(class_str)
xstrfmtcat(line, ":Classification=%s", class_str);
slurmdb_hierarchical_rec = list_peek(slurmdb_hierarchical_rec_list);
assoc = slurmdb_hierarchical_rec->assoc;
- if (strcmp(assoc->acct, "root"))
+ if(strcmp(assoc->acct, "root"))
fprintf(stderr, "Root association not on the top it was %s\n",
assoc->acct);
else
print_file_add_limits_to_line(&line, assoc);
- if (fprintf(fd, "%s\n", line) < 0) {
+ if(fprintf(fd, "%s\n", line) < 0) {
exit_code=1;
fprintf(stderr, " Can't write to file");
return SLURM_ERROR;
diff --git a/src/sacctmgr/common.c b/src/sacctmgr/common.c
index 567c534dea482d2ec0eb35df55f13cc79f96ca6f..a75a73a76c22f57defe8ba3d8f9c67b28cfc6308 100644
--- a/src/sacctmgr/common.c
+++ b/src/sacctmgr/common.c
@@ -82,18 +82,18 @@ extern int parse_option_end(char *option)
{
int end = 0;
- if (!option)
+ if(!option)
return 0;
while(option[end]) {
- if ((option[end] == '=')
+ if((option[end] == '=')
|| (option[end] == '+' && option[end+1] == '=')
|| (option[end] == '-' && option[end+1] == '='))
break;
end++;
}
- if (!option[end])
+ if(!option[end])
return 0;
end++;
@@ -109,7 +109,7 @@ extern char *strip_quotes(char *option, int *increased, bool make_lower)
char quote_c = '\0';
int quote = 0;
- if (!option)
+ if(!option)
return NULL;
/* first strip off the ("|')'s */
@@ -121,14 +121,14 @@ extern char *strip_quotes(char *option, int *increased, bool make_lower)
start = i;
while(option[i]) {
- if (quote && option[i] == quote_c) {
+ if(quote && option[i] == quote_c) {
end++;
break;
- } else if (option[i] == '\"' || option[i] == '\'')
+ } else if(option[i] == '\"' || option[i] == '\'')
option[i] = '`';
- else if (make_lower) {
+ else if(make_lower) {
char lower = tolower(option[i]);
- if (lower != option[i])
+ if(lower != option[i])
option[i] = lower;
}
@@ -139,7 +139,7 @@ extern char *strip_quotes(char *option, int *increased, bool make_lower)
meat = xmalloc((i-start)+1);
memcpy(meat, option+start, (i-start));
- if (increased)
+ if(increased)
(*increased) += end;
return meat;
@@ -150,7 +150,7 @@ extern int notice_thread_init()
pthread_attr_t attr;
slurm_attr_init(&attr);
- if (pthread_create(&lock_warning_thread, &attr, &_print_lock_warn, NULL))
+ if(pthread_create(&lock_warning_thread, &attr, &_print_lock_warn, NULL))
error ("pthread_create error %m");
slurm_attr_destroy(&attr);
return SLURM_SUCCESS;
@@ -169,7 +169,7 @@ extern int commit_check(char *warning)
fd_set rfds;
struct timeval tv;
- if (!rollback_flag)
+ if(!rollback_flag)
return 1;
printf("%s (You have 30 seconds to decide)\n", warning);
@@ -177,7 +177,7 @@ extern int commit_check(char *warning)
while(c != 'Y' && c != 'y'
&& c != 'N' && c != 'n'
&& c != '\n') {
- if (c) {
+ if(c) {
printf("Y or N please\n");
}
printf("(N/y): ");
@@ -187,16 +187,16 @@ extern int commit_check(char *warning)
/* Wait up to 30 seconds. */
tv.tv_sec = 30;
tv.tv_usec = 0;
- if ((ans = select(fd+1, &rfds, NULL, NULL, &tv)) <= 0)
+ if((ans = select(fd+1, &rfds, NULL, NULL, &tv)) <= 0)
break;
c = getchar();
printf("\n");
}
_nonblock(0);
- if (ans <= 0)
+ if(ans <= 0)
printf("timeout\n");
- else if (c == 'Y' || c == 'y')
+ else if(c == 'Y' || c == 'y')
return 1;
return 0;
@@ -212,31 +212,31 @@ extern slurmdb_association_rec_t *sacctmgr_find_association(char *user,
List assoc_list = NULL;
memset(&assoc_cond, 0, sizeof(slurmdb_association_cond_t));
- if (account) {
+ if(account) {
assoc_cond.acct_list = list_create(NULL);
list_append(assoc_cond.acct_list, account);
} else {
error("need an account to find association");
return NULL;
}
- if (cluster) {
+ if(cluster) {
assoc_cond.cluster_list = list_create(NULL);
list_append(assoc_cond.cluster_list, cluster);
} else {
- if (assoc_cond.acct_list)
+ if(assoc_cond.acct_list)
list_destroy(assoc_cond.acct_list);
error("need an cluster to find association");
return NULL;
}
assoc_cond.user_list = list_create(NULL);
- if (user)
+ if(user)
list_append(assoc_cond.user_list, user);
else
list_append(assoc_cond.user_list, "");
assoc_cond.partition_list = list_create(NULL);
- if (partition)
+ if(partition)
list_append(assoc_cond.partition_list, partition);
else
list_append(assoc_cond.partition_list, "");
@@ -249,7 +249,7 @@ extern slurmdb_association_rec_t *sacctmgr_find_association(char *user,
list_destroy(assoc_cond.user_list);
list_destroy(assoc_cond.partition_list);
- if (assoc_list)
+ if(assoc_list)
assoc = list_pop(assoc_list);
list_destroy(assoc_list);
@@ -265,10 +265,10 @@ extern slurmdb_association_rec_t *sacctmgr_find_account_base_assoc(char *account
slurmdb_association_cond_t assoc_cond;
List assoc_list = NULL;
- if (!cluster)
+ if(!cluster)
return NULL;
- if (account)
+ if(account)
temp = account;
memset(&assoc_cond, 0, sizeof(slurmdb_association_cond_t));
@@ -286,7 +286,7 @@ extern slurmdb_association_rec_t *sacctmgr_find_account_base_assoc(char *account
list_destroy(assoc_cond.cluster_list);
list_destroy(assoc_cond.user_list);
- if (assoc_list)
+ if(assoc_list)
assoc = list_pop(assoc_list);
list_destroy(assoc_list);
@@ -306,7 +306,7 @@ extern slurmdb_user_rec_t *sacctmgr_find_user(char *name)
slurmdb_association_cond_t assoc_cond;
List user_list = NULL;
- if (!name)
+ if(!name)
return NULL;
memset(&user_cond, 0, sizeof(slurmdb_user_cond_t));
@@ -320,7 +320,7 @@ extern slurmdb_user_rec_t *sacctmgr_find_user(char *name)
list_destroy(assoc_cond.user_list);
- if (user_list)
+ if(user_list)
user = list_pop(user_list);
list_destroy(user_list);
@@ -335,7 +335,7 @@ extern slurmdb_account_rec_t *sacctmgr_find_account(char *name)
slurmdb_association_cond_t assoc_cond;
List account_list = NULL;
- if (!name)
+ if(!name)
return NULL;
memset(&account_cond, 0, sizeof(slurmdb_account_cond_t));
@@ -349,7 +349,7 @@ extern slurmdb_account_rec_t *sacctmgr_find_account(char *name)
list_destroy(assoc_cond.acct_list);
- if (account_list)
+ if(account_list)
account = list_pop(account_list);
list_destroy(account_list);
@@ -363,7 +363,7 @@ extern slurmdb_cluster_rec_t *sacctmgr_find_cluster(char *name)
slurmdb_cluster_cond_t cluster_cond;
List cluster_list = NULL;
- if (!name)
+ if(!name)
return NULL;
slurmdb_init_cluster_cond(&cluster_cond);
@@ -375,7 +375,7 @@ extern slurmdb_cluster_rec_t *sacctmgr_find_cluster(char *name)
list_destroy(cluster_cond.cluster_list);
- if (cluster_list)
+ if(cluster_list)
cluster = list_pop(cluster_list);
list_destroy(cluster_list);
@@ -390,12 +390,12 @@ extern slurmdb_association_rec_t *sacctmgr_find_association_from_list(
ListIterator itr = NULL;
slurmdb_association_rec_t * assoc = NULL;
- if (!assoc_list)
+ if(!assoc_list)
return NULL;
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
- if (((!user && assoc->user)
+ if(((!user && assoc->user)
|| (user && (!assoc->user
|| strcasecmp(user, assoc->user))))
|| ((!account && assoc->acct)
@@ -423,17 +423,17 @@ extern slurmdb_association_rec_t *sacctmgr_find_account_base_assoc_from_list(
slurmdb_association_rec_t *assoc = NULL;
char *temp = "root";
- if (!cluster || !assoc_list)
+ if(!cluster || !assoc_list)
return NULL;
- if (account)
+ if(account)
temp = account;
/* info("looking for %s %s in %d", account, cluster, */
/* list_count(assoc_list)); */
itr = list_iterator_create(assoc_list);
while((assoc = list_next(itr))) {
/* info("is it %s %s %s", assoc->user, assoc->acct, assoc->cluster); */
- if (assoc->user
+ if(assoc->user
|| strcasecmp(temp, assoc->acct)
|| strcasecmp(cluster, assoc->cluster))
continue;
@@ -452,17 +452,17 @@ extern slurmdb_qos_rec_t *sacctmgr_find_qos_from_list(
slurmdb_qos_rec_t *qos = NULL;
char *working_name = NULL;
- if (!name || !qos_list)
+ if(!name || !qos_list)
return NULL;
- if (name[0] == '+' || name[0] == '-')
+ if(name[0] == '+' || name[0] == '-')
working_name = name+1;
else
working_name = name;
itr = list_iterator_create(qos_list);
while((qos = list_next(itr))) {
- if (!strcasecmp(working_name, qos->name))
+ if(!strcasecmp(working_name, qos->name))
break;
}
list_iterator_destroy(itr);
@@ -477,12 +477,12 @@ extern slurmdb_user_rec_t *sacctmgr_find_user_from_list(
ListIterator itr = NULL;
slurmdb_user_rec_t *user = NULL;
- if (!name || !user_list)
+ if(!name || !user_list)
return NULL;
itr = list_iterator_create(user_list);
while((user = list_next(itr))) {
- if (!strcasecmp(name, user->name))
+ if(!strcasecmp(name, user->name))
break;
}
list_iterator_destroy(itr);
@@ -497,12 +497,12 @@ extern slurmdb_account_rec_t *sacctmgr_find_account_from_list(
ListIterator itr = NULL;
slurmdb_account_rec_t *account = NULL;
- if (!name || !acct_list)
+ if(!name || !acct_list)
return NULL;
itr = list_iterator_create(acct_list);
while((account = list_next(itr))) {
- if (!strcasecmp(name, account->name))
+ if(!strcasecmp(name, account->name))
break;
}
list_iterator_destroy(itr);
@@ -517,12 +517,12 @@ extern slurmdb_cluster_rec_t *sacctmgr_find_cluster_from_list(
ListIterator itr = NULL;
slurmdb_cluster_rec_t *cluster = NULL;
- if (!name || !cluster_list)
+ if(!name || !cluster_list)
return NULL;
itr = list_iterator_create(cluster_list);
while((cluster = list_next(itr))) {
- if (!strcasecmp(name, cluster->name))
+ if(!strcasecmp(name, cluster->name))
break;
}
list_iterator_destroy(itr);
@@ -536,12 +536,12 @@ extern slurmdb_wckey_rec_t *sacctmgr_find_wckey_from_list(
ListIterator itr = NULL;
slurmdb_wckey_rec_t * wckey = NULL;
- if (!wckey_list)
+ if(!wckey_list)
return NULL;
itr = list_iterator_create(wckey_list);
while((wckey = list_next(itr))) {
- if (((!user && wckey->user)
+ if(((!user && wckey->user)
|| (user && (!wckey->user
|| strcasecmp(user, wckey->user))))
|| ((!name && wckey->name)
@@ -564,7 +564,7 @@ extern int get_uint(char *in_value, uint32_t *out_value, char *type)
char *ptr = NULL, *meat = NULL;
long num;
- if (!(meat = strip_quotes(in_value, NULL, 1))) {
+ if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
}
@@ -588,7 +588,7 @@ extern int get_uint16(char *in_value, uint16_t *out_value, char *type)
char *ptr = NULL, *meat = NULL;
long num;
- if (!(meat = strip_quotes(in_value, NULL, 1))) {
+ if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
}
@@ -613,7 +613,7 @@ extern int get_uint64(char *in_value, uint64_t *out_value, char *type)
char *ptr = NULL, *meat = NULL;
long long num;
- if (!(meat = strip_quotes(in_value, NULL, 1))) {
+ if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
}
@@ -638,7 +638,7 @@ extern int get_double(char *in_value, double *out_value, char *type)
char *ptr = NULL, *meat = NULL;
double num;
- if (!(meat = strip_quotes(in_value, NULL, 1))) {
+ if(!(meat = strip_quotes(in_value, NULL, 1))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
}
@@ -667,13 +667,13 @@ extern int addto_action_char_list(List char_list, char *names)
uint32_t id=0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -681,17 +681,17 @@ extern int addto_action_char_list(List char_list, char *names)
}
start = i;
while(names[i]) {
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
id = str_2_slurmdbd_msg_type(name);
- if (id == NO_VAL) {
+ if(id == NO_VAL) {
error("You gave a bad action "
"'%s'.", name);
xfree(name);
@@ -701,12 +701,12 @@ extern int addto_action_char_list(List char_list, char *names)
name = xstrdup_printf("%u", id);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
list_iterator_reset(itr);
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -715,7 +715,7 @@ extern int addto_action_char_list(List char_list, char *names)
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
error("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -724,12 +724,12 @@ extern int addto_action_char_list(List char_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
id = str_2_slurmdbd_msg_type(name);
- if (id == NO_VAL) {
+ if(id == NO_VAL) {
error("You gave a bad action '%s'.",
name);
xfree(name);
@@ -739,11 +739,11 @@ extern int addto_action_char_list(List char_list, char *names)
name = xstrdup_printf("%u", id);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -761,7 +761,7 @@ extern List copy_char_list(List char_list)
char *tmp_char = NULL;
ListIterator itr = NULL;
- if (!char_list || !list_count(char_list))
+ if(!char_list || !list_count(char_list))
return NULL;
itr = list_iterator_create(char_list);
@@ -783,8 +783,8 @@ extern void sacctmgr_print_coord_list(
char *print_this = NULL;
slurmdb_coord_rec_t *object = NULL;
- if (!value || !list_count(value)) {
- if (print_fields_parsable_print)
+ if(!value || !list_count(value)) {
+ if(print_fields_parsable_print)
print_this = xstrdup("");
else
print_this = xstrdup(" ");
@@ -792,7 +792,7 @@ extern void sacctmgr_print_coord_list(
list_sort(value, (ListCmpF)sort_coord_list);
itr = list_iterator_create(value);
while((object = list_next(itr))) {
- if (print_this)
+ if(print_this)
xstrfmtcat(print_this, ",%s",
object->name);
else
@@ -801,16 +801,16 @@ extern void sacctmgr_print_coord_list(
list_iterator_destroy(itr);
}
- if (print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
+ if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if (strlen(print_this) > abs_len)
+ if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
- if (field->len == abs_len)
+ if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
printf("%-*.*s ", abs_len, abs_len, print_this);
@@ -826,16 +826,16 @@ extern void sacctmgr_print_qos_list(print_field_t *field, List qos_list,
print_this = get_qos_complete_str(qos_list, value);
- if (print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
+ if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if (strlen(print_this) > abs_len)
+ if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
- if (field->len == abs_len)
+ if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
printf("%-*.*s ", abs_len, abs_len, print_this);
@@ -851,16 +851,16 @@ extern void sacctmgr_print_qos_bitstr(print_field_t *field, List qos_list,
print_this = get_qos_complete_str_bitstr(qos_list, value);
- if (print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
+ if(print_fields_parsable_print == PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", print_this);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", print_this);
else {
- if (strlen(print_this) > abs_len)
+ if(strlen(print_this) > abs_len)
print_this[abs_len-1] = '+';
- if (field->len == abs_len)
+ if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, print_this);
else
printf("%-*.*s ", abs_len, abs_len, print_this);
@@ -870,93 +870,93 @@ extern void sacctmgr_print_qos_bitstr(print_field_t *field, List qos_list,
extern void sacctmgr_print_assoc_limits(slurmdb_association_rec_t *assoc)
{
- if (!assoc)
+ if(!assoc)
return;
- if (assoc->shares_raw == INFINITE)
+ if(assoc->shares_raw == INFINITE)
printf(" Fairshare = NONE\n");
- else if (assoc->shares_raw != NO_VAL)
+ else if(assoc->shares_raw != NO_VAL)
printf(" Fairshare = %u\n", assoc->shares_raw);
- if (assoc->grp_cpu_mins == INFINITE)
+ if(assoc->grp_cpu_mins == INFINITE)
printf(" GrpCPUMins = NONE\n");
- else if (assoc->grp_cpu_mins != NO_VAL)
+ else if(assoc->grp_cpu_mins != NO_VAL)
printf(" GrpCPUMins = %llu\n",
(long long unsigned)assoc->grp_cpu_mins);
- if (assoc->grp_cpus == INFINITE)
+ if(assoc->grp_cpus == INFINITE)
printf(" GrpCPUs = NONE\n");
- else if (assoc->grp_cpus != NO_VAL)
+ else if(assoc->grp_cpus != NO_VAL)
printf(" GrpCPUs = %u\n", assoc->grp_cpus);
- if (assoc->grp_jobs == INFINITE)
+ if(assoc->grp_jobs == INFINITE)
printf(" GrpJobs = NONE\n");
- else if (assoc->grp_jobs != NO_VAL)
+ else if(assoc->grp_jobs != NO_VAL)
printf(" GrpJobs = %u\n", assoc->grp_jobs);
- if (assoc->grp_nodes == INFINITE)
+ if(assoc->grp_nodes == INFINITE)
printf(" GrpNodes = NONE\n");
- else if (assoc->grp_nodes != NO_VAL)
+ else if(assoc->grp_nodes != NO_VAL)
printf(" GrpNodes = %u\n", assoc->grp_nodes);
- if (assoc->grp_submit_jobs == INFINITE)
+ if(assoc->grp_submit_jobs == INFINITE)
printf(" GrpSubmitJobs = NONE\n");
- else if (assoc->grp_submit_jobs != NO_VAL)
+ else if(assoc->grp_submit_jobs != NO_VAL)
printf(" GrpSubmitJobs = %u\n",
assoc->grp_submit_jobs);
- if (assoc->grp_wall == INFINITE)
+ if(assoc->grp_wall == INFINITE)
printf(" GrpWall = NONE\n");
- else if (assoc->grp_wall != NO_VAL) {
+ else if(assoc->grp_wall != NO_VAL) {
char time_buf[32];
mins2time_str((time_t) assoc->grp_wall,
time_buf, sizeof(time_buf));
printf(" GrpWall = %s\n", time_buf);
}
- if (assoc->max_cpu_mins_pj == (uint64_t)INFINITE)
+ if(assoc->max_cpu_mins_pj == (uint64_t)INFINITE)
printf(" MaxCPUMins = NONE\n");
- else if (assoc->max_cpu_mins_pj != (uint64_t)NO_VAL)
+ else if(assoc->max_cpu_mins_pj != (uint64_t)NO_VAL)
printf(" MaxCPUMins = %llu\n",
(long long unsigned)assoc->max_cpu_mins_pj);
- if (assoc->max_cpus_pj == INFINITE)
+ if(assoc->max_cpus_pj == INFINITE)
printf(" MaxCPUs = NONE\n");
- else if (assoc->max_cpus_pj != NO_VAL)
+ else if(assoc->max_cpus_pj != NO_VAL)
printf(" MaxCPUs = %u\n", assoc->max_cpus_pj);
- if (assoc->max_jobs == INFINITE)
+ if(assoc->max_jobs == INFINITE)
printf(" MaxJobs = NONE\n");
- else if (assoc->max_jobs != NO_VAL)
+ else if(assoc->max_jobs != NO_VAL)
printf(" MaxJobs = %u\n", assoc->max_jobs);
- if (assoc->max_nodes_pj == INFINITE)
+ if(assoc->max_nodes_pj == INFINITE)
printf(" MaxNodes = NONE\n");
- else if (assoc->max_nodes_pj != NO_VAL)
+ else if(assoc->max_nodes_pj != NO_VAL)
printf(" MaxNodes = %u\n", assoc->max_nodes_pj);
- if (assoc->max_submit_jobs == INFINITE)
+ if(assoc->max_submit_jobs == INFINITE)
printf(" MaxSubmitJobs = NONE\n");
- else if (assoc->max_submit_jobs != NO_VAL)
+ else if(assoc->max_submit_jobs != NO_VAL)
printf(" MaxSubmitJobs = %u\n",
assoc->max_submit_jobs);
- if (assoc->max_wall_pj == INFINITE)
+ if(assoc->max_wall_pj == INFINITE)
printf(" MaxWall = NONE\n");
- else if (assoc->max_wall_pj != NO_VAL) {
+ else if(assoc->max_wall_pj != NO_VAL) {
char time_buf[32];
mins2time_str((time_t) assoc->max_wall_pj,
time_buf, sizeof(time_buf));
printf(" MaxWall = %s\n", time_buf);
}
- if (assoc->qos_list) {
- if (!g_qos_list)
+ if(assoc->qos_list) {
+ if(!g_qos_list)
g_qos_list =
acct_storage_g_get_qos(db_conn, my_uid, NULL);
char *temp_char = get_qos_complete_str(g_qos_list,
assoc->qos_list);
- if (temp_char) {
+ if(temp_char) {
printf(" QOS = %s\n", temp_char);
xfree(temp_char);
}
@@ -965,96 +965,96 @@ extern void sacctmgr_print_assoc_limits(slurmdb_association_rec_t *assoc)
extern void sacctmgr_print_qos_limits(slurmdb_qos_rec_t *qos)
{
- if (!qos)
+ if(!qos)
return;
- if (qos->preempt_list && !g_qos_list)
+ if(qos->preempt_list && !g_qos_list)
g_qos_list = acct_storage_g_get_qos(db_conn, my_uid, NULL);
- if (qos->grp_cpu_mins == INFINITE)
+ if(qos->grp_cpu_mins == INFINITE)
printf(" GrpCPUMins = NONE\n");
- else if (qos->grp_cpu_mins != NO_VAL)
+ else if(qos->grp_cpu_mins != NO_VAL)
printf(" GrpCPUMins = %llu\n",
(long long unsigned)qos->grp_cpu_mins);
- if (qos->grp_cpus == INFINITE)
+ if(qos->grp_cpus == INFINITE)
printf(" GrpCPUs = NONE\n");
- else if (qos->grp_cpus != NO_VAL)
+ else if(qos->grp_cpus != NO_VAL)
printf(" GrpCPUs = %u\n", qos->grp_cpus);
- if (qos->grp_jobs == INFINITE)
+ if(qos->grp_jobs == INFINITE)
printf(" GrpJobs = NONE\n");
- else if (qos->grp_jobs != NO_VAL)
+ else if(qos->grp_jobs != NO_VAL)
printf(" GrpJobs = %u\n", qos->grp_jobs);
- if (qos->grp_nodes == INFINITE)
+ if(qos->grp_nodes == INFINITE)
printf(" GrpNodes = NONE\n");
- else if (qos->grp_nodes != NO_VAL)
+ else if(qos->grp_nodes != NO_VAL)
printf(" GrpNodes = %u\n", qos->grp_nodes);
- if (qos->grp_submit_jobs == INFINITE)
+ if(qos->grp_submit_jobs == INFINITE)
printf(" GrpSubmitJobs = NONE\n");
- else if (qos->grp_submit_jobs != NO_VAL)
+ else if(qos->grp_submit_jobs != NO_VAL)
printf(" GrpSubmitJobs = %u\n",
qos->grp_submit_jobs);
- if (qos->grp_wall == INFINITE)
+ if(qos->grp_wall == INFINITE)
printf(" GrpWall = NONE\n");
- else if (qos->grp_wall != NO_VAL) {
+ else if(qos->grp_wall != NO_VAL) {
char time_buf[32];
mins2time_str((time_t) qos->grp_wall,
time_buf, sizeof(time_buf));
printf(" GrpWall = %s\n", time_buf);
}
- if (qos->max_cpu_mins_pj == (uint64_t)INFINITE)
+ if(qos->max_cpu_mins_pj == (uint64_t)INFINITE)
printf(" MaxCPUMins = NONE\n");
- else if (qos->max_cpu_mins_pj != (uint64_t)NO_VAL)
+ else if(qos->max_cpu_mins_pj != (uint64_t)NO_VAL)
printf(" MaxCPUMins = %llu\n",
(long long unsigned)qos->max_cpu_mins_pj);
- if (qos->max_cpus_pj == INFINITE)
+ if(qos->max_cpus_pj == INFINITE)
printf(" MaxCPUs = NONE\n");
- else if (qos->max_cpus_pj != NO_VAL)
+ else if(qos->max_cpus_pj != NO_VAL)
printf(" MaxCPUs = %u\n", qos->max_cpus_pj);
- if (qos->max_jobs_pu == INFINITE)
+ if(qos->max_jobs_pu == INFINITE)
printf(" MaxJobs = NONE\n");
- else if (qos->max_jobs_pu != NO_VAL)
+ else if(qos->max_jobs_pu != NO_VAL)
printf(" MaxJobs = %u\n", qos->max_jobs_pu);
- if (qos->max_nodes_pj == INFINITE)
+ if(qos->max_nodes_pj == INFINITE)
printf(" MaxNodes = NONE\n");
- else if (qos->max_nodes_pj != NO_VAL)
+ else if(qos->max_nodes_pj != NO_VAL)
printf(" MaxNodes = %u\n", qos->max_nodes_pj);
- if (qos->max_submit_jobs_pu == INFINITE)
+ if(qos->max_submit_jobs_pu == INFINITE)
printf(" MaxSubmitJobs = NONE\n");
- else if (qos->max_submit_jobs_pu != NO_VAL)
+ else if(qos->max_submit_jobs_pu != NO_VAL)
printf(" MaxSubmitJobs = %u\n",
qos->max_submit_jobs_pu);
- if (qos->max_wall_pj == INFINITE)
+ if(qos->max_wall_pj == INFINITE)
printf(" MaxWall = NONE\n");
- else if (qos->max_wall_pj != NO_VAL) {
+ else if(qos->max_wall_pj != NO_VAL) {
char time_buf[32];
mins2time_str((time_t) qos->max_wall_pj,
time_buf, sizeof(time_buf));
printf(" MaxWall = %s\n", time_buf);
}
- if (qos->preempt_list) {
+ if(qos->preempt_list) {
char *temp_char = get_qos_complete_str(g_qos_list,
qos->preempt_list);
- if (temp_char) {
+ if(temp_char) {
printf(" Preempt = %s\n", temp_char);
xfree(temp_char);
}
}
- if (qos->priority == INFINITE)
+ if(qos->priority == INFINITE)
printf(" Priority = NONE\n");
- else if (qos->priority != NO_VAL)
+ else if(qos->priority != NO_VAL)
printf(" Priority = %d\n", qos->priority);
}
diff --git a/src/sacctmgr/event_functions.c b/src/sacctmgr/event_functions.c
index 27da50deb8906e0da69ff1d47afbfbf2404d70de..ce156aab572179a5928ef62ccea4861215ae86a5 100644
--- a/src/sacctmgr/event_functions.c
+++ b/src/sacctmgr/event_functions.c
@@ -89,13 +89,13 @@ static int _addto_state_char_list(List char_list, char *names)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -104,12 +104,12 @@ static int _addto_state_char_list(List char_list, char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
c = _decode_node_state(name);
@@ -120,11 +120,11 @@ static int _addto_state_char_list(List char_list, char *names)
name = xstrdup_printf("%u", c);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -133,7 +133,7 @@ static int _addto_state_char_list(List char_list, char *names)
}
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -142,7 +142,7 @@ static int _addto_state_char_list(List char_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
c = _decode_node_state(name);
@@ -152,11 +152,11 @@ static int _addto_state_char_list(List char_list, char *names)
name = xstrdup_printf("%u", c);
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -169,7 +169,7 @@ static int _addto_state_char_list(List char_list, char *names)
static char *_convert_to_id(char *name, bool gid)
{
- if (gid) {
+ if(gid) {
struct group *grp;
if (!(grp=getgrnam(name))) {
fprintf(stderr, "Invalid group id: %s\n", name);
@@ -199,13 +199,13 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -214,12 +214,12 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
@@ -229,11 +229,11 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -242,7 +242,7 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -251,7 +251,7 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
@@ -260,11 +260,11 @@ static int _addto_id_char_list(List char_list, char *names, bool gid)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -286,53 +286,53 @@ static int _set_cond(int *start, int argc, char *argv[],
int local_cluster_flag = 0;
int all_time_flag = 0;
- if (!event_cond->cluster_list)
+ if(!event_cond->cluster_list)
event_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 5))) {
local_cluster_flag = 1;
- } else if (!end && !strncasecmp(argv[i], "all_time",
+ } else if(!end && !strncasecmp(argv[i], "all_time",
MAX(command_len, 5))) {
all_time_flag = 1;
- } else if (!end && !strncasecmp(argv[i], "where",
+ } else if(!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if (!end || (!strncasecmp(argv[i], "Events",
+ } else if(!end || (!strncasecmp (argv[i], "Events",
MAX(command_len, 1)))) {
ListIterator itr = NULL;
List tmp_list = list_create(slurm_destroy_char);
char *temp = NULL;
- if (slurm_addto_char_list(tmp_list,
+ if(slurm_addto_char_list(tmp_list,
argv[i]+end))
set = 1;
/* check to make sure user gave ints here */
itr = list_iterator_create(tmp_list);
while ((temp = list_next(itr))) {
- if (!strncasecmp("Node", temp,
+ if(!strncasecmp("Node", temp,
MAX(strlen(temp), 1))) {
- if (event_cond->event_type)
+ if(event_cond->event_type)
event_cond->event_type =
SLURMDB_EVENT_ALL;
else
event_cond->event_type =
SLURMDB_EVENT_NODE;
- } else if (!strncasecmp("Cluster", temp,
+ } else if(!strncasecmp("Cluster", temp,
MAX(strlen(temp), 1))) {
- if (event_cond->event_type)
+ if(event_cond->event_type)
event_cond->event_type =
SLURMDB_EVENT_ALL;
else
@@ -350,67 +350,67 @@ static int _set_cond(int *start, int argc, char *argv[],
}
list_iterator_destroy(itr);
list_destroy(tmp_list);
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
- if (!event_cond->cluster_list)
+ if(!event_cond->cluster_list)
event_cond->cluster_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(event_cond->cluster_list,
+ if(slurm_addto_char_list(event_cond->cluster_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
event_cond->period_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "MinCpus",
+ } else if (!strncasecmp (argv[i], "MinCpus",
MAX(command_len, 2))) {
if (get_uint(argv[i]+end, &event_cond->cpus_min,
"MinCpus") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "MaxCpus",
+ } else if (!strncasecmp (argv[i], "MaxCpus",
MAX(command_len, 2))) {
if (get_uint(argv[i]+end, &event_cond->cpus_max,
"MaxCpus") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "Nodes",
+ } else if (!strncasecmp (argv[i], "Nodes",
MAX(command_len, 1))) {
- if (!event_cond->node_list)
+ if(!event_cond->node_list)
event_cond->node_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(event_cond->node_list,
+ if(slurm_addto_char_list(event_cond->node_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Reason",
+ } else if (!strncasecmp (argv[i], "Reason",
MAX(command_len, 1))) {
- if (!event_cond->reason_list)
+ if(!event_cond->reason_list)
event_cond->reason_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(event_cond->reason_list,
+ if(slurm_addto_char_list(event_cond->reason_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 4))) {
event_cond->period_start = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "States",
+ } else if (!strncasecmp (argv[i], "States",
MAX(command_len, 4))) {
- if (!event_cond->state_list)
+ if(!event_cond->state_list)
event_cond->state_list =
list_create(slurm_destroy_char);
- if (_addto_state_char_list(event_cond->state_list,
+ if(_addto_state_char_list(event_cond->state_list,
argv[i]+end)) {
event_cond->event_type = SLURMDB_EVENT_NODE;
set = 1;
}
- } else if (!strncasecmp(argv[i], "User",
+ } else if (!strncasecmp (argv[i], "User",
MAX(command_len, 1))) {
- if (!event_cond->reason_uid_list)
+ if(!event_cond->reason_uid_list)
event_cond->reason_uid_list =
list_create(slurm_destroy_char);
- if (_addto_id_char_list(event_cond->reason_uid_list,
+ if(_addto_id_char_list(event_cond->reason_uid_list,
argv[i]+end, 0)) {
event_cond->event_type = SLURMDB_EVENT_NODE;
set = 1;
@@ -422,18 +422,18 @@ static int _set_cond(int *start, int argc, char *argv[],
}
(*start) = i;
- if (!local_cluster_flag && !list_count(event_cond->cluster_list)) {
+ if(!local_cluster_flag && !list_count(event_cond->cluster_list)) {
char *temp = slurm_get_cluster_name();
- if (temp)
+ if(temp)
list_append(event_cond->cluster_list, temp);
}
- if (!all_time_flag && !event_cond->period_start) {
+ if(!all_time_flag && !event_cond->period_start) {
event_cond->period_start = time(NULL);
- if (!event_cond->state_list) {
+ if(!event_cond->state_list) {
struct tm start_tm;
- if (!localtime_r(&event_cond->period_start, &start_tm)) {
+ if(!localtime_r(&event_cond->period_start, &start_tm)) {
fprintf(stderr,
" Couldn't get localtime from %ld",
event_cond->period_start);
@@ -489,13 +489,13 @@ extern int sacctmgr_list_event(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
_set_cond(&i, argc, argv, event_cond, format_list);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_event_cond(event_cond);
list_destroy(format_list);
return SLURM_ERROR;
@@ -503,8 +503,8 @@ extern int sacctmgr_list_event(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- if (!list_count(format_list)) {
- if (event_cond->event_type == SLURMDB_EVENT_CLUSTER)
+ if(!list_count(format_list)) {
+ if(event_cond->event_type == SLURMDB_EVENT_CLUSTER)
slurm_addto_char_list(format_list,
"Cluster,Cpus,Start,End,"
"ClusterNodes");
@@ -520,7 +520,7 @@ extern int sacctmgr_list_event(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -528,76 +528,76 @@ extern int sacctmgr_list_event(int argc, char *argv[])
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("ClusterNodes", object,
+ if(!strncasecmp("ClusterNodes", object,
MAX(command_len, 8))) {
field->type = PRINT_CLUSTER_NODES;
field->name = xstrdup("Cluster Nodes");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 1))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("CPUs", object,
+ } else if(!strncasecmp("CPUs", object,
MAX(command_len, 2))) {
field->type = PRINT_CPUS;
field->name = xstrdup("CPUs");
field->len = 7;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Duration", object,
+ } else if(!strncasecmp("Duration", object,
MAX(command_len, 2))) {
field->type = PRINT_DURATION;
field->name = xstrdup("Duration");
field->len = 13;
field->print_routine = print_fields_time_from_secs;
- } else if (!strncasecmp("End", object, MAX(command_len, 2))) {
+ } else if(!strncasecmp("End", object, MAX(command_len, 2))) {
field->type = PRINT_END;
field->name = xstrdup("End");
field->len = 19;
field->print_routine = print_fields_date;
- } else if (!strncasecmp("EventRaw", object,
+ } else if(!strncasecmp("EventRaw", object,
MAX(command_len, 6))) {
field->type = PRINT_EVENTRAW;
field->name = xstrdup("EventRaw");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Event", object,
+ } else if(!strncasecmp("Event", object,
MAX(command_len, 2))) {
field->type = PRINT_EVENT;
field->name = xstrdup("Event");
field->len = 7;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("NodeName", object,
+ } else if(!strncasecmp("NodeName", object,
MAX(command_len, 1))) {
field->type = PRINT_NODENAME;
field->name = xstrdup("Node Name");
field->len = -15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Reason", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Reason", object, MAX(command_len, 1))) {
field->type = PRINT_REASON;
field->name = xstrdup("Reason");
field->len = 30;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Start", object,
+ } else if(!strncasecmp("Start", object,
MAX(command_len, 1))) {
field->type = PRINT_START;
field->name = xstrdup("Start");
field->len = 19;
field->print_routine = print_fields_date;
- } else if (!strncasecmp("StateRaw", object,
+ } else if(!strncasecmp("StateRaw", object,
MAX(command_len, 6))) {
field->type = PRINT_STATERAW;
field->name = xstrdup("StateRaw");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("State", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("State", object, MAX(command_len, 1))) {
field->type = PRINT_STATE;
field->name = xstrdup("State");
field->len = 6;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("User", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("User", object, MAX(command_len, 1))) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 15;
@@ -609,7 +609,7 @@ extern int sacctmgr_list_event(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -617,7 +617,7 @@ extern int sacctmgr_list_event(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
list_destroy(print_fields_list);
return SLURM_ERROR;
}
@@ -625,7 +625,7 @@ extern int sacctmgr_list_event(int argc, char *argv[])
event_list = acct_storage_g_get_events(db_conn, my_uid, event_cond);
slurmdb_destroy_event_cond(event_cond);
- if (!event_list) {
+ if(!event_list) {
exit_code=1;
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(errno));
@@ -663,7 +663,7 @@ extern int sacctmgr_list_event(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_DURATION:
- if (!newend)
+ if(!newend)
newend = time(NULL);
field->print_routine(
field,
@@ -680,9 +680,9 @@ extern int sacctmgr_list_event(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_EVENT:
- if (event->event_type == SLURMDB_EVENT_CLUSTER)
+ if(event->event_type == SLURMDB_EVENT_CLUSTER)
tmp_char = "Cluster";
- else if (event->event_type == SLURMDB_EVENT_NODE)
+ else if(event->event_type == SLURMDB_EVENT_NODE)
tmp_char = "Node";
else
tmp_char = "Unknown";
@@ -709,7 +709,7 @@ extern int sacctmgr_list_event(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_STATE:
- if (event->event_type == SLURMDB_EVENT_CLUSTER)
+ if(event->event_type == SLURMDB_EVENT_CLUSTER)
tmp_char = NULL;
else
tmp_char = node_state_string_compact(
@@ -720,7 +720,7 @@ extern int sacctmgr_list_event(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_USER:
- if (event->reason_uid != NO_VAL) {
+ if(event->reason_uid != NO_VAL) {
tmp_char = uid_to_string(
event->reason_uid);
snprintf(tmp, sizeof(tmp), "%s(%u)",
diff --git a/src/sacctmgr/file_functions.c b/src/sacctmgr/file_functions.c
index 5314130b3a415c6c3cf3fb6f05e6c131e79e6b6f..b836d2a9e6e30f73c25826d9b29095f1a1848b43 100644
--- a/src/sacctmgr/file_functions.c
+++ b/src/sacctmgr/file_functions.c
@@ -115,7 +115,7 @@ typedef enum {
static int _init_sacctmgr_file_opts(sacctmgr_file_opts_t *file_opts)
{
- if (!file_opts)
+ if(!file_opts)
return SLURM_ERROR;
memset(file_opts, 0, sizeof(sacctmgr_file_opts_t));
@@ -243,8 +243,8 @@ static void _destroy_sacctmgr_file_opts(void *object)
{
sacctmgr_file_opts_t *file_opts = (sacctmgr_file_opts_t *)object;
- if (file_opts) {
- if (file_opts->coord_list)
+ if(file_opts) {
+ if(file_opts->coord_list)
list_destroy(file_opts->coord_list);
xfree(file_opts->def_acct);
xfree(file_opts->def_wckey);
@@ -252,7 +252,7 @@ static void _destroy_sacctmgr_file_opts(void *object)
xfree(file_opts->name);
xfree(file_opts->org);
xfree(file_opts->part);
- if (file_opts->wckey_list)
+ if(file_opts->wckey_list)
list_destroy(file_opts->wckey_list);
xfree(file_opts);
}
@@ -275,9 +275,9 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
start=i;
while(options[i] && options[i] != ':' && options[i] != '\n') {
- if (options[i] == '"' || options[i] == '\'') {
- if (quote) {
- if (options[i] == quote_c)
+ if(options[i] == '"' || options[i] == '\'') {
+ if(quote) {
+ if(options[i] == quote_c)
quote = 0;
} else {
quote = 1;
@@ -286,57 +286,57 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
}
i++;
}
- if (quote) {
+ if(quote) {
while(options[i] && options[i] != quote_c)
i++;
- if (!options[i])
+ if(!options[i])
fatal("There is a problem with option "
"%s with quotes.", option);
i++;
}
- if (i-start <= 0)
+ if(i-start <= 0)
goto next_col;
sub = xstrndup(options+start, i-start);
end = parse_option_end(sub);
command_len = end - 1;
- if (sub[end] == '=') {
+ if(sub[end] == '=') {
option2 = (int)sub[end-1];
end++;
}
option = strip_quotes(sub+end, NULL, 1);
- if (!end) {
- if (file_opts->name) {
+ if(!end) {
+ if(file_opts->name) {
exit_code=1;
fprintf(stderr, " Bad format on %s: "
- "End your option with "
- "an '=' sign\n", sub);
+ "End your option with "
+ "an '=' sign\n", sub);
_destroy_sacctmgr_file_opts(file_opts);
break;
}
file_opts->name = xstrdup(option);
- } else if (!strncasecmp(sub, "AdminLevel",
- MAX(command_len, 2))) {
+ } else if (!strncasecmp (sub, "AdminLevel",
+ MAX(command_len, 2))) {
file_opts->admin = str_2_slurmdb_admin_level(option);
- } else if (!strncasecmp(sub, "Coordinator",
- MAX(command_len, 2))) {
- if (!file_opts->coord_list)
+ } else if (!strncasecmp (sub, "Coordinator",
+ MAX(command_len, 2))) {
+ if(!file_opts->coord_list)
file_opts->coord_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(file_opts->coord_list, option);
- } else if (!strncasecmp(sub, "Classification",
- MAX(command_len, 2))) {
+ } else if (!strncasecmp (sub, "Classification",
+ MAX(command_len, 2))) {
file_opts->classification =
str_2_classification(option);
- } else if (!strncasecmp(sub, "DefaultAccount",
- MAX(command_len, 8))) {
+ } else if (!strncasecmp (sub, "DefaultAccount",
+ MAX(command_len, 8))) {
file_opts->def_acct = xstrdup(option);
- } else if (!strncasecmp(sub, "DefaultQOS",
- MAX(command_len, 8))) {
- if (!g_qos_list) {
+ } else if (!strncasecmp (sub, "DefaultQOS",
+ MAX(command_len, 8))) {
+ if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
}
@@ -344,7 +344,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
file_opts->def_qos_id = str_2_slurmdb_qos(
g_qos_list, option);
- if (file_opts->def_qos_id == NO_VAL) {
+ if(file_opts->def_qos_id == NO_VAL) {
fprintf(stderr,
"You gave a bad qos '%s'. "
"Use 'list qos' to get "
@@ -353,30 +353,30 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "DefaultWCKey",
- MAX(command_len, 8))) {
+ } else if (!strncasecmp (sub, "DefaultWCKey",
+ MAX(command_len, 8))) {
file_opts->def_wckey = xstrdup(option);
- if (!file_opts->wckey_list)
+ if(!file_opts->wckey_list)
file_opts->wckey_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(file_opts->wckey_list, option);
- } else if (!strncasecmp(sub, "Description",
- MAX(command_len, 3))) {
+ } else if (!strncasecmp (sub, "Description",
+ MAX(command_len, 3))) {
file_opts->desc = xstrdup(option);
- } else if (!strncasecmp(sub, "FairShare",
- MAX(command_len, 1))
- || !strncasecmp(sub, "Shares",
- MAX(command_len, 1))) {
+ } else if (!strncasecmp (sub, "FairShare",
+ MAX(command_len, 1))
+ || !strncasecmp (sub, "Shares",
+ MAX(command_len, 1))) {
if (get_uint(option, &file_opts->fairshare,
- "FairShare") != SLURM_SUCCESS) {
+ "FairShare") != SLURM_SUCCESS) {
exit_code=1;
fprintf(stderr,
" Bad FairShare value: %s\n", option);
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "GrpCPUMins",
- MAX(command_len, 7))) {
+ } else if (!strncasecmp (sub, "GrpCPUMins",
+ MAX(command_len, 7))) {
if (get_uint64(option, &file_opts->grp_cpu_mins,
"GrpCPUMins") != SLURM_SUCCESS) {
exit_code=1;
@@ -385,7 +385,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "GrpCPUs", MAX(command_len, 7))) {
+ } else if (!strncasecmp (sub, "GrpCPUs", MAX(command_len, 7))) {
if (get_uint(option, &file_opts->grp_cpus,
"GrpCPUs") != SLURM_SUCCESS) {
exit_code=1;
@@ -394,7 +394,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "GrpJobs", MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "GrpJobs", MAX(command_len, 4))) {
if (get_uint(option, &file_opts->grp_jobs,
"GrpJobs") != SLURM_SUCCESS) {
exit_code=1;
@@ -403,8 +403,8 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "GrpNodes",
- MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "GrpNodes",
+ MAX(command_len, 4))) {
if (get_uint(option, &file_opts->grp_nodes,
"GrpNodes") != SLURM_SUCCESS) {
exit_code=1;
@@ -413,8 +413,8 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "GrpSubmitJobs",
- MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "GrpSubmitJobs",
+ MAX(command_len, 4))) {
if (get_uint(option, &file_opts->grp_submit_jobs,
"GrpSubmitJobs") != SLURM_SUCCESS) {
exit_code=1;
@@ -423,7 +423,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "GrpWall", MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "GrpWall", MAX(command_len, 4))) {
mins = time_str2mins(option);
if (mins >= 0) {
file_opts->grp_wall
@@ -438,10 +438,10 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "MaxCPUMinsPerJob",
- MAX(command_len, 7))
- || !strncasecmp(sub, "MaxProcSecPerJob",
- MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "MaxCPUMinsPerJob",
+ MAX(command_len, 7))
+ || !strncasecmp (sub, "MaxProcSecPerJob",
+ MAX(command_len, 4))) {
if (get_uint64(option, &file_opts->max_cpu_mins_pj,
"MaxCPUMins") != SLURM_SUCCESS) {
exit_code=1;
@@ -450,8 +450,8 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "MaxCPUsPerJob",
- MAX(command_len, 7))) {
+ } else if (!strncasecmp (sub, "MaxCPUsPerJob",
+ MAX(command_len, 7))) {
if (get_uint(option, &file_opts->max_cpus_pj,
"MaxCPUs") != SLURM_SUCCESS) {
exit_code=1;
@@ -460,7 +460,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "MaxJobs", MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "MaxJobs", MAX(command_len, 4))) {
if (get_uint(option, &file_opts->max_jobs,
"MaxJobs") != SLURM_SUCCESS) {
exit_code=1;
@@ -469,8 +469,8 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "MaxNodesPerJob",
- MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "MaxNodesPerJob",
+ MAX(command_len, 4))) {
if (get_uint(option, &file_opts->max_nodes_pj,
"MaxNodes") != SLURM_SUCCESS) {
exit_code=1;
@@ -479,8 +479,8 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "MaxSubmitJobs",
- MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "MaxSubmitJobs",
+ MAX(command_len, 4))) {
if (get_uint(option, &file_opts->max_submit_jobs,
"MaxSubmitJobs") != SLURM_SUCCESS) {
exit_code=1;
@@ -489,8 +489,8 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "MaxWallDurationPerJob",
- MAX(command_len, 4))) {
+ } else if (!strncasecmp (sub, "MaxWallDurationPerJob",
+ MAX(command_len, 4))) {
mins = time_str2mins(option);
if (mins >= 0) {
file_opts->max_wall_pj
@@ -505,18 +505,18 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
_destroy_sacctmgr_file_opts(file_opts);
break;
}
- } else if (!strncasecmp(sub, "Organization",
- MAX(command_len, 1))) {
+ } else if (!strncasecmp (sub, "Organization",
+ MAX(command_len, 1))) {
file_opts->org = xstrdup(option);
- } else if (!strncasecmp(sub, "QosLevel", MAX(command_len, 1))
- || !strncasecmp(sub, "Expedite",
- MAX(command_len, 1))) {
- if (!file_opts->qos_list) {
+ } else if (!strncasecmp (sub, "QosLevel", MAX(command_len, 1))
+ || !strncasecmp (sub, "Expedite",
+ MAX(command_len, 1))) {
+ if(!file_opts->qos_list) {
file_opts->qos_list =
list_create(slurm_destroy_char);
}
- if (!g_qos_list) {
+ if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
}
@@ -524,9 +524,9 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
slurmdb_addto_qos_char_list(file_opts->qos_list,
g_qos_list,
option, option2);
- } else if (!strncasecmp(sub, "WCKeys",
- MAX(command_len, 2))) {
- if (!file_opts->wckey_list)
+ } else if (!strncasecmp (sub, "WCKeys",
+ MAX(command_len, 2))) {
+ if(!file_opts->wckey_list)
file_opts->wckey_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(file_opts->wckey_list, option);
@@ -539,7 +539,7 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
xfree(option);
next_col:
- if (options[i] == ':')
+ if(options[i] == ':')
i++;
else
break;
@@ -548,12 +548,12 @@ static sacctmgr_file_opts_t *_parse_options(char *options)
xfree(sub);
xfree(option);
- if (!file_opts->name) {
+ if(!file_opts->name) {
exit_code=1;
fprintf(stderr, " No name given\n");
_destroy_sacctmgr_file_opts(file_opts);
file_opts = NULL;
- } else if (exit_code) {
+ } else if(exit_code) {
_destroy_sacctmgr_file_opts(file_opts);
file_opts = NULL;
}
@@ -573,185 +573,185 @@ static List _set_up_print_fields(List format_list)
while((object = list_next(itr))) {
int command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Account", object, MAX(command_len, 2))) {
+ if(!strncasecmp("Account", object, MAX(command_len, 2))) {
field->type = PRINT_ACCOUNT;
field->name = xstrdup("Account");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("AdminLevel", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("AdminLevel", object,
+ MAX(command_len, 2))) {
field->type = PRINT_ADMIN;
field->name = xstrdup("Admin");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
- MAX(command_len, 3))) {
+ } else if(!strncasecmp("Cluster", object,
+ MAX(command_len, 3))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Classification", object,
- MAX(command_len, 3))) {
+ } else if(!strncasecmp("Classification", object,
+ MAX(command_len, 3))) {
field->type = PRINT_CLASSIFICATION;
field->name = xstrdup("Classif");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Coordinators", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Coordinators", object,
+ MAX(command_len, 2))) {
field->type = PRINT_COORDS;
field->name = xstrdup("Coord Accounts");
field->len = 20;
field->print_routine = sacctmgr_print_coord_list;
- } else if (!strncasecmp("DefaultAccount", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("DefaultAccount", object,
+ MAX(command_len, 8))) {
field->type = PRINT_DACCT;
field->name = xstrdup("Def Acct");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("DefaultQOS", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("DefaultQOS", object,
+ MAX(command_len, 8))) {
field->type = PRINT_DQOS;
field->name = xstrdup("Def QOS");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("DefaultWckey", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("DefaultWckey", object,
+ MAX(command_len, 8))) {
field->type = PRINT_DWCKEY;
field->name = xstrdup("Def WCKey");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Description", object,
- MAX(command_len, 3))) {
+ } else if(!strncasecmp("Description", object,
+ MAX(command_len, 3))) {
field->type = PRINT_DESC;
field->name = xstrdup("Descr");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("FairShare", object,
- MAX(command_len, 1))
- || !strncasecmp("Shares", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("FairShare", object,
+ MAX(command_len, 1))
+ || !strncasecmp("Shares", object,
+ MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpCPUMins", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("GrpCPUMins", object,
+ MAX(command_len, 7))) {
field->type = PRINT_GRPCM;
field->name = xstrdup("GrpCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("GrpCPUs", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("GrpCPUs", object,
+ MAX(command_len, 7))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpNodes", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpNodes", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpWall", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpWall", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPW;
field->name = xstrdup("GrpWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("ID", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("ID", object, MAX(command_len, 1))) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxCPUMinsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUMinsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXCM;
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("MaxCPUsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxNodesPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxNodesPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxWallDurationPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxWallDurationPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("Name", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Name", object, MAX(command_len, 1))) {
field->type = PRINT_NAME;
field->name = xstrdup("Name");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Organization", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("Organization", object,
+ MAX(command_len, 1))) {
field->type = PRINT_ORG;
field->name = xstrdup("Org");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("QOSRAWLevel", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("QOSRAWLevel", object,
+ MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
field->len = 7;
field->print_routine = print_fields_char_list;
- } else if (!strncasecmp("QOSLevel", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("QOSLevel", object,
+ MAX(command_len, 1))) {
field->type = PRINT_QOS;
field->name = xstrdup("QOS");
field->len = 9;
field->print_routine = sacctmgr_print_qos_list;
- } else if (!strncasecmp("Parent", object, MAX(command_len, 4))) {
+ } else if(!strncasecmp("Parent", object, MAX(command_len, 4))) {
field->type = PRINT_PARENT;
field->name = xstrdup("Parent");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Partition", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("Partition", object,
+ MAX(command_len, 4))) {
field->type = PRINT_PART;
field->name = xstrdup("Partition");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("User", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("User", object, MAX(command_len, 1))) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("WCKeys", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("WCKeys", object,
+ MAX(command_len, 2))) {
field->type = PRINT_WCKEYS;
field->name = xstrdup("WCKeys");
field->len = 20;
@@ -778,11 +778,11 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
int rc = SLURM_SUCCESS;
char *tmp_char = NULL;
- if (!assoc_list || !list_count(assoc_list))
+ if(!assoc_list || !list_count(assoc_list))
return rc;
format_list = list_create(slurm_destroy_char);
- if (user)
+ if(user)
slurm_addto_char_list(format_list,
"User,Account");
else
@@ -808,7 +808,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
assoc->acct);
break;
case PRINT_DQOS:
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn,
my_uid,
@@ -886,7 +886,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
assoc->partition);
break;
case PRINT_QOS:
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -911,7 +911,7 @@ static int _print_out_assoc(List assoc_list, bool user, bool add)
list_iterator_destroy(itr);
list_iterator_destroy(itr2);
list_destroy(print_fields_list);
- if (add)
+ if(add)
rc = acct_storage_g_add_associations(db_conn,
my_uid, assoc_list);
printf("--------------------------------------------------------------\n\n");
@@ -951,8 +951,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
slurmdb_init_association_rec(&mod_assoc);
memset(&assoc_cond, 0, sizeof(slurmdb_association_cond_t));
- if ((file_opts->fairshare != NO_VAL)
- && (assoc->shares_raw != file_opts->fairshare)) {
+ if((file_opts->fairshare != NO_VAL)
+ && (assoc->shares_raw != file_opts->fairshare)) {
mod_assoc.shares_raw = file_opts->fairshare;
changed = 1;
xstrfmtcat(my_info,
@@ -963,8 +963,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->fairshare);
}
- if ((file_opts->grp_cpu_mins != NO_VAL)
- && (assoc->grp_cpu_mins != file_opts->grp_cpu_mins)) {
+ if((file_opts->grp_cpu_mins != NO_VAL)
+ && (assoc->grp_cpu_mins != file_opts->grp_cpu_mins)) {
mod_assoc.grp_cpu_mins = file_opts->grp_cpu_mins;
changed = 1;
xstrfmtcat(my_info,
@@ -975,8 +975,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->grp_cpu_mins);
}
- if ((file_opts->grp_cpus != NO_VAL)
- && (assoc->grp_cpus != file_opts->grp_cpus)) {
+ if((file_opts->grp_cpus != NO_VAL)
+ && (assoc->grp_cpus != file_opts->grp_cpus)) {
mod_assoc.grp_cpus = file_opts->grp_cpus;
changed = 1;
xstrfmtcat(my_info,
@@ -987,8 +987,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->grp_cpus);
}
- if ((file_opts->grp_jobs != NO_VAL)
- && (assoc->grp_jobs != file_opts->grp_jobs)) {
+ if((file_opts->grp_jobs != NO_VAL)
+ && (assoc->grp_jobs != file_opts->grp_jobs)) {
mod_assoc.grp_jobs = file_opts->grp_jobs;
changed = 1;
xstrfmtcat(my_info,
@@ -999,8 +999,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->grp_jobs);
}
- if ((file_opts->grp_nodes != NO_VAL)
- && (assoc->grp_nodes != file_opts->grp_nodes)) {
+ if((file_opts->grp_nodes != NO_VAL)
+ && (assoc->grp_nodes != file_opts->grp_nodes)) {
mod_assoc.grp_nodes = file_opts->grp_nodes;
changed = 1;
xstrfmtcat(my_info,
@@ -1011,8 +1011,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->grp_nodes);
}
- if ((file_opts->grp_submit_jobs != NO_VAL)
- && (assoc->grp_submit_jobs != file_opts->grp_submit_jobs)) {
+ if((file_opts->grp_submit_jobs != NO_VAL)
+ && (assoc->grp_submit_jobs != file_opts->grp_submit_jobs)) {
mod_assoc.grp_submit_jobs = file_opts->grp_submit_jobs;
changed = 1;
xstrfmtcat(my_info,
@@ -1023,8 +1023,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->grp_submit_jobs);
}
- if ((file_opts->grp_wall != NO_VAL)
- && (assoc->grp_wall != file_opts->grp_wall)) {
+ if((file_opts->grp_wall != NO_VAL)
+ && (assoc->grp_wall != file_opts->grp_wall)) {
mod_assoc.grp_wall = file_opts->grp_wall;
changed = 1;
xstrfmtcat(my_info,
@@ -1035,8 +1035,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->grp_wall);
}
- if ((file_opts->max_cpu_mins_pj != (uint64_t)NO_VAL)
- && (assoc->max_cpu_mins_pj != file_opts->max_cpu_mins_pj)) {
+ if((file_opts->max_cpu_mins_pj != (uint64_t)NO_VAL)
+ && (assoc->max_cpu_mins_pj != file_opts->max_cpu_mins_pj)) {
mod_assoc.max_cpu_mins_pj =
file_opts->max_cpu_mins_pj;
changed = 1;
@@ -1048,8 +1048,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->max_cpu_mins_pj);
}
- if ((file_opts->max_cpus_pj != NO_VAL)
- && (assoc->max_cpus_pj != file_opts->max_cpus_pj)) {
+ if((file_opts->max_cpus_pj != NO_VAL)
+ && (assoc->max_cpus_pj != file_opts->max_cpus_pj)) {
mod_assoc.max_cpus_pj = file_opts->max_cpus_pj;
changed = 1;
xstrfmtcat(my_info,
@@ -1060,8 +1060,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->max_cpus_pj);
}
- if ((file_opts->max_jobs != NO_VAL)
- && (assoc->max_jobs != file_opts->max_jobs)) {
+ if((file_opts->max_jobs != NO_VAL)
+ && (assoc->max_jobs != file_opts->max_jobs)) {
mod_assoc.max_jobs = file_opts->max_jobs;
changed = 1;
xstrfmtcat(my_info,
@@ -1072,8 +1072,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->max_jobs);
}
- if ((file_opts->max_nodes_pj != NO_VAL)
- && (assoc->max_nodes_pj != file_opts->max_nodes_pj)) {
+ if((file_opts->max_nodes_pj != NO_VAL)
+ && (assoc->max_nodes_pj != file_opts->max_nodes_pj)) {
mod_assoc.max_nodes_pj = file_opts->max_nodes_pj;
changed = 1;
xstrfmtcat(my_info,
@@ -1084,8 +1084,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->max_nodes_pj);
}
- if ((file_opts->max_submit_jobs != NO_VAL)
- && (assoc->max_submit_jobs != file_opts->max_submit_jobs)) {
+ if((file_opts->max_submit_jobs != NO_VAL)
+ && (assoc->max_submit_jobs != file_opts->max_submit_jobs)) {
mod_assoc.max_submit_jobs = file_opts->max_submit_jobs;
changed = 1;
xstrfmtcat(my_info,
@@ -1096,8 +1096,8 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
file_opts->max_submit_jobs);
}
- if ((file_opts->max_wall_pj != NO_VAL)
- && (assoc->max_wall_pj != file_opts->max_wall_pj)) {
+ if((file_opts->max_wall_pj != NO_VAL)
+ && (assoc->max_wall_pj != file_opts->max_wall_pj)) {
mod_assoc.max_wall_pj = file_opts->max_wall_pj;
changed = 1;
xstrfmtcat(my_info,
@@ -1107,7 +1107,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
assoc->max_wall_pj,
file_opts->max_wall_pj);
}
- if (assoc->parent_acct && parent && strcmp(assoc->parent_acct, parent)) {
+ if(assoc->parent_acct && parent && strcmp(assoc->parent_acct, parent)) {
mod_assoc.parent_acct = parent;
changed = 1;
xstrfmtcat(my_info,
@@ -1118,31 +1118,31 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
parent);
}
- if (assoc->qos_list && list_count(assoc->qos_list)
- && file_opts->qos_list && list_count(file_opts->qos_list)) {
+ if(assoc->qos_list && list_count(assoc->qos_list)
+ && file_opts->qos_list && list_count(file_opts->qos_list)) {
ListIterator now_qos_itr =
list_iterator_create(assoc->qos_list),
new_qos_itr = list_iterator_create(file_opts->qos_list);
char *now_qos = NULL, *new_qos = NULL;
- if (!mod_assoc.qos_list)
+ if(!mod_assoc.qos_list)
mod_assoc.qos_list = list_create(slurm_destroy_char);
while((new_qos = list_next(new_qos_itr))) {
while((now_qos = list_next(now_qos_itr))) {
- if (!strcmp(new_qos, now_qos))
+ if(!strcmp(new_qos, now_qos))
break;
}
list_iterator_reset(now_qos_itr);
- if (!now_qos)
+ if(!now_qos)
list_append(mod_assoc.qos_list,
xstrdup(new_qos));
}
list_iterator_destroy(new_qos_itr);
list_iterator_destroy(now_qos_itr);
- if (mod_assoc.qos_list && list_count(mod_assoc.qos_list))
+ if(mod_assoc.qos_list && list_count(mod_assoc.qos_list))
new_qos = get_qos_complete_str(g_qos_list,
mod_assoc.qos_list);
- if (new_qos) {
+ if(new_qos) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s\n",
" Added QOS",
@@ -1154,11 +1154,11 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
list_destroy(mod_assoc.qos_list);
mod_assoc.qos_list = NULL;
}
- } else if (file_opts->qos_list && list_count(file_opts->qos_list)) {
+ } else if(file_opts->qos_list && list_count(file_opts->qos_list)) {
char *new_qos = get_qos_complete_str(g_qos_list,
file_opts->qos_list);
- if (new_qos) {
+ if(new_qos) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s\n",
" Added QOS",
@@ -1171,7 +1171,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
}
}
- if (changed) {
+ if(changed) {
List ret_list = NULL;
assoc_cond.cluster_list = list_create(NULL);
@@ -1180,10 +1180,10 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
assoc_cond.acct_list = list_create(NULL);
list_push(assoc_cond.acct_list, assoc->acct);
- if (mod_type == MOD_USER) {
+ if(mod_type == MOD_USER) {
assoc_cond.user_list = list_create(NULL);
list_push(assoc_cond.user_list, assoc->user);
- if (assoc->partition) {
+ if(assoc->partition) {
assoc_cond.partition_list = list_create(NULL);
list_push(assoc_cond.partition_list,
assoc->partition);
@@ -1197,17 +1197,17 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
&mod_assoc);
notice_thread_fini();
- if (mod_assoc.qos_list)
+ if(mod_assoc.qos_list)
list_destroy(mod_assoc.qos_list);
list_destroy(assoc_cond.cluster_list);
list_destroy(assoc_cond.acct_list);
- if (assoc_cond.user_list)
+ if(assoc_cond.user_list)
list_destroy(assoc_cond.user_list);
- if (assoc_cond.partition_list)
+ if(assoc_cond.partition_list)
list_destroy(assoc_cond.partition_list);
-/* if (ret_list && list_count(ret_list)) { */
+/* if(ret_list && list_count(ret_list)) { */
/* char *object = NULL; */
/* ListIterator itr = list_iterator_create(ret_list); */
/* printf(" Modified account defaults for " */
@@ -1217,7 +1217,7 @@ static int _mod_assoc(sacctmgr_file_opts_t *file_opts,
/* list_iterator_destroy(itr); */
/* } */
- if (ret_list) {
+ if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
} else
@@ -1239,8 +1239,8 @@ static int _mod_cluster(sacctmgr_file_opts_t *file_opts,
slurmdb_init_cluster_rec(&mod_cluster);
slurmdb_init_cluster_cond(&cluster_cond);
- if (file_opts->classification
- && (file_opts->classification != cluster->classification)) {
+ if(file_opts->classification
+ && (file_opts->classification != cluster->classification)) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Classification", "Cluster",
@@ -1251,7 +1251,7 @@ static int _mod_cluster(sacctmgr_file_opts_t *file_opts,
changed = 1;
}
- if (changed) {
+ if(changed) {
List ret_list = NULL;
cluster_cond.cluster_list = list_create(NULL);
@@ -1266,7 +1266,7 @@ static int _mod_cluster(sacctmgr_file_opts_t *file_opts,
list_destroy(cluster_cond.cluster_list);
-/* if (ret_list && list_count(ret_list)) { */
+/* if(ret_list && list_count(ret_list)) { */
/* char *object = NULL; */
/* ListIterator itr = list_iterator_create(ret_list); */
/* printf(" Modified account defaults for " */
@@ -1276,14 +1276,14 @@ static int _mod_cluster(sacctmgr_file_opts_t *file_opts,
/* list_iterator_destroy(itr); */
/* } */
- if (ret_list) {
+ if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
} else
changed = 0;
xfree(my_info);
}
- if (!cluster->root_assoc || !cluster->root_assoc->cluster) {
+ if(!cluster->root_assoc || !cluster->root_assoc->cluster) {
error("Cluster %s doesn't appear to have a root association. "
"Try removing this cluster and then re-run load.",
cluster->name);
@@ -1309,10 +1309,10 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
memset(&acct_cond, 0, sizeof(slurmdb_account_cond_t));
memset(&assoc_cond, 0, sizeof(slurmdb_association_cond_t));
- if (file_opts->desc)
+ if(file_opts->desc)
desc = xstrdup(file_opts->desc);
- if (desc && strcmp(desc, acct->description)) {
+ if(desc && strcmp(desc, acct->description)) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed description", "Account",
@@ -1324,10 +1324,10 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
} else
xfree(desc);
- if (file_opts->org)
+ if(file_opts->org)
org = xstrdup(file_opts->org);
- if (org && strcmp(org, acct->organization)) {
+ if(org && strcmp(org, acct->organization)) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed organization", "Account",
@@ -1339,7 +1339,7 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
} else
xfree(org);
- if (changed) {
+ if(changed) {
List ret_list = NULL;
assoc_cond.acct_list = list_create(NULL);
@@ -1354,7 +1354,7 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
list_destroy(assoc_cond.acct_list);
-/* if (ret_list && list_count(ret_list)) { */
+/* if(ret_list && list_count(ret_list)) { */
/* char *object = NULL; */
/* ListIterator itr = list_iterator_create(ret_list); */
/* printf(" Modified account defaults for " */
@@ -1364,7 +1364,7 @@ static int _mod_acct(sacctmgr_file_opts_t *file_opts,
/* list_iterator_destroy(itr); */
/* } */
- if (ret_list) {
+ if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
} else
@@ -1388,7 +1388,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
List ret_list = NULL;
slurmdb_association_cond_t assoc_cond;
- if (!user || !user->name) {
+ if(!user || !user->name) {
fatal(" We need a user name in _mod_user");
}
@@ -1400,11 +1400,11 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
list_append(assoc_cond.user_list, user->name);
user_cond.assoc_cond = &assoc_cond;
- if (file_opts->def_acct)
+ if(file_opts->def_acct)
def_acct = xstrdup(file_opts->def_acct);
- if (def_acct &&
- (!user->default_acct || strcmp(def_acct, user->default_acct))) {
+ if(def_acct &&
+ (!user->default_acct || strcmp(def_acct, user->default_acct))) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Default Account", "User",
@@ -1415,11 +1415,11 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
changed = 1;
}
- if (file_opts->def_wckey)
+ if(file_opts->def_wckey)
def_wckey = xstrdup(file_opts->def_wckey);
- if (def_wckey &&
- (!user->default_wckey || strcmp(def_wckey, user->default_wckey))) {
+ if(def_wckey &&
+ (!user->default_wckey || strcmp(def_wckey, user->default_wckey))) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Default WCKey", "User",
@@ -1430,9 +1430,9 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
changed = 1;
}
- if (user->admin_level != SLURMDB_ADMIN_NOTSET
- && file_opts->admin != SLURMDB_ADMIN_NOTSET
- && user->admin_level != file_opts->admin) {
+ if(user->admin_level != SLURMDB_ADMIN_NOTSET
+ && file_opts->admin != SLURMDB_ADMIN_NOTSET
+ && user->admin_level != file_opts->admin) {
xstrfmtcat(my_info,
"%-30.30s for %-7.7s %-10.10s %8s -> %s\n",
" Changed Admin Level", "User",
@@ -1445,7 +1445,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
changed = 1;
}
- if (changed) {
+ if(changed) {
notice_thread_init();
ret_list = acct_storage_g_modify_users(
db_conn, my_uid,
@@ -1453,7 +1453,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
&mod_user);
notice_thread_fini();
-/* if (ret_list && list_count(ret_list)) { */
+/* if(ret_list && list_count(ret_list)) { */
/* char *object = NULL; */
/* ListIterator itr = list_iterator_create(ret_list); */
/* printf(" Modified user defaults for " */
@@ -1463,7 +1463,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
/* list_iterator_destroy(itr); */
/* } */
- if (ret_list) {
+ if(ret_list) {
printf("%s", my_info);
list_destroy(ret_list);
set = 1;
@@ -1473,9 +1473,9 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
xfree(def_acct);
xfree(def_wckey);
- if ((!user->coord_accts || !list_count(user->coord_accts))
- && (file_opts->coord_list
- && list_count(file_opts->coord_list))) {
+ if((!user->coord_accts || !list_count(user->coord_accts))
+ && (file_opts->coord_list
+ && list_count(file_opts->coord_list))) {
ListIterator coord_itr = NULL;
char *temp_char = NULL;
slurmdb_coord_rec_t *coord = NULL;
@@ -1496,7 +1496,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
coord->direct = 1;
list_push(user->coord_accts, coord);
- if (first) {
+ if(first) {
printf(" %s", temp_char);
first = 0;
} else
@@ -1505,9 +1505,9 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
list_iterator_destroy(coord_itr);
printf("\n");
set = 1;
- } else if ((user->coord_accts && list_count(user->coord_accts))
- && (file_opts->coord_list
- && list_count(file_opts->coord_list))) {
+ } else if((user->coord_accts && list_count(user->coord_accts))
+ && (file_opts->coord_list
+ && list_count(file_opts->coord_list))) {
ListIterator coord_itr = NULL;
ListIterator char_itr = NULL;
char *temp_char = NULL;
@@ -1519,13 +1519,13 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
while((temp_char = list_next(char_itr))) {
while((coord = list_next(coord_itr))) {
- if (!coord->direct)
+ if(!coord->direct)
continue;
- if (!strcmp(coord->name, temp_char)) {
+ if(!strcmp(coord->name, temp_char)) {
break;
}
}
- if (!coord) {
+ if(!coord) {
printf(" Making User '%s' coordinator of "
"account '%s'\n",
user->name,
@@ -1539,7 +1539,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
list_iterator_destroy(char_itr);
list_iterator_destroy(coord_itr);
- if (list_count(add_list)) {
+ if(list_count(add_list)) {
notice_thread_init();
rc = acct_storage_g_add_coord(db_conn, my_uid,
add_list,
@@ -1550,9 +1550,9 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
list_destroy(add_list);
}
- if ((!user->wckey_list || !list_count(user->wckey_list))
- && (file_opts->wckey_list
- && list_count(file_opts->wckey_list))) {
+ if((!user->wckey_list || !list_count(user->wckey_list))
+ && (file_opts->wckey_list
+ && list_count(file_opts->wckey_list))) {
ListIterator wckey_itr = NULL;
char *temp_char = NULL;
slurmdb_wckey_rec_t *wckey = NULL;
@@ -1568,7 +1568,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
wckey->user = xstrdup(user->name);
list_push(user->wckey_list, wckey);
- if (first) {
+ if(first) {
printf("'%s'", temp_char);
first = 0;
} else
@@ -1581,9 +1581,9 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
rc = acct_storage_g_add_wckeys(db_conn, my_uid,
user->wckey_list);
notice_thread_fini();
- } else if ((user->wckey_list && list_count(user->wckey_list))
- && (file_opts->wckey_list
- && list_count(file_opts->wckey_list))) {
+ } else if((user->wckey_list && list_count(user->wckey_list))
+ && (file_opts->wckey_list
+ && list_count(file_opts->wckey_list))) {
ListIterator wckey_itr = NULL;
ListIterator char_itr = NULL;
char *temp_char = NULL;
@@ -1595,10 +1595,10 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
while((temp_char = list_next(char_itr))) {
while((wckey = list_next(wckey_itr))) {
- if (!strcmp(wckey->name, temp_char))
+ if(!strcmp(wckey->name, temp_char))
break;
}
- if (!wckey) {
+ if(!wckey) {
printf(" Adding WCKey '%s' to User '%s'\n",
temp_char, user->name);
wckey = xmalloc(sizeof(slurmdb_wckey_rec_t));
@@ -1614,7 +1614,7 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
list_iterator_destroy(char_itr);
list_iterator_destroy(wckey_itr);
- if (list_count(add_list)) {
+ if(list_count(add_list)) {
notice_thread_init();
rc = acct_storage_g_add_wckeys(db_conn, my_uid,
add_list);
@@ -1631,26 +1631,26 @@ static int _mod_user(sacctmgr_file_opts_t *file_opts,
}
static slurmdb_user_rec_t *_set_user_up(sacctmgr_file_opts_t *file_opts,
- char *cluster, char *parent)
+ char *cluster, char *parent)
{
slurmdb_user_rec_t *user = xmalloc(sizeof(slurmdb_user_rec_t));
user->assoc_list = NULL;
user->name = xstrdup(file_opts->name);
- if (file_opts->def_acct)
+ if(file_opts->def_acct)
user->default_acct = xstrdup(file_opts->def_acct);
else
user->default_acct = xstrdup(parent);
- if (file_opts->def_wckey)
+ if(file_opts->def_wckey)
user->default_wckey = xstrdup(file_opts->def_wckey);
else
user->default_wckey = xstrdup("");
user->admin_level = file_opts->admin;
- if (file_opts->coord_list) {
+ if(file_opts->coord_list) {
slurmdb_user_cond_t user_cond;
slurmdb_association_cond_t assoc_cond;
ListIterator coord_itr = NULL;
@@ -1680,7 +1680,7 @@ static slurmdb_user_rec_t *_set_user_up(sacctmgr_file_opts_t *file_opts,
list_iterator_destroy(coord_itr);
}
- if (file_opts->wckey_list) {
+ if(file_opts->wckey_list) {
ListIterator wckey_itr = NULL;
char *temp_char = NULL;
slurmdb_wckey_rec_t *wckey = NULL;
@@ -1704,18 +1704,18 @@ static slurmdb_user_rec_t *_set_user_up(sacctmgr_file_opts_t *file_opts,
static slurmdb_account_rec_t *_set_acct_up(sacctmgr_file_opts_t *file_opts,
- char *parent)
+ char *parent)
{
slurmdb_account_rec_t *acct = xmalloc(sizeof(slurmdb_account_rec_t));
acct->assoc_list = NULL;
acct->name = xstrdup(file_opts->name);
- if (file_opts->desc)
+ if(file_opts->desc)
acct->description = xstrdup(file_opts->desc);
else
acct->description = xstrdup(file_opts->name);
- if (file_opts->org)
+ if(file_opts->org)
acct->organization = xstrdup(file_opts->org);
- else if (strcmp(parent, "root"))
+ else if(strcmp(parent, "root"))
acct->organization = xstrdup(parent);
else
acct->organization = xstrdup(file_opts->name);
@@ -1727,17 +1727,17 @@ static slurmdb_account_rec_t *_set_acct_up(sacctmgr_file_opts_t *file_opts,
}
static slurmdb_association_rec_t *_set_assoc_up(sacctmgr_file_opts_t *file_opts,
- sacctmgr_mod_type_t mod_type,
- char *cluster, char *parent)
+ sacctmgr_mod_type_t mod_type,
+ char *cluster, char *parent)
{
slurmdb_association_rec_t *assoc = NULL;
- if (!cluster) {
+ if(!cluster) {
error("No cluster name was given for _set_assoc_up");
return NULL;
}
- if (!parent && (mod_type != MOD_CLUSTER)) {
+ if(!parent && (mod_type != MOD_CLUSTER)) {
error("No parent was given for _set_assoc_up");
return NULL;
}
@@ -1786,7 +1786,7 @@ static slurmdb_association_rec_t *_set_assoc_up(sacctmgr_file_opts_t *file_opts,
assoc->max_submit_jobs = file_opts->max_submit_jobs;
assoc->max_wall_pj = file_opts->max_wall_pj;
- if (file_opts->qos_list && list_count(file_opts->qos_list))
+ if(file_opts->qos_list && list_count(file_opts->qos_list))
assoc->qos_list = copy_char_list(file_opts->qos_list);
@@ -1805,32 +1805,32 @@ static int _print_file_slurmdb_hierarchical_rec_childern(
itr = list_iterator_create(slurmdb_hierarchical_rec_list);
while((slurmdb_hierarchical_rec = list_next(itr))) {
- if (slurmdb_hierarchical_rec->assoc->user) {
+ if(slurmdb_hierarchical_rec->assoc->user) {
user_rec = sacctmgr_find_user_from_list(
user_list,
slurmdb_hierarchical_rec->assoc->user);
line = xstrdup_printf(
"User - %s",
slurmdb_hierarchical_rec->sort_name);
- if (slurmdb_hierarchical_rec->assoc->partition)
+ if(slurmdb_hierarchical_rec->assoc->partition)
xstrfmtcat(line, ":Partition='%s'",
slurmdb_hierarchical_rec->
assoc->partition);
- if (user_rec) {
+ if(user_rec) {
xstrfmtcat(line, ":DefaultAccount='%s'",
user_rec->default_acct);
- if (user_rec->default_wckey
- && user_rec->default_wckey[0])
+ if(user_rec->default_wckey
+ && user_rec->default_wckey[0])
xstrfmtcat(line, ":DefaultWCKey='%s'",
user_rec->default_wckey);
- if (user_rec->admin_level > SLURMDB_ADMIN_NONE)
+ if(user_rec->admin_level > SLURMDB_ADMIN_NONE)
xstrfmtcat(line, ":AdminLevel='%s'",
slurmdb_admin_level_str(
user_rec->
admin_level));
- if (user_rec->coord_accts
- && list_count(user_rec->coord_accts)) {
+ if(user_rec->coord_accts
+ && list_count(user_rec->coord_accts)) {
ListIterator itr2 = NULL;
slurmdb_coord_rec_t *coord = NULL;
int first_coord = 1;
@@ -1842,9 +1842,9 @@ static int _print_file_slurmdb_hierarchical_rec_childern(
/* We only care about
* the direct accounts here
*/
- if (!coord->direct)
+ if(!coord->direct)
continue;
- if (first_coord) {
+ if(first_coord) {
xstrfmtcat(
line,
":Coordinator"
@@ -1856,20 +1856,20 @@ static int _print_file_slurmdb_hierarchical_rec_childern(
coord->name);
}
}
- if (!first_coord)
+ if(!first_coord)
xstrcat(line, "'");
list_iterator_destroy(itr2);
}
- if (user_rec->wckey_list
- && list_count(user_rec->wckey_list)) {
+ if(user_rec->wckey_list
+ && list_count(user_rec->wckey_list)) {
ListIterator itr2 = NULL;
slurmdb_wckey_rec_t *wckey = NULL;
int first_wckey = 1;
itr2 = list_iterator_create(
user_rec->wckey_list);
while((wckey = list_next(itr2))) {
- if (first_wckey) {
+ if(first_wckey) {
xstrfmtcat(
line,
":WCKeys='%s",
@@ -1880,7 +1880,7 @@ static int _print_file_slurmdb_hierarchical_rec_childern(
wckey->name);
}
}
- if (!first_wckey)
+ if(!first_wckey)
xstrcat(line, "'");
list_iterator_destroy(itr2);
}
@@ -1892,7 +1892,7 @@ static int _print_file_slurmdb_hierarchical_rec_childern(
line = xstrdup_printf(
"Account - %s",
slurmdb_hierarchical_rec->sort_name);
- if (acct_rec) {
+ if(acct_rec) {
xstrfmtcat(line, ":Description='%s'",
acct_rec->description);
xstrfmtcat(line, ":Organization='%s'",
@@ -1903,7 +1903,7 @@ static int _print_file_slurmdb_hierarchical_rec_childern(
print_file_add_limits_to_line(&line,
slurmdb_hierarchical_rec->assoc);
- if (fprintf(fd, "%s\n", line) < 0) {
+ if(fprintf(fd, "%s\n", line) < 0) {
exit_code=1;
fprintf(stderr, " Can't write to file");
xfree(line);
@@ -1923,61 +1923,61 @@ static int _print_file_slurmdb_hierarchical_rec_childern(
extern int print_file_add_limits_to_line(char **line,
slurmdb_association_rec_t *assoc)
{
- if (!assoc)
+ if(!assoc)
return SLURM_ERROR;
- if (assoc->def_qos_id) {
+ if(assoc->def_qos_id) {
char *tmp_char;
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
tmp_char = slurmdb_qos_str(g_qos_list, assoc->def_qos_id);
xstrfmtcat(*line, ":DefaultQOS='%s'", tmp_char);
}
- if (assoc->shares_raw != INFINITE)
+ if(assoc->shares_raw != INFINITE)
xstrfmtcat(*line, ":Fairshare=%u", assoc->shares_raw);
- if (assoc->grp_cpu_mins != (uint64_t)INFINITE)
+ if(assoc->grp_cpu_mins != (uint64_t)INFINITE)
xstrfmtcat(*line, ":GrpCPUMins=%llu", assoc->grp_cpu_mins);
- if (assoc->grp_cpus != INFINITE)
+ if(assoc->grp_cpus != INFINITE)
xstrfmtcat(*line, ":GrpCPUs=%u", assoc->grp_cpus);
- if (assoc->grp_jobs != INFINITE)
+ if(assoc->grp_jobs != INFINITE)
xstrfmtcat(*line, ":GrpJobs=%u", assoc->grp_jobs);
- if (assoc->grp_nodes != INFINITE)
+ if(assoc->grp_nodes != INFINITE)
xstrfmtcat(*line, ":GrpNodes=%u", assoc->grp_nodes);
- if (assoc->grp_submit_jobs != INFINITE)
+ if(assoc->grp_submit_jobs != INFINITE)
xstrfmtcat(*line, ":GrpSubmitJobs=%u", assoc->grp_submit_jobs);
- if (assoc->grp_wall != INFINITE)
+ if(assoc->grp_wall != INFINITE)
xstrfmtcat(*line, ":GrpWall=%u", assoc->grp_wall);
- if (assoc->max_cpu_mins_pj != (uint64_t)INFINITE)
+ if(assoc->max_cpu_mins_pj != (uint64_t)INFINITE)
xstrfmtcat(*line, ":MaxCPUMinsPerJob=%llu",
assoc->max_cpu_mins_pj);
- if (assoc->max_cpus_pj != INFINITE)
+ if(assoc->max_cpus_pj != INFINITE)
xstrfmtcat(*line, ":MaxCPUsPerJob=%u", assoc->max_cpus_pj);
- if (assoc->max_jobs != INFINITE)
+ if(assoc->max_jobs != INFINITE)
xstrfmtcat(*line, ":MaxJobs=%u", assoc->max_jobs);
- if (assoc->max_nodes_pj != INFINITE)
+ if(assoc->max_nodes_pj != INFINITE)
xstrfmtcat(*line, ":MaxNodesPerJob=%u", assoc->max_nodes_pj);
- if (assoc->max_submit_jobs != INFINITE)
+ if(assoc->max_submit_jobs != INFINITE)
xstrfmtcat(*line, ":MaxSubmitJobs=%u", assoc->max_submit_jobs);
- if (assoc->max_wall_pj != INFINITE)
+ if(assoc->max_wall_pj != INFINITE)
xstrfmtcat(*line, ":MaxWallDurationPerJob=%u",
assoc->max_wall_pj);
- if (assoc->qos_list && list_count(assoc->qos_list)) {
+ if(assoc->qos_list && list_count(assoc->qos_list)) {
char *temp_char = NULL;
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -2005,15 +2005,15 @@ extern int print_file_slurmdb_hierarchical_rec_list(
/* depth, list_count(slurmdb_hierarchical_rec->childern), */
/* slurmdb_hierarchical_rec->assoc->acct,
slurmdb_hierarchical_rec->assoc->user); */
- if (!list_count(slurmdb_hierarchical_rec->childern))
+ if(!list_count(slurmdb_hierarchical_rec->childern))
continue;
- if (fprintf(fd, "Parent - %s\n",
- slurmdb_hierarchical_rec->assoc->acct) < 0) {
+ if(fprintf(fd, "Parent - %s\n",
+ slurmdb_hierarchical_rec->assoc->acct) < 0) {
error("Can't write to file");
return SLURM_ERROR;
}
info("%s - %s", "Parent",
- slurmdb_hierarchical_rec->assoc->acct);
+ slurmdb_hierarchical_rec->assoc->acct);
/* info("sending %d from %s", */
/* list_count(slurmdb_hierarchical_rec->childern), */
/* slurmdb_hierarchical_rec->assoc->acct); */
@@ -2072,7 +2072,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
int set = 0, command_len = 0;
- if (readonly_flag) {
+ if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
return;
@@ -2084,21 +2084,21 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
for (i=0; i<argc; i++) {
int option = 0;
int end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "clean",
- MAX(command_len, 3))) {
+ if(!end && !strncasecmp(argv[i], "clean",
+ MAX(command_len, 3))) {
start_clean = 1;
- } else if (!end || !strncasecmp(argv[i], "File",
+ } else if(!end || !strncasecmp (argv[i], "File",
MAX(command_len, 1))) {
- if (file_name) {
+ if(file_name) {
exit_code=1;
fprintf(stderr,
" File name already set to %s\n",
@@ -2106,9 +2106,9 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
continue;
}
file_name = xstrdup(argv[i]+end);
- } else if (!strncasecmp(argv[i], "Cluster",
- MAX(command_len, 3))) {
- if (cluster_name) {
+ } else if (!strncasecmp (argv[i], "Cluster",
+ MAX(command_len, 3))) {
+ if(cluster_name) {
exit_code=1;
fprintf(stderr,
" Can only do one cluster at a time. "
@@ -2123,7 +2123,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
}
- if (!file_name) {
+ if(!file_name) {
exit_code=1;
xfree(cluster_name);
fprintf(stderr,
@@ -2168,21 +2168,21 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
/* first find the object */
start=0;
for(i=0; i<len; i++) {
- if (line[i] == '-') {
+ if(line[i] == '-') {
start = i;
- if (line[i-1] == ' ')
+ if(line[i-1] == ' ')
i--;
- if (i<sizeof(object))
+ if(i<sizeof(object))
strncpy(object, line, i);
break;
}
}
- if (!object[0])
+ if(!object[0])
continue;
while(line[start] != ' ' && start<len)
start++;
- if (start>=len) {
+ if(start>=len) {
exit_code=1;
fprintf(stderr, " Nothing after object "
"name '%s'. line(%d)\n",
@@ -2192,21 +2192,21 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
start++;
- if (!strcasecmp("Machine", object)
- || !strcasecmp("Cluster", object)) {
+ if(!strcasecmp("Machine", object)
+ || !strcasecmp("Cluster", object)) {
slurmdb_association_cond_t assoc_cond;
- if (cluster_name && !cluster_name_set) {
+ if(cluster_name && !cluster_name_set) {
exit_code=1;
fprintf(stderr, " You can only add one cluster "
- "at a time.\n");
+ "at a time.\n");
rc = SLURM_ERROR;
break;
}
file_opts = _parse_options(line+start);
- if (!file_opts) {
+ if(!file_opts) {
exit_code=1;
fprintf(stderr,
" error: Problem with line(%d)\n", lc);
@@ -2214,7 +2214,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
break;
}
- if (!cluster_name_set)
+ if(!cluster_name_set)
cluster_name = xstrdup(file_opts->name);
/* we have to do this here since this is the
@@ -2237,28 +2237,28 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
/* make sure this person running is an admin */
user_name = uid_to_string(my_uid);
- if (!(user = sacctmgr_find_user_from_list(
- curr_user_list, user_name))) {
+ if(!(user = sacctmgr_find_user_from_list(
+ curr_user_list, user_name))) {
exit_code=1;
fprintf(stderr, " Your uid (%u) is not in the "
"accounting system, can't load file.\n",
my_uid);
- if (curr_user_list)
+ if(curr_user_list)
list_destroy(curr_user_list);
xfree(user_name);
return;
} else {
- if (my_uid != slurm_get_slurm_user_id()
- && my_uid != 0
- && (user->admin_level
- < SLURMDB_ADMIN_SUPER_USER)) {
+ if(my_uid != slurm_get_slurm_user_id()
+ && my_uid != 0
+ && (user->admin_level
+ < SLURMDB_ADMIN_SUPER_USER)) {
exit_code=1;
fprintf(stderr,
" Your user does not have "
"sufficient "
"privileges to load files.\n");
- if (curr_user_list)
+ if(curr_user_list)
list_destroy(curr_user_list);
xfree(user_name);
return;
@@ -2266,15 +2266,15 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
xfree(user_name);
- if (start_clean) {
+ if(start_clean) {
slurmdb_cluster_cond_t cluster_cond;
List ret_list = NULL;
- if (!commit_check("You requested to flush "
- "the cluster before "
- "adding it again.\n"
- "Are you sure you want "
- "to continue?")) {
+ if(!commit_check("You requested to flush "
+ "the cluster before "
+ "adding it again.\n"
+ "Are you sure you want "
+ "to continue?")) {
printf("Aborted\n");
break;
}
@@ -2290,7 +2290,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
notice_thread_fini();
list_destroy(cluster_cond.cluster_list);
- if (!ret_list) {
+ if(!ret_list) {
exit_code=1;
fprintf(stderr, " There was a problem "
"removing the cluster.\n");
@@ -2304,11 +2304,11 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
curr_cluster_list = acct_storage_g_get_clusters(
db_conn, my_uid, NULL);
- if (cluster_name)
+ if(cluster_name)
printf("For cluster %s\n", cluster_name);
- if (!(cluster = sacctmgr_find_cluster_from_list(
- curr_cluster_list, cluster_name))) {
+ if(!(cluster = sacctmgr_find_cluster_from_list(
+ curr_cluster_list, cluster_name))) {
List temp_assoc_list = list_create(NULL);
List cluster_list = list_create(
slurmdb_destroy_cluster_rec);
@@ -2318,7 +2318,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
slurmdb_init_cluster_rec(cluster);
list_append(cluster_list, cluster);
cluster->name = xstrdup(cluster_name);
- if (file_opts->classification) {
+ if(file_opts->classification) {
cluster->classification =
file_opts->classification;
printf("Classification: %s\n",
@@ -2342,7 +2342,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
notice_thread_fini();
list_destroy(cluster_list);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
exit_code=1;
fprintf(stderr,
" Problem adding cluster: %s\n",
@@ -2364,7 +2364,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
db_conn, my_uid, &assoc_cond);
list_destroy(assoc_cond.cluster_list);
- if (!curr_assoc_list) {
+ if(!curr_assoc_list) {
exit_code=1;
fprintf(stderr, " Problem getting associations "
"for this cluster\n");
@@ -2373,54 +2373,54 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
//info("got %d assocs", list_count(curr_assoc_list));
continue;
- } else if (!cluster_name) {
+ } else if(!cluster_name) {
exit_code=1;
fprintf(stderr, " You need to specify a cluster name "
"first with 'Cluster - $NAME' in your file\n");
break;
}
- if (!strcasecmp("Parent", object)) {
+ if(!strcasecmp("Parent", object)) {
xfree(parent);
i = start;
while(line[i] != '\n' && i<len)
i++;
- if (i >= len) {
+ if(i >= len) {
exit_code=1;
fprintf(stderr, " No parent name "
"given line(%d)\n",
- lc);
+ lc);
rc = SLURM_ERROR;
break;
}
parent = xstrndup(line+start, i-start);
//info("got parent %s", parent);
- if (!sacctmgr_find_account_base_assoc_from_list(
- curr_assoc_list, parent, cluster_name)
- && !sacctmgr_find_account_base_assoc_from_list(
- slurmdb_assoc_list, parent, cluster_name)) {
+ if(!sacctmgr_find_account_base_assoc_from_list(
+ curr_assoc_list, parent, cluster_name)
+ && !sacctmgr_find_account_base_assoc_from_list(
+ slurmdb_assoc_list, parent, cluster_name)) {
exit_code=1;
fprintf(stderr, " line(%d) You need to add "
- "this parent (%s) as a child before "
- "you can add childern to it.\n",
- lc, parent);
+ "this parent (%s) as a child before "
+ "you can add childern to it.\n",
+ lc, parent);
break;
}
continue;
- } else if (!parent) {
+ } else if(!parent) {
parent = xstrdup("root");
printf(" No parent given creating off root, "
"If incorrect specify 'Parent - name' "
"before any childern in your file\n");
}
- if (!strcasecmp("Project", object)
- || !strcasecmp("Account", object)) {
+ if(!strcasecmp("Project", object)
+ || !strcasecmp("Account", object)) {
file_opts = _parse_options(line+start);
- if (!file_opts) {
+ if(!file_opts) {
exit_code=1;
fprintf(stderr, " Problem with line(%d)\n", lc);
rc = SLURM_ERROR;
@@ -2428,10 +2428,10 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
//info("got a project %s of %s", file_opts->name, parent);
- if (!(acct = sacctmgr_find_account_from_list(
- curr_acct_list, file_opts->name))
- && !sacctmgr_find_account_from_list(
- acct_list, file_opts->name)) {
+ if(!(acct = sacctmgr_find_account_from_list(
+ curr_acct_list, file_opts->name))
+ && !sacctmgr_find_account_from_list(
+ acct_list, file_opts->name)) {
acct = _set_acct_up(file_opts, parent);
list_append(acct_list, acct);
/* don't add anything to the
@@ -2443,22 +2443,22 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_append(slurmdb_assoc_list, assoc);
/* don't add anything to the
curr_assoc_list */
- } else if (!(assoc =
- sacctmgr_find_account_base_assoc_from_list(
- curr_assoc_list, file_opts->name,
- cluster_name)) &&
- !sacctmgr_find_account_base_assoc_from_list(
- slurmdb_assoc_list, file_opts->name,
- cluster_name)) {
+ } else if(!(assoc =
+ sacctmgr_find_account_base_assoc_from_list(
+ curr_assoc_list, file_opts->name,
+ cluster_name)) &&
+ !sacctmgr_find_account_base_assoc_from_list(
+ slurmdb_assoc_list, file_opts->name,
+ cluster_name)) {
acct2 = sacctmgr_find_account_from_list(
mod_acct_list, file_opts->name);
- if (!acct2) {
+ if(!acct2) {
acct2 = xmalloc(
sizeof(slurmdb_account_rec_t));
list_append(mod_acct_list, acct2);
acct2->name = xstrdup(file_opts->name);
- if (_mod_acct(file_opts, acct, parent))
+ if(_mod_acct(file_opts, acct, parent))
set = 1;
} else {
debug2("already modified this account");
@@ -2470,16 +2470,16 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_append(slurmdb_assoc_list, assoc);
/* don't add anything to the
curr_assoc_list */
- } else if (assoc) {
+ } else if(assoc) {
acct2 = sacctmgr_find_account_from_list(
mod_acct_list, file_opts->name);
- if (!acct2) {
+ if(!acct2) {
acct2 = xmalloc(
sizeof(slurmdb_account_rec_t));
list_append(mod_acct_list, acct2);
acct2->name = xstrdup(file_opts->name);
- if (_mod_acct(file_opts, acct, parent))
+ if(_mod_acct(file_opts, acct, parent))
set = 1;
} else {
debug2("already modified this account");
@@ -2491,7 +2491,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
cluster_name,
NULL);
- if (!assoc2) {
+ if(!assoc2) {
assoc2 = xmalloc(
sizeof(slurmdb_association_rec_t));
slurmdb_init_association_rec(assoc2);
@@ -2500,8 +2500,8 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
assoc2->acct = xstrdup(file_opts->name);
assoc2->parent_acct =
xstrdup(assoc->parent_acct);
- if (_mod_assoc(file_opts,
- assoc, MOD_ACCT, parent))
+ if(_mod_assoc(file_opts,
+ assoc, MOD_ACCT, parent))
set = 1;
} else {
debug2("already modified this assoc");
@@ -2509,20 +2509,20 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
}
_destroy_sacctmgr_file_opts(file_opts);
continue;
- } else if (!strcasecmp("User", object)) {
+ } else if(!strcasecmp("User", object)) {
file_opts = _parse_options(line+start);
- if (!file_opts) {
+ if(!file_opts) {
exit_code=1;
fprintf(stderr, " Problem with line(%d)\n", lc);
rc = SLURM_ERROR;
break;
}
- if (!(user = sacctmgr_find_user_from_list(
- curr_user_list, file_opts->name))
- && !sacctmgr_find_user_from_list(
- user_list, file_opts->name)) {
+ if(!(user = sacctmgr_find_user_from_list(
+ curr_user_list, file_opts->name))
+ && !sacctmgr_find_user_from_list(
+ user_list, file_opts->name)) {
user = _set_user_up(file_opts, cluster_name,
parent);
@@ -2536,21 +2536,21 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_append(user_assoc_list, assoc);
/* don't add anything to the
curr_assoc_list */
- } else if (!(assoc = sacctmgr_find_association_from_list(
- curr_assoc_list,
- file_opts->name, parent,
- cluster_name, file_opts->part))
- && !sacctmgr_find_association_from_list(
- user_assoc_list,
- file_opts->name, parent,
- cluster_name,
- file_opts->part)) {
+ } else if(!(assoc = sacctmgr_find_association_from_list(
+ curr_assoc_list,
+ file_opts->name, parent,
+ cluster_name, file_opts->part))
+ && !sacctmgr_find_association_from_list(
+ user_assoc_list,
+ file_opts->name, parent,
+ cluster_name,
+ file_opts->part)) {
/* This means the user was added
* during this round but this is a new
* association we are adding
*/
- if (!user)
+ if(!user)
goto new_association;
/* This means there could be a change
@@ -2558,13 +2558,13 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
*/
user2 = sacctmgr_find_user_from_list(
mod_user_list, file_opts->name);
- if (!user2) {
+ if(!user2) {
user2 = xmalloc(
sizeof(slurmdb_user_rec_t));
list_append(mod_user_list, user2);
user2->name = xstrdup(file_opts->name);
- if (_mod_user(file_opts, user,
- cluster_name, parent))
+ if(_mod_user(file_opts, user,
+ cluster_name, parent))
set = 1;
} else {
debug2("already modified this user");
@@ -2576,16 +2576,16 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_append(user_assoc_list, assoc);
/* don't add anything to the
curr_assoc_list */
- } else if (assoc) {
+ } else if(assoc) {
user2 = sacctmgr_find_user_from_list(
mod_user_list, file_opts->name);
- if (!user2) {
+ if(!user2) {
user2 = xmalloc(
sizeof(slurmdb_user_rec_t));
list_append(mod_user_list, user2);
user2->name = xstrdup(file_opts->name);
- if (_mod_user(file_opts, user,
- cluster_name, parent))
+ if(_mod_user(file_opts, user,
+ cluster_name, parent))
set = 1;
} else {
debug2("already modified this user");
@@ -2597,7 +2597,7 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
cluster_name,
file_opts->part);
- if (!assoc2) {
+ if(!assoc2) {
assoc2 = xmalloc(
sizeof(slurmdb_association_rec_t));
slurmdb_init_association_rec(assoc2);
@@ -2607,8 +2607,8 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
assoc2->user = xstrdup(file_opts->name);
assoc2->partition =
xstrdup(file_opts->part);
- if (_mod_assoc(file_opts,
- assoc, MOD_USER, parent))
+ if(_mod_assoc(file_opts,
+ assoc, MOD_USER, parent))
set = 1;
} else {
debug2("already modified this assoc");
@@ -2630,10 +2630,10 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
xfree(parent);
START_TIMER;
- if (rc == SLURM_SUCCESS && list_count(acct_list)) {
+ if(rc == SLURM_SUCCESS && list_count(acct_list)) {
printf("Accounts\n");
slurm_addto_char_list(format_list,
- "Name,Description,Organization,QOS");
+ "Name,Description,Organization,QOS");
print_fields_list = _set_up_print_fields(format_list);
list_flush(format_list);
@@ -2675,12 +2675,12 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
set = 1;
}
- if (rc == SLURM_SUCCESS && list_count(slurmdb_assoc_list)) {
+ if(rc == SLURM_SUCCESS && list_count(slurmdb_assoc_list)) {
printf("Account Associations\n");
rc = _print_out_assoc(slurmdb_assoc_list, 0, 1);
set = 1;
}
- if (rc == SLURM_SUCCESS && list_count(user_list)) {
+ if(rc == SLURM_SUCCESS && list_count(user_list)) {
printf("Users\n");
slurm_addto_char_list(format_list,
@@ -2743,19 +2743,19 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
set = 1;
}
- if (rc == SLURM_SUCCESS && list_count(user_assoc_list)) {
+ if(rc == SLURM_SUCCESS && list_count(user_assoc_list)) {
printf("User Associations\n");
rc = _print_out_assoc(user_assoc_list, 1, 1);
set = 1;
}
END_TIMER2("add cluster");
- if (set)
+ if(set)
info("Done adding cluster in %s", TIME_STR);
- if (rc == SLURM_SUCCESS) {
- if (set) {
- if (commit_check("Would you like to commit changes?")) {
+ if(rc == SLURM_SUCCESS) {
+ if(set) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
@@ -2778,12 +2778,12 @@ extern void load_sacctmgr_cfg_file (int argc, char *argv[])
list_destroy(user_list);
list_destroy(user_assoc_list);
list_destroy(mod_assoc_list);
- if (curr_acct_list)
+ if(curr_acct_list)
list_destroy(curr_acct_list);
- if (curr_assoc_list)
+ if(curr_assoc_list)
list_destroy(curr_assoc_list);
- if (curr_cluster_list)
+ if(curr_cluster_list)
list_destroy(curr_cluster_list);
- if (curr_user_list)
+ if(curr_user_list)
list_destroy(curr_user_list);
}
diff --git a/src/sacctmgr/problem_functions.c b/src/sacctmgr/problem_functions.c
index 3140f0e0f5fbeac416e35d27b8f988b83e8feb2e..0e2fca1b279246aad512948ec2a48ba6ea7a85ae 100644
--- a/src/sacctmgr/problem_functions.c
+++ b/src/sacctmgr/problem_functions.c
@@ -50,66 +50,66 @@ static int _set_cond(int *start, int argc, char *argv[],
int option = 0;
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "Tree",
+ if (!end && !strncasecmp (argv[i], "Tree",
MAX(command_len, 4))) {
tree_display = 1;
- } else if (!end && !strncasecmp(argv[i], "where",
+ } else if(!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if (!end || !strncasecmp(argv[i], "Ids",
+ } else if(!end || !strncasecmp (argv[i], "Ids",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Problems",
+ || !strncasecmp (argv[i], "Problems",
MAX(command_len, 2))) {
- if (!assoc_cond->id_list)
+ if(!assoc_cond->id_list)
assoc_cond->id_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->id_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))
- || !strncasecmp(argv[i], "Acct",
+ || !strncasecmp (argv[i], "Acct",
MAX(command_len, 4))) {
- if (!assoc_cond->acct_list)
+ if(!assoc_cond->acct_list)
assoc_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->acct_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
- if (!assoc_cond->cluster_list)
+ if(!assoc_cond->cluster_list)
assoc_cond->cluster_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list,
argv[i]+end);
- } else if (!strncasecmp(argv[i], "Partitions",
+ } else if (!strncasecmp (argv[i], "Partitions",
MAX(command_len, 4))) {
- if (!assoc_cond->partition_list)
+ if(!assoc_cond->partition_list)
assoc_cond->partition_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->partition_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Users",
+ } else if (!strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
- if (!assoc_cond->user_list)
+ if(!assoc_cond->user_list)
assoc_cond->user_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->user_list,
@@ -155,17 +155,17 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
_set_cond(&i, argc, argv, assoc_cond, format_list);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_association_cond(assoc_cond);
list_destroy(format_list);
return SLURM_ERROR;
- } else if (!list_count(format_list))
+ } else if(!list_count(format_list))
slurm_addto_char_list(format_list, "C,A,U,Problem");
print_fields_list = list_create(destroy_print_field);
@@ -176,7 +176,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -185,28 +185,28 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Account", object, MAX(command_len, 1))
+ if(!strncasecmp("Account", object, MAX(command_len, 1))
|| !strncasecmp("Acct", object, MAX(command_len, 4))) {
field->type = PRINT_ACCOUNT;
field->name = xstrdup("Account");
- if (tree_display)
+ if(tree_display)
field->len = -20;
else
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 1))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Problem", object,
+ } else if(!strncasecmp("Problem", object,
MAX(command_len, 1))) {
field->type = PRINT_PROBLEM;
field->name = xstrdup("Problem");
field->len = 40;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("User", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("User", object, MAX(command_len, 1))) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 10;
@@ -219,7 +219,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -227,7 +227,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_association_cond(assoc_cond);
list_destroy(print_fields_list);
return SLURM_ERROR;
@@ -236,7 +236,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
assoc_list = acct_storage_g_get_problems(db_conn, my_uid, assoc_cond);
slurmdb_destroy_association_cond(assoc_cond);
- if (!assoc_list) {
+ if(!assoc_list) {
exit_code=1;
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(errno));
@@ -294,7 +294,7 @@ extern int sacctmgr_list_problem(int argc, char *argv[])
printf("\n");
}
- if (tree_list)
+ if(tree_list)
list_destroy(tree_list);
list_iterator_destroy(itr2);
diff --git a/src/sacctmgr/qos_functions.c b/src/sacctmgr/qos_functions.c
index 8932296bb21294f732021d6fcd370209102c43df..2d92a45dfde83b51fa0c82902116a93a19bb62cf 100644
--- a/src/sacctmgr/qos_functions.c
+++ b/src/sacctmgr/qos_functions.c
@@ -49,7 +49,7 @@ static uint16_t _parse_preempt_modes(char *names)
uint16_t preempt_mode = 0;
uint16_t ret_mode = 0;
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -58,17 +58,17 @@ static uint16_t _parse_preempt_modes(char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
+ else if(names[i] == ',') {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
ret_mode = preempt_mode_num(name);
- if (ret_mode == (uint16_t)NO_VAL) {
+ if(ret_mode == (uint16_t)NO_VAL) {
error("Unknown preempt_mode given '%s'",
name);
xfree(name);
@@ -81,7 +81,7 @@ static uint16_t _parse_preempt_modes(char *names)
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -96,7 +96,7 @@ static uint16_t _parse_preempt_modes(char *names)
//info("got %s %d", name, i-start);
ret_mode = preempt_mode_num(name);
- if (ret_mode == (uint16_t)NO_VAL) {
+ if(ret_mode == (uint16_t)NO_VAL) {
error("Unknown preempt_mode given '%s'",
name);
xfree(name);
@@ -120,68 +120,68 @@ static int _set_cond(int *start, int argc, char *argv[],
int command_len = 0;
int option = 0;
- if (!qos_cond) {
+ if(!qos_cond) {
error("No qos_cond given");
return -1;
}
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!strncasecmp(argv[i], "Set", MAX(command_len, 3))) {
+ if (!strncasecmp (argv[i], "Set", MAX(command_len, 3))) {
i--;
break;
- } else if (!end && !strncasecmp(argv[i], "WithDeleted",
- MAX(command_len, 5))) {
+ } else if (!end && !strncasecmp (argv[i], "WithDeleted",
+ MAX(command_len, 5))) {
qos_cond->with_deleted = 1;
- } else if (!end && !strncasecmp(argv[i], "where",
- MAX(command_len, 5))) {
+ } else if(!end && !strncasecmp(argv[i], "where",
+ MAX(command_len, 5))) {
continue;
- } else if (!end
- || !strncasecmp(argv[i], "Names",
+ } else if(!end
+ || !strncasecmp (argv[i], "Names",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "QOSLevel",
+ || !strncasecmp (argv[i], "QOSLevel",
MAX(command_len, 1))) {
- if (!qos_cond->name_list) {
+ if(!qos_cond->name_list) {
qos_cond->name_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(qos_cond->name_list,
- argv[i]+end))
+ if(slurm_addto_char_list(qos_cond->name_list,
+ argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Descriptions",
+ } else if(!strncasecmp (argv[i], "Descriptions",
MAX(command_len, 1))) {
- if (!qos_cond->description_list) {
+ if(!qos_cond->description_list) {
qos_cond->description_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(qos_cond->description_list,
- argv[i]+end))
+ if(slurm_addto_char_list(qos_cond->description_list,
+ argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
- MAX(command_len, 1))) {
- if (format_list)
+ } else if (!strncasecmp (argv[i], "Format",
+ MAX(command_len, 1))) {
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "Ids", MAX(command_len, 1))) {
+ } else if(!strncasecmp (argv[i], "Ids", MAX(command_len, 1))) {
ListIterator itr = NULL;
char *temp = NULL;
uint32_t id = 0;
- if (!qos_cond->id_list) {
+ if(!qos_cond->id_list) {
qos_cond->id_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(qos_cond->id_list,
- argv[i]+end))
+ if(slurm_addto_char_list(qos_cond->id_list,
+ argv[i]+end))
set = 1;
/* check to make sure user gave ints here */
@@ -194,13 +194,13 @@ static int _set_cond(int *start, int argc, char *argv[],
}
}
list_iterator_destroy(itr);
- } else if (!strncasecmp(argv[i], "PreemptMode",
- MAX(command_len, 3))) {
- if (!qos_cond)
+ } else if (!strncasecmp (argv[i], "PreemptMode",
+ MAX(command_len, 3))) {
+ if(!qos_cond)
continue;
qos_cond->preempt_mode |=
_parse_preempt_modes(argv[i]+end);
- if (qos_cond->preempt_mode == (uint16_t)NO_VAL) {
+ if(qos_cond->preempt_mode == (uint16_t)NO_VAL) {
fprintf(stderr,
" Bad Preempt Mode given: %s\n",
argv[i]);
@@ -231,72 +231,72 @@ static int _set_rec(int *start, int argc, char *argv[],
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))) {
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))) {
i--;
break;
- } else if (!end && !strncasecmp(argv[i], "set",
- MAX(command_len, 3))) {
+ } else if(!end && !strncasecmp(argv[i], "set",
+ MAX(command_len, 3))) {
continue;
- } else if (!end
- || !strncasecmp(argv[i], "Name",
+ } else if(!end
+ || !strncasecmp (argv[i], "Name",
MAX(command_len, 1))) {
- if (name_list)
+ if(name_list)
slurm_addto_char_list(name_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "Description",
- MAX(command_len, 1))) {
- if (!qos->description)
+ } else if (!strncasecmp (argv[i], "Description",
+ MAX(command_len, 1))) {
+ if(!qos->description)
qos->description =
strip_quotes(argv[i]+end, NULL, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "GrpCPUMins",
- MAX(command_len, 7))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "GrpCPUMins",
+ MAX(command_len, 7))) {
+ if(!qos)
continue;
if (get_uint64(argv[i]+end,
&qos->grp_cpu_mins,
"GrpCPUMins") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "GrpCpus",
- MAX(command_len, 7))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "GrpCpus",
+ MAX(command_len, 7))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->grp_cpus,
- "GrpCpus") == SLURM_SUCCESS)
+ "GrpCpus") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "GrpJobs",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "GrpJobs",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->grp_jobs,
- "GrpJobs") == SLURM_SUCCESS)
+ "GrpJobs") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "GrpNodes",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "GrpNodes",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->grp_nodes,
- "GrpNodes") == SLURM_SUCCESS)
+ "GrpNodes") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "GrpSubmitJobs",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "GrpSubmitJobs",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->grp_submit_jobs,
- "GrpSubmitJobs") == SLURM_SUCCESS)
+ "GrpSubmitJobs") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "GrpWall",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "GrpWall",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
mins = time_str2mins(argv[i]+end);
if (mins != NO_VAL) {
@@ -308,46 +308,46 @@ static int _set_rec(int *start, int argc, char *argv[],
" Bad GrpWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp(argv[i], "MaxCPUMinsPerJob",
- MAX(command_len, 7))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "MaxCPUMinsPerJob",
+ MAX(command_len, 7))) {
+ if(!qos)
continue;
if (get_uint64(argv[i]+end,
&qos->max_cpu_mins_pj,
"MaxCPUMins") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "MaxCpusPerJob",
- MAX(command_len, 7))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "MaxCpusPerJob",
+ MAX(command_len, 7))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->max_cpus_pj,
- "MaxCpus") == SLURM_SUCCESS)
+ "MaxCpus") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "MaxJobsPerUser",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "MaxJobsPerUser",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->max_jobs_pu,
- "MaxJobs") == SLURM_SUCCESS)
+ "MaxJobs") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "MaxNodesPerJob",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "MaxNodesPerJob",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end,
- &qos->max_nodes_pj,
- "MaxNodes") == SLURM_SUCCESS)
+ &qos->max_nodes_pj,
+ "MaxNodes") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "MaxSubmitJobsPerUser",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "MaxSubmitJobsPerUser",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->max_submit_jobs_pu,
- "MaxSubmitJobs") == SLURM_SUCCESS)
+ "MaxSubmitJobs") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "MaxWallDurationPerJob",
- MAX(command_len, 4))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "MaxWallDurationPerJob",
+ MAX(command_len, 4))) {
+ if(!qos)
continue;
mins = time_str2mins(argv[i]+end);
if (mins != NO_VAL) {
@@ -359,52 +359,52 @@ static int _set_rec(int *start, int argc, char *argv[],
" Bad MaxWall time format: %s\n",
argv[i]);
}
- } else if (!strncasecmp(argv[i], "Preempt",
- MAX(command_len, 7))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "Preempt",
+ MAX(command_len, 7))) {
+ if(!qos)
continue;
- if (!qos->preempt_list)
+ if(!qos->preempt_list)
qos->preempt_list =
list_create(slurm_destroy_char);
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
- if (slurmdb_addto_qos_char_list(qos->preempt_list,
- g_qos_list, argv[i]+end,
- option))
+ if(slurmdb_addto_qos_char_list(qos->preempt_list,
+ g_qos_list, argv[i]+end,
+ option))
set = 1;
else
exit_code = 1;
- } else if (!strncasecmp(argv[i], "PreemptMode",
- MAX(command_len, 8))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "PreemptMode",
+ MAX(command_len, 8))) {
+ if(!qos)
continue;
qos->preempt_mode = preempt_mode_num(argv[i]+end);
- if (qos->preempt_mode == (uint16_t)NO_VAL) {
+ if(qos->preempt_mode == (uint16_t)NO_VAL) {
fprintf(stderr,
" Bad Preempt Mode given: %s\n",
argv[i]);
exit_code = 1;
} else
set = 1;
- } else if (!strncasecmp(argv[i], "Priority",
- MAX(command_len, 3))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "Priority",
+ MAX(command_len, 3))) {
+ if(!qos)
continue;
if (get_uint(argv[i]+end, &qos->priority,
- "Priority") == SLURM_SUCCESS)
+ "Priority") == SLURM_SUCCESS)
set = 1;
- } else if (!strncasecmp(argv[i], "UsageFactor",
- MAX(command_len, 3))) {
- if (!qos)
+ } else if (!strncasecmp (argv[i], "UsageFactor",
+ MAX(command_len, 3))) {
+ if(!qos)
continue;
if (get_double(argv[i]+end, &qos->usage_factor,
- "UsageFactor") == SLURM_SUCCESS)
+ "UsageFactor") == SLURM_SUCCESS)
set = 1;
} else {
printf(" Unknown option: %s\n"
@@ -435,18 +435,18 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
limit_set += _set_rec(&i, argc, argv, name_list, start_qos);
}
- if (exit_code) {
+ if(exit_code) {
list_destroy(name_list);
xfree(description);
return SLURM_ERROR;
- } else if (!list_count(name_list)) {
+ } else if(!list_count(name_list)) {
list_destroy(name_list);
slurmdb_destroy_qos_rec(start_qos);
exit_code=1;
@@ -454,10 +454,10 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
return SLURM_SUCCESS;
}
- if (!g_qos_list) {
+ if(!g_qos_list) {
g_qos_list = acct_storage_g_get_qos(db_conn, my_uid, NULL);
- if (!g_qos_list) {
+ if(!g_qos_list) {
exit_code=1;
fprintf(stderr, " Problem getting qos's "
"from database. "
@@ -473,10 +473,10 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
itr = list_iterator_create(name_list);
while((name = list_next(itr))) {
qos = NULL;
- if (!sacctmgr_find_qos_from_list(g_qos_list, name)) {
+ if(!sacctmgr_find_qos_from_list(g_qos_list, name)) {
qos = xmalloc(sizeof(slurmdb_qos_rec_t));
qos->name = xstrdup(name);
- if (start_qos->description)
+ if(start_qos->description)
qos->description =
xstrdup(start_qos->description);
else
@@ -510,15 +510,15 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(name_list);
- if (!list_count(qos_list)) {
+ if(!list_count(qos_list)) {
printf(" Nothing new added.\n");
goto end_it;
}
- if (qos_str) {
+ if(qos_str) {
printf(" Adding QOS(s)\n%s", qos_str);
printf(" Settings\n");
- if (description)
+ if(description)
printf(" Description = %s\n", description);
else
printf(" Description = %s\n", "QOS Name");
@@ -529,15 +529,15 @@ extern int sacctmgr_add_qos(int argc, char *argv[])
}
notice_thread_init();
- if (list_count(qos_list))
+ if(list_count(qos_list))
rc = acct_storage_g_add_qos(db_conn, my_uid, qos_list);
else
goto end_it;
notice_thread_fini();
- if (rc == SLURM_SUCCESS) {
- if (commit_check("Would you like to commit changes?")) {
+ if(rc == SLURM_SUCCESS) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
@@ -598,17 +598,17 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
_set_cond(&i, argc, argv, qos_cond, format_list);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_qos_cond(qos_cond);
list_destroy(format_list);
return SLURM_ERROR;
- } else if (!list_count(format_list)) {
+ } else if(!list_count(format_list)) {
slurm_addto_char_list(format_list, "N,Prio,Preempt,PreemptM,"
"GrpJ,GrpN,GrpS,MaxJ,MaxN,MaxS,MaxW");
}
@@ -621,7 +621,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -629,125 +629,125 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Description", object, MAX(command_len, 1))) {
+ if(!strncasecmp("Description", object, MAX(command_len, 1))) {
field->type = PRINT_DESC;
field->name = xstrdup("Descr");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("GrpCPUMins", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPUMins", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPCM;
field->name = xstrdup("GrpCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("GrpCPUs", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPUs", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpNodes", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpNodes", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpWall", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpWall", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPW;
field->name = xstrdup("GrpWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("GrpWallRaw", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpWallRaw", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPW;
field->name = xstrdup("GrpWall");
field->len = 11;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("ID", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("ID", object, MAX(command_len, 1))) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxCPUMinsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUMinsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXCM;
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("MaxCPUsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxJobsPerUser", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxJobsPerUser", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxNodesPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxNodesPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxSubmitJobsPerUser", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxSubmitJobsPerUser", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxWallDurationPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxWallDurationPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("MaxWallRaw", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("MaxWallRaw", object,
+ MAX(command_len, 8))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Name", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Name", object, MAX(command_len, 1))) {
field->type = PRINT_NAME;
field->name = xstrdup("Name");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Preempt", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("Preempt", object,
+ MAX(command_len, 7))) {
field->type = PRINT_PREE;
field->name = xstrdup("Preempt");
field->len = 10;
field->print_routine = sacctmgr_print_qos_bitstr;
- } else if (!strncasecmp("PreemptMode", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("PreemptMode", object,
+ MAX(command_len, 8))) {
field->type = PRINT_PREEM;
field->name = xstrdup("PreemptMode");
field->len = 11;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Priority", object,
- MAX(command_len, 3))) {
+ } else if(!strncasecmp("Priority", object,
+ MAX(command_len, 3))) {
field->type = PRINT_PRIO;
field->name = xstrdup("Priority");
field->len = 10;
field->print_routine = print_fields_int;
- } else if (!strncasecmp("UsageFactor", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("UsageFactor", object,
+ MAX(command_len, 1))) {
field->type = PRINT_UF;
field->name = xstrdup("UsageFactor");
field->len = 11;
@@ -759,7 +759,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -767,14 +767,14 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
list_destroy(print_fields_list);
return SLURM_ERROR;
}
qos_list = acct_storage_g_get_qos(db_conn, my_uid, qos_cond);
slurmdb_destroy_qos_cond(qos_cond);
- if (!qos_list) {
+ if(!qos_list) {
exit_code=1;
fprintf(stderr, " Problem with query.\n");
list_destroy(print_fields_list);
@@ -870,7 +870,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_PREE:
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list = acct_storage_g_get_qos(
db_conn, my_uid, NULL);
@@ -881,7 +881,7 @@ extern int sacctmgr_list_qos(int argc, char *argv[])
case PRINT_PREEM:
{
char *tmp_char = "cluster";
- if (qos->preempt_mode)
+ if(qos->preempt_mode)
tmp_char = xstrtolower(
preempt_mode_string(
qos->preempt_mode));
@@ -933,11 +933,11 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))) {
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))) {
i++;
cond_set += _set_cond(&i, argc, argv, qos_cond, NULL);
- } else if (!strncasecmp(argv[i], "Set", MAX(command_len, 3))) {
+ } else if (!strncasecmp (argv[i], "Set", MAX(command_len, 3))) {
i++;
rec_set += _set_rec(&i, argc, argv, NULL, qos);
} else {
@@ -945,19 +945,19 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
}
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_qos_cond(qos_cond);
slurmdb_destroy_qos_rec(qos);
return SLURM_ERROR;
- } else if (!rec_set) {
+ } else if(!rec_set) {
exit_code=1;
fprintf(stderr, " You didn't give me anything to set\n");
slurmdb_destroy_qos_cond(qos_cond);
slurmdb_destroy_qos_rec(qos);
return SLURM_ERROR;
- } else if (!cond_set) {
- if (!commit_check("You didn't set any conditions with 'WHERE'.\n"
- "Are you sure you want to continue?")) {
+ } else if(!cond_set) {
+ if(!commit_check("You didn't set any conditions with 'WHERE'.\n"
+ "Are you sure you want to continue?")) {
printf("Aborted\n");
slurmdb_destroy_qos_cond(qos_cond);
slurmdb_destroy_qos_rec(qos);
@@ -968,7 +968,7 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
notice_thread_init();
ret_list = acct_storage_g_modify_qos(db_conn, my_uid, qos_cond, qos);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Modified qos...\n");
@@ -977,7 +977,7 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
}
list_iterator_destroy(itr);
set = 1;
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing modified\n");
} else {
exit_code=1;
@@ -986,13 +986,13 @@ extern int sacctmgr_modify_qos(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
notice_thread_fini();
- if (set) {
- if (commit_check("Would you like to commit changes?"))
+ if(set) {
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -1017,19 +1017,19 @@ extern int sacctmgr_delete_qos(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
set += _set_cond(&i, argc, argv, qos_cond, NULL);
}
- if (!set) {
+ if(!set) {
exit_code=1;
fprintf(stderr,
" No conditions given to remove, not executing.\n");
slurmdb_destroy_qos_cond(qos_cond);
return SLURM_ERROR;
- } else if (set == -1) {
+ } else if(set == -1) {
slurmdb_destroy_qos_cond(qos_cond);
return SLURM_ERROR;
}
@@ -1039,7 +1039,7 @@ extern int sacctmgr_delete_qos(int argc, char *argv[])
notice_thread_fini();
slurmdb_destroy_qos_cond(qos_cond);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Deleting QOS(s)...\n");
@@ -1048,13 +1048,13 @@ extern int sacctmgr_delete_qos(int argc, char *argv[])
printf(" %s\n", object);
}
list_iterator_destroy(itr);
- if (commit_check("Would you like to commit changes?")) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
acct_storage_g_commit(db_conn, 0);
}
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing deleted\n");
} else {
exit_code=1;
@@ -1063,7 +1063,7 @@ extern int sacctmgr_delete_qos(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
return rc;
diff --git a/src/sacctmgr/sacctmgr.c b/src/sacctmgr/sacctmgr.c
index 93b85989a88cab6d4533aa29284e4fd3d52c68f1..fb459408a49e3a504bdb516038adeadb27cabbe2 100644
--- a/src/sacctmgr/sacctmgr.c
+++ b/src/sacctmgr/sacctmgr.c
@@ -177,7 +177,7 @@ main (int argc, char *argv[])
/* Check to see if we are running a supported accounting plugin */
temp = slurm_get_accounting_storage_type();
- if (strcasecmp(temp, "accounting_storage/slurmdbd")
+ if(strcasecmp(temp, "accounting_storage/slurmdbd")
&& strcasecmp(temp, "accounting_storage/mysql")) {
fprintf (stderr, "You are not running a supported "
"accounting_storage plugin\n(%s).\n"
@@ -194,20 +194,20 @@ main (int argc, char *argv[])
*/
errno = 0;
db_conn = acct_storage_g_get_connection(false, 0, 1, NULL);
- if (errno != SLURM_SUCCESS) {
+ if(errno != SLURM_SUCCESS) {
int tmp_errno = errno;
- if ((input_field_count == 2) &&
+ if((input_field_count == 2) &&
(!strncasecmp(argv[2], "Configuration", strlen(argv[1]))) &&
((!strncasecmp(argv[1], "list", strlen(argv[0]))) ||
(!strncasecmp(argv[1], "show", strlen(argv[0]))))) {
- if (tmp_errno == ESLURM_DB_CONNECTION) {
+ if(tmp_errno == ESLURM_DB_CONNECTION) {
tmp_errno = 0;
sacctmgr_list_config(true);
} else
sacctmgr_list_config(false);
}
errno = tmp_errno;
- if (errno)
+ if(errno)
error("Problem talking to the database: %m");
exit(1);
}
@@ -227,16 +227,16 @@ main (int argc, char *argv[])
* them to fix it and let the process happen since there
* are checks for global exit_code we need to reset it.
*/
- if (exit_code) {
+ if(exit_code) {
local_exit_code = exit_code;
exit_code = 0;
}
}
- if (local_exit_code)
+ if(local_exit_code)
exit_code = local_exit_code;
acct_storage_g_close_connection(&db_conn);
slurm_acct_storage_fini();
- if (g_qos_list)
+ if(g_qos_list)
list_destroy(g_qos_list);
exit(exit_code);
}
@@ -374,12 +374,12 @@ _process_command (int argc, char *argv[])
command_len = strlen(argv[0]);
- if (strncasecmp(argv[0], "associations",
+ if (strncasecmp (argv[0], "associations",
MAX(command_len, 3)) == 0) {
with_assoc_flag = 1;
- } else if (strncasecmp(argv[0], "dump", MAX(command_len, 3)) == 0) {
+ } else if (strncasecmp (argv[0], "dump", MAX(command_len, 3)) == 0) {
sacctmgr_dump_cluster((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "help", MAX(command_len, 2)) == 0) {
+ } else if (strncasecmp (argv[0], "help", MAX(command_len, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -387,9 +387,9 @@ _process_command (int argc, char *argv[])
argv[0]);
}
_usage ();
- } else if (strncasecmp(argv[0], "load", MAX(command_len, 2)) == 0) {
+ } else if (strncasecmp (argv[0], "load", MAX(command_len, 2)) == 0) {
load_sacctmgr_cfg_file((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "oneliner",
+ } else if (strncasecmp (argv[0], "oneliner",
MAX(command_len, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
@@ -398,16 +398,16 @@ _process_command (int argc, char *argv[])
argv[0]);
}
one_liner = 1;
- } else if (strncasecmp(argv[0], "quiet", MAX(command_len, 4)) == 0) {
+ } else if (strncasecmp (argv[0], "quiet", MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr, "too many arguments for keyword:%s\n",
argv[0]);
}
quiet_flag = 1;
- } else if ((strncasecmp(argv[0], "exit", MAX(command_len, 4)) == 0) ||
- (strncasecmp(argv[0], "\\q", MAX(command_len, 2)) == 0) ||
- (strncasecmp(argv[0], "quit", MAX(command_len, 4)) == 0)) {
+ } else if ((strncasecmp (argv[0], "exit", MAX(command_len, 4)) == 0) ||
+ (strncasecmp (argv[0], "\\q", MAX(command_len, 2)) == 0) ||
+ (strncasecmp (argv[0], "quit", MAX(command_len, 4)) == 0)) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -415,25 +415,25 @@ _process_command (int argc, char *argv[])
argv[0]);
}
exit_flag = 1;
- } else if ((strncasecmp(argv[0], "add", MAX(command_len, 3)) == 0) ||
- (strncasecmp(argv[0], "create",
+ } else if ((strncasecmp (argv[0], "add", MAX(command_len, 3)) == 0) ||
+ (strncasecmp (argv[0], "create",
MAX(command_len, 3)) == 0)) {
_add_it((argc - 1), &argv[1]);
- } else if ((strncasecmp(argv[0], "archive",
+ } else if ((strncasecmp (argv[0], "archive",
MAX(command_len, 3)) == 0)) {
_archive_it((argc - 1), &argv[1]);
- } else if ((strncasecmp(argv[0], "show", MAX(command_len, 3)) == 0) ||
- (strncasecmp(argv[0], "list", MAX(command_len, 3)) == 0)) {
+ } else if ((strncasecmp (argv[0], "show", MAX(command_len, 3)) == 0) ||
+ (strncasecmp (argv[0], "list", MAX(command_len, 3)) == 0)) {
_show_it((argc - 1), &argv[1]);
- } else if (!strncasecmp(argv[0], "modify", MAX(command_len, 1))
- || !strncasecmp(argv[0], "update", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[0], "modify", MAX(command_len, 1))
+ || !strncasecmp (argv[0], "update", MAX(command_len, 1))) {
_modify_it((argc - 1), &argv[1]);
- } else if ((strncasecmp(argv[0], "delete",
+ } else if ((strncasecmp (argv[0], "delete",
MAX(command_len, 3)) == 0) ||
- (strncasecmp(argv[0], "remove",
+ (strncasecmp (argv[0], "remove",
MAX(command_len, 3)) == 0)) {
_delete_it((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "verbose", MAX(command_len, 4)) == 0) {
+ } else if (strncasecmp (argv[0], "verbose", MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -441,7 +441,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
quiet_flag = -1;
- } else if (strncasecmp(argv[0], "readonly",
+ } else if (strncasecmp (argv[0], "readonly",
MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
@@ -450,7 +450,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
readonly_flag = 1;
- } else if (strncasecmp(argv[0], "rollup", MAX(command_len, 2)) == 0) {
+ } else if (strncasecmp (argv[0], "rollup", MAX(command_len, 2)) == 0) {
time_t my_start = 0;
time_t my_end = 0;
uint16_t archive_data = 0;
@@ -461,23 +461,23 @@ _process_command (int argc, char *argv[])
argv[0]);
}
- if (argc > 1)
+ if(argc > 1)
my_start = parse_time(argv[1], 1);
- if (argc > 2)
+ if(argc > 2)
my_end = parse_time(argv[2], 1);
- if (argc > 3)
+ if(argc > 3)
archive_data = atoi(argv[3]);
- if (acct_storage_g_roll_usage(db_conn, my_start,
+ if(acct_storage_g_roll_usage(db_conn, my_start,
my_end, archive_data)
== SLURM_SUCCESS) {
- if (commit_check("Would you like to commit rollup?")) {
+ if(commit_check("Would you like to commit rollup?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Rollup Discarded\n");
acct_storage_g_commit(db_conn, 0);
}
}
- } else if (strncasecmp(argv[0], "version", MAX(command_len, 4)) == 0) {
+ } else if (strncasecmp (argv[0], "version", MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -503,13 +503,13 @@ static void _add_it (int argc, char *argv[])
int error_code = SLURM_SUCCESS;
int command_len = 0;
- if (readonly_flag) {
+ if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
return;
}
- if (!argv[0])
+ if(!argv[0])
goto helpme;
command_len = strlen(argv[0]);
@@ -517,17 +517,17 @@ static void _add_it (int argc, char *argv[])
acct_storage_g_commit(db_conn, 0);
/* First identify the entity to add */
- if (strncasecmp(argv[0], "Account", MAX(command_len, 1)) == 0
- || !strncasecmp(argv[0], "Acct", MAX(command_len, 4))) {
+ if (strncasecmp (argv[0], "Account", MAX(command_len, 1)) == 0
+ || !strncasecmp (argv[0], "Acct", MAX(command_len, 4))) {
error_code = sacctmgr_add_account((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Cluster", MAX(command_len, 2)) == 0) {
+ } else if (strncasecmp (argv[0], "Cluster", MAX(command_len, 2)) == 0) {
error_code = sacctmgr_add_cluster((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Coordinator",
+ } else if (strncasecmp (argv[0], "Coordinator",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_add_coord((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "QOS", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "QOS", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_add_qos((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "User", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "User", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_add_user((argc - 1), &argv[1]);
} else {
helpme:
@@ -553,13 +553,13 @@ static void _archive_it (int argc, char *argv[])
int error_code = SLURM_SUCCESS;
int command_len = 0;
- if (readonly_flag) {
+ if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
return;
}
- if (!argv[0])
+ if(!argv[0])
goto helpme;
command_len = strlen(argv[0]);
@@ -567,9 +567,9 @@ static void _archive_it (int argc, char *argv[])
acct_storage_g_commit(db_conn, 0);
/* First identify the entity to add */
- if (strncasecmp(argv[0], "dump", MAX(command_len, 1)) == 0) {
+ if (strncasecmp (argv[0], "dump", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_archive_dump((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "load", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "load", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_archive_load((argc - 1), &argv[1]);
} else {
helpme:
@@ -596,7 +596,7 @@ static void _show_it (int argc, char *argv[])
int error_code = SLURM_SUCCESS;
int command_len = 0;
- if (!argv[0])
+ if(!argv[0])
goto helpme;
command_len = strlen(argv[0]);
@@ -605,32 +605,32 @@ static void _show_it (int argc, char *argv[])
acct_storage_g_commit(db_conn, 0);
/* First identify the entity to list */
- if (strncasecmp(argv[0], "Accounts", MAX(command_len, 2)) == 0
- || !strncasecmp(argv[0], "Acct", MAX(command_len, 4))) {
+ if (strncasecmp (argv[0], "Accounts", MAX(command_len, 2)) == 0
+ || !strncasecmp (argv[0], "Acct", MAX(command_len, 4))) {
error_code = sacctmgr_list_account((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Associations",
+ } else if (strncasecmp (argv[0], "Associations",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_list_association((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Clusters",
+ } else if (strncasecmp (argv[0], "Clusters",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_list_cluster((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Configuration",
+ } else if (strncasecmp (argv[0], "Configuration",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_list_config(true);
- } else if (strncasecmp(argv[0], "Events",
+ } else if (strncasecmp (argv[0], "Events",
MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_event((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Problems",
+ } else if (strncasecmp (argv[0], "Problems",
MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_problem((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "QOS", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "QOS", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_qos((argc - 1), &argv[1]);
- } else if (!strncasecmp(argv[0], "Transactions", MAX(command_len, 1))
- || !strncasecmp(argv[0], "Txn", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[0], "Transactions", MAX(command_len, 1))
+ || !strncasecmp (argv[0], "Txn", MAX(command_len, 1))) {
error_code = sacctmgr_list_txn((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Users", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "Users", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_user((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "WCKeys", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "WCKeys", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_list_wckey((argc - 1), &argv[1]);
} else {
helpme:
@@ -659,13 +659,13 @@ static void _modify_it (int argc, char *argv[])
int error_code = SLURM_SUCCESS;
int command_len = 0;
- if (readonly_flag) {
+ if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
return;
}
- if (!argv[0])
+ if(!argv[0])
goto helpme;
command_len = strlen(argv[0]);
@@ -673,15 +673,15 @@ static void _modify_it (int argc, char *argv[])
acct_storage_g_commit(db_conn, 0);
/* First identify the entity to modify */
- if (strncasecmp(argv[0], "Accounts", MAX(command_len, 1)) == 0
- || !strncasecmp(argv[0], "Acct", MAX(command_len, 4))) {
+ if (strncasecmp (argv[0], "Accounts", MAX(command_len, 1)) == 0
+ || !strncasecmp (argv[0], "Acct", MAX(command_len, 4))) {
error_code = sacctmgr_modify_account((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Clusters",
+ } else if (strncasecmp (argv[0], "Clusters",
MAX(command_len, 1)) == 0) {
error_code = sacctmgr_modify_cluster((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "QOSs", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "QOSs", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_modify_qos((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Users", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "Users", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_modify_user((argc - 1), &argv[1]);
} else {
helpme:
@@ -707,13 +707,13 @@ static void _delete_it (int argc, char *argv[])
int error_code = SLURM_SUCCESS;
int command_len = 0;
- if (readonly_flag) {
+ if(readonly_flag) {
exit_code = 1;
fprintf(stderr, "Can't run this command in readonly mode.\n");
return;
}
- if (!argv[0])
+ if(!argv[0])
goto helpme;
command_len = strlen(argv[0]);
@@ -721,18 +721,18 @@ static void _delete_it (int argc, char *argv[])
acct_storage_g_commit(db_conn, 0);
/* First identify the entity to delete */
- if (strncasecmp(argv[0], "Accounts", MAX(command_len, 1)) == 0
- || !strncasecmp(argv[0], "Acct", MAX(command_len, 4))) {
+ if (strncasecmp (argv[0], "Accounts", MAX(command_len, 1)) == 0
+ || !strncasecmp (argv[0], "Acct", MAX(command_len, 4))) {
error_code = sacctmgr_delete_account((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Clusters",
+ } else if (strncasecmp (argv[0], "Clusters",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_delete_cluster((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Coordinators",
+ } else if (strncasecmp (argv[0], "Coordinators",
MAX(command_len, 2)) == 0) {
error_code = sacctmgr_delete_coord((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "QOS", MAX(command_len, 2)) == 0) {
+ } else if (strncasecmp (argv[0], "QOS", MAX(command_len, 2)) == 0) {
error_code = sacctmgr_delete_qos((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Users", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "Users", MAX(command_len, 1)) == 0) {
error_code = sacctmgr_delete_user((argc - 1), &argv[1]);
} else {
helpme:
diff --git a/src/sacctmgr/txn_functions.c b/src/sacctmgr/txn_functions.c
index 20d3c6f9b29f2ebcefd481b9acccf676c5074710..3795eedfa9fcf35b575675fc002e405c80a2413a 100644
--- a/src/sacctmgr/txn_functions.c
+++ b/src/sacctmgr/txn_functions.c
@@ -52,37 +52,37 @@ static int _set_cond(int *start, int argc, char *argv[],
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "where",
+ if(!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if (!end && !strncasecmp(argv[i], "withassocinfo",
+ } else if(!end && !strncasecmp(argv[i], "withassocinfo",
MAX(command_len, 5))) {
txn_cond->with_assoc_info = 1;
set = 1;
- } else if (!end
- || (!strncasecmp(argv[i], "Ids",
+ } else if(!end
+ || (!strncasecmp (argv[i], "Ids",
MAX(command_len, 1)))
- || (!strncasecmp(argv[i], "Txn",
+ || (!strncasecmp (argv[i], "Txn",
MAX(command_len, 1)))) {
ListIterator itr = NULL;
char *temp = NULL;
uint32_t id = 0;
- if (!txn_cond->id_list)
+ if(!txn_cond->id_list)
txn_cond->id_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(txn_cond->id_list,
+ if(slurm_addto_char_list(txn_cond->id_list,
argv[i]+end))
set = 1;
@@ -96,58 +96,58 @@ static int _set_cond(int *start, int argc, char *argv[],
}
}
list_iterator_destroy(itr);
- } else if (!strncasecmp(argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 3))) {
- if (!txn_cond->acct_list)
+ if(!txn_cond->acct_list)
txn_cond->acct_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(txn_cond->acct_list,
+ if(slurm_addto_char_list(txn_cond->acct_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Action",
+ } else if (!strncasecmp (argv[i], "Action",
MAX(command_len, 4))) {
- if (!txn_cond->action_list)
+ if(!txn_cond->action_list)
txn_cond->action_list =
list_create(slurm_destroy_char);
- if (addto_action_char_list(txn_cond->action_list,
+ if(addto_action_char_list(txn_cond->action_list,
argv[i]+end))
set = 1;
else
exit_code=1;
- } else if (!strncasecmp(argv[i], "Actors",
+ } else if (!strncasecmp (argv[i], "Actors",
MAX(command_len, 4))) {
- if (!txn_cond->actor_list)
+ if(!txn_cond->actor_list)
txn_cond->actor_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(txn_cond->actor_list,
+ if(slurm_addto_char_list(txn_cond->actor_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 3))) {
- if (!txn_cond->cluster_list)
+ if(!txn_cond->cluster_list)
txn_cond->cluster_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(txn_cond->cluster_list,
+ if(slurm_addto_char_list(txn_cond->cluster_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
txn_cond->time_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
txn_cond->time_start = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "User",
+ } else if (!strncasecmp (argv[i], "User",
MAX(command_len, 1))) {
- if (!txn_cond->user_list)
+ if(!txn_cond->user_list)
txn_cond->user_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(txn_cond->user_list,
+ if(slurm_addto_char_list(txn_cond->user_list,
argv[i]+end))
set = 1;
} else {
@@ -193,13 +193,13 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
_set_cond(&i, argc, argv, txn_cond, format_list);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_txn_cond(txn_cond);
list_destroy(format_list);
return SLURM_ERROR;
@@ -207,9 +207,9 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- if (!list_count(format_list)) {
+ if(!list_count(format_list)) {
slurm_addto_char_list(format_list, "T,Action,Actor,Where,Info");
- if (txn_cond->with_assoc_info)
+ if(txn_cond->with_assoc_info)
slurm_addto_char_list(format_list,
"User,Account,Cluster");
}
@@ -220,7 +220,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -228,57 +228,57 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Accounts", object, MAX(command_len, 3))) {
+ if(!strncasecmp("Accounts", object, MAX(command_len, 3))) {
field->type = PRINT_ACCT;
field->name = xstrdup("Accounts");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("ActionRaw", object,
+ } else if(!strncasecmp("ActionRaw", object,
MAX(command_len, 7))) {
field->type = PRINT_ACTIONRAW;
field->name = xstrdup("ActionRaw");
field->len = 10;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Action", object,
+ } else if(!strncasecmp("Action", object,
MAX(command_len, 4))) {
field->type = PRINT_ACTION;
field->name = xstrdup("Action");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Actor", object,
+ } else if(!strncasecmp("Actor", object,
MAX(command_len, 4))) {
field->type = PRINT_ACTOR;
field->name = xstrdup("Actor");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Clusters", object,
+ } else if(!strncasecmp("Clusters", object,
MAX(command_len, 4))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Clusters");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("ID", object, MAX(command_len, 2))) {
+ } else if(!strncasecmp("ID", object, MAX(command_len, 2))) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Info", object, MAX(command_len, 2))) {
+ } else if(!strncasecmp("Info", object, MAX(command_len, 2))) {
field->type = PRINT_INFO;
field->name = xstrdup("Info");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("TimeStamp", object,
+ } else if(!strncasecmp("TimeStamp", object,
MAX(command_len, 1))) {
field->type = PRINT_TS;
field->name = xstrdup("Time");
field->len = 19;
field->print_routine = print_fields_date;
- } else if (!strncasecmp("Users", object, MAX(command_len, 4))) {
+ } else if(!strncasecmp("Users", object, MAX(command_len, 4))) {
field->type = PRINT_USER;
field->name = xstrdup("Users");
field->len = 20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Where", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Where", object, MAX(command_len, 1))) {
field->type = PRINT_WHERE;
field->name = xstrdup("Where");
field->len = 20;
@@ -290,7 +290,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -298,7 +298,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
list_destroy(print_fields_list);
return SLURM_ERROR;
}
@@ -306,7 +306,7 @@ extern int sacctmgr_list_txn(int argc, char *argv[])
txn_list = acct_storage_g_get_txn(db_conn, my_uid, txn_cond);
slurmdb_destroy_txn_cond(txn_cond);
- if (!txn_list) {
+ if(!txn_list) {
exit_code=1;
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(errno));
diff --git a/src/sacctmgr/user_functions.c b/src/sacctmgr/user_functions.c
index e1e6501f5c2d6bddfc5d7f4d243fab7b57aaaf3b..a48a6e5176a0cd36c300e20960dbbc840675e52e 100644
--- a/src/sacctmgr/user_functions.c
+++ b/src/sacctmgr/user_functions.c
@@ -52,12 +52,12 @@ static int _set_cond(int *start, int argc, char *argv[],
int command_len = 0;
int option = 0;
- if (!user_cond) {
+ if(!user_cond) {
error("No user_cond given");
return -1;
}
- if (!user_cond->assoc_cond)
+ if(!user_cond->assoc_cond)
user_cond->assoc_cond =
xmalloc(sizeof(slurmdb_association_cond_t));
@@ -68,16 +68,16 @@ static int _set_cond(int *start, int argc, char *argv[],
* accounts. Having it blank is fine, it just needs to
* exist.
*/
- if (!assoc_cond->user_list)
+ if(!assoc_cond->user_list)
assoc_cond->user_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
@@ -87,71 +87,71 @@ static int _set_cond(int *start, int argc, char *argv[],
i--;
break;
} else if (!end && !strncasecmp(argv[i], "WithAssoc",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
user_cond->with_assocs = 1;
} else if (!end &&
!strncasecmp(argv[i], "WithCoordinators",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
user_cond->with_coords = 1;
} else if (!end &&
!strncasecmp(argv[i], "WithDeleted",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
user_cond->with_deleted = 1;
assoc_cond->with_deleted = 1;
} else if (!end &&
!strncasecmp(argv[i], "WithRawQOSLevel",
- MAX(command_len, 5))) {
+ MAX(command_len, 5))) {
assoc_cond->with_raw_qos = 1;
} else if (!end && !strncasecmp(argv[i], "WOPLimits",
- MAX(command_len, 4))) {
+ MAX(command_len, 4))) {
assoc_cond->without_parent_limits = 1;
- } else if (!end && !strncasecmp(argv[i], "where",
- MAX(command_len, 5))) {
+ } else if(!end && !strncasecmp(argv[i], "where",
+ MAX(command_len, 5))) {
continue;
- } else if (!end
- || !strncasecmp(argv[i], "Names",
+ } else if(!end
+ || !strncasecmp(argv[i], "Names",
MAX(command_len, 1))
- || !strncasecmp(argv[i], "Users",
+ || !strncasecmp(argv[i], "Users",
MAX(command_len, 1))) {
- if (slurm_addto_char_list(assoc_cond->user_list,
- argv[i]+end))
+ if(slurm_addto_char_list(assoc_cond->user_list,
+ argv[i]+end))
u_set = 1;
else
exit_code=1;
} else if (!strncasecmp(argv[i], "AdminLevel",
- MAX(command_len, 2))) {
+ MAX(command_len, 2))) {
user_cond->admin_level =
str_2_slurmdb_admin_level(argv[i]+end);
u_set = 1;
} else if (!strncasecmp(argv[i], "DefaultAccount",
- MAX(command_len, 8))) {
- if (!user_cond->def_acct_list) {
+ MAX(command_len, 8))) {
+ if(!user_cond->def_acct_list) {
user_cond->def_acct_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(user_cond->def_acct_list,
- argv[i]+end))
+ if(slurm_addto_char_list(user_cond->def_acct_list,
+ argv[i]+end))
u_set = 1;
else
exit_code=1;
} else if (!strncasecmp(argv[i], "DefaultWCKey",
- MAX(command_len, 8))) {
- if (!user_cond->def_wckey_list) {
+ MAX(command_len, 8))) {
+ if(!user_cond->def_wckey_list) {
user_cond->def_wckey_list =
list_create(slurm_destroy_char);
}
- if (slurm_addto_char_list(user_cond->def_wckey_list,
- argv[i]+end))
+ if(slurm_addto_char_list(user_cond->def_wckey_list,
+ argv[i]+end))
u_set = 1;
else
exit_code=1;
} else if (!strncasecmp(argv[i], "Format",
- MAX(command_len, 1))) {
- if (format_list)
+ MAX(command_len, 1))) {
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!(a_set = sacctmgr_set_association_cond(
- assoc_cond, argv[i], argv[i]+end,
- command_len))) {
+ } else if(!(a_set = sacctmgr_set_association_cond(
+ assoc_cond, argv[i], argv[i]+end,
+ command_len))) {
exit_code=1;
fprintf(stderr, " Unknown condition: %s\n"
" Use keyword 'set' to modify value\n",
@@ -161,11 +161,11 @@ static int _set_cond(int *start, int argc, char *argv[],
(*start) = i;
- if (u_set && a_set)
+ if(u_set && a_set)
return 3;
- else if (a_set) {
+ else if(a_set) {
return 2;
- } else if (u_set)
+ } else if(u_set)
return 1;
return 0;
@@ -184,11 +184,11 @@ static int _set_rec(int *start, int argc, char *argv[],
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
@@ -197,42 +197,42 @@ static int _set_rec(int *start, int argc, char *argv[],
if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))) {
i--;
break;
- } else if (!end && !strncasecmp(argv[i], "set",
- MAX(command_len, 3))) {
+ } else if(!end && !strncasecmp(argv[i], "set",
+ MAX(command_len, 3))) {
continue;
- } else if (!end) {
+ } else if(!end) {
exit_code=1;
fprintf(stderr,
" Bad format on %s: End your option with "
"an '=' sign\n", argv[i]);
} else if (!strncasecmp(argv[i], "AdminLevel",
- MAX(command_len, 2))) {
+ MAX(command_len, 2))) {
user->admin_level =
str_2_slurmdb_admin_level(argv[i]+end);
u_set = 1;
} else if (!strncasecmp(argv[i], "DefaultAccount",
- MAX(command_len, 8))) {
- if (user->default_acct)
+ MAX(command_len, 8))) {
+ if(user->default_acct)
xfree(user->default_acct);
user->default_acct = strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
} else if (!strncasecmp(argv[i], "DefaultWCKey",
- MAX(command_len, 8))) {
- if (user->default_wckey)
+ MAX(command_len, 8))) {
+ if(user->default_wckey)
xfree(user->default_wckey);
user->default_wckey =
strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
} else if (!strncasecmp(argv[i], "NewName",
- MAX(command_len, 1))) {
- if (user->name)
+ MAX(command_len, 1))) {
+ if(user->name)
xfree(user->name);
user->name = strip_quotes(argv[i]+end, NULL, 1);
u_set = 1;
- } else if (!assoc ||
- (assoc && !(a_set = sacctmgr_set_association_rec(
- assoc, argv[i], argv[i]+end,
- command_len, option)))) {
+ } else if(!assoc ||
+ (assoc && !(a_set = sacctmgr_set_association_rec(
+ assoc, argv[i], argv[i]+end,
+ command_len, option)))) {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n"
" Use keyword 'where' to modify condition\n",
@@ -242,11 +242,11 @@ static int _set_rec(int *start, int argc, char *argv[],
(*start) = i;
- if (u_set && a_set)
+ if(u_set && a_set)
return 3;
- else if (u_set)
+ else if(u_set)
return 1;
- else if (a_set)
+ else if(a_set)
return 2;
return 0;
}
@@ -267,21 +267,21 @@ static int _check_coord_request(slurmdb_user_cond_t *user_cond, bool check)
List local_user_list = NULL;
int rc = SLURM_SUCCESS;
- if (!user_cond) {
+ if(!user_cond) {
exit_code=1;
fprintf(stderr, " You need to specify the user_cond here.\n");
return SLURM_ERROR;
}
- if (check && (!user_cond->assoc_cond->user_list
- || !list_count(user_cond->assoc_cond->user_list))) {
+ if(check && (!user_cond->assoc_cond->user_list
+ || !list_count(user_cond->assoc_cond->user_list))) {
exit_code=1;
fprintf(stderr, " You need to specify a user list here.\n");
return SLURM_ERROR;
}
- if (check && (!user_cond->assoc_cond->acct_list
- || !list_count(user_cond->assoc_cond->acct_list))) {
+ if(check && (!user_cond->assoc_cond->acct_list
+ || !list_count(user_cond->assoc_cond->acct_list))) {
exit_code=1;
fprintf(stderr, " You need to specify a account list here.\n");
return SLURM_ERROR;
@@ -291,27 +291,27 @@ static int _check_coord_request(slurmdb_user_cond_t *user_cond, bool check)
account_cond.assoc_cond = user_cond->assoc_cond;
local_acct_list =
acct_storage_g_get_accounts(db_conn, my_uid, &account_cond);
- if (!local_acct_list) {
+ if(!local_acct_list) {
exit_code=1;
fprintf(stderr, " Problem getting accounts from database. "
"Contact your admin.\n");
return SLURM_ERROR;
}
- if (user_cond->assoc_cond->acct_list &&
- (list_count(local_acct_list) !=
- list_count(user_cond->assoc_cond->acct_list))) {
+ if(user_cond->assoc_cond->acct_list &&
+ (list_count(local_acct_list) !=
+ list_count(user_cond->assoc_cond->acct_list))) {
itr = list_iterator_create(user_cond->assoc_cond->acct_list);
itr2 = list_iterator_create(local_acct_list);
while((name = list_next(itr))) {
while((acct_rec = list_next(itr2))) {
- if (!strcmp(name, acct_rec->name))
+ if(!strcmp(name, acct_rec->name))
break;
}
list_iterator_reset(itr2);
- if (!acct_rec) {
+ if(!acct_rec) {
fprintf(stderr,
" You specified a non-existant "
"account '%s'.\n", name);
@@ -324,29 +324,29 @@ static int _check_coord_request(slurmdb_user_cond_t *user_cond, bool check)
}
local_user_list = acct_storage_g_get_users(db_conn, my_uid, user_cond);
- if (!local_user_list) {
+ if(!local_user_list) {
exit_code=1;
fprintf(stderr, " Problem getting users from database. "
"Contact your admin.\n");
- if (local_acct_list)
+ if(local_acct_list)
list_destroy(local_acct_list);
return SLURM_ERROR;
}
- if (user_cond->assoc_cond->user_list &&
- (list_count(local_user_list) !=
- list_count(user_cond->assoc_cond->user_list))) {
+ if(user_cond->assoc_cond->user_list &&
+ (list_count(local_user_list) !=
+ list_count(user_cond->assoc_cond->user_list))) {
itr = list_iterator_create(user_cond->assoc_cond->user_list);
itr2 = list_iterator_create(local_user_list);
while((name = list_next(itr))) {
while((user_rec = list_next(itr2))) {
- if (!strcmp(name, user_rec->name))
+ if(!strcmp(name, user_rec->name))
break;
}
list_iterator_reset(itr2);
- if (!user_rec) {
+ if(!user_rec) {
fprintf(stderr,
" You specified a non-existant "
"user '%s'.\n", name);
@@ -358,9 +358,9 @@ static int _check_coord_request(slurmdb_user_cond_t *user_cond, bool check)
list_iterator_destroy(itr2);
}
- if (local_acct_list)
+ if(local_acct_list)
list_destroy(local_acct_list);
- if (local_user_list)
+ if(local_user_list)
list_destroy(local_user_list);
return rc;
@@ -379,7 +379,7 @@ static int _check_user_has_acct(char *user, char *acct)
ret_list = acct_storage_g_get_associations(db_conn, my_uid,
&assoc_cond);
- if (ret_list && (list_count(ret_list)))
+ if(ret_list && (list_count(ret_list)))
return 1;
return 0;
@@ -422,7 +422,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
int option = 0;
uint16_t track_wckey = slurm_get_track_wckey();
-/* if (!list_count(sacctmgr_cluster_list)) { */
+/* if(!list_count(sacctmgr_cluster_list)) { */
/* printf(" Can't add users, no cluster defined yet.\n" */
/* " Please contact your administrator.\n"); */
/* return SLURM_ERROR; */
@@ -442,28 +442,28 @@ extern int sacctmgr_add_user(int argc, char *argv[])
for (i=0; i<argc; i++) {
int end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end
- || !strncasecmp(argv[i], "Names", MAX(command_len, 1))
- || !strncasecmp(argv[i], "Users", MAX(command_len, 1))) {
- if (!slurm_addto_char_list(assoc_cond->user_list,
- argv[i]+end))
+ if(!end
+ || !strncasecmp(argv[i], "Names", MAX(command_len, 1))
+ || !strncasecmp(argv[i], "Users", MAX(command_len, 1))) {
+ if(!slurm_addto_char_list(assoc_cond->user_list,
+ argv[i]+end))
exit_code=1;
} else if (!strncasecmp(argv[i], "AdminLevel",
- MAX(command_len, 2))) {
+ MAX(command_len, 2))) {
admin_level = str_2_slurmdb_admin_level(argv[i]+end);
} else if (!strncasecmp(argv[i], "DefaultAccount",
- MAX(command_len, 8))) {
- if (default_acct) {
+ MAX(command_len, 8))) {
+ if(default_acct) {
fprintf(stderr,
" Already listed DefaultAccount %s\n",
default_acct);
@@ -474,8 +474,8 @@ extern int sacctmgr_add_user(int argc, char *argv[])
slurm_addto_char_list(assoc_cond->acct_list,
default_acct);
} else if (!strncasecmp(argv[i], "DefaultWCKey",
- MAX(command_len, 8))) {
- if (default_wckey) {
+ MAX(command_len, 8))) {
+ if(default_wckey) {
fprintf(stderr,
" Already listed DefaultWCKey %s\n",
default_wckey);
@@ -486,25 +486,25 @@ extern int sacctmgr_add_user(int argc, char *argv[])
slurm_addto_char_list(wckey_cond->name_list,
default_wckey);
} else if (!strncasecmp(argv[i], "WCKeys",
- MAX(command_len, 1))) {
+ MAX(command_len, 1))) {
slurm_addto_char_list(wckey_cond->name_list,
argv[i]+end);
- } else if (!(limit_set = sacctmgr_set_association_rec(
- &start_assoc, argv[i], argv[i]+end,
- command_len, option))
- && !(limit_set = sacctmgr_set_association_cond(
- assoc_cond, argv[i], argv[i]+end,
- command_len))) {
+ } else if(!(limit_set = sacctmgr_set_association_rec(
+ &start_assoc, argv[i], argv[i]+end,
+ command_len, option))
+ && !(limit_set = sacctmgr_set_association_cond(
+ assoc_cond, argv[i], argv[i]+end,
+ command_len))) {
exit_code=1;
fprintf(stderr, " Unknown option: %s\n", argv[i]);
}
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_wckey_cond(wckey_cond);
slurmdb_destroy_association_cond(assoc_cond);
return SLURM_ERROR;
- } else if (!list_count(assoc_cond->user_list)) {
+ } else if(!list_count(assoc_cond->user_list)) {
slurmdb_destroy_wckey_cond(wckey_cond);
slurmdb_destroy_association_cond(assoc_cond);
exit_code=1;
@@ -521,7 +521,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
}
- if (!local_user_list) {
+ if(!local_user_list) {
exit_code=1;
fprintf(stderr, " Problem getting users from database. "
"Contact your admin.\n");
@@ -531,13 +531,13 @@ extern int sacctmgr_add_user(int argc, char *argv[])
}
- if (!list_count(assoc_cond->cluster_list)) {
+ if(!list_count(assoc_cond->cluster_list)) {
List cluster_list = NULL;
slurmdb_cluster_rec_t *cluster_rec = NULL;
cluster_list = acct_storage_g_get_clusters(db_conn,
my_uid, NULL);
- if (!cluster_list) {
+ if(!cluster_list) {
exit_code=1;
fprintf(stderr,
" Problem getting clusters from database. "
@@ -545,7 +545,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
slurmdb_destroy_wckey_cond(wckey_cond);
slurmdb_destroy_association_cond(assoc_cond);
list_destroy(local_user_list);
- if (local_acct_list)
+ if(local_acct_list)
list_destroy(local_acct_list);
return SLURM_ERROR;
}
@@ -557,7 +557,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
}
list_iterator_destroy(itr_c);
- if (!list_count(assoc_cond->cluster_list)) {
+ if(!list_count(assoc_cond->cluster_list)) {
exit_code=1;
fprintf(stderr,
" Can't add users, no cluster defined yet.\n"
@@ -565,7 +565,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
slurmdb_destroy_wckey_cond(wckey_cond);
slurmdb_destroy_association_cond(assoc_cond);
list_destroy(local_user_list);
- if (local_acct_list)
+ if(local_acct_list)
list_destroy(local_acct_list);
return SLURM_ERROR;
}
@@ -586,10 +586,10 @@ extern int sacctmgr_add_user(int argc, char *argv[])
list_iterator_reset(itr);
while((cluster_rec = list_next(itr))) {
- if (!strcasecmp(cluster_rec->name, cluster))
+ if(!strcasecmp(cluster_rec->name, cluster))
break;
}
- if (!cluster_rec) {
+ if(!cluster_rec) {
exit_code=1;
fprintf(stderr, " This cluster '%s' "
"doesn't exist.\n"
@@ -603,18 +603,18 @@ extern int sacctmgr_add_user(int argc, char *argv[])
list_iterator_destroy(itr_c);
list_destroy(temp_list);
- if (!list_count(assoc_cond->cluster_list)) {
+ if(!list_count(assoc_cond->cluster_list)) {
slurmdb_destroy_wckey_cond(wckey_cond);
slurmdb_destroy_association_cond(assoc_cond);
list_destroy(local_user_list);
- if (local_acct_list)
+ if(local_acct_list)
list_destroy(local_acct_list);
return SLURM_ERROR;
}
}
- if (!list_count(assoc_cond->acct_list)) {
- if (!list_count(wckey_cond->name_list)) {
+ if(!list_count(assoc_cond->acct_list)) {
+ if(!list_count(wckey_cond->name_list)) {
slurmdb_destroy_wckey_cond(wckey_cond);
slurmdb_destroy_association_cond(assoc_cond);
exit_code=1;
@@ -632,7 +632,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
local_acct_list = acct_storage_g_get_accounts(
db_conn, my_uid, &account_cond);
- if (!local_acct_list) {
+ if(!local_acct_list) {
exit_code=1;
fprintf(stderr, " Problem getting accounts "
"from database. Contact your admin.\n");
@@ -642,7 +642,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
return SLURM_ERROR;
}
- if (!default_acct)
+ if(!default_acct)
default_acct =
xstrdup(list_peek(assoc_cond->acct_list));
@@ -653,7 +653,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
local_assoc_list = acct_storage_g_get_associations(
db_conn, my_uid, &query_assoc_cond);
- if (!local_assoc_list) {
+ if(!local_assoc_list) {
exit_code=1;
fprintf(stderr, " Problem getting associations "
"from database. Contact your admin.\n");
@@ -665,14 +665,14 @@ extern int sacctmgr_add_user(int argc, char *argv[])
}
}
- if (track_wckey || default_wckey) {
- if (!default_wckey)
+ if(track_wckey || default_wckey) {
+ if(!default_wckey)
default_wckey =
xstrdup(list_peek(wckey_cond->name_list));
wckey_cond->cluster_list = assoc_cond->cluster_list;
wckey_cond->user_list = assoc_cond->user_list;
- if (!(local_wckey_list = acct_storage_g_get_wckeys(
- db_conn, my_uid, wckey_cond)))
+ if(!(local_wckey_list = acct_storage_g_get_wckeys(
+ db_conn, my_uid, wckey_cond)))
info("If you are a coordinator ignore "
"the previous error");
@@ -689,7 +689,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
itr = list_iterator_create(assoc_cond->user_list);
while((name = list_next(itr))) {
- if (!name[0]) {
+ if(!name[0]) {
exit_code=1;
fprintf(stderr, " No blank names are "
"allowed when adding.\n");
@@ -698,18 +698,18 @@ extern int sacctmgr_add_user(int argc, char *argv[])
}
user = NULL;
- if (!sacctmgr_find_user_from_list(local_user_list, name)) {
+ if(!sacctmgr_find_user_from_list(local_user_list, name)) {
uid_t pw_uid;
- if (!default_acct || !default_acct[0]) {
+ if(!default_acct || !default_acct[0]) {
exit_code=1;
fprintf(stderr, " Need a default account for "
"these users to add.\n");
rc = SLURM_ERROR;
goto no_default;
}
- if (first) {
- if (!sacctmgr_find_account_from_list(
- local_acct_list, default_acct)) {
+ if(first) {
+ if(!sacctmgr_find_account_from_list(
+ local_acct_list, default_acct)) {
exit_code=1;
fprintf(stderr, " This account '%s' "
"doesn't exist.\n"
@@ -726,7 +726,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
"\nAre you sure you want to continue?",
name);
- if (!commit_check(warning)) {
+ if(!commit_check(warning)) {
xfree(warning);
rc = SLURM_ERROR;
list_flush(user_list);
@@ -753,9 +753,9 @@ extern int sacctmgr_add_user(int argc, char *argv[])
itr_a = list_iterator_create(assoc_cond->acct_list);
while((account = list_next(itr_a))) {
- if (acct_first) {
- if (!sacctmgr_find_account_from_list(
- local_acct_list, default_acct)) {
+ if(acct_first) {
+ if(!sacctmgr_find_account_from_list(
+ local_acct_list, default_acct)) {
exit_code=1;
fprintf(stderr, " This account '%s' "
"doesn't exist.\n"
@@ -767,10 +767,10 @@ extern int sacctmgr_add_user(int argc, char *argv[])
}
itr_c = list_iterator_create(assoc_cond->cluster_list);
while((cluster = list_next(itr_c))) {
- if (!sacctmgr_find_account_base_assoc_from_list(
- local_assoc_list, account,
- cluster)) {
- if (acct_first) {
+ if(!sacctmgr_find_account_base_assoc_from_list(
+ local_assoc_list, account,
+ cluster)) {
+ if(acct_first) {
exit_code=1;
fprintf(stderr, " This "
"account '%s' "
@@ -788,10 +788,10 @@ extern int sacctmgr_add_user(int argc, char *argv[])
assoc_cond->partition_list);
while((partition = list_next(itr_p))) {
partition_set = 1;
- if (sacctmgr_find_association_from_list(
- local_assoc_list,
- name, account,
- cluster, partition))
+ if(sacctmgr_find_association_from_list(
+ local_assoc_list,
+ name, account,
+ cluster, partition))
continue;
assoc = xmalloc(
sizeof(slurmdb_association_rec_t));
@@ -829,7 +829,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
assoc->qos_list = copy_char_list(
start_assoc.qos_list);
- if (user)
+ if(user)
list_append(user->assoc_list,
assoc);
else
@@ -844,12 +844,12 @@ extern int sacctmgr_add_user(int argc, char *argv[])
assoc->partition);
}
list_iterator_destroy(itr_p);
- if (partition_set)
+ if(partition_set)
continue;
- if (sacctmgr_find_association_from_list(
- local_assoc_list,
- name, account, cluster, NULL)) {
+ if(sacctmgr_find_association_from_list(
+ local_assoc_list,
+ name, account, cluster, NULL)) {
continue;
}
@@ -883,7 +883,7 @@ extern int sacctmgr_add_user(int argc, char *argv[])
assoc->qos_list =
copy_char_list(start_assoc.qos_list);
- if (user)
+ if(user)
list_append(user->assoc_list, assoc);
else
list_append(assoc_list, assoc);
@@ -900,23 +900,23 @@ extern int sacctmgr_add_user(int argc, char *argv[])
acct_first = 0;
/* continue here if not doing wckeys */
- if (!track_wckey && !default_wckey)
+ if(!track_wckey && !default_wckey)
continue;
itr_w = list_iterator_create(wckey_cond->name_list);
while((account = list_next(itr_w))) {
itr_c = list_iterator_create(assoc_cond->cluster_list);
while((cluster = list_next(itr_c))) {
- if (sacctmgr_find_wckey_from_list(
- local_wckey_list, name, account,
- cluster)) {
+ if(sacctmgr_find_wckey_from_list(
+ local_wckey_list, name, account,
+ cluster)) {
continue;
}
wckey = xmalloc(sizeof(slurmdb_wckey_rec_t));
wckey->user = xstrdup(name);
wckey->name = xstrdup(account);
wckey->cluster = xstrdup(cluster);
- if (user)
+ if(user)
list_append(user->wckey_list, wckey);
else
list_append(wckey_list, wckey);
@@ -935,68 +935,68 @@ extern int sacctmgr_add_user(int argc, char *argv[])
no_default:
list_iterator_destroy(itr);
list_destroy(local_user_list);
- if (local_acct_list)
+ if(local_acct_list)
list_destroy(local_acct_list);
- if (local_assoc_list)
+ if(local_assoc_list)
list_destroy(local_assoc_list);
- if (local_wckey_list)
+ if(local_wckey_list)
list_destroy(local_wckey_list);
slurmdb_destroy_wckey_cond(wckey_cond);
slurmdb_destroy_association_cond(assoc_cond);
- if (!list_count(user_list) && !list_count(assoc_list)
- && !list_count(wckey_list)) {
+ if(!list_count(user_list) && !list_count(assoc_list)
+ && !list_count(wckey_list)) {
printf(" Nothing new added.\n");
goto end_it;
- } else if (!assoc_str && !wckey_str) {
+ } else if(!assoc_str && !wckey_str) {
exit_code=1;
fprintf(stderr, " No associations or wckeys created.\n");
goto end_it;
}
- if (user_str) {
+ if(user_str) {
printf(" Adding User(s)\n%s", user_str);
printf(" Settings =\n");
printf(" Default Account = %s\n", default_acct);
- if (default_wckey)
+ if(default_wckey)
printf(" Default WCKey = %s\n", default_wckey);
- if (admin_level != SLURMDB_ADMIN_NOTSET)
+ if(admin_level != SLURMDB_ADMIN_NOTSET)
printf(" Admin Level = %s\n",
slurmdb_admin_level_str(admin_level));
xfree(user_str);
}
- if (assoc_str) {
+ if(assoc_str) {
printf(" Associations =\n%s", assoc_str);
xfree(assoc_str);
}
- if (wckey_str) {
+ if(wckey_str) {
printf(" WCKeys =\n%s", wckey_str);
xfree(wckey_str);
}
- if (limit_set) {
+ if(limit_set) {
printf(" Non Default Settings\n");
sacctmgr_print_assoc_limits(&start_assoc);
- if (start_assoc.qos_list)
+ if(start_assoc.qos_list)
list_destroy(start_assoc.qos_list);
}
notice_thread_init();
- if (list_count(user_list)) {
+ if(list_count(user_list)) {
rc = acct_storage_g_add_users(db_conn, my_uid, user_list);
}
- if (rc == SLURM_SUCCESS) {
- if (list_count(assoc_list))
+ if(rc == SLURM_SUCCESS) {
+ if(list_count(assoc_list))
rc = acct_storage_g_add_associations(db_conn, my_uid,
assoc_list);
}
- if (rc == SLURM_SUCCESS) {
- if (list_count(wckey_list))
+ if(rc == SLURM_SUCCESS) {
+ if(list_count(wckey_list))
rc = acct_storage_g_add_wckeys(db_conn, my_uid,
wckey_list);
} else {
@@ -1010,8 +1010,8 @@ no_default:
notice_thread_fini();
- if (rc == SLURM_SUCCESS) {
- if (commit_check("Would you like to commit changes?")) {
+ if(rc == SLURM_SUCCESS) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
@@ -1054,10 +1054,10 @@ extern int sacctmgr_add_coord(int argc, char *argv[])
cond_set = MAX(cond_set, prev_set);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_user_cond(user_cond);
return SLURM_ERROR;
- } else if (!cond_set) {
+ } else if(!cond_set) {
exit_code=1;
fprintf(stderr, " You need to specify conditions to "
"to add the coordinator.\n");
@@ -1065,8 +1065,8 @@ extern int sacctmgr_add_coord(int argc, char *argv[])
return SLURM_ERROR;
}
- if ((_check_coord_request(user_cond, true) == SLURM_ERROR)
- || exit_code) {
+ if((_check_coord_request(user_cond, true) == SLURM_ERROR)
+ || exit_code) {
slurmdb_destroy_user_cond(user_cond);
return SLURM_ERROR;
}
@@ -1093,8 +1093,8 @@ extern int sacctmgr_add_coord(int argc, char *argv[])
notice_thread_fini();
slurmdb_destroy_user_cond(user_cond);
- if (rc == SLURM_SUCCESS) {
- if (commit_check("Would you like to commit changes?")) {
+ if(rc == SLURM_SUCCESS) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
@@ -1172,31 +1172,31 @@ extern int sacctmgr_list_user(int argc, char *argv[])
cond_set = MAX(cond_set, prev_set);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_user_cond(user_cond);
list_destroy(format_list);
return SLURM_ERROR;
}
- if (!list_count(format_list)) {
- if (slurm_get_track_wckey())
+ if(!list_count(format_list)) {
+ if(slurm_get_track_wckey())
slurm_addto_char_list(format_list,
"U,DefaultA,DefaultW,Ad");
else
slurm_addto_char_list(format_list, "U,DefaultA,Ad");
- if (user_cond->with_assocs)
+ if(user_cond->with_assocs)
slurm_addto_char_list(format_list,
"Cl,Ac,Part,Shares,"
"MaxJ,MaxN,MaxCPUs,MaxS,MaxW,"
"MaxCPUMins,QOS,DefaultQOS");
- if (user_cond->with_coords)
+ if(user_cond->with_coords)
slurm_addto_char_list(format_list, "Coord");
}
- if (!user_cond->with_assocs && cond_set > 1) {
- if (!commit_check("You requested options that are only vaild "
- "when querying with the withassoc option.\n"
- "Are you sure you want to continue?")) {
+ if(!user_cond->with_assocs && cond_set > 1) {
+ if(!commit_check("You requested options that are only vaild "
+ "when querying with the withassoc option.\n"
+ "Are you sure you want to continue?")) {
printf("Aborted\n");
list_destroy(format_list);
slurmdb_destroy_user_cond(user_cond);
@@ -1211,7 +1211,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -1219,176 +1219,176 @@ extern int sacctmgr_list_user(int argc, char *argv[])
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Account", object, MAX(command_len, 2))
- || !strncasecmp("Acct", object, MAX(command_len, 4))) {
+ if(!strncasecmp("Account", object, MAX(command_len, 2))
+ || !strncasecmp("Acct", object, MAX(command_len, 4))) {
field->type = PRINT_ACCOUNT;
field->name = xstrdup("Account");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("AdminLevel", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("AdminLevel", object,
+ MAX(command_len, 2))) {
field->type = PRINT_ADMIN;
field->name = xstrdup("Admin");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Cluster", object,
+ MAX(command_len, 2))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Coordinators", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("Coordinators", object,
+ MAX(command_len, 2))) {
field->type = PRINT_COORDS;
field->name = xstrdup("Coord Accounts");
field->len = 20;
field->print_routine = sacctmgr_print_coord_list;
- } else if (!strncasecmp("DefaultAccount", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("DefaultAccount", object,
+ MAX(command_len, 8))) {
field->type = PRINT_DACCT;
field->name = xstrdup("Def Acct");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("DefaultWCKey", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("DefaultWCKey", object,
+ MAX(command_len, 8))) {
field->type = PRINT_DWCKEY;
field->name = xstrdup("Def WCKey");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("DefaultQOS", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("DefaultQOS", object,
+ MAX(command_len, 8))) {
field->type = PRINT_DQOS;
field->name = xstrdup("Def QOS");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("FairShare", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("FairShare", object,
+ MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpCPUMins", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPUMins", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPCM;
field->name = xstrdup("GrpCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("GrpCPURunMins", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPURunMins", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPCRM;
field->name = xstrdup("GrpCPURunMins");
field->len = 13;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("GrpCPUs", object,
- MAX(command_len, 8))) {
+ } else if(!strncasecmp("GrpCPUs", object,
+ MAX(command_len, 8))) {
field->type = PRINT_GRPC;
field->name = xstrdup("GrpCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPJ;
field->name = xstrdup("GrpJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpNodes", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpNodes", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPN;
field->name = xstrdup("GrpNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPS;
field->name = xstrdup("GrpSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("GrpWall", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("GrpWall", object,
+ MAX(command_len, 4))) {
field->type = PRINT_GRPW;
field->name = xstrdup("GrpWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("ID", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("ID", object, MAX(command_len, 1))) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxCPUMinsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUMinsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXCM;
field->name = xstrdup("MaxCPUMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("MaxCPURunMins", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPURunMins", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXCRM;
field->name = xstrdup("MaxCPURunMins");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("MaxCPUsPerJob", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("MaxCPUsPerJob", object,
+ MAX(command_len, 7))) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUs");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxNodesPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxNodesPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxSubmitJobs", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxSubmitJobs", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXS;
field->name = xstrdup("MaxSubmit");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("MaxWallDurationPerJob", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("MaxWallDurationPerJob", object,
+ MAX(command_len, 4))) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("QOSRAWLevel", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("QOSRAWLevel", object,
+ MAX(command_len, 4))) {
field->type = PRINT_QOS_RAW;
field->name = xstrdup("QOS_RAW");
field->len = 10;
field->print_routine = print_fields_char_list;
- } else if (!strncasecmp("QOSLevel", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("QOSLevel", object,
+ MAX(command_len, 1))) {
field->type = PRINT_QOS;
field->name = xstrdup("QOS");
field->len = 20;
field->print_routine = sacctmgr_print_qos_list;
- } else if (!strncasecmp("ParentID", object,
- MAX(command_len, 7))) {
+ } else if(!strncasecmp("ParentID", object,
+ MAX(command_len, 7))) {
field->type = PRINT_PID;
field->name = xstrdup("Par ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Partition", object,
- MAX(command_len, 4))) {
+ } else if(!strncasecmp("Partition", object,
+ MAX(command_len, 4))) {
field->type = PRINT_PART;
field->name = xstrdup("Partition");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Shares", object,
- MAX(command_len, 1))) {
+ } else if(!strncasecmp("Shares", object,
+ MAX(command_len, 1))) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("Shares");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("User", object, MAX(command_len, 1))
- || !strncasecmp("Name", object,
- MAX(command_len, 2))) {
+ } else if(!strncasecmp("User", object, MAX(command_len, 1))
+ || !strncasecmp("Name", object,
+ MAX(command_len, 2))) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 10;
@@ -1400,7 +1400,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -1408,7 +1408,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_user_cond(user_cond);
list_destroy(print_fields_list);
return SLURM_ERROR;
@@ -1417,7 +1417,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
user_list = acct_storage_g_get_users(db_conn, my_uid, user_cond);
slurmdb_destroy_user_cond(user_cond);
- if (!user_list) {
+ if(!user_list) {
exit_code=1;
fprintf(stderr, " Problem with query.\n");
list_destroy(print_fields_list);
@@ -1431,7 +1431,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field_count = list_count(print_fields_list);
while((user = list_next(itr))) {
- if (user->assoc_list) {
+ if(user->assoc_list) {
ListIterator itr3 =
list_iterator_create(user->assoc_list);
@@ -1488,7 +1488,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field_count));
break;
case PRINT_DQOS:
- if (!g_qos_list)
+ if(!g_qos_list)
g_qos_list =
acct_storage_g_get_qos(
db_conn,
@@ -1620,7 +1620,7 @@ extern int sacctmgr_list_user(int argc, char *argv[])
field_count));
break;
case PRINT_QOS:
- if (!g_qos_list) {
+ if(!g_qos_list) {
g_qos_list =
acct_storage_g_get_qos(
db_conn,
@@ -1800,21 +1800,21 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
}
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_user_cond(user_cond);
slurmdb_destroy_user_rec(user);
slurmdb_destroy_association_rec(assoc);
return SLURM_ERROR;
- } else if (!rec_set) {
+ } else if(!rec_set) {
exit_code=1;
fprintf(stderr, " You didn't give me anything to set\n");
slurmdb_destroy_user_cond(user_cond);
slurmdb_destroy_user_rec(user);
slurmdb_destroy_association_rec(assoc);
return SLURM_ERROR;
- } else if (!cond_set) {
- if (!commit_check("You didn't set any conditions with 'WHERE'.\n"
- "Are you sure you want to continue?")) {
+ } else if(!cond_set) {
+ if(!commit_check("You didn't set any conditions with 'WHERE'.\n"
+ "Are you sure you want to continue?")) {
printf("Aborted\n");
slurmdb_destroy_user_cond(user_cond);
slurmdb_destroy_user_rec(user);
@@ -1824,8 +1824,8 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
}
notice_thread_init();
- if (rec_set == 3 || rec_set == 1) { // process the account changes
- if (cond_set == 2) {
+ if(rec_set == 3 || rec_set == 1) { // process the account changes
+ if(cond_set == 2) {
rc = SLURM_ERROR;
exit_code=1;
fprintf(stderr,
@@ -1834,15 +1834,15 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
goto assoc_start;
}
- if (user_cond->assoc_cond
- && user_cond->assoc_cond->acct_list
- && list_count(user_cond->assoc_cond->acct_list)) {
+ if(user_cond->assoc_cond
+ && user_cond->assoc_cond->acct_list
+ && list_count(user_cond->assoc_cond->acct_list)) {
notice_thread_fini();
- if (commit_check(
- " You specified Accounts in your "
- "request. Did you mean "
- "DefaultAccounts?\n")) {
- if (!user_cond->def_acct_list)
+ if(commit_check(
+ " You specified Accounts in your "
+ "request. Did you mean "
+ "DefaultAccounts?\n")) {
+ if(!user_cond->def_acct_list)
user_cond->def_acct_list =
list_create(slurm_destroy_char);
list_transfer(user_cond->def_acct_list,
@@ -1853,7 +1853,7 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
ret_list = acct_storage_g_modify_users(
db_conn, my_uid, user_cond, user);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
List regret_list = NULL;
ListIterator itr = list_iterator_create(ret_list);
@@ -1869,16 +1869,16 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
* user doesn't have the account make
* note of it.
*/
- if (user->default_acct &&
- !_check_user_has_acct(
- object, user->default_acct)) {
- if (!regret_list)
+ if(user->default_acct &&
+ !_check_user_has_acct(
+ object, user->default_acct)) {
+ if(!regret_list)
regret_list = list_create(NULL);
list_append(regret_list, object);
continue;
}
}
- if (regret_list) {
+ if(regret_list) {
list_iterator_destroy(itr);
itr = list_iterator_create(regret_list);
printf(" Can't modify because these users "
@@ -1901,27 +1901,27 @@ extern int sacctmgr_modify_user(int argc, char *argv[])
list_iterator_destroy(itr);
set = 1;
}
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing modified\n");
} else {
exit_code=1;
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(errno));
- if (errno == ESLURM_ONE_CHANGE)
+ if(errno == ESLURM_ONE_CHANGE)
fprintf(stderr, " If you are changing a users "
"name you can only specify 1 user "
"at a time.\n");
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
}
assoc_start:
- if (rec_set == 3 || rec_set == 2) { // process the association changes
- if (cond_set == 1
- && !list_count(user_cond->assoc_cond->user_list)) {
+ if(rec_set == 3 || rec_set == 2) { // process the association changes
+ if(cond_set == 1
+ && !list_count(user_cond->assoc_cond->user_list)) {
rc = SLURM_ERROR;
exit_code=1;
fprintf(stderr,
@@ -1933,7 +1933,7 @@ assoc_start:
ret_list = acct_storage_g_modify_associations(
db_conn, my_uid, user_cond->assoc_cond, assoc);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Modified account associations...\n");
@@ -1942,7 +1942,7 @@ assoc_start:
}
list_iterator_destroy(itr);
set = 1;
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing modified\n");
} else {
exit_code=1;
@@ -1951,14 +1951,14 @@ assoc_start:
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
}
assoc_end:
notice_thread_fini();
- if (set) {
- if (commit_check("Would you like to commit changes?"))
+ if(set) {
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
@@ -1990,7 +1990,7 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
cond_set = MAX(cond_set, prev_set);
}
- if (!cond_set) {
+ if(!cond_set) {
exit_code=1;
fprintf(stderr,
" No conditions given to remove, not executing.\n");
@@ -1998,16 +1998,16 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
return SLURM_ERROR;
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_user_cond(user_cond);
return SLURM_ERROR;
}
notice_thread_init();
- if (cond_set == 1) {
+ if(cond_set == 1) {
ret_list = acct_storage_g_remove_users(
db_conn, my_uid, user_cond);
- } else if (cond_set == 2 || cond_set == 3) {
+ } else if(cond_set == 2 || cond_set == 3) {
ret_list = acct_storage_g_remove_associations(
db_conn, my_uid, user_cond->assoc_cond);
}
@@ -2016,13 +2016,13 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
slurmdb_destroy_user_cond(user_cond);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
/* If there were jobs running with an association to
be deleted, don't.
*/
- if (rc == ESLURM_JOBS_RUNNING_ON_ASSOC) {
+ if(rc == ESLURM_JOBS_RUNNING_ON_ASSOC) {
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(rc));
while((object = list_next(itr))) {
@@ -2033,22 +2033,22 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
acct_storage_g_commit(db_conn, 0);
return rc;
}
- if (cond_set == 1) {
+ if(cond_set == 1) {
printf(" Deleting users...\n");
- } else if (cond_set == 2 || cond_set == 3) {
+ } else if(cond_set == 2 || cond_set == 3) {
printf(" Deleting user associations...\n");
}
while((object = list_next(itr))) {
printf(" %s\n", object);
}
list_iterator_destroy(itr);
- if (commit_check("Would you like to commit changes?")) {
+ if(commit_check("Would you like to commit changes?")) {
acct_storage_g_commit(db_conn, 1);
} else {
printf(" Changes Discarded\n");
acct_storage_g_commit(db_conn, 0);
}
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing deleted\n");
} else {
exit_code=1;
@@ -2058,7 +2058,7 @@ extern int sacctmgr_delete_user(int argc, char *argv[])
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
return rc;
@@ -2086,23 +2086,23 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
cond_set = MAX(cond_set, prev_set);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_user_cond(user_cond);
return SLURM_ERROR;
- } else if (!cond_set) {
+ } else if(!cond_set) {
exit_code=1;
fprintf(stderr, " You need to specify a user list "
"or account list here.\n");
slurmdb_destroy_user_cond(user_cond);
return SLURM_ERROR;
}
- if ((_check_coord_request(user_cond, false) == SLURM_ERROR)
- || exit_code) {
+ if((_check_coord_request(user_cond, false) == SLURM_ERROR)
+ || exit_code) {
slurmdb_destroy_user_cond(user_cond);
return SLURM_ERROR;
}
- if (user_cond->assoc_cond->user_list) {
+ if(user_cond->assoc_cond->user_list) {
itr = list_iterator_create(user_cond->assoc_cond->user_list);
while((name = list_next(itr))) {
xstrfmtcat(user_str, " %s\n", name);
@@ -2111,7 +2111,7 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
list_iterator_destroy(itr);
}
- if (user_cond->assoc_cond->acct_list) {
+ if(user_cond->assoc_cond->acct_list) {
itr = list_iterator_create(user_cond->assoc_cond->acct_list);
while((name = list_next(itr))) {
xstrfmtcat(acct_str, " %s\n", name);
@@ -2120,7 +2120,7 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
list_iterator_destroy(itr);
}
- if (!user_str && !acct_str) {
+ if(!user_str && !acct_str) {
exit_code=1;
fprintf(stderr, " You need to specify a user list "
"or an account list here.\n");
@@ -2131,9 +2131,9 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
* just assumed. Right now it doesn't do it correctly though.
* This is why we are doing it this way.
*/
- if (user_str) {
+ if(user_str) {
printf(" Removing Coordinators with user name\n%s", user_str);
- if (acct_str)
+ if(acct_str)
printf(" From Account(s)\n%s", acct_str);
else
printf(" From all accounts\n");
@@ -2147,7 +2147,7 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
slurmdb_destroy_user_cond(user_cond);
- if (ret_list && list_count(ret_list)) {
+ if(ret_list && list_count(ret_list)) {
char *object = NULL;
ListIterator itr = list_iterator_create(ret_list);
printf(" Removed Coordinators (sub accounts not listed)...\n");
@@ -2156,7 +2156,7 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
}
list_iterator_destroy(itr);
set = 1;
- } else if (ret_list) {
+ } else if(ret_list) {
printf(" Nothing removed\n");
} else {
exit_code=1;
@@ -2165,11 +2165,11 @@ extern int sacctmgr_delete_coord(int argc, char *argv[])
rc = SLURM_ERROR;
}
- if (ret_list)
+ if(ret_list)
list_destroy(ret_list);
notice_thread_fini();
- if (set) {
- if (commit_check("Would you like to commit changes?"))
+ if(set) {
+ if(commit_check("Would you like to commit changes?"))
acct_storage_g_commit(db_conn, 1);
else {
printf(" Changes Discarded\n");
diff --git a/src/sacctmgr/wckey_functions.c b/src/sacctmgr/wckey_functions.c
index d670f5176f933afc91df694397548e395794f26d..393bfec5c4478c492f8f0c28f8663db0aa2a79bf 100644
--- a/src/sacctmgr/wckey_functions.c
+++ b/src/sacctmgr/wckey_functions.c
@@ -50,52 +50,52 @@ static int _set_cond(int *start, int argc, char *argv[],
int command_len = 0;
int option = 0;
- if (!wckey_cond) {
+ if(!wckey_cond) {
error("No wckey_cond given");
return -1;
}
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "where",
+ if(!end && !strncasecmp(argv[i], "where",
MAX(command_len, 5))) {
continue;
- } else if (!end && !strncasecmp(argv[i], "withdeleted",
+ } else if(!end && !strncasecmp(argv[i], "withdeleted",
MAX(command_len, 5))) {
wckey_cond->with_deleted = 1;
set = 1;
- } else if (!end
- || !strncasecmp(argv[i], "WCKeys",
+ } else if(!end
+ || !strncasecmp (argv[i], "WCKeys",
MAX(command_len, 3))
- || !strncasecmp(argv[i], "Names",
+ || !strncasecmp (argv[i], "Names",
MAX(command_len, 3))) {
- if (!wckey_cond->name_list)
+ if(!wckey_cond->name_list)
wckey_cond->name_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(wckey_cond->name_list,
+ if(slurm_addto_char_list(wckey_cond->name_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Ids",
+ } else if (!strncasecmp (argv[i], "Ids",
MAX(command_len, 1))) {
ListIterator itr = NULL;
char *temp = NULL;
uint32_t id = 0;
- if (!wckey_cond->id_list)
+ if(!wckey_cond->id_list)
wckey_cond->id_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(wckey_cond->id_list,
+ if(slurm_addto_char_list(wckey_cond->id_list,
argv[i]+end))
set = 1;
@@ -109,31 +109,31 @@ static int _set_cond(int *start, int argc, char *argv[],
}
}
list_iterator_destroy(itr);
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 3))) {
- if (!wckey_cond->cluster_list)
+ if(!wckey_cond->cluster_list)
wckey_cond->cluster_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(wckey_cond->cluster_list,
+ if(slurm_addto_char_list(wckey_cond->cluster_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
wckey_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
wckey_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Users",
+ } else if (!strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
- if (!wckey_cond->user_list)
+ if(!wckey_cond->user_list)
wckey_cond->user_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(wckey_cond->user_list,
+ if(slurm_addto_char_list(wckey_cond->user_list,
argv[i]+end))
set = 1;
} else {
@@ -173,19 +173,19 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
for (i=0; i<argc; i++) {
int command_len = strlen(argv[i]);
- if (!strncasecmp(argv[i], "Where", MAX(command_len, 5))
- || !strncasecmp(argv[i], "Set", MAX(command_len, 3)))
+ if (!strncasecmp (argv[i], "Where", MAX(command_len, 5))
+ || !strncasecmp (argv[i], "Set", MAX(command_len, 3)))
i++;
_set_cond(&i, argc, argv, wckey_cond, format_list);
}
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_wckey_cond(wckey_cond);
list_destroy(format_list);
return SLURM_ERROR;
}
- if (!list_count(format_list)) {
+ if(!list_count(format_list)) {
slurm_addto_char_list(format_list,
"Name,Cluster,User");
}
@@ -198,7 +198,7 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -206,24 +206,24 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("WCKeys", object, MAX(command_len, 1))
+ if(!strncasecmp("WCKeys", object, MAX(command_len, 1))
|| !strncasecmp("Names", object, MAX(command_len, 1))) {
field->type = PRINT_NAME;
field->name = xstrdup("WCKey");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Clusters", object,
+ } else if(!strncasecmp("Clusters", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("IDs", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("IDs", object, MAX(command_len, 1))) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Users", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Users", object, MAX(command_len, 1))) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 10;
@@ -235,7 +235,7 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -243,7 +243,7 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
slurmdb_destroy_wckey_cond(wckey_cond);
list_destroy(print_fields_list);
return SLURM_ERROR;
@@ -252,7 +252,7 @@ extern int sacctmgr_list_wckey(int argc, char *argv[])
wckey_list = acct_storage_g_get_wckeys(db_conn, my_uid, wckey_cond);
slurmdb_destroy_wckey_cond(wckey_cond);
- if (!wckey_list) {
+ if(!wckey_list) {
exit_code=1;
fprintf(stderr, " Error with request: %s\n",
slurm_strerror(errno));
diff --git a/src/salloc/opt.c b/src/salloc/opt.c
index d97349e42692da8b733b4f91643170f5de1f680f..c63c99ff918e47f5c0b903eeb56c82d37f9d3973 100644
--- a/src/salloc/opt.c
+++ b/src/salloc/opt.c
@@ -226,12 +226,12 @@ static bool _valid_node_list(char **node_list_pptr)
procs to use then we need exactly this many since we are
saying, lay it out this way! Same for max and min nodes.
Other than that just read in as many in the hostfile */
- if (opt.ntasks_set)
+ if(opt.ntasks_set)
count = opt.ntasks;
- else if (opt.nodes_set) {
- if (opt.max_nodes)
+ else if(opt.nodes_set) {
+ if(opt.max_nodes)
count = opt.max_nodes;
- else if (opt.min_nodes)
+ else if(opt.min_nodes)
count = opt.min_nodes;
}
@@ -1313,7 +1313,7 @@ static bool _opt_verify(void)
if (opt.distribution == SLURM_DIST_PLANE && opt.plane_size) {
if ((opt.ntasks/opt.plane_size) < opt.min_nodes) {
if (((opt.min_nodes-1)*opt.plane_size) >= opt.ntasks) {
-#if (0)
+#if(0)
info("Too few processes ((n/plane_size) %d < N %d) "
"and ((N-1)*(plane_size) %d >= n %d)) ",
opt.ntasks/opt.plane_size, opt.min_nodes,
@@ -1389,12 +1389,12 @@ static bool _opt_verify(void)
} /* else if (opt.ntasks_set && !opt.nodes_set) */
- if (!opt.nodelist) {
- if ((opt.nodelist = xstrdup(getenv("SLURM_HOSTFILE")))) {
+ if(!opt.nodelist) {
+ if((opt.nodelist = xstrdup(getenv("SLURM_HOSTFILE")))) {
/* make sure the file being read in has a / in
it to make sure it is a file in the
valid_node_list function */
- if (!strstr(opt.nodelist, "/")) {
+ if(!strstr(opt.nodelist, "/")) {
char *add_slash = xstrdup("./");
xstrcat(add_slash, opt.nodelist);
xfree(opt.nodelist);
@@ -1417,14 +1417,14 @@ static bool _opt_verify(void)
/* set up the proc and node counts based on the arbitrary list
of nodes */
- if ((opt.distribution == SLURM_DIST_ARBITRARY)
+ if((opt.distribution == SLURM_DIST_ARBITRARY)
&& (!opt.nodes_set || !opt.ntasks_set)) {
hostlist_t hl = hostlist_create(opt.nodelist);
- if (!opt.ntasks_set) {
+ if(!opt.ntasks_set) {
opt.ntasks_set = 1;
opt.ntasks = hostlist_count(hl);
}
- if (!opt.nodes_set) {
+ if(!opt.nodes_set) {
opt.nodes_set = 1;
hostlist_uniq(hl);
opt.min_nodes = opt.max_nodes = hostlist_count(hl);
@@ -1645,7 +1645,7 @@ static void _opt_list()
if (opt.jobid != NO_VAL)
info("jobid : %u", opt.jobid);
info("distribution : %s", format_task_dist_states(opt.distribution));
- if (opt.distribution == SLURM_DIST_PLANE)
+ if(opt.distribution == SLURM_DIST_PLANE)
info("plane size : %u", opt.plane_size);
info("verbose : %d", opt.verbose);
if (opt.immediate <= 1)
diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c
index 6a60e9b9c6e62df7ce85cc24bf5868b78a5837ba..053057980567b31a705d47a442c36c017dacc4e9 100644
--- a/src/salloc/salloc.c
+++ b/src/salloc/salloc.c
@@ -267,14 +267,14 @@ int main(int argc, char *argv[])
info("Granted job allocation %d", alloc->job_id);
#ifdef HAVE_BG
if (!_wait_bluegene_block_ready(alloc)) {
- if (!allocation_interrupted)
+ if(!allocation_interrupted)
error("Something is wrong with the "
"boot of the block.");
goto relinquish;
}
#else
if (!_wait_nodes_ready(alloc)) {
- if (!allocation_interrupted)
+ if(!allocation_interrupted)
error("Something is wrong with the "
"boot of the nodes.");
goto relinquish;
@@ -282,7 +282,7 @@ int main(int argc, char *argv[])
#endif
#ifdef HAVE_CRAY_XT
if (!_claim_reservation(alloc)) {
- if (!allocation_interrupted)
+ if(!allocation_interrupted)
error("Something is wrong with the ALPS "
"resource reservation.");
goto relinquish;
@@ -862,7 +862,7 @@ static int _blocks_dealloc(void)
return -1;
}
for (i=0; i<new_bg_ptr->record_count; i++) {
- if (new_bg_ptr->block_array[i].state
+ if(new_bg_ptr->block_array[i].state
== RM_PARTITION_DEALLOCATING) {
rc = 1;
break;
diff --git a/src/sbatch/mult_cluster.c b/src/sbatch/mult_cluster.c
index 11a1ee6f0541c45df12b8ec2b231a8c512f5cea1..2b203317f0cd8e60c2c47bd8b6762e01e1953856 100644
--- a/src/sbatch/mult_cluster.c
+++ b/src/sbatch/mult_cluster.c
@@ -68,9 +68,9 @@ static int _sort_local_cluster(local_cluster_rec_t* rec_a,
else if (rec_a->preempt_cnt > rec_b->preempt_cnt)
return 1;
- if (!strcmp(local_cluster_name, rec_a->cluster_rec->name))
+ if(!strcmp(local_cluster_name, rec_a->cluster_rec->name))
return -1;
- else if (!strcmp(local_cluster_name, rec_b->cluster_rec->name))
+ else if(!strcmp(local_cluster_name, rec_b->cluster_rec->name))
return 1;
return 0;
@@ -108,7 +108,7 @@ local_cluster_rec_t *_job_will_run (job_desc_msg_t *req)
slurm_seterrno(rc);
break;
case RESPONSE_JOB_WILL_RUN:
- if (working_cluster_rec->flags & CLUSTER_FLAG_BG)
+ if(working_cluster_rec->flags & CLUSTER_FLAG_BG)
type = "cnodes";
will_run_resp = (will_run_response_msg_t *) resp_msg.data;
slurm_make_time_str(&will_run_resp->start_time,
@@ -123,7 +123,7 @@ local_cluster_rec_t *_job_will_run (job_desc_msg_t *req)
if (will_run_resp->preemptee_job_id) {
local_cluster->preempt_cnt =
list_count(will_run_resp->preemptee_job_id);
- if (opt.verbose >= LOG_LEVEL_DEBUG) {
+ if(opt.verbose >= LOG_LEVEL_DEBUG) {
ListIterator itr;
uint32_t *job_id_ptr;
char *job_list = NULL, *sep = "";
@@ -160,9 +160,9 @@ extern int sbatch_set_first_avail_cluster(job_desc_msg_t *req)
List ret_list = NULL;
/* return if we only have 1 or less clusters here */
- if (!opt.clusters || !list_count(opt.clusters)) {
+ if(!opt.clusters || !list_count(opt.clusters)) {
return rc;
- } else if (list_count(opt.clusters) == 1) {
+ } else if(list_count(opt.clusters) == 1) {
working_cluster_rec = list_peek(opt.clusters);
return rc;
}
@@ -176,8 +176,8 @@ extern int sbatch_set_first_avail_cluster(job_desc_msg_t *req)
ret_list = list_create(_destroy_local_cluster_rec);
itr = list_iterator_create(opt.clusters);
while((working_cluster_rec = list_next(itr))) {
- if ((local_cluster = _job_will_run(req))) {
- if (!ret_list)
+ if((local_cluster = _job_will_run(req))) {
+ if(!ret_list)
ret_list = list_create(
_destroy_local_cluster_rec);
list_append(ret_list, local_cluster);
@@ -190,7 +190,7 @@ extern int sbatch_set_first_avail_cluster(job_desc_msg_t *req)
if (host_set)
req->alloc_node = NULL;
- if (!ret_list) {
+ if(!ret_list) {
error("Can't run on any of the clusters given");
return SLURM_ERROR;
}
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 0e9edcd1c60fd95ff05de17c0cac298b3e6cd9a4..9622febec05fee9f0227a2e103ee7bb13c2f5ede 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -246,12 +246,12 @@ static bool _valid_node_list(char **node_list_pptr)
procs to use then we need exactly this many since we are
saying, lay it out this way! Same for max and min nodes.
Other than that just read in as many in the hostfile */
- if (opt.ntasks_set)
+ if(opt.ntasks_set)
count = opt.ntasks;
- else if (opt.nodes_set) {
- if (opt.max_nodes)
+ else if(opt.nodes_set) {
+ if(opt.max_nodes)
count = opt.max_nodes;
- else if (opt.min_nodes)
+ else if(opt.min_nodes)
count = opt.min_nodes;
}
@@ -1210,9 +1210,9 @@ static void _set_options(int argc, char **argv)
}
break;
case 'M':
- if (opt.clusters)
+ if(opt.clusters)
list_destroy(opt.clusters);
- if (!(opt.clusters =
+ if(!(opt.clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --clusters",
optarg);
@@ -1790,7 +1790,7 @@ static char *_get_pbs_node_name(char *node_options, int *i)
value = xmalloc((*i)-start+1);
memcpy(value, node_options+start, (*i)-start);
- if (node_options[*i])
+ if(node_options[*i])
(*i)++;
return value;
@@ -1802,7 +1802,7 @@ static void _get_next_pbs_node_part(char *node_options, int *i)
&& node_options[*i] != '+'
&& node_options[*i] != ':')
(*i)++;
- if (node_options[*i])
+ if(node_options[*i])
(*i)++;
}
@@ -1816,14 +1816,14 @@ static void _parse_pbs_nodes_opts(char *node_opts)
hostlist_t hl = hostlist_create(NULL);
while(node_opts[i]) {
- if (!strncmp(node_opts+i, "ppn=", 4)) {
+ if(!strncmp(node_opts+i, "ppn=", 4)) {
i+=4;
ppn += strtol(node_opts+i, NULL, 10);
_get_next_pbs_node_part(node_opts, &i);
- } else if (isdigit(node_opts[i])) {
+ } else if(isdigit(node_opts[i])) {
node_cnt += strtol(node_opts+i, NULL, 10);
_get_next_pbs_node_part(node_opts, &i);
- } else if (isalpha(node_opts[i])) {
+ } else if(isalpha(node_opts[i])) {
temp = _get_pbs_node_name(node_opts, &i);
hostlist_push(hl, temp);
xfree(temp);
@@ -1832,20 +1832,20 @@ static void _parse_pbs_nodes_opts(char *node_opts)
}
- if (!node_cnt)
+ if(!node_cnt)
node_cnt = 1;
else {
opt.nodes_set = true;
opt.min_nodes = opt.max_nodes = node_cnt;
}
- if (ppn) {
+ if(ppn) {
ppn *= node_cnt;
opt.ntasks_set = true;
opt.ntasks = ppn;
}
- if (hostlist_count(hl) > 0) {
+ if(hostlist_count(hl) > 0) {
hostlist_ranged_string(hl, sizeof(buf), buf);
xfree(opt.nodelist);
opt.nodelist = xstrdup(buf);
@@ -1864,7 +1864,7 @@ static void _get_next_pbs_option(char *pbs_options, int *i)
{
while(pbs_options[*i] && pbs_options[*i] != ',')
(*i)++;
- if (pbs_options[*i])
+ if(pbs_options[*i])
(*i)++;
}
@@ -1878,7 +1878,7 @@ static char *_get_pbs_option_value(char *pbs_options, int *i)
value = xmalloc((*i)-start+1);
memcpy(value, pbs_options+start, (*i)-start);
- if (pbs_options[*i])
+ if(pbs_options[*i])
(*i)++;
return value;
@@ -1890,10 +1890,10 @@ static void _parse_pbs_resource_list(char *rl)
char *temp = NULL;
while(rl[i]) {
- if (!strncmp(rl+i, "arch=", 5)) {
+ if(!strncmp(rl+i, "arch=", 5)) {
i+=5;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "cput=", 5)) {
+ } else if(!strncmp(rl+i, "cput=", 5)) {
i+=5;
temp = _get_pbs_option_value(rl, &i);
if (!temp) {
@@ -1903,12 +1903,12 @@ static void _parse_pbs_resource_list(char *rl)
xfree(opt.time_limit_str);
opt.time_limit_str = xstrdup(temp);
xfree(temp);
- } else if (!strncmp(rl+i, "file=", 5)) {
+ } else if(!strncmp(rl+i, "file=", 5)) {
int end = 0;
i+=5;
temp = _get_pbs_option_value(rl, &i);
- if (!temp) {
+ if(!temp) {
error("No value given for file");
exit(error_exit);
}
@@ -1926,15 +1926,15 @@ static void _parse_pbs_resource_list(char *rl)
exit(error_exit);
}
xfree(temp);
- } else if (!strncmp(rl+i, "host=", 5)) {
+ } else if(!strncmp(rl+i, "host=", 5)) {
i+=5;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "mem=", 4)) {
+ } else if(!strncmp(rl+i, "mem=", 4)) {
int end = 0;
i+=4;
temp = _get_pbs_option_value(rl, &i);
- if (!temp) {
+ if(!temp) {
error("No value given for mem");
exit(error_exit);
}
@@ -1953,7 +1953,7 @@ static void _parse_pbs_resource_list(char *rl)
}
xfree(temp);
- } else if (!strncmp(rl+i, "nice=", 5)) {
+ } else if(!strncmp(rl+i, "nice=", 5)) {
i+=5;
temp = _get_pbs_option_value(rl, &i);
if (temp)
@@ -1966,47 +1966,47 @@ static void _parse_pbs_resource_list(char *rl)
exit(error_exit);
}
xfree(temp);
- } else if (!strncmp(rl+i, "nodes=", 6)) {
+ } else if(!strncmp(rl+i, "nodes=", 6)) {
i+=6;
temp = _get_pbs_option_value(rl, &i);
- if (!temp) {
+ if(!temp) {
error("No value given for nodes");
exit(error_exit);
}
_parse_pbs_nodes_opts(temp);
xfree(temp);
- } else if (!strncmp(rl+i, "opsys=", 6)) {
+ } else if(!strncmp(rl+i, "opsys=", 6)) {
i+=6;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "other=", 6)) {
+ } else if(!strncmp(rl+i, "other=", 6)) {
i+=6;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "pcput=", 6)) {
+ } else if(!strncmp(rl+i, "pcput=", 6)) {
i+=6;
temp = _get_pbs_option_value(rl, &i);
- if (!temp) {
+ if(!temp) {
error("No value given for pcput");
exit(error_exit);
}
xfree(opt.time_limit_str);
opt.time_limit_str = xstrdup(temp);
xfree(temp);
- } else if (!strncmp(rl+i, "pmem=", 5)) {
+ } else if(!strncmp(rl+i, "pmem=", 5)) {
i+=5;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "pvmem=", 6)) {
+ } else if(!strncmp(rl+i, "pvmem=", 6)) {
i+=6;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "software=", 9)) {
+ } else if(!strncmp(rl+i, "software=", 9)) {
i+=9;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "vmem=", 5)) {
+ } else if(!strncmp(rl+i, "vmem=", 5)) {
i+=5;
_get_next_pbs_option(rl, &i);
- } else if (!strncmp(rl+i, "walltime=", 9)) {
+ } else if(!strncmp(rl+i, "walltime=", 9)) {
i+=9;
temp = _get_pbs_option_value(rl, &i);
- if (!temp) {
+ if(!temp) {
error("No value given for walltime");
exit(error_exit);
}
@@ -2119,7 +2119,7 @@ static bool _opt_verify(void)
if ((opt.min_nodes <= 0) ||
((opt.ntasks/opt.plane_size) < opt.min_nodes)) {
if (((opt.min_nodes-1)*opt.plane_size) >= opt.ntasks) {
-#if (0)
+#if(0)
info("Too few processes ((n/plane_size) %d < N %d) "
"and ((N-1)*(plane_size) %d >= n %d)) ",
opt.ntasks/opt.plane_size, opt.min_nodes,
@@ -2133,18 +2133,18 @@ static bool _opt_verify(void)
}
_set_distribution(opt.distribution, &dist, &lllp_dist);
- if (dist)
+ if(dist)
if (setenvf(NULL, "SLURM_DISTRIBUTION", "%s", dist)) {
error("Can't set SLURM_DISTRIBUTION env variable");
}
- if (opt.distribution == SLURM_DIST_PLANE)
+ if(opt.distribution == SLURM_DIST_PLANE)
if (setenvf(NULL, "SLURM_DIST_PLANESIZE", "%d",
opt.plane_size)) {
error("Can't set SLURM_DIST_PLANESIZE env variable");
}
- if (lllp_dist)
+ if(lllp_dist)
if (setenvf(NULL, "SLURM_DIST_LLLP", "%s", lllp_dist)) {
error("Can't set SLURM_DIST_LLLP env variable");
}
@@ -2211,12 +2211,12 @@ static bool _opt_verify(void)
} /* else if (opt.ntasks_set && !opt.nodes_set) */
- if (!opt.nodelist) {
- if ((opt.nodelist = xstrdup(getenv("SLURM_HOSTFILE")))) {
+ if(!opt.nodelist) {
+ if((opt.nodelist = xstrdup(getenv("SLURM_HOSTFILE")))) {
/* make sure the file being read in has a / in
it to make sure it is a file in the
valid_node_list function */
- if (!strstr(opt.nodelist, "/")) {
+ if(!strstr(opt.nodelist, "/")) {
char *add_slash = xstrdup("./");
xstrcat(add_slash, opt.nodelist);
xfree(opt.nodelist);
@@ -2239,14 +2239,14 @@ static bool _opt_verify(void)
/* set up the proc and node counts based on the arbitrary list
of nodes */
- if ((opt.distribution == SLURM_DIST_ARBITRARY)
+ if((opt.distribution == SLURM_DIST_ARBITRARY)
&& (!opt.nodes_set || !opt.ntasks_set)) {
hostlist_t hl = hostlist_create(opt.nodelist);
- if (!opt.ntasks_set) {
+ if(!opt.ntasks_set) {
opt.ntasks_set = 1;
opt.ntasks = hostlist_count(hl);
}
- if (!opt.nodes_set) {
+ if(!opt.nodes_set) {
opt.nodes_set = 1;
hostlist_uniq(hl);
opt.min_nodes = opt.max_nodes
@@ -2587,7 +2587,7 @@ static void _opt_list()
info("wckey : `%s'", opt.wckey);
info("distribution : %s",
format_task_dist_states(opt.distribution));
- if (opt.distribution == SLURM_DIST_PLANE)
+ if(opt.distribution == SLURM_DIST_PLANE)
info("plane size : %u", opt.plane_size);
info("verbose : %d", opt.verbose);
info("immediate : %s", tf_(opt.immediate));
diff --git a/src/sbatch/sbatch.c b/src/sbatch/sbatch.c
index 270bdcb2cc66ef08babc084a9f137f61c7b1c7b9..94344b6865d24e3a76574e6ade4e053e87f6037a 100644
--- a/src/sbatch/sbatch.c
+++ b/src/sbatch/sbatch.c
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
/* If can run on multiple clusters find the earliest run time
and run it there */
- if (sbatch_set_first_avail_cluster(&desc) != SLURM_SUCCESS)
+ if(sbatch_set_first_avail_cluster(&desc) != SLURM_SUCCESS)
exit(error_exit);
while (slurm_submit_batch_job(&desc, &resp) < 0) {
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
}
printf("Submitted batch job %u", resp->job_id);
- if (working_cluster_rec)
+ if(working_cluster_rec)
printf(" on cluster %s", working_cluster_rec->name);
printf("\n");
@@ -371,7 +371,7 @@ static int _fill_job_desc_from_opts(job_desc_msg_t *desc)
"SLURM_GET_USER_ENV", "1");
}
- if (opt.distribution == SLURM_DIST_ARBITRARY) {
+ if(opt.distribution == SLURM_DIST_ARBITRARY) {
env_array_overwrite_fmt(&desc->environment,
"SLURM_ARBITRARY_NODELIST",
"%s", desc->req_nodes);
diff --git a/src/sbcast/agent.c b/src/sbcast/agent.c
index 6d2e6ba71bb877eb759dcb8b7e88e9d96891ad9d..2ea8eb6f7358eee516ea37078a6a386596acd149 100644
--- a/src/sbcast/agent.c
+++ b/src/sbcast/agent.c
@@ -149,7 +149,7 @@ extern void send_rpc(file_bcast_msg_t *bcast_msg,
while (i < sbcast_cred->node_cnt) {
int j = 0;
name = hostlist_shift(hl);
- if (!name) {
+ if(!name) {
debug3("no more nodes to send to");
break;
}
@@ -158,7 +158,7 @@ extern void send_rpc(file_bcast_msg_t *bcast_msg,
i++;
for(j = 0; j < span[threads_used]; j++) {
name = hostlist_shift(hl);
- if (!name)
+ if(!name)
break;
hostlist_push(new_hl, name);
free(name);
diff --git a/src/scancel/opt.c b/src/scancel/opt.c
index d982fc812180d8624c449bc199d465f0e1dfa623..884ba691299185125eb48ea86b74c7decc77a2b8 100644
--- a/src/scancel/opt.c
+++ b/src/scancel/opt.c
@@ -357,9 +357,9 @@ static void _opt_args(int argc, char **argv)
break;
case (int)'M':
opt.ctld = true;
- if (opt.clusters)
+ if(opt.clusters)
list_destroy(opt.clusters);
- if (!(opt.clusters =
+ if(!(opt.clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
diff --git a/src/scontrol/info_job.c b/src/scontrol/info_job.c
index 9776fcdb8add2fe5acbe7334a46b6e0d285d7807..823f7012f714ecd0276efa06ba1e5793326f7b06 100644
--- a/src/scontrol/info_job.c
+++ b/src/scontrol/info_job.c
@@ -753,7 +753,7 @@ static int _blocks_dealloc(void)
return -1;
}
for (i=0; i<new_bg_ptr->record_count; i++) {
- if (new_bg_ptr->block_array[i].state
+ if(new_bg_ptr->block_array[i].state
== RM_PARTITION_DEALLOCATING) {
rc = 1;
break;
@@ -873,7 +873,7 @@ extern int scontrol_job_ready(char *job_id_str)
return SLURM_ERROR;
}
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
resource_allocation_response_msg_t *alloc;
rc = slurm_allocation_lookup_lite(job_id, &alloc);
if (rc == SLURM_SUCCESS) {
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index 0c66802192ea6038c2a642270e278e752d1f72c6..65773d844066c6ac10956adcf8ca7e591a55dad0 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -139,12 +139,12 @@ main (int argc, char *argv[])
detail_flag = 0;
break;
case (int)'M':
- if (clusters) {
+ if(clusters) {
list_destroy(clusters);
clusters = NULL;
working_cluster_rec = NULL;
}
- if (!(clusters = slurmdb_get_info_cluster(optarg))) {
+ if(!(clusters = slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
exit(1);
@@ -203,7 +203,7 @@ main (int argc, char *argv[])
break;
error_code = _get_command (&input_field_count, input_fields);
}
- if (clusters)
+ if(clusters)
list_destroy(clusters);
exit(exit_code);
}
@@ -507,7 +507,7 @@ _process_command (int argc, char *argv[])
if (quiet_flag == -1)
fprintf(stderr, "no input");
return 0;
- } else if (tag)
+ } else if(tag)
taglen = strlen(tag);
else {
if (quiet_flag == -1)
@@ -515,7 +515,7 @@ _process_command (int argc, char *argv[])
return 0;
}
- if (strncasecmp(tag, "abort", MAX(taglen, 5)) == 0) {
+ if (strncasecmp (tag, "abort", MAX(taglen, 5)) == 0) {
/* require full command name */
if (argc > 2) {
exit_code = 1;
@@ -530,9 +530,9 @@ _process_command (int argc, char *argv[])
slurm_perror ("slurm_shutdown error");
}
}
- else if (strncasecmp(tag, "all", MAX(taglen, 2)) == 0)
+ else if (strncasecmp (tag, "all", MAX(taglen, 2)) == 0)
all_flag = 1;
- else if (strncasecmp(tag, "completing", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "completing", MAX(taglen, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -541,14 +541,14 @@ _process_command (int argc, char *argv[])
}
scontrol_print_completing();
}
- else if (strncasecmp(tag, "cluster", MAX(taglen, 2)) == 0) {
- if (clusters) {
+ else if (strncasecmp (tag, "cluster", MAX(taglen, 2)) == 0) {
+ if(clusters) {
list_destroy(clusters);
clusters = NULL;
working_cluster_rec = NULL;
}
if (argc >= 2) {
- if (!(clusters = slurmdb_get_info_cluster(argv[1]))) {
+ if(!(clusters = slurmdb_get_info_cluster(argv[1]))) {
error("'%s' invalid entry for --cluster",
optarg);
exit(1);
@@ -568,20 +568,20 @@ _process_command (int argc, char *argv[])
old_res_info_ptr = NULL;
slurm_free_ctl_conf(old_slurm_ctl_conf_ptr);
old_slurm_ctl_conf_ptr = NULL;
- /* if (old_block_info_ptr) */
+ /* if(old_block_info_ptr) */
/* old_block_info_ptr->last_update = 0; */
- /* if (old_job_info_ptr) */
+ /* if(old_job_info_ptr) */
/* old_job_info_ptr->last_update = 0; */
- /* if (old_node_info_ptr) */
+ /* if(old_node_info_ptr) */
/* old_node_info_ptr->last_update = 0; */
- /* if (old_part_info_ptr) */
+ /* if(old_part_info_ptr) */
/* old_part_info_ptr->last_update = 0; */
- /* if (old_res_info_ptr) */
+ /* if(old_res_info_ptr) */
/* old_res_info_ptr->last_update = 0; */
- /* if (old_slurm_ctl_conf_ptr) */
+ /* if(old_slurm_ctl_conf_ptr) */
/* old_slurm_ctl_conf_ptr->last_update = 0; */
}
- else if (strncasecmp(tag, "create", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "create", MAX(taglen, 2)) == 0) {
if (argc < 2) {
exit_code = 1;
fprintf (stderr, "too few arguments for %s keyword\n",
@@ -590,7 +590,7 @@ _process_command (int argc, char *argv[])
}
_create_it ((argc - 1), &argv[1]);
}
- else if (strncasecmp(tag, "details", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp (tag, "details", MAX(taglen, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -600,7 +600,7 @@ _process_command (int argc, char *argv[])
}
detail_flag = 1;
}
- else if (strncasecmp(tag, "exit", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp (tag, "exit", MAX(taglen, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -609,7 +609,7 @@ _process_command (int argc, char *argv[])
}
exit_flag = 1;
}
- else if (strncasecmp(tag, "help", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "help", MAX(taglen, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -618,11 +618,11 @@ _process_command (int argc, char *argv[])
}
_usage ();
}
- else if (strncasecmp(tag, "hide", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "hide", MAX(taglen, 2)) == 0) {
all_flag = 0;
detail_flag = 0;
}
- else if (strncasecmp(tag, "oneliner", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp (tag, "oneliner", MAX(taglen, 1)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -631,7 +631,7 @@ _process_command (int argc, char *argv[])
}
one_liner = 1;
}
- else if (strncasecmp(tag, "pidinfo", MAX(taglen, 3)) == 0) {
+ else if (strncasecmp (tag, "pidinfo", MAX(taglen, 3)) == 0) {
if (argc > 2) {
exit_code = 1;
fprintf (stderr,
@@ -645,7 +645,7 @@ _process_command (int argc, char *argv[])
} else
scontrol_pid_info ((pid_t) atol (argv[1]) );
}
- else if (strncasecmp(tag, "ping", MAX(taglen, 3)) == 0) {
+ else if (strncasecmp (tag, "ping", MAX(taglen, 3)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -654,8 +654,8 @@ _process_command (int argc, char *argv[])
}
_print_ping ();
}
- else if ((strncasecmp(tag, "\\q", 2) == 0) ||
- (strncasecmp(tag, "quiet", MAX(taglen, 4)) == 0)) {
+ else if ((strncasecmp (tag, "\\q", 2) == 0) ||
+ (strncasecmp (tag, "quiet", MAX(taglen, 4)) == 0)) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr, "too many arguments for keyword:%s\n",
@@ -663,7 +663,7 @@ _process_command (int argc, char *argv[])
}
quiet_flag = 1;
}
- else if (strncasecmp(tag, "quit", MAX(taglen, 4)) == 0) {
+ else if (strncasecmp (tag, "quit", MAX(taglen, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -672,7 +672,7 @@ _process_command (int argc, char *argv[])
}
exit_flag = 1;
}
- else if (strncasecmp(tag, "reconfigure", MAX(taglen, 3)) == 0) {
+ else if (strncasecmp (tag, "reconfigure", MAX(taglen, 3)) == 0) {
if (argc > 2) {
exit_code = 1;
fprintf (stderr, "too many arguments for keyword:%s\n",
@@ -685,7 +685,7 @@ _process_command (int argc, char *argv[])
slurm_perror ("slurm_reconfigure error");
}
}
- else if (strncasecmp(tag, "checkpoint", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "checkpoint", MAX(taglen, 2)) == 0) {
if (argc > 5) {
exit_code = 1;
if (quiet_flag != 1)
@@ -711,7 +711,7 @@ _process_command (int argc, char *argv[])
}
}
}
- else if (strncasecmp(tag, "requeue", MAX(taglen, 3)) == 0) {
+ else if (strncasecmp (tag, "requeue", MAX(taglen, 3)) == 0) {
if (argc > 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -734,8 +734,8 @@ _process_command (int argc, char *argv[])
}
}
- else if ((strncasecmp(tag, "hold", MAX(taglen, 4)) == 0) ||
- (strncasecmp(tag, "release", MAX(taglen, 3)) == 0)) {
+ else if ((strncasecmp (tag, "hold", MAX(taglen, 4)) == 0) ||
+ (strncasecmp (tag, "release", MAX(taglen, 3)) == 0)) {
if (argc > 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -758,8 +758,8 @@ _process_command (int argc, char *argv[])
}
}
}
- else if ((strncasecmp(tag, "suspend", MAX(taglen, 2)) == 0) ||
- (strncasecmp(tag, "resume", MAX(taglen, 3)) == 0)) {
+ else if ((strncasecmp (tag, "suspend", MAX(taglen, 2)) == 0) ||
+ (strncasecmp (tag, "resume", MAX(taglen, 3)) == 0)) {
if (argc > 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -782,7 +782,7 @@ _process_command (int argc, char *argv[])
}
}
}
- else if (strncasecmp(tag, "wait_job", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "wait_job", MAX(taglen, 2)) == 0) {
if (argc > 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -802,7 +802,7 @@ _process_command (int argc, char *argv[])
exit_code = 1;
}
}
- else if (strncasecmp(tag, "setdebug", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "setdebug", MAX(taglen, 2)) == 0) {
if (argc > 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -855,7 +855,7 @@ _process_command (int argc, char *argv[])
}
}
}
- else if (strncasecmp(tag, "schedloglevel", MAX(taglen, 2)) == 0) {
+ else if (strncasecmp (tag, "schedloglevel", MAX(taglen, 2)) == 0) {
if (argc > 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -905,10 +905,10 @@ _process_command (int argc, char *argv[])
}
}
}
- else if (strncasecmp(tag, "show", MAX(taglen, 3)) == 0) {
+ else if (strncasecmp (tag, "show", MAX(taglen, 3)) == 0) {
_show_it (argc, argv);
}
- else if (strncasecmp(tag, "takeover", MAX(taglen, 8)) == 0) {
+ else if (strncasecmp (tag, "takeover", MAX(taglen, 8)) == 0) {
char *secondary = NULL;
slurm_ctl_conf_info_msg_t *slurm_ctl_conf_ptr = NULL;
@@ -929,7 +929,7 @@ _process_command (int argc, char *argv[])
}
xfree(secondary);
}
- else if (strncasecmp(tag, "shutdown", MAX(taglen, 8)) == 0) {
+ else if (strncasecmp (tag, "shutdown", MAX(taglen, 8)) == 0) {
/* require full command name */
uint16_t options = 0;
if (argc == 2) {
@@ -958,7 +958,7 @@ _process_command (int argc, char *argv[])
}
}
}
- else if (strncasecmp(tag, "update", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp (tag, "update", MAX(taglen, 1)) == 0) {
if (argc < 2) {
exit_code = 1;
fprintf (stderr, "too few arguments for %s keyword\n",
@@ -967,7 +967,7 @@ _process_command (int argc, char *argv[])
}
_update_it ((argc - 1), &argv[1]);
}
- else if (strncasecmp(tag, "delete", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp (tag, "delete", MAX(taglen, 1)) == 0) {
if (argc < 2) {
exit_code = 1;
fprintf (stderr, "too few arguments for %s keyword\n",
@@ -976,7 +976,7 @@ _process_command (int argc, char *argv[])
}
_delete_it ((argc - 1), &argv[1]);
}
- else if (strncasecmp(tag, "verbose", MAX(taglen, 4)) == 0) {
+ else if (strncasecmp (tag, "verbose", MAX(taglen, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -985,7 +985,7 @@ _process_command (int argc, char *argv[])
}
quiet_flag = -1;
}
- else if (strncasecmp(tag, "version", MAX(taglen, 4)) == 0) {
+ else if (strncasecmp (tag, "version", MAX(taglen, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -994,7 +994,7 @@ _process_command (int argc, char *argv[])
}
_print_version();
}
- else if (strncasecmp(tag, "listpids", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp (tag, "listpids", MAX(taglen, 1)) == 0) {
if (argc > 3) {
exit_code = 1;
fprintf (stderr,
@@ -1005,7 +1005,7 @@ _process_command (int argc, char *argv[])
argc <= 2 ? NULL : argv[2]);
}
}
- else if (strncasecmp(tag, "notify", MAX(taglen, 1)) == 0) {
+ else if (strncasecmp (tag, "notify", MAX(taglen, 1)) == 0) {
if (argc < 3) {
exit_code = 1;
fprintf (stderr,
@@ -1097,7 +1097,7 @@ _delete_it (int argc, char *argv[])
}
/* First identify the entity type to delete */
- if (strncasecmp(tag, "PartitionName", MAX(taglen, 3)) == 0) {
+ if (strncasecmp (tag, "PartitionName", MAX(taglen, 3)) == 0) {
delete_part_msg_t part_msg;
part_msg.name = val;
if (slurm_delete_partition(&part_msg)) {
@@ -1105,7 +1105,7 @@ _delete_it (int argc, char *argv[])
snprintf(errmsg, 64, "delete_partition %s", argv[0]);
slurm_perror(errmsg);
}
- } else if (strncasecmp(tag, "ReservationName", MAX(taglen, 3)) == 0) {
+ } else if (strncasecmp (tag, "ReservationName", MAX(taglen, 3)) == 0) {
reservation_name_msg_t res_msg;
res_msg.name = val;
if (slurm_delete_reservation(&res_msg)) {
@@ -1113,8 +1113,8 @@ _delete_it (int argc, char *argv[])
snprintf(errmsg, 64, "delete_reservation %s", argv[0]);
slurm_perror(errmsg);
}
- } else if (strncasecmp(tag, "BlockName", MAX(taglen, 3)) == 0) {
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ } else if (strncasecmp (tag, "BlockName", MAX(taglen, 3)) == 0) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
update_block_msg_t block_msg;
slurm_init_update_block_msg ( &block_msg );
block_msg.bg_block_id = val;
@@ -1176,11 +1176,11 @@ _show_it (int argc, char *argv[])
val = NULL;
}
- if (strncasecmp(tag, "blocks", MAX(taglen, 1)) == 0) {
+ if (strncasecmp (tag, "blocks", MAX(taglen, 1)) == 0) {
scontrol_print_block (val);
- } else if (strncasecmp(tag, "config", MAX(taglen, 1)) == 0) {
+ } else if (strncasecmp (tag, "config", MAX(taglen, 1)) == 0) {
_print_config (val);
- } else if (strncasecmp(tag, "daemons", MAX(taglen, 1)) == 0) {
+ } else if (strncasecmp (tag, "daemons", MAX(taglen, 1)) == 0) {
if (val) {
exit_code = 1;
if (quiet_flag != 1)
@@ -1189,34 +1189,34 @@ _show_it (int argc, char *argv[])
argv[0]);
}
_print_daemons ();
- } else if (strncasecmp(tag, "jobs", MAX(taglen, 1)) == 0 ||
- strncasecmp(tag, "jobid", MAX(taglen, 1)) == 0 ) {
+ } else if (strncasecmp (tag, "jobs", MAX(taglen, 1)) == 0 ||
+ strncasecmp (tag, "jobid", MAX(taglen, 1)) == 0 ) {
scontrol_print_job (val);
- } else if (strncasecmp(tag, "hostnames", MAX(taglen, 5)) == 0) {
+ } else if (strncasecmp (tag, "hostnames", MAX(taglen, 5)) == 0) {
if (val)
scontrol_print_hosts(val);
else
scontrol_print_hosts(getenv("SLURM_NODELIST"));
- } else if (strncasecmp(tag, "hostlist", MAX(taglen, 5)) == 0) {
+ } else if (strncasecmp (tag, "hostlist", MAX(taglen, 5)) == 0) {
if (!val) {
exit_code = 1;
fprintf(stderr, "invalid encode argument\n");
_usage();
} else if (scontrol_encode_hostlist(val))
exit_code = 1;
- } else if (strncasecmp(tag, "nodes", MAX(taglen, 1)) == 0) {
+ } else if (strncasecmp (tag, "nodes", MAX(taglen, 1)) == 0) {
scontrol_print_node_list (val);
- } else if (strncasecmp(tag, "partitions", MAX(taglen, 1)) == 0 ||
- strncasecmp(tag, "partitionname", MAX(taglen, 1)) == 0) {
+ } else if (strncasecmp (tag, "partitions", MAX(taglen, 1)) == 0 ||
+ strncasecmp (tag, "partitionname", MAX(taglen, 1)) == 0) {
scontrol_print_part (val);
- } else if (strncasecmp(tag, "reservations", MAX(taglen, 1)) == 0 ||
- strncasecmp(tag, "reservationname", MAX(taglen, 1)) == 0) {
+ } else if (strncasecmp (tag, "reservations", MAX(taglen, 1)) == 0 ||
+ strncasecmp (tag, "reservationname", MAX(taglen, 1)) == 0) {
scontrol_print_res (val);
- } else if (strncasecmp(tag, "slurmd", MAX(taglen, 2)) == 0) {
+ } else if (strncasecmp (tag, "slurmd", MAX(taglen, 2)) == 0) {
_print_slurmd (val);
- } else if (strncasecmp(tag, "steps", MAX(taglen, 2)) == 0) {
+ } else if (strncasecmp (tag, "steps", MAX(taglen, 2)) == 0) {
scontrol_print_step (val);
- } else if (strncasecmp(tag, "topology", MAX(taglen, 1)) == 0) {
+ } else if (strncasecmp (tag, "topology", MAX(taglen, 1)) == 0) {
scontrol_print_topo (val);
} else {
exit_code = 1;
@@ -1302,7 +1302,7 @@ _update_it (int argc, char *argv[])
exit_code = 1;
fprintf(stderr, "No valid entity in update command\n");
fprintf(stderr, "Input line must include \"NodeName\", ");
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
fprintf(stderr, "\"BlockName\", \"SubBPName\" "
"(i.e. bgl000[0-3]),");
}
@@ -1330,7 +1330,7 @@ _update_bluegene_block (int argc, char *argv[])
int i, update_cnt = 0;
update_block_msg_t block_msg;
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
exit_code = 1;
fprintf(stderr, "This only works on a bluegene system.\n");
return 0;
@@ -1386,7 +1386,7 @@ _update_bluegene_block (int argc, char *argv[])
}
}
- if (!block_msg.bg_block_id) {
+ if(!block_msg.bg_block_id) {
error("You didn't supply a block name.");
return 0;
} else if (block_msg.state == (uint16_t)NO_VAL) {
@@ -1416,7 +1416,7 @@ _update_bluegene_subbp (int argc, char *argv[])
int i, update_cnt = 0;
update_block_msg_t block_msg;
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
exit_code = 1;
fprintf(stderr, "This only works on a bluegene system.\n");
return 0;
@@ -1464,7 +1464,7 @@ _update_bluegene_subbp (int argc, char *argv[])
}
}
- if (!block_msg.nodes) {
+ if(!block_msg.nodes) {
error("You didn't supply an ionode list.");
return 0;
} else if (block_msg.state == (uint16_t)NO_VAL) {
diff --git a/src/scontrol/update_job.c b/src/scontrol/update_job.c
index bb359a346b59d767490df5c25d7ec477935524e4..d210192f9fb0bcfa7afb8da66a2b1d06cca515b9 100644
--- a/src/scontrol/update_job.c
+++ b/src/scontrol/update_job.c
@@ -425,7 +425,7 @@ scontrol_update_job (int argc, char *argv[])
(int *)&job_msg.min_nodes,
(int *)&job_msg.max_nodes,
false);
- if (!rc)
+ if(!rc)
return rc;
update_size = true;
update_cnt++;
@@ -598,7 +598,7 @@ scontrol_update_job (int argc, char *argv[])
}
else if (strncasecmp(tag, "Conn-Type", MAX(taglen, 2)) == 0) {
job_msg.conn_type = verify_conn_type(val);
- if (job_msg.conn_type != (uint16_t)NO_VAL)
+ if(job_msg.conn_type != (uint16_t)NO_VAL)
update_cnt++;
}
else if (strncasecmp(tag, "Licenses", MAX(taglen, 1)) == 0) {
@@ -607,8 +607,8 @@ scontrol_update_job (int argc, char *argv[])
}
else if (!strncasecmp(tag, "EligibleTime", MAX(taglen, 2)) ||
!strncasecmp(tag, "StartTime", MAX(taglen, 2))) {
- if ((job_msg.begin_time = parse_time(val, 0))) {
- if (job_msg.begin_time < time(NULL))
+ if((job_msg.begin_time = parse_time(val, 0))) {
+ if(job_msg.begin_time < time(NULL))
job_msg.begin_time = time(NULL);
update_cnt++;
}
diff --git a/src/scontrol/update_node.c b/src/scontrol/update_node.c
index 77f9f0c28dc1967aef8cb9cd22f1385e76092e60..31c05de6dac27d642ce190a3cea08f622dcc8b7c 100644
--- a/src/scontrol/update_node.c
+++ b/src/scontrol/update_node.c
@@ -163,7 +163,7 @@ scontrol_update_node (int argc, char *argv[])
} else {
state_val = (uint16_t) NO_VAL;
for (j = 0; j < NODE_STATE_END; j++) {
- if (strncasecmp(node_state_string(j),
+ if (strncasecmp (node_state_string(j),
val,
MAX(vallen, 3)) == 0){
state_val = (uint16_t) j;
diff --git a/src/sinfo/opts.c b/src/sinfo/opts.c
index 116c89c3b22a5f01d48b09455d50d8ba3af967b5..15644e4d3f028aec23c8c7810f76592631953fa0 100644
--- a/src/sinfo/opts.c
+++ b/src/sinfo/opts.c
@@ -138,7 +138,7 @@ extern void parse_command_line(int argc, char *argv[])
break;
case (int)'b':
params.cluster_flags = slurmdb_setup_cluster_flags();
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
params.bg_flag = true;
else {
error("Must be on a BG system to use --bg "
@@ -169,9 +169,9 @@ extern void parse_command_line(int argc, char *argv[])
params.long_output = true;
break;
case (int) 'M':
- if (params.clusters)
+ if(params.clusters)
list_destroy(params.clusters);
- if (!(params.clusters =
+ if(!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
@@ -248,7 +248,7 @@ extern void parse_command_line(int argc, char *argv[])
if ( params.format == NULL ) {
if ( params.summarize ) {
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
params.format = "%9P %.5a %.10l %.32F %N";
else
params.format = "%9P %.5a %.10l %.16F %N";
@@ -327,7 +327,7 @@ _build_state_list (char *state_str)
if (state_str == NULL)
return NULL;
- if (strcasecmp(state_str, "all") == 0 )
+ if (strcasecmp (state_str, "all") == 0 )
return _build_all_states_list ();
orig = str = xstrdup (state_str);
diff --git a/src/sinfo/print.c b/src/sinfo/print.c
index b99579b919bbd6d2932476c8ca0c0edf15db162f..46ac2993c6e5f1d37609675232d06fba1cc8c8e0 100644
--- a/src/sinfo/print.c
+++ b/src/sinfo/print.c
@@ -333,7 +333,7 @@ int _print_cpus_aiot(sinfo_data_t * sinfo_data, int width,
char tmpo[8];
char tmpt[8];
if (sinfo_data) {
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit((float)sinfo_data->cpus_alloc,
tmpa, sizeof(tmpa), UNIT_NONE);
convert_num_unit((float)sinfo_data->cpus_idle,
@@ -562,7 +562,7 @@ int _print_node_list(sinfo_data_t * sinfo_data, int width,
_print_str(tmp, width, right_justify, true);
} else {
char *title = "NODELIST";
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
title = "BP_LIST";
_print_str(title, width, right_justify, false);
@@ -579,7 +579,7 @@ int _print_nodes_t(sinfo_data_t * sinfo_data, int width,
char id[FORMAT_STRING_SIZE];
char tmp[8];
if (sinfo_data) {
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)sinfo_data->nodes_total,
tmp, sizeof(tmp), UNIT_NONE);
else
@@ -602,7 +602,7 @@ int _print_nodes_ai(sinfo_data_t * sinfo_data, int width,
char tmpa[8];
char tmpi[8];
if (sinfo_data) {
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit((float)sinfo_data->nodes_alloc,
tmpa, sizeof(tmpa), UNIT_NONE);
convert_num_unit((float)sinfo_data->nodes_idle,
@@ -633,7 +633,7 @@ int _print_nodes_aiot(sinfo_data_t * sinfo_data, int width,
char tmpo[8];
char tmpt[8];
if (sinfo_data) {
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit((float)sinfo_data->nodes_alloc,
tmpa, sizeof(tmpa), UNIT_NONE);
convert_num_unit((float)sinfo_data->nodes_idle,
diff --git a/src/sinfo/sinfo.c b/src/sinfo/sinfo.c
index 8bf1f97e96cc2c08fe869336b40720bd2fbe7a49..c1e85ba737264fc764dc36529ff5a94fdd697ad3 100644
--- a/src/sinfo/sinfo.c
+++ b/src/sinfo/sinfo.c
@@ -230,10 +230,10 @@ _query_server(partition_info_msg_t ** part_pptr,
old_node_ptr = new_node_ptr;
*node_pptr = new_node_ptr;
- if (!params.bg_flag)
+ if(!params.bg_flag)
return SLURM_SUCCESS;
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
if (old_bg_ptr) {
error_code = slurm_load_block_info(
old_bg_ptr->last_update,
@@ -313,7 +313,7 @@ static int _build_sinfo_data(List sinfo_list,
_filter_out(node_ptr)))
continue;
- if (select_g_select_nodeinfo_get(
+ if(select_g_select_nodeinfo_get(
node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBGRP_SIZE,
0,
@@ -406,7 +406,7 @@ static bool _filter_out(node_info_t *node_ptr)
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&cpus);
- if (cpus) {
+ if(cpus) {
match = true;
break;
}
@@ -416,7 +416,7 @@ static bool _filter_out(node_info_t *node_ptr)
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&cpus);
- if (cpus) {
+ if(cpus) {
match = true;
break;
}
@@ -661,15 +661,15 @@ static void _update_sinfo(sinfo_data_t *sinfo_ptr, node_info_t *node_ptr,
NODE_STATE_ERROR,
&error_cpus);
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
- if (error_cpus) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(error_cpus) {
xfree(node_ptr->reason);
node_ptr->reason = xstrdup("Block(s) in error state");
sinfo_ptr->reason = node_ptr->reason;
sinfo_ptr->reason_time= node_ptr->reason_time;
sinfo_ptr->reason_uid = node_ptr->reason_uid;
}
- if (!params.match_flags.state_flag
+ if(!params.match_flags.state_flag
&& (used_cpus || error_cpus)) {
/* We only get one shot at this (because all states
are combined together), so we need to make
@@ -783,21 +783,21 @@ static int _handle_subgrps(List sinfo_list, uint16_t part_num,
iterator = list_iterator_create(params.state_list);
for(i=0; i<state_cnt; i++) {
- if (iterator) {
+ if(iterator) {
node_info_t tmp_node, *tmp_node_ptr = &tmp_node;
while ((node_state = list_next(iterator))) {
tmp_node_ptr->node_state = *node_state;
- if ((((state[i] == NODE_STATE_ALLOCATED)
+ if((((state[i] == NODE_STATE_ALLOCATED)
&& IS_NODE_DRAINING(tmp_node_ptr))
|| (*node_state == NODE_STATE_DRAIN))
|| (*node_state == state[i]))
break;
}
list_iterator_reset(iterator);
- if (!node_state)
+ if(!node_state)
continue;
}
- if (select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
+ if(select_g_select_nodeinfo_get(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
state[i],
&size) == SLURM_SUCCESS
@@ -811,22 +811,22 @@ static int _handle_subgrps(List sinfo_list, uint16_t part_num,
}
/* now handle the idle */
- if (iterator) {
+ if(iterator) {
while ((node_state = list_next(iterator))) {
node_info_t tmp_node, *tmp_node_ptr = &tmp_node;
tmp_node_ptr->node_state = *node_state;
- if (((*node_state == NODE_STATE_DRAIN)
+ if(((*node_state == NODE_STATE_DRAIN)
|| IS_NODE_DRAINED(tmp_node_ptr))
|| (*node_state == NODE_STATE_IDLE))
break;
}
list_iterator_destroy(iterator);
- if (!node_state)
+ if(!node_state)
return SLURM_SUCCESS;
}
node_ptr->node_state &= NODE_STATE_FLAGS;
node_ptr->node_state |= NODE_STATE_IDLE;
- if ((int)node_scaling > 0)
+ if((int)node_scaling > 0)
_insert_node_ptr(sinfo_list, part_num, part_ptr,
node_ptr, node_scaling);
diff --git a/src/slurmctld/acct_policy.c b/src/slurmctld/acct_policy.c
index bd439618c2fecc302b47b4379033c22d8423df03..b6fbead564f31bb864eb590ce4bd3cad053ddefb 100644
--- a/src/slurmctld/acct_policy.c
+++ b/src/slurmctld/acct_policy.c
@@ -80,7 +80,7 @@ static bool _valid_job_assoc(struct job_record *job_ptr)
(assoc_ptr->uid != job_ptr->user_id)) {
error("Invalid assoc_ptr for jobid=%u", job_ptr->job_id);
memset(&assoc_rec, 0, sizeof(slurmdb_association_rec_t));
- if (job_ptr->assoc_id)
+ if(job_ptr->assoc_id)
assoc_rec.id = job_ptr->assoc_id;
else {
assoc_rec.uid = job_ptr->user_id;
@@ -118,16 +118,16 @@ static void _adjust_limit_usage(int type, struct job_record *job_ptr)
slurmdb_used_limits_t *used_limits = NULL;
qos_ptr = (slurmdb_qos_rec_t *)job_ptr->qos_ptr;
- if (!qos_ptr->usage->user_limit_list)
+ if(!qos_ptr->usage->user_limit_list)
qos_ptr->usage->user_limit_list =
list_create(slurmdb_destroy_used_limits);
itr = list_iterator_create(qos_ptr->usage->user_limit_list);
while((used_limits = list_next(itr))) {
- if (used_limits->uid == job_ptr->user_id)
+ if(used_limits->uid == job_ptr->user_id)
break;
}
list_iterator_destroy(itr);
- if (!used_limits) {
+ if(!used_limits) {
used_limits = xmalloc(sizeof(slurmdb_used_limits_t));
used_limits->uid = job_ptr->user_id;
list_append(qos_ptr->usage->user_limit_list,
@@ -139,14 +139,14 @@ static void _adjust_limit_usage(int type, struct job_record *job_ptr)
used_limits->submit_jobs++;
break;
case ACCT_POLICY_REM_SUBMIT:
- if (qos_ptr->usage->grp_used_submit_jobs)
+ if(qos_ptr->usage->grp_used_submit_jobs)
qos_ptr->usage->grp_used_submit_jobs--;
else
debug2("acct_policy_remove_job_submit: "
"grp_submit_jobs underflow for qos %s",
qos_ptr->name);
- if (used_limits->submit_jobs)
+ if(used_limits->submit_jobs)
used_limits->submit_jobs--;
else
debug2("acct_policy_remove_job_submit: "
@@ -161,27 +161,27 @@ static void _adjust_limit_usage(int type, struct job_record *job_ptr)
used_limits->jobs++;
break;
case ACCT_POLICY_JOB_FINI:
- if (qos_ptr->usage->grp_used_jobs)
+ if(qos_ptr->usage->grp_used_jobs)
qos_ptr->usage->grp_used_jobs--;
else
debug2("acct_policy_job_fini: used_jobs "
"underflow for qos %s", qos_ptr->name);
qos_ptr->usage->grp_used_cpus -= job_ptr->total_cpus;
- if ((int32_t)qos_ptr->usage->grp_used_cpus < 0) {
+ if((int32_t)qos_ptr->usage->grp_used_cpus < 0) {
qos_ptr->usage->grp_used_cpus = 0;
debug2("acct_policy_job_fini: grp_used_cpus "
"underflow for qos %s", qos_ptr->name);
}
qos_ptr->usage->grp_used_nodes -= job_ptr->node_cnt;
- if ((int32_t)qos_ptr->usage->grp_used_nodes < 0) {
+ if((int32_t)qos_ptr->usage->grp_used_nodes < 0) {
qos_ptr->usage->grp_used_nodes = 0;
debug2("acct_policy_job_fini: grp_used_nodes "
"underflow for qos %s", qos_ptr->name);
}
- if (used_limits->jobs)
+ if(used_limits->jobs)
used_limits->jobs--;
else
debug2("acct_policy_job_fini: used_jobs "
@@ -334,7 +334,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
assoc_mgr_lock(&locks);
qos_ptr = job_ptr->qos_ptr;
- if (qos_ptr) {
+ if(qos_ptr) {
usage_mins = (uint64_t)(qos_ptr->usage->usage_raw / 60.0);
wall_mins = qos_ptr->usage->grp_used_wall / 60;
@@ -483,16 +483,16 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
if (qos_ptr->max_jobs_pu != INFINITE) {
slurmdb_used_limits_t *used_limits = NULL;
- if (qos_ptr->usage->user_limit_list) {
+ if(qos_ptr->usage->user_limit_list) {
ListIterator itr = list_iterator_create(
qos_ptr->usage->user_limit_list);
while((used_limits = list_next(itr))) {
- if (used_limits->uid == job_ptr->user_id)
+ if(used_limits->uid == job_ptr->user_id)
break;
}
list_iterator_destroy(itr);
}
- if (used_limits && (used_limits->jobs
+ if(used_limits && (used_limits->jobs
>= qos_ptr->max_jobs_pu)) {
debug2("job %u being held, "
"the job is at or exceeds "
@@ -677,7 +677,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
* parents since we have pre-propogated them, so just
* continue with the next parent
*/
- if (parent) {
+ if(parent) {
assoc_ptr = assoc_ptr->usage->parent_assoc_ptr;
continue;
}
@@ -775,7 +775,7 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
end_it:
assoc_mgr_unlock(&locks);
- if (cancel_job)
+ if(cancel_job)
_cancel_job(job_ptr);
return rc;
@@ -818,7 +818,7 @@ extern bool acct_policy_node_usable(struct job_record *job_ptr,
assoc_mgr_lock(&locks);
qos_ptr = job_ptr->qos_ptr;
- if (qos_ptr) {
+ if(qos_ptr) {
if (qos_ptr->grp_cpus != INFINITE) {
if ((total_cpus+qos_ptr->usage->grp_used_cpus)
> qos_ptr->grp_cpus) {
@@ -873,7 +873,7 @@ extern bool acct_policy_node_usable(struct job_record *job_ptr,
* parents since we have pre-propogated them, so just
* continue with the next parent
*/
- if (parent) {
+ if(parent) {
assoc_ptr = assoc_ptr->usage->parent_assoc_ptr;
continue;
}
@@ -900,7 +900,7 @@ extern bool acct_policy_node_usable(struct job_record *job_ptr,
end_it:
assoc_mgr_unlock(&locks);
- if (cancel_job)
+ if(cancel_job)
_cancel_job(job_ptr);
return rc;
diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index 578c0d49e3c7432ea2af23c955b36bce1b3b0da9..7e733109ef3b6c1b97b4e5f45d5de9bfc30b51d7 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -425,12 +425,12 @@ static agent_info_t *_make_agent_info(agent_arg_t *agent_arg_ptr)
thread_ptr[thr_count].state = DSH_NEW;
thread_ptr[thr_count].addr = agent_arg_ptr->addr;
name = hostlist_shift(agent_arg_ptr->hostlist);
- if (!name) {
+ if(!name) {
debug3("no more nodes to send to");
break;
}
hl = hostlist_create(name);
- if (thread_ptr[thr_count].addr && span[thr_count]) {
+ if(thread_ptr[thr_count].addr && span[thr_count]) {
debug("warning: you will only be sending this to %s",
name);
span[thr_count] = 0;
@@ -439,7 +439,7 @@ static agent_info_t *_make_agent_info(agent_arg_t *agent_arg_ptr)
i++;
for(j = 0; j < span[thr_count]; j++) {
name = hostlist_shift(agent_arg_ptr->hostlist);
- if (!name)
+ if(!name)
break;
hostlist_push(hl, name);
free(name);
@@ -550,7 +550,7 @@ static void *_wdog(void *args)
slurm_mutex_lock(&agent_ptr->thread_mutex);
for (i = 0; i < agent_ptr->thread_count; i++) {
//info("thread name %s",thread_ptr[i].node_name);
- if (!thread_ptr[i].ret_list) {
+ if(!thread_ptr[i].ret_list) {
_update_wdog_state(&thread_ptr[i],
&thread_ptr[i].state,
&thd_comp);
@@ -677,7 +677,7 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
#if AGENT_IS_THREAD
lock_slurmctld(node_write_lock);
for (i = 0; i < agent_ptr->thread_count; i++) {
- if (!thread_ptr[i].ret_list) {
+ if(!thread_ptr[i].ret_list) {
state = thread_ptr[i].state;
is_ret_list = 0;
goto switch_on_state;
@@ -690,7 +690,7 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
switch_on_state:
switch(state) {
case DSH_NO_RESP:
- if (!is_ret_list) {
+ if(!is_ret_list) {
node_not_resp(thread_ptr[i].nodelist,
thread_ptr[i].
start_time);
@@ -704,7 +704,7 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
#ifdef HAVE_BG
error("Prolog/epilog failure");
#else
- if (!is_ret_list) {
+ if(!is_ret_list) {
set_node_down(thread_ptr[i].nodelist,
"Prolog/epilog failure");
break;
@@ -714,14 +714,14 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
#endif
break;
case DSH_DONE:
- if (!is_ret_list) {
+ if(!is_ret_list) {
node_did_resp(thread_ptr[i].nodelist);
break;
}
node_did_resp(ret_data_info->node_name);
break;
default:
- if (!is_ret_list) {
+ if(!is_ret_list) {
error("unknown state returned for %s",
thread_ptr[i].nodelist);
break;
@@ -730,7 +730,7 @@ static void _notify_slurmctld_nodes(agent_info_t *agent_ptr,
ret_data_info->node_name);
break;
}
- if (!is_ret_list)
+ if(!is_ret_list)
goto finished;
}
list_iterator_destroy(itr);
@@ -849,10 +849,10 @@ static void *_thread_per_group_rpc(void *args)
info("sending message type %u to %s", msg_type, thread_ptr->nodelist);
#endif
if (task_ptr->get_reply) {
- if (thread_ptr->addr) {
+ if(thread_ptr->addr) {
msg.address = *thread_ptr->addr;
- if (!(ret_list = slurm_send_addr_recv_msgs(
+ if(!(ret_list = slurm_send_addr_recv_msgs(
&msg, thread_ptr->nodelist, 0))) {
error("_thread_per_group_rpc: "
"no ret_list given");
@@ -861,7 +861,7 @@ static void *_thread_per_group_rpc(void *args)
} else {
- if (!(ret_list = slurm_send_recv_msgs(
+ if(!(ret_list = slurm_send_recv_msgs(
thread_ptr->nodelist,
&msg, 0, true))) {
error("_thread_per_group_rpc: "
@@ -870,12 +870,12 @@ static void *_thread_per_group_rpc(void *args)
}
}
} else {
- if (thread_ptr->addr) {
+ if(thread_ptr->addr) {
//info("got the address");
msg.address = *thread_ptr->addr;
} else {
//info("no address given");
- if (slurm_conf_get_addr(thread_ptr->nodelist,
+ if(slurm_conf_get_addr(thread_ptr->nodelist,
&msg.address) == SLURM_ERROR) {
error("_thread_per_group_rpc: "
"can't find address for host %s, "
@@ -985,9 +985,9 @@ static void *_thread_per_group_rpc(void *args)
errno = ret_data_info->err;
rc = _comm_err(ret_data_info->node_name);
}
- if (srun_agent)
+ if(srun_agent)
thread_state = DSH_FAILED;
- else if (ret_data_info->type == RESPONSE_FORWARD_FAILED)
+ else if(ret_data_info->type == RESPONSE_FORWARD_FAILED)
/* check if a forward failed */
thread_state = DSH_NO_RESP;
else { /* some will fail that don't mean anything went
@@ -1039,7 +1039,7 @@ static int _setup_requeue(agent_arg_t *agent_arg_ptr, thd_t *thread_ptr,
debug("got the name %s to resend out of %d",
ret_data_info->node_name, count);
- if (agent_arg_ptr) {
+ if(agent_arg_ptr) {
hostlist_push(agent_arg_ptr->hostlist,
ret_data_info->node_name);
@@ -1079,7 +1079,7 @@ static void _queue_agent_retry(agent_info_t * agent_info_ptr, int count)
j = 0;
for (i = 0; i < agent_info_ptr->thread_count; i++) {
- if (!thread_ptr[i].ret_list) {
+ if(!thread_ptr[i].ret_list) {
if (thread_ptr[i].state != DSH_NO_RESP)
continue;
@@ -1091,7 +1091,7 @@ static void _queue_agent_retry(agent_info_t * agent_info_ptr, int count)
if ((++j) == count)
break;
} else {
- if (_setup_requeue(agent_arg_ptr, &thread_ptr[i],
+ if(_setup_requeue(agent_arg_ptr, &thread_ptr[i],
count, &j))
break;
}
@@ -1435,9 +1435,9 @@ static void _mail_proc(mail_info_t *mi)
(void) close(1);
(void) close(2);
fd = open("/dev/null", O_RDWR); // 0
- if (dup(fd) == -1) // 1
+ if(dup(fd) == -1) // 1
error("Couldn't do a dup for 1: %m");
- if (dup(fd) == -1) // 2
+ if(dup(fd) == -1) // 2
error("Couldn't do a dup for 2 %m");
execle(slurmctld_conf.mail_prog, "mail",
"-s", mi->message, mi->user_name,
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 7b5ed347b7365f83b03bf4954a502541106864f1..f83bb2320336eb526700615eac712184f4d5c87e 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
association_based_accounting =
slurm_get_is_association_based_accounting();
accounting_enforce = slurmctld_conf.accounting_storage_enforce;
- if (!strcasecmp(slurmctld_conf.accounting_storage_type,
+ if(!strcasecmp(slurmctld_conf.accounting_storage_type,
"accounting_storage/slurmdbd")) {
with_slurmdbd = 1;
/* we need job_list not to be NULL */
@@ -356,7 +356,7 @@ int main(int argc, char *argv[])
ASSOC_MGR_CACHE_USER | ASSOC_MGR_CACHE_QOS;
if (assoc_mgr_init(acct_db_conn, &assoc_init_arg)) {
- if (accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)
+ if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)
error("Association database appears down, "
"reading from state file.");
else
@@ -989,7 +989,7 @@ static void *_service_connection(void *arg)
slurm_msg_t_init(msg);
- if (slurm_receive_msg(conn->newsockfd, msg, 0) != 0) {
+ if(slurm_receive_msg(conn->newsockfd, msg, 0) != 0) {
error("slurm_receive_msg: %m");
/* close should only be called when the socket implementation
* is being used the following call will be a no-op in a
@@ -1002,7 +1002,7 @@ static void *_service_connection(void *arg)
/* set msg connection fd to accepted fd. This allows
* possibility for slurmd_req () to close accepted connection
*/
- if (errno != SLURM_SUCCESS) {
+ if(errno != SLURM_SUCCESS) {
if (errno == SLURM_PROTOCOL_VERSION_ERROR) {
slurm_send_rc_msg(msg, SLURM_PROTOCOL_VERSION_ERROR);
} else
@@ -1122,7 +1122,7 @@ static int _accounting_cluster_ready()
cluster_nodes,
cluster_cpus, event_time);
xfree(cluster_nodes);
- if (rc == ACCOUNTING_FIRST_REG) {
+ if(rc == ACCOUNTING_FIRST_REG) {
/* see if we are running directly to a database
* instead of a slurmdbd.
*/
@@ -1153,7 +1153,7 @@ static int _accounting_mark_all_nodes_down(char *reason)
}
xfree(state_file);
- if ((rc = acct_storage_g_flush_jobs_on_cluster(acct_db_conn,
+ if((rc = acct_storage_g_flush_jobs_on_cluster(acct_db_conn,
event_time))
== SLURM_ERROR)
return rc;
@@ -1162,7 +1162,7 @@ static int _accounting_mark_all_nodes_down(char *reason)
for (i = 0; i < node_record_count; i++, node_ptr++) {
if (node_ptr->name == '\0')
continue;
- if ((rc = clusteracct_storage_g_node_down(
+ if((rc = clusteracct_storage_g_node_down(
acct_db_conn,
node_ptr, event_time,
reason, slurm_get_slurm_user_id()))
@@ -1600,12 +1600,12 @@ static void _parse_commandline(int argc, char *argv[])
break;
case 'r':
recover = 1;
- if (!bg_recover_override)
+ if(!bg_recover_override)
bg_recover = 1;
break;
case 'R':
recover = 2;
- if (!bg_recover_override)
+ if(!bg_recover_override)
bg_recover = 1;
break;
case 'v':
@@ -1875,13 +1875,13 @@ static void *_assoc_cache_mgr(void *no_data)
/* This is here to see if we are exiting. If we get
NO_VAL then just return since we are closing down.
*/
- if (running_cache == (uint16_t)NO_VAL) {
+ if(running_cache == (uint16_t)NO_VAL) {
slurm_mutex_unlock(&assoc_cache_mutex);
return NULL;
}
lock_slurmctld(job_write_lock);
assoc_mgr_refresh_lists(acct_db_conn, NULL);
- if (running_cache)
+ if(running_cache)
unlock_slurmctld(job_write_lock);
slurm_mutex_unlock(&assoc_cache_mutex);
}
@@ -1891,7 +1891,7 @@ static void *_assoc_cache_mgr(void *no_data)
list_count(job_list));
itr = list_iterator_create(job_list);
while ((job_ptr = list_next(itr))) {
- if (job_ptr->assoc_id) {
+ if(job_ptr->assoc_id) {
memset(&assoc_rec, 0, sizeof(slurmdb_association_rec_t));
assoc_rec.id = job_ptr->assoc_id;
@@ -1915,10 +1915,10 @@ static void *_assoc_cache_mgr(void *no_data)
job_ptr->assoc_ptr, job_ptr->assoc_id,
job_ptr->job_id);
}
- if (job_ptr->qos_id) {
+ if(job_ptr->qos_id) {
memset(&qos_rec, 0, sizeof(slurmdb_qos_rec_t));
qos_rec.id = job_ptr->qos_id;
- if ((assoc_mgr_fill_in_qos(
+ if((assoc_mgr_fill_in_qos(
acct_db_conn, &qos_rec,
accounting_enforce,
(slurmdb_qos_rec_t **)&job_ptr->qos_ptr))
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 7c9621d5095e8efb5d5916d7ab7b6f5aefe04be7..c47f449cd5a4d68109ec469ce4184495e8ccd5a2 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -323,15 +323,15 @@ static slurmdb_qos_rec_t *_determine_and_validate_qos(
with the association. If not just fill in the qos and
continue. */
- if (accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)
+ if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)
xassert(assoc_ptr);
xassert(qos_rec);
- if (!qos_rec->name && !qos_rec->id) {
- if (assoc_ptr && assoc_ptr->usage->valid_qos)
- if (assoc_ptr->def_qos_id)
+ if(!qos_rec->name && !qos_rec->id) {
+ if(assoc_ptr && assoc_ptr->usage->valid_qos)
+ if(assoc_ptr->def_qos_id)
qos_rec->id = assoc_ptr->def_qos_id;
- else if (bit_set_count(assoc_ptr->usage->valid_qos) == 1)
+ else if(bit_set_count(assoc_ptr->usage->valid_qos) == 1)
qos_rec->id =
bit_ffs(assoc_ptr->usage->valid_qos);
else
@@ -340,7 +340,7 @@ static slurmdb_qos_rec_t *_determine_and_validate_qos(
qos_rec->name = "normal";
}
- if (assoc_mgr_fill_in_qos(acct_db_conn, qos_rec, accounting_enforce,
+ if(assoc_mgr_fill_in_qos(acct_db_conn, qos_rec, accounting_enforce,
&qos_ptr)
!= SLURM_SUCCESS) {
error("Invalid qos (%s)", qos_rec->name);
@@ -348,7 +348,7 @@ static slurmdb_qos_rec_t *_determine_and_validate_qos(
return NULL;
}
- if ((accounting_enforce & ACCOUNTING_ENFORCE_QOS)
+ if((accounting_enforce & ACCOUNTING_ENFORCE_QOS)
&& assoc_ptr
&& (!assoc_ptr->usage->valid_qos
|| !bit_test(assoc_ptr->usage->valid_qos, qos_rec->id))) {
@@ -471,11 +471,11 @@ int dump_all_job_state(void)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
@@ -576,10 +576,10 @@ extern int load_all_job_state(void)
buffer = create_buf(data, data_size);
safe_unpackstr_xmalloc(&ver_str, &ver_str_len, buffer);
debug3("Version string in job_state header is %s", ver_str);
- if (ver_str) {
- if (!strcmp(ver_str, JOB_STATE_VERSION)) {
+ if(ver_str) {
+ if(!strcmp(ver_str, JOB_STATE_VERSION)) {
protocol_version = SLURM_PROTOCOL_VERSION;
- } else if (!strcmp(ver_str, JOB_2_1_STATE_VERSION)) {
+ } else if(!strcmp(ver_str, JOB_2_1_STATE_VERSION)) {
protocol_version = SLURM_2_1_PROTOCOL_VERSION;
}
}
@@ -840,7 +840,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
slurmdb_qos_rec_t qos_rec;
bool job_finished = false;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpack32(&assoc_id, buffer);
safe_unpack32(&job_id, buffer);
@@ -979,7 +979,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
goto unpack_error;
safe_unpack16(&step_flag, buffer);
}
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
uint16_t kill_on_step_done;
uint32_t min_cpus;
@@ -1232,7 +1232,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
* association record. If not look for it by
* account,partition, user_id.
*/
- if (job_ptr->assoc_id)
+ if(job_ptr->assoc_id)
assoc_rec.id = job_ptr->assoc_id;
else {
assoc_rec.acct = job_ptr->account;
@@ -1261,7 +1261,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
info("Recovered job %u %u", job_id, job_ptr->assoc_id);
/* make sure we have started this job in accounting */
- if (!job_ptr->db_index) {
+ if(!job_ptr->db_index) {
debug("starting job %u in accounting",
job_ptr->job_id);
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
@@ -1272,7 +1272,7 @@ static int _load_job_state(Buf buffer, uint16_t protocol_version)
}
/* make sure we have this job completed in the
* database */
- if (IS_JOB_FINISHED(job_ptr)) {
+ if(IS_JOB_FINISHED(job_ptr)) {
jobacct_storage_g_job_complete(acct_db_conn, job_ptr);
job_finished = 1;
}
@@ -1407,7 +1407,7 @@ static int _load_job_details(struct job_record *job_ptr, Buf buffer,
multi_core_data_t *mc_ptr;
/* unpack the job's details from the buffer */
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpack32(&min_cpus, buffer);
safe_unpack32(&max_cpus, buffer);
safe_unpack32(&min_nodes, buffer);
@@ -1455,7 +1455,7 @@ static int _load_job_details(struct job_record *job_ptr, Buf buffer,
goto unpack_error;
safe_unpackstr_array(&argv, &argc, buffer);
safe_unpackstr_array(&env_sup, &env_cnt, buffer);
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpack32(&min_nodes, buffer);
safe_unpack32(&max_nodes, buffer);
safe_unpack32(&num_tasks, buffer);
@@ -2373,7 +2373,7 @@ extern int job_allocate(job_desc_msg_t * job_specs, int immediate,
job_ptr->exit_code = 1;
job_ptr->start_time = job_ptr->end_time = now;
_purge_job_record(job_ptr->job_id);
- } else if (!with_slurmdbd && !job_ptr->db_index)
+ } else if(!with_slurmdbd && !job_ptr->db_index)
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
if (!will_run) {
@@ -2495,7 +2495,7 @@ extern int job_signal(uint32_t job_id, uint16_t signal, uint16_t batch_flag,
return ESLURM_ALREADY_DONE;
/* save user ID of the one who requested the job be cancelled */
- if (signal == SIGKILL)
+ if(signal == SIGKILL)
job_ptr->requid = uid;
if (IS_JOB_PENDING(job_ptr) && IS_JOB_COMPLETING(job_ptr) &&
(signal == SIGKILL)) {
@@ -3100,7 +3100,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
job_desc->user_id, assoc_rec.acct, assoc_rec.partition);
error_code = ESLURM_INVALID_ACCOUNT;
goto cleanup_fail;
- } else if (association_based_accounting
+ } else if(association_based_accounting
&& !assoc_ptr
&& !(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)) {
/* if not enforcing associations we want to look for
@@ -3110,7 +3110,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
assoc_rec.acct = NULL;
assoc_mgr_fill_in_assoc(acct_db_conn, &assoc_rec,
accounting_enforce, &assoc_ptr);
- if (assoc_ptr) {
+ if(assoc_ptr) {
info("_job_create: account '%s' has no association "
"for user %u using default account '%s'",
job_desc->account, job_desc->user_id,
@@ -3229,7 +3229,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
select_g_select_jobinfo_set(job_desc->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE,
&conn_type);
- } else if (((conn_type >= SELECT_SMALL)
+ } else if(((conn_type >= SELECT_SMALL)
&& (job_desc->min_cpus >= cpus_per_bp))
|| (((conn_type == SELECT_TORUS)|| (conn_type == SELECT_MESH))
&& (job_desc->min_cpus < cpus_per_bp))) {
@@ -3258,7 +3258,7 @@ static int _job_create(job_desc_msg_t * job_desc, int allocate, int will_run,
job_pptr,
&req_bitmap,
&exc_bitmap))) {
- if (error_code == SLURM_ERROR)
+ if(error_code == SLURM_ERROR)
error_code = ESLURM_ERROR_ON_DESC_TO_RECORD_COPY;
goto cleanup_fail;
}
@@ -3812,8 +3812,8 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
struct job_details *detail_ptr;
struct job_record *job_ptr;
- if (slurm_get_track_wckey()) {
- if (!job_desc->wckey) {
+ if(slurm_get_track_wckey()) {
+ if(!job_desc->wckey) {
/* get the default wckey for this user since none was
* given */
slurmdb_user_rec_t user_rec;
@@ -3821,10 +3821,10 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
user_rec.uid = job_desc->user_id;
assoc_mgr_fill_in_user(acct_db_conn, &user_rec,
accounting_enforce, NULL);
- if (user_rec.default_wckey)
+ if(user_rec.default_wckey)
job_desc->wckey = xstrdup_printf(
"*%s", user_rec.default_wckey);
- else if (!(accounting_enforce
+ else if(!(accounting_enforce
& ACCOUNTING_ENFORCE_WCKEYS))
job_desc->wckey = xstrdup("*");
else {
@@ -3832,7 +3832,7 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
"%d has no default.", job_desc->user_id);
return ESLURM_INVALID_WCKEY;
}
- } else if (job_desc->wckey) {
+ } else if(job_desc->wckey) {
slurmdb_wckey_rec_t wckey_rec, *wckey_ptr = NULL;
memset(&wckey_rec, 0, sizeof(slurmdb_wckey_rec_t));
@@ -3842,7 +3842,7 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
if (assoc_mgr_fill_in_wckey(acct_db_conn, &wckey_rec,
accounting_enforce,
&wckey_ptr)) {
- if (accounting_enforce
+ if(accounting_enforce
& ACCOUNTING_ENFORCE_WCKEYS) {
error("_job_create: invalid wckey '%s' "
"for user %u.",
@@ -4213,7 +4213,7 @@ void job_time_limit(void)
* job has been running for 11 minutes it continues
* until 20.
*/
- if (qos) {
+ if(qos) {
usage_mins = (uint64_t)(qos->usage->usage_raw / 60.0);
wall_mins = qos->usage->grp_used_wall / 60;
@@ -4306,13 +4306,13 @@ void job_time_limit(void)
assoc = assoc->usage->parent_assoc_ptr;
/* these limits don't apply to the root assoc */
- if (assoc == assoc_mgr_root_assoc)
+ if(assoc == assoc_mgr_root_assoc)
break;
}
job_failed:
assoc_mgr_unlock(&locks);
- if (job_ptr->state_reason == FAIL_TIMEOUT) {
+ if(job_ptr->state_reason == FAIL_TIMEOUT) {
last_job_update = now;
_job_timed_out(job_ptr);
xfree(job_ptr->state_desc);
@@ -4598,7 +4598,7 @@ static int _list_find_job_old(void *job_entry, void *key)
the slurmdbd lets put it on the list to be handled later
when it comes back up since we won't get another chance.
*/
- if (with_slurmdbd && !job_ptr->db_index)
+ if(with_slurmdbd && !job_ptr->db_index)
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
return 1; /* Purge the job */
}
@@ -4743,7 +4743,7 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer,
assoc_mgr_lock_t locks = { NO_LOCK, NO_LOCK,
READ_LOCK, NO_LOCK, NO_LOCK };
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
pack32(dump_job_ptr->assoc_id, buffer);
pack32(dump_job_ptr->job_id, buffer);
pack32(dump_job_ptr->user_id, buffer);
@@ -4774,7 +4774,7 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer,
pack_time(begin_time, buffer);
/* Actual or expected start time */
- if ((dump_job_ptr->start_time) || (begin_time <= time(NULL)))
+ if((dump_job_ptr->start_time) || (begin_time <= time(NULL)))
pack_time(dump_job_ptr->start_time, buffer);
else /* earliest start time in the future */
pack_time(begin_time, buffer);
@@ -4851,7 +4851,7 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer,
else
_pack_pending_job_details(NULL, buffer,
protocol_version);
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
pack32(dump_job_ptr->assoc_id, buffer);
pack32(dump_job_ptr->job_id, buffer);
pack32(dump_job_ptr->user_id, buffer);
@@ -4881,7 +4881,7 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer,
pack_time(begin_time, buffer);
/* Actual or expected start time */
- if ((dump_job_ptr->start_time) || (begin_time <= time(NULL)))
+ if((dump_job_ptr->start_time) || (begin_time <= time(NULL)))
pack_time(dump_job_ptr->start_time, buffer);
else /* earliest start time in the future */
pack_time(begin_time, buffer);
@@ -4946,7 +4946,7 @@ void pack_job(struct job_record *dump_job_ptr, uint16_t show_flags, Buf buffer,
pack32(dump_job_ptr->cpu_cnt, buffer);
else if (dump_job_ptr->total_cpus)
pack32(dump_job_ptr->total_cpus, buffer);
- else if (detail_ptr)
+ else if(detail_ptr)
pack32(detail_ptr->min_cpus, buffer);
else
pack32(dump_job_ptr->cpu_cnt, buffer);
@@ -4977,7 +4977,7 @@ static void _pack_default_job_details(struct job_record *job_ptr,
struct job_details *detail_ptr = job_ptr->details;
char *cmd_line = NULL;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
if (detail_ptr) {
packstr(detail_ptr->features, buffer);
packstr(detail_ptr->work_dir, buffer);
@@ -5001,7 +5001,7 @@ static void _pack_default_job_details(struct job_record *job_ptr,
pack32((uint32_t) 0, buffer);
} else {
pack32(detail_ptr->min_cpus, buffer);
- if (detail_ptr->max_cpus != NO_VAL)
+ if(detail_ptr->max_cpus != NO_VAL)
pack32(detail_ptr->max_cpus, buffer);
else
pack32((uint32_t) 0, buffer);
@@ -5034,7 +5034,7 @@ static void _pack_default_job_details(struct job_record *job_ptr,
pack32((uint32_t) 0, buffer);
pack16((uint16_t) 0, buffer);
}
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
if (detail_ptr) {
packstr(detail_ptr->features, buffer);
packstr(detail_ptr->work_dir, buffer);
@@ -5075,7 +5075,7 @@ static void _pack_default_job_details(struct job_record *job_ptr,
static void _pack_pending_job_details(struct job_details *detail_ptr,
Buf buffer, uint16_t protocol_version)
{
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
if (detail_ptr) {
pack16(detail_ptr->shared, buffer);
pack16(detail_ptr->contiguous, buffer);
@@ -5471,7 +5471,7 @@ static bool _top_priority(struct job_record *job_ptr)
* execute on different sets of nodes. While sched/backfill would
* eventually start the job if delayed here based upon priority,
* that could delay the initiation of a job by a few seconds. */
- if (static_part == (uint16_t)NO_VAL) {
+ if(static_part == (uint16_t)NO_VAL) {
/* Since this never changes we can just set it once
and not look at it again. */
rc = select_g_get_info_from_plugin(SELECT_STATIC_PART, job_ptr,
@@ -5582,9 +5582,9 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
static uint32_t cpus_per_bp = 0;
static uint16_t cpus_per_node = 0;
- if (!cpus_per_bp)
+ if(!cpus_per_bp)
select_g_alter_node_cnt(SELECT_GET_BP_CPU_CNT, &cpus_per_bp);
- if (!cpus_per_node)
+ if(!cpus_per_node)
select_g_alter_node_cnt(SELECT_GET_NODE_CPU_CNT,
&cpus_per_node);
#endif
@@ -5728,7 +5728,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
update_accounting = true;
}
}
- } else if (job_specs->qos) {
+ } else if(job_specs->qos) {
slurmdb_qos_rec_t qos_rec;
if (!IS_JOB_PENDING(job_ptr))
error_code = ESLURM_DISABLED;
@@ -5802,7 +5802,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if (save_min_cpus) {
#ifdef HAVE_BG
uint32_t node_cnt = detail_ptr->min_cpus;
- if (cpus_per_node)
+ if(cpus_per_node)
node_cnt /= cpus_per_node;
/* This is only set up so accounting is set up
correctly */
@@ -5852,7 +5852,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
else {
#ifdef HAVE_BG
uint32_t node_cnt = job_specs->num_tasks;
- if (cpus_per_node)
+ if(cpus_per_node)
node_cnt /= cpus_per_node;
/* This is only set up so accounting is set up
correctly */
@@ -5864,10 +5864,10 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
info("update_job: setting num_tasks to %u for "
"job_id %u", job_specs->num_tasks,
job_specs->job_id);
- if (detail_ptr->cpus_per_task) {
+ if(detail_ptr->cpus_per_task) {
uint32_t new_cpus = detail_ptr->num_tasks
/ detail_ptr->cpus_per_task;
- if ((new_cpus < detail_ptr->min_cpus)
+ if((new_cpus < detail_ptr->min_cpus)
|| (!detail_ptr->overcommit
&& (new_cpus > detail_ptr->min_cpus))) {
detail_ptr->min_cpus = new_cpus;
@@ -6477,7 +6477,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
started in the past since the job isn't
going to start until now as the earliest.
*/
- if (job_specs->begin_time < now)
+ if(job_specs->begin_time < now)
job_specs->begin_time = now;
detail_ptr->begin_time = job_specs->begin_time;
@@ -6539,7 +6539,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if ((!IS_JOB_PENDING(job_ptr)) || (detail_ptr == NULL))
error_code = ESLURM_DISABLED;
else {
- if ((conn_type >= SELECT_SMALL)
+ if((conn_type >= SELECT_SMALL)
&& (detail_ptr->min_cpus >= cpus_per_bp)) {
info("update_job: could not change "
"conn_type to '%s' because cpu "
@@ -6549,7 +6549,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
detail_ptr->min_cpus,
job_ptr->job_id);
error_code = ESLURM_INVALID_NODE_COUNT;
- } else if (((conn_type == SELECT_TORUS)
+ } else if(((conn_type == SELECT_TORUS)
|| (conn_type == SELECT_MESH))
&& (detail_ptr->min_cpus < cpus_per_bp)) {
info("update_job: could not change "
@@ -6574,7 +6574,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
/* check to make sure we didn't mess up with the proc count */
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_CONN_TYPE, &conn_type);
- if (detail_ptr &&
+ if(detail_ptr &&
(((conn_type >= SELECT_SMALL)
&& (detail_ptr->min_cpus >= cpus_per_bp))
|| (((conn_type == SELECT_TORUS)|| (conn_type == SELECT_MESH))
@@ -6696,7 +6696,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
}
#endif
- if (update_accounting) {
+ if(update_accounting) {
info("updating accounting");
if (job_ptr->details && job_ptr->details->begin_time) {
/* Update job record in accounting to reflect
@@ -6714,7 +6714,7 @@ extern void job_pre_resize_acctg(struct job_record *job_ptr)
/* if we don't have a db_index go a start this one up since if
running with the slurmDBD the job may not have started yet.
*/
- if (!job_ptr->db_index)
+ if(!job_ptr->db_index)
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
job_ptr->job_state |= JOB_RESIZING;
@@ -7378,7 +7378,7 @@ extern void job_completion_logger(struct job_record *job_ptr, bool requeue)
if (IS_JOB_RESIZING(job_ptr))
return;
- if (!job_ptr->assoc_id) {
+ if(!job_ptr->assoc_id) {
slurmdb_association_rec_t assoc_rec;
/* In case accounting enabled after starting the job */
memset(&assoc_rec, 0, sizeof(slurmdb_association_rec_t));
@@ -7386,7 +7386,7 @@ extern void job_completion_logger(struct job_record *job_ptr, bool requeue)
assoc_rec.partition = job_ptr->partition;
assoc_rec.uid = job_ptr->user_id;
- if (!(assoc_mgr_fill_in_assoc(acct_db_conn, &assoc_rec,
+ if(!(assoc_mgr_fill_in_assoc(acct_db_conn, &assoc_rec,
accounting_enforce,
(slurmdb_association_rec_t **)
&job_ptr->assoc_ptr))) {
@@ -7398,7 +7398,7 @@ extern void job_completion_logger(struct job_record *job_ptr, bool requeue)
}
}
- if (!with_slurmdbd && !job_ptr->db_index)
+ if(!with_slurmdbd && !job_ptr->db_index)
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
jobacct_storage_g_job_complete(acct_db_conn, job_ptr);
@@ -7979,7 +7979,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
//(*limit_set_max_nodes) = 0;
assoc_mgr_lock(&locks);
- if (qos_ptr) {
+ if(qos_ptr) {
/* for validation we don't need to look at
* qos_ptr->grp_cpu_mins.
*/
@@ -8011,7 +8011,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_cpus,
qos_ptr->grp_cpus);
- if (job_desc->max_cpus == NO_VAL)
+ if(job_desc->max_cpus == NO_VAL)
limit_set_max_cpus = 1;
job_desc->max_cpus = qos_ptr->grp_cpus;
}
@@ -8048,7 +8048,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_nodes,
qos_ptr->grp_nodes);
- if (job_desc->max_nodes == NO_VAL)
+ if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
job_desc->max_nodes = qos_ptr->grp_nodes;
}
@@ -8105,7 +8105,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_cpus,
qos_ptr->max_cpus_pj);
- if (job_desc->max_cpus == NO_VAL)
+ if(job_desc->max_cpus == NO_VAL)
limit_set_max_cpus = 1;
job_desc->max_cpus = qos_ptr->max_cpus_pj;
}
@@ -8141,7 +8141,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_nodes,
qos_ptr->max_nodes_pj);
- if (job_desc->max_nodes == NO_VAL)
+ if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
job_desc->max_nodes = qos_ptr->max_nodes_pj;
}
@@ -8149,17 +8149,17 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
if (qos_ptr->max_submit_jobs_pu != INFINITE) {
slurmdb_used_limits_t *used_limits = NULL;
- if (qos_ptr->usage->user_limit_list) {
+ if(qos_ptr->usage->user_limit_list) {
ListIterator itr = list_iterator_create(
qos_ptr->usage->user_limit_list);
while((used_limits = list_next(itr))) {
- if (used_limits->uid
+ if(used_limits->uid
== job_desc->user_id)
break;
}
list_iterator_destroy(itr);
}
- if (used_limits && (used_limits->submit_jobs
+ if(used_limits && (used_limits->submit_jobs
>= qos_ptr->max_submit_jobs_pu)) {
info("job submit for user %s(%u): "
"account max submit job limit exceeded %u",
@@ -8230,7 +8230,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_cpus,
assoc_ptr->grp_cpus);
- if (job_desc->max_cpus == NO_VAL)
+ if(job_desc->max_cpus == NO_VAL)
limit_set_max_cpus = 1;
job_desc->max_cpus = assoc_ptr->grp_cpus;
}
@@ -8269,7 +8269,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_nodes,
assoc_ptr->grp_nodes);
- if (job_desc->max_nodes == NO_VAL)
+ if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
job_desc->max_nodes = assoc_ptr->grp_nodes;
}
@@ -8300,7 +8300,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
* parents since we have pre-propogated them, so just
* continue with the next parent
*/
- if (parent) {
+ if(parent) {
assoc_ptr = assoc_ptr->usage->parent_assoc_ptr;
continue;
}
@@ -8337,7 +8337,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_cpus,
assoc_ptr->max_cpus_pj);
- if (job_desc->max_cpus == NO_VAL)
+ if(job_desc->max_cpus == NO_VAL)
limit_set_max_cpus = 1;
job_desc->max_cpus = assoc_ptr->max_cpus_pj;
}
@@ -8375,7 +8375,7 @@ static bool _validate_acct_policy(job_desc_msg_t *job_desc,
job_desc->user_id,
job_desc->max_nodes,
assoc_ptr->max_nodes_pj);
- if (job_desc->max_nodes == NO_VAL)
+ if(job_desc->max_nodes == NO_VAL)
(*limit_set_max_nodes) = 1;
job_desc->max_nodes = assoc_ptr->max_nodes_pj;
}
@@ -8455,13 +8455,13 @@ extern int job_cancel_by_assoc_id(uint32_t assoc_id)
continue;
/* move up to the parent that should still exist */
- if (job_ptr->assoc_ptr) {
+ if(job_ptr->assoc_ptr) {
/* Force a start so the association doesn't
get lost. Since there could be some delay
in the start of the job when running with
the slurmdbd.
*/
- if (!job_ptr->db_index) {
+ if(!job_ptr->db_index) {
jobacct_storage_g_job_start(acct_db_conn,
job_ptr);
}
@@ -8469,13 +8469,13 @@ extern int job_cancel_by_assoc_id(uint32_t assoc_id)
job_ptr->assoc_ptr =
((slurmdb_association_rec_t *)
job_ptr->assoc_ptr)->usage->parent_assoc_ptr;
- if (job_ptr->assoc_ptr)
+ if(job_ptr->assoc_ptr)
job_ptr->assoc_id =
((slurmdb_association_rec_t *)
job_ptr->assoc_ptr)->id;
}
- if (IS_JOB_FINISHED(job_ptr))
+ if(IS_JOB_FINISHED(job_ptr))
continue;
info("Association deleted, cancelling job %u",
@@ -8516,20 +8516,20 @@ extern int job_cancel_by_qos_id(uint32_t qos_id)
continue;
/* move up to the parent that should still exist */
- if (job_ptr->qos_ptr) {
+ if(job_ptr->qos_ptr) {
/* Force a start so the association doesn't
get lost. Since there could be some delay
in the start of the job when running with
the slurmdbd.
*/
- if (!job_ptr->db_index) {
+ if(!job_ptr->db_index) {
jobacct_storage_g_job_start(acct_db_conn,
job_ptr);
}
job_ptr->qos_ptr = NULL;
}
- if (IS_JOB_FINISHED(job_ptr))
+ if(IS_JOB_FINISHED(job_ptr))
continue;
info("QOS deleted, cancelling job %u",
@@ -8575,7 +8575,7 @@ extern int update_job_account(char *module, struct job_record *job_ptr,
info("%s: invalid account %s for job_id %u",
module, new_account, job_ptr->job_id);
return ESLURM_INVALID_ACCOUNT;
- } else if (association_based_accounting &&
+ } else if(association_based_accounting &&
!job_ptr->assoc_ptr &&
!(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS)) {
/* if not enforcing associations we want to look for
@@ -8587,7 +8587,7 @@ extern int update_job_account(char *module, struct job_record *job_ptr,
accounting_enforce,
(slurmdb_association_rec_t **)
&job_ptr->assoc_ptr);
- if (!job_ptr->assoc_ptr) {
+ if(!job_ptr->assoc_ptr) {
debug("%s: we didn't have an association for account "
"'%s' and user '%u', and we can't seem to find "
"a default one either. Keeping new account "
@@ -8643,7 +8643,7 @@ extern int update_job_wckey(char *module, struct job_record *job_ptr,
info("%s: invalid wckey %s for job_id %u",
module, new_wckey, job_ptr->job_id);
return ESLURM_INVALID_WCKEY;
- } else if (association_based_accounting
+ } else if(association_based_accounting
&& !wckey_ptr
&& !(accounting_enforce & ACCOUNTING_ENFORCE_WCKEYS)) {
/* if not enforcing associations we want to look for
@@ -8653,7 +8653,7 @@ extern int update_job_wckey(char *module, struct job_record *job_ptr,
wckey_rec.name = NULL;
assoc_mgr_fill_in_wckey(acct_db_conn, &wckey_rec,
accounting_enforce, &wckey_ptr);
- if (!wckey_ptr) {
+ if(!wckey_ptr) {
debug("%s: we didn't have a wckey record for wckey "
"'%s' and user '%u', and we can't seem to find "
"a default one either. Setting it anyway. "
@@ -8693,7 +8693,7 @@ extern int send_jobs_to_accounting(void)
lock_slurmctld(job_write_lock);
itr = list_iterator_create(job_list);
while ((job_ptr = list_next(itr))) {
- if (!job_ptr->assoc_id) {
+ if(!job_ptr->assoc_id) {
slurmdb_association_rec_t assoc_rec;
memset(&assoc_rec, 0,
sizeof(slurmdb_association_rec_t));
@@ -8701,7 +8701,7 @@ extern int send_jobs_to_accounting(void)
assoc_rec.partition = job_ptr->partition;
assoc_rec.acct = job_ptr->account;
- if (assoc_mgr_fill_in_assoc(
+ if(assoc_mgr_fill_in_assoc(
acct_db_conn, &assoc_rec,
accounting_enforce,
(slurmdb_association_rec_t **)
@@ -8723,7 +8723,7 @@ extern int send_jobs_to_accounting(void)
}
/* we only want active, un accounted for jobs */
- if (job_ptr->db_index || IS_JOB_FINISHED(job_ptr))
+ if(job_ptr->db_index || IS_JOB_FINISHED(job_ptr))
continue;
debug("first reg: starting job %u in accounting",
@@ -8921,11 +8921,11 @@ static int _checkpoint_job_record (struct job_record *job_ptr, char *image_dir)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(ckpt_file, old_file))
+ if(link(ckpt_file, old_file))
debug4("unable to create link for %s -> %s: %m",
ckpt_file, old_file);
(void) unlink(ckpt_file);
- if (link(new_file, ckpt_file))
+ if(link(new_file, ckpt_file))
debug4("unable to create link for %s -> %s: %m",
new_file, ckpt_file);
(void) unlink(new_file);
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 0e5302da00c58165a1a7a88dca76e0050f404d54..197c869dd51a25f864171111676617b4012c3e11 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -505,7 +505,7 @@ extern int schedule(void)
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
- if (ionodes) {
+ if(ionodes) {
sprintf(tmp_char,"%s[%s]",
job_ptr->nodes, ionodes);
} else {
diff --git a/src/slurmctld/job_submit.c b/src/slurmctld/job_submit.c
index 4626fb3061c568cdd8d7ef3e3f9ed23d7560da57..f2cc2ad1da84f8bce10d36cf7812f48a5f95984c 100644
--- a/src/slurmctld/job_submit.c
+++ b/src/slurmctld/job_submit.c
@@ -118,7 +118,7 @@ static int _load_submit_plugin(char *plugin_name,
if (plugin_context->cur_plugin != PLUGIN_INVALID_HANDLE)
return SLURM_SUCCESS;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("job_submit: Couldn't load specified plugin name "
"for %s: %s",
plugin_context->sched_type, plugin_strerror(errno));
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index cacc396254fdacc69dc55ec4f3b3361133e427ce..540df31072851e4de525487713d2f5f4eb48280b 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -176,11 +176,11 @@ int dump_all_node_state ( void )
(void) unlink (new_file);
else { /* file shuffle */
(void) unlink (old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink (reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink (new_file);
@@ -317,10 +317,10 @@ extern int load_all_node_state ( bool state_only )
safe_unpackstr_xmalloc( &ver_str, &name_len, buffer);
debug3("Version string in node_state header is %s", ver_str);
- if (ver_str) {
- if (!strcmp(ver_str, NODE_STATE_VERSION)) {
+ if(ver_str) {
+ if(!strcmp(ver_str, NODE_STATE_VERSION)) {
protocol_version = SLURM_PROTOCOL_VERSION;
- } else if (!strcmp(ver_str, NODE_2_1_STATE_VERSION)) {
+ } else if(!strcmp(ver_str, NODE_2_1_STATE_VERSION)) {
protocol_version = SLURM_2_1_PROTOCOL_VERSION;
}
}
@@ -339,7 +339,7 @@ extern int load_all_node_state ( bool state_only )
while (remaining_buf (buffer) > 0) {
uint16_t base_state;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc (&node_name, &name_len, buffer);
safe_unpackstr_xmalloc (&reason, &name_len, buffer);
safe_unpackstr_xmalloc (&features, &name_len, buffer);
@@ -357,7 +357,7 @@ extern int load_all_node_state ( bool state_only )
node_name) != SLURM_SUCCESS)
goto unpack_error;
base_state = node_state & NODE_STATE_BASE;
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc (&node_name, &name_len, buffer);
safe_unpackstr_xmalloc (&reason, &name_len, buffer);
safe_unpackstr_xmalloc (&features, &name_len, buffer);
@@ -573,7 +573,7 @@ extern void pack_all_node (char **buffer_ptr, int *buffer_size,
buffer = init_buf (BUF_SIZE*16);
nodes_packed = 0;
- if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
/* write header: version and time */
pack32(nodes_packed, buffer);
select_g_alter_node_cnt(SELECT_GET_NODE_SCALING,
@@ -641,7 +641,7 @@ extern void pack_all_node (char **buffer_ptr, int *buffer_size,
static void _pack_node (struct node_record *dump_node_ptr, Buf buffer,
uint16_t protocol_version)
{
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
packstr (dump_node_ptr->name, buffer);
pack16 (dump_node_ptr->node_state, buffer);
if (slurmctld_conf.fast_schedule) {
@@ -679,7 +679,7 @@ static void _pack_node (struct node_record *dump_node_ptr, Buf buffer,
packstr(dump_node_ptr->config_ptr->gres, buffer);
packstr(dump_node_ptr->os, buffer);
packstr(dump_node_ptr->reason, buffer);
- } else if (protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
+ } else if(protocol_version >= SLURM_2_1_PROTOCOL_VERSION) {
packstr (dump_node_ptr->name, buffer);
pack16 (dump_node_ptr->node_state, buffer);
if (slurmctld_conf.fast_schedule) {
@@ -1661,7 +1661,7 @@ extern int validate_node_specs(slurm_node_registration_status_msg_t *reg_msg)
&& (node_ptr->boot_time > node_ptr->last_response)
&& (slurmctld_conf.ret2service != 2)) {
last_node_update = now;
- if (!node_ptr->reason) {
+ if(!node_ptr->reason) {
node_ptr->reason_time = now;
node_ptr->reason_uid =
slurm_get_slurm_user_id();
@@ -2413,7 +2413,7 @@ void make_node_idle(struct node_record *node_ptr,
bitstr_t *node_bitmap = NULL;
if (job_ptr) { /* Specific job completed */
- if (job_ptr->node_bitmap_cg)
+ if(job_ptr->node_bitmap_cg)
node_bitmap = job_ptr->node_bitmap_cg;
else
node_bitmap = job_ptr->node_bitmap;
@@ -2509,7 +2509,7 @@ extern int send_nodes_to_accounting(time_t event_time)
/* send nodes not in not 'up' state */
node_ptr = node_record_table_ptr;
for (i = 0; i < node_record_count; i++, node_ptr++) {
- if (node_ptr->reason)
+ if(node_ptr->reason)
reason = node_ptr->reason;
else
reason = "First Registration";
@@ -2519,14 +2519,14 @@ extern int send_nodes_to_accounting(time_t event_time)
/* At this point, the node appears to be up,
but on some systems we need to make sure there
aren't some part of a node in an error state. */
- if (node_ptr->select_nodeinfo) {
+ if(node_ptr->select_nodeinfo) {
uint16_t err_cpus = 0;
select_g_select_nodeinfo_get(
node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
- if (err_cpus) {
+ if(err_cpus) {
struct node_record send_node;
struct config_record config_rec;
int cpus_per_node = 1;
@@ -2541,7 +2541,7 @@ extern int send_nodes_to_accounting(time_t event_time)
SELECT_GET_NODE_SCALING,
&node_scaling);
- if (node_scaling)
+ if(node_scaling)
cpus_per_node = node_ptr->cpus
/ node_scaling;
err_cpus *= cpus_per_node;
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index b9259ae20146c103819ba2743da687dc6083a90f..1c16c5b2ffb75aeaacc49244cb5ea0f2ab1ce787 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -1221,7 +1221,7 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
acct_policy_job_begin(job_ptr);
/* If ran with slurmdbd this is handled out of band in the job */
- if (!with_slurmdbd)
+ if(!with_slurmdbd)
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
prolog_slurmctld(job_ptr);
@@ -1932,7 +1932,7 @@ extern void re_kill_job(struct job_record *job_ptr)
if (agent_args->node_count == 0) {
slurm_free_kill_job_msg(kill_job);
- if (agent_args->hostlist)
+ if(agent_args->hostlist)
hostlist_destroy(agent_args->hostlist);
xfree(agent_args);
hostlist_destroy(kill_hostlist);
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 8a9faf601bedf5f7738b0aee8207afa11adea201..7b9edc21d09a77ce188e6f2f4231e86d4187fb92 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -236,7 +236,7 @@ struct part_record *create_part_record(void)
part_ptr->max_share = default_part.max_share;
part_ptr->preempt_mode = default_part.preempt_mode;
part_ptr->priority = default_part.priority;
- if (part_max_priority)
+ if(part_max_priority)
part_ptr->norm_priority = (double)default_part.priority
/ (double)part_max_priority;
part_ptr->node_bitmap = NULL;
@@ -358,11 +358,11 @@ int dump_all_part_state(void)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
@@ -500,10 +500,10 @@ int load_all_part_state(void)
safe_unpackstr_xmalloc( &ver_str, &name_len, buffer);
debug3("Version string in part_state header is %s", ver_str);
- if (ver_str) {
- if (!strcmp(ver_str, PART_STATE_VERSION)) {
+ if(ver_str) {
+ if(!strcmp(ver_str, PART_STATE_VERSION)) {
protocol_version = SLURM_PROTOCOL_VERSION;
- } else if (!strcmp(ver_str, PART_2_1_STATE_VERSION)) {
+ } else if(!strcmp(ver_str, PART_2_1_STATE_VERSION)) {
protocol_version = SLURM_2_1_PROTOCOL_VERSION;
}
}
@@ -520,7 +520,7 @@ int load_all_part_state(void)
safe_unpack_time(&time, buffer);
while (remaining_buf(buffer) > 0) {
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpackstr_xmalloc(&part_name, &name_len, buffer);
safe_unpack32(&max_time, buffer);
safe_unpack32(&default_time, buffer);
@@ -532,7 +532,7 @@ int load_all_part_state(void)
safe_unpack16(&preempt_mode, buffer);
safe_unpack16(&priority, buffer);
- if (priority > part_max_priority)
+ if(priority > part_max_priority)
part_max_priority = priority;
safe_unpack16(&state_up, buffer);
@@ -925,7 +925,7 @@ void pack_part(struct part_record *part_ptr, Buf buffer,
{
uint32_t altered;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
if (default_part_loc == part_ptr)
part_ptr->flags |= PART_FLAG_DEFAULT;
else
@@ -1176,7 +1176,7 @@ extern int update_part (update_part_msg_t * part_desc, bool create_flag)
the normalized priorities of all the other
partitions. If not then just set this partitions.
*/
- if (part_ptr->priority > part_max_priority) {
+ if(part_ptr->priority > part_max_priority) {
ListIterator itr = list_iterator_create(part_list);
struct part_record *part2 = NULL;
@@ -1334,7 +1334,7 @@ extern int validate_alloc_node(struct part_record *part_ptr, char* alloc_node)
status=hostlist_find(hl,alloc_node);
hostlist_destroy(hl);
- if (status==-1)
+ if(status==-1)
status=0;
else
status=1;
diff --git a/src/slurmctld/preempt.c b/src/slurmctld/preempt.c
index 3cbabd13d7696248a39bcc3536f4d26090606a7f..50683621e9f8b799d9246d46122cd0ed6f9088af 100644
--- a/src/slurmctld/preempt.c
+++ b/src/slurmctld/preempt.c
@@ -94,7 +94,7 @@ static slurm_preempt_ops_t *
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->preempt_type, plugin_strerror(errno));
return NULL;
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 9303c578a3d463fa4c52e767f86b46448507ef67..429df67518112aee999007f6c83ed7dcf7c11ca7 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -943,7 +943,7 @@ static void _slurm_rpc_get_shares(slurm_msg_t *msg)
response_msg.msg_type = RESPONSE_SHARE_INFO;
response_msg.data = &resp_msg;
slurm_send_node_msg(msg->conn_fd, &response_msg);
- if (resp_msg.assoc_shares_list)
+ if(resp_msg.assoc_shares_list)
list_destroy(resp_msg.assoc_shares_list);
END_TIMER2("_slurm_rpc_get_share");
debug2("_slurm_rpc_get_shares %s", TIME_STR);
@@ -971,7 +971,7 @@ static void _slurm_rpc_get_priority_factors(slurm_msg_t *msg)
response_msg.msg_type = RESPONSE_PRIORITY_FACTORS;
response_msg.data = &resp_msg;
slurm_send_node_msg(msg->conn_fd, &response_msg);
- if (resp_msg.priority_factors_list)
+ if(resp_msg.priority_factors_list)
list_destroy(resp_msg.priority_factors_list);
END_TIMER2("_slurm_rpc_get_priority_factors");
debug2("_slurm_rpc_get_priority_factors %s", TIME_STR);
@@ -1640,7 +1640,7 @@ static void _slurm_rpc_node_registration(slurm_msg_t * msg)
}
if (error_code == SLURM_SUCCESS) {
/* do RPC call */
- if (!(slurm_get_debug_flags() & DEBUG_FLAG_NO_CONF_HASH)
+ if(!(slurm_get_debug_flags() & DEBUG_FLAG_NO_CONF_HASH)
&& (node_reg_stat_msg->hash_val != NO_VAL)
&& (node_reg_stat_msg->hash_val != slurm_get_hash_val())) {
error("Node %s appears to have a different slurm.conf "
@@ -2237,7 +2237,7 @@ static void _slurm_rpc_step_layout(slurm_msg_t *msg)
}
step_ptr = find_step_record(job_ptr, req->step_id);
- if (!step_ptr) {
+ if(!step_ptr) {
unlock_slurmctld(job_read_lock);
debug2("_slurm_rpc_step_layout: "
"JobId=%u.%u Not Found",
@@ -2900,11 +2900,11 @@ static void _slurm_rpc_update_block(slurm_msg_t * msg)
if (error_code == SLURM_SUCCESS) {
/* do RPC call */
- if (block_desc_ptr->bg_block_id) {
+ if(block_desc_ptr->bg_block_id) {
error_code = select_g_update_block(block_desc_ptr);
END_TIMER2("_slurm_rpc_update_block");
name = block_desc_ptr->bg_block_id;
- } else if (block_desc_ptr->nodes) {
+ } else if(block_desc_ptr->nodes) {
error_code = select_g_update_sub_node(block_desc_ptr);
END_TIMER2("_slurm_rpc_update_subbp");
name = block_desc_ptr->nodes;
@@ -3712,7 +3712,7 @@ inline static void _slurm_rpc_accounting_update_msg(slurm_msg_t *msg)
slurm_send_rc_msg(msg, EACCES);
return;
}
- if (update_ptr->update_list && list_count(update_ptr->update_list))
+ if(update_ptr->update_list && list_count(update_ptr->update_list))
rc = assoc_mgr_update(update_ptr->update_list);
END_TIMER2("_slurm_rpc_accounting_update_msg");
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 92e42ccbcc16286c792028bb6a4d40c232661fbd..262fda7bd4dcab4d856740f7a43306240d7ba892 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -459,7 +459,7 @@ static int _build_single_partitionline_info(slurm_conf_partition_t *part)
if (part->preempt_mode != (uint16_t) NO_VAL)
part_ptr->preempt_mode = part->preempt_mode;
- if (part->disable_root_jobs == (uint16_t)NO_VAL) {
+ if(part->disable_root_jobs == (uint16_t)NO_VAL) {
if (slurmctld_conf.disable_root_jobs)
part_ptr->flags |= PART_FLAG_NO_ROOT;
} else if (part->disable_root_jobs) {
@@ -468,7 +468,7 @@ static int _build_single_partitionline_info(slurm_conf_partition_t *part)
part_ptr->flags &= (~PART_FLAG_NO_ROOT);
}
- if (part_ptr->flags & PART_FLAG_NO_ROOT)
+ if(part_ptr->flags & PART_FLAG_NO_ROOT)
debug2("partition %s does not allow root jobs", part_ptr->name);
if ((part->default_time != NO_VAL) &&
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index fb36a40f3fb043b3bc516c7cfde54fa3fbd1f225..6b0862233b02b3cd30d70cbc1915dce131f14973 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -373,7 +373,7 @@ static int _append_assoc_list(List assoc_list, slurmdb_association_rec_t *assoc)
acct_db_conn, assoc,
accounting_enforce,
&assoc_ptr)) {
- if (accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("No association for user %u and account %s",
assoc->uid, assoc->acct);
} else {
@@ -398,22 +398,22 @@ static int _set_assoc_list(slurmctld_resv_t *resv_ptr)
slurmdb_association_rec_t assoc, *assoc_ptr = NULL;
/* no need to do this if we can't ;) */
- if (!association_based_accounting)
+ if(!association_based_accounting)
return rc;
assoc_list = list_create(NULL);
memset(&assoc, 0, sizeof(slurmdb_association_rec_t));
- if (resv_ptr->user_cnt) {
+ if(resv_ptr->user_cnt) {
for(i=0; i < resv_ptr->user_cnt; i++) {
- if (resv_ptr->account_cnt) {
+ if(resv_ptr->account_cnt) {
for(j=0; j < resv_ptr->account_cnt; j++) {
memset(&assoc, 0,
sizeof(slurmdb_association_rec_t));
assoc.uid = resv_ptr->user_list[i];
assoc.acct = resv_ptr->account_list[j];
- if ((rc = _append_assoc_list(
+ if((rc = _append_assoc_list(
assoc_list, &assoc))
!= SLURM_SUCCESS) {
goto end_it;
@@ -423,7 +423,7 @@ static int _set_assoc_list(slurmctld_resv_t *resv_ptr)
memset(&assoc, 0,
sizeof(slurmdb_association_rec_t));
assoc.uid = resv_ptr->user_list[i];
- if ((rc = assoc_mgr_get_user_assocs(
+ if((rc = assoc_mgr_get_user_assocs(
acct_db_conn, &assoc,
accounting_enforce, assoc_list))
!= SLURM_SUCCESS) {
@@ -432,28 +432,28 @@ static int _set_assoc_list(slurmctld_resv_t *resv_ptr)
}
}
}
- } else if (resv_ptr->account_cnt) {
+ } else if(resv_ptr->account_cnt) {
for(i=0; i < resv_ptr->account_cnt; i++) {
memset(&assoc, 0,
sizeof(slurmdb_association_rec_t));
assoc.uid = (uint32_t)NO_VAL;
assoc.acct = resv_ptr->account_list[j];
- if ((rc = _append_assoc_list(assoc_list, &assoc))
+ if((rc = _append_assoc_list(assoc_list, &assoc))
!= SLURM_SUCCESS) {
goto end_it;
}
}
- } else if (accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS) {
+ } else if(accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS) {
error("We need at least 1 user or 1 account to "
"create a reservtion.");
rc = SLURM_ERROR;
}
- if (list_count(assoc_list)) {
+ if(list_count(assoc_list)) {
ListIterator itr = list_iterator_create(assoc_list);
xfree(resv_ptr->assoc_list); /* clear for modify */
while((assoc_ptr = list_next(itr))) {
- if (resv_ptr->assoc_list)
+ if(resv_ptr->assoc_list)
xstrfmtcat(resv_ptr->assoc_list, "%u,",
assoc_ptr->id);
else
@@ -531,7 +531,7 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
resv.id = resv_ptr->resv_id;
resv.time_end = resv_ptr->end_time;
- if (!old_resv_ptr) {
+ if(!old_resv_ptr) {
resv.assocs = resv_ptr->assoc_list;
resv.cpus = resv_ptr->cpu_cnt;
resv.flags = resv_ptr->flags;
@@ -539,28 +539,28 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
} else {
time_t now = time(NULL);
- if (old_resv_ptr->assoc_list && resv_ptr->assoc_list) {
- if (strcmp(old_resv_ptr->assoc_list,
+ if(old_resv_ptr->assoc_list && resv_ptr->assoc_list) {
+ if(strcmp(old_resv_ptr->assoc_list,
resv_ptr->assoc_list))
resv.assocs = resv_ptr->assoc_list;
- } else if (resv_ptr->assoc_list)
+ } else if(resv_ptr->assoc_list)
resv.assocs = resv_ptr->assoc_list;
- if (old_resv_ptr->cpu_cnt != resv_ptr->cpu_cnt)
+ if(old_resv_ptr->cpu_cnt != resv_ptr->cpu_cnt)
resv.cpus = resv_ptr->cpu_cnt;
else
resv.cpus = (uint32_t)NO_VAL;
- if (old_resv_ptr->flags != resv_ptr->flags)
+ if(old_resv_ptr->flags != resv_ptr->flags)
resv.flags = resv_ptr->flags;
else
resv.flags = (uint16_t)NO_VAL;
- if (old_resv_ptr->node_list && resv_ptr->node_list) {
- if (strcmp(old_resv_ptr->node_list,
+ if(old_resv_ptr->node_list && resv_ptr->node_list) {
+ if(strcmp(old_resv_ptr->node_list,
resv_ptr->node_list))
resv.nodes = resv_ptr->node_list;
- } else if (resv_ptr->node_list)
+ } else if(resv_ptr->node_list)
resv.nodes = resv_ptr->node_list;
/* Here if the reservation has started already we need
@@ -568,7 +568,7 @@ static int _post_resv_update(slurmctld_resv_t *resv_ptr,
* variables are needed in accounting. Right now if
* the assocs, nodes, flags or cpu count changes we need a
* new start time of now. */
- if ((resv_ptr->start_time < now)
+ if((resv_ptr->start_time < now)
&& (resv.assocs
|| resv.nodes
|| (resv.flags != (uint16_t)NO_VAL)
@@ -1308,7 +1308,7 @@ extern int create_resv(resv_desc_msg_t *resv_desc_ptr)
resv_ptr->user_list = user_list;
resv_desc_ptr->users = NULL; /* Nothing left to free */
_set_cpu_cnt(resv_ptr);
- if ((rc = _set_assoc_list(resv_ptr)) != SLURM_SUCCESS)
+ if((rc = _set_assoc_list(resv_ptr)) != SLURM_SUCCESS)
goto bad_parse;
/* This needs to be done after all other setup is done. */
@@ -1496,7 +1496,7 @@ extern int update_resv(resv_desc_msg_t *resv_desc_ptr)
resv_ptr->start_time_prev = resv_ptr->start_time;
resv_ptr->start_time = resv_desc_ptr->start_time;
resv_ptr->start_time_first = resv_desc_ptr->start_time;
- if (resv_ptr->duration) {
+ if(resv_ptr->duration) {
resv_ptr->end_time = resv_ptr->start_time_first +
(resv_ptr->duration * 60);
}
@@ -1724,11 +1724,11 @@ extern void show_resv(char **buffer_ptr, int *buffer_size, uid_t uid)
&& !validate_super_user(uid)) {
int i = 0;
for(i=0; i<resv_ptr->user_cnt; i++) {
- if (resv_ptr->user_list[i] == uid)
+ if(resv_ptr->user_list[i] == uid)
break;
}
- if (i >= resv_ptr->user_cnt)
+ if(i >= resv_ptr->user_cnt)
continue;
}
@@ -1816,11 +1816,11 @@ extern int dump_all_resv_state(void)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
@@ -2498,7 +2498,7 @@ static int _valid_job_access_resv(struct job_record *job_ptr,
if (accounting_enforce & ACCOUNTING_ENFORCE_ASSOCS) {
char tmp_char[30];
- if (!resv_ptr->assoc_list) {
+ if(!resv_ptr->assoc_list) {
error("Reservation %s has no association list. "
"Checking user/account lists",
resv_ptr->name);
@@ -2506,7 +2506,7 @@ static int _valid_job_access_resv(struct job_record *job_ptr,
}
snprintf(tmp_char, sizeof(tmp_char), ",%u,",
job_ptr->assoc_id);
- if (strstr(resv_ptr->assoc_list, tmp_char))
+ if(strstr(resv_ptr->assoc_list, tmp_char))
return SLURM_SUCCESS;
} else {
no_assocs:
@@ -2958,7 +2958,7 @@ extern int send_resvs_to_accounting(void)
ListIterator itr = NULL;
slurmctld_resv_t *resv_ptr;
- if (!resv_list)
+ if(!resv_list)
return SLURM_SUCCESS;
itr = list_iterator_create(resv_list);
diff --git a/src/slurmctld/sched_plugin.c b/src/slurmctld/sched_plugin.c
index 729f6d2e704cd6012f400c67cbc04b81e145c376..fae4040bc4167b2ad1739ce7e6f703de67b58988 100644
--- a/src/slurmctld/sched_plugin.c
+++ b/src/slurmctld/sched_plugin.c
@@ -115,7 +115,7 @@ slurm_sched_get_ops( slurm_sched_context_t *c )
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->sched_type, plugin_strerror(errno));
return NULL;
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index a796010c1ba4c0b628ab6dcad929427f8b630d6d..86069aa35c6c112ad79310de75e99a82b71247ef 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -1645,7 +1645,7 @@ step_create(job_step_create_request_msg_t *step_specs,
fatal ("step_create: checkpoint_alloc_jobinfo error");
*new_step_record = step_ptr;
- if (!with_slurmdbd && !job_ptr->db_index)
+ if(!with_slurmdbd && !job_ptr->db_index)
jobacct_storage_g_job_start(acct_db_conn, job_ptr);
jobacct_storage_g_step_start(acct_db_conn, step_ptr);
@@ -1800,7 +1800,7 @@ static void _pack_ctld_job_step_info(struct step_record *step_ptr, Buf buffer)
task_cnt = step_ptr->step_layout->task_cnt;
node_list = step_ptr->step_layout->node_list;
} else {
- if (step_ptr->job_ptr->details)
+ if(step_ptr->job_ptr->details)
task_cnt = step_ptr->job_ptr->details->min_cpus;
else
task_cnt = step_ptr->job_ptr->cpu_cnt;
@@ -1814,7 +1814,7 @@ static void _pack_ctld_job_step_info(struct step_record *step_ptr, Buf buffer)
#ifdef HAVE_BG
if (step_ptr->job_ptr->total_cpus)
pack32(step_ptr->job_ptr->total_cpus, buffer);
- else if (step_ptr->job_ptr->details)
+ else if(step_ptr->job_ptr->details)
pack32(step_ptr->job_ptr->details->min_cpus, buffer);
else
pack32(step_ptr->job_ptr->cpu_cnt, buffer);
@@ -2510,7 +2510,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer,
slurm_step_layout_t *step_layout = NULL;
List gres_list = NULL;
- if (protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
+ if(protocol_version >= SLURM_2_2_PROTOCOL_VERSION) {
safe_unpack32(&step_id, buffer);
safe_unpack16(&cyclic_alloc, buffer);
safe_unpack16(&port, buffer);
diff --git a/src/slurmctld/trigger_mgr.c b/src/slurmctld/trigger_mgr.c
index 743166ffb00569ea1552fca8677b2ecd33a8cb76..82f0c8aa4700916fb93f2e366f690f2c99185c44 100644
--- a/src/slurmctld/trigger_mgr.c
+++ b/src/slurmctld/trigger_mgr.c
@@ -589,11 +589,11 @@ extern int trigger_state_save(void)
(void) unlink(new_file);
else { /* file shuffle */
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
diff --git a/src/slurmd/common/proctrack.c b/src/slurmd/common/proctrack.c
index f1548d108c4ca57a09de42ac738a7ec50e00b781..4d3209b53e0b877a0f121fc3ee6d2c398a56667a 100644
--- a/src/slurmd/common/proctrack.c
+++ b/src/slurmd/common/proctrack.c
@@ -102,7 +102,7 @@ _proctrack_get_ops(slurm_proctrack_context_t * c)
if (c->cur_plugin != PLUGIN_INVALID_HANDLE)
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->proctrack_type, plugin_strerror(errno));
return NULL;
diff --git a/src/slurmd/common/setproctitle.c b/src/slurmd/common/setproctitle.c
index fa109bba8ab1aa7066cda45aac9299a21acb175a..977744fa7753ba3064c1bfb66b6cdad58e05d968 100644
--- a/src/slurmd/common/setproctitle.c
+++ b/src/slurmd/common/setproctitle.c
@@ -302,7 +302,7 @@ init_setproctitle(int argc, char *argv[])
new_environ[i] = strdup(environ[i]);
//free(environ[i]);
}
- /* if (environ) */
+ /* if(environ) */
/* free(environ); */
new_environ[i] = NULL;
environ = new_environ;
diff --git a/src/slurmd/common/task_plugin.c b/src/slurmd/common/task_plugin.c
index f127d04c5630dd22b5b6c4ff44c88cb7375220db..d7f662a3a115d56ee1c7c6615b91447476ef1571 100644
--- a/src/slurmd/common/task_plugin.c
+++ b/src/slurmd/common/task_plugin.c
@@ -102,7 +102,7 @@ _slurmd_task_get_ops(slurmd_task_context_t *c)
if ( c->cur_plugin != PLUGIN_INVALID_HANDLE )
return &c->ops;
- if (errno != EPLUGIN_NOTFOUND) {
+ if(errno != EPLUGIN_NOTFOUND) {
error("Couldn't load specified plugin name for %s: %s",
c->task_type, plugin_strerror(errno));
return NULL;
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index 42de2c47130982c1b6667da97fb80b85905477a4..0af0557fe8f11998a1505194e4917b7d680bb950 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -464,7 +464,7 @@ _send_slurmstepd_init(int fd, slurmd_step_type_t type, void *req,
free_buf(buffer);
/* send self address over to slurmstepd */
- if (self) {
+ if(self) {
buffer = init_buf(0);
slurm_pack_slurm_addr(self, buffer);
len = get_buf_offset(buffer);
@@ -530,7 +530,7 @@ _send_slurmstepd_init(int fd, slurmd_step_type_t type, void *req,
return 0;
rwfail:
- if (buffer)
+ if(buffer)
free_buf(buffer);
error("_send_slurmstepd_init failed");
return -1;
@@ -672,7 +672,7 @@ _forkexec_slurmstepd(slurmd_step_type_t type, void *req,
}
fd_set_noclose_on_exec(STDERR_FILENO);
log_fini();
- if (!failed) {
+ if(!failed) {
execvp(argv[0], argv);
error("exec of slurmstepd failed: %m");
}
@@ -3651,7 +3651,7 @@ _destroy_env(char **env)
{
int i=0;
- if (env) {
+ if(env) {
for(i=0; env[i]; i++) {
xfree(env[i]);
}
@@ -3920,7 +3920,7 @@ _getgroups(void)
return NULL;
}
gg = (gid_t *)xmalloc(n * sizeof(gid_t));
- if (getgroups(n, gg) == -1) {
+ if(getgroups(n, gg) == -1) {
error("_getgroups: couldn't get %d groups: %m", n);
xfree(gg);
return NULL;
@@ -3958,7 +3958,7 @@ init_gids_cache(int cache)
return;
}
orig_gids = (gid_t *)xmalloc(ngids * sizeof(gid_t));
- if (getgroups(ngids, orig_gids) == -1) {
+ if(getgroups(ngids, orig_gids) == -1) {
error("init_gids_cache: couldn't get %d groups: %m", ngids);
xfree(orig_gids);
return;
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 8ad918958c525a68b39db36aa934bfd9c208bc13..c1a4da883c3cc78081b569597df03b6a0783870b 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -202,7 +202,7 @@ main (int argc, char *argv[])
conf->argc = &argc;
slurmd_uid = slurm_get_slurmd_user_id();
curr_uid = getuid();
- if (curr_uid != slurmd_uid) {
+ if(curr_uid != slurmd_uid) {
struct passwd *pw = NULL;
char *slurmd_user = NULL;
char *curr_user = NULL;
@@ -507,7 +507,7 @@ _service_connection(void *arg)
debug3("in the service_connection");
slurm_msg_t_init(msg);
- if ((rc = slurm_receive_msg_and_forward(con->fd, con->cli_addr, msg, 0))
+ if((rc = slurm_receive_msg_and_forward(con->fd, con->cli_addr, msg, 0))
!= SLURM_SUCCESS) {
error("service_connection: slurm_receive_msg: %m");
/* if this fails we need to make sure the nodes we forward
@@ -784,7 +784,7 @@ _read_config(void)
conf->threads = conf->conf_threads;
}
- if (cf->fast_schedule &&
+ if(cf->fast_schedule &&
((conf->cpus != conf->actual_cpus) ||
(conf->sockets != conf->actual_sockets) ||
(conf->cores != conf->actual_cores) ||
@@ -883,7 +883,7 @@ _reconfigure(void)
stepd->jobid, stepd->stepid);
if (fd == -1)
continue;
- if (stepd_reconfig(fd) != SLURM_SUCCESS)
+ if(stepd_reconfig(fd) != SLURM_SUCCESS)
debug("Reconfig jobid=%u.%u failed: %m",
stepd->jobid, stepd->stepid);
close(fd);
@@ -1015,7 +1015,7 @@ _init_conf(void)
static void
_destroy_conf(void)
{
- if (conf) {
+ if(conf) {
xfree(conf->block_map);
xfree(conf->block_map_inv);
xfree(conf->conffile);
@@ -1422,11 +1422,11 @@ int save_cred_state(slurm_cred_ctx_t ctx)
goto cleanup;
}
(void) unlink(old_file);
- if (link(reg_file, old_file))
+ if(link(reg_file, old_file))
debug4("unable to create link for %s -> %s: %m",
reg_file, old_file);
(void) unlink(reg_file);
- if (link(new_file, reg_file))
+ if(link(new_file, reg_file))
debug4("unable to create link for %s -> %s: %m",
new_file, reg_file);
(void) unlink(new_file);
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index 7706d70b6f921552e5e15ee4b44d9cab8df23d82..c6bb517d7dfc52a633244871ae7279d2f26073d1 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -248,7 +248,7 @@ batch_finish(slurmd_job_t *job, int rc)
for (i = 0; i < job->node_tasks; i++) {
/* If signalled we only need to check one and then
* break out of the loop */
- if (WIFSIGNALED(job->task[i]->estatus)) {
+ if(WIFSIGNALED(job->task[i]->estatus)) {
switch(WTERMSIG(job->task[i]->estatus)) {
case SIGTERM:
case SIGKILL:
@@ -490,7 +490,7 @@ _setup_normal_io(slurmd_job_t *job)
}
}
- if (io_initial_client_connect(srun, job, srun_stdout_tasks,
+ if(io_initial_client_connect(srun, job, srun_stdout_tasks,
srun_stderr_tasks) < 0) {
rc = ESLURMD_IO_ERROR;
goto claim;
@@ -628,7 +628,7 @@ _wait_for_children_slurmstepd(slurmd_job_t *job)
for (i = 0; i < job->node_tasks; i++) {
/* If signalled we only need to check one and then
break out of the loop */
- if (WIFSIGNALED(job->task[i]->estatus)) {
+ if(WIFSIGNALED(job->task[i]->estatus)) {
switch(WTERMSIG(job->task[i]->estatus)) {
case SIGTERM:
case SIGKILL:
@@ -675,7 +675,7 @@ _one_step_complete_msg(slurmd_job_t *job, int first, int last)
msg.step_rc = step_complete.step_rc;
msg.jobacct = jobacct_gather_g_create(NULL);
/************* acct stuff ********************/
- if (!acct_sent) {
+ if(!acct_sent) {
jobacct_gather_g_aggregate(step_complete.jobacct, job->jobacct);
jobacct_gather_g_getinfo(step_complete.jobacct,
JOBACCT_DATA_TOTAL, msg.jobacct);
@@ -869,7 +869,7 @@ job_manager(slurmd_job_t *job)
/*
* Initialize log facility to copy errors back to srun
*/
- if (!rc)
+ if(!rc)
rc = _slurmd_job_log_init(job);
if (rc) {
@@ -915,7 +915,7 @@ job_manager(slurmd_job_t *job)
/* if we are not polling then we need to make sure we get some
* information here
*/
- if (!conf->job_acct_gather_freq)
+ if(!conf->job_acct_gather_freq)
jobacct_gather_g_stat_task(0);
/* Send job launch response with list of pids */
@@ -1372,7 +1372,7 @@ _wait_for_any_task(slurmd_job_t *job, bool waitflag)
/************* acct stuff ********************/
jobacct = jobacct_gather_g_remove_task(pid);
- if (jobacct) {
+ if(jobacct) {
jobacct_gather_g_setinfo(jobacct,
JOBACCT_DATA_RUSAGE, &rusage);
jobacct_gather_g_aggregate(job->jobacct, jobacct);
@@ -1745,7 +1745,7 @@ _drop_privileges(slurmd_job_t *job, bool do_setuid, struct priv_state *ps)
ps->gid_list = (gid_t *) xmalloc(ps->ngids * sizeof(gid_t));
- if (getgroups(ps->ngids, ps->gid_list) == -1) {
+ if(getgroups(ps->ngids, ps->gid_list) == -1) {
error("_drop_privileges: couldn't get %d groups: %m",
ps->ngids);
xfree(ps->gid_list);
@@ -2040,7 +2040,7 @@ _run_script_as_user(const char *name, const char *path, slurmd_job_t *job,
exit(127);
}
- if (chdir(job->cwd) == -1)
+ if(chdir(job->cwd) == -1)
error("run_script_as_user: couldn't "
"change working dir to %s: %m", job->cwd);
#ifdef SETPGRP_TWO_ARGS
diff --git a/src/slurmd/slurmstepd/req.c b/src/slurmd/slurmstepd/req.c
index fef3ed6b0da6b3757663151b4488d80a38272e43..f856b1175d6d529068f2fc9a5714bbb65ac437ec 100644
--- a/src/slurmd/slurmstepd/req.c
+++ b/src/slurmd/slurmstepd/req.c
@@ -1368,7 +1368,7 @@ _handle_stat_jobacct(int fd, slurmd_job_t *job, uid_t uid)
for (i = 0; i < job->node_tasks; i++) {
temp_jobacct = jobacct_gather_g_stat_task(job->task[i]->pid);
- if (temp_jobacct) {
+ if(temp_jobacct) {
jobacct_gather_g_aggregate(jobacct, temp_jobacct);
jobacct_gather_g_destroy(temp_jobacct);
num_tasks++;
diff --git a/src/slurmd/slurmstepd/slurmstepd.c b/src/slurmd/slurmstepd/slurmstepd.c
index f0c834460832f61d4e4a1d9d710be710f8d3a12a..8e1bdd43ef646dd86853b4bd42a6c6f38d3f599c 100644
--- a/src/slurmd/slurmstepd/slurmstepd.c
+++ b/src/slurmd/slurmstepd/slurmstepd.c
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
/* Create the slurmd_job_t, mostly from info in a
launch_tasks_request_msg_t or a batch_job_launch_msg_t */
- if (!(job = _step_setup(cli, self, msg))) {
+ if(!(job = _step_setup(cli, self, msg))) {
_send_fail_to_slurmd(STDOUT_FILENO);
rc = SLURM_FAILURE;
goto ending;
@@ -241,7 +241,7 @@ _init_from_slurmd(int sock, char **argv,
incoming_buffer = xmalloc(len);
safe_read(sock, incoming_buffer, len);
buffer = create_buf(incoming_buffer,len);
- if (unpack_slurmd_conf_lite_no_alloc(conf, buffer) == SLURM_ERROR) {
+ if(unpack_slurmd_conf_lite_no_alloc(conf, buffer) == SLURM_ERROR) {
fatal("slurmstepd: problem with unpack of slurmd_conf");
}
free_buf(buffer);
@@ -281,20 +281,20 @@ _init_from_slurmd(int sock, char **argv,
safe_read(sock, incoming_buffer, len);
buffer = create_buf(incoming_buffer,len);
cli = xmalloc(sizeof(slurm_addr_t));
- if (slurm_unpack_slurm_addr_no_alloc(cli, buffer) == SLURM_ERROR) {
+ if(slurm_unpack_slurm_addr_no_alloc(cli, buffer) == SLURM_ERROR) {
fatal("slurmstepd: problem with unpack of slurmd_conf");
}
free_buf(buffer);
/* receive self from slurmd */
safe_read(sock, &len, sizeof(int));
- if (len > 0) {
+ if(len > 0) {
/* receive packed self from main slurmd */
incoming_buffer = xmalloc(sizeof(char) * len);
safe_read(sock, incoming_buffer, len);
buffer = create_buf(incoming_buffer,len);
self = xmalloc(sizeof(slurm_addr_t));
- if (slurm_unpack_slurm_addr_no_alloc(self, buffer)
+ if(slurm_unpack_slurm_addr_no_alloc(self, buffer)
== SLURM_ERROR) {
fatal("slurmstepd: problem with unpack of "
"slurmd_conf");
@@ -322,7 +322,7 @@ _init_from_slurmd(int sock, char **argv,
fatal("Unrecognized launch RPC");
break;
}
- if (unpack_msg(msg, buffer) == SLURM_ERROR)
+ if(unpack_msg(msg, buffer) == SLURM_ERROR)
fatal("slurmstepd: we didn't unpack the request correctly");
free_buf(buffer);
@@ -371,7 +371,7 @@ _step_setup(slurm_addr_t *cli, slurm_addr_t *self, slurm_msg_t *msg)
fatal("handle_launch_message: Unrecognized launch RPC");
break;
}
- if (!job) {
+ if(!job) {
error("_step_setup: no job returned");
return NULL;
}
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.c b/src/slurmd/slurmstepd/slurmstepd_job.c
index c34a7a35f29763d3fe5972c4199c188d241950dd..0185673a8c8909bf832b0ba65393b7e6c2484892 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.c
+++ b/src/slurmd/slurmstepd/slurmstepd_job.c
@@ -196,7 +196,7 @@ job_create(launch_tasks_request_msg_t *msg)
nodeid = 0;
job->node_name = xstrdup(msg->complete_nodelist);
#endif
- if (nodeid < 0) {
+ if(nodeid < 0) {
error("couldn't find node %s in %s",
job->node_name, msg->complete_nodelist);
job_destroy(job);
@@ -339,7 +339,7 @@ job_batch_job_create(batch_job_launch_msg_t *msg)
_pwd_destroy(pwd);
return NULL;
}
- if (msg->job_mem && (msg->acctg_freq != (uint16_t) NO_VAL)
+ if(msg->job_mem && (msg->acctg_freq != (uint16_t) NO_VAL)
&& (msg->acctg_freq > conf->job_acct_gather_freq)) {
error("Can't set frequency to %u, it is higher than %u. "
"We need it to be at least at this level to "
diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index 2ffe7a6a59e235afc6b47f9d303e3bccf01853d7..e988600d1c23656b81d8f8d5738a4a21447c9d31 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -220,7 +220,7 @@ _run_script_and_set_env(const char *name, const char *path, slurmd_job_t *job)
argv[0] = xstrdup(path);
argv[1] = NULL;
close(1);
- if (dup(pfd[1]) == -1)
+ if(dup(pfd[1]) == -1)
error("couldn't do the dup: %m");
close(2);
close(0);
@@ -535,7 +535,7 @@ static char *_uint32_array_to_str(int array_len, const uint32_t *array)
char *sep = ","; /* seperator */
char *str = xstrdup("");
- if (array == NULL)
+ if(array == NULL)
return str;
for (i = 0; i < array_len; i++) {
diff --git a/src/slurmdbd/backup.c b/src/slurmdbd/backup.c
index 84eba162154e47dcecc2ffc7fc9f48388a8e700d..c3b6c49440e437e23ed776e541238192cb3a85fb 100644
--- a/src/slurmdbd/backup.c
+++ b/src/slurmdbd/backup.c
@@ -55,7 +55,7 @@ static slurm_fd_t slurmdbd_fd = -1;
/* Open a connection to the Slurm DBD and set slurmdbd_fd */
static void _open_slurmdbd_fd(slurm_addr_t dbd_addr)
{
- if (dbd_addr.sin_port == 0) {
+ if(dbd_addr.sin_port == 0) {
error("sin_port == 0 in the slurmdbd backup");
return;
}
@@ -112,14 +112,14 @@ extern void run_backup(void)
shutdown_threads();
have_control = false;
break;
- } else if (!have_control && !writeable) {
+ } else if(!have_control && !writeable) {
have_control = true;
info("Taking Control");
break;
}
sleep(1);
- if (!writeable)
+ if(!writeable)
_reopen_slurmdbd_fd(dbd_addr);
}
diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c
index 0ad1e092b4602a38201245340ecd06726fb8838a..dab65bf7a5a86b9dafe42e60025440d50a332722 100644
--- a/src/slurmdbd/proc_req.c
+++ b/src/slurmdbd/proc_req.c
@@ -424,7 +424,7 @@ proc_req(slurmdbd_conn_t *slurmdbd_conn,
break;
}
- if (rc == ESLURM_ACCESS_DENIED)
+ if(rc == ESLURM_ACCESS_DENIED)
error("Security violation, %s",
slurmdbd_msg_type_2_str(msg_type, 1));
}
@@ -443,11 +443,11 @@ static char * _replace_double_quotes(char *option)
{
int i=0;
- if (!option)
+ if(!option)
return NULL;
while(option[i]) {
- if (option[i] == '\"')
+ if(option[i] == '\"')
option[i] = '`';
i++;
}
@@ -463,14 +463,14 @@ static int _add_accounts(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
debug2("DBD_ADD_ACCOUNTS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
slurmdb_user_rec_t user;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = *uid;
- if (assoc_mgr_fill_in_user(
+ if(assoc_mgr_fill_in_user(
slurmdbd_conn->db_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
comment = "Your user has not been added to the accounting system yet.";
@@ -478,7 +478,7 @@ static int _add_accounts(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
- if (!user.coord_accts || !list_count(user.coord_accts)) {
+ if(!user.coord_accts || !list_count(user.coord_accts)) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
@@ -525,7 +525,7 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
}
debug2("DBD_ADD_ACCOUNT_COORDS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
ListIterator itr = NULL;
@@ -537,7 +537,7 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = *uid;
- if (assoc_mgr_fill_in_user(
+ if(assoc_mgr_fill_in_user(
slurmdbd_conn->db_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
comment = "Your user has not been added to the accounting system yet.";
@@ -545,7 +545,7 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
- if (!user.coord_accts || !list_count(user.coord_accts)) {
+ if(!user.coord_accts || !list_count(user.coord_accts)) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
@@ -555,10 +555,10 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
itr2 = list_iterator_create(user.coord_accts);
while((acct = list_next(itr))) {
while((coord = list_next(itr2))) {
- if (!strcasecmp(coord->name, acct))
+ if(!strcasecmp(coord->name, acct))
break;
}
- if (!coord) {
+ if(!coord) {
bad = 1;
break;
}
@@ -567,7 +567,7 @@ static int _add_account_coords(slurmdbd_conn_t *slurmdbd_conn,
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
- if (bad) {
+ if(bad) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
@@ -602,7 +602,7 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
goto end_it;
}
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
ListIterator itr = NULL;
@@ -613,7 +613,7 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = *uid;
- if (assoc_mgr_fill_in_user(
+ if(assoc_mgr_fill_in_user(
slurmdbd_conn->db_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
comment = "Your user has not been added to the accounting system yet.";
@@ -621,7 +621,7 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
- if (!user.coord_accts || !list_count(user.coord_accts)) {
+ if(!user.coord_accts || !list_count(user.coord_accts)) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
@@ -631,21 +631,21 @@ static int _add_assocs(slurmdbd_conn_t *slurmdbd_conn,
itr2 = list_iterator_create(user.coord_accts);
while((object = list_next(itr))) {
char *account = "root";
- if (object->user)
+ if(object->user)
account = object->acct;
- else if (object->parent_acct)
+ else if(object->parent_acct)
account = object->parent_acct;
list_iterator_reset(itr2);
while((coord = list_next(itr2))) {
- if (!strcasecmp(coord->name, account))
+ if(!strcasecmp(coord->name, account))
break;
}
- if (!coord)
+ if(!coord)
break;
}
list_iterator_destroy(itr2);
list_iterator_destroy(itr);
- if (!coord) {
+ if(!coord) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
@@ -670,7 +670,7 @@ static int _add_clusters(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
debug2("DBD_ADD_CLUSTERS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -690,7 +690,7 @@ static int _add_clusters(slurmdbd_conn_t *slurmdbd_conn,
rc = acct_storage_g_add_clusters(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
comment = "Failed to add cluster.";
end_it:
@@ -708,7 +708,7 @@ static int _add_qos(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
debug2("DBD_ADD_QOS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& (assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER)) {
comment = "Your user doesn't have privilege to preform this action";
@@ -728,7 +728,7 @@ static int _add_qos(slurmdbd_conn_t *slurmdbd_conn,
rc = acct_storage_g_add_qos(slurmdbd_conn->db_conn, *uid,
get_msg->my_list);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
comment = "Failed to add qos.";
end_it:
@@ -745,14 +745,14 @@ static int _add_users(slurmdbd_conn_t *slurmdbd_conn,
dbd_list_msg_t *get_msg = NULL;
char *comment = NULL;
debug2("DBD_ADD_USERS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
slurmdb_user_rec_t user;
memset(&user, 0, sizeof(slurmdb_user_rec_t));
user.uid = *uid;
- if (assoc_mgr_fill_in_user(
+ if(assoc_mgr_fill_in_user(
slurmdbd_conn->db_conn, &user, 1, NULL)
!= SLURM_SUCCESS) {
comment = "Your user has not been added to the accounting system yet.";
@@ -760,7 +760,7 @@ static int _add_users(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
goto end_it;
}
- if (!user.coord_accts || !list_count(user.coord_accts)) {
+ if(!user.coord_accts || !list_count(user.coord_accts)) {
comment = "Your user doesn't have privilege to preform this action";
error("%s", comment);
rc = ESLURM_ACCESS_DENIED;
@@ -800,7 +800,7 @@ static int _add_wckeys(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
debug2("DBD_ADD_WCKEYS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -869,7 +869,7 @@ static int _archive_dump(slurmdbd_conn_t *slurmdbd_conn,
slurmdb_archive_cond_t *arch_cond = NULL;
debug2("DBD_ARCHIVE_DUMP: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -888,9 +888,9 @@ static int _archive_dump(slurmdbd_conn_t *slurmdbd_conn,
}
arch_cond = (slurmdb_archive_cond_t *)get_msg->cond;
/* set up some defaults */
- if (!arch_cond->archive_dir)
+ if(!arch_cond->archive_dir)
arch_cond->archive_dir = xstrdup(slurmdbd_conf->archive_dir);
- if (!arch_cond->archive_script)
+ if(!arch_cond->archive_script)
arch_cond->archive_script =
xstrdup(slurmdbd_conf->archive_script);
@@ -900,8 +900,8 @@ static int _archive_dump(slurmdbd_conn_t *slurmdbd_conn,
arch_cond->purge_suspend = slurmdbd_conf->purge_suspend;
rc = jobacct_storage_g_archive(slurmdbd_conn->db_conn, arch_cond);
- if (rc != SLURM_SUCCESS) {
- if (errno == EACCES)
+ if(rc != SLURM_SUCCESS) {
+ if(errno == EACCES)
comment = "Problem accessing file.";
else
comment = "Error with request.";
@@ -921,7 +921,7 @@ static int _archive_load(slurmdbd_conn_t *slurmdbd_conn,
char *comment = "SUCCESS";
debug2("DBD_ARCHIVE_LOAD: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -941,9 +941,9 @@ static int _archive_load(slurmdbd_conn_t *slurmdbd_conn,
rc = jobacct_storage_g_archive_load(slurmdbd_conn->db_conn, arch_rec);
- if (rc == ENOENT)
+ if(rc == ENOENT)
comment = "No archive file given to recover.";
- else if (rc != SLURM_SUCCESS)
+ else if(rc != SLURM_SUCCESS)
comment = "Error with request.";
end_it:
@@ -984,7 +984,7 @@ static int _cluster_cpus(slurmdbd_conn_t *slurmdbd_conn,
cluster_cpus_msg->cluster_nodes,
cluster_cpus_msg->cpu_count,
cluster_cpus_msg->event_time);
- if (rc == ESLURM_ACCESS_DENIED) {
+ if(rc == ESLURM_ACCESS_DENIED) {
comment = "This cluster hasn't been added to accounting yet";
rc = SLURM_ERROR;
}
@@ -1017,8 +1017,8 @@ static int _get_accounts(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_accounts(slurmdbd_conn->db_conn,
*uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_ACCOUNTS, *out_buffer);
@@ -1033,7 +1033,7 @@ static int _get_accounts(slurmdbd_conn_t *slurmdbd_conn,
}
slurmdbd_free_cond_msg(get_msg, DBD_GET_ACCOUNTS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1062,8 +1062,8 @@ static int _get_assocs(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_associations(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_ASSOCS, *out_buffer);
@@ -1078,7 +1078,7 @@ static int _get_assocs(slurmdbd_conn_t *slurmdbd_conn,
slurmdbd_free_cond_msg(get_msg, DBD_GET_ASSOCS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1107,8 +1107,8 @@ static int _get_clusters(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_clusters(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_CLUSTERS, *out_buffer);
@@ -1124,7 +1124,7 @@ static int _get_clusters(slurmdbd_conn_t *slurmdbd_conn,
slurmdbd_free_cond_msg(get_msg, DBD_GET_CLUSTERS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1143,7 +1143,7 @@ static int _get_config(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_CONFIG, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_CONFIG, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return SLURM_SUCCESS;
@@ -1172,8 +1172,8 @@ static int _get_events(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_events(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_EVENTS, *out_buffer);
@@ -1189,7 +1189,7 @@ static int _get_events(slurmdbd_conn_t *slurmdbd_conn,
slurmdbd_free_cond_msg(get_msg, DBD_GET_EVENTS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1245,8 +1245,8 @@ static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = jobacct_storage_g_get_jobs_cond(
slurmdbd_conn->db_conn, *uid, &job_cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_JOBS, *out_buffer);
@@ -1259,16 +1259,16 @@ static int _get_jobs(slurmdbd_conn_t *slurmdbd_conn,
rc = SLURM_ERROR;
}
- if (job_cond.cluster_list)
+ if(job_cond.cluster_list)
list_destroy(job_cond.cluster_list);
- if (job_cond.userid_list)
+ if(job_cond.userid_list)
list_destroy(job_cond.userid_list);
- if (job_cond.groupid_list)
+ if(job_cond.groupid_list)
list_destroy(job_cond.groupid_list);
slurmdbd_free_get_jobs_msg(get_jobs_msg);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1297,8 +1297,8 @@ static int _get_jobs_cond(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = jobacct_storage_g_get_jobs_cond(
slurmdbd_conn->db_conn, *uid, cond_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_JOBS, *out_buffer);
@@ -1312,7 +1312,7 @@ static int _get_jobs_cond(slurmdbd_conn_t *slurmdbd_conn,
}
slurmdbd_free_cond_msg(cond_msg, DBD_GET_JOBS_COND);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1328,7 +1328,7 @@ static int _get_probs(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_GET_PROBS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
@@ -1354,8 +1354,8 @@ static int _get_probs(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_problems(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_PROBS, *out_buffer);
@@ -1370,7 +1370,7 @@ static int _get_probs(slurmdbd_conn_t *slurmdbd_conn,
slurmdbd_free_cond_msg(get_msg, DBD_GET_PROBS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1399,11 +1399,11 @@ static int _get_qos(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_qos(slurmdbd_conn->db_conn, *uid,
cond_msg->cond);
- if (errno == ESLURM_ACCESS_DENIED && !list_msg.my_list)
+ if(errno == ESLURM_ACCESS_DENIED && !list_msg.my_list)
list_msg.my_list = list_create(NULL);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_QOS, *out_buffer);
@@ -1417,7 +1417,7 @@ static int _get_qos(slurmdbd_conn_t *slurmdbd_conn,
}
slurmdbd_free_cond_msg(cond_msg, DBD_GET_QOS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1446,8 +1446,8 @@ static int _get_txn(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_txn(slurmdbd_conn->db_conn, *uid,
cond_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_TXN, *out_buffer);
@@ -1461,7 +1461,7 @@ static int _get_txn(slurmdbd_conn_t *slurmdbd_conn,
}
slurmdbd_free_cond_msg(cond_msg, DBD_GET_TXN);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1511,7 +1511,7 @@ static int _get_usage(uint16_t type, slurmdbd_conn_t *slurmdbd_conn,
get_msg->start, get_msg->end);
slurmdbd_free_usage_msg(get_msg, type);
- if (rc != SLURM_SUCCESS) {
+ if(rc != SLURM_SUCCESS) {
comment = "Problem getting usage info";
error("%s", comment);
*out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
@@ -1554,8 +1554,8 @@ static int _get_users(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_users(slurmdbd_conn->db_conn,
*uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_USERS, *out_buffer);
@@ -1569,7 +1569,7 @@ static int _get_users(slurmdbd_conn_t *slurmdbd_conn,
}
slurmdbd_free_cond_msg(get_msg, DBD_GET_USERS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1585,7 +1585,7 @@ static int _get_wckeys(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_GET_WCKEYS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
@@ -1610,8 +1610,8 @@ static int _get_wckeys(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_wckeys(slurmdbd_conn->db_conn,
*uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_WCKEYS, *out_buffer);
@@ -1625,7 +1625,7 @@ static int _get_wckeys(slurmdbd_conn_t *slurmdbd_conn,
}
slurmdbd_free_cond_msg(get_msg, DBD_GET_WCKEYS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1655,8 +1655,8 @@ static int _get_reservations(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_get_reservations(
slurmdbd_conn->db_conn, *uid, get_msg->cond);
- if (!errno) {
- if (!list_msg.my_list)
+ if(!errno) {
+ if(!list_msg.my_list)
list_msg.my_list = list_create(NULL);
*out_buffer = init_buf(1024);
pack16((uint16_t) DBD_GOT_RESVS, *out_buffer);
@@ -1670,7 +1670,7 @@ static int _get_reservations(slurmdbd_conn_t *slurmdbd_conn,
}
slurmdbd_free_cond_msg(get_msg, DBD_GET_RESVS);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -1744,7 +1744,7 @@ static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
false, slurmdbd_conn->newsockfd, init_msg->rollback,
slurmdbd_conn->cluster_name);
slurmdbd_conn->rpc_version = init_msg->version;
- if (errno) {
+ if(errno) {
rc = errno;
comment = slurm_strerror(rc);
}
@@ -1773,7 +1773,7 @@ static int _fini_conn(slurmdbd_conn_t *slurmdbd_conn, Buf in_buffer,
debug2("DBD_FINI: CLOSE:%u COMMIT:%u",
fini_msg->close_conn, fini_msg->commit);
- if (fini_msg->close_conn == 1)
+ if(fini_msg->close_conn == 1)
rc = acct_storage_g_close_connection(&slurmdbd_conn->db_conn);
else
rc = acct_storage_g_commit(slurmdbd_conn->db_conn,
@@ -1827,7 +1827,7 @@ static int _job_complete(slurmdbd_conn_t *slurmdbd_conn,
job.details = &details;
- if (job.job_state & JOB_RESIZING) {
+ if(job.job_state & JOB_RESIZING) {
job.resize_time = job_comp_msg->end_time;
debug2("DBD_JOB_COMPLETE: RESIZE ID:%u", job_comp_msg->job_id);
} else
@@ -1835,7 +1835,7 @@ static int _job_complete(slurmdbd_conn_t *slurmdbd_conn,
rc = jobacct_storage_g_job_complete(slurmdbd_conn->db_conn, &job);
- if (rc && errno == 740) /* meaning data is already there */
+ if(rc && errno == 740) /* meaning data is already there */
rc = SLURM_SUCCESS;
/* just incase this gets set we need to clear it */
@@ -1925,7 +1925,7 @@ static int _job_suspend(slurmdbd_conn_t *slurmdbd_conn,
job.details = &details;
rc = jobacct_storage_g_job_suspend(slurmdbd_conn->db_conn, &job);
- if (rc && errno == 740) /* meaning data is already there */
+ if(rc && errno == 740) /* meaning data is already there */
rc = SLURM_SUCCESS;
/* just incase this gets set we need to clear it */
@@ -1946,7 +1946,7 @@ static int _modify_accounts(slurmdbd_conn_t *slurmdbd_conn,
char *comment = NULL;
debug2("DBD_MODIFY_ACCOUNTS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
@@ -1970,24 +1970,24 @@ static int _modify_accounts(slurmdbd_conn_t *slurmdbd_conn,
}
- if (!(list_msg.my_list = acct_storage_g_modify_accounts(
+ if(!(list_msg.my_list = acct_storage_g_modify_accounts(
slurmdbd_conn->db_conn, *uid, get_msg->cond,
get_msg->rec))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2002,7 +2002,7 @@ static int _modify_accounts(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
}
@@ -2034,24 +2034,24 @@ static int _modify_assocs(slurmdbd_conn_t *slurmdbd_conn,
* until we process it through the database.
*/
- if (!(list_msg.my_list = acct_storage_g_modify_associations(
+ if(!(list_msg.my_list = acct_storage_g_modify_associations(
slurmdbd_conn->db_conn, *uid, get_msg->cond,
get_msg->rec))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2066,7 +2066,7 @@ static int _modify_assocs(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2080,7 +2080,7 @@ static int _modify_clusters(slurmdbd_conn_t *slurmdbd_conn,
dbd_modify_msg_t *get_msg = NULL;
char *comment = NULL;
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -2105,24 +2105,24 @@ static int _modify_clusters(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_MODIFY_CLUSTERS: called");
- if (!(list_msg.my_list = acct_storage_g_modify_clusters(
+ if(!(list_msg.my_list = acct_storage_g_modify_clusters(
slurmdbd_conn->db_conn, *uid, get_msg->cond,
get_msg->rec))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2137,7 +2137,7 @@ static int _modify_clusters(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2151,7 +2151,7 @@ static int _modify_qos(slurmdbd_conn_t *slurmdbd_conn,
dbd_modify_msg_t *get_msg = NULL;
char *comment = NULL;
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -2176,27 +2176,27 @@ static int _modify_qos(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_MODIFY_QOS: called");
- if (!(list_msg.my_list = acct_storage_g_modify_qos(
+ if(!(list_msg.my_list = acct_storage_g_modify_qos(
slurmdbd_conn->db_conn, *uid, get_msg->cond,
get_msg->rec))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_QOS_PREEMPTION_LOOP) {
+ } else if(errno == ESLURM_QOS_PREEMPTION_LOOP) {
comment = "QOS Preemption loop detected";
rc = ESLURM_QOS_PREEMPTION_LOOP;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2211,7 +2211,7 @@ static int _modify_qos(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2246,9 +2246,9 @@ static int _modify_users(slurmdbd_conn_t *slurmdbd_conn,
user_cond = (slurmdb_user_cond_t *)get_msg->cond;
user_rec = (slurmdb_user_rec_t *)get_msg->rec;
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& admin_level < SLURMDB_ADMIN_OPERATOR) {
- if (user_cond && user_cond->assoc_cond
+ if(user_cond && user_cond->assoc_cond
&& user_cond->assoc_cond->user_list
&& (list_count(user_cond->assoc_cond->user_list) == 1)) {
uid_t pw_uid;
@@ -2273,11 +2273,11 @@ is_same_user:
/* same_user can only alter the default account, default wckey
* nothing else */
- if (same_user) {
+ if(same_user) {
/* If we add anything else here for the user we will
* need to document it
*/
- if ((user_rec->admin_level != SLURMDB_ADMIN_NOTSET)) {
+ if((user_rec->admin_level != SLURMDB_ADMIN_NOTSET)) {
comment = "You can only change your own default account, default wckey nothing else";
error("%s", comment);
*out_buffer = make_dbd_rc_msg(slurmdbd_conn->rpc_version,
@@ -2289,30 +2289,30 @@ is_same_user:
}
}
- if ((user_rec->admin_level != SLURMDB_ADMIN_NOTSET)
+ if((user_rec->admin_level != SLURMDB_ADMIN_NOTSET)
&& (*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& (admin_level < user_rec->admin_level)) {
comment = "You have to be the same or higher admin level to change another persons";
user_rec->admin_level = SLURMDB_ADMIN_NOTSET;
}
- if (!(list_msg.my_list = acct_storage_g_modify_users(
+ if(!(list_msg.my_list = acct_storage_g_modify_users(
slurmdbd_conn->db_conn, *uid, user_cond, user_rec))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2327,7 +2327,7 @@ is_same_user:
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2341,7 +2341,7 @@ static int _modify_wckeys(slurmdbd_conn_t *slurmdbd_conn,
dbd_modify_msg_t *get_msg = NULL;
char *comment = NULL;
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -2366,24 +2366,24 @@ static int _modify_wckeys(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_MODIFY_WCKEYS: called");
- if (!(list_msg.my_list = acct_storage_g_modify_wckeys(
+ if(!(list_msg.my_list = acct_storage_g_modify_wckeys(
slurmdbd_conn->db_conn, *uid, get_msg->cond,
get_msg->rec))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2398,7 +2398,7 @@ static int _modify_wckeys(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2471,10 +2471,10 @@ static int _node_state(slurmdbd_conn_t *slurmdbd_conn,
slurmctld_conf.fast_schedule = 0;
- if (!node_ptr.cpus)
+ if(!node_ptr.cpus)
node_state_msg->new_state = DBD_NODE_STATE_UP;
- if (node_state_msg->new_state == DBD_NODE_STATE_UP) {
+ if(node_state_msg->new_state == DBD_NODE_STATE_UP) {
debug3("DBD_NODE_STATE: NODE:%s STATE:%s REASON:%s TIME:%u",
node_state_msg->hostlist,
_node_state_string(node_state_msg->new_state),
@@ -2554,12 +2554,12 @@ static void _process_job_start(slurmdbd_conn_t *slurmdbd_conn,
job.details = &details;
- if (job.job_state & JOB_RESIZING) {
+ if(job.job_state & JOB_RESIZING) {
job.resize_time = job_start_msg->eligible_time;
debug2("DBD_JOB_START: RESIZE CALL ID:%u NAME:%s INX:%u",
job_start_msg->job_id, job_start_msg->name,
job.db_index);
- } else if (job.start_time) {
+ } else if(job.start_time) {
debug2("DBD_JOB_START: START CALL ID:%u NAME:%s INX:%u",
job_start_msg->job_id, job_start_msg->name,
job.db_index);
@@ -2573,7 +2573,7 @@ static void _process_job_start(slurmdbd_conn_t *slurmdbd_conn,
id_rc_msg->id = job.db_index;
/* just incase job.wckey was set because we didn't send one */
- if (!job_start_msg->wckey)
+ if(!job_start_msg->wckey)
xfree(job.wckey);
}
@@ -2622,21 +2622,21 @@ static int _register_ctld(slurmdbd_conn_t *slurmdbd_conn,
list_msg.my_list = acct_storage_g_modify_clusters(
slurmdbd_conn->db_conn, *uid, &cluster_q, &cluster);
- if (errno == EFAULT) {
+ if(errno == EFAULT) {
comment = "Request to register was incomplete";
rc = SLURM_ERROR;
- } else if (errno == ESLURM_ACCESS_DENIED) {
+ } else if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
- } else if (!list_msg.my_list || !list_count(list_msg.my_list)) {
+ } else if(!list_msg.my_list || !list_count(list_msg.my_list)) {
comment = "This cluster hasn't been added to accounting yet";
rc = SLURM_ERROR;
}
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
@@ -2684,7 +2684,7 @@ static int _remove_accounts(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_ACCOUNTS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
@@ -2707,23 +2707,23 @@ static int _remove_accounts(slurmdbd_conn_t *slurmdbd_conn,
return SLURM_ERROR;
}
- if (!(list_msg.my_list = acct_storage_g_remove_accounts(
+ if(!(list_msg.my_list = acct_storage_g_remove_accounts(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2739,7 +2739,7 @@ static int _remove_accounts(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2772,24 +2772,24 @@ static int _remove_account_coords(slurmdbd_conn_t *slurmdbd_conn,
* until we process it through the database.
*/
- if (!(list_msg.my_list = acct_storage_g_remove_coord(
+ if(!(list_msg.my_list = acct_storage_g_remove_coord(
slurmdbd_conn->db_conn, *uid, get_msg->acct_list,
get_msg->cond))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2806,7 +2806,7 @@ static int _remove_account_coords(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2837,23 +2837,23 @@ static int _remove_assocs(slurmdbd_conn_t *slurmdbd_conn,
* until we process it through the database.
*/
- if (!(list_msg.my_list = acct_storage_g_remove_associations(
+ if(!(list_msg.my_list = acct_storage_g_remove_associations(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2869,7 +2869,7 @@ static int _remove_assocs(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2886,7 +2886,7 @@ static int _remove_clusters(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_CLUSTERS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -2909,23 +2909,23 @@ static int _remove_clusters(slurmdbd_conn_t *slurmdbd_conn,
return SLURM_ERROR;
}
- if (!(list_msg.my_list = acct_storage_g_remove_clusters(
+ if(!(list_msg.my_list = acct_storage_g_remove_clusters(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -2941,7 +2941,7 @@ static int _remove_clusters(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -2957,7 +2957,7 @@ static int _remove_qos(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_QOS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -2980,23 +2980,23 @@ static int _remove_qos(slurmdbd_conn_t *slurmdbd_conn,
return SLURM_ERROR;
}
- if (!(list_msg.my_list = acct_storage_g_remove_qos(
+ if(!(list_msg.my_list = acct_storage_g_remove_qos(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -3012,7 +3012,7 @@ static int _remove_qos(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -3028,7 +3028,7 @@ static int _remove_users(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_USERS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
@@ -3051,23 +3051,23 @@ static int _remove_users(slurmdbd_conn_t *slurmdbd_conn,
return SLURM_ERROR;
}
- if (!(list_msg.my_list = acct_storage_g_remove_users(
+ if(!(list_msg.my_list = acct_storage_g_remove_users(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -3083,7 +3083,7 @@ static int _remove_users(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -3099,7 +3099,7 @@ static int _remove_wckeys(slurmdbd_conn_t *slurmdbd_conn,
debug2("DBD_REMOVE_WCKEYS: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_SUPER_USER) {
comment = "Your user doesn't have privilege to preform this action";
@@ -3122,23 +3122,23 @@ static int _remove_wckeys(slurmdbd_conn_t *slurmdbd_conn,
return SLURM_ERROR;
}
- if (!(list_msg.my_list = acct_storage_g_remove_wckeys(
+ if(!(list_msg.my_list = acct_storage_g_remove_wckeys(
slurmdbd_conn->db_conn, *uid, get_msg->cond))) {
- if (errno == ESLURM_ACCESS_DENIED) {
+ if(errno == ESLURM_ACCESS_DENIED) {
comment = "Your user doesn't have privilege to preform this action";
rc = ESLURM_ACCESS_DENIED;
- } else if (errno == SLURM_ERROR) {
+ } else if(errno == SLURM_ERROR) {
comment = "Something was wrong with your query";
rc = SLURM_ERROR;
- } else if (errno == SLURM_NO_CHANGE_IN_DATA) {
+ } else if(errno == SLURM_NO_CHANGE_IN_DATA) {
comment = "Request didn't affect anything";
rc = SLURM_SUCCESS;
- } else if (errno == ESLURM_DB_CONNECTION) {
+ } else if(errno == ESLURM_DB_CONNECTION) {
comment = slurm_strerror(errno);
rc = errno;
} else {
rc = errno;
- if (!(comment = slurm_strerror(errno)))
+ if(!(comment = slurm_strerror(errno)))
comment = "Unknown issue";
}
error("%s", comment);
@@ -3154,7 +3154,7 @@ static int _remove_wckeys(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_LIST, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_LIST, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return rc;
@@ -3202,7 +3202,7 @@ static int _roll_usage(slurmdbd_conn_t *slurmdbd_conn,
info("DBD_ROLL_USAGE: called");
- if ((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
+ if((*uid != slurmdbd_conf->slurm_user_id && *uid != 0)
&& assoc_mgr_get_admin_level(slurmdbd_conn->db_conn, *uid)
< SLURMDB_ADMIN_OPERATOR) {
comment = "Your user doesn't have privilege to preform this action";
@@ -3279,7 +3279,7 @@ static int _send_mult_job_start(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_MULT_JOB_START, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_MULT_JOB_START, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return SLURM_SUCCESS;
@@ -3323,7 +3323,7 @@ static int _send_mult_msg(slurmdbd_conn_t *slurmdbd_conn,
ret_buf = NULL;
rc = proc_req(slurmdbd_conn, get_buf_data(req_buf),
size_buf(req_buf), 0, &ret_buf, uid);
- if (ret_buf)
+ if(ret_buf)
list_append(list_msg.my_list, ret_buf);
if (rc != SLURM_SUCCESS)
break;
@@ -3336,7 +3336,7 @@ static int _send_mult_msg(slurmdbd_conn_t *slurmdbd_conn,
pack16((uint16_t) DBD_GOT_MULT_MSG, *out_buffer);
slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version,
DBD_GOT_MULT_MSG, *out_buffer);
- if (list_msg.my_list)
+ if(list_msg.my_list)
list_destroy(list_msg.my_list);
return SLURM_SUCCESS;
@@ -3393,7 +3393,7 @@ static int _step_complete(slurmdbd_conn_t *slurmdbd_conn,
rc = jobacct_storage_g_step_complete(slurmdbd_conn->db_conn, &step);
- if (rc && errno == 740) /* meaning data is already there */
+ if(rc && errno == 740) /* meaning data is already there */
rc = SLURM_SUCCESS;
/* just incase this gets set we need to clear it */
xfree(job.wckey);
@@ -3460,7 +3460,7 @@ static int _step_start(slurmdbd_conn_t *slurmdbd_conn,
rc = jobacct_storage_g_step_start(slurmdbd_conn->db_conn, &step);
- if (rc && errno == 740) /* meaning data is already there */
+ if(rc && errno == 740) /* meaning data is already there */
rc = SLURM_SUCCESS;
/* just incase this gets set we need to clear it */
diff --git a/src/slurmdbd/read_config.c b/src/slurmdbd/read_config.c
index 4a0cdd34463c3e4ba0dacb5e8f1dea49455d931c..42c4f4dfb7dc53338c526d8aa92814b76678e48b 100644
--- a/src/slurmdbd/read_config.c
+++ b/src/slurmdbd/read_config.c
@@ -191,7 +191,7 @@ extern int read_slurmdbd_conf(void)
conf_path);
}
- if (!s_p_get_string(&slurmdbd_conf->archive_dir, "ArchiveDir",
+ if(!s_p_get_string(&slurmdbd_conf->archive_dir, "ArchiveDir",
tbl))
slurmdbd_conf->archive_dir =
xstrdup(DEFAULT_SLURMDBD_ARCHIVE_DIR);
@@ -210,8 +210,8 @@ extern int read_slurmdbd_conf(void)
s_p_get_uint16(&slurmdbd_conf->dbd_port, "DbdPort", tbl);
s_p_get_uint16(&slurmdbd_conf->debug_level, "DebugLevel", tbl);
s_p_get_string(&slurmdbd_conf->default_qos, "DefaultQOS", tbl);
- if (s_p_get_uint32(&slurmdbd_conf->purge_job, "JobPurge", tbl)) {
- if (!slurmdbd_conf->purge_job)
+ if(s_p_get_uint32(&slurmdbd_conf->purge_job, "JobPurge", tbl)) {
+ if(!slurmdbd_conf->purge_job)
slurmdbd_conf->purge_job = NO_VAL;
else
slurmdbd_conf->purge_job |=
@@ -254,72 +254,72 @@ extern int read_slurmdbd_conf(void)
slurmdbd_conf->private_data = 0xffff;
xfree(temp_str);
}
- if (s_p_get_string(&temp_str, "PurgeEventAfter", tbl)) {
+ if(s_p_get_string(&temp_str, "PurgeEventAfter", tbl)) {
/* slurmdb_parse_purge will set SLURMDB_PURGE_FLAGS */
- if ((slurmdbd_conf->purge_event =
+ if((slurmdbd_conf->purge_event =
slurmdb_parse_purge(temp_str)) == NO_VAL) {
fatal("Bad value \"%s\" for PurgeEventAfter",
temp_str);
}
xfree(temp_str);
}
- if (s_p_get_string(&temp_str, "PurgeJobAfter", tbl)) {
+ if(s_p_get_string(&temp_str, "PurgeJobAfter", tbl)) {
/* slurmdb_parse_purge will set SLURMDB_PURGE_FLAGS */
- if ((slurmdbd_conf->purge_job =
+ if((slurmdbd_conf->purge_job =
slurmdb_parse_purge(temp_str)) == NO_VAL) {
fatal("Bad value \"%s\" for PurgeJobAfter",
temp_str);
}
xfree(temp_str);
}
- if (s_p_get_string(&temp_str, "PurgeStepAfter", tbl)) {
+ if(s_p_get_string(&temp_str, "PurgeStepAfter", tbl)) {
/* slurmdb_parse_purge will set SLURMDB_PURGE_FLAGS */
- if ((slurmdbd_conf->purge_step =
+ if((slurmdbd_conf->purge_step =
slurmdb_parse_purge(temp_str)) == NO_VAL) {
fatal("Bad value \"%s\" for PurgeStepAfter",
temp_str);
}
xfree(temp_str);
}
- if (s_p_get_string(&temp_str, "PurgeSuspendAfter", tbl)) {
+ if(s_p_get_string(&temp_str, "PurgeSuspendAfter", tbl)) {
/* slurmdb_parse_purge will set SLURMDB_PURGE_FLAGS */
- if ((slurmdbd_conf->purge_suspend =
+ if((slurmdbd_conf->purge_suspend =
slurmdb_parse_purge(temp_str)) == NO_VAL) {
fatal("Bad value \"%s\" for PurgeSuspendAfter",
temp_str);
}
xfree(temp_str);
}
- if (s_p_get_uint32(&slurmdbd_conf->purge_event,
+ if(s_p_get_uint32(&slurmdbd_conf->purge_event,
"PurgeEventMonths", tbl)) {
- if (!slurmdbd_conf->purge_event)
+ if(!slurmdbd_conf->purge_event)
slurmdbd_conf->purge_event = NO_VAL;
else
slurmdbd_conf->purge_event |=
SLURMDB_PURGE_MONTHS;
}
- if (s_p_get_uint32(&slurmdbd_conf->purge_job,
+ if(s_p_get_uint32(&slurmdbd_conf->purge_job,
"PurgeJobMonths", tbl)) {
- if (!slurmdbd_conf->purge_job)
+ if(!slurmdbd_conf->purge_job)
slurmdbd_conf->purge_job = NO_VAL;
else
slurmdbd_conf->purge_job |=
SLURMDB_PURGE_MONTHS;
}
- if (s_p_get_uint32(&slurmdbd_conf->purge_step,
+ if(s_p_get_uint32(&slurmdbd_conf->purge_step,
"PurgeStepMonths", tbl)) {
- if (!slurmdbd_conf->purge_step)
+ if(!slurmdbd_conf->purge_step)
slurmdbd_conf->purge_step = NO_VAL;
else
slurmdbd_conf->purge_step |=
SLURMDB_PURGE_MONTHS;
}
- if (s_p_get_uint32(&slurmdbd_conf->purge_suspend,
+ if(s_p_get_uint32(&slurmdbd_conf->purge_suspend,
"PurgeSuspendMonths", tbl)) {
- if (!slurmdbd_conf->purge_suspend)
+ if(!slurmdbd_conf->purge_suspend)
slurmdbd_conf->purge_suspend = NO_VAL;
else
slurmdbd_conf->purge_suspend
@@ -329,9 +329,9 @@ extern int read_slurmdbd_conf(void)
s_p_get_string(&slurmdbd_conf->slurm_user_name,
"SlurmUser", tbl);
- if (s_p_get_uint32(&slurmdbd_conf->purge_step,
+ if(s_p_get_uint32(&slurmdbd_conf->purge_step,
"StepPurge", tbl)) {
- if (!slurmdbd_conf->purge_step)
+ if(!slurmdbd_conf->purge_step)
slurmdbd_conf->purge_step = NO_VAL;
else
slurmdbd_conf->purge_step |=
@@ -353,17 +353,17 @@ extern int read_slurmdbd_conf(void)
s_p_get_string(&slurmdbd_conf->storage_user,
"StorageUser", tbl);
- if (!s_p_get_boolean((bool *)&slurmdbd_conf->track_wckey,
+ if(!s_p_get_boolean((bool *)&slurmdbd_conf->track_wckey,
"TrackWCKey", tbl))
slurmdbd_conf->track_wckey = false;
- if (a_events)
+ if(a_events)
slurmdbd_conf->purge_event |= SLURMDB_PURGE_ARCHIVE;
- if (a_jobs)
+ if(a_jobs)
slurmdbd_conf->purge_job |= SLURMDB_PURGE_ARCHIVE;
- if (a_steps)
+ if(a_steps)
slurmdbd_conf->purge_step |= SLURMDB_PURGE_ARCHIVE;
- if (a_suspend)
+ if(a_suspend)
slurmdbd_conf->purge_suspend |= SLURMDB_PURGE_ARCHIVE;
s_p_hashtbl_destroy(tbl);
@@ -383,7 +383,7 @@ extern int read_slurmdbd_conf(void)
slurmdbd_conf->pid_file = xstrdup(DEFAULT_SLURMDBD_PIDFILE);
if (slurmdbd_conf->dbd_port == 0)
slurmdbd_conf->dbd_port = SLURMDBD_PORT;
- if (slurmdbd_conf->plugindir == NULL)
+ if(slurmdbd_conf->plugindir == NULL)
slurmdbd_conf->plugindir = xstrdup(default_plugin_path);
if (slurmdbd_conf->slurm_user_name) {
uid_t pw_uid;
@@ -407,30 +407,30 @@ extern int read_slurmdbd_conf(void)
if (!slurmdbd_conf->storage_user)
slurmdbd_conf->storage_user = xstrdup(getlogin());
- if (!strcmp(slurmdbd_conf->storage_type,
+ if(!strcmp(slurmdbd_conf->storage_type,
"accounting_storage/mysql")) {
- if (!slurmdbd_conf->storage_port)
+ if(!slurmdbd_conf->storage_port)
slurmdbd_conf->storage_port = DEFAULT_MYSQL_PORT;
- if (!slurmdbd_conf->storage_loc)
+ if(!slurmdbd_conf->storage_loc)
slurmdbd_conf->storage_loc =
xstrdup(DEFAULT_ACCOUNTING_DB);
- } else if (!strcmp(slurmdbd_conf->storage_type,
+ } else if(!strcmp(slurmdbd_conf->storage_type,
"accounting_storage/pgsql")) {
- if (!slurmdbd_conf->storage_port)
+ if(!slurmdbd_conf->storage_port)
slurmdbd_conf->storage_port = DEFAULT_PGSQL_PORT;
- if (!slurmdbd_conf->storage_loc)
+ if(!slurmdbd_conf->storage_loc)
slurmdbd_conf->storage_loc =
xstrdup(DEFAULT_ACCOUNTING_DB);
} else {
- if (!slurmdbd_conf->storage_port)
+ if(!slurmdbd_conf->storage_port)
slurmdbd_conf->storage_port = DEFAULT_STORAGE_PORT;
- if (!slurmdbd_conf->storage_loc)
+ if(!slurmdbd_conf->storage_loc)
slurmdbd_conf->storage_loc =
xstrdup(DEFAULT_STORAGE_LOC);
}
if (slurmdbd_conf->archive_dir) {
- if (stat(slurmdbd_conf->archive_dir, &buf) < 0)
+ if(stat(slurmdbd_conf->archive_dir, &buf) < 0)
fatal("Failed to stat the archive directory %s: %m",
slurmdbd_conf->archive_dir);
if (!(buf.st_mode & S_IFDIR))
@@ -443,7 +443,7 @@ extern int read_slurmdbd_conf(void)
}
if (slurmdbd_conf->archive_script) {
- if (stat(slurmdbd_conf->archive_script, &buf) < 0)
+ if(stat(slurmdbd_conf->archive_script, &buf) < 0)
fatal("Failed to stat the archive script %s: %m",
slurmdbd_conf->archive_dir);
@@ -486,28 +486,28 @@ extern void log_config(void)
debug2("PrivateData = %s", tmp_str);
- if (slurmdbd_conf->purge_event != NO_VAL)
+ if(slurmdbd_conf->purge_event != NO_VAL)
slurmdb_purge_string(slurmdbd_conf->purge_event,
tmp_str, sizeof(tmp_str), 1);
else
sprintf(tmp_str, "NONE");
debug2("PurgeEventAfter = %s", tmp_str);
- if (slurmdbd_conf->purge_job != NO_VAL)
+ if(slurmdbd_conf->purge_job != NO_VAL)
slurmdb_purge_string(slurmdbd_conf->purge_job,
tmp_str, sizeof(tmp_str), 1);
else
sprintf(tmp_str, "NONE");
debug2("PurgeJobAfter = %s", tmp_str);
- if (slurmdbd_conf->purge_step != NO_VAL)
+ if(slurmdbd_conf->purge_step != NO_VAL)
slurmdb_purge_string(slurmdbd_conf->purge_step,
tmp_str, sizeof(tmp_str), 1);
else
sprintf(tmp_str, "NONE");
debug2("PurgeStepAfter = %s", tmp_str);
- if (slurmdbd_conf->purge_suspend != NO_VAL)
+ if(slurmdbd_conf->purge_suspend != NO_VAL)
slurmdb_purge_string(slurmdbd_conf->purge_suspend,
tmp_str, sizeof(tmp_str), 1);
else
@@ -701,7 +701,7 @@ extern List dump_config(void)
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PurgeEventAfter");
- if (slurmdbd_conf->purge_event != NO_VAL) {
+ if(slurmdbd_conf->purge_event != NO_VAL) {
key_pair->value = xmalloc(32);
slurmdb_purge_string(slurmdbd_conf->purge_event,
key_pair->value, 32, 1);
@@ -711,7 +711,7 @@ extern List dump_config(void)
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PurgeJobAfter");
- if (slurmdbd_conf->purge_job != NO_VAL) {
+ if(slurmdbd_conf->purge_job != NO_VAL) {
key_pair->value = xmalloc(32);
slurmdb_purge_string(slurmdbd_conf->purge_job,
key_pair->value, 32, 1);
@@ -721,7 +721,7 @@ extern List dump_config(void)
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PurgeStepAfter");
- if (slurmdbd_conf->purge_step != NO_VAL) {
+ if(slurmdbd_conf->purge_step != NO_VAL) {
key_pair->value = xmalloc(32);
slurmdb_purge_string(slurmdbd_conf->purge_step,
key_pair->value, 32, 1);
@@ -731,7 +731,7 @@ extern List dump_config(void)
key_pair = xmalloc(sizeof(config_key_pair_t));
key_pair->name = xstrdup("PurgeSuspendAfter");
- if (slurmdbd_conf->purge_suspend != NO_VAL) {
+ if(slurmdbd_conf->purge_suspend != NO_VAL) {
key_pair->value = xmalloc(32);
slurmdb_purge_string(slurmdbd_conf->purge_suspend,
key_pair->value, 32, 1);
diff --git a/src/slurmdbd/slurmdbd.c b/src/slurmdbd/slurmdbd.c
index 07834d1ca62ded0eaf105c9b2b56a77bb7b00bce..462e19312349a2fd0d3161f6f1c2d087ba5eab9e 100644
--- a/src/slurmdbd/slurmdbd.c
+++ b/src/slurmdbd/slurmdbd.c
@@ -154,10 +154,10 @@ int main(int argc, char *argv[])
/* If we are tacking wckey we need to cache
wckeys, if we aren't only cache the users and qos */
assoc_init_arg.cache_level = ASSOC_MGR_CACHE_USER | ASSOC_MGR_CACHE_QOS;
- if (slurmdbd_conf->track_wckey)
+ if(slurmdbd_conf->track_wckey)
assoc_init_arg.cache_level |= ASSOC_MGR_CACHE_WCKEY;
- if (assoc_mgr_init(db_conn, &assoc_init_arg) == SLURM_ERROR) {
+ if(assoc_mgr_init(db_conn, &assoc_init_arg) == SLURM_ERROR) {
error("Problem getting cache of data");
acct_storage_g_close_connection(&db_conn);
goto end_it;
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
have_control = false;
backup = true;
run_backup();
- if (!shutdown_time)
+ if(!shutdown_time)
assoc_mgr_refresh_lists(db_conn, NULL);
} else if (slurmdbd_conf->dbd_host &&
(!strcmp(slurmdbd_conf->dbd_host, node_name) ||
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
slurmdbd_conf->dbd_backup);
}
- if (!shutdown_time) {
+ if(!shutdown_time) {
/* Create attached thread to process incoming RPCs */
slurm_attr_init(&thread_attr);
if (pthread_create(&rpc_handler_thread, &thread_attr,
@@ -197,7 +197,7 @@ int main(int argc, char *argv[])
slurm_attr_destroy(&thread_attr);
}
- if (!shutdown_time) {
+ if(!shutdown_time) {
/* Create attached thread to do usage rollup */
slurm_attr_init(&thread_attr);
if (pthread_create(&rollup_handler_thread,
@@ -208,31 +208,31 @@ int main(int argc, char *argv[])
}
/* Daemon is fully operational here */
- if (!shutdown_time || primary_resumed) {
+ if(!shutdown_time || primary_resumed) {
shutdown_time = 0;
info("slurmdbd version %s started",
SLURM_VERSION_STRING);
- if (backup)
+ if(backup)
run_backup();
}
/* this is only ran if not backup */
- if (rollup_handler_thread)
+ if(rollup_handler_thread)
pthread_join(rollup_handler_thread, NULL);
- if (rpc_handler_thread)
+ if(rpc_handler_thread)
pthread_join(rpc_handler_thread, NULL);
- if (backup && primary_resumed) {
+ if(backup && primary_resumed) {
shutdown_time = 0;
info("Backup has given up control");
}
- if (shutdown_time)
+ if(shutdown_time)
break;
}
/* Daemon termination handled here */
- if (signal_handler_thread)
+ if(signal_handler_thread)
pthread_join(signal_handler_thread, NULL);
end_it:
@@ -451,10 +451,10 @@ static void _daemonize(void)
static void _rollup_handler_cancel()
{
- if (running_rollup)
+ if(running_rollup)
debug("Waiting for rollup thread to finish.");
slurm_mutex_lock(&rollup_lock);
- if (rollup_handler_thread)
+ if(rollup_handler_thread)
pthread_cancel(rollup_handler_thread);
slurm_mutex_unlock(&rollup_lock);
}
@@ -470,14 +470,14 @@ static void *_rollup_handler(void *db_conn)
(void) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
(void) pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
- if (!localtime_r(&start_time, &tm)) {
+ if(!localtime_r(&start_time, &tm)) {
fatal("Couldn't get localtime for rollup handler %d",
start_time);
return NULL;
}
while (1) {
- if (!db_conn)
+ if(!db_conn)
break;
/* run the roll up */
slurm_mutex_lock(&rollup_lock);
@@ -500,7 +500,7 @@ static void *_rollup_handler(void *db_conn)
sleep((next_time-start_time));
start_time = time(NULL);
- if (!localtime_r(&start_time, &tm)) {
+ if(!localtime_r(&start_time, &tm)) {
fatal("Couldn't get localtime for rollup handler %d",
start_time);
return NULL;
diff --git a/src/smap/configure_functions.c b/src/smap/configure_functions.c
index 41bbf3b1d19c110915f64ac1a5bc887c6a09dd89..4e207ad26112dbd669256cbad4f9ce52e350496f 100644
--- a/src/smap/configure_functions.c
+++ b/src/smap/configure_functions.c
@@ -101,7 +101,7 @@ static allocated_block_t *_make_request(ba_request_t *request)
return NULL;
} else {
char *pass = ba_passthroughs_string(request->deny_pass);
- if (pass) {
+ if(pass) {
sprintf(error_string,"THERE ARE PASSTHROUGHS IN "
"THIS ALLOCATION DIM %s!!!!!!!", pass);
xfree(pass);
@@ -130,20 +130,20 @@ static int _set_layout(char *com)
int len = strlen(com);
while(i<len) {
- if (!strncasecmp(com+i, "dynamic", 7)) {
+ if(!strncasecmp(com+i, "dynamic", 7)) {
layout_mode = "DYNAMIC";
break;
- } else if (!strncasecmp(com+i, "static", 6)) {
+ } else if(!strncasecmp(com+i, "static", 6)) {
layout_mode = "STATIC";
break;
- } else if (!strncasecmp(com+i, "overlap", 7)) {
+ } else if(!strncasecmp(com+i, "overlap", 7)) {
layout_mode = "OVERLAP";
break;
} else {
i++;
}
}
- if (i>=len) {
+ if(i>=len) {
sprintf(error_string,
"You didn't put in a mode that I recognized. \n"
"Please use (STATIC, OVERLAP, or DYNAMIC)\n");
@@ -160,13 +160,13 @@ static int _set_base_part_cnt(char *com)
int len = strlen(com);
while(i<len) {
- if (com[i] < 58 && com[i] > 47) {
+ if(com[i] < 58 && com[i] > 47) {
break;
} else {
i++;
}
}
- if (i>=len) {
+ if(i>=len) {
sprintf(error_string,
"I didn't notice the number you typed in\n");
return 0;
@@ -184,13 +184,13 @@ static int _set_nodecard_cnt(char *com)
int len = strlen(com);
while(i<len) {
- if (com[i] < 58 && com[i] > 47) {
+ if(com[i] < 58 && com[i] > 47) {
break;
} else {
i++;
}
}
- if (i>=len) {
+ if(i>=len) {
sprintf(error_string,
"I didn't notice the number you typed in\n");
return 0;
@@ -224,78 +224,78 @@ static int _create_allocation(char *com, List allocated_blocks)
request->avail_node_bitmap = NULL;
while(i<len) {
- if (!strncasecmp(com+i, "mesh", 4)) {
+ if(!strncasecmp(com+i, "mesh", 4)) {
request->conn_type=SELECT_MESH;
i+=4;
- } else if (!strncasecmp(com+i, "small", 5)) {
+ } else if(!strncasecmp(com+i, "small", 5)) {
request->conn_type = SELECT_SMALL;
i+=5;
- } else if (!strncasecmp(com+i, "deny", 4)) {
+ } else if(!strncasecmp(com+i, "deny", 4)) {
i+=4;
- if (strstr(com+i, "X"))
+ if(strstr(com+i, "X"))
request->deny_pass |= PASS_DENY_X;
- if (strstr(com+i, "Y"))
+ if(strstr(com+i, "Y"))
request->deny_pass |= PASS_DENY_Y;
- if (strstr(com+i, "Z"))
+ if(strstr(com+i, "Z"))
request->deny_pass |= PASS_DENY_Z;
- if (!strcasecmp(com+i, "ALL"))
+ if(!strcasecmp(com+i, "ALL"))
request->deny_pass |= PASS_DENY_ALL;
- } else if (!strncasecmp(com+i, "nodecard", 8)) {
+ } else if(!strncasecmp(com+i, "nodecard", 8)) {
small32=0;
i+=8;
- } else if (!strncasecmp(com+i, "quarter", 7)) {
+ } else if(!strncasecmp(com+i, "quarter", 7)) {
small128=0;
i+=7;
- } else if (!strncasecmp(com+i, "32CN", 4)) {
+ } else if(!strncasecmp(com+i, "32CN", 4)) {
small32=0;
i+=4;
- } else if (!strncasecmp(com+i, "128CN", 5)) {
+ } else if(!strncasecmp(com+i, "128CN", 5)) {
small128=0;
i+=5;
- } else if (!strncasecmp(com+i, "rotate", 6)) {
+ } else if(!strncasecmp(com+i, "rotate", 6)) {
request->rotate=true;
i+=6;
- } else if (!strncasecmp(com+i, "elongate", 8)) {
+ } else if(!strncasecmp(com+i, "elongate", 8)) {
request->elongate=true;
i+=8;
- } else if (!strncasecmp(com+i, "start", 5)) {
+ } else if(!strncasecmp(com+i, "start", 5)) {
request->start_req=1;
i+=5;
- } else if (request->start_req
+ } else if(request->start_req
&& starti<0
&& ((com[i] >= '0' && com[i] <= '9')
|| (com[i] >= 'A' && com[i] <= 'Z'))) {
starti=i;
i++;
- } else if (small32 == 0 && (com[i] >= '0' && com[i] <= '9')) {
+ } else if(small32 == 0 && (com[i] >= '0' && com[i] <= '9')) {
small32=i;
i++;
- } else if (small128 == 0 && (com[i] >= '0' && com[i] <= '9')) {
+ } else if(small128 == 0 && (com[i] >= '0' && com[i] <= '9')) {
small128=i;
i++;
}
#ifndef HAVE_BGL
- else if (!strncasecmp(com+i, "16CN", 4)) {
+ else if(!strncasecmp(com+i, "16CN", 4)) {
small16=0;
i+=4;
- } else if (!strncasecmp(com+i, "64CN", 4)) {
+ } else if(!strncasecmp(com+i, "64CN", 4)) {
small64=0;
i+=4;
- } else if (!strncasecmp(com+i, "256CN", 5)) {
+ } else if(!strncasecmp(com+i, "256CN", 5)) {
small256=0;
i+=5;
- } else if (small16 == 0 && (com[i] >= '0' && com[i] <= '9')) {
+ } else if(small16 == 0 && (com[i] >= '0' && com[i] <= '9')) {
small16=i;
i++;
- } else if (small64 == 0 && (com[i] >= '0' && com[i] <= '9')) {
+ } else if(small64 == 0 && (com[i] >= '0' && com[i] <= '9')) {
small64=i;
i++;
- } else if (small256 == 0 && (com[i] >= '0' && com[i] <= '9')) {
+ } else if(small256 == 0 && (com[i] >= '0' && com[i] <= '9')) {
small256=i;
i++;
}
#endif
- else if (geoi<0 && ((com[i] >= '0' && com[i] <= '9')
+ else if(geoi<0 && ((com[i] >= '0' && com[i] <= '9')
|| (com[i] >= 'A' && com[i] <= 'Z'))) {
geoi=i;
i++;
@@ -305,35 +305,35 @@ static int _create_allocation(char *com, List allocated_blocks)
}
- if (request->conn_type == SELECT_SMALL) {
+ if(request->conn_type == SELECT_SMALL) {
int total = 512;
#ifndef HAVE_BGL
- if (small16 > 0) {
+ if(small16 > 0) {
request->small16 = atoi(&com[small16]);
total -= request->small16 * 16;
}
- if (small64 > 0) {
+ if(small64 > 0) {
request->small64 = atoi(&com[small64]);
total -= request->small64 * 64;
}
- if (small256 > 0) {
+ if(small256 > 0) {
request->small256 = atoi(&com[small256]);
total -= request->small256 * 256;
}
#endif
- if (small32 > 0) {
+ if(small32 > 0) {
request->small32 = atoi(&com[small32]);
total -= request->small32 * 32;
}
- if (small128 > 0) {
+ if(small128 > 0) {
request->small128 = atoi(&com[small128]);
total -= request->small128 * 128;
}
- if (total < 0) {
+ if(total < 0) {
sprintf(error_string,
"You asked for %d more nodes than "
"are in a Midplane\n", total * 2);
@@ -343,19 +343,19 @@ static int _create_allocation(char *com, List allocated_blocks)
#ifndef HAVE_BGL
while(total > 0) {
- if (total >= 256) {
+ if(total >= 256) {
request->small256++;
total -= 256;
- } else if (total >= 128) {
+ } else if(total >= 128) {
request->small128++;
total -= 128;
- } else if (total >= 64) {
+ } else if(total >= 64) {
request->small64++;
total -= 64;
- } else if (total >= 32) {
+ } else if(total >= 32) {
request->small32++;
total -= 32;
- } else if (total >= 16) {
+ } else if(total >= 16) {
request->small16++;
total -= 16;
} else
@@ -363,10 +363,10 @@ static int _create_allocation(char *com, List allocated_blocks)
}
#else
while(total > 0) {
- if (total >= 128) {
+ if(total >= 128) {
request->small128++;
total -= 128;
- } else if (total >= 32) {
+ } else if(total >= 32) {
request->small32++;
total -= 32;
} else
@@ -381,24 +381,24 @@ static int _create_allocation(char *com, List allocated_blocks)
/* request->small256); */
}
- if (geoi<0 && !request->size) {
+ if(geoi<0 && !request->size) {
memset(error_string,0,255);
sprintf(error_string,
"No size or dimension specified, please re-enter");
} else {
i2=geoi;
while(i2<len) {
- if (request->size)
+ if(request->size)
break;
- if (com[i2]==' ' || i2==(len-1)) {
+ if(com[i2]==' ' || i2==(len-1)) {
/* for size */
request->size = atoi(&com[geoi]);
break;
}
- if (com[i2]=='x') {
+ if(com[i2]=='x') {
diff = i2-geoi;
/* for geometery */
- if (diff>1) {
+ if(diff>1) {
request->geometry[X] =
xstrntol(&com[geoi],
NULL, diff,
@@ -414,10 +414,10 @@ static int _create_allocation(char *com, List allocated_blocks)
while(com[geoi-1]!='x' && geoi<len)
geoi++;
- if (geoi==len)
+ if(geoi==len)
goto geo_error_message;
diff = geoi - diff;
- if (diff>1) {
+ if(diff>1) {
request->geometry[Y] =
xstrntol(&com[geoi],
NULL, diff,
@@ -432,11 +432,11 @@ static int _create_allocation(char *com, List allocated_blocks)
diff = geoi;
while(com[geoi-1]!='x' && geoi<len)
geoi++;
- if (geoi==len)
+ if(geoi==len)
goto geo_error_message;
diff = geoi - diff;
- if (diff>1) {
+ if(diff>1) {
request->geometry[Z] =
xstrntol(&com[geoi],
NULL, diff,
@@ -453,12 +453,12 @@ static int _create_allocation(char *com, List allocated_blocks)
i2++;
}
- if (request->start_req) {
+ if(request->start_req) {
i2 = starti;
while(com[i2]!='x' && i2<len)
i2++;
diff = i2-starti;
- if (diff>1) {
+ if(diff>1) {
request->start[X] = xstrntol(&com[starti],
NULL, diff,
10);
@@ -469,7 +469,7 @@ static int _create_allocation(char *com, List allocated_blocks)
cluster_base);
}
starti += diff;
- if (starti==len)
+ if(starti==len)
goto start_request;
starti++;
@@ -478,7 +478,7 @@ static int _create_allocation(char *com, List allocated_blocks)
i2++;
diff = i2-starti;
- if (diff>1) {
+ if(diff>1) {
request->start[Y] = xstrntol(&com[starti],
NULL, diff,
10);
@@ -488,7 +488,7 @@ static int _create_allocation(char *com, List allocated_blocks)
params.cluster_base);
}
starti += diff;
- if (starti==len)
+ if(starti==len)
goto start_request;
starti++;
@@ -497,7 +497,7 @@ static int _create_allocation(char *com, List allocated_blocks)
i2++;
diff = i2-starti;
- if (diff>1) {
+ if(diff>1) {
request->start[Z] = xstrntol(&com[starti],
NULL, diff,
10);
@@ -509,7 +509,7 @@ static int _create_allocation(char *com, List allocated_blocks)
}
}
start_request:
- if (!strcasecmp(layout_mode,"OVERLAP"))
+ if(!strcasecmp(layout_mode,"OVERLAP"))
reset_ba_system(true);
/*
@@ -517,9 +517,9 @@ static int _create_allocation(char *com, List allocated_blocks)
It will send a request back which we will throw into
a list just incase we change something later.
*/
- if (!new_ba_request(request)) {
+ if(!new_ba_request(request)) {
memset(error_string,0,255);
- if (request->size!=-1) {
+ if(request->size!=-1) {
sprintf(error_string,
"Problems with request for %d\n"
"Either you put in something "
@@ -538,7 +538,7 @@ static int _create_allocation(char *com, List allocated_blocks)
request->geometry[1],
request->geometry[2]);
} else {
- if ((allocated_block = _make_request(request)) != NULL)
+ if((allocated_block = _make_request(request)) != NULL)
list_append(allocated_blocks,
allocated_block);
else {
@@ -577,11 +577,11 @@ static int _resolve(char *com)
#endif
while(com[i] != '\0') {
- if ((i>0) && (com[i-1] != ' '))
+ if((i>0) && (com[i-1] != ' '))
break;
i++;
}
- if (com[i] == 'r')
+ if(com[i] == 'r')
com[i] = 'R';
memset(error_string,0,255);
@@ -591,14 +591,14 @@ static int _resolve(char *com)
goto resolve_error;
}
- if (len-i<3) {
+ if(len-i<3) {
sprintf(error_string, "Must enter 3 coords to resolve.\n");
goto resolve_error;
}
- if (com[i] != 'R') {
+ if(com[i] != 'R') {
rack_mid = find_bp_rack_mid(com+i);
- if (rack_mid)
+ if(rack_mid)
sprintf(error_string,
"X=%c Y=%c Z=%c resolves to %s\n",
com[X+i],com[Y+i],com[Z+i], rack_mid);
@@ -610,7 +610,7 @@ static int _resolve(char *com)
} else {
coord = find_bp_loc(com+i);
- if (coord)
+ if(coord)
sprintf(error_string,
"%s resolves to X=%d Y=%d Z=%d\n",
com+i,coord[X],coord[Y],coord[Z]);
@@ -633,7 +633,7 @@ static int _change_state_all_bps(char *com, int state)
char allnodes[50];
memset(allnodes,0,50);
- if (params.cluster_dims == 3)
+ if(params.cluster_dims == 3)
sprintf(allnodes, "000x%c%c%c",
alpha_num[DIM_SIZE[X]-1], alpha_num[DIM_SIZE[Y]-1],
alpha_num[DIM_SIZE[Z]-1]);
@@ -656,7 +656,7 @@ static int _change_state_bps(char *com, int state)
char *c_state = "up";
char *p = '\0';
- if (state == NODE_STATE_DOWN) {
+ if(state == NODE_STATE_DOWN) {
letter = '#';
opposite = '.';
used = true;
@@ -666,7 +666,7 @@ static int _change_state_bps(char *com, int state)
&& (com[i] < '0' || com[i] > 'Z'
|| (com[i] > '9' && com[i] < 'A')))
i++;
- if (i>(len-1)) {
+ if(i>(len-1)) {
memset(error_string,0,255);
sprintf(error_string,
"You didn't specify any nodes to make %s. "
@@ -675,7 +675,7 @@ static int _change_state_bps(char *com, int state)
return 0;
}
- if (params.cluster_dims == 1) {
+ if(params.cluster_dims == 1) {
if ((com[i+3] == 'x')
|| (com[i+3] == '-')) {
start[X] = xstrntol(com + i, NULL,
@@ -691,7 +691,7 @@ static int _change_state_bps(char *com, int state)
params.cluster_base);
}
- if ((start[X]>end[X])
+ if((start[X]>end[X])
|| (start[X]<0)
|| (end[X]>DIM_SIZE[X]-1))
goto error_message;
@@ -747,7 +747,7 @@ static int _change_state_bps(char *com, int state)
number, start, params.cluster_dims,
params.cluster_base);
}
- if ((start[X]>end[X]
+ if((start[X]>end[X]
|| start[Y]>end[Y]
|| start[Z]>end[Z])
|| (start[X]<0
@@ -761,7 +761,7 @@ static int _change_state_bps(char *com, int state)
for(x=start[X];x<=end[X];x++) {
for(y=start[Y];y<=end[Y];y++) {
for(z=start[Z];z<=end[Z];z++) {
- if (ba_system_ptr->grid[x][y][z].letter
+ if(ba_system_ptr->grid[x][y][z].letter
!= opposite)
continue;
ba_system_ptr->grid[x][y][z].color = 0;
@@ -773,7 +773,7 @@ static int _change_state_bps(char *com, int state)
return 1;
error_message:
memset(error_string,0,255);
- if (params.cluster_dims == 1) {
+ if(params.cluster_dims == 1) {
sprintf(error_string,
"Problem with nodes, specified range was %d-%d",
start[X],end[X]);
@@ -807,7 +807,7 @@ static int _remove_allocation(char *com, List allocated_blocks)
i++;
}
- if (i>(len-1)) {
+ if(i>(len-1)) {
memset(error_string,0,255);
sprintf(error_string,
"You need to specify which letter to delete.");
@@ -816,8 +816,8 @@ static int _remove_allocation(char *com, List allocated_blocks)
letter = com[i];
results_i = list_iterator_create(allocated_blocks);
while((allocated_block = list_next(results_i)) != NULL) {
- if (found) {
- if (redo_block(allocated_block->nodes,
+ if(found) {
+ if(redo_block(allocated_block->nodes,
allocated_block->
request->geometry,
allocated_block->
@@ -833,7 +833,7 @@ static int _remove_allocation(char *com, List allocated_blocks)
allocated_block->color =
colors[color_count%6];
- } else if (allocated_block->letter == letter) {
+ } else if(allocated_block->letter == letter) {
found=1;
remove_block(allocated_block->nodes,
color_count,
@@ -866,16 +866,16 @@ static int _alter_allocation(char *com, List allocated_blocks)
/* while(com[i-1]!=' ' && i<len) { */
/* i++; */
/* } */
-/* if (!strncasecmp(com+i, "mesh", 4)) { */
+/* if(!strncasecmp(com+i, "mesh", 4)) { */
/* torus=SELECT_MESH; */
/* i+=4; */
-/* } else if (!strncasecmp(com+i, "rotate", 6)) { */
+/* } else if(!strncasecmp(com+i, "rotate", 6)) { */
/* rotate=true; */
/* i+=6; */
-/* } else if (!strncasecmp(com+i, "elongate", 8)) { */
+/* } else if(!strncasecmp(com+i, "elongate", 8)) { */
/* elongate=true; */
/* i+=8; */
-/* } else if (com[i] < 58 && com[i] > 47) { */
+/* } else if(com[i] < 58 && com[i] > 47) { */
/* i2=i; */
/* i++; */
/* } else { */
@@ -903,20 +903,20 @@ static int _copy_allocation(char *com, List allocated_blocks)
while(com[i-1]!=' ' && i<len)
i++;
- if (i<=len) {
+ if(i<=len) {
/* Here we are looking for a real number for the count
instead of the params.cluster_base so atoi is ok
*/
- if (com[i]>='0' && com[i]<='9')
+ if(com[i]>='0' && com[i]<='9')
count = atoi(com+i);
else {
letter = com[i];
i++;
- if (com[i]!='\n') {
+ if(com[i]!='\n') {
while(com[i-1]!=' ' && i<len)
i++;
- if (com[i]>='0' && com[i]<='9')
+ if(com[i]>='0' && com[i]<='9')
count = atoi(com+i);
}
}
@@ -925,16 +925,16 @@ static int _copy_allocation(char *com, List allocated_blocks)
results_i = list_iterator_create(allocated_blocks);
while((allocated_block = list_next(results_i)) != NULL) {
temp_block = allocated_block;
- if (allocated_block->letter != letter)
+ if(allocated_block->letter != letter)
continue;
break;
}
list_iterator_destroy(results_i);
- if (!letter)
+ if(!letter)
allocated_block = temp_block;
- if (!allocated_block) {
+ if(!allocated_block) {
memset(error_string,0,255);
sprintf(error_string,
"Could not find requested record to copy");
@@ -976,7 +976,7 @@ static int _copy_allocation(char *com, List allocated_blocks)
}
list_iterator_destroy(results_i);
- if ((allocated_block = _make_request(request)) == NULL) {
+ if((allocated_block = _make_request(request)) == NULL) {
memset(error_string,0,255);
sprintf(error_string,
"Problem with the copy\n"
@@ -1005,7 +1005,7 @@ static int _save_allocation(char *com, List allocated_blocks)
ListIterator results_i;
memset(filename,0,50);
- if (len>5)
+ if(len>5)
while(i<len) {
while(com[i-1]!=' ' && i<len) {
@@ -1017,7 +1017,7 @@ static int _save_allocation(char *com, List allocated_blocks)
j++;
}
}
- if (filename[0]=='\0') {
+ if(filename[0]=='\0') {
time_t now_time = time(NULL);
sprintf(filename,"bluegene.conf.%ld",
(long int) now_time);
@@ -1067,7 +1067,7 @@ static int _save_allocation(char *com, List allocated_blocks)
base_part_node_cnt);
xstrfmtcat(save_string, "NodeCardNodeCnt=%d\n",
nodecard_node_cnt);
- if (!list_count(allocated_blocks))
+ if(!list_count(allocated_blocks))
xstrcat(save_string, "LayoutMode=DYNAMIC\n");
else {
xstrfmtcat(save_string, "LayoutMode=%s\n", layout_mode);
@@ -1075,9 +1075,9 @@ static int _save_allocation(char *com, List allocated_blocks)
}
results_i = list_iterator_create(allocated_blocks);
while((allocated_block = list_next(results_i)) != NULL) {
- if (allocated_block->request->conn_type == SELECT_TORUS)
+ if(allocated_block->request->conn_type == SELECT_TORUS)
conn_type = "TORUS";
- else if (allocated_block->request->conn_type
+ else if(allocated_block->request->conn_type
== SELECT_MESH)
conn_type = "MESH";
else {
@@ -1103,7 +1103,7 @@ static int _save_allocation(char *com, List allocated_blocks)
xstrfmtcat(save_string, "BPs=%s Type=%s",
allocated_block->request->save_name,
conn_type);
- if (extra) {
+ if(extra) {
xstrfmtcat(save_string, "%s\n", extra);
xfree(extra);
} else
@@ -1163,11 +1163,11 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
}
nodes = blockreq->block;
- if (!nodes)
+ if(!nodes)
return SLURM_SUCCESS;
len = strlen(nodes);
while (nodes[j] != '\0') {
- if (j > len)
+ if(j > len)
break;
else if ((nodes[j] == '[' || nodes[j] == ',')
&& (nodes[j+8] == ']' || nodes[j+8] == ',')
@@ -1186,7 +1186,7 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
params.cluster_base);
j += 3;
diff = end[X]-start[X];
- if (diff > largest_diff) {
+ if(diff > largest_diff) {
start1[X] = start[X];
start1[Y] = start[Y];
start1[Z] = start[Z];
@@ -1194,24 +1194,24 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
for (x = start[X]; x <= end[X]; x++)
for (y = start[Y]; y <= end[Y]; y++)
for (z = start[Z]; z <= end[Z]; z++) {
- if (x>end1[X]) {
+ if(x>end1[X]) {
geo[X]++;
end1[X] = x;
}
- if (y>end1[Y]) {
+ if(y>end1[Y]) {
geo[Y]++;
end1[Y] = y;
}
- if (z>end1[Z]) {
+ if(z>end1[Z]) {
geo[Z]++;
end1[Z] = z;
}
bp_count++;
}
- if (nodes[j] != ',')
+ if(nodes[j] != ',')
break;
j--;
- } else if ((nodes[j] >= '0' && nodes[j] <= '9')
+ } else if((nodes[j] >= '0' && nodes[j] <= '9')
|| (nodes[j] >= 'A' && nodes[j] <= 'Z')) {
number = xstrntol(nodes + j, &p, params.cluster_dims,
params.cluster_base);
@@ -1220,25 +1220,25 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
params.cluster_base);
j+=3;
diff = 0;
- if (diff > largest_diff) {
+ if(diff > largest_diff) {
start1[X] = start[X];
start1[Y] = start[Y];
start1[Z] = start[Z];
}
- if (start[X]>end1[X]) {
+ if(start[X]>end1[X]) {
geo[X]++;
end1[X] = start[X];
}
- if (start[Y]>end1[Y]) {
+ if(start[Y]>end1[Y]) {
geo[Y]++;
end1[Y] = start[Y];
}
- if (start[Z]>end1[Z]) {
+ if(start[Z]>end1[Z]) {
geo[Z]++;
end1[Z] = start[Z];
}
bp_count++;
- if (nodes[j] != ',')
+ if(nodes[j] != ',')
break;
j--;
}
@@ -1250,7 +1250,7 @@ static int _add_bg_record(blockreq_t *blockreq, List allocated_blocks)
geo[X], geo[Y], geo[Z], conn_type,
start1[X], start1[Y], start1[Z],
blockreq->small32, blockreq->small128);
- if (!strcasecmp(layout_mode, "OVERLAP"))
+ if(!strcasecmp(layout_mode, "OVERLAP"))
reset_ba_system(false);
set_all_bps_except(nodes);
@@ -1274,7 +1274,7 @@ static int _load_configuration(char *com, List allocated_blocks)
allocated_blocks = list_create(NULL);
memset(filename,0,100);
- if (len>5)
+ if(len>5)
while(i<len) {
while(com[i-1]!=' ' && i<len) {
i++;
@@ -1283,7 +1283,7 @@ static int _load_configuration(char *com, List allocated_blocks)
filename[j] = com[i];
i++;
j++;
- if (j>100) {
+ if(j>100) {
memset(error_string,0,255);
sprintf(error_string,
"filename is too long needs "
@@ -1293,12 +1293,12 @@ static int _load_configuration(char *com, List allocated_blocks)
}
}
- if (filename[0]=='\0') {
+ if(filename[0]=='\0') {
sprintf(filename,"bluegene.conf");
}
tbl = s_p_hashtbl_create(bg_conf_file_options);
- if (s_p_parse_file(tbl, NULL, filename) == SLURM_ERROR) {
+ if(s_p_parse_file(tbl, NULL, filename) == SLURM_ERROR) {
memset(error_string,0,255);
sprintf(error_string, "ERROR: couldn't open/read %s",
filename);
@@ -1315,7 +1315,7 @@ static int _load_configuration(char *com, List allocated_blocks)
xfree(layout);
}
- if (strcasecmp(layout_mode, "DYNAMIC")) {
+ if(strcasecmp(layout_mode, "DYNAMIC")) {
if (!s_p_get_array((void ***)&blockreq_array,
&count, "BPs", tbl)) {
memset(error_string,0,255);
@@ -1397,7 +1397,7 @@ static void _print_text_command(allocated_block_t *allocated_block)
mvwprintw(text_win, main_ycord,
main_xcord, "%c", allocated_block->letter);
main_xcord += 4;
- if (allocated_block->request->conn_type==SELECT_TORUS)
+ if(allocated_block->request->conn_type==SELECT_TORUS)
mvwprintw(text_win, main_ycord,
main_xcord, "TORUS");
else if (allocated_block->request->conn_type==SELECT_MESH)
@@ -1408,7 +1408,7 @@ static void _print_text_command(allocated_block_t *allocated_block)
main_xcord, "SMALL");
main_xcord += 7;
- if (allocated_block->request->rotate)
+ if(allocated_block->request->rotate)
mvwprintw(text_win, main_ycord,
main_xcord, "Y");
else
@@ -1416,7 +1416,7 @@ static void _print_text_command(allocated_block_t *allocated_block)
main_xcord, "N");
main_xcord += 7;
- if (allocated_block->request->elongate)
+ if(allocated_block->request->elongate)
mvwprintw(text_win, main_ycord,
main_xcord, "Y");
else
@@ -1428,7 +1428,7 @@ static void _print_text_command(allocated_block_t *allocated_block)
main_xcord, "%d", allocated_block->request->size);
main_xcord += 10;
- if (allocated_block->request->conn_type == SELECT_SMALL) {
+ if(allocated_block->request->conn_type == SELECT_SMALL) {
#ifndef HAVE_BGL
mvwprintw(text_win, main_ycord,
main_xcord, "%d",
@@ -1486,7 +1486,7 @@ void get_command(void)
List allocated_blocks;
ListIterator results_i;
- if (params.commandline) {
+ if(params.commandline) {
printf("Configure won't work with commandline mode.\n");
printf("Please remove the -c from the commandline.\n");
ba_fini();
@@ -1510,10 +1510,10 @@ void get_command(void)
if (!params.no_header)
_print_header_command();
- if (error_string!=NULL) {
+ if(error_string!=NULL) {
i=0;
while(error_string[i]!='\0') {
- if (error_string[i]=='\n') {
+ if(error_string[i]=='\n') {
main_ycord++;
main_xcord=1;
i++;
@@ -1534,11 +1534,11 @@ void get_command(void)
count = list_count(allocated_blocks)
- (LINES-(main_ycord+5));
- if (count<0)
+ if(count<0)
count=0;
i=0;
while((allocated_block = list_next(results_i)) != NULL) {
- if (i>=count)
+ if(i>=count)
_print_text_command(allocated_block);
i++;
}
diff --git a/src/smap/grid_functions.c b/src/smap/grid_functions.c
index 889aa704663dae3e071da9d47abe68a8f5536c56..1e353a582f7b6b95ec2712f42d76cbe8a278e3ac 100644
--- a/src/smap/grid_functions.c
+++ b/src/smap/grid_functions.c
@@ -63,11 +63,11 @@ extern int set_grid_name(char *nodes, int count)
if (!nodes)
return 1;
- if (params.cluster_dims == 4) {
+ if(params.cluster_dims == 4) {
/* FIX ME: smap doesn't do anything correctly with
more than 3 dims yet.
*/
- } else if (params.cluster_dims == 3) {
+ } else if(params.cluster_dims == 3) {
hl = hostlist_create(nodes);
while ((node = hostlist_shift(hl))) {
i = strlen(node);
@@ -148,7 +148,7 @@ extern int set_grid_bg(int *start, int *end, int count, int set)
block if the set flag is specified
or if the letter hasn't been set yet
*/
- if (set
+ if(set
|| ((ba_system_ptr->grid[x][y][z].letter
== '.')
&& (ba_system_ptr->grid[x][y][z].letter
@@ -223,7 +223,7 @@ bitstr_t *get_requested_node_bitmap()
int i = 0;
node_info_t *node_ptr = NULL;
- if (!params.hl)
+ if(!params.hl)
return NULL;
if (old_node_ptr) {
@@ -238,7 +238,7 @@ bitstr_t *get_requested_node_bitmap()
error_code = slurm_load_node((time_t) NULL, &new_node_ptr,
SHOW_ALL);
- if (bitmap)
+ if(bitmap)
FREE_NULL_BITMAP(bitmap);
if (error_code) {
@@ -251,7 +251,7 @@ bitstr_t *get_requested_node_bitmap()
bitmap = bit_alloc(old_node_ptr->record_count);
for(i=0; i<old_node_ptr->record_count; i++) {
node_ptr = &(old_node_ptr->node_array[i]);
- if (hostlist_find(params.hl, node_ptr->name) != -1)
+ if(hostlist_find(params.hl, node_ptr->name) != -1)
bit_set(bitmap, i);
}
return bitmap;
diff --git a/src/smap/job_functions.c b/src/smap/job_functions.c
index 84428621427a27bc760ae8f5280506b30e9e91ec..85af0b0eca380d144d482eedce80bcc49f56f2ea 100644
--- a/src/smap/job_functions.c
+++ b/src/smap/job_functions.c
@@ -60,10 +60,10 @@ extern void get_job(void)
bitstr_t *nodes_req = NULL;
static uint16_t last_flags = 0;
- if (params.all_flag)
+ if(params.all_flag)
show_flags |= SHOW_ALL;
if (job_info_ptr) {
- if (show_flags != last_flags)
+ if(show_flags != last_flags)
job_info_ptr->last_update = 0;
error_code = slurm_load_jobs(job_info_ptr->last_update,
&new_job_ptr, show_flags);
@@ -80,7 +80,7 @@ extern void get_job(void)
last_flags = show_flags;
if (error_code) {
if (quiet_flag != 1) {
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win,
main_ycord, 1,
"slurm_load_job: %s",
@@ -101,27 +101,27 @@ extern void get_job(void)
else
recs = 0;
- if (!params.commandline)
- if ((text_line_cnt+printed_jobs) > count)
+ if(!params.commandline)
+ if((text_line_cnt+printed_jobs) > count)
text_line_cnt--;
printed_jobs = 0;
count = 0;
- if (params.hl)
+ if(params.hl)
nodes_req = get_requested_node_bitmap();
for (i = 0; i < recs; i++) {
job_ptr = &(new_job_ptr->job_array[i]);
- if (!IS_JOB_PENDING(job_ptr) && !IS_JOB_RUNNING(job_ptr)
+ if(!IS_JOB_PENDING(job_ptr) && !IS_JOB_RUNNING(job_ptr)
&& !IS_JOB_SUSPENDED(job_ptr)
&& !IS_JOB_COMPLETING(job_ptr))
continue; /* job has completed */
- if (nodes_req) {
+ if(nodes_req) {
int overlap = 0;
bitstr_t *loc_bitmap = bit_alloc(bit_size(nodes_req));
inx2bitstr(loc_bitmap, job_ptr->node_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if (!overlap)
+ if(!overlap)
continue;
}
@@ -137,8 +137,8 @@ extern void get_job(void)
j += 2;
}
- if (!params.commandline) {
- if ((count>=text_line_cnt)
+ if(!params.commandline) {
+ if((count>=text_line_cnt)
&& (printed_jobs
< (text_win->_maxy-3))) {
job_ptr->num_cpus =
@@ -156,7 +156,7 @@ extern void get_job(void)
}
count++;
}
- if (count==128)
+ if(count==128)
count=0;
}
@@ -166,8 +166,8 @@ extern void get_job(void)
if (!IS_JOB_PENDING(job_ptr))
continue; /* job has completed */
- if (!params.commandline) {
- if ((count>=text_line_cnt)
+ if(!params.commandline) {
+ if((count>=text_line_cnt)
&& (printed_jobs
< (text_win->_maxy-3))) {
xfree(job_ptr->nodes);
@@ -189,14 +189,14 @@ extern void get_job(void)
}
count++;
- if (count==128)
+ if(count==128)
count=0;
}
if (params.commandline && params.iterate)
printf("\n");
- if (!params.commandline)
+ if(!params.commandline)
main_ycord++;
job_info_ptr = new_job_ptr;
@@ -205,7 +205,7 @@ extern void get_job(void)
static void _print_header_job(void)
{
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win, main_ycord,
main_xcord, "ID");
main_xcord += 3;
@@ -215,12 +215,12 @@ static void _print_header_job(void)
mvwprintw(text_win, main_ycord,
main_xcord, "PARTITION");
main_xcord += 10;
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
mvwprintw(text_win, main_ycord,
main_xcord, "BG_BLOCK");
main_xcord += 18;
}
- if (params.cluster_flags & CLUSTER_FLAG_CRAYXT) {
+ if(params.cluster_flags & CLUSTER_FLAG_CRAYXT) {
mvwprintw(text_win, main_ycord,
main_xcord, "RESV_ID");
main_xcord += 18;
@@ -240,7 +240,7 @@ static void _print_header_job(void)
mvwprintw(text_win, main_ycord,
main_xcord, "NODES");
main_xcord += 6;
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
mvwprintw(text_win, main_ycord,
main_xcord, "BP_LIST");
else
@@ -251,14 +251,14 @@ static void _print_header_job(void)
} else {
printf(" JOBID ");
printf("PARTITION ");
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
printf(" BG_BLOCK ");
printf(" USER ");
printf(" NAME ");
printf("ST ");
printf(" TIME ");
printf("NODES ");
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
printf("BP_LIST\n");
else
printf("NODELIST\n");
@@ -279,14 +279,14 @@ static int _print_text_job(job_info_t * job_ptr)
char *ionodes = NULL, *uname;
time_t now_time = time(NULL);
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&node_cnt);
- if (!strcasecmp(job_ptr->nodes,"waiting..."))
+ if(!strcasecmp(job_ptr->nodes,"waiting..."))
xfree(ionodes);
} else
node_cnt = job_ptr->num_nodes;
@@ -294,13 +294,13 @@ static int _print_text_job(job_info_t * job_ptr)
if ((node_cnt == 0) || (node_cnt == NO_VAL))
node_cnt = _get_node_cnt(job_ptr);
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)node_cnt, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
else
snprintf(tmp_cnt, sizeof(tmp_cnt), "%d", node_cnt);
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win, main_ycord,
main_xcord, "%c", job_ptr->num_cpus);
main_xcord += 3;
@@ -310,7 +310,7 @@ static int _print_text_job(job_info_t * job_ptr)
mvwprintw(text_win, main_ycord,
main_xcord, "%.10s", job_ptr->partition);
main_xcord += 10;
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
mvwprintw(text_win, main_ycord,
main_xcord, "%.16s",
select_g_select_jobinfo_sprint(
@@ -320,7 +320,7 @@ static int _print_text_job(job_info_t * job_ptr)
SELECT_PRINT_BG_ID));
main_xcord += 18;
}
- if (params.cluster_flags & CLUSTER_FLAG_CRAYXT) {
+ if(params.cluster_flags & CLUSTER_FLAG_CRAYXT) {
mvwprintw(text_win, main_ycord,
main_xcord, "%.16s",
select_g_select_jobinfo_sprint(
@@ -341,7 +341,7 @@ static int _print_text_job(job_info_t * job_ptr)
main_xcord, "%.2s",
job_state_string_compact(job_ptr->job_state));
main_xcord += 2;
- if (!strcasecmp(job_ptr->nodes,"waiting...")) {
+ if(!strcasecmp(job_ptr->nodes,"waiting...")) {
sprintf(time_buf,"00:00:00");
} else {
time_diff = now_time - job_ptr->start_time;
@@ -382,7 +382,7 @@ static int _print_text_job(job_info_t * job_ptr)
}
i++;
}
- if (ionodes) {
+ if(ionodes) {
mvwprintw(text_win,
main_ycord,
main_xcord, "[%s]",
@@ -396,13 +396,13 @@ static int _print_text_job(job_info_t * job_ptr)
} else {
printf("%8d ", job_ptr->job_id);
printf("%9.9s ", job_ptr->partition);
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
printf("%16.16s ",
select_g_select_jobinfo_sprint(
job_ptr->select_jobinfo,
time_buf, sizeof(time_buf),
SELECT_PRINT_BG_ID));
- if (params.cluster_flags & CLUSTER_FLAG_CRAYXT)
+ if(params.cluster_flags & CLUSTER_FLAG_CRAYXT)
printf("%16.16s ",
select_g_select_jobinfo_sprint(
job_ptr->select_jobinfo,
@@ -414,7 +414,7 @@ static int _print_text_job(job_info_t * job_ptr)
printf("%6.6s ", job_ptr->name);
printf("%2.2s ",
job_state_string_compact(job_ptr->job_state));
- if (!strcasecmp(job_ptr->nodes,"waiting...")) {
+ if(!strcasecmp(job_ptr->nodes,"waiting...")) {
sprintf(time_buf,"00:00:00");
} else {
time_diff = now_time - job_ptr->start_time;
@@ -426,7 +426,7 @@ static int _print_text_job(job_info_t * job_ptr)
printf("%5s ", tmp_cnt);
printf("%s", job_ptr->nodes);
- if (ionodes) {
+ if(ionodes) {
printf("[%s]", ionodes);
xfree(ionodes);
}
diff --git a/src/smap/opts.c b/src/smap/opts.c
index 6e18c635c810bec6fb9f2ac33433d69905931f56..b4e0645df74612c12ed7e119393414bbc96741e2 100644
--- a/src/smap/opts.c
+++ b/src/smap/opts.c
@@ -120,16 +120,16 @@ extern void parse_command_line(int argc, char *argv[])
* pset size. This number should be large enough.
*/
params.io_bit = bit_alloc(128);
- if (bit_unfmt(params.io_bit, optarg) == -1) {
+ if(bit_unfmt(params.io_bit, optarg) == -1) {
error("'%s' invalid entry for --ionodes",
optarg);
exit(1);
}
break;
case 'M':
- if (params.clusters)
+ if(params.clusters)
list_destroy(params.clusters);
- if (!(params.clusters =
+ if(!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
diff --git a/src/smap/partition_functions.c b/src/smap/partition_functions.c
index 3ac8cce30ad842316a1c32e4fd3ea8bea4e221a0..18b9355f1a411acb18c635bf4851ae8cf3e41e2d 100644
--- a/src/smap/partition_functions.c
+++ b/src/smap/partition_functions.c
@@ -86,10 +86,10 @@ extern void get_slurm_part()
bitstr_t *nodes_req = NULL;
static uint16_t last_flags = 0;
- if (params.all_flag)
+ if(params.all_flag)
show_flags |= SHOW_ALL;
if (part_info_ptr) {
- if (show_flags != last_flags)
+ if(show_flags != last_flags)
part_info_ptr->last_update = 0;
error_code = slurm_load_partitions(part_info_ptr->last_update,
&new_part_ptr, show_flags);
@@ -107,7 +107,7 @@ extern void get_slurm_part()
last_flags = show_flags;
if (error_code) {
if (quiet_flag != 1) {
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win,
main_ycord, 1,
"slurm_load_partitions: %s",
@@ -129,22 +129,22 @@ extern void get_slurm_part()
else
recs = 0;
if (!params.commandline)
- if ((recs - text_line_cnt) < (text_win->_maxy-3))
+ if((recs - text_line_cnt) < (text_win->_maxy-3))
text_line_cnt--;
- if (params.hl)
+ if(params.hl)
nodes_req = get_requested_node_bitmap();
for (i = 0; i < recs; i++) {
j = 0;
part = new_part_ptr->partition_array[i];
- if (nodes_req) {
+ if(nodes_req) {
int overlap = 0;
bitstr_t *loc_bitmap = bit_alloc(bit_size(nodes_req));
inx2bitstr(loc_bitmap, part.node_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if (!overlap)
+ if(!overlap)
continue;
}
while (part.node_inx[j] >= 0) {
@@ -152,8 +152,8 @@ extern void get_slurm_part()
part.node_inx[j + 1], count);
j += 2;
}
- if (!params.commandline) {
- if (i>=text_line_cnt) {
+ if(!params.commandline) {
+ if(i>=text_line_cnt) {
part.flags = (int) letters[count%62];
wattron(text_win,
COLOR_PAIR(colors[count%6]));
@@ -168,7 +168,7 @@ extern void get_slurm_part()
count++;
}
- if (count==128)
+ if(count==128)
count=0;
if (params.commandline && params.iterate)
printf("\n");
@@ -192,7 +192,7 @@ extern void get_bg_part()
List nodelist = NULL;
bitstr_t *nodes_req = NULL;
- if (!(params.cluster_flags & CLUSTER_FLAG_BG))
+ if(!(params.cluster_flags & CLUSTER_FLAG_BG))
return;
if (part_info_ptr) {
@@ -211,7 +211,7 @@ extern void get_bg_part()
if (error_code) {
if (quiet_flag != 1) {
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win,
main_ycord, 1,
"slurm_load_partitions: %s",
@@ -239,7 +239,7 @@ extern void get_bg_part()
}
if (error_code) {
if (quiet_flag != 1) {
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win,
main_ycord, 1,
"slurm_load_block: %s",
@@ -263,23 +263,23 @@ extern void get_bg_part()
}
}
if (!params.commandline)
- if ((new_bg_ptr->record_count - text_line_cnt)
+ if((new_bg_ptr->record_count - text_line_cnt)
< (text_win->_maxy-3))
text_line_cnt--;
- if (params.hl)
+ if(params.hl)
nodes_req = get_requested_node_bitmap();
for (i=0; i<new_bg_ptr->record_count; i++) {
- if (nodes_req) {
+ if(nodes_req) {
int overlap = 0;
bitstr_t *loc_bitmap = bit_alloc(bit_size(nodes_req));
inx2bitstr(loc_bitmap,
new_bg_ptr->block_array[i].bp_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if (!overlap)
+ if(!overlap)
continue;
}
- if (params.io_bit && new_bg_ptr->block_array[i].ionodes) {
+ if(params.io_bit && new_bg_ptr->block_array[i].ionodes) {
int overlap = 0;
bitstr_t *loc_bitmap =
bit_alloc(bit_size(params.io_bit));
@@ -288,7 +288,7 @@ extern void get_bg_part()
overlap = bit_overlap(loc_bitmap,
params.io_bit);
FREE_NULL_BITMAP(loc_bitmap);
- if (!overlap)
+ if(!overlap)
continue;
}
@@ -304,7 +304,7 @@ extern void get_bg_part()
= xstrdup(new_bg_ptr->block_array[i].owner_name);
block_ptr->state = new_bg_ptr->block_array[i].state;
block_ptr->bg_conn_type = new_bg_ptr->block_array[i].conn_type;
- if (params.cluster_flags & CLUSTER_FLAG_BGL)
+ if(params.cluster_flags & CLUSTER_FLAG_BGL)
block_ptr->bg_node_use =
new_bg_ptr->block_array[i].node_use;
@@ -315,7 +315,7 @@ extern void get_bg_part()
itr = list_iterator_create(block_list);
while ((found_block = (db2_block_info_t*)list_next(itr))
!= NULL) {
- if (!strcmp(block_ptr->nodes, found_block->nodes)) {
+ if(!strcmp(block_ptr->nodes, found_block->nodes)) {
block_ptr->letter_num =
found_block->letter_num;
break;
@@ -323,13 +323,13 @@ extern void get_bg_part()
}
list_iterator_destroy(itr);
- if (!found_block) {
+ if(!found_block) {
last_count++;
_marknodes(block_ptr, last_count);
}
block_ptr->job_running =
new_bg_ptr->block_array[i].job_running;
- if (block_ptr->bg_conn_type >= SELECT_SMALL)
+ if(block_ptr->bg_conn_type >= SELECT_SMALL)
block_ptr->size = 0;
list_append(block_list, block_ptr);
@@ -356,7 +356,7 @@ extern void get_bg_part()
itr = list_iterator_create(block_list);
while ((block_ptr = (db2_block_info_t*)
list_next(itr)) != NULL) {
- if (_in_slurm_partition(nodelist,
+ if(_in_slurm_partition(nodelist,
block_ptr->nodelist)) {
block_ptr->slurm_part_name
= xstrdup(part.name);
@@ -375,7 +375,7 @@ extern void get_bg_part()
if (params.commandline)
block_ptr->printed = 1;
else {
- if (count>=text_line_cnt)
+ if(count>=text_line_cnt)
block_ptr->printed = 1;
}
_print_rest(block_ptr);
@@ -424,16 +424,16 @@ static int _marknodes(db2_block_info_t *block_ptr, int count)
params.cluster_base);
j += 3;
- if (block_ptr->state != RM_PARTITION_FREE)
+ if(block_ptr->state != RM_PARTITION_FREE)
block_ptr->size += set_grid_bg(
start, end, count, 1);
else
block_ptr->size += set_grid_bg(
start, end, count, 0);
- if (block_ptr->nodes[j] != ',')
+ if(block_ptr->nodes[j] != ',')
break;
j--;
- } else if ((block_ptr->nodes[j] >= '0'
+ } else if((block_ptr->nodes[j] >= '0'
&& block_ptr->nodes[j] <= '9')
|| (block_ptr->nodes[j] >= 'A'
&& block_ptr->nodes[j] <= 'Z')) {
@@ -446,7 +446,7 @@ static int _marknodes(db2_block_info_t *block_ptr, int count)
j+=3;
block_ptr->size += set_grid_bg(
start, start, count, 0);
- if (block_ptr->nodes[j] != ',')
+ if(block_ptr->nodes[j] != ',')
break;
j--;
}
@@ -457,7 +457,7 @@ static int _marknodes(db2_block_info_t *block_ptr, int count)
static void _print_header_part(void)
{
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win, main_ycord,
main_xcord, "ID");
main_xcord += 4;
@@ -495,7 +495,7 @@ static void _print_header_part(void)
main_ycord,
main_xcord, "CONN");
main_xcord += 7;
- if (params.cluster_flags & CLUSTER_FLAG_BGL) {
+ if(params.cluster_flags & CLUSTER_FLAG_BGL) {
mvwprintw(text_win,
main_ycord,
main_xcord, "NODE_USE");
@@ -506,7 +506,7 @@ static void _print_header_part(void)
mvwprintw(text_win, main_ycord,
main_xcord, "NODES");
main_xcord += 7;
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
mvwprintw(text_win, main_ycord,
main_xcord, "BP_LIST");
else
@@ -525,12 +525,12 @@ static void _print_header_part(void)
printf(" JOBID ");
printf(" USER ");
printf(" CONN ");
- if (params.cluster_flags & CLUSTER_FLAG_BGL)
+ if(params.cluster_flags & CLUSTER_FLAG_BGL)
printf(" NODE_USE ");
}
printf("NODES ");
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
printf("BP_LIST\n");
else
printf("NODELIST\n");
@@ -549,13 +549,13 @@ static int _print_text_part(partition_info_t *part_ptr,
char tmp_cnt[8];
char tmp_char[8];
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
else
snprintf(tmp_cnt, sizeof(tmp_cnt), "%u", part_ptr->total_nodes);
- if (!params.commandline) {
+ if(!params.commandline) {
uint16_t root_only = 0;
if (part_ptr->flags & PART_FLAG_ROOT_ONLY)
root_only = 1;
@@ -622,7 +622,7 @@ static int _print_text_part(partition_info_t *part_ptr,
db2_info_ptr->state));
main_xcord += 7;
- if (db2_info_ptr->job_running > NO_JOB_RUNNING)
+ if(db2_info_ptr->job_running > NO_JOB_RUNNING)
snprintf(tmp_char, sizeof(tmp_char),
"%d",
db2_info_ptr->job_running);
@@ -649,7 +649,7 @@ static int _print_text_part(partition_info_t *part_ptr,
db2_info_ptr->
bg_conn_type));
main_xcord += 7;
- if (params.cluster_flags & CLUSTER_FLAG_BGL) {
+ if(params.cluster_flags & CLUSTER_FLAG_BGL) {
mvwprintw(text_win,
main_ycord,
main_xcord, "%.9s",
@@ -726,7 +726,7 @@ static int _print_text_part(partition_info_t *part_ptr,
i++;
}
- if ((params.display == BGPART) && db2_info_ptr
+ if((params.display == BGPART) && db2_info_ptr
&& (db2_info_ptr->ionodes)) {
mvwprintw(text_win,
main_ycord,
@@ -775,7 +775,7 @@ static int _print_text_part(partition_info_t *part_ptr,
bg_block_state_string(
db2_info_ptr->state));
- if (db2_info_ptr->job_running > NO_JOB_RUNNING)
+ if(db2_info_ptr->job_running > NO_JOB_RUNNING)
snprintf(tmp_char, sizeof(tmp_char),
"%d",
db2_info_ptr->job_running);
@@ -788,7 +788,7 @@ static int _print_text_part(partition_info_t *part_ptr,
printf("%5.5s ", conn_type_string(
db2_info_ptr->bg_conn_type));
- if (params.cluster_flags & CLUSTER_FLAG_BGL)
+ if(params.cluster_flags & CLUSTER_FLAG_BGL)
printf("%9.9s ", node_use_string(
db2_info_ptr->
bg_node_use));
@@ -802,7 +802,7 @@ static int _print_text_part(partition_info_t *part_ptr,
else
nodes = part_ptr->nodes;
- if ((params.display == BGPART) && db2_info_ptr
+ if((params.display == BGPART) && db2_info_ptr
&& (db2_info_ptr->ionodes)) {
printf("%s[%s]\n", nodes, db2_info_ptr->ionodes);
} else
@@ -821,7 +821,7 @@ static void _block_list_del(void *object)
xfree(block_ptr->slurm_part_name);
xfree(block_ptr->nodes);
xfree(block_ptr->ionodes);
- if (block_ptr->nodelist)
+ if(block_ptr->nodelist)
list_destroy(block_ptr->nodelist);
xfree(block_ptr);
@@ -856,21 +856,21 @@ static int _in_slurm_partition(List slurm_nodes, List bg_nodes)
list_iterator_reset(slurm_itr);
found = 0;
while ((slurm_coord = list_next(slurm_itr)) != NULL) {
- if ((coord[X] == slurm_coord[X])
+ if((coord[X] == slurm_coord[X])
&& (coord[Y] == slurm_coord[Y])
&& (coord[Z] == slurm_coord[Z])) {
found=1;
break;
}
}
- if (!found) {
+ if(!found) {
break;
}
}
list_iterator_destroy(slurm_itr);
list_iterator_destroy(bg_itr);
- if (found)
+ if(found)
return 1;
else
return 0;
@@ -881,10 +881,10 @@ static int _print_rest(db2_block_info_t *block_ptr)
{
partition_info_t part;
- if (block_ptr->node_cnt == 0)
+ if(block_ptr->node_cnt == 0)
block_ptr->node_cnt = block_ptr->size;
part.total_nodes = block_ptr->node_cnt;
- if (block_ptr->slurm_part_name)
+ if(block_ptr->slurm_part_name)
part.name = block_ptr->slurm_part_name;
else
part.name = "no part";
@@ -893,7 +893,7 @@ static int _print_rest(db2_block_info_t *block_ptr)
return SLURM_SUCCESS;
part.allow_groups = block_ptr->nodes;
part.flags = (int) letters[block_ptr->letter_num%62];
- if (!params.commandline) {
+ if(!params.commandline) {
wattron(text_win,
COLOR_PAIR(colors[block_ptr->letter_num%6]));
_print_text_part(&part, block_ptr);
@@ -909,7 +909,7 @@ static int _addto_nodelist(List nodelist, int *start, int *end)
{
int *coord = NULL;
int x,y,z;
- if (end[X] >= DIM_SIZE[X]
+ if(end[X] >= DIM_SIZE[X]
|| end[Y] >= DIM_SIZE[Y]
|| end[Z] >= DIM_SIZE[Z]) {
fatal("It appears the slurm.conf file has changed since "
@@ -943,7 +943,7 @@ static int _make_nodelist(char *nodes, List nodelist)
int end[params.cluster_dims];
char *p = '\0';
- if (!nodelist)
+ if(!nodelist)
nodelist = list_create(_nodelist_del);
while (nodes[j] != '\0') {
if ((nodes[j] == '['
@@ -966,10 +966,10 @@ static int _make_nodelist(char *nodes, List nodelist)
params.cluster_base);
j += 3;
_addto_nodelist(nodelist, start, end);
- if (nodes[j] != ',')
+ if(nodes[j] != ',')
break;
j--;
- } else if ((nodes[j] >= '0' && nodes[j] <= '9')
+ } else if((nodes[j] >= '0' && nodes[j] <= '9')
|| (nodes[j] >= 'A' && nodes[j] <= 'Z')) {
number = xstrntol(nodes + j, &p, params.cluster_dims,
@@ -979,7 +979,7 @@ static int _make_nodelist(char *nodes, List nodelist)
params.cluster_base);
j+=3;
_addto_nodelist(nodelist, start, start);
- if (nodes[j] != ',')
+ if(nodes[j] != ',')
break;
j--;
}
diff --git a/src/smap/reservation_functions.c b/src/smap/reservation_functions.c
index d111cfc6ea9199e2b64265052c47eaffb07802d9..c3c9ddc5860c9889318262b60191a2496d2c3a20 100644
--- a/src/smap/reservation_functions.c
+++ b/src/smap/reservation_functions.c
@@ -69,7 +69,7 @@ extern void get_reservation(void)
if (error_code) {
if (quiet_flag != 1) {
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(text_win,
main_ycord, 1,
"slurm_load_reservations: %s",
@@ -91,22 +91,22 @@ extern void get_reservation(void)
recs = 0;
if (!params.commandline) {
- if ((text_line_cnt+printed_resv) > count)
+ if((text_line_cnt+printed_resv) > count)
text_line_cnt--;
}
printed_resv = 0;
count = 0;
- if (params.hl)
+ if(params.hl)
nodes_req = get_requested_node_bitmap();
for (i = 0; i < recs; i++) {
resv = new_resv_ptr->reservation_array[i];
- if (nodes_req) {
+ if(nodes_req) {
int overlap = 0;
bitstr_t *loc_bitmap = bit_alloc(bit_size(nodes_req));
inx2bitstr(loc_bitmap, resv.node_inx);
overlap = bit_overlap(loc_bitmap, nodes_req);
FREE_NULL_BITMAP(loc_bitmap);
- if (!overlap)
+ if(!overlap)
continue;
}
diff --git a/src/smap/smap.c b/src/smap/smap.c
index d849bdbf9689b127ee633d21579a2a71fea020c7..9d50a8de385ba844340a2d45ad2edd60bb4cf67b 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -94,11 +94,11 @@ int main(int argc, char *argv[])
log_alter(opts, SYSLOG_FACILITY_USER, NULL);
}
- if (params.cluster_dims == 4) {
+ if(params.cluster_dims == 4) {
/* FIX ME: smap doesn't do anything correctly with
more than 3 dims yet.
*/
- } else if (params.cluster_dims == 3)
+ } else if(params.cluster_dims == 3)
min_screen_width = 92;
while (slurm_load_node((time_t) NULL, &new_node_ptr, SHOW_ALL)) {
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
ba_init(new_node_ptr, 0);
- if (params.resolve) {
+ if(params.resolve) {
#ifdef HAVE_BG_FILES
if (!have_db2) {
@@ -126,17 +126,17 @@ int main(int argc, char *argv[])
goto part_fini;
}
- if (!mapset)
+ if(!mapset)
mapset = set_bp_map();
- if (params.resolve[0] != 'R') {
+ if(params.resolve[0] != 'R') {
i = strlen(params.resolve);
i -= 3;
- if (i<0) {
+ if(i<0) {
printf("No real block was entered\n");
goto part_fini;
}
char *rack_mid = find_bp_rack_mid(params.resolve+i);
- if (rack_mid)
+ if(rack_mid)
printf("X=%c Y=%c Z=%c resolves to %s\n",
params.resolve[X+i],
params.resolve[Y+i],
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
} else {
int *coord = find_bp_loc(params.resolve);
- if (coord)
+ if(coord)
printf("%s resolves to X=%d Y=%d Z=%d\n",
params.resolve,
coord[X], coord[Y], coord[Z]);
@@ -166,16 +166,16 @@ part_fini:
xfree(params.resolve);
exit(0);
}
- if (!params.commandline) {
+ if(!params.commandline) {
int check_width = min_screen_width;
signal(SIGWINCH, (void (*)(int))_resize_handler);
initscr();
- if (params.cluster_dims == 4) {
+ if(params.cluster_dims == 4) {
/* FIX ME: smap doesn't do anything correctly with
more than 3 dims yet.
*/
- } else if (params.cluster_dims == 3) {
+ } else if(params.cluster_dims == 3) {
height = DIM_SIZE[Y] * DIM_SIZE[Z] + DIM_SIZE[Y] + 3;
width = DIM_SIZE[X] + DIM_SIZE[Z] + 3;
check_width += width;
@@ -210,11 +210,11 @@ part_fini:
max_display = grid_win->_maxy * grid_win->_maxx;
//scrollok(grid_win, TRUE);
- if (params.cluster_dims == 4) {
+ if(params.cluster_dims == 4) {
/* FIX ME: smap doesn't do anything correctly with
more than 3 dims yet.
*/
- } else if (params.cluster_dims == 3) {
+ } else if(params.cluster_dims == 3) {
startx = width;
COLS -= 2;
width = COLS - width;
@@ -228,7 +228,7 @@ part_fini:
text_win = newwin(height, width, starty, startx);
}
while (!end) {
- if (!params.commandline) {
+ if(!params.commandline) {
_get_option();
redraw:
@@ -241,7 +241,7 @@ part_fini:
main_ycord = 1;
}
- if (!params.no_header)
+ if(!params.no_header)
print_date();
switch (params.display) {
@@ -255,8 +255,8 @@ part_fini:
get_slurm_part();
break;
case COMMANDS:
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
- if (!mapset) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(!mapset) {
mapset = set_bp_map();
wclear(text_win);
//doupdate();
@@ -266,19 +266,19 @@ part_fini:
} else {
error("Must be on a BG SYSTEM to "
"run this command");
- if (!params.commandline)
+ if(!params.commandline)
endwin();
ba_fini();
exit(1);
}
break;
case BGPART:
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
get_bg_part();
else {
error("Must be on a BG SYSTEM to "
"run this command");
- if (!params.commandline)
+ if(!params.commandline)
endwin();
ba_fini();
exit(1);
@@ -286,7 +286,7 @@ part_fini:
break;
}
- if (!params.commandline) {
+ if(!params.commandline) {
//wscrl(grid_win,-1);
box(text_win, 0, 0);
wnoutrefresh(text_win);
@@ -316,7 +316,7 @@ part_fini:
&new_node_ptr, SHOW_ALL);
}
if (error_code && (quiet_flag != 1)) {
- if (!params.commandline) {
+ if(!params.commandline) {
mvwprintw(
text_win,
main_ycord,
@@ -337,7 +337,7 @@ part_fini:
for (i = 0; i < params.iterate; i++) {
sleep(1);
- if (!params.commandline) {
+ if(!params.commandline) {
if ((rc = _get_option()) == 1)
goto redraw;
else if (resize_screen) {
@@ -351,7 +351,7 @@ part_fini:
}
- if (!params.commandline) {
+ if(!params.commandline) {
nodelay(stdscr, FALSE);
getch();
endwin();
@@ -377,7 +377,7 @@ static int _get_option()
case '=':
case '+':
text_line_cnt--;
- if (text_line_cnt<0) {
+ if(text_line_cnt<0) {
text_line_cnt = 0;
return 0;
@@ -387,7 +387,7 @@ static int _get_option()
case 'H':
case 'h':
- if (params.all_flag)
+ if(params.all_flag)
params.all_flag = 0;
else
params.all_flag = 1;
@@ -412,7 +412,7 @@ static int _get_option()
return 1;
break;
case 'b':
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
text_line_cnt = 0;
grid_line_cnt = 0;
params.display = BGPART;
@@ -420,16 +420,16 @@ static int _get_option()
}
break;
case 'c':
- if (params.cluster_flags & CLUSTER_FLAG_BG) {
+ if(params.cluster_flags & CLUSTER_FLAG_BG) {
params.display = COMMANDS;
return 1;
}
break;
case 'u':
case KEY_UP:
- if (!(params.cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(params.cluster_flags & CLUSTER_FLAG_BG)) {
grid_line_cnt--;
- if (grid_line_cnt<0) {
+ if(grid_line_cnt<0) {
grid_line_cnt = 0;
return 0;
}
@@ -438,9 +438,9 @@ static int _get_option()
break;
case 'd':
case KEY_DOWN:
- if (!(params.cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(params.cluster_flags & CLUSTER_FLAG_BG)) {
grid_line_cnt++;
- if ((((grid_line_cnt-2) * (grid_win->_maxx-1)) +
+ if((((grid_line_cnt-2) * (grid_win->_maxx-1)) +
max_display) > DIM_SIZE[X]) {
grid_line_cnt--;
return 0;
@@ -479,11 +479,11 @@ static void *_resize_handler(int sig)
doupdate(); /* update now to make sure we get the new size */
getmaxyx(stdscr,LINES,COLS);
- if (params.cluster_dims == 4) {
+ if(params.cluster_dims == 4) {
/* FIX ME: smap doesn't do anything correctly with
more than 3 dims yet.
*/
- } else if (params.cluster_dims == 3) {
+ } else if(params.cluster_dims == 3) {
height = DIM_SIZE[Y] * DIM_SIZE[Z] + DIM_SIZE[Y] + 3;
width = DIM_SIZE[X] + DIM_SIZE[Z] + 3;
check_width += width;
@@ -504,11 +504,11 @@ static void *_resize_handler(int sig)
grid_win = newwin(height, width, starty, startx);
max_display = grid_win->_maxy * grid_win->_maxx;
- if (params.cluster_dims == 4) {
+ if(params.cluster_dims == 4) {
/* FIX ME: smap doesn't do anything correctly with
more than 3 dims yet.
*/
- } else if (params.cluster_dims == 3) {
+ } else if(params.cluster_dims == 3) {
startx = width;
COLS -= 2;
width = COLS - width;
@@ -533,11 +533,11 @@ static void *_resize_handler(int sig)
get_slurm_part();
break;
case COMMANDS:
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
get_command();
break;
case BGPART:
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
get_bg_part();
break;
}
diff --git a/src/sprio/opts.c b/src/sprio/opts.c
index 4a80e0e1c5476461ab33db52150b714da04b4a61..e0ed091abf17e42661c67905798f12c9da24540a 100644
--- a/src/sprio/opts.c
+++ b/src/sprio/opts.c
@@ -122,9 +122,9 @@ parse_command_line( int argc, char* argv[] )
params.long_list = true;
break;
case (int) 'M':
- if (params.clusters)
+ if(params.clusters)
list_destroy(params.clusters);
- if (!(params.clusters =
+ if(!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
diff --git a/src/sprio/sprio.c b/src/sprio/sprio.c
index 202e9466a12aa26677f9acef390329cacb257c9b..f3d056c07ceeed4c609510e7f43da29e4ccc1fc7 100644
--- a/src/sprio/sprio.c
+++ b/src/sprio/sprio.c
@@ -83,7 +83,7 @@ int main (int argc, char *argv[])
/* Check to see if we are running a supported accounting plugin */
temp = slurm_get_priority_type();
- if (strcasecmp(temp, "priority/multifactor")) {
+ if(strcasecmp(temp, "priority/multifactor")) {
fprintf (stderr, "You are not running a supported "
"priority plugin\n(%s).\n"
"Only 'priority/multifactor' is supported.\n",
diff --git a/src/squeue/opts.c b/src/squeue/opts.c
index 470b23870ea752e6b2821d2d6d9f18b32bb46e44..2d5c7fdc7b0d82d9eaf2b1a921afdf31fe67689b 100644
--- a/src/squeue/opts.c
+++ b/src/squeue/opts.c
@@ -170,9 +170,9 @@ parse_command_line( int argc, char* argv[] )
params.long_list = true;
break;
case (int) 'M':
- if (params.clusters)
+ if(params.clusters)
list_destroy(params.clusters);
- if (!(params.clusters =
+ if(!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
diff --git a/src/squeue/print.c b/src/squeue/print.c
index df5b0d45aea6dd07e291bce3c22c9aa4340d412e..95fd8b92a0c7b8c4b5a4246092afa6a22955083c 100644
--- a/src/squeue/print.c
+++ b/src/squeue/print.c
@@ -585,7 +585,7 @@ int _print_job_nodes(job_info_t * job, int width, bool right, char* suffix)
{
if (job == NULL) { /* Print the Header instead */
char *title = "NODELIST";
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
title = "BP_LIST";
_print_str(title, width, right, false);
} else
@@ -601,7 +601,7 @@ int _print_job_reason_list(job_info_t * job, int width, bool right,
{
if (job == NULL) { /* Print the Header instead */
char *title = "NODELIST(REASON)";
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
title = "BP_LIST(REASON)";
_print_str(title, width, right, false);
} else if (!IS_JOB_COMPLETING(job)
@@ -621,7 +621,7 @@ int _print_job_reason_list(job_info_t * job, int width, bool right,
select_g_select_jobinfo_get(job->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
- if (ionodes) {
+ if(ionodes) {
xstrfmtcat(nodes, "[%s]", ionodes);
xfree(ionodes);
_print_str(nodes, width, right, false);
@@ -661,7 +661,7 @@ int _print_job_num_cpus(job_info_t * job, int width, bool right, char* suffix)
if (job == NULL) /* Print the Header instead */
_print_str("CPUS", width, right, true);
else {
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)job->num_cpus, tmp_char,
sizeof(tmp_char), UNIT_NONE);
else
@@ -683,7 +683,7 @@ int _print_job_num_nodes(job_info_t * job, int width, bool right_justify,
if (job == NULL) /* Print the Header instead */
_print_str("NODES", width, right_justify, true);
else {
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
select_g_select_jobinfo_get(job->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&node_cnt);
@@ -691,7 +691,7 @@ int _print_job_num_nodes(job_info_t * job, int width, bool right_justify,
if ((node_cnt == 0) || (node_cnt == NO_VAL))
node_cnt = _get_node_cnt(job);
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)node_cnt, tmp_char,
sizeof(tmp_char), UNIT_NONE);
else
@@ -1234,7 +1234,7 @@ int _print_step_nodes(job_step_info_t * step, int width, bool right,
{
if (step == NULL) { /* Print the Header instead */
char *title = "NODELIST";
- if (params.cluster_flags & CLUSTER_FLAG_BG)
+ if(params.cluster_flags & CLUSTER_FLAG_BG)
title = "BP_LIST";
_print_str(title, width, right, false);
diff --git a/src/squeue/squeue.c b/src/squeue/squeue.c
index cdf1ffb5ca0e414f21ef10c57e0ac61c82ea05bc..125cfd06bc8a406e81ce18af53cca49453918f7c 100644
--- a/src/squeue/squeue.c
+++ b/src/squeue/squeue.c
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
}
max_line_size = _get_window_width( );
- if (params.clusters)
+ if(params.clusters)
working_cluster_rec = list_peek(params.clusters);
while (1)
diff --git a/src/sreport/cluster_reports.c b/src/sreport/cluster_reports.c
index 85327b7b7d5112af03a65947e809cbef38e19da5..90ed99ac6762e3a840c85aaa197ac8902fdbc259 100644
--- a/src/sreport/cluster_reports.c
+++ b/src/sreport/cluster_reports.c
@@ -82,7 +82,7 @@ static int _set_wckey_cond(int *start, int argc, char *argv[],
time_t start_time, end_time;
int option = 0;
- if (!wckey_cond) {
+ if(!wckey_cond) {
error("No wckey_cond given");
return -1;
}
@@ -90,62 +90,62 @@ static int _set_wckey_cond(int *start, int argc, char *argv[],
wckey_cond->with_usage = 1;
wckey_cond->with_deleted = 1;
- if (!wckey_cond->cluster_list)
+ if(!wckey_cond->cluster_list)
wckey_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
- } else if (!end && !strncasecmp(argv[i], "withdeleted",
+ } else if(!end && !strncasecmp(argv[i], "withdeleted",
MAX(command_len, 5))) {
wckey_cond->with_deleted = 1;
set = 1;
- } else if (!end
- || !strncasecmp(argv[i], "WCKeys",
+ } else if(!end
+ || !strncasecmp (argv[i], "WCKeys",
MAX(command_len, 3))) {
- if (!wckey_cond->name_list)
+ if(!wckey_cond->name_list)
wckey_cond->name_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(wckey_cond->name_list,
+ if(slurm_addto_char_list(wckey_cond->name_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 3))) {
- if (!wckey_cond->cluster_list)
+ if(!wckey_cond->cluster_list)
wckey_cond->cluster_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(wckey_cond->cluster_list,
+ if(slurm_addto_char_list(wckey_cond->cluster_list,
argv[i]+end))
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
wckey_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
wckey_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "User",
+ } else if (!strncasecmp (argv[i], "User",
MAX(command_len, 1))) {
- if (!wckey_cond->user_list)
+ if(!wckey_cond->user_list)
wckey_cond->user_list =
list_create(slurm_destroy_char);
- if (slurm_addto_char_list(wckey_cond->user_list,
+ if(slurm_addto_char_list(wckey_cond->user_list,
argv[i]+end))
set = 1;
} else {
@@ -156,9 +156,9 @@ static int _set_wckey_cond(int *start, int argc, char *argv[],
(*start) = i;
- if (!local_cluster_flag && !list_count(wckey_cond->cluster_list)) {
+ if(!local_cluster_flag && !list_count(wckey_cond->cluster_list)) {
char *temp = slurm_get_cluster_name();
- if (temp)
+ if(temp)
list_append(wckey_cond->cluster_list, temp);
}
@@ -187,7 +187,7 @@ static int _set_assoc_cond(int *start, int argc, char *argv[],
int command_len = 0;
int option = 0;
- if (!assoc_cond) {
+ if(!assoc_cond) {
error("We need an slurmdb_association_cond to call this");
return SLURM_ERROR;
}
@@ -195,59 +195,59 @@ static int _set_assoc_cond(int *start, int argc, char *argv[],
assoc_cond->with_usage = 1;
assoc_cond->with_deleted = 1;
- if (!assoc_cond->cluster_list)
+ if(!assoc_cond->cluster_list)
assoc_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
- } else if (!end && !strncasecmp(argv[i], "Tree",
+ } else if (!end && !strncasecmp (argv[i], "Tree",
MAX(command_len, 4))) {
tree_display = 1;
- } else if (!end
- || !strncasecmp(argv[i], "Users",
+ } else if(!end
+ || !strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
- if (!assoc_cond->user_list)
+ if(!assoc_cond->user_list)
assoc_cond->user_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->user_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))
|| !strncasecmp(argv[i], "Acct",
MAX(command_len, 4))) {
- if (!assoc_cond->acct_list)
+ if(!assoc_cond->acct_list)
assoc_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->acct_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(assoc_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
assoc_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list,
argv[i]+end);
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
assoc_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
@@ -259,9 +259,9 @@ static int _set_assoc_cond(int *start, int argc, char *argv[],
}
(*start) = i;
- if (!local_cluster_flag && !list_count(assoc_cond->cluster_list)) {
+ if(!local_cluster_flag && !list_count(assoc_cond->cluster_list)) {
char *temp = slurm_get_cluster_name();
- if (temp)
+ if(temp)
list_append(assoc_cond->cluster_list, temp);
}
@@ -290,7 +290,7 @@ static int _set_cluster_cond(int *start, int argc, char *argv[],
int command_len = 0;
int option = 0;
- if (!cluster_cond) {
+ if(!cluster_cond) {
error("We need an slurmdb_cluster_cond to call this");
return SLURM_ERROR;
}
@@ -298,38 +298,38 @@ static int _set_cluster_cond(int *start, int argc, char *argv[],
cluster_cond->with_deleted = 1;
cluster_cond->with_usage = 1;
- if (!cluster_cond->cluster_list)
+ if(!cluster_cond->cluster_list)
cluster_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
- } else if (!end
- || !strncasecmp(argv[i], "Clusters",
+ } else if(!end
+ || !strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(cluster_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
cluster_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list,
argv[i]+end);
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
cluster_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
@@ -341,9 +341,9 @@ static int _set_cluster_cond(int *start, int argc, char *argv[],
}
(*start) = i;
- if (!local_cluster_flag && !list_count(cluster_cond->cluster_list)) {
+ if(!local_cluster_flag && !list_count(cluster_cond->cluster_list)) {
char *temp = slurm_get_cluster_name();
- if (temp)
+ if(temp)
list_append(cluster_cond->cluster_list, temp);
}
@@ -366,14 +366,14 @@ static int _setup_print_fields_list(List format_list)
print_field_t *field = NULL;
char *object = NULL;
- if (!format_list || !list_count(format_list)) {
+ if(!format_list || !list_count(format_list)) {
exit_code=1;
fprintf(stderr, " we need a format list "
"to set up the print.\n");
return SLURM_ERROR;
}
- if (!print_fields_list)
+ if(!print_fields_list)
print_fields_list = list_create(destroy_print_field);
itr = list_iterator_create(format_list);
@@ -382,7 +382,7 @@ static int _setup_print_fields_list(List format_list)
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -390,125 +390,125 @@ static int _setup_print_fields_list(List format_list)
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Accounts", object, MAX(command_len, 2))) {
+ if(!strncasecmp("Accounts", object, MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_ACCT;
field->name = xstrdup("Account");
- if (tree_display)
+ if(tree_display)
field->len = -20;
else
field->len = 15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("allocated", object,
+ } else if(!strncasecmp("allocated", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_ACPU;
field->name = xstrdup("Allocated");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 12;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_NAME;
field->name = xstrdup("Cluster");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("cpucount", object,
+ } else if(!strncasecmp("cpucount", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_CPUS;
field->name = xstrdup("CPU count");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("down", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("down", object, MAX(command_len, 1))) {
field->type = PRINT_CLUSTER_DCPU;
field->name = xstrdup("Down");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 18;
else
field->len = 10;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("idle", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("idle", object, MAX(command_len, 1))) {
field->type = PRINT_CLUSTER_ICPU;
field->name = xstrdup("Idle");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 12;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("Login", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Login", object, MAX(command_len, 1))) {
field->type = PRINT_CLUSTER_USER_LOGIN;
field->name = xstrdup("Login");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("overcommited", object,
+ } else if(!strncasecmp("overcommited", object,
MAX(command_len, 1))) {
field->type = PRINT_CLUSTER_OCPU;
field->name = xstrdup("Over Comm");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 18;
else
field->len = 9;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("PlannedDown", object,
+ } else if(!strncasecmp("PlannedDown", object,
MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_PDCPU;
field->name = xstrdup("PLND Down");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 18;
else
field->len = 10;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("Proper", object, MAX(command_len, 2))) {
+ } else if(!strncasecmp("Proper", object, MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_USER_PROPER;
field->name = xstrdup("Proper Name");
field->len = 15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("reported", object,
+ } else if(!strncasecmp("reported", object,
MAX(command_len, 3))) {
field->type = PRINT_CLUSTER_TOTAL;
field->name = xstrdup("Reported");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 12;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("reserved", object,
+ } else if(!strncasecmp("reserved", object,
MAX(command_len, 3))) {
field->type = PRINT_CLUSTER_RCPU;
field->name = xstrdup("Reserved");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 18;
else
field->len = 9;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("Used", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Used", object, MAX(command_len, 1))) {
field->type = PRINT_CLUSTER_AMOUNT_USED;
field->name = xstrdup("Used");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 18;
else
field->len = 10;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("WCKey", object, MAX(command_len, 2))) {
+ } else if(!strncasecmp("WCKey", object, MAX(command_len, 2))) {
field->type = PRINT_CLUSTER_WCKEY;
field->name = xstrdup("WCKey");
- if (tree_display)
+ if(tree_display)
field->len = 20;
else
field->len = 15;
@@ -520,7 +520,7 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -545,13 +545,13 @@ static List _get_cluster_list(int argc, char *argv[], uint32_t *total_time,
_set_cluster_cond(&i, argc, argv, cluster_cond, format_list);
cluster_list = slurmdb_clusters_get(db_conn, cluster_cond);
- if (!cluster_list) {
+ if(!cluster_list) {
exit_code=1;
fprintf(stderr, " Problem with cluster query.\n");
return NULL;
}
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = cluster_cond->usage_start;
@@ -612,20 +612,20 @@ extern int cluster_account_by_user(int argc, char *argv[])
_set_assoc_cond(&i, argc, argv, assoc_cond, format_list);
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list,
"Cluster,Ac,Login,Proper,Used");
_setup_print_fields_list(format_list);
list_destroy(format_list);
- if (!(slurmdb_report_cluster_list =
+ if(!(slurmdb_report_cluster_list =
slurmdb_report_cluster_account_by_user(db_conn, assoc_cond))) {
exit_code = 1;
goto end_it;
}
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = assoc_cond->usage_start;
@@ -662,7 +662,7 @@ extern int cluster_account_by_user(int argc, char *argv[])
while((slurmdb_report_cluster = list_next(cluster_itr))) {
//list_sort(slurmdb_report_cluster->assoc_list,
// (ListCmpF)sort_assoc_dec);
- if (tree_list)
+ if(tree_list)
list_flush(tree_list);
else
tree_list = list_create(slurmdb_destroy_print_tree);
@@ -670,17 +670,17 @@ extern int cluster_account_by_user(int argc, char *argv[])
itr = list_iterator_create(slurmdb_report_cluster->assoc_list);
while((slurmdb_report_assoc = list_next(itr))) {
int curr_inx = 1;
- if (!slurmdb_report_assoc->cpu_secs)
+ if(!slurmdb_report_assoc->cpu_secs)
continue;
while((field = list_next(itr2))) {
char *tmp_char = NULL;
struct passwd *pwd = NULL;
switch(field->type) {
case PRINT_CLUSTER_ACCT:
- if (tree_display) {
+ if(tree_display) {
char *local_acct = NULL;
char *parent_acct = NULL;
- if (slurmdb_report_assoc->user) {
+ if(slurmdb_report_assoc->user) {
local_acct =
xstrdup_printf(
"|%s",
@@ -722,14 +722,14 @@ extern int cluster_account_by_user(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_CLUSTER_USER_PROPER:
- if (slurmdb_report_assoc->user)
+ if(slurmdb_report_assoc->user)
pwd = getpwnam(
slurmdb_report_assoc->user);
- if (pwd) {
+ if(pwd) {
tmp_char =
strtok(pwd->pw_gecos,
",");
- if (!tmp_char)
+ if(!tmp_char)
tmp_char =
pwd->pw_gecos;
}
@@ -762,12 +762,12 @@ extern int cluster_account_by_user(int argc, char *argv[])
end_it:
slurmdb_destroy_association_cond(assoc_cond);
- if (slurmdb_report_cluster_list) {
+ if(slurmdb_report_cluster_list) {
list_destroy(slurmdb_report_cluster_list);
slurmdb_report_cluster_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
@@ -798,20 +798,20 @@ extern int cluster_user_by_account(int argc, char *argv[])
_set_assoc_cond(&i, argc, argv, assoc_cond, format_list);
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list,
"Cluster,Login,Proper,Ac,Used");
_setup_print_fields_list(format_list);
list_destroy(format_list);
- if (!(slurmdb_report_cluster_list =
+ if(!(slurmdb_report_cluster_list =
slurmdb_report_cluster_user_by_account(db_conn, assoc_cond))) {
exit_code = 1;
goto end_it;
}
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = assoc_cond->usage_start;
@@ -852,7 +852,7 @@ extern int cluster_user_by_account(int argc, char *argv[])
int curr_inx = 1;
/* we don't care if they didn't use any time */
- if (!slurmdb_report_user->cpu_secs)
+ if(!slurmdb_report_user->cpu_secs)
continue;
while((field = list_next(itr2))) {
@@ -879,11 +879,11 @@ extern int cluster_user_by_account(int argc, char *argv[])
break;
case PRINT_CLUSTER_USER_PROPER:
pwd = getpwnam(slurmdb_report_user->name);
- if (pwd) {
+ if(pwd) {
tmp_char =
strtok(pwd->pw_gecos,
",");
- if (!tmp_char)
+ if(!tmp_char)
tmp_char =
pwd->pw_gecos;
}
@@ -916,12 +916,12 @@ extern int cluster_user_by_account(int argc, char *argv[])
end_it:
slurmdb_destroy_association_cond(assoc_cond);
- if (slurmdb_report_cluster_list) {
+ if(slurmdb_report_cluster_list) {
list_destroy(slurmdb_report_cluster_list);
slurmdb_report_cluster_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
@@ -952,20 +952,20 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
_set_wckey_cond(&i, argc, argv, wckey_cond, format_list);
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list,
"Cluster,Login,Proper,WCkey,Used");
_setup_print_fields_list(format_list);
list_destroy(format_list);
- if (!(slurmdb_report_cluster_list =
+ if(!(slurmdb_report_cluster_list =
slurmdb_report_cluster_user_by_wckey(db_conn, wckey_cond))) {
exit_code = 1;
goto end_it;
}
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = wckey_cond->usage_start;
@@ -1006,7 +1006,7 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
int curr_inx = 1;
/* we don't care if they didn't use any time */
- if (!slurmdb_report_user->cpu_secs)
+ if(!slurmdb_report_user->cpu_secs)
continue;
while((field = list_next(itr2))) {
@@ -1033,11 +1033,11 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
break;
case PRINT_CLUSTER_USER_PROPER:
pwd = getpwnam(slurmdb_report_user->name);
- if (pwd) {
+ if(pwd) {
tmp_char =
strtok(pwd->pw_gecos,
",");
- if (!tmp_char)
+ if(!tmp_char)
tmp_char =
pwd->pw_gecos;
}
@@ -1070,12 +1070,12 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
end_it:
slurmdb_destroy_wckey_cond(wckey_cond);
- if (slurmdb_report_cluster_list) {
+ if(slurmdb_report_cluster_list) {
list_destroy(slurmdb_report_cluster_list);
slurmdb_report_cluster_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
@@ -1102,12 +1102,12 @@ extern int cluster_utilization(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- if (!(cluster_list = _get_cluster_list(argc, argv, &total_time,
+ if(!(cluster_list = _get_cluster_list(argc, argv, &total_time,
"Cluster Utilization",
format_list)))
goto end_it;
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,al,d,planned,i,res,rep");
_setup_print_fields_list(format_list);
@@ -1127,7 +1127,7 @@ extern int cluster_utilization(int argc, char *argv[])
uint64_t local_total_time = 0;
int curr_inx = 1;
- if (!cluster->accounting_list
+ if(!cluster->accounting_list
|| !list_count(cluster->accounting_list))
continue;
@@ -1233,12 +1233,12 @@ extern int cluster_utilization(int argc, char *argv[])
list_iterator_destroy(itr);
end_it:
- if (cluster_list) {
+ if(cluster_list) {
list_destroy(cluster_list);
cluster_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
@@ -1270,20 +1270,20 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
_set_wckey_cond(&i, argc, argv, wckey_cond, format_list);
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list,
"Cluster,WCKey,Login,Proper,Used");
_setup_print_fields_list(format_list);
list_destroy(format_list);
- if (!(slurmdb_report_cluster_list =
+ if(!(slurmdb_report_cluster_list =
slurmdb_report_cluster_wckey_by_user(db_conn, wckey_cond))) {
exit_code = 1;
goto end_it;
}
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = wckey_cond->usage_start;
@@ -1320,7 +1320,7 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
while((slurmdb_report_cluster = list_next(cluster_itr))) {
//list_sort(slurmdb_report_cluster->wckey_list,
// (ListCmpF)sort_wckey_dec);
- if (tree_list)
+ if(tree_list)
list_flush(tree_list);
else
tree_list = list_create(slurmdb_destroy_print_tree);
@@ -1328,7 +1328,7 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
itr = list_iterator_create(slurmdb_report_cluster->assoc_list);
while((slurmdb_report_assoc = list_next(itr))) {
int curr_inx = 1;
- if (!slurmdb_report_assoc->cpu_secs)
+ if(!slurmdb_report_assoc->cpu_secs)
continue;
while((field = list_next(itr2))) {
char *tmp_char = NULL;
@@ -1354,14 +1354,14 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
(curr_inx == field_count));
break;
case PRINT_CLUSTER_USER_PROPER:
- if (slurmdb_report_assoc->user)
+ if(slurmdb_report_assoc->user)
pwd = getpwnam(
slurmdb_report_assoc->user);
- if (pwd) {
+ if(pwd) {
tmp_char =
strtok(pwd->pw_gecos,
",");
- if (!tmp_char)
+ if(!tmp_char)
tmp_char =
pwd->pw_gecos;
}
@@ -1394,12 +1394,12 @@ extern int cluster_wckey_by_user(int argc, char *argv[])
end_it:
slurmdb_destroy_wckey_cond(wckey_cond);
- if (slurmdb_report_cluster_list) {
+ if(slurmdb_report_cluster_list) {
list_destroy(slurmdb_report_cluster_list);
slurmdb_report_cluster_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
diff --git a/src/sreport/common.c b/src/sreport/common.c
index 6b04b9f74b151d4a9335d043e1a826ca3bc95628..81105142ba22659be6bc2b1e1d4b2da590b8c3b9 100644
--- a/src/sreport/common.c
+++ b/src/sreport/common.c
@@ -45,16 +45,16 @@ extern void slurmdb_report_print_time(print_field_t *field,
{
int abs_len = abs(field->len);
- if (!total_time)
+ if(!total_time)
total_time = 1;
/* (value == unset) || (value == cleared) */
- if ((value == NO_VAL) || (value == INFINITE)) {
- if (print_fields_parsable_print
+ if((value == NO_VAL) || (value == INFINITE)) {
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
;
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("|");
else
printf("%-*s ", abs_len, " ");
@@ -106,13 +106,13 @@ extern void slurmdb_report_print_time(print_field_t *field,
break;
}
- if (print_fields_parsable_print
+ if(print_fields_parsable_print
== PRINT_FIELDS_PARSABLE_NO_ENDING
&& last)
printf("%s", output);
- else if (print_fields_parsable_print)
+ else if(print_fields_parsable_print)
printf("%s|", output);
- else if (field->len == abs_len)
+ else if(field->len == abs_len)
printf("%*.*s ", abs_len, abs_len, output);
else
printf("%-*.*s ", abs_len, abs_len, output);
@@ -125,12 +125,12 @@ extern int parse_option_end(char *option)
{
int end = 0;
- if (!option)
+ if(!option)
return 0;
while(option[end] && option[end] != '=')
end++;
- if (!option[end])
+ if(!option[end])
return 0;
end++;
return end;
@@ -143,7 +143,7 @@ extern char *strip_quotes(char *option, int *increased)
int i=0, start=0;
char *meat = NULL;
- if (!option)
+ if(!option)
return NULL;
/* first strip off the ("|')'s */
@@ -152,7 +152,7 @@ extern char *strip_quotes(char *option, int *increased)
start = i;
while(option[i]) {
- if (option[i] == '\"' || option[i] == '\'') {
+ if(option[i] == '\"' || option[i] == '\'') {
end++;
break;
}
@@ -163,7 +163,7 @@ extern char *strip_quotes(char *option, int *increased)
meat = xmalloc((i-start)+1);
memcpy(meat, option+start, (i-start));
- if (increased)
+ if(increased)
(*increased) += end;
return meat;
@@ -175,30 +175,30 @@ extern void addto_char_list(List char_list, char *names)
char *name = NULL, *tmp_char = NULL;
ListIterator itr = NULL;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'')
i++;
start = i;
while(names[i]) {
- if (names[i] == '\"' || names[i] == '\'')
+ if(names[i] == '\"' || names[i] == '\'')
break;
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char)
+ if(!tmp_char)
list_append(char_list, name);
else
xfree(name);
@@ -209,15 +209,15 @@ extern void addto_char_list(List char_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char)
+ if(!tmp_char)
list_append(char_list, name);
else
xfree(name);
@@ -237,14 +237,14 @@ extern int sort_user_dec(slurmdb_report_user_rec_t *user_a,
{
int diff = 0;
- if (sort_flag == SLURMDB_REPORT_SORT_TIME) {
+ if(sort_flag == SLURMDB_REPORT_SORT_TIME) {
if (user_a->cpu_secs > user_b->cpu_secs)
return -1;
else if (user_a->cpu_secs < user_b->cpu_secs)
return 1;
}
- if (!user_a->name || !user_b->name)
+ if(!user_a->name || !user_b->name)
return 0;
diff = strcmp(user_a->name, user_b->name);
@@ -270,7 +270,7 @@ extern int sort_cluster_dec(slurmdb_report_cluster_rec_t *cluster_a,
{
int diff = 0;
- if (!cluster_a->name || !cluster_b->name)
+ if(!cluster_a->name || !cluster_b->name)
return 0;
diff = strcmp(cluster_a->name, cluster_b->name);
@@ -298,7 +298,7 @@ extern int sort_assoc_dec(slurmdb_report_assoc_rec_t *assoc_a,
{
int diff = 0;
- if (!assoc_a->acct || !assoc_b->acct)
+ if(!assoc_a->acct || !assoc_b->acct)
return 0;
diff = strcmp(assoc_a->acct, assoc_b->acct);
@@ -308,9 +308,9 @@ extern int sort_assoc_dec(slurmdb_report_assoc_rec_t *assoc_a,
else if (diff < 0)
return -1;
- if (!assoc_a->user && assoc_b->user)
+ if(!assoc_a->user && assoc_b->user)
return 1;
- else if (!assoc_b->user)
+ else if(!assoc_b->user)
return -1;
diff = strcmp(assoc_a->user, assoc_b->user);
@@ -335,7 +335,7 @@ extern int sort_reservations_dec(slurmdb_reservation_rec_t *resv_a,
{
int diff = 0;
- if (!resv_a->cluster || !resv_b->cluster)
+ if(!resv_a->cluster || !resv_b->cluster)
return 0;
diff = strcmp(resv_a->cluster, resv_b->cluster);
@@ -345,7 +345,7 @@ extern int sort_reservations_dec(slurmdb_reservation_rec_t *resv_a,
else if (diff < 0)
return -1;
- if (!resv_a->name || !resv_b->name)
+ if(!resv_a->name || !resv_b->name)
return 0;
diff = strcmp(resv_a->name, resv_b->name);
@@ -355,9 +355,9 @@ extern int sort_reservations_dec(slurmdb_reservation_rec_t *resv_a,
else if (diff < 0)
return -1;
- if (resv_a->time_start < resv_b->time_start)
+ if(resv_a->time_start < resv_b->time_start)
return 1;
- else if (resv_a->time_start > resv_b->time_start)
+ else if(resv_a->time_start > resv_b->time_start)
return -1;
return 0;
@@ -368,7 +368,7 @@ extern int get_uint(char *in_value, uint32_t *out_value, char *type)
char *ptr = NULL, *meat = NULL;
long num;
- if (!(meat = strip_quotes(in_value, NULL))) {
+ if(!(meat = strip_quotes(in_value, NULL))) {
error("Problem with strip_quotes");
return SLURM_ERROR;
}
diff --git a/src/sreport/job_reports.c b/src/sreport/job_reports.c
index 8f685a5e8949fd3b1c594ad13e1a0f21be0edb42..a448db5c1c04c92fdd38a7d4d0d4f2f910488ac3 100644
--- a/src/sreport/job_reports.c
+++ b/src/sreport/job_reports.c
@@ -72,7 +72,7 @@ static int _sort_cluster_grouping_dec(
{
int diff = 0;
- if (!cluster_a->cluster || !cluster_b->cluster)
+ if(!cluster_a->cluster || !cluster_b->cluster)
return 0;
diff = strcmp(cluster_a->cluster, cluster_b->cluster);
@@ -98,7 +98,7 @@ static int _sort_acct_grouping_dec(slurmdb_report_acct_grouping_t *acct_a,
{
int diff = 0;
- if (!acct_a->acct || !acct_b->acct)
+ if(!acct_a->acct || !acct_b->acct)
return 0;
diff = strcmp(acct_a->acct, acct_b->acct);
@@ -121,13 +121,13 @@ static int _addto_uid_char_list(List char_list, char *names)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -136,12 +136,12 @@ static int _addto_uid_char_list(List char_list, char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
@@ -160,11 +160,11 @@ static int _addto_uid_char_list(List char_list, char *names)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -173,7 +173,7 @@ static int _addto_uid_char_list(List char_list, char *names)
}
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -182,7 +182,7 @@ static int _addto_uid_char_list(List char_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
@@ -199,11 +199,11 @@ static int _addto_uid_char_list(List char_list, char *names)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -225,79 +225,79 @@ static int _set_cond(int *start, int argc, char *argv[],
time_t start_time, end_time;
int command_len = 0;
- if (!job_cond->cluster_list)
+ if(!job_cond->cluster_list)
job_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else
command_len=end-1;
- if (!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
continue;
- } else if (!end && !strncasecmp(argv[i], "PrintJobCount",
+ } else if(!end && !strncasecmp(argv[i], "PrintJobCount",
MAX(command_len, 2))) {
print_job_count = 1;
continue;
- } else if (!end && !strncasecmp(argv[i], "FlatView",
+ } else if (!end && !strncasecmp (argv[i], "FlatView",
MAX(command_len, 2))) {
flat_view = true;
continue;
- } else if (!end
- || !strncasecmp(argv[i], "Clusters",
+ } else if(!end
+ || !strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(job_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))
|| !strncasecmp(argv[i], "Acct",
MAX(command_len, 4))) {
- if (!job_cond->acct_list)
+ if(!job_cond->acct_list)
job_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->acct_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Associations",
+ } else if (!strncasecmp (argv[i], "Associations",
MAX(command_len, 2))) {
- if (!job_cond->associd_list)
+ if(!job_cond->associd_list)
job_cond->associd_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->associd_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
job_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 2))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "Gid", MAX(command_len, 2))) {
- if (!job_cond->groupid_list)
+ } else if (!strncasecmp (argv[i], "Gid", MAX(command_len, 2))) {
+ if(!job_cond->groupid_list)
job_cond->groupid_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->groupid_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "grouping",
+ } else if (!strncasecmp (argv[i], "grouping",
MAX(command_len, 2))) {
- if (!strncasecmp(argv[i]+end, "individual", 1)) {
+ if(!strncasecmp(argv[i]+end, "individual", 1)) {
individual_grouping = 1;
- } else if (grouping_list)
+ } else if(grouping_list)
slurm_addto_char_list(grouping_list,
argv[i]+end);
- } else if (!strncasecmp(argv[i], "Jobs",
+ } else if (!strncasecmp (argv[i], "Jobs",
MAX(command_len, 1))) {
char *end_char = NULL, *start_char = argv[i]+end;
slurmdb_selected_step_t *selected_step = NULL;
char *dot = NULL;
- if (!job_cond->step_list)
+ if(!job_cond->step_list)
job_cond->step_list =
list_create(slurm_destroy_char);
@@ -306,7 +306,7 @@ static int _set_cond(int *start, int argc, char *argv[],
*end_char = 0;
while (isspace(*start_char))
start_char++; /* discard whitespace */
- if (!(int)*start_char)
+ if(!(int)*start_char)
continue;
selected_step = xmalloc(
sizeof(slurmdb_selected_step_t));
@@ -325,9 +325,9 @@ static int _set_cond(int *start, int argc, char *argv[],
}
set = 1;
- } else if (!strncasecmp(argv[i], "Nodes",
+ } else if(!strncasecmp (argv[i], "Nodes",
MAX(command_len, 1))) {
- if (job_cond->used_nodes) {
+ if(job_cond->used_nodes) {
error("You already specified nodes '%s' "
" combine your request into 1 nodes=.",
job_cond->used_nodes);
@@ -336,29 +336,29 @@ static int _set_cond(int *start, int argc, char *argv[],
}
job_cond->used_nodes = xstrdup(argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Partitions",
+ } else if (!strncasecmp (argv[i], "Partitions",
MAX(command_len, 2))) {
- if (!job_cond->partition_list)
+ if(!job_cond->partition_list)
job_cond->partition_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->partition_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
job_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Users",
+ } else if (!strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
- if (!job_cond->userid_list)
+ if(!job_cond->userid_list)
job_cond->userid_list =
list_create(slurm_destroy_char);
_addto_uid_char_list(job_cond->userid_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Wckeys",
+ } else if (!strncasecmp (argv[i], "Wckeys",
MAX(command_len, 2))) {
- if (!job_cond->wckey_list)
+ if(!job_cond->wckey_list)
job_cond->wckey_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(job_cond->wckey_list,
@@ -372,9 +372,9 @@ static int _set_cond(int *start, int argc, char *argv[],
}
(*start) = i;
- if (!local_cluster_flag && !list_count(job_cond->cluster_list)) {
+ if(!local_cluster_flag && !list_count(job_cond->cluster_list)) {
char *temp = slurm_get_cluster_name();
- if (temp)
+ if(temp)
list_append(job_cond->cluster_list, temp);
}
@@ -398,14 +398,14 @@ static int _setup_print_fields_list(List format_list)
print_field_t *field = NULL;
char *object = NULL;
- if (!format_list || !list_count(format_list)) {
+ if(!format_list || !list_count(format_list)) {
exit_code=1;
fprintf(stderr,
" We need a format list to set up the print.\n");
return SLURM_ERROR;
}
- if (!print_fields_list)
+ if(!print_fields_list)
print_fields_list = list_create(destroy_print_field);
itr = list_iterator_create(format_list);
@@ -414,7 +414,7 @@ static int _setup_print_fields_list(List format_list)
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -422,49 +422,49 @@ static int _setup_print_fields_list(List format_list)
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Account", object, MAX(command_len, 1))
+ if(!strncasecmp("Account", object, MAX(command_len, 1))
|| !strncasecmp("Acct", object, MAX(command_len, 4))) {
field->type = PRINT_JOB_ACCOUNT;
field->name = xstrdup("Account");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 2))) {
field->type = PRINT_JOB_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("CpuCount", object,
+ } else if(!strncasecmp("CpuCount", object,
MAX(command_len, 2))) {
field->type = PRINT_JOB_CPUS;
field->name = xstrdup("CPU Count");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("Duration", object,
+ } else if(!strncasecmp("Duration", object,
MAX(command_len, 1))) {
field->type = PRINT_JOB_DUR;
field->name = xstrdup("Duration");
field->len = 12;
field->print_routine = print_fields_time;
- } else if (!strncasecmp("JobCount", object,
+ } else if(!strncasecmp("JobCount", object,
MAX(command_len, 2))) {
field->type = PRINT_JOB_COUNT;
field->name = xstrdup("Job Count");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("NodeCount", object,
+ } else if(!strncasecmp("NodeCount", object,
MAX(command_len, 2))) {
field->type = PRINT_JOB_NODES;
field->name = xstrdup("Node Count");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("User", object,
+ } else if(!strncasecmp("User", object,
MAX(command_len, 1))) {
field->type = PRINT_JOB_USER;
field->name = xstrdup("User");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Wckey", object,
+ } else if(!strncasecmp("Wckey", object,
MAX(command_len, 1))) {
field->type = PRINT_JOB_WCKEY;
field->name = xstrdup("Wckey");
@@ -477,7 +477,7 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -497,72 +497,72 @@ static int _setup_grouping_print_fields_list(List grouping_list)
uint32_t size = 0;
char *tmp_char = NULL;
- if (!grouping_list || !list_count(grouping_list)) {
+ if(!grouping_list || !list_count(grouping_list)) {
exit_code=1;
fprintf(stderr, " We need a grouping list to "
"set up the print.\n");
return SLURM_ERROR;
}
- if (!grouping_print_fields_list)
+ if(!grouping_print_fields_list)
grouping_print_fields_list = list_create(destroy_print_field);
itr = list_iterator_create(grouping_list);
while((object = list_next(itr))) {
field = xmalloc(sizeof(print_field_t));
size = atoi(object);
- if (print_job_count)
+ if(print_job_count)
field->type = PRINT_JOB_COUNT;
else
field->type = PRINT_JOB_SIZE;
- if (individual_grouping)
+ if(individual_grouping)
field->name = xstrdup_printf("%u cpus", size);
else
field->name = xstrdup_printf("%u-%u cpus",
last_size, size-1);
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 13;
- if (print_job_count)
+ if(print_job_count)
field->print_routine = print_fields_uint;
else
field->print_routine = slurmdb_report_print_time;
last_size = size;
last_object = object;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
int newlen = atoi(tmp_char+1);
- if (newlen)
+ if(newlen)
field->len = newlen;
}
list_append(grouping_print_fields_list, field);
}
list_iterator_destroy(itr);
- if (last_size && !individual_grouping) {
+ if(last_size && !individual_grouping) {
field = xmalloc(sizeof(print_field_t));
- if (print_job_count)
+ if(print_job_count)
field->type = PRINT_JOB_COUNT;
else
field->type = PRINT_JOB_SIZE;
field->name = xstrdup_printf(">= %u cpus", last_size);
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 13;
- if (print_job_count)
+ if(print_job_count)
field->print_routine = print_fields_uint;
else
field->print_routine = slurmdb_report_print_time;
- if ((tmp_char = strstr(last_object, "\%"))) {
+ if((tmp_char = strstr(last_object, "\%"))) {
int newlen = atoi(tmp_char+1);
- if (newlen)
+ if(newlen)
field->len = newlen;
}
list_append(grouping_print_fields_list, field);
@@ -607,16 +607,16 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
_set_cond(&i, argc, argv, job_cond, format_list, grouping_list);
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,a");
- if (!individual_grouping && !list_count(grouping_list))
+ if(!individual_grouping && !list_count(grouping_list))
slurm_addto_char_list(grouping_list, "50,250,500,1000");
_setup_print_fields_list(format_list);
list_destroy(format_list);
- if (!(slurmdb_report_cluster_grouping_list =
+ if(!(slurmdb_report_cluster_grouping_list =
slurmdb_report_job_sizes_grouped_by_top_account(db_conn,
job_cond, grouping_list, flat_view))) {
exit_code = 1;
@@ -625,7 +625,7 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
_setup_grouping_print_fields_list(grouping_list);
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = job_cond->usage_start;
@@ -638,7 +638,7 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
printf("Job Sizes %s - %s (%d secs)\n",
start_char, end_char,
(int)(job_cond->usage_end - job_cond->usage_start));
- if (print_job_count)
+ if(print_job_count)
printf("Units are in number of jobs ran\n");
else
printf("Time reported in %s\n", time_format_string);
@@ -737,35 +737,35 @@ extern int job_sizes_grouped_by_top_acct(int argc, char *argv[])
// time_format = temp_time_format;
end_it:
- if (print_job_count)
+ if(print_job_count)
print_job_count = 0;
- if (individual_grouping)
+ if(individual_grouping)
individual_grouping = 0;
slurmdb_destroy_job_cond(job_cond);
- if (grouping_list) {
+ if(grouping_list) {
list_destroy(grouping_list);
grouping_list = NULL;
}
- if (assoc_list) {
+ if(assoc_list) {
list_destroy(assoc_list);
assoc_list = NULL;
}
- if (slurmdb_report_cluster_grouping_list) {
+ if(slurmdb_report_cluster_grouping_list) {
list_destroy(slurmdb_report_cluster_grouping_list);
slurmdb_report_cluster_grouping_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
- if (grouping_print_fields_list) {
+ if(grouping_print_fields_list) {
list_destroy(grouping_print_fields_list);
grouping_print_fields_list = NULL;
}
@@ -808,16 +808,16 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
_set_cond(&i, argc, argv, job_cond, format_list, grouping_list);
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,wc");
- if (!individual_grouping && !list_count(grouping_list))
+ if(!individual_grouping && !list_count(grouping_list))
slurm_addto_char_list(grouping_list, "50,250,500,1000");
_setup_print_fields_list(format_list);
list_destroy(format_list);
- if (!(slurmdb_report_cluster_grouping_list =
+ if(!(slurmdb_report_cluster_grouping_list =
slurmdb_report_job_sizes_grouped_by_wckey(db_conn,
job_cond, grouping_list))) {
exit_code = 1;
@@ -826,7 +826,7 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
_setup_grouping_print_fields_list(grouping_list);
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = job_cond->usage_start;
@@ -839,7 +839,7 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
printf("Job Sizes by Wckey %s - %s (%d secs)\n",
start_char, end_char,
(int)(job_cond->usage_end - job_cond->usage_start));
- if (print_job_count)
+ if(print_job_count)
printf("Units are in number of jobs ran\n");
else
printf("Time reported in %s\n", time_format_string);
@@ -938,35 +938,35 @@ extern int job_sizes_grouped_by_wckey(int argc, char *argv[])
// time_format = temp_time_format;
end_it:
- if (print_job_count)
+ if(print_job_count)
print_job_count = 0;
- if (individual_grouping)
+ if(individual_grouping)
individual_grouping = 0;
slurmdb_destroy_job_cond(job_cond);
- if (grouping_list) {
+ if(grouping_list) {
list_destroy(grouping_list);
grouping_list = NULL;
}
- if (wckey_list) {
+ if(wckey_list) {
list_destroy(wckey_list);
wckey_list = NULL;
}
- if (slurmdb_report_cluster_grouping_list) {
+ if(slurmdb_report_cluster_grouping_list) {
list_destroy(slurmdb_report_cluster_grouping_list);
slurmdb_report_cluster_grouping_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
- if (grouping_print_fields_list) {
+ if(grouping_print_fields_list) {
list_destroy(grouping_print_fields_list);
grouping_print_fields_list = NULL;
}
diff --git a/src/sreport/resv_reports.c b/src/sreport/resv_reports.c
index 5ca5fe149ab62f44f6b40e3517a132699fd064b3..a200a949c94f2ec27c16f890d63464490d56d8b2 100644
--- a/src/sreport/resv_reports.c
+++ b/src/sreport/resv_reports.c
@@ -80,67 +80,67 @@ static int _set_resv_cond(int *start, int argc, char *argv[],
int command_len = 0;
int option = 0;
- if (!resv_cond) {
+ if(!resv_cond) {
error("We need an slurmdb_reservation_cond to call this");
return SLURM_ERROR;
}
resv_cond->with_usage = 1;
- if (!resv_cond->cluster_list)
+ if(!resv_cond->cluster_list)
resv_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else {
command_len=end-1;
- if (argv[i][end] == '=') {
+ if(argv[i][end] == '=') {
option = (int)argv[i][end-1];
end++;
}
}
- if (!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
- } else if (!end
- || !strncasecmp(argv[i], "Names",
+ } else if(!end
+ || !strncasecmp (argv[i], "Names",
MAX(command_len, 1))) {
- if (!resv_cond->name_list)
+ if(!resv_cond->name_list)
resv_cond->name_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(resv_cond->name_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(resv_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
resv_cond->time_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Flags",
+ } else if (!strncasecmp (argv[i], "Flags",
MAX(command_len, 2))) {
/* FIX ME: make flags work here */
//resv_cond->flags = parse_resv_flags(argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 2))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list,
argv[i]+end);
- } else if (!strncasecmp(argv[i], "Ids",
+ } else if (!strncasecmp (argv[i], "Ids",
MAX(command_len, 1))) {
- if (!resv_cond->id_list)
+ if(!resv_cond->id_list)
resv_cond->id_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(resv_cond->id_list, argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Nodes",
+ } else if(!strncasecmp (argv[i], "Nodes",
MAX(command_len, 1))) {
- if (resv_cond->nodes) {
+ if(resv_cond->nodes) {
error("You already specified nodes '%s' "
" combine your request into 1 nodes=.",
resv_cond->nodes);
@@ -149,7 +149,7 @@ static int _set_resv_cond(int *start, int argc, char *argv[],
}
resv_cond->nodes = xstrdup(argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
resv_cond->time_start = parse_time(argv[i]+end, 1);
set = 1;
@@ -161,9 +161,9 @@ static int _set_resv_cond(int *start, int argc, char *argv[],
}
(*start) = i;
- if (!local_cluster_flag && !list_count(resv_cond->cluster_list)) {
+ if(!local_cluster_flag && !list_count(resv_cond->cluster_list)) {
char *temp = slurm_get_cluster_name();
- if (temp)
+ if(temp)
list_append(resv_cond->cluster_list, temp);
}
@@ -186,14 +186,14 @@ static int _setup_print_fields_list(List format_list)
print_field_t *field = NULL;
char *object = NULL;
- if (!format_list || !list_count(format_list)) {
+ if(!format_list || !list_count(format_list)) {
exit_code=1;
fprintf(stderr, " we need a format list "
"to set up the print.\n");
return SLURM_ERROR;
}
- if (!print_fields_list)
+ if(!print_fields_list)
print_fields_list = list_create(destroy_print_field);
itr = list_iterator_create(format_list);
@@ -202,7 +202,7 @@ static int _setup_print_fields_list(List format_list)
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -210,85 +210,85 @@ static int _setup_print_fields_list(List format_list)
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("allocated", object,
+ if(!strncasecmp("allocated", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_ACPU;
field->name = xstrdup("Allocated");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 9;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("Associations",
+ } else if(!strncasecmp("Associations",
object, MAX(command_len, 2))) {
field->type = PRINT_RESV_ASSOCS;
field->name = xstrdup("Associations");
field->len = 15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("cpucount", object,
+ } else if(!strncasecmp("cpucount", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_CPUS;
field->name = xstrdup("CPU count");
field->len = 9;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("down", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("down", object, MAX(command_len, 1))) {
field->type = PRINT_RESV_DCPU;
field->name = xstrdup("Down");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 9;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("idle", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("idle", object, MAX(command_len, 1))) {
field->type = PRINT_RESV_ICPU;
field->name = xstrdup("Idle");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 20;
else
field->len = 9;
field->print_routine = slurmdb_report_print_time;
- } else if (!strncasecmp("Nodes", object, MAX(command_len, 2))) {
+ } else if(!strncasecmp("Nodes", object, MAX(command_len, 2))) {
field->type = PRINT_RESV_NODES;
field->name = xstrdup("Nodes");
field->len = 15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Name", object,
+ } else if(!strncasecmp("Name", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_NAME;
field->name = xstrdup("Name");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Start", object,
+ } else if(!strncasecmp("Start", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_START;
field->name = xstrdup("Start");
field->len = 19;
field->print_routine = print_fields_date;
- } else if (!strncasecmp("End", object,
+ } else if(!strncasecmp("End", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_END;
field->name = xstrdup("End");
field->len = 19;
field->print_routine = print_fields_date;
- } else if (!strncasecmp("TotalTime", object,
+ } else if(!strncasecmp("TotalTime", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_TIME;
field->name = xstrdup("TotalTime");
field->len = 9;
field->print_routine = print_fields_time_from_secs;
- } else if (!strncasecmp("CPUTime", object,
+ } else if(!strncasecmp("CPUTime", object,
MAX(command_len, 2))) {
field->type = PRINT_RESV_CPUTIME;
field->name = xstrdup("CPUTime");
@@ -301,7 +301,7 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -324,13 +324,13 @@ static List _get_resv_list(int argc, char *argv[],
_set_resv_cond(&i, argc, argv, resv_cond, format_list);
resv_list = slurmdb_reservations_get(db_conn, resv_cond);
- if (!resv_list) {
+ if(!resv_list) {
exit_code=1;
fprintf(stderr, " Problem with resv query.\n");
return NULL;
}
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = resv_cond->time_start;
@@ -382,12 +382,12 @@ extern int resv_utilization(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- if (!(resv_list = _get_resv_list(argc, argv,
+ if(!(resv_list = _get_resv_list(argc, argv,
"Reservation Utilization",
format_list)))
goto end_it;
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list,
"Cl,name,start,end,al,i");
@@ -414,7 +414,7 @@ extern int resv_utilization(int argc, char *argv[])
*/
while((resv = list_next(itr))) {
while((tot_resv = list_next(tot_itr))) {
- if (tot_resv->id == resv->id) {
+ if(tot_resv->id == resv->id) {
/* get an average of cpus if the
reservation changes we will just
get an average.
@@ -423,14 +423,14 @@ extern int resv_utilization(int argc, char *argv[])
tot_resv->cpus /= 2;
tot_resv->alloc_secs += resv->alloc_secs;
tot_resv->down_secs += resv->down_secs;
- if (resv->time_start < tot_resv->time_start)
+ if(resv->time_start < tot_resv->time_start)
tot_resv->time_start = resv->time_start;
- if (resv->time_end > tot_resv->time_end)
+ if(resv->time_end > tot_resv->time_end)
tot_resv->time_end = resv->time_end;
break;
}
}
- if (!tot_resv)
+ if(!tot_resv)
list_append(tot_resv_list, resv);
list_iterator_reset(tot_itr);
@@ -443,7 +443,7 @@ extern int resv_utilization(int argc, char *argv[])
int curr_inx = 1;
total_time = tot_resv->time_end - tot_resv->time_start;
- if (total_time <= 0)
+ if(total_time <= 0)
continue;
total_reported = (uint64_t)(total_time * tot_resv->cpus);
@@ -544,15 +544,15 @@ extern int resv_utilization(int argc, char *argv[])
list_iterator_destroy(itr);
end_it:
- if (resv_list) {
+ if(resv_list) {
list_destroy(resv_list);
resv_list = NULL;
}
- if (tot_resv_list) {
+ if(tot_resv_list) {
list_destroy(tot_resv_list);
tot_resv_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
diff --git a/src/sreport/sreport.c b/src/sreport/sreport.c
index 07530128fa50b6356e8586d975ade3cc8e9d0df4..463c206e3c59b334316393708e3d4c0dc51d2644 100644
--- a/src/sreport/sreport.c
+++ b/src/sreport/sreport.c
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
/* Check to see if we are running a supported accounting plugin */
temp = slurm_get_accounting_storage_type();
- if (strcasecmp(temp, "accounting_storage/slurmdbd")
+ if(strcasecmp(temp, "accounting_storage/slurmdbd")
&& strcasecmp(temp, "accounting_storage/mysql")) {
fprintf (stderr, "You are not running a supported "
"accounting_storage plugin\n(%s).\n"
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
db_conn = slurmdb_connection_get();
- if (errno) {
+ if(errno) {
error("Problem talking to the database: %m");
exit(1);
}
@@ -239,10 +239,10 @@ static void _job_rep (int argc, char *argv[])
/* For backwards compatibility we just look at the 1st char
* by default since Sizes was the original name */
- if (!strncasecmp(argv[0], "SizesByAccount", MAX(command_len, 1))) {
+ if (!strncasecmp (argv[0], "SizesByAccount", MAX(command_len, 1))) {
error_code = job_sizes_grouped_by_top_acct(
(argc - 1), &argv[1]);
- } else if (!strncasecmp(argv[0],
+ } else if (!strncasecmp (argv[0],
"SizesByWcKey", MAX(command_len, 8))) {
error_code = job_sizes_grouped_by_wckey(
(argc - 1), &argv[1]);
@@ -267,7 +267,7 @@ static void _user_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
- if (strncasecmp(argv[0], "Top", 1) == 0) {
+ if (strncasecmp (argv[0], "Top", 1) == 0) {
error_code = user_top((argc - 1), &argv[1]);
} else {
exit_code = 1;
@@ -290,7 +290,7 @@ static void _resv_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
- if (strncasecmp(argv[0], "Utilization", 1) == 0) {
+ if (strncasecmp (argv[0], "Utilization", 1) == 0) {
error_code = resv_utilization((argc - 1), &argv[1]);
} else {
exit_code = 1;
@@ -313,17 +313,17 @@ static void _cluster_rep (int argc, char *argv[])
{
int error_code = SLURM_SUCCESS;
- if (strncasecmp(argv[0], "AccountUtilizationByUser", 1) == 0) {
+ if (strncasecmp (argv[0], "AccountUtilizationByUser", 1) == 0) {
error_code = cluster_account_by_user((argc - 1), &argv[1]);
- } else if ((strncasecmp(argv[0], "UserUtilizationByAccount", 18) == 0)
- || (strncasecmp(argv[0], "UA", 2) == 0)) {
+ } else if ((strncasecmp (argv[0], "UserUtilizationByAccount", 18) == 0)
+ || (strncasecmp (argv[0], "UA", 2) == 0)) {
error_code = cluster_user_by_account((argc - 1), &argv[1]);
- } else if ((strncasecmp(argv[0], "UserUtilizationByWckey", 18) == 0)
- || (strncasecmp(argv[0], "UW", 2) == 0)) {
+ } else if ((strncasecmp (argv[0], "UserUtilizationByWckey", 18) == 0)
+ || (strncasecmp (argv[0], "UW", 2) == 0)) {
error_code = cluster_user_by_wckey((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "Utilization", 2) == 0) {
+ } else if (strncasecmp (argv[0], "Utilization", 2) == 0) {
error_code = cluster_utilization((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "WCKeyUtilizationByUser", 1) == 0) {
+ } else if (strncasecmp (argv[0], "WCKeyUtilizationByUser", 1) == 0) {
error_code = cluster_wckey_by_user((argc - 1), &argv[1]);
} else {
exit_code = 1;
@@ -464,7 +464,7 @@ _process_command (int argc, char *argv[])
command_len = strlen(argv[0]);
- if ((strncasecmp(argv[0], "association", MAX(command_len, 1)) == 0)) {
+ if ((strncasecmp (argv[0], "association", MAX(command_len, 1)) == 0)) {
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -473,7 +473,7 @@ _process_command (int argc, char *argv[])
argv[0]);
} else
_assoc_rep((argc - 1), &argv[1]);
- } else if ((strncasecmp(argv[0], "cluster",
+ } else if ((strncasecmp (argv[0], "cluster",
MAX(command_len, 2)) == 0)) {
if (argc < 2) {
exit_code = 1;
@@ -483,7 +483,7 @@ _process_command (int argc, char *argv[])
argv[0]);
} else
_cluster_rep((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "help", MAX(command_len, 2)) == 0) {
+ } else if (strncasecmp (argv[0], "help", MAX(command_len, 2)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -491,7 +491,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
_usage ();
- } else if ((strncasecmp(argv[0], "job", MAX(command_len, 1)) == 0)) {
+ } else if ((strncasecmp (argv[0], "job", MAX(command_len, 1)) == 0)) {
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -500,16 +500,16 @@ _process_command (int argc, char *argv[])
argv[0]);
} else
_job_rep((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "quiet", MAX(command_len, 4)) == 0) {
+ } else if (strncasecmp (argv[0], "quiet", MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr, "too many arguments for keyword:%s\n",
argv[0]);
}
quiet_flag = 1;
- } else if ((strncasecmp(argv[0], "exit", MAX(command_len, 1)) == 0) ||
- (strncasecmp(argv[0], "\\q", MAX(command_len, 2)) == 0) ||
- (strncasecmp(argv[0], "quit", MAX(command_len, 4)) == 0)) {
+ } else if ((strncasecmp (argv[0], "exit", MAX(command_len, 1)) == 0) ||
+ (strncasecmp (argv[0], "\\q", MAX(command_len, 2)) == 0) ||
+ (strncasecmp (argv[0], "quit", MAX(command_len, 4)) == 0)) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -517,7 +517,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
exit_flag = 1;
- } else if (strncasecmp(argv[0], "nonparsable",
+ } else if (strncasecmp (argv[0], "nonparsable",
MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
@@ -525,7 +525,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
print_fields_parsable_print = 0;
- } else if (strncasecmp(argv[0], "parsable",
+ } else if (strncasecmp (argv[0], "parsable",
MAX(command_len, 8)) == 0) {
if (argc > 1) {
exit_code = 1;
@@ -533,7 +533,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
print_fields_parsable_print = PRINT_FIELDS_PARSABLE_ENDING;
- } else if (strncasecmp(argv[0], "parsable2",
+ } else if (strncasecmp (argv[0], "parsable2",
MAX(command_len, 9)) == 0) {
if (argc > 1) {
exit_code = 1;
@@ -541,9 +541,9 @@ _process_command (int argc, char *argv[])
argv[0]);
}
print_fields_parsable_print = PRINT_FIELDS_PARSABLE_NO_ENDING;
- } else if ((strncasecmp(argv[0], "reservation",
+ } else if ((strncasecmp (argv[0], "reservation",
MAX(command_len, 2)) == 0)
- || (strncasecmp(argv[0], "resv",
+ || (strncasecmp (argv[0], "resv",
MAX(command_len, 2)) == 0)) {
if (argc < 2) {
exit_code = 1;
@@ -553,7 +553,7 @@ _process_command (int argc, char *argv[])
argv[0]);
} else
_resv_rep((argc - 1), &argv[1]);
- } else if (strncasecmp(argv[0], "sort", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "sort", MAX(command_len, 1)) == 0) {
if (argc < 2) {
exit_code = 1;
fprintf (stderr,
@@ -561,7 +561,7 @@ _process_command (int argc, char *argv[])
argv[0]);
} else
_set_sort(argv[1]);
- } else if (strncasecmp(argv[0], "time", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (argv[0], "time", MAX(command_len, 1)) == 0) {
if (argc < 2) {
exit_code = 1;
fprintf (stderr,
@@ -569,7 +569,7 @@ _process_command (int argc, char *argv[])
argv[0]);
} else
_set_time_format(argv[1]);
- } else if (strncasecmp(argv[0], "verbose", MAX(command_len, 4)) == 0) {
+ } else if (strncasecmp (argv[0], "verbose", MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -577,7 +577,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
quiet_flag = -1;
- } else if (strncasecmp(argv[0], "version", MAX(command_len, 4)) == 0) {
+ } else if (strncasecmp (argv[0], "version", MAX(command_len, 4)) == 0) {
if (argc > 1) {
exit_code = 1;
fprintf (stderr,
@@ -585,7 +585,7 @@ _process_command (int argc, char *argv[])
argv[0]);
}
_print_version();
- } else if ((strncasecmp(argv[0], "user", MAX(command_len, 1)) == 0)) {
+ } else if ((strncasecmp (argv[0], "user", MAX(command_len, 1)) == 0)) {
if (argc < 2) {
exit_code = 1;
if (quiet_flag != 1)
@@ -606,25 +606,25 @@ static int _set_time_format(char *format)
{
int command_len = strlen(format);
- if (strncasecmp(format, "SecPer", MAX(command_len, 6)) == 0) {
+ if (strncasecmp (format, "SecPer", MAX(command_len, 6)) == 0) {
time_format = SLURMDB_REPORT_TIME_SECS_PER;
time_format_string = "Seconds/Percentage of Total";
- } else if (strncasecmp(format, "MinPer", MAX(command_len, 6)) == 0) {
+ } else if (strncasecmp (format, "MinPer", MAX(command_len, 6)) == 0) {
time_format = SLURMDB_REPORT_TIME_MINS_PER;
time_format_string = "Minutes/Percentage of Total";
- } else if (strncasecmp(format, "HourPer", MAX(command_len, 6)) == 0) {
+ } else if (strncasecmp (format, "HourPer", MAX(command_len, 6)) == 0) {
time_format = SLURMDB_REPORT_TIME_HOURS_PER;
time_format_string = "Hours/Percentage of Total";
- } else if (strncasecmp(format, "Seconds", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (format, "Seconds", MAX(command_len, 1)) == 0) {
time_format = SLURMDB_REPORT_TIME_SECS;
time_format_string = "Seconds";
- } else if (strncasecmp(format, "Minutes", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (format, "Minutes", MAX(command_len, 1)) == 0) {
time_format = SLURMDB_REPORT_TIME_MINS;
time_format_string = "Minutes";
- } else if (strncasecmp(format, "Hours", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (format, "Hours", MAX(command_len, 1)) == 0) {
time_format = SLURMDB_REPORT_TIME_HOURS;
time_format_string = "Hours";
- } else if (strncasecmp(format, "Percent", MAX(command_len, 1)) == 0) {
+ } else if (strncasecmp (format, "Percent", MAX(command_len, 1)) == 0) {
time_format = SLURMDB_REPORT_TIME_PERCENT;
time_format_string = "Percentage of Total";
} else {
@@ -639,9 +639,9 @@ static int _set_sort(char *format)
{
int command_len = strlen(format);
- if (strncasecmp(format, "Name", MAX(command_len, 1)) == 0) {
+ if (strncasecmp (format, "Name", MAX(command_len, 1)) == 0) {
sort_flag = SLURMDB_REPORT_SORT_NAME;
- } else if (strncasecmp(format, "Time", MAX(command_len, 6)) == 0) {
+ } else if (strncasecmp (format, "Time", MAX(command_len, 6)) == 0) {
sort_flag = SLURMDB_REPORT_SORT_TIME;
} else {
fprintf (stderr, "unknown timesort format %s", format);
diff --git a/src/sreport/user_reports.c b/src/sreport/user_reports.c
index 8c4e68210077bfed00b2173d217bf9c8fb3e276d..410e247a42a4eb15de760c569419d2e3a6fbc80c 100644
--- a/src/sreport/user_reports.c
+++ b/src/sreport/user_reports.c
@@ -63,72 +63,72 @@ static int _set_cond(int *start, int argc, char *argv[],
time_t start_time, end_time;
int command_len = 0;
- if (!user_cond) {
+ if(!user_cond) {
error("We need an slurmdb_user_cond to call this");
return SLURM_ERROR;
}
user_cond->with_deleted = 1;
user_cond->with_assocs = 1;
- if (!user_cond->assoc_cond) {
+ if(!user_cond->assoc_cond) {
user_cond->assoc_cond =
xmalloc(sizeof(slurmdb_association_cond_t));
user_cond->assoc_cond->with_usage = 1;
}
assoc_cond = user_cond->assoc_cond;
- if (!assoc_cond->cluster_list)
+ if(!assoc_cond->cluster_list)
assoc_cond->cluster_list = list_create(slurm_destroy_char);
for (i=(*start); i<argc; i++) {
end = parse_option_end(argv[i]);
- if (!end)
+ if(!end)
command_len=strlen(argv[i]);
else
command_len=end-1;
- if (!end && !strncasecmp(argv[i], "all_clusters",
+ if(!end && !strncasecmp(argv[i], "all_clusters",
MAX(command_len, 1))) {
local_cluster_flag = 1;
continue;
} else if (!end && !strncasecmp(argv[i], "group",
MAX(command_len, 1))) {
group_accts = 1;
- } else if (!end
- || !strncasecmp(argv[i], "Users",
+ } else if(!end
+ || !strncasecmp (argv[i], "Users",
MAX(command_len, 1))) {
- if (!assoc_cond->user_list)
+ if(!assoc_cond->user_list)
assoc_cond->user_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->user_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Accounts",
+ } else if (!strncasecmp (argv[i], "Accounts",
MAX(command_len, 2))
|| !strncasecmp(argv[i], "Acct",
MAX(command_len, 4))) {
- if (!assoc_cond->acct_list)
+ if(!assoc_cond->acct_list)
assoc_cond->acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(assoc_cond->acct_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "Clusters",
+ } else if (!strncasecmp (argv[i], "Clusters",
MAX(command_len, 1))) {
slurm_addto_char_list(assoc_cond->cluster_list,
argv[i]+end);
set = 1;
- } else if (!strncasecmp(argv[i], "End", MAX(command_len, 1))) {
+ } else if (!strncasecmp (argv[i], "End", MAX(command_len, 1))) {
assoc_cond->usage_end = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "Format",
+ } else if (!strncasecmp (argv[i], "Format",
MAX(command_len, 1))) {
- if (format_list)
+ if(format_list)
slurm_addto_char_list(format_list, argv[i]+end);
- } else if (!strncasecmp(argv[i], "Start",
+ } else if (!strncasecmp (argv[i], "Start",
MAX(command_len, 1))) {
assoc_cond->usage_start = parse_time(argv[i]+end, 1);
set = 1;
- } else if (!strncasecmp(argv[i], "TopCount",
+ } else if (!strncasecmp (argv[i], "TopCount",
MAX(command_len, 1))) {
if (get_uint(argv[i]+end, &top_limit, "TopCount")
!= SLURM_SUCCESS)
@@ -141,9 +141,9 @@ static int _set_cond(int *start, int argc, char *argv[],
}
(*start) = i;
- if (!local_cluster_flag && !list_count(assoc_cond->cluster_list)) {
+ if(!local_cluster_flag && !list_count(assoc_cond->cluster_list)) {
char *temp = slurm_get_cluster_name();
- if (temp)
+ if(temp)
list_append(assoc_cond->cluster_list, temp);
}
@@ -166,14 +166,14 @@ static int _setup_print_fields_list(List format_list)
print_field_t *field = NULL;
char *object = NULL;
- if (!format_list || !list_count(format_list)) {
+ if(!format_list || !list_count(format_list)) {
exit_code=1;
fprintf(stderr,
" We need a format list to set up the print.\n");
return SLURM_ERROR;
}
- if (!print_fields_list)
+ if(!print_fields_list)
print_fields_list = list_create(destroy_print_field);
itr = list_iterator_create(format_list);
@@ -182,7 +182,7 @@ static int _setup_print_fields_list(List format_list)
int command_len = 0;
int newlen = 0;
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -190,31 +190,31 @@ static int _setup_print_fields_list(List format_list)
command_len = strlen(object);
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Accounts", object, MAX(command_len, 1))) {
+ if(!strncasecmp("Accounts", object, MAX(command_len, 1))) {
field->type = PRINT_USER_ACCT;
field->name = xstrdup("Account");
field->len = 15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object,
+ } else if(!strncasecmp("Cluster", object,
MAX(command_len, 1))) {
field->type = PRINT_USER_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Login", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Login", object, MAX(command_len, 1))) {
field->type = PRINT_USER_LOGIN;
field->name = xstrdup("Login");
field->len = 9;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Proper", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Proper", object, MAX(command_len, 1))) {
field->type = PRINT_USER_PROPER;
field->name = xstrdup("Proper Name");
field->len = 15;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Used", object, MAX(command_len, 1))) {
+ } else if(!strncasecmp("Used", object, MAX(command_len, 1))) {
field->type = PRINT_USER_USED;
field->name = xstrdup("Used");
- if (time_format == SLURMDB_REPORT_TIME_SECS_PER
+ if(time_format == SLURMDB_REPORT_TIME_SECS_PER
|| time_format == SLURMDB_REPORT_TIME_MINS_PER
|| time_format == SLURMDB_REPORT_TIME_HOURS_PER)
field->len = 18;
@@ -228,7 +228,7 @@ static int _setup_print_fields_list(List format_list)
continue;
}
- if (newlen)
+ if(newlen)
field->len = newlen;
list_append(print_fields_list, field);
@@ -260,19 +260,19 @@ extern int user_top(int argc, char *argv[])
_set_cond(&i, argc, argv, user_cond, format_list);
- if (!list_count(format_list))
+ if(!list_count(format_list))
slurm_addto_char_list(format_list, "Cl,L,P,A,U");
_setup_print_fields_list(format_list);
list_destroy(format_list);
- if (!(slurmdb_report_cluster_list =
+ if(!(slurmdb_report_cluster_list =
slurmdb_report_user_top_usage(db_conn, user_cond, group_accts))) {
exit_code = 1;
goto end_it;
}
- if (print_fields_have_header) {
+ if(print_fields_have_header) {
char start_char[20];
char end_char[20];
time_t my_start = user_cond->assoc_cond->usage_start;
@@ -321,7 +321,7 @@ extern int user_top(int argc, char *argv[])
itr3 = list_iterator_create(
slurmdb_report_user->acct_list);
while((object = list_next(itr3))) {
- if (tmp_char)
+ if(tmp_char)
xstrfmtcat(tmp_char,
", %s",
object);
@@ -350,10 +350,10 @@ extern int user_top(int argc, char *argv[])
break;
case PRINT_USER_PROPER:
pwd = getpwnam(slurmdb_report_user->name);
- if (pwd) {
+ if(pwd) {
tmp_char = strtok(pwd->pw_gecos,
",");
- if (!tmp_char)
+ if(!tmp_char)
tmp_char =
pwd->pw_gecos;
}
@@ -380,7 +380,7 @@ extern int user_top(int argc, char *argv[])
list_iterator_reset(itr2);
printf("\n");
count++;
- if (count >= top_limit)
+ if(count >= top_limit)
break;
}
list_iterator_destroy(itr);
@@ -393,12 +393,12 @@ end_it:
group_accts = 0;
slurmdb_destroy_user_cond(user_cond);
- if (slurmdb_report_cluster_list) {
+ if(slurmdb_report_cluster_list) {
list_destroy(slurmdb_report_cluster_list);
slurmdb_report_cluster_list = NULL;
}
- if (print_fields_list) {
+ if(print_fields_list) {
list_destroy(print_fields_list);
print_fields_list = NULL;
}
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index 311156075f93f13739f8f701f725f95ee5844397..eb31d5a9006605d3ba4e5cefe471ed671d0cc0d4 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -134,7 +134,7 @@ static void _exit_on_signal(int signo)
/* This typically signifies the job was cancelled by scancel */
static void _job_complete_handler(srun_job_complete_msg_t *msg)
{
- if ((int)msg->step_id >= 0)
+ if((int)msg->step_id >= 0)
info("Force Terminated job %u.%u", msg->job_id, msg->step_id);
else
info("Force Terminated job %u", msg->job_id);
@@ -310,7 +310,7 @@ static int _blocks_dealloc(void)
return -1;
}
for (i=0; i<new_bg_ptr->record_count; i++) {
- if (new_bg_ptr->block_array[i].state
+ if(new_bg_ptr->block_array[i].state
== RM_PARTITION_DEALLOCATING) {
rc = 1;
break;
@@ -399,7 +399,7 @@ allocate_test(void)
{
int rc;
job_desc_msg_t *j = job_desc_msg_create_from_opts();
- if (!j)
+ if(!j)
return SLURM_ERROR;
rc = slurm_job_will_run(j);
@@ -449,7 +449,7 @@ allocate_nodes(void)
if (destroy_job) {
/* cancelled by signal */
break;
- } else if (!resp && !_retry()) {
+ } else if(!resp && !_retry()) {
break;
}
}
@@ -460,14 +460,14 @@ allocate_nodes(void)
*/
#ifdef HAVE_BG
if (!_wait_bluegene_block_ready(resp)) {
- if (!destroy_job)
+ if(!destroy_job)
error("Something is wrong with the "
"boot of the block.");
goto relinquish;
}
#else
if (!_wait_nodes_ready(resp)) {
- if (!destroy_job)
+ if(!destroy_job)
error("Something is wrong with the "
"boot of the nodes.");
goto relinquish;
@@ -475,7 +475,7 @@ allocate_nodes(void)
#endif
#ifdef HAVE_CRAY_XT
if (!_claim_reservation(resp)) {
- if (!destroy_job)
+ if(!destroy_job)
error("Something is wrong with the ALPS "
"resource reservation.");
goto relinquish;
@@ -500,7 +500,7 @@ allocate_nodes(void)
relinquish:
slurm_free_resource_allocation_response_msg(resp);
- if (!destroy_job)
+ if(!destroy_job)
slurm_complete_job(resp->job_id, 1);
exit(error_exit);
return NULL;
@@ -609,7 +609,7 @@ job_desc_msg_create_from_opts (void)
/* simplify the job allocation nodelist,
* not laying out tasks until step */
- if (j->req_nodes) {
+ if(j->req_nodes) {
hl = hostlist_create(j->req_nodes);
hostlist_ranged_string(hl, sizeof(buf), buf);
xfree(opt.nodelist);
@@ -622,7 +622,7 @@ job_desc_msg_create_from_opts (void)
j->req_nodes = xstrdup(buf);
}
- if (opt.distribution == SLURM_DIST_ARBITRARY
+ if(opt.distribution == SLURM_DIST_ARBITRARY
&& !j->req_nodes) {
error("With Arbitrary distribution you need to "
"specify a nodelist or hostfile with the -w option");
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 18a2c907026e9bd8363b9936b336c1e526679b10..f950c95f33da4f594c12e944c261a4b6c0897beb 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -259,12 +259,12 @@ static bool _valid_node_list(char **node_list_pptr)
procs to use then we need exactly this many since we are
saying, lay it out this way! Same for max and min nodes.
Other than that just read in as many in the hostfile */
- if (opt.ntasks_set)
+ if(opt.ntasks_set)
count = opt.ntasks;
- else if (opt.nodes_set) {
- if (opt.max_nodes)
+ else if(opt.nodes_set) {
+ if(opt.max_nodes)
count = opt.max_nodes;
- else if (opt.min_nodes)
+ else if(opt.min_nodes)
count = opt.min_nodes;
}
@@ -831,7 +831,7 @@ static void set_options(const int argc, char **argv)
exit(error_exit);
}
- if (opt.progname == NULL)
+ if(opt.progname == NULL)
opt.progname = xbasename(argv[0]);
else
error("opt.progname is already set.");
@@ -1524,7 +1524,7 @@ static void _opt_args(int argc, char **argv)
if (opt.distribution == SLURM_DIST_PLANE && opt.plane_size) {
if ((opt.ntasks/opt.plane_size) < opt.min_nodes) {
if (((opt.min_nodes-1)*opt.plane_size) >= opt.ntasks) {
-#if (0)
+#if(0)
info("Too few processes ((n/plane_size) %d < N %d) "
"and ((N-1)*(plane_size) %d >= n %d)) ",
opt.ntasks/opt.plane_size, opt.min_nodes,
@@ -1642,12 +1642,12 @@ static bool _opt_verify(void)
if (opt.argc > 0)
opt.cmd_name = base_name(opt.argv[0]);
- if (!opt.nodelist) {
- if ((opt.nodelist = xstrdup(getenv("SLURM_HOSTFILE")))) {
+ if(!opt.nodelist) {
+ if((opt.nodelist = xstrdup(getenv("SLURM_HOSTFILE")))) {
/* make sure the file being read in has a / in
it to make sure it is a file in the
valid_node_list function */
- if (!strstr(opt.nodelist, "/")) {
+ if(!strstr(opt.nodelist, "/")) {
char *add_slash = xstrdup("./");
xstrcat(add_slash, opt.nodelist);
xfree(opt.nodelist);
@@ -1670,14 +1670,14 @@ static bool _opt_verify(void)
/* set up the proc and node counts based on the arbitrary list
of nodes */
- if ((opt.distribution == SLURM_DIST_ARBITRARY)
+ if((opt.distribution == SLURM_DIST_ARBITRARY)
&& (!opt.nodes_set || !opt.ntasks_set)) {
hostlist_t hl = hostlist_create(opt.nodelist);
- if (!opt.ntasks_set) {
+ if(!opt.ntasks_set) {
opt.ntasks_set = true;
opt.ntasks = hostlist_count(hl);
}
- if (!opt.nodes_set) {
+ if(!opt.nodes_set) {
opt.nodes_set = true;
opt.nodes_set_opt = true;
hostlist_uniq(hl);
@@ -1690,11 +1690,11 @@ static bool _opt_verify(void)
* nodelist but only if it isn't arbitrary since the user has
* laid it out how it should be so don't mess with it print an
* error later if it doesn't work the way they wanted */
- if (opt.max_nodes && opt.nodelist
+ if(opt.max_nodes && opt.nodelist
&& opt.distribution != SLURM_DIST_ARBITRARY) {
hostlist_t hl = hostlist_create(opt.nodelist);
int count = hostlist_count(hl);
- if (count > opt.max_nodes) {
+ if(count > opt.max_nodes) {
int i = 0;
char buf[8192];
error("Required nodelist includes more nodes than "
@@ -1704,7 +1704,7 @@ static bool _opt_verify(void)
count -= opt.max_nodes;
while(i<count) {
char *name = hostlist_pop(hl);
- if (name)
+ if(name)
free(name);
else
break;
@@ -1838,7 +1838,7 @@ static bool _opt_verify(void)
error("memory allocation failure");
exit(error_exit);
}
- if (opt.distribution == SLURM_DIST_ARBITRARY
+ if(opt.distribution == SLURM_DIST_ARBITRARY
&& !opt.ntasks_set) {
opt.ntasks = hostlist_count(hl);
opt.ntasks_set = true;
@@ -2146,7 +2146,7 @@ static void _opt_list()
info("reservation : `%s'", opt.reservation);
info("wckey : `%s'", opt.wckey);
info("distribution : %s", format_task_dist_states(opt.distribution));
- if (opt.distribution == SLURM_DIST_PLANE)
+ if(opt.distribution == SLURM_DIST_PLANE)
info("plane size : %u", opt.plane_size);
info("cpu_bind : %s",
opt.cpu_bind == NULL ? "default" : opt.cpu_bind);
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 9ff18190d7bd458bf769e2f087457e60be345bd1..1fe9af5a587e4183af88ed4e6f97e1bd5a27287f 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -517,7 +517,7 @@ int srun(int ac, char **av)
}
cleanup:
- if (got_alloc) {
+ if(got_alloc) {
cleanup_allocation();
/* send the controller we were cancelled */
@@ -602,7 +602,7 @@ static char *_uint16_array_to_str(int array_len, const uint16_t *array)
char *sep = ","; /* seperator */
char *str = xstrdup("");
- if (array == NULL)
+ if(array == NULL)
return str;
for (i = 0; i < array_len; i++) {
@@ -1072,7 +1072,7 @@ _task_start(launch_tasks_response_msg_t *msg)
int taskid;
int i;
- if (msg->count_of_pids)
+ if(msg->count_of_pids)
verbose("Node %s, %d tasks started",
msg->node_name, msg->count_of_pids);
else
@@ -1367,7 +1367,7 @@ static void _handle_pipe(int signo)
{
static int ending = 0;
- if (ending)
+ if(ending)
return;
ending = 1;
slurm_step_launch_abort(job->step_ctx);
diff --git a/src/srun/srun_job.c b/src/srun/srun_job.c
index 94327869d2d63a1357f1ce4f895e8938dbde216f..2b4898b09f58060cf0f5daa62d42f0119a813a1c 100644
--- a/src/srun/srun_job.c
+++ b/src/srun/srun_job.c
@@ -166,7 +166,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
char *node_name = NULL;
hl = hostlist_create(ai->nodelist);
- if (opt.nodelist) {
+ if(opt.nodelist) {
inc_hl = hostlist_create(opt.nodelist);
}
hostlist_uniq(hl);
@@ -178,7 +178,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
hostlist_delete_nth(hl, inx);
ai->nnodes--; /* decrement node count */
}
- if (inc_hl) {
+ if(inc_hl) {
inx = hostlist_find(inc_hl, node_name);
if (inx >= 0) {
error("Requested node %s is also "
@@ -205,26 +205,26 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
* know it is less than the number of nodes
* in the allocation
*/
- if (opt.ntasks_set && (opt.ntasks < ai->nnodes))
+ if(opt.ntasks_set && (opt.ntasks < ai->nnodes))
opt.min_nodes = opt.ntasks;
else
opt.min_nodes = ai->nnodes;
opt.nodes_set = true;
}
- if (!opt.max_nodes)
+ if(!opt.max_nodes)
opt.max_nodes = opt.min_nodes;
- if ((opt.max_nodes > 0) && (opt.max_nodes < ai->nnodes))
+ if((opt.max_nodes > 0) && (opt.max_nodes < ai->nnodes))
ai->nnodes = opt.max_nodes;
count = hostlist_count(hl);
- if (!count) {
+ if(!count) {
error("Hostlist is now nothing! Can't run job.");
hostlist_destroy(hl);
goto error;
}
- if (inc_hl) {
+ if(inc_hl) {
count = hostlist_count(inc_hl);
- if (count < ai->nnodes) {
+ if(count < ai->nnodes) {
/* add more nodes to get correct number for
allocation */
hostlist_t tmp_hl = hostlist_copy(hl);
@@ -245,7 +245,7 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
xfree(opt.nodelist);
opt.nodelist = xstrdup(buf);
} else {
- if (count > ai->nnodes) {
+ if(count > ai->nnodes) {
/* remove more nodes than needed for
allocation */
int i=0;
@@ -265,15 +265,15 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
* know it is less than the number of nodes
* in the allocation
*/
- if (opt.ntasks_set && (opt.ntasks < ai->nnodes))
+ if(opt.ntasks_set && (opt.ntasks < ai->nnodes))
opt.min_nodes = opt.ntasks;
else
opt.min_nodes = ai->nnodes;
opt.nodes_set = true;
}
- if (!opt.max_nodes)
+ if(!opt.max_nodes)
opt.max_nodes = opt.min_nodes;
- if ((opt.max_nodes > 0) && (opt.max_nodes < ai->nnodes))
+ if((opt.max_nodes > 0) && (opt.max_nodes < ai->nnodes))
ai->nnodes = opt.max_nodes;
/* Don't reset the ai->nodelist because that is the
* nodelist we want to say the allocation is under
@@ -284,11 +284,11 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
}
/* get the correct number of hosts to run tasks on */
- if (opt.nodelist) {
+ if(opt.nodelist) {
hl = hostlist_create(opt.nodelist);
- if (opt.distribution != SLURM_DIST_ARBITRARY)
+ if(opt.distribution != SLURM_DIST_ARBITRARY)
hostlist_uniq(hl);
- if (!hostlist_count(hl)) {
+ if(!hostlist_count(hl)) {
error("Hostlist is now nothing! Can not run job.");
hostlist_destroy(hl);
goto error;
@@ -307,8 +307,8 @@ job_step_create_allocation(resource_allocation_response_msg_t *resp)
opt.nodelist = xstrdup(buf);
}
- if (opt.distribution == SLURM_DIST_ARBITRARY) {
- if (count != opt.ntasks) {
+ if(opt.distribution == SLURM_DIST_ARBITRARY) {
+ if(count != opt.ntasks) {
error("You asked for %d tasks but specified %d nodes",
opt.ntasks, count);
goto error;
@@ -469,7 +469,7 @@ _job_create_structure(allocation_info_t *ainfo)
#endif
#ifndef HAVE_FRONT_END
- if (opt.min_nodes > job->nhosts) {
+ if(opt.min_nodes > job->nhosts) {
error("Only allocated %d nodes asked for %d",
job->nhosts, opt.min_nodes);
if (opt.exc_nodes) {
diff --git a/src/sshare/process.c b/src/sshare/process.c
index 9980a18eccf4625c1c40b6a81ca81b6dfd831f95..bbe6f36beb02f2d4ff71f892a0d41284c5c3c77f 100644
--- a/src/sshare/process.c
+++ b/src/sshare/process.c
@@ -70,7 +70,7 @@ extern int process(shares_response_msg_t *resp)
PRINT_USER,
};
- if (!resp)
+ if(!resp)
return SLURM_ERROR;
format_list = list_create(slurm_destroy_char);
@@ -91,52 +91,52 @@ extern int process(shares_response_msg_t *resp)
while((object = list_next(itr))) {
char *tmp_char = NULL;
field = xmalloc(sizeof(print_field_t));
- if (!strncasecmp("Account", object, 1)) {
+ if(!strncasecmp("Account", object, 1)) {
field->type = PRINT_ACCOUNT;
field->name = xstrdup("Account");
field->len = -20;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("Cluster", object, 1)) {
+ } else if(!strncasecmp("Cluster", object, 1)) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_fields_str;
- } else if (!strncasecmp("EffUsage", object, 1)) {
+ } else if(!strncasecmp("EffUsage", object, 1)) {
field->type = PRINT_EUSED;
field->name = xstrdup("Effectv Usage");
field->len = 13;
field->print_routine = print_fields_double;
- } else if (!strncasecmp("FSFctr", object, 1)) {
+ } else if(!strncasecmp("FSFctr", object, 1)) {
field->type = PRINT_FSFACTOR;
field->name = xstrdup("Fair-share");
field->len = 10;
field->print_routine = print_fields_double;
- } else if (!strncasecmp("ID", object, 1)) {
+ } else if(!strncasecmp("ID", object, 1)) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_fields_uint;
- } else if (!strncasecmp("NormShares", object, 5)) {
+ } else if(!strncasecmp("NormShares", object, 5)) {
field->type = PRINT_NORMS;
field->name = xstrdup("Norm Shares");
field->len = 11;
field->print_routine = print_fields_double;
- } else if (!strncasecmp("NormUsage", object, 5)) {
+ } else if(!strncasecmp("NormUsage", object, 5)) {
field->type = PRINT_NORMU;
field->name = xstrdup("Norm Usage");
field->len = 11;
field->print_routine = print_fields_double;
- } else if (!strncasecmp("RawShares", object, 4)) {
+ } else if(!strncasecmp("RawShares", object, 4)) {
field->type = PRINT_RAWS;
field->name = xstrdup("Raw Shares");
field->len = 10;
field->print_routine = print_fields_uint32;
- } else if (!strncasecmp("RawUsage", object, 4)) {
+ } else if(!strncasecmp("RawUsage", object, 4)) {
field->type = PRINT_RAWU;
field->name = xstrdup("Raw Usage");
field->len = 11;
field->print_routine = print_fields_uint64;
- } else if (!strncasecmp("User", object, 1)) {
+ } else if(!strncasecmp("User", object, 1)) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 10;
@@ -148,9 +148,9 @@ extern int process(shares_response_msg_t *resp)
xfree(field);
continue;
}
- if ((tmp_char = strstr(object, "\%"))) {
+ if((tmp_char = strstr(object, "\%"))) {
int newlen = atoi(tmp_char+1);
- if (newlen)
+ if(newlen)
field->len = newlen;
}
list_append(print_fields_list, field);
@@ -158,7 +158,7 @@ extern int process(shares_response_msg_t *resp)
list_iterator_destroy(itr);
list_destroy(format_list);
- if (exit_code) {
+ if(exit_code) {
list_destroy(print_fields_list);
return SLURM_ERROR;
}
@@ -168,7 +168,7 @@ extern int process(shares_response_msg_t *resp)
field_count = list_count(print_fields_list);
- if (!resp->assoc_shares_list || !list_count(resp->assoc_shares_list))
+ if(!resp->assoc_shares_list || !list_count(resp->assoc_shares_list))
return SLURM_SUCCESS;
tree_list = list_create(slurmdb_destroy_print_tree);
itr = list_iterator_create(resp->assoc_shares_list);
@@ -180,7 +180,7 @@ extern int process(shares_response_msg_t *resp)
while((field = list_next(itr2))) {
switch(field->type) {
case PRINT_ACCOUNT:
- if (assoc->user)
+ if(assoc->user)
local_acct = xstrdup_printf(
"|%s", assoc->name);
else
@@ -239,7 +239,7 @@ extern int process(shares_response_msg_t *resp)
(curr_inx == field_count));
break;
case PRINT_USER:
- if (assoc->user)
+ if(assoc->user)
tmp_char = assoc->name;
field->print_routine(field,
tmp_char,
@@ -257,7 +257,7 @@ extern int process(shares_response_msg_t *resp)
printf("\n");
}
- if (tree_list)
+ if(tree_list)
list_destroy(tree_list);
list_iterator_destroy(itr2);
diff --git a/src/sshare/sshare.c b/src/sshare/sshare.c
index 49811988f8b47b20aa41603249aec8b3ad4aa1d3..21c0fca2611e1803fa29073c7460228822830279 100644
--- a/src/sshare/sshare.c
+++ b/src/sshare/sshare.c
@@ -89,7 +89,7 @@ main (int argc, char *argv[])
/* Check to see if we are running a supported accounting plugin */
temp = slurm_get_priority_type();
- if (strcasecmp(temp, "priority/multifactor")) {
+ if(strcasecmp(temp, "priority/multifactor")) {
fprintf (stderr, "You are not running a supported "
"priority plugin\n(%s).\n"
"Only 'priority/multifactor' is supported.\n",
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
all_users = 1;
break;
case 'A':
- if (!req_msg.acct_list)
+ if(!req_msg.acct_list)
req_msg.acct_list =
list_create(slurm_destroy_char);
slurm_addto_char_list(req_msg.acct_list, optarg);
@@ -132,9 +132,9 @@ main (int argc, char *argv[])
long_flag = 1;
break;
case 'M':
- if (clusters)
+ if(clusters)
list_destroy(clusters);
- if (!(clusters =
+ if(!(clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
@@ -154,12 +154,12 @@ main (int argc, char *argv[])
PRINT_FIELDS_PARSABLE_NO_ENDING;
break;
case 'u':
- if (!strcmp(optarg, "-1")) {
+ if(!strcmp(optarg, "-1")) {
all_users = 1;
break;
}
all_users = 0;
- if (!req_msg.user_list)
+ if(!req_msg.user_list)
req_msg.user_list =
list_create(slurm_destroy_char);
_addto_name_char_list(req_msg.user_list, optarg, 0);
@@ -190,13 +190,13 @@ main (int argc, char *argv[])
log_alter(opts, 0, NULL);
}
- if (all_users) {
- if (req_msg.user_list
+ if(all_users) {
+ if(req_msg.user_list
&& list_count(req_msg.user_list)) {
list_destroy(req_msg.user_list);
req_msg.user_list = NULL;
}
- if (verbosity)
+ if(verbosity)
fprintf(stderr, "Users requested:\n\t: all\n");
} else if (verbosity && req_msg.user_list
&& list_count(req_msg.user_list)) {
@@ -205,40 +205,40 @@ main (int argc, char *argv[])
while((temp = list_next(itr)))
fprintf(stderr, "\t: %s\n", temp);
list_iterator_destroy(itr);
- } else if (!req_msg.user_list || !list_count(req_msg.user_list)) {
+ } else if(!req_msg.user_list || !list_count(req_msg.user_list)) {
struct passwd *pwd = getpwuid(getuid());
- if (!req_msg.user_list)
+ if(!req_msg.user_list)
req_msg.user_list = list_create(slurm_destroy_char);
temp = xstrdup(pwd->pw_name);
list_append(req_msg.user_list, temp);
- if (verbosity) {
+ if(verbosity) {
fprintf(stderr, "Users requested:\n");
fprintf(stderr, "\t: %s\n", temp);
}
}
- if (req_msg.acct_list && list_count(req_msg.acct_list)) {
+ if(req_msg.acct_list && list_count(req_msg.acct_list)) {
fprintf(stderr, "Accounts requested:\n");
ListIterator itr = list_iterator_create(req_msg.acct_list);
while((temp = list_next(itr)))
fprintf(stderr, "\t: %s\n", temp);
list_iterator_destroy(itr);
} else {
- if (req_msg.acct_list
+ if(req_msg.acct_list
&& list_count(req_msg.acct_list)) {
list_destroy(req_msg.acct_list);
req_msg.acct_list = NULL;
}
- if (verbosity)
+ if(verbosity)
fprintf(stderr, "Accounts requested:\n\t: all\n");
}
error_code = _get_info(&req_msg, &resp_msg);
- if (req_msg.acct_list)
+ if(req_msg.acct_list)
list_destroy(req_msg.acct_list);
- if (req_msg.user_list)
+ if(req_msg.user_list)
list_destroy(req_msg.user_list);
if (error_code) {
@@ -299,13 +299,13 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
int quote = 0;
int count = 0;
- if (!char_list) {
+ if(!char_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(char_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -314,12 +314,12 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
//info("got %s %d", name, i-start);
@@ -331,11 +331,11 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -344,7 +344,7 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
}
i++;
start = i;
- if (!names[i]) {
+ if(!names[i]) {
info("There is a problem with "
"your request. It appears you "
"have spaces inside your list.");
@@ -353,7 +353,7 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
@@ -364,11 +364,11 @@ static int _addto_name_char_list(List char_list, char *names, bool gid)
}
while((tmp_char = list_next(itr))) {
- if (!strcasecmp(tmp_char, name))
+ if(!strcasecmp(tmp_char, name))
break;
}
- if (!tmp_char) {
+ if(!tmp_char) {
list_append(char_list, name);
count++;
} else
@@ -383,7 +383,7 @@ static char *_convert_to_name(int id, bool gid)
{
char *name = NULL;
- if (gid) {
+ if(gid) {
struct group *grp;
if (!(grp=getgrgid(id))) {
fprintf(stderr, "Invalid group id: %s\n", name);
diff --git a/src/sstat/options.c b/src/sstat/options.c
index ec457fb64f65b17545d129b0e3d890b948eb8a0a..01075e60e2ea395450bc4f4e58c1b8e965ff3c19 100644
--- a/src/sstat/options.c
+++ b/src/sstat/options.c
@@ -55,7 +55,7 @@ void _help_fields_msg(void)
for (i = 0; fields[i].name; i++) {
if (i & 3)
printf(" ");
- else if (i)
+ else if(i)
printf("\n");
printf("%-13s", fields[i].name);
}
@@ -146,13 +146,13 @@ static int _addto_job_list(List job_list, char *names)
int quote = 0;
int count = 0;
- if (!job_list) {
+ if(!job_list) {
error("No list was given to fill in");
return 0;
}
itr = list_iterator_create(job_list);
- if (names) {
+ if(names) {
if (names[i] == '\"' || names[i] == '\'') {
quote_c = names[i];
quote = 1;
@@ -161,12 +161,12 @@ static int _addto_job_list(List job_list, char *names)
start = i;
while(names[i]) {
//info("got %d - %d = %d", i, start, i-start);
- if (quote && names[i] == quote_c)
+ if(quote && names[i] == quote_c)
break;
else if (names[i] == '\"' || names[i] == '\'')
names[i] = '`';
- else if (names[i] == ',') {
- if ((i-start) > 0) {
+ else if(names[i] == ',') {
+ if((i-start) > 0) {
char *dot = NULL;
name = xmalloc((i-start+1));
memcpy(name, names+start, (i-start));
@@ -186,7 +186,7 @@ static int _addto_job_list(List job_list, char *names)
xfree(name);
while((curr_step = list_next(itr))) {
- if ((curr_step->jobid
+ if((curr_step->jobid
== selected_step->jobid)
&& (curr_step->stepid
== selected_step->
@@ -194,7 +194,7 @@ static int _addto_job_list(List job_list, char *names)
break;
}
- if (!curr_step) {
+ if(!curr_step) {
list_append(job_list,
selected_step);
count++;
@@ -208,7 +208,7 @@ static int _addto_job_list(List job_list, char *names)
}
i++;
}
- if ((i-start) > 0) {
+ if((i-start) > 0) {
name = xmalloc((i-start)+1);
memcpy(name, names+start, (i-start));
@@ -226,13 +226,13 @@ static int _addto_job_list(List job_list, char *names)
xfree(name);
while((curr_step = list_next(itr))) {
- if ((curr_step->jobid == selected_step->jobid)
+ if((curr_step->jobid == selected_step->jobid)
&& (curr_step->stepid
== selected_step->stepid))
break;
}
- if (!curr_step) {
+ if(!curr_step) {
list_append(job_list, selected_step);
count++;
} else
@@ -325,7 +325,7 @@ void parse_command_line(int argc, char **argv)
optarg);
exit(1);
}
- if (!params.opt_job_list)
+ if(!params.opt_job_list)
params.opt_job_list = list_create(
slurmdb_destroy_selected_step);
_addto_job_list(params.opt_job_list, optarg);
@@ -364,7 +364,7 @@ void parse_command_line(int argc, char **argv)
}
}
- if (params.opt_help) {
+ if(params.opt_help) {
_do_help();
exit(0);
}
@@ -378,13 +378,13 @@ void parse_command_line(int argc, char **argv)
optarg);
exit(1);
}
- if (!params.opt_job_list)
+ if(!params.opt_job_list)
params.opt_job_list = list_create(
slurmdb_destroy_selected_step);
_addto_job_list(params.opt_job_list, optarg);
}
- if (!params.opt_field_list)
+ if(!params.opt_field_list)
xstrfmtcat(params.opt_field_list, "%s,", STAT_FIELDS);
if (params.opt_verbose) {
@@ -399,7 +399,7 @@ void parse_command_line(int argc, char **argv)
debug("Jobs requested:\n");
itr = list_iterator_create(params.opt_job_list);
while((selected_step = list_next(itr))) {
- if (selected_step->stepid != NO_VAL)
+ if(selected_step->stepid != NO_VAL)
debug("\t: %d.%d\n",
selected_step->jobid,
selected_step->stepid);
@@ -419,10 +419,10 @@ void parse_command_line(int argc, char **argv)
*end = 0;
while (isspace(*start))
start++; /* discard whitespace */
- if (!(int)*start)
+ if(!(int)*start)
continue;
- if ((tmp_char = strstr(start, "\%"))) {
+ if((tmp_char = strstr(start, "\%"))) {
newlen = atoi(tmp_char+1);
tmp_char[0] = '\0';
}
@@ -436,7 +436,7 @@ void parse_command_line(int argc, char **argv)
error("Invalid field requested: \"%s\"", start);
exit(1);
foundfield:
- if (newlen)
+ if(newlen)
fields[i].len = newlen;
list_append(print_fields_list, &fields[i]);
start = end + 1;
diff --git a/src/sstat/print.c b/src/sstat/print.c
index 0c630313dd5899d085460c19afb529697d31d4be..888fcbab11d64abf23355dc002c907715ef44789 100644
--- a/src/sstat/print.c
+++ b/src/sstat/print.c
@@ -51,7 +51,7 @@ char *_elapsed_time(long secs, long usecs)
long subsec = 0;
char *str = NULL;
- if (secs < 0 || secs == NO_VAL)
+ if(secs < 0 || secs == NO_VAL)
return NULL;
@@ -59,7 +59,7 @@ char *_elapsed_time(long secs, long usecs)
secs++;
usecs -= 1E6;
}
- if (usecs > 0) {
+ if(usecs > 0) {
/* give me 3 significant digits to tack onto the sec */
subsec = (usecs/1000);
}
diff --git a/src/sstat/process.c b/src/sstat/process.c
index a1a4f947d9e113238e2d2fe3d254b58dfbf67a31..5513a7db4e9a80d713a1e8180a2b7798c73b0bf0 100644
--- a/src/sstat/process.c
+++ b/src/sstat/process.c
@@ -46,12 +46,12 @@ char *find_hostname(uint32_t pos, char *hosts)
hostlist_t hostlist = NULL;
char *temp = NULL, *host = NULL;
- if (!hosts || (pos == (uint32_t)NO_VAL))
+ if(!hosts || (pos == (uint32_t)NO_VAL))
return NULL;
hostlist = hostlist_create(hosts);
temp = hostlist_nth(hostlist, pos);
- if (temp) {
+ if(temp) {
host = xstrdup(temp);
free(temp);
}
@@ -61,28 +61,28 @@ char *find_hostname(uint32_t pos, char *hosts)
void aggregate_stats(slurmdb_stats_t *dest, slurmdb_stats_t *from)
{
- if (dest->vsize_max < from->vsize_max) {
+ if(dest->vsize_max < from->vsize_max) {
dest->vsize_max = from->vsize_max;
dest->vsize_max_nodeid = from->vsize_max_nodeid;
dest->vsize_max_taskid = from->vsize_max_taskid;
}
dest->vsize_ave += from->vsize_ave;
- if (dest->rss_max < from->rss_max) {
+ if(dest->rss_max < from->rss_max) {
dest->rss_max = from->rss_max;
dest->rss_max_nodeid = from->rss_max_nodeid;
dest->rss_max_taskid = from->rss_max_taskid;
}
dest->rss_ave += from->rss_ave;
- if (dest->pages_max < from->pages_max) {
+ if(dest->pages_max < from->pages_max) {
dest->pages_max = from->pages_max;
dest->pages_max_nodeid = from->pages_max_nodeid;
dest->pages_max_taskid = from->pages_max_taskid;
}
dest->pages_ave += from->pages_ave;
- if ((dest->cpu_min > from->cpu_min)
+ if((dest->cpu_min > from->cpu_min)
|| (dest->cpu_min == NO_VAL)) {
dest->cpu_min = from->cpu_min;
dest->cpu_min_nodeid = from->cpu_min_nodeid;
diff --git a/src/sstat/sstat.c b/src/sstat/sstat.c
index f60d733e69ab8e1d4cb28147949c4caee5548d26..74c9a36a54004fea929659725b11490b0e9819e8 100644
--- a/src/sstat/sstat.c
+++ b/src/sstat/sstat.c
@@ -92,7 +92,7 @@ int _do_stat(uint32_t jobid, uint32_t stepid)
hostlist_t hl = NULL;
debug("requesting info for job %u.%u", jobid, stepid);
- if ((rc = slurm_job_step_stat(jobid, stepid, NULL,
+ if((rc = slurm_job_step_stat(jobid, stepid, NULL,
&step_stat_response)) != SLURM_SUCCESS) {
error("problem getting step_layout for %u.%u: %s",
jobid, stepid, slurm_strerror(rc));
@@ -118,19 +118,19 @@ int _do_stat(uint32_t jobid, uint32_t stepid)
hl = hostlist_create(NULL);
itr = list_iterator_create(step_stat_response->stats_list);
while((step_stat = list_next(itr))) {
- if (!step_stat->step_pids || !step_stat->step_pids->node_name)
+ if(!step_stat->step_pids || !step_stat->step_pids->node_name)
continue;
if (step_stat->step_pids->pid_cnt > 0 ) {
int i;
for(i=0; i<step_stat->step_pids->pid_cnt; i++) {
- if (step.pid_str)
+ if(step.pid_str)
xstrcat(step.pid_str, ",");
xstrfmtcat(step.pid_str, "%u",
step_stat->step_pids->pid[i]);
}
}
- if (params.pid_format) {
+ if(params.pid_format) {
step.nodes = step_stat->step_pids->node_name;
print_fields(&step);
xfree(step.pid_str);
@@ -153,7 +153,7 @@ int _do_stat(uint32_t jobid, uint32_t stepid)
hostlist_destroy(hl);
tot_tasks += ntasks;
- if (tot_tasks) {
+ if(tot_tasks) {
step.stats.cpu_ave /= (double)tot_tasks;
step.stats.rss_ave /= (double)tot_tasks;
step.stats.vsize_ave /= (double)tot_tasks;
@@ -176,7 +176,7 @@ int main(int argc, char **argv)
print_fields_itr = list_iterator_create(print_fields_list);
parse_command_line(argc, argv);
- if (!params.opt_job_list || !list_count(params.opt_job_list)) {
+ if(!params.opt_job_list || !list_count(params.opt_job_list)) {
error("You didn't give me any jobs to stat.");
return 1;
}
@@ -184,12 +184,12 @@ int main(int argc, char **argv)
print_fields_header(print_fields_list);
itr = list_iterator_create(params.opt_job_list);
while((selected_step = list_next(itr))) {
- if (selected_step->stepid != NO_VAL)
+ if(selected_step->stepid != NO_VAL)
stepid = selected_step->stepid;
- else if (params.opt_all_steps) {
+ else if(params.opt_all_steps) {
job_step_info_response_msg_t *step_ptr = NULL;
int i = 0;
- if (slurm_get_job_steps(
+ if(slurm_get_job_steps(
0, selected_step->jobid, NO_VAL,
&step_ptr, SHOW_ALL)) {
error("couldn't get steps for job %u",
@@ -205,14 +205,14 @@ int main(int argc, char **argv)
} else {
/* get the first running step to query against. */
job_step_info_response_msg_t *step_ptr = NULL;
- if (slurm_get_job_steps(
+ if(slurm_get_job_steps(
0, selected_step->jobid, NO_VAL,
&step_ptr, SHOW_ALL)) {
error("couldn't get steps for job %u",
selected_step->jobid);
continue;
}
- if (!step_ptr->job_step_count) {
+ if(!step_ptr->job_step_count) {
error("no steps running for job %u",
selected_step->jobid);
continue;
@@ -224,12 +224,12 @@ int main(int argc, char **argv)
list_iterator_destroy(itr);
xfree(params.opt_field_list);
- if (params.opt_job_list)
+ if(params.opt_job_list)
list_destroy(params.opt_job_list);
- if (print_fields_itr)
+ if(print_fields_itr)
list_iterator_destroy(print_fields_itr);
- if (print_fields_list)
+ if(print_fields_list)
list_destroy(print_fields_list);
return 0;
diff --git a/src/strigger/opts.c b/src/strigger/opts.c
index 4fcf220c9bd1ffdf52d4378d70473107e97806b0..44c08f502ab4445064ff0768e648e24672143cf5 100644
--- a/src/strigger/opts.c
+++ b/src/strigger/opts.c
@@ -161,9 +161,9 @@ extern void parse_command_line(int argc, char *argv[])
params.job_id = tmp_l;
break;
case (int) 'M':
- if (params.clusters)
+ if(params.clusters)
list_destroy(params.clusters);
- if (!(params.clusters =
+ if(!(params.clusters =
slurmdb_get_info_cluster(optarg))) {
error("'%s' invalid entry for --cluster",
optarg);
diff --git a/src/sview/admin_info.c b/src/sview/admin_info.c
index d5459d24c38b784a1c0cc4bd2405f65af47578b8..632b498e3fc2fb315ee36ab89a533962c9e62a5d 100644
--- a/src/sview/admin_info.c
+++ b/src/sview/admin_info.c
@@ -103,13 +103,13 @@ extern void row_clicked_admin(GtkTreeView *tree_view,
GtkWidget *popup = NULL;
GtkWidget *label = NULL;
char *info = NULL;
- if (line == -1) {
+ if(line == -1) {
g_error("problem getting line number");
return;
}
/* part_ptr = &new_part_ptr->partition_array[line]; */
- /* if (!(info = slurm_sprint_partition_info(part_ptr, 0))) { */
+ /* if(!(info = slurm_sprint_partition_info(part_ptr, 0))) { */
/* info = xmalloc(100); */
/* sprintf(info, "Problem getting partition info for %s", */
/* part_ptr->name); */
diff --git a/src/sview/block_info.c b/src/sview/block_info.c
index 6a2f8bdb09ddea08b7787afcaaeb4da32c991c0f..0120407322aafbd12ff9d6ccff67f492ae4dfaab 100644
--- a/src/sview/block_info.c
+++ b/src/sview/block_info.c
@@ -199,14 +199,14 @@ static int _in_slurm_partition(int *part_inx, int *bp_inx)
j = 0;
found = 0;
while(part_inx[j] >= 0) {
- if ((bp_inx[i] >= part_inx[j])
+ if((bp_inx[i] >= part_inx[j])
&& bp_inx[i+1] <= part_inx[j+1]) {
found = 1;
break;
}
j += 2;
}
- if (!found)
+ if(!found)
return 0;
i += 2;
}
@@ -233,7 +233,7 @@ static void _layout_block_record(GtkTreeView *treeview,
SORTID_CONN),
conn_type_string(
block_ptr->bg_conn_type));
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_IMAGEBLRTS),
@@ -265,7 +265,7 @@ static void _layout_block_record(GtkTreeView *treeview,
block_ptr->imagemloader);
}
- if (block_ptr->job_running > NO_JOB_RUNNING)
+ if(block_ptr->job_running > NO_JOB_RUNNING)
snprintf(tmp_cnt, sizeof(tmp_cnt),
"%d", block_ptr->job_running);
else
@@ -275,7 +275,7 @@ static void _layout_block_record(GtkTreeView *treeview,
find_col_name(display_data_block,
SORTID_JOB),
tmp_cnt);
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_block,
SORTID_USE),
@@ -320,7 +320,7 @@ static void _update_block_record(sview_block_info_t *block_ptr,
bg_block_state_string(block_ptr->state), -1);
gtk_tree_store_set(treestore, iter, SORTID_USER,
block_ptr->bg_user_name, -1);
- if (block_ptr->job_running > NO_JOB_RUNNING)
+ if(block_ptr->job_running > NO_JOB_RUNNING)
snprintf(tmp_cnt, sizeof(tmp_cnt),
"%d", block_ptr->job_running);
else
@@ -330,7 +330,7 @@ static void _update_block_record(sview_block_info_t *block_ptr,
gtk_tree_store_set(treestore, iter, SORTID_CONN,
conn_type_string(block_ptr->bg_conn_type), -1);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
gtk_tree_store_set(treestore, iter, SORTID_USE,
node_use_string(block_ptr->bg_node_use), -1);
@@ -344,7 +344,7 @@ static void _update_block_record(sview_block_info_t *block_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_NODE_INX, block_ptr->bp_inx, -1);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
gtk_tree_store_set(treestore, iter, SORTID_IMAGEBLRTS,
block_ptr->imageblrts, -1);
@@ -394,7 +394,7 @@ static void _update_info_block(List block_list,
while(1) {
gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
SORTID_UPDATED, 0, -1);
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -405,9 +405,9 @@ static void _update_info_block(List block_list,
itr = list_iterator_create(block_list);
while ((block_ptr = (sview_block_info_t*) list_next(itr))) {
- if (block_ptr->node_cnt == 0)
+ if(block_ptr->node_cnt == 0)
block_ptr->node_cnt = block_ptr->size;
- if (!block_ptr->slurm_part_name)
+ if(!block_ptr->slurm_part_name)
block_ptr->slurm_part_name = xstrdup("no part");
/* get the iter, or find out the list is empty goto add */
@@ -420,7 +420,7 @@ static void _update_info_block(List block_list,
it is in the list */
gtk_tree_model_get(model, &iter, SORTID_BLOCK,
&name, -1);
- if (!strcmp(name, block_ptr->bg_block_name)) {
+ if(!strcmp(name, block_ptr->bg_block_name)) {
/* update with new info */
g_free(name);
_update_block_record(block_ptr,
@@ -431,7 +431,7 @@ static void _update_info_block(List block_list,
g_free(name);
line++;
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -443,7 +443,7 @@ static void _update_info_block(List block_list,
}
list_iterator_destroy(itr);
- if (host)
+ if(host)
free(host);
gtk_tree_path_free(path);
@@ -457,17 +457,17 @@ static int _sview_block_sort_aval_dec(sview_block_info_t* rec_a,
int size_a = rec_a->node_cnt;
int size_b = rec_b->node_cnt;
- if ((rec_a->job_running == NO_JOB_RUNNING)
+ if((rec_a->job_running == NO_JOB_RUNNING)
&& (rec_b->job_running != NO_JOB_RUNNING))
return 1;
- else if ((rec_a->job_running != NO_JOB_RUNNING)
+ else if((rec_a->job_running != NO_JOB_RUNNING)
&& (rec_b->job_running == NO_JOB_RUNNING))
return -1;
- if ((rec_a->state == RM_PARTITION_FREE)
+ if((rec_a->state == RM_PARTITION_FREE)
&& (rec_b->state != RM_PARTITION_FREE))
return 1;
- else if ((rec_a->state != RM_PARTITION_FREE)
+ else if((rec_a->state != RM_PARTITION_FREE)
&& (rec_b->state == RM_PARTITION_FREE))
return -1;
@@ -476,7 +476,7 @@ static int _sview_block_sort_aval_dec(sview_block_info_t* rec_a,
else if (size_a > size_b)
return 1;
- if (rec_a->nodes && rec_b->nodes) {
+ if(rec_a->nodes && rec_b->nodes) {
size_a = strcmp(rec_a->nodes, rec_b->nodes);
if (size_a < 0)
return -1;
@@ -496,11 +496,11 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
sview_block_info_t *block_ptr = NULL;
char tmp_nodes[50];
- if (!changed && block_list) {
+ if(!changed && block_list) {
return block_list;
}
- if (block_list)
+ if(block_list)
list_flush(block_list);
else
block_list = list_create(_block_list_del);
@@ -517,7 +517,7 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
/* If we don't have a block name just continue since
ths block hasn't been made in the system yet. */
- if (!block_ptr->bg_block_name)
+ if(!block_ptr->bg_block_name)
continue;
#ifdef HAVE_BG_FILES
@@ -531,14 +531,14 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
whatever they want, so doing this fixes what could
be a negative number.
*/
- if (block_ptr->color_inx < 0)
+ if(block_ptr->color_inx < 0)
block_ptr->color_inx = i;
block_ptr->color_inx %= sview_colors_cnt;
block_ptr->nodes
= xstrdup(block_info_ptr->block_array[i].nodes);
- if (block_info_ptr->block_array[i].ionodes) {
+ if(block_info_ptr->block_array[i].ionodes) {
block_ptr->small_block = 1;
snprintf(tmp_nodes, sizeof(tmp_nodes),
"%s[%s]",
@@ -551,7 +551,7 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
block_ptr->bg_user_name
= xstrdup(block_info_ptr->
block_array[i].owner_name);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
block_ptr->imageblrts = xstrdup(
block_info_ptr->block_array[i].blrtsimage);
@@ -567,7 +567,7 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
block_ptr->bg_conn_type
= block_info_ptr->block_array[i].conn_type;
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
block_ptr->bg_node_use
= block_info_ptr->block_array[i].node_use;
@@ -577,7 +577,7 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
= block_info_ptr->block_array[i].bp_inx;
for(j = 0; j < part_info_ptr->record_count; j++) {
part = part_info_ptr->partition_array[j];
- if (_in_slurm_partition(part.node_inx,
+ if(_in_slurm_partition(part.node_inx,
block_ptr->bp_inx)) {
block_ptr->slurm_part_name
= xstrdup(part.name);
@@ -586,7 +586,7 @@ static List _create_block_list(partition_info_msg_t *part_info_ptr,
}
block_ptr->job_running =
block_info_ptr->block_array[i].job_running;
- if (block_ptr->bg_conn_type >= SELECT_SMALL)
+ if(block_ptr->bg_conn_type >= SELECT_SMALL)
block_ptr->size = 0;
list_append(block_list, block_ptr);
@@ -611,13 +611,13 @@ void _display_info_block(List block_list,
GtkTreeView *treeview = NULL;
ListIterator itr = NULL;
- if (!spec_info->search_info->gchar_data) {
+ if(!spec_info->search_info->gchar_data) {
info = xstrdup("No pointer given!");
goto finished;
}
need_refresh:
- if (!spec_info->display_widget) {
+ if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
spec_info->display_widget =
@@ -629,15 +629,15 @@ need_refresh:
itr = list_iterator_create(block_list);
while ((block_ptr = (sview_block_info_t*) list_next(itr))) {
- if (!strcmp(block_ptr->bg_block_name, name)
+ if(!strcmp(block_ptr->bg_block_name, name)
|| !strcmp(block_ptr->nodes, name)) {
/* we want to over ride any subgrp in error
state */
enum node_states state = NODE_STATE_UNKNOWN;
- if (block_ptr->state == RM_PARTITION_ERROR)
+ if(block_ptr->state == RM_PARTITION_ERROR)
state = NODE_STATE_ERROR;
- else if (block_ptr->job_running > NO_JOB_RUNNING)
+ else if(block_ptr->job_running > NO_JOB_RUNNING)
state = NODE_STATE_ALLOCATED;
else
state = NODE_STATE_IDLE;
@@ -660,8 +660,8 @@ need_refresh:
list_iterator_destroy(itr);
post_setup_popup_grid_list(popup_win);
- if (!found) {
- if (!popup_win->not_found) {
+ if(!found) {
+ if(!popup_win->not_found) {
char *temp = "BLOCK DOESN'T EXSIST\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
@@ -675,7 +675,7 @@ need_refresh:
}
popup_win->not_found = true;
} else {
- if (popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
@@ -707,15 +707,15 @@ extern int get_new_info_block(block_info_msg_t **block_ptr, int force)
static time_t last;
static bool changed = 0;
- if (!(cluster_flags & CLUSTER_FLAG_BG))
+ if(!(cluster_flags & CLUSTER_FLAG_BG))
return error_code;
- if (g_block_info_ptr && !force
+ if(g_block_info_ptr && !force
&& ((now - last) < working_sview_config.refresh_delay)) {
- if (*block_ptr != g_block_info_ptr)
+ if(*block_ptr != g_block_info_ptr)
error_code = SLURM_SUCCESS;
*block_ptr = g_block_info_ptr;
- if (changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
@@ -738,8 +738,8 @@ extern int get_new_info_block(block_info_msg_t **block_ptr, int force)
}
g_block_info_ptr = new_bg_ptr;
- if (block_ptr) {
- if (g_block_info_ptr && (*block_ptr != g_block_info_ptr))
+ if(block_ptr) {
+ if(g_block_info_ptr && (*block_ptr != g_block_info_ptr))
error_code = SLURM_SUCCESS;
*block_ptr = g_block_info_ptr;
@@ -757,7 +757,7 @@ extern int update_state_block(GtkDialog *dialog,
GtkWidget *label = NULL;
int no_dialog = 0;
- if (!dialog) {
+ if(!dialog) {
dialog = GTK_DIALOG(
gtk_dialog_new_with_buttons(
type,
@@ -776,24 +776,24 @@ extern int update_state_block(GtkDialog *dialog,
gtk_dialog_add_button(dialog,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- if (!strcasecmp("Error", type)
+ if(!strcasecmp("Error", type)
|| !strcasecmp("Put block in error state", type)) {
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to put block %s "
"in an error state?",
blockid);
block_msg.state = RM_PARTITION_ERROR;
- } else if (!strcasecmp("Recreate block", type)) {
+ } else if(!strcasecmp("Recreate block", type)) {
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to recreate block %s?",
blockid);
block_msg.state = RM_PARTITION_CONFIGURING;
- } else if (!strcasecmp("Remove block", type)) {
+ } else if(!strcasecmp("Remove block", type)) {
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to remove block %s?",
blockid);
block_msg.state = RM_PARTITION_NAV;
- } else if (!strcasecmp("Resume block", type)) {
+ } else if(!strcasecmp("Resume block", type)) {
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to resume block %s?",
blockid);
@@ -813,7 +813,7 @@ extern int update_state_block(GtkDialog *dialog,
gtk_widget_show_all(GTK_WIDGET(dialog));
i = gtk_dialog_run(dialog);
if (i == GTK_RESPONSE_OK) {
- if (slurm_update_block(&block_msg)
+ if(slurm_update_block(&block_msg)
== SLURM_SUCCESS) {
snprintf(tmp_char, sizeof(tmp_char),
"Block %s updated successfully",
@@ -826,7 +826,7 @@ extern int update_state_block(GtkDialog *dialog,
display_edit_note(tmp_char);
}
- if (no_dialog)
+ if(no_dialog)
gtk_widget_destroy(GTK_WIDGET(dialog));
return rc;
}
@@ -870,7 +870,7 @@ extern void admin_edit_block(GtkCellRendererText *cell,
char *blockid = NULL;
char *old_text = NULL;
- if (!new_text || !strcmp(new_text, ""))
+ if(!new_text || !strcmp(new_text, ""))
goto no_input;
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
@@ -912,8 +912,8 @@ extern void get_info_block(GtkTable *table, display_data_t *display_data)
GtkTreePath *path = NULL;
/* reset */
- if (!table && !display_data) {
- if (display_widget)
+ if(!table && !display_data) {
+ if(display_widget)
gtk_widget_destroy(display_widget);
display_widget = NULL;
part_info_ptr = NULL;
@@ -921,27 +921,27 @@ extern void get_info_block(GtkTable *table, display_data_t *display_data)
return;
}
- if (display_data)
+ if(display_data)
local_display_data = display_data;
- if (!table) {
+ if(!table) {
display_data_block->set_menu = local_display_data->set_menu;
return;
}
- if (display_widget && toggled) {
+ if(display_widget && toggled) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
goto display_it;
}
- if ((part_error_code = get_new_info_part(&part_info_ptr, force_refresh))
+ if((part_error_code = get_new_info_part(&part_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
} else if (part_error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
view = ERROR_VIEW;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
sprintf(error_char, "slurm_load_partitions: %s",
slurm_strerror(slurm_get_errno()));
@@ -954,18 +954,18 @@ extern void get_info_block(GtkTable *table, display_data_t *display_data)
goto end_it;
}
- if ((block_error_code = get_new_info_block(&block_ptr, force_refresh))
+ if((block_error_code = get_new_info_block(&block_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if ((!display_widget || view == ERROR_VIEW)
+ if((!display_widget || view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA)) {
goto display_it;
}
changed = 0;
} else if (block_error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
view = ERROR_VIEW;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
sprintf(error_char, "slurm_load_block: %s",
slurm_strerror(slurm_get_errno()));
@@ -980,16 +980,16 @@ extern void get_info_block(GtkTable *table, display_data_t *display_data)
display_it:
- if (!part_info_ptr || !block_ptr)
+ if(!part_info_ptr || !block_ptr)
return;
block_list = _create_block_list(part_info_ptr, block_ptr,
changed);
- if (!block_list)
+ if(!block_list)
return;
/* set up the grid */
- if (display_widget && GTK_IS_TREE_VIEW(display_widget)
+ if(display_widget && GTK_IS_TREE_VIEW(display_widget)
&& gtk_tree_selection_count_selected_rows(
gtk_tree_view_get_selection(
GTK_TREE_VIEW(display_widget)))) {
@@ -998,7 +998,7 @@ display_it:
gtk_tree_view_get_cursor(GTK_TREE_VIEW(display_widget),
&path, &focus_column);
}
- if (!path) {
+ if(!path) {
itr = list_iterator_create(block_list);
while ((sview_block_info_ptr = list_next(itr))) {
j=0;
@@ -1015,11 +1015,11 @@ display_it:
list_iterator_destroy(itr);
}
- if (view == ERROR_VIEW && display_widget) {
+ if(view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
}
- if (!display_widget) {
+ if(!display_widget) {
tree_view = create_treeview(local_display_data,
&grid_button_list);
display_widget = gtk_widget_ref(GTK_WIDGET(tree_view));
@@ -1033,14 +1033,14 @@ display_it:
SORTID_CNT, SORTID_NODELIST, SORTID_COLOR);
}
- if (path)
+ if(path)
highlight_grid(GTK_TREE_VIEW(display_widget),
SORTID_NODE_INX, SORTID_COLOR_INX,
grid_button_list);
else
change_grid_color(grid_button_list, -1, -1,
MAKE_WHITE, true, 0);
- if (working_sview_config.grid_speedup) {
+ if(working_sview_config.grid_speedup) {
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
}
@@ -1073,25 +1073,25 @@ extern void specific_info_block(popup_info_t *popup_win)
hostset_t hostset = NULL;
ListIterator itr = NULL;
- if (!spec_info->display_widget) {
+ if(!spec_info->display_widget) {
setup_popup_info(popup_win, display_data_block, SORTID_CNT);
}
- if (spec_info->display_widget && popup_win->toggled) {
+ if(spec_info->display_widget && popup_win->toggled) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
goto display_it;
}
- if ((part_error_code = get_new_info_part(&part_info_ptr,
+ if((part_error_code = get_new_info_part(&part_info_ptr,
popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
} else if (part_error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
spec_info->view = ERROR_VIEW;
- if (spec_info->display_widget)
+ if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
sprintf(error_char, "slurm_load_partitions: %s",
slurm_strerror(slurm_get_errno()));
@@ -1104,10 +1104,10 @@ extern void specific_info_block(popup_info_t *popup_win)
goto end_it;
}
- if ((block_error_code =
+ if((block_error_code =
get_new_info_block(&block_info_ptr, popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if ((!spec_info->display_widget
+ if((!spec_info->display_widget
|| spec_info->view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA)) {
goto display_it;
@@ -1115,10 +1115,10 @@ extern void specific_info_block(popup_info_t *popup_win)
changed = 0;
} else if (block_error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
spec_info->view = ERROR_VIEW;
- if (spec_info->display_widget)
+ if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
sprintf(error_char, "slurm_load_block: %s",
slurm_strerror(slurm_get_errno()));
@@ -1134,14 +1134,14 @@ extern void specific_info_block(popup_info_t *popup_win)
display_it:
block_list = _create_block_list(part_info_ptr, block_info_ptr,
changed);
- if (!block_list)
+ if(!block_list)
return;
- if (spec_info->view == ERROR_VIEW && spec_info->display_widget) {
+ if(spec_info->view == ERROR_VIEW && spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
- if (spec_info->type != INFO_PAGE && !spec_info->display_widget) {
+ if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
spec_info->display_widget =
@@ -1158,7 +1158,7 @@ display_it:
setup_popup_grid_list(popup_win);
spec_info->view = INFO_VIEW;
- if (spec_info->type == INFO_PAGE) {
+ if(spec_info->type == INFO_PAGE) {
_display_info_block(block_list, popup_win);
goto end_it;
}
@@ -1177,22 +1177,22 @@ display_it:
i++;
switch(spec_info->type) {
case PART_PAGE:
- if (strcmp(block_ptr->slurm_part_name,
+ if(strcmp(block_ptr->slurm_part_name,
search_info->gchar_data))
continue;
break;
case RESV_PAGE:
case NODE_PAGE:
- if (!block_ptr->nodes)
+ if(!block_ptr->nodes)
continue;
- if (!(hostset = hostset_create(search_info->gchar_data)))
+ if(!(hostset = hostset_create(search_info->gchar_data)))
continue;
name = block_ptr->nodes;
- if (block_ptr->small_block) {
+ if(block_ptr->small_block) {
int j=0;
/* strip off the ionodes part */
while(name[j]) {
- if (name[j] == '[') {
+ if(name[j] == '[') {
name[j] = '\0';
break;
}
@@ -1200,7 +1200,7 @@ display_it:
}
}
- if (!hostset_intersects(hostset, name)) {
+ if(!hostset_intersects(hostset, name)) {
hostset_destroy(hostset);
continue;
}
@@ -1209,24 +1209,24 @@ display_it:
case BLOCK_PAGE:
switch(search_info->search_type) {
case SEARCH_BLOCK_NAME:
- if (!search_info->gchar_data)
+ if(!search_info->gchar_data)
continue;
- if (strcmp(block_ptr->bg_block_name,
+ if(strcmp(block_ptr->bg_block_name,
search_info->gchar_data))
continue;
break;
case SEARCH_BLOCK_SIZE:
- if (search_info->int_data == NO_VAL)
+ if(search_info->int_data == NO_VAL)
continue;
- if (block_ptr->node_cnt
+ if(block_ptr->node_cnt
!= search_info->int_data)
continue;
break;
case SEARCH_BLOCK_STATE:
- if (search_info->int_data == NO_VAL)
+ if(search_info->int_data == NO_VAL)
continue;
- if (block_ptr->state != search_info->int_data)
+ if(block_ptr->state != search_info->int_data)
continue;
break;
@@ -1236,7 +1236,7 @@ display_it:
}
break;
case JOB_PAGE:
- if (strcmp(block_ptr->bg_block_name,
+ if(strcmp(block_ptr->bg_block_name,
search_info->gchar_data))
continue;
break;
@@ -1246,9 +1246,9 @@ display_it:
}
list_push(send_block_list, block_ptr);
- if (block_ptr->state == RM_PARTITION_ERROR)
+ if(block_ptr->state == RM_PARTITION_ERROR)
state = NODE_STATE_ERROR;
- else if (block_ptr->job_running > NO_JOB_RUNNING)
+ else if(block_ptr->job_running > NO_JOB_RUNNING)
state = NODE_STATE_ALLOCATED;
else
state = NODE_STATE_IDLE;
@@ -1353,15 +1353,15 @@ extern void popup_all_block(GtkTreeModel *model, GtkTreeIter *iter, int id)
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info)
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info)
+ if(!strcmp(popup_win->spec_info->title, title)) {
break;
}
}
list_iterator_destroy(itr);
- if (!popup_win) {
- if (id == INFO_PAGE)
+ if(!popup_win) {
+ if(id == INFO_PAGE)
popup_win = create_popup_info(id, BLOCK_PAGE, title);
else
popup_win = create_popup_info(BLOCK_PAGE, id, title);
@@ -1392,11 +1392,11 @@ extern void popup_all_block(GtkTreeModel *model, GtkTreeIter *iter, int id)
g_free(name);
gtk_tree_model_get(model, iter, SORTID_NODELIST, &name, -1);
gtk_tree_model_get(model, iter, SORTID_SMALL_BLOCK, &i, -1);
- if (i) {
+ if(i) {
i=0;
/* strip off the ionodes part */
while(name[i]) {
- if (name[i] == '[') {
+ if(name[i] == '[') {
name[i] = '\0';
break;
}
@@ -1444,9 +1444,9 @@ extern void cluster_change_block()
{
display_data_t *display_data = display_data_block;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
switch(display_data->id) {
case SORTID_USE:
display_data->name = "Node Use";
diff --git a/src/sview/common.c b/src/sview/common.c
index bda33b17696dfd2fcdb6a8c3c39fdc8096ce37ea..14bcb459e5dcabcae5edb830dd99c61a1192af7a 100644
--- a/src/sview/common.c
+++ b/src/sview/common.c
@@ -49,7 +49,7 @@ static gboolean control_key_in_effect = FALSE;
static gboolean _menu_button_pressed(GtkWidget *widget, GdkEventButton *event,
gpointer extra)
{
- if (event->button == 3) {
+ if(event->button == 3) {
menu_right_pressed = true;
return true;
}
@@ -59,7 +59,7 @@ static gboolean _menu_button_pressed(GtkWidget *widget, GdkEventButton *event,
static gboolean _menu_button_released(GtkWidget *widget, GdkEventButton *event,
gpointer extra)
{
- if (event->button == 3 && !menu_right_pressed)
+ if(event->button == 3 && !menu_right_pressed)
return true;
menu_right_pressed = false;
return false;
@@ -109,11 +109,11 @@ static int _sort_iter_compare_func_char(GtkTreeModel *model,
len2 = strlen(name2);
while((ret < len1) && (!g_ascii_isdigit(name1[ret])))
ret++;
- if (ret < len1) {
- if (!g_ascii_strncasecmp(name1, name2, ret)) {
- if (len1 > len2)
+ if(ret < len1) {
+ if(!g_ascii_strncasecmp(name1, name2, ret)) {
+ if(len1 > len2)
ret = 1;
- else if (len1 < len2)
+ else if(len1 < len2)
ret = -1;
else {
ret = g_ascii_strcasecmp(name1, name2);
@@ -177,19 +177,19 @@ static int _sort_iter_compare_func_nodes(GtkTreeModel *model,
&& !g_ascii_isdigit(name1[spot])) {
spot++;
}
- if (!name1[spot])
+ if(!name1[spot])
break;
tmp_int = atoi(name1+spot);
while(name1[spot] && g_ascii_isdigit(name1[spot])) {
spot++;
}
- if (!name1[spot]) {
- } else if (name1[spot] == 'K')
+ if(!name1[spot]) {
+ } else if(name1[spot] == 'K')
tmp_int *= 1024;
- else if (name1[spot] == 'M')
+ else if(name1[spot] == 'M')
tmp_int *= 1048576;
- else if (name1[spot] == 'G')
+ else if(name1[spot] == 'G')
tmp_int *= 1073741824;
int1 += tmp_int;
@@ -201,18 +201,18 @@ static int _sort_iter_compare_func_nodes(GtkTreeModel *model,
&& !g_ascii_isdigit(name2[spot])) {
spot++;
}
- if (!name2[spot])
+ if(!name2[spot])
break;
tmp_int = atoi(name2+spot);
while(name2[spot] && g_ascii_isdigit(name2[spot])) {
spot++;
}
- if (!name2[spot]) {
- } else if (name2[spot] == 'K')
+ if(!name2[spot]) {
+ } else if(name2[spot] == 'K')
tmp_int *= 1024;
- else if (name2[spot] == 'M')
+ else if(name2[spot] == 'M')
tmp_int *= 1048576;
- else if (name2[spot] == 'G')
+ else if(name2[spot] == 'G')
tmp_int *= 1073741824;
int2 += tmp_int;
@@ -328,14 +328,14 @@ static void _cell_data_func(GtkTreeViewColumn *col,
uint32_t color;
g_object_get(renderer, "pixbuf", &pixbuf, NULL);
- if (!pixbuf)
+ if(!pixbuf)
return;
gtk_tree_model_get(model, iter,
GPOINTER_TO_INT(g_object_get_data(G_OBJECT(renderer),
"column")),
&color_char, -1);
- if (!color_char)
+ if(!color_char)
return;
color_char2 = color_char+1;
@@ -362,7 +362,7 @@ static void _add_col_to_treeview(GtkTreeView *tree_view,
GtkListStore *model = (display_data->create_model)(display_data->id);
GtkCellRenderer *renderer = NULL;
- if (model && display_data->extra != EDIT_NONE) {
+ if(model && display_data->extra != EDIT_NONE) {
renderer = gtk_cell_renderer_combo_new();
g_object_set(renderer,
"model", model,
@@ -370,12 +370,12 @@ static void _add_col_to_treeview(GtkTreeView *tree_view,
"has-entry", 1,
"editable", TRUE,
NULL);
- } else if (display_data->extra == EDIT_TEXTBOX) {
+ } else if(display_data->extra == EDIT_TEXTBOX) {
renderer = gtk_cell_renderer_text_new();
g_object_set(renderer,
"editable", TRUE,
NULL);
- } else if (display_data->extra == EDIT_COLOR) {
+ } else if(display_data->extra == EDIT_COLOR) {
GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false,
8, 10, 20);
renderer = gtk_cell_renderer_pixbuf_new();
@@ -389,7 +389,7 @@ static void _add_col_to_treeview(GtkTreeView *tree_view,
g_object_set_data(G_OBJECT(renderer), "column",
GINT_TO_POINTER(display_data->id));
- if (display_data->extra == EDIT_COLOR) {
+ if(display_data->extra == EDIT_COLOR) {
gtk_tree_view_column_set_cell_data_func(
col, renderer, _cell_data_func,
NULL, NULL);
@@ -416,7 +416,7 @@ static void _add_col_to_treeview(GtkTreeView *tree_view,
static void _toggle_state_changed(GtkCheckMenuItem *menuitem,
display_data_t *display_data)
{
- if (display_data->show)
+ if(display_data->show)
display_data->show = FALSE;
else
display_data->show = TRUE;
@@ -428,7 +428,7 @@ static void _popup_state_changed(GtkCheckMenuItem *menuitem,
display_data_t *display_data)
{
popup_info_t *popup_win = (popup_info_t *) display_data->user_data;
- if (display_data->show)
+ if(display_data->show)
display_data->show = FALSE;
else
display_data->show = TRUE;
@@ -502,7 +502,7 @@ extern int get_row_number(GtkTreeView *tree_view, GtkTreePath *path)
GtkTreeIter iter;
int line = 0;
- if (!model) {
+ if(!model) {
g_error("error getting the model from the tree_view");
return -1;
}
@@ -520,9 +520,9 @@ extern int find_col(display_data_t *display_data, int type)
int i = 0;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (display_data->id == type)
+ if(display_data->id == type)
return i;
i++;
}
@@ -534,9 +534,9 @@ extern const char *find_col_name(display_data_t *display_data, int type)
int i = 0;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (display_data->id == type)
+ if(display_data->id == type)
return display_data->name;
i++;
}
@@ -549,7 +549,7 @@ extern void *get_pointer(GtkTreeView *tree_view, GtkTreePath *path, int loc)
GtkTreeIter iter;
void *ptr = NULL;
- if (!model) {
+ if(!model) {
g_error("error getting the model from the tree_view");
return ptr;
}
@@ -570,7 +570,7 @@ extern void make_fields_menu(popup_info_t *popup_win, GtkMenu *menu,
int i = 0;
/* we don't want to display anything on the full info page */
- if (popup_win && popup_win->spec_info->type == INFO_PAGE)
+ if(popup_win && popup_win->spec_info->type == INFO_PAGE)
return;
g_signal_connect(G_OBJECT(menu), "button-press-event",
@@ -582,11 +582,11 @@ extern void make_fields_menu(popup_info_t *popup_win, GtkMenu *menu,
for(i=0; i<count; i++) {
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (!display_data->name)
+ if(!display_data->name)
continue;
- if (display_data->id != i)
+ if(display_data->id != i)
continue;
menuitem = gtk_check_menu_item_new_with_label(
@@ -595,7 +595,7 @@ extern void make_fields_menu(popup_info_t *popup_win, GtkMenu *menu,
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(menuitem),
display_data->show);
- if (popup_win) {
+ if(popup_win) {
display_data->user_data = popup_win;
g_signal_connect(
menuitem, "toggled",
@@ -638,15 +638,15 @@ extern void make_options_menu(GtkTreeView *tree_view, GtkTreePath *path,
row_count=gtk_tree_selection_count_selected_rows(
gtk_tree_view_get_selection(tree_view));
- if (display_data->user_data)
+ if(display_data->user_data)
xfree(display_data->user_data);
while(display_data++) {
- if (display_data->id == -1) {
+ if(display_data->id == -1) {
break;
}
- if (!display_data->name)
+ if(!display_data->name)
continue;
display_data->user_data = treedata;
menuitem = gtk_menu_item_new_with_label(display_data->name);
@@ -715,7 +715,7 @@ extern void create_page(GtkNotebook *notebook, display_data_t *display_data)
GtkWidget *image = NULL;
int err;
- if (display_data->id == TAB_PAGE) {
+ if(display_data->id == TAB_PAGE) {
table = gtk_table_new(PAGE_CNT, 3, FALSE);
image = gtk_image_new_from_stock(
GTK_STOCK_ADD, GTK_ICON_SIZE_SMALL_TOOLBAR);
@@ -749,7 +749,7 @@ extern void create_page(GtkNotebook *notebook, display_data_t *display_data)
gtk_widget_show_all(table);
//(display_data->set_fields)(GTK_MENU(menu));
- if ((err = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+ if((err = gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
GTK_WIDGET(scrolled_window),
table)) == -1) {
g_error("Couldn't add page to notebook\n");
@@ -767,7 +767,7 @@ extern GtkTreeView *create_treeview(display_data_t *local, List *button_list)
signal_params->display_data = local;
signal_params->button_list = button_list;
- if (working_sview_config.ruled_treeview)
+ if(working_sview_config.ruled_treeview)
gtk_tree_view_set_rules_hint (tree_view, true);
g_signal_connect(G_OBJECT(tree_view), "button-press-event",
@@ -795,7 +795,7 @@ extern GtkTreeView *create_treeview_2cols_attach_to_table(GtkTable *table)
GtkTreeViewColumn *col = gtk_tree_view_column_new();
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
- if (working_sview_config.ruled_treeview)
+ if(working_sview_config.ruled_treeview)
gtk_tree_view_set_rules_hint (tree_view, true);
gtk_table_attach_defaults(table,
@@ -853,7 +853,7 @@ extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
}
treestore = gtk_tree_store_newv(count, types);
- if (!treestore) {
+ if(!treestore) {
g_print("Can't create treestore.\n");
return NULL;
}
@@ -861,11 +861,11 @@ extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
gtk_tree_view_set_model(tree_view, GTK_TREE_MODEL(treestore));
for(i=1; i<count; i++) {
- if (!display_data[i].show)
+ if(!display_data[i].show)
continue;
_add_col_to_treeview(tree_view, &display_data[i], color_column);
- if (!display_data[i].name)
+ if(!display_data[i].name)
continue;
switch(display_data[i].type) {
@@ -879,7 +879,7 @@ extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
break;
case G_TYPE_STRING:
- if (!strcasecmp(display_data[i].name, "Node Count")
+ if(!strcasecmp(display_data[i].name, "Node Count")
|| !strcasecmp(display_data[i].name, "CPU Count")
|| !strcasecmp(display_data[i].name, "Real Memory")
|| !strcasecmp(display_data[i].name, "Tmp Disk")) {
@@ -890,7 +890,7 @@ extern GtkTreeStore *create_treestore(GtkTreeView *tree_view,
GINT_TO_POINTER(display_data[i].id),
NULL);
break;
- } else if (!strcasecmp(display_data[i].name,
+ } else if(!strcasecmp(display_data[i].name,
"BP List")) {
gtk_tree_sortable_set_sort_func(
GTK_TREE_SORTABLE(treestore),
@@ -931,10 +931,10 @@ extern gboolean right_button_pressed(GtkTreeView *tree_view,
GtkMenu *menu = GTK_MENU(gtk_menu_new());
display_data_t *display_data = signal_params->display_data;
- if (type == ROW_CLICKED) {
+ if(type == ROW_CLICKED) {
/* These next 2 functions are there to keep the keyboard in
sync */
- if (!(event->state & GDK_CONTROL_MASK)
+ if(!(event->state & GDK_CONTROL_MASK)
&& (global_multi_count > 0))
gtk_tree_view_set_cursor(tree_view, path, NULL, false);
@@ -967,7 +967,7 @@ extern gboolean left_button_pressed(GtkTreeView *tree_view,
static gpointer *last_user_data = NULL;
/* These next 2 functions are there to keep the keyboard in
sync */
- if (!((event->state & GDK_CONTROL_MASK)
+ if(!((event->state & GDK_CONTROL_MASK)
|| (event->state & GDK_SHIFT_MASK)))
gtk_tree_view_set_cursor(tree_view, path, NULL, false);
@@ -982,14 +982,14 @@ extern gboolean left_button_pressed(GtkTreeView *tree_view,
g_error("left pressed, error getting iter from model\n");
return rc;
}
- if (!(now-last_time)
+ if(!(now-last_time)
&& (!last_user_data || (iter.user_data == last_user_data))) {
/* double click */
(display_data->set_menu)(tree_view, NULL, path, FULL_CLICKED);
}
last_user_data = iter.user_data;
- if (!working_sview_config.admin_mode)
+ if(!working_sview_config.admin_mode)
rc = true;
last_time = now;
@@ -1014,7 +1014,7 @@ extern gboolean row_activated(GtkTreeView *tree_view, GtkTreePath *path,
extern gboolean key_pressed(GtkTreeView *tree_view, GdkEventButton *event,
const signal_params_t *signal_params)
{
- if ((event->state == KEY_CONTROL))
+ if((event->state == KEY_CONTROL))
control_key_in_effect = TRUE;
return FALSE;
@@ -1066,7 +1066,7 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
GtkTreeSelection *selection = NULL;
gboolean did_something = FALSE;
- if (!gtk_tree_view_get_path_at_pos(tree_view,
+ if(!gtk_tree_view_get_path_at_pos(tree_view,
(gint) event->x,
(gint) event->y,
&path, NULL, NULL, NULL)) {
@@ -1077,8 +1077,8 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
* it up by doing a refresh. If there wasn't a
* selection before OR we are stacking selections via
* the ctrl key do nothing here. */
- if (gtk_tree_selection_count_selected_rows(selection)){
- if (!(event->state & GDK_CONTROL_MASK)) {
+ if(gtk_tree_selection_count_selected_rows(selection)){
+ if(!(event->state & GDK_CONTROL_MASK)) {
gtk_tree_selection_unselect_all(selection);
//reset selections counter.
global_multi_count = 0;
@@ -1093,9 +1093,9 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
selection = gtk_tree_view_get_selection(tree_view);
/*if shift is down then pull a range out*/
- if ((event->state & GDK_SHIFT_MASK)) {
+ if((event->state & GDK_SHIFT_MASK)) {
if (last_event_x != 0) {
- if (gtk_tree_view_get_path_at_pos(tree_view,
+ if(gtk_tree_view_get_path_at_pos(tree_view,
(gint) last_event_x,
(gint) last_event_y,
&last_path, NULL,
@@ -1114,7 +1114,7 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
else {
/* Only select path if control key is not held in order to
* establish anchor*/
- if (!(event->state & GDK_CONTROL_MASK))
+ if(!(event->state & GDK_CONTROL_MASK))
gtk_tree_selection_select_path(selection, path);
else {
if (!gtk_tree_selection_count_selected_rows(
@@ -1128,7 +1128,7 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
last_event_y = event->y; /*save THIS y*/
global_multi_count++;
- if (event->x <= 20) {
+ if(event->x <= 20) {
/* When you try to resize a column this event happens
for some reason. Resizing always happens in the
first 2 of x so if that happens just return and
@@ -1136,9 +1136,9 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
column, that happens in the first 20 so just skip
that also. */
did_something = FALSE;
- } else if (event->button == 1) {
+ } else if(event->button == 1) {
/* left click */
- if (!(event->state & GDK_CONTROL_MASK)
+ if(!(event->state & GDK_CONTROL_MASK)
&& !(event->state & GDK_SHIFT_MASK)) {
/* unselect current on naked left clicks..*/
gtk_tree_selection_unselect_all(selection);
@@ -1146,22 +1146,22 @@ extern gboolean row_clicked(GtkTreeView *tree_view, GdkEventButton *event,
}
did_something = left_button_pressed(
tree_view, path, signal_params, event);
- } else if (event->button == 3) {
+ } else if(event->button == 3) {
/* right click */
- if (!(event->state & GDK_CONTROL_MASK))
+ if(!(event->state & GDK_CONTROL_MASK))
global_multi_count = 0; //reset selections counter.
right_button_pressed(tree_view, path, event,
signal_params, ROW_CLICKED);
did_something = TRUE;
- } else if (!working_sview_config.admin_mode)
+ } else if(!working_sview_config.admin_mode)
did_something = TRUE;
gtk_tree_path_free(path);
/* If control key held refresh main (which does the grid and
exit with false to reset the treeview. This has to happen
after left_button_pressed to get other things correct. */
- if (event->state & GDK_CONTROL_MASK) {
+ if(event->state & GDK_CONTROL_MASK) {
refresh_main(NULL, NULL);
return FALSE; /*propagate event*/
}
@@ -1282,7 +1282,7 @@ extern void setup_popup_info(popup_info_t *popup_win,
extern void redo_popup(GtkWidget *widget, GdkEventButton *event,
popup_info_t *popup_win)
{
- if (event->button == 3) {
+ if(event->button == 3) {
GtkMenu *menu = GTK_MENU(gtk_menu_new());
(popup_win->display_data->set_menu)(popup_win, menu,
@@ -1299,8 +1299,8 @@ extern void redo_popup(GtkWidget *widget, GdkEventButton *event,
extern void destroy_search_info(void *arg)
{
sview_search_info_t *search_info = (sview_search_info_t *)arg;
- if (search_info) {
- if (search_info->gchar_data)
+ if(search_info) {
+ if(search_info->gchar_data)
g_free(search_info->gchar_data);
search_info->gchar_data = NULL;
xfree(search_info);
@@ -1311,12 +1311,12 @@ extern void destroy_search_info(void *arg)
extern void destroy_specific_info(void *arg)
{
specific_info_t *spec_info = (specific_info_t *)arg;
- if (spec_info) {
+ if(spec_info) {
xfree(spec_info->title);
destroy_search_info(spec_info->search_info);
- if (spec_info->display_widget) {
+ if(spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
@@ -1328,30 +1328,30 @@ extern void destroy_popup_info(void *arg)
{
popup_info_t *popup_win = (popup_info_t *)arg;
- if (popup_win) {
+ if(popup_win) {
*popup_win->running = 0;
//g_print("locking destroy_popup_info\n");
g_static_mutex_lock(&sview_mutex);
//g_print("locked\n");
/* these are all childern of each other so must
be freed in this order */
- if (popup_win->grid_button_list) {
+ if(popup_win->grid_button_list) {
list_destroy(popup_win->grid_button_list);
popup_win->grid_button_list = NULL;
}
- if (popup_win->table) {
+ if(popup_win->table) {
gtk_widget_destroy(GTK_WIDGET(popup_win->table));
popup_win->table = NULL;
}
- if (popup_win->grid_table) {
+ if(popup_win->grid_table) {
gtk_widget_destroy(GTK_WIDGET(popup_win->grid_table));
popup_win->grid_table = NULL;
}
- if (popup_win->event_box) {
+ if(popup_win->event_box) {
gtk_widget_destroy(popup_win->event_box);
popup_win->event_box = NULL;
}
- if (popup_win->popup) {
+ if(popup_win->popup) {
gtk_widget_destroy(popup_win->popup);
popup_win->popup = NULL;
}
@@ -1368,7 +1368,7 @@ extern void destroy_signal_params(void *arg)
{
signal_params_t *signal_params = (signal_params_t *)arg;
- if (signal_params) {
+ if(signal_params) {
xfree(signal_params);
}
}
@@ -1379,8 +1379,8 @@ extern gboolean delete_popup(GtkWidget *widget, GtkWidget *event, char *title)
popup_info_t *popup_win = NULL;
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info) {
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info) {
+ if(!strcmp(popup_win->spec_info->title, title)) {
//g_print("removing %s\n", title);
list_remove(itr);
destroy_popup_info(popup_win);
@@ -1447,15 +1447,15 @@ extern void remove_old(GtkTreeModel *model, int updated)
if (gtk_tree_model_get_iter(model, &iter, path)) {
while(1) {
gtk_tree_model_get(model, &iter, updated, &i, -1);
- if (!i) {
- if (!gtk_tree_store_remove(
+ if(!i) {
+ if(!gtk_tree_store_remove(
GTK_TREE_STORE(model),
&iter))
break;
else
continue;
}
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -1474,7 +1474,7 @@ extern GtkWidget *create_pulldown_combo(display_data_t *display_data,
store = gtk_list_store_new(2, G_TYPE_INT, G_TYPE_STRING);
for(i=0; i<count; i++) {
- if (display_data[i].id == -1)
+ if(display_data[i].id == -1)
break;
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, display_data[i].id,
@@ -1544,7 +1544,7 @@ extern char *get_reason()
{
reason_str = xstrdup(gtk_entry_get_text(GTK_ENTRY(entry)));
len = strlen(reason_str) - 1;
- if (len == -1) {
+ if(len == -1) {
xfree(reason_str);
reason_str = NULL;
goto end_it;
@@ -1582,13 +1582,13 @@ extern void display_admin_edit(GtkTable *table, void *type_msg, int *row,
GtkWidget *label = NULL;
GtkWidget *entry = NULL;
- if (display_data->extra == EDIT_MODEL) {
+ if(display_data->extra == EDIT_MODEL) {
/* edittable items that can only be known
values */
GtkCellRenderer *renderer = NULL;
GtkTreeModel *model2 = GTK_TREE_MODEL(
(display_data->create_model)(display_data->id));
- if (!model2) {
+ if(!model2) {
g_print("no model set up for %d(%s)\n",
display_data->id,
display_data->name);
@@ -1611,7 +1611,7 @@ extern void display_admin_edit(GtkTable *table, void *type_msg, int *row,
renderer, TRUE);
gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(entry),
renderer, "text", 0);
- } else if (display_data->extra == EDIT_TEXTBOX) {
+ } else if(display_data->extra == EDIT_TEXTBOX) {
char *temp_char = NULL;
/* other edittable items that are unknown */
entry = create_entry();
@@ -1622,7 +1622,7 @@ extern void display_admin_edit(GtkTable *table, void *type_msg, int *row,
(DEFAULT_ENTRY_LENGTH +
display_data->id));
- if (temp_char) {
+ if(temp_char) {
gtk_entry_set_text(GTK_ENTRY(entry),
temp_char);
g_free(temp_char);
@@ -1671,12 +1671,12 @@ extern void add_display_treestore_line(int update,
GtkTreeIter *iter,
const char *name, char *value)
{
- if (!name) {
+ if(!name) {
/* g_print("error, name = %s and value = %s\n", */
/* name, value); */
return;
}
- if (update) {
+ if(update) {
char *display_name = NULL;
GtkTreePath *path = gtk_tree_path_new_first();
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path);
@@ -1687,14 +1687,14 @@ extern void add_display_treestore_line(int update,
gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter,
DISPLAY_NAME,
&display_name, -1);
- if (!strcmp(display_name, name)) {
+ if(!strcmp(display_name, name)) {
/* update with new info */
g_free(display_name);
goto found;
}
g_free(display_name);
- if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore),
+ if(!gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore),
iter)) {
return;
}
@@ -1719,12 +1719,12 @@ extern void add_display_treestore_line_with_font(
const char *name, char *value,
char *font)
{
- if (!name) {
+ if(!name) {
/* g_print("error, name = %s and value = %s\n", */
/* name, value); */
return;
}
- if (update) {
+ if(update) {
char *display_name = NULL;
GtkTreePath *path = gtk_tree_path_new_first();
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path);
@@ -1735,14 +1735,14 @@ extern void add_display_treestore_line_with_font(
gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter,
DISPLAY_NAME,
&display_name, -1);
- if (!strcmp(display_name, name)) {
+ if(!strcmp(display_name, name)) {
/* update with new info */
g_free(display_name);
goto found;
}
g_free(display_name);
- if (!gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore),
+ if(!gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore),
iter)) {
return;
}
@@ -1767,7 +1767,7 @@ extern void sview_widget_modify_bg(GtkWidget *widget, GtkStateType state,
/* DEF_TIMERS; */
/* START_TIMER; */
- if (working_sview_config.grid_speedup) {
+ if(working_sview_config.grid_speedup) {
/* For some reason, QT Themes have a very slow call to for
* gtk_widget_modify_bg as of 7-6-09.
* Here we only take around 40 microsecs where
@@ -1833,7 +1833,7 @@ extern void sview_radio_action_set_current_value(GtkRadioAction *action,
set the correct value.
*/
g_return_if_fail(GTK_IS_RADIO_ACTION(action));
- if ((group = gtk_radio_action_get_group(action))) {
+ if((group = gtk_radio_action_get_group(action))) {
/* for some reason groups are set backwards like a
stack, g_slist_reverse will fix this but takes twice
as long so just figure out the length, they add 1
@@ -1841,14 +1841,14 @@ extern void sview_radio_action_set_current_value(GtkRadioAction *action,
value to get the augmented in the stack.
*/
current_value = g_slist_length(group) - 1 - current_value;
- if (current_value < 0) {
+ if(current_value < 0) {
g_warning("Radio group does not contain an action "
"with value '%d'\n", current_value);
return;
}
for (slist = group; slist; slist = slist->next) {
- if (i == current_value) {
+ if(i == current_value) {
gtk_toggle_action_set_active(
GTK_TOGGLE_ACTION(slist->data), TRUE);
g_object_set(action, "value",
@@ -1908,8 +1908,8 @@ extern char *visible_to_str(sview_config_t *sview_config)
char *ret = NULL;
int i = 0;
for(i=0; i<PAGE_CNT; i++)
- if (sview_config->page_visible[i]) {
- if (ret)
+ if(sview_config->page_visible[i]) {
+ if(ret)
xstrcat(ret, ",");
xstrcat(ret, page_to_str(i));
}
diff --git a/src/sview/config_info.c b/src/sview/config_info.c
index 18d4daa1fc9548faa2a0317651f554c22ea9e3ae..57c92ffce6371f730afd738ee80955402025bd69 100644
--- a/src/sview/config_info.c
+++ b/src/sview/config_info.c
@@ -57,7 +57,7 @@ extern int get_new_info_config(slurm_ctl_conf_info_msg_t **info_ptr)
error_code = slurm_load_ctl_conf((time_t) NULL, &new_ctl_ptr);
g_ctl_info_ptr = new_ctl_ptr;
- if (g_ctl_info_ptr && (*info_ptr != g_ctl_info_ptr))
+ if(g_ctl_info_ptr && (*info_ptr != g_ctl_info_ptr))
error_code = SLURM_SUCCESS;
*info_ptr = new_ctl_ptr;
diff --git a/src/sview/defaults.c b/src/sview/defaults.c
index d5295458b104e1cafbe3d24ac5b79cac8316c537..352c494e14521a18a1616c5d3fc091770a289fbd 100644
--- a/src/sview/defaults.c
+++ b/src/sview/defaults.c
@@ -142,7 +142,7 @@ static const char *_set_sview_config(sview_config_t *sview_config,
/* need to clear global_edit_error here (just in case) */
global_edit_error = 0;
- if (!sview_config)
+ if(!sview_config)
return NULL;
switch(column) {
@@ -154,34 +154,34 @@ static const char *_set_sview_config(sview_config_t *sview_config,
sview_config->admin_mode = 0;
break;
case SORTID_DEFAULT_PAGE:
- if (!strcasecmp(new_text, "job"))
+ if(!strcasecmp(new_text, "job"))
sview_config->default_page = JOB_PAGE;
- else if (!strcasecmp(new_text, "part"))
+ else if(!strcasecmp(new_text, "part"))
sview_config->default_page = PART_PAGE;
- else if (!strcasecmp(new_text, "res"))
+ else if(!strcasecmp(new_text, "res"))
sview_config->default_page = RESV_PAGE;
- else if (!strcasecmp(new_text, "block"))
+ else if(!strcasecmp(new_text, "block"))
sview_config->default_page = BLOCK_PAGE;
- else if (!strcasecmp(new_text, "node"))
+ else if(!strcasecmp(new_text, "node"))
sview_config->default_page = NODE_PAGE;
else
sview_config->default_page = JOB_PAGE;
break;
case SORTID_GRID_HORI:
temp_int = strtol(new_text, (char **)NULL, 10);
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
sview_config->grid_hori = temp_int;
break;
case SORTID_GRID_VERT:
temp_int = strtol(new_text, (char **)NULL, 10);
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
sview_config->grid_vert = temp_int;
break;
case SORTID_GRID_X_WIDTH:
temp_int = strtol(new_text, (char **)NULL, 10);
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
sview_config->grid_x_width = temp_int;
break;
@@ -191,7 +191,7 @@ static const char *_set_sview_config(sview_config_t *sview_config,
type = "Refresh Delay";
temp_int = strtol(new_text, (char **)NULL, 10);
//temp_int = time_str2secs((char *)new_text);
- if ((temp_int <= 0) && (temp_int != INFINITE))
+ if((temp_int <= 0) && (temp_int != INFINITE))
goto return_error;
sview_config->refresh_delay = temp_int;
break;
@@ -233,7 +233,7 @@ static const char *_set_sview_config(sview_config_t *sview_config,
type = "unknown";
break;
}
- if (strcmp(type, "unknown"))
+ if(strcmp(type, "unknown"))
global_send_update_msg = 1;
return type;
@@ -245,7 +245,7 @@ return_error:
static void _admin_focus_toggle(GtkToggleButton *toggle_button,
bool *visible)
{
- if (visible) {
+ if(visible) {
(*visible) = gtk_toggle_button_get_active(toggle_button);
global_send_update_msg = 1;
}
@@ -259,15 +259,15 @@ static void _admin_edit_combo_box_defaults(GtkComboBox *combo,
int column = 0;
char *name = NULL;
- if (!sview_config)
+ if(!sview_config)
return;
- if (!gtk_combo_box_get_active_iter(combo, &iter)) {
+ if(!gtk_combo_box_get_active_iter(combo, &iter)) {
g_print("nothing selected\n");
return;
}
model = gtk_combo_box_get_model(combo);
- if (!model) {
+ if(!model) {
g_print("nothing selected\n");
return;
}
@@ -284,14 +284,14 @@ static gboolean _admin_focus_out_defaults(GtkEntry *entry,
GdkEventFocus *event,
sview_config_t *sview_config)
{
- if (global_entry_changed) {
+ if(global_entry_changed) {
const char *col_name = NULL;
int type = gtk_entry_get_max_length(entry);
const char *name = gtk_entry_get_text(entry);
type -= DEFAULT_ENTRY_LENGTH;
col_name = _set_sview_config(sview_config, name, type);
- if (global_edit_error) {
- if (global_edit_error_msg)
+ if(global_edit_error) {
+ if(global_edit_error_msg)
g_free(global_edit_error_msg);
global_edit_error_msg = g_strdup_printf(
"Default for %s can't be set to %s",
@@ -311,13 +311,13 @@ static void _local_display_admin_edit(GtkTable *table,
GtkWidget *label = NULL;
GtkWidget *entry = NULL;
- if (display_data->extra == EDIT_MODEL) {
+ if(display_data->extra == EDIT_MODEL) {
/* edittable items that can only be known
values */
GtkCellRenderer *renderer = NULL;
GtkTreeModel *model2 = GTK_TREE_MODEL(
create_model_defaults(display_data->id));
- if (!model2) {
+ if(!model2) {
g_print("no model set up for %d(%s)\n",
display_data->id,
display_data->name);
@@ -338,7 +338,7 @@ static void _local_display_admin_edit(GtkTable *table,
renderer, TRUE);
gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(entry),
renderer, "text", 0);
- } else if (display_data->extra == EDIT_TEXTBOX) {
+ } else if(display_data->extra == EDIT_TEXTBOX) {
char *temp_char = NULL;
/* other edittable items that are unknown */
entry = create_entry();
@@ -367,7 +367,7 @@ static void _local_display_admin_edit(GtkTable *table,
(DEFAULT_ENTRY_LENGTH +
display_data->id));
- if (temp_char) {
+ if(temp_char) {
gtk_entry_set_text(GTK_ENTRY(entry),
temp_char);
xfree(temp_char);
@@ -380,7 +380,7 @@ static void _local_display_admin_edit(GtkTable *table,
g_signal_connect(entry, "changed",
G_CALLBACK(entry_changed),
NULL);
- } else if (display_data->extra == EDIT_ARRAY) {
+ } else if(display_data->extra == EDIT_ARRAY) {
int i;
switch(display_data->id) {
case SORTID_PAGE_VISIBLE:
@@ -393,10 +393,10 @@ static void _local_display_admin_edit(GtkTable *table,
GTK_FILL | GTK_EXPAND,
GTK_SHRINK, 0, 0);
for(i=0; i<PAGE_CNT; i++) {
- if (main_display_data[i].id == -1)
+ if(main_display_data[i].id == -1)
break;
- if (!main_display_data[i].name
+ if(!main_display_data[i].name
|| (i == TAB_PAGE))
continue;
entry = gtk_check_button_new_with_label(
@@ -471,10 +471,10 @@ static void _init_sview_conf()
default_sview_config.default_page = JOB_PAGE;
default_sview_config.tab_pos = GTK_POS_TOP;
- if (getenv("SVIEW_GRID_SPEEDUP"))
+ if(getenv("SVIEW_GRID_SPEEDUP"))
default_sview_config.grid_speedup = 1;
for(i=0; i<PAGE_CNT; i++) {
- if (!main_display_data[i].show)
+ if(!main_display_data[i].show)
default_sview_config.page_visible[i] = FALSE;
else
default_sview_config.page_visible[i] = TRUE;
@@ -507,7 +507,7 @@ extern int load_defaults()
_init_sview_conf();
- if (!home)
+ if(!home)
goto end_it;
pathname = xstrdup_printf("%s/.slurm", home);
@@ -518,14 +518,14 @@ extern int load_defaults()
}
xstrcat(pathname, "/sviewrc");
- if (access(pathname, R_OK) != 0) {
+ if(access(pathname, R_OK) != 0) {
rc = SLURM_ERROR;
goto end_it;
}
hashtbl = s_p_hashtbl_create(sview_conf_options);
- if (s_p_parse_file(hashtbl, &hash_val, pathname) == SLURM_ERROR)
+ if(s_p_parse_file(hashtbl, &hash_val, pathname) == SLURM_ERROR)
fatal("something wrong with opening/reading conf file");
s_p_get_boolean(&default_sview_config.admin_mode, "AdminMode", hashtbl);
@@ -604,7 +604,7 @@ extern int save_defaults()
char *tmp_str = NULL, *tmp_str2 = NULL;
int fd = 0;
- if (!home)
+ if(!home)
return SLURM_ERROR;
reg_file = xstrdup_printf("%s/.slurm", home);
@@ -629,79 +629,79 @@ extern int save_defaults()
"YES" : "NO");
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("DefaultPage=%s\n",
page_to_str(default_sview_config.
default_page));
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("GridHorizontal=%u\n",
default_sview_config.grid_hori);
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("GridSpeedup=%s\n",
default_sview_config.grid_speedup ?
"YES" : "NO");
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("GridVertical=%u\n",
default_sview_config.grid_vert);
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("GridXWidth=%u\n",
default_sview_config.grid_x_width);
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("RefreshDelay=%u\n",
default_sview_config.refresh_delay);
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("RuledTables=%s\n",
default_sview_config.ruled_treeview ?
"YES" : "NO");
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("ShowGrid=%s\n",
default_sview_config.show_grid ?
"YES" : "NO");
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("ShowHidden=%s\n",
default_sview_config.show_hidden ?
"YES" : "NO");
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("TabPosition=%s\n",
tab_pos_to_str(default_sview_config.tab_pos));
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
tmp_str2 = visible_to_str(&default_sview_config);
tmp_str = xstrdup_printf("VisiblePages=%s\n", tmp_str2);
xfree(tmp_str2);
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
goto end_it;
fsync(fd);
@@ -848,11 +848,11 @@ extern int configure_defaults()
for(i = 0; i < SORTID_CNT; i++) {
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (!display_data->name)
+ if(!display_data->name)
continue;
- if (display_data->id != i)
+ if(display_data->id != i)
continue;
_local_display_admin_edit(
@@ -866,19 +866,19 @@ extern int configure_defaults()
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
- if (window)
+ if(window)
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
GTK_WIDGET(window), TRUE, TRUE, 0);
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
if (response == GTK_RESPONSE_OK) {
- if (global_edit_error)
+ if(global_edit_error)
tmp_char_ptr = global_edit_error_msg;
- else if (!global_send_update_msg)
+ else if(!global_send_update_msg)
tmp_char_ptr = g_strdup_printf(
"No change detected.");
else {
- if (tmp_config.ruled_treeview
+ if(tmp_config.ruled_treeview
!= working_sview_config.ruled_treeview) {
/* get rid of each existing table */
cluster_change_block();
@@ -910,10 +910,10 @@ extern int configure_defaults()
working_sview_config.tab_pos);
for(i=0; i<PAGE_CNT; i++) {
- if (main_display_data[i].id == -1)
+ if(main_display_data[i].id == -1)
break;
- if (!main_display_data[i].name
+ if(!main_display_data[i].name
|| (i == TAB_PAGE))
continue;
diff --git a/src/sview/grid.c b/src/sview/grid.c
index c2f17aebf5a189d9cd5600dec7621ede035ef79b..37722f8ede2bc64be693db3b80c872c3b8800cde 100644
--- a/src/sview/grid.c
+++ b/src/sview/grid.c
@@ -80,7 +80,7 @@ static gboolean _mouseover_node(GtkWidget *widget, GdkEventButton *event,
gtk_widget_set_tooltip_text(grid_button->button,
grid_button->node_name);
#else
- if (!grid_button->tip)
+ if(!grid_button->tip)
grid_button->tip = gtk_tooltips_new();
gtk_tooltips_set_tip(grid_button->tip,
grid_button->button,
@@ -98,7 +98,7 @@ static gboolean _mouseoff_node(GtkWidget *widget, GdkEventButton *event,
{
gboolean rc = false;
- if (grid_button->last_state == GTK_STATE_ACTIVE) {
+ if(grid_button->last_state == GTK_STATE_ACTIVE) {
gtk_widget_set_state(grid_button->button, GTK_STATE_ACTIVE);
rc = true;
//g_print("off of %s\n", grid_button->node_name);
@@ -109,9 +109,9 @@ static gboolean _mouseoff_node(GtkWidget *widget, GdkEventButton *event,
static gboolean _open_node(GtkWidget *widget, GdkEventButton *event,
grid_button_t *grid_button)
{
- if (event->button == 1) {
+ if(event->button == 1) {
popup_all_node_name(grid_button->node_name, INFO_PAGE);
- } else if (event->button == 3) {
+ } else if(event->button == 3) {
/* right click */
admin_menu_node_name(grid_button->node_name, event);
}
@@ -132,14 +132,14 @@ static void _open_block(GtkWidget *widget, GdkEventButton *event,
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info)
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info)
+ if(!strcmp(popup_win->spec_info->title, title)) {
break;
}
}
list_iterator_destroy(itr);
- if (!popup_win) {
+ if(!popup_win) {
popup_win = create_popup_info(INFO_PAGE, BLOCK_PAGE, title);
popup_win->spec_info->search_info->search_type =
SEARCH_BLOCK_NODENAME;
@@ -208,7 +208,7 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
GtkWidget *image = NULL;
/* GdkColor color; */
- if (GTK_IS_EVENT_BOX(grid_button->button)) {
+ if(GTK_IS_EVENT_BOX(grid_button->button)) {
//gtk_widget_set_sensitive (grid_button->button, TRUE);
return;
}
@@ -222,10 +222,10 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
FALSE);
_add_button_signals(grid_button);
-/* if (grid_button->frame) */
+/* if(grid_button->frame) */
/* gtk_container_add(GTK_CONTAINER(grid_button->frame), */
/* grid_button->button); */
- if (grid_button->table)
+ if(grid_button->table)
gtk_table_attach(grid_button->table, grid_button->button,
grid_button->table_x,
(grid_button->table_x+1),
@@ -238,7 +238,7 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
//sview_widget_modify_bg(grid_button->button, GTK_STATE_NORMAL, color);
//gdk_color_parse(white_color, &color);
//sview_widget_modify_bg(grid_button->button, GTK_STATE_ACTIVE, color);
- if (state == NODE_STATE_DRAIN)
+ if(state == NODE_STATE_DRAIN)
image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_ERROR,
GTK_ICON_SIZE_SMALL_TOOLBAR);
else
@@ -252,7 +252,7 @@ void _put_button_as_down(grid_button_t *grid_button, int state)
void _put_button_as_up(grid_button_t *grid_button)
{
- if (GTK_IS_BUTTON(grid_button->button)) {
+ if(GTK_IS_BUTTON(grid_button->button)) {
return;
}
gtk_widget_destroy(grid_button->button);
@@ -260,10 +260,10 @@ void _put_button_as_up(grid_button_t *grid_button)
gtk_widget_set_size_request(grid_button->button, 10, 10);
_add_button_signals(grid_button);
-/* if (grid_button->frame) */
+/* if(grid_button->frame) */
/* gtk_container_add(GTK_CONTAINER(grid_button->frame), */
/* grid_button->button); */
- if (grid_button->table)
+ if(grid_button->table)
gtk_table_attach(grid_button->table, grid_button->button,
grid_button->table_x,
(grid_button->table_x+1),
@@ -277,7 +277,7 @@ void _put_button_as_up(grid_button_t *grid_button)
void _put_button_as_inactive(grid_button_t *grid_button)
{
- if (GTK_IS_BUTTON(grid_button->button)) {
+ if(GTK_IS_BUTTON(grid_button->button)) {
//gtk_widget_set_sensitive (grid_button->button, FALSE);
return;
}
@@ -288,10 +288,10 @@ void _put_button_as_inactive(grid_button_t *grid_button)
_add_button_signals(grid_button);
-/* if (grid_button->frame) */
+/* if(grid_button->frame) */
/* gtk_container_add(GTK_CONTAINER(grid_button->frame), */
/* grid_button->button); */
- if (grid_button->table)
+ if(grid_button->table)
gtk_table_attach(grid_button->table, grid_button->button,
grid_button->table_x,
(grid_button->table_x+1),
@@ -314,12 +314,12 @@ static bool _change_button_color(grid_button_t *grid_button,
xassert(grid_button);
- if (only_change_unused && grid_button->used)
+ if(only_change_unused && grid_button->used)
return 0;
grid_button->used = true;
- if (color_inx == MAKE_BLACK) {
- if (grid_button->color_inx != color_inx) {
+ if(color_inx == MAKE_BLACK) {
+ if(grid_button->color_inx != color_inx) {
_put_button_as_inactive(grid_button);
grid_button->color = new_col;
grid_button->color_inx = color_inx;
@@ -334,7 +334,7 @@ static bool _change_button_color(grid_button_t *grid_button,
return changed;
}
- if (state_override != NODE_STATE_UNKNOWN)
+ if(state_override != NODE_STATE_UNKNOWN)
state = state_override;
else
state = grid_button->state;
@@ -346,7 +346,7 @@ static bool _change_button_color(grid_button_t *grid_button,
} else if ((state & NODE_STATE_DRAIN)
|| (node_base_state == NODE_STATE_ERROR)) {
_put_button_as_down(grid_button, NODE_STATE_DRAIN);
- } else if (grid_button->color_inx != color_inx) {
+ } else if(grid_button->color_inx != color_inx) {
_put_button_as_up(grid_button);
grid_button->color = new_col;
grid_button->color_inx = color_inx;
@@ -381,10 +381,10 @@ static void selected_foreach_func(GtkTreeModel *model,
gtk_tree_model_get(model, iter, grid_foreach->color_inx_id,
&color_inx, -1);
- if (!node_inx)
+ if(!node_inx)
return;
- if (color_inx > sview_colors_cnt) {
+ if(color_inx > sview_colors_cnt) {
g_print("hey the color_inx from %d was set to %d > %d\n",
grid_foreach->color_inx_id, color_inx,
sview_colors_cnt);
@@ -397,30 +397,30 @@ static void selected_foreach_func(GtkTreeModel *model,
/*For multiple selections, need to retain all selected.
*(previously this assumed only one selected).
*/
- if ((node_inx[j] < 0)
+ if((node_inx[j] < 0)
|| (grid_button->inx < node_inx[j])
|| (grid_button->inx > node_inx[j+1])) {
continue;
}
- if (_change_button_color(grid_button, color_inx,
+ if(_change_button_color(grid_button, color_inx,
sview_colors[color_inx],
color, 0, 0)) {
changed = 1;
}
- if (GTK_WIDGET_STATE(grid_button->button) != GTK_STATE_NORMAL) {
+ if(GTK_WIDGET_STATE(grid_button->button) != GTK_STATE_NORMAL) {
gtk_widget_set_state(grid_button->button,
GTK_STATE_NORMAL);
}
- if (grid_button->inx == node_inx[j+1]) {
+ if(grid_button->inx == node_inx[j+1]) {
j+=2;
}
}
list_iterator_destroy(itr);
- if (changed && working_sview_config.grid_speedup) {
+ if(changed && working_sview_config.grid_speedup) {
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
}
@@ -432,7 +432,7 @@ static void selected_foreach_func(GtkTreeModel *model,
static int _block_in_node(int *bp_inx, int inx)
{
int j=0;
- if (bp_inx[j] >= 0) {
+ if(bp_inx[j] >= 0) {
if ((bp_inx[j] == inx) && (bp_inx[j+1] == inx))
return 1;
}
@@ -443,7 +443,7 @@ static int _block_in_node(int *bp_inx, int inx)
/* { */
/* grid_foreach_t *grid_foreach = (grid_foreach_t *)arg; */
-/* if (grid_foreach) { */
+/* if(grid_foreach) { */
/* xfree(grid_foreach); */
/* } */
/* } */
@@ -451,8 +451,8 @@ static int _block_in_node(int *bp_inx, int inx)
extern void destroy_grid_button(void *arg)
{
grid_button_t *grid_button = (grid_button_t *)arg;
- if (grid_button) {
- if (grid_button->button) {
+ if(grid_button) {
+ if(grid_button->button) {
gtk_widget_destroy(grid_button->button);
grid_button->button = NULL;
}
@@ -476,12 +476,12 @@ extern grid_button_t *create_grid_button_from_another(
uint16_t node_base_state;
char *new_col = NULL;
- if (!grid_button || !name)
+ if(!grid_button || !name)
return NULL;
- if (color_inx >= 0) {
+ if(color_inx >= 0) {
color_inx %= sview_colors_cnt;
new_col = sview_colors[color_inx];
- } else if (color_inx == MAKE_BLACK)
+ } else if(color_inx == MAKE_BLACK)
new_col = blank_color;
else
new_col = white_color;
@@ -494,7 +494,7 @@ extern grid_button_t *create_grid_button_from_another(
/* need to set the table to empty because we will want to fill
this into the new table later */
send_grid_button->table = NULL;
- if (color_inx == MAKE_BLACK) {
+ if(color_inx == MAKE_BLACK) {
send_grid_button->button = gtk_button_new();
//gtk_widget_set_sensitive (send_grid_button->button, FALSE);
gdk_color_parse(new_col, &color);
@@ -503,7 +503,7 @@ extern grid_button_t *create_grid_button_from_another(
GTK_STATE_NORMAL, color);
/* sview_widget_modify_bg(send_grid_button->button, */
/* GTK_STATE_ACTIVE, color); */
- } else if ((color_inx >= 0) && node_base_state == NODE_STATE_DOWN) {
+ } else if((color_inx >= 0) && node_base_state == NODE_STATE_DOWN) {
GtkWidget *image = gtk_image_new_from_stock(
GTK_STOCK_CANCEL,
GTK_ICON_SIZE_SMALL_TOOLBAR);
@@ -520,7 +520,7 @@ extern grid_button_t *create_grid_button_from_another(
gtk_container_add(
GTK_CONTAINER(send_grid_button->button),
image);
- } else if ((color_inx >= 0)
+ } else if((color_inx >= 0)
&& ((send_grid_button->state & NODE_STATE_DRAIN)
|| (node_base_state == NODE_STATE_ERROR))) {
GtkWidget *image = gtk_image_new_from_stock(
@@ -566,13 +566,13 @@ extern char *change_grid_color(List button_list, int start, int end,
GdkColor color;
char *new_col = NULL;
- if (!button_list)
+ if(!button_list)
return NULL;
- if (color_inx >= 0) {
+ if(color_inx >= 0) {
color_inx %= sview_colors_cnt;
new_col = sview_colors[color_inx];
- } else if (color_inx == MAKE_BLACK)
+ } else if(color_inx == MAKE_BLACK)
new_col = blank_color;
else
new_col = white_color;
@@ -581,7 +581,7 @@ extern char *change_grid_color(List button_list, int start, int end,
itr = list_iterator_create(button_list);
while((grid_button = list_next(itr))) {
- if (start != -1)
+ if(start != -1)
if ((grid_button->inx < start)
|| (grid_button->inx > end))
continue;
@@ -600,14 +600,14 @@ extern void highlight_grid(GtkTreeView *tree_view,
grid_button_t *grid_button = NULL;
grid_foreach_t grid_foreach;
- if (!button_list)
+ if(!button_list)
return;
/*first clear all grid buttons*/
itr = list_iterator_create(button_list);
while((grid_button = list_next(itr))) {
/* clear everyone */
- if ((GTK_WIDGET_STATE(grid_button->button)
+ if((GTK_WIDGET_STATE(grid_button->button)
!= GTK_STATE_ACTIVE)) {
gtk_widget_set_state(grid_button->button,
GTK_STATE_ACTIVE);
@@ -633,16 +633,16 @@ extern void highlight_grid_range(int start, int end, List button_list)
ListIterator itr = NULL;
grid_button_t *grid_button = NULL;
- if (!button_list)
+ if(!button_list)
return;
itr = list_iterator_create(button_list);
while((grid_button = list_next(itr))) {
- if (start != -1)
+ if(start != -1)
if ((grid_button->inx < start)
|| (grid_button->inx > end)) {
/* clear everyone else */
- if ((GTK_WIDGET_STATE(grid_button->button)
+ if((GTK_WIDGET_STATE(grid_button->button)
!= GTK_STATE_ACTIVE))
gtk_widget_set_state(
grid_button->button,
@@ -652,7 +652,7 @@ extern void highlight_grid_range(int start, int end, List button_list)
/* highlight this one, if it is already hightlighted,
* put it back to normal */
//g_print("highlighting %d\n", grid_button->inx);
- if ((GTK_WIDGET_STATE(grid_button->button)
+ if((GTK_WIDGET_STATE(grid_button->button)
!= GTK_STATE_NORMAL))
gtk_widget_set_state(grid_button->button,
GTK_STATE_NORMAL);
@@ -668,17 +668,17 @@ extern void set_grid_used(List button_list, int start, int end,
ListIterator itr = NULL;
grid_button_t *grid_button = NULL;
- if (!button_list)
+ if(!button_list)
return;
itr = list_iterator_create(button_list);
while((grid_button = list_next(itr))) {
- if (start != -1)
+ if(start != -1)
if ((grid_button->inx < start)
|| (grid_button->inx > end))
continue;
grid_button->used = used;
- if (reset_highlight)
+ if(reset_highlight)
gtk_widget_set_state(grid_button->button,
GTK_STATE_NORMAL);
@@ -696,7 +696,7 @@ extern void get_button_list_from_main(List *button_list, int start, int end,
grid_button_t *grid_button = NULL;
grid_button_t *send_grid_button = NULL;
- if (!*button_list)
+ if(!*button_list)
*button_list = list_create(destroy_grid_button);
color_inx %= sview_colors_cnt;
@@ -707,16 +707,16 @@ extern void get_button_list_from_main(List *button_list, int start, int end,
continue;
button_itr = list_iterator_create(*button_list);
while((send_grid_button = list_next(button_itr))) {
- if (send_grid_button->inx == grid_button->inx)
+ if(send_grid_button->inx == grid_button->inx)
break;
}
list_iterator_destroy(button_itr);
- if (send_grid_button)
+ if(send_grid_button)
continue;
send_grid_button = create_grid_button_from_another(
grid_button, grid_button->node_name, color_inx);
- if (send_grid_button) {
+ if(send_grid_button) {
send_grid_button->button_list = *button_list;
_add_button_signals(send_grid_button);
list_append(*button_list, send_grid_button);
@@ -737,7 +737,7 @@ extern List copy_main_button_list(int initial_color)
while((grid_button = list_next(itr))) {
send_grid_button = create_grid_button_from_another(
grid_button, grid_button->node_name, initial_color);
- if (send_grid_button) {
+ if(send_grid_button) {
send_grid_button->button_list = button_list;
_add_button_signals(send_grid_button);
send_grid_button->used = false;
@@ -771,7 +771,7 @@ extern void add_extra_bluegene_buttons(List *button_list, int inx,
return;
}
- if (!*button_list)
+ if(!*button_list)
*button_list = list_create(NULL);
*color_inx %= sview_colors_cnt;
@@ -783,7 +783,7 @@ extern void add_extra_bluegene_buttons(List *button_list, int inx,
}
list_iterator_destroy(itr);
- if (!grid_button)
+ if(!grid_button)
return;
orig_state = grid_button->state;
/* remove all (if any) buttons pointing to this node since we
@@ -791,32 +791,32 @@ extern void add_extra_bluegene_buttons(List *button_list, int inx,
itr = list_iterator_create(*button_list);
while((send_grid_button = list_next(itr))) {
- if (send_grid_button->inx == grid_button->inx)
+ if(send_grid_button->inx == grid_button->inx)
list_remove(itr);
}
list_iterator_destroy(itr);
for (i=0; i < block_ptr->record_count; i++) {
bg_info_ptr = &block_ptr->block_array[i];
- if (!_block_in_node(bg_info_ptr->bp_inx, inx))
+ if(!_block_in_node(bg_info_ptr->bp_inx, inx))
continue;
found = 1;
nodes = bg_info_ptr->nodes;
- if (bg_info_ptr->ionodes) {
+ if(bg_info_ptr->ionodes) {
sprintf(tmp_nodes, "%s[%s]", nodes,
bg_info_ptr->ionodes);
nodes = tmp_nodes;
}
- if (bg_info_ptr->state == RM_PARTITION_ERROR)
+ if(bg_info_ptr->state == RM_PARTITION_ERROR)
grid_button->state = NODE_STATE_ERROR;
- else if (bg_info_ptr->job_running > NO_JOB_RUNNING)
+ else if(bg_info_ptr->job_running > NO_JOB_RUNNING)
grid_button->state = NODE_STATE_ALLOCATED;
else
grid_button->state = NODE_STATE_IDLE;
send_grid_button = create_grid_button_from_another(
grid_button, nodes, *color_inx);
grid_button->state = orig_state;
- if (send_grid_button) {
+ if(send_grid_button) {
send_grid_button->button_list = *button_list;
send_grid_button->table_x = 0;
send_grid_button->table_y = coord_y++;
@@ -839,10 +839,10 @@ extern void add_extra_bluegene_buttons(List *button_list, int inx,
(*color_inx)++;
}
}
- if (!found) {
+ if(!found) {
send_grid_button = create_grid_button_from_another(
grid_button, grid_button->node_name, *color_inx);
- if (send_grid_button) {
+ if(send_grid_button) {
send_grid_button->button_list = *button_list;
send_grid_button->table_x = 0;
send_grid_button->table_y = coord_y++;
@@ -872,18 +872,18 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
list_sort(button_list, (ListCmpF) _sort_button_inx);
- if (cluster_dims == 4) {
+ if(cluster_dims == 4) {
/* FIXME: */
return;
- } else if (cluster_dims == 3) {
+ } else if(cluster_dims == 3) {
node_count = DIM_SIZE[X];
working_sview_config.grid_x_width = DIM_SIZE[X] + DIM_SIZE[Z];
table_y = (DIM_SIZE[Z] * DIM_SIZE[Y]) + DIM_SIZE[Y];
} else {
- if (!working_sview_config.grid_x_width) {
- if (node_count < 50) {
+ if(!working_sview_config.grid_x_width) {
+ if(node_count < 50) {
working_sview_config.grid_x_width = 1;
- } else if (node_count < 500) {
+ } else if(node_count < 500) {
working_sview_config.grid_x_width = 10;
} else {
working_sview_config.grid_x_width=20;
@@ -896,10 +896,10 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
gtk_table_resize(table, table_y, working_sview_config.grid_x_width);
itr = list_iterator_create(button_list);
while((grid_button = list_next(itr))) {
- if (cluster_dims == 4) {
+ if(cluster_dims == 4) {
/* FIXME: */
return;
- } else if (cluster_dims == 3) {
+ } else if(cluster_dims == 3) {
grid_button->table = table;
gtk_table_attach(table, grid_button->button,
grid_button->table_x,
@@ -908,7 +908,7 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
(grid_button->table_y+1),
GTK_SHRINK, GTK_SHRINK,
1, 1);
- if (!grid_button->table_x)
+ if(!grid_button->table_x)
gtk_table_set_row_spacing(table,
grid_button->table_y,
5);
@@ -922,18 +922,18 @@ extern void put_buttons_in_table(GtkTable *table, List button_list)
GTK_SHRINK, GTK_SHRINK,
1, 1);
coord_x++;
- if (coord_x == working_sview_config.grid_x_width) {
+ if(coord_x == working_sview_config.grid_x_width) {
coord_x = 0;
coord_y++;
- if (!(coord_y % working_sview_config.grid_vert))
+ if(!(coord_y % working_sview_config.grid_vert))
gtk_table_set_row_spacing(
table, coord_y-1, 5);
}
- if (coord_y == table_y)
+ if(coord_y == table_y)
break;
- if (coord_x
+ if(coord_x
&& !(coord_x % working_sview_config.grid_hori))
gtk_table_set_col_spacing(table, coord_x-1, 5);
}
@@ -959,10 +959,10 @@ extern int update_grid_table(GtkTable *table, List button_list, List node_list)
sview_node_info_t *sview_node_info_ptr = NULL;
int default_y_offset = 0;
- if (cluster_dims == 4) {
+ if(cluster_dims == 4) {
/* FIXME: */
return SLURM_ERROR;
- } else if (cluster_dims == 3) {
+ } else if(cluster_dims == 3) {
default_y_offset = (DIM_SIZE[Z] * DIM_SIZE[Y])
+ (DIM_SIZE[Y] - DIM_SIZE[Z]);
node_count = DIM_SIZE[X];
@@ -970,10 +970,10 @@ extern int update_grid_table(GtkTable *table, List button_list, List node_list)
table_y = (DIM_SIZE[Z] * DIM_SIZE[Y]) + DIM_SIZE[Y];
} else {
node_count = list_count(node_list);
- if (!working_sview_config.grid_x_width) {
- if (node_count < 50) {
+ if(!working_sview_config.grid_x_width) {
+ if(node_count < 50) {
working_sview_config.grid_x_width = 1;
- } else if (node_count < 500) {
+ } else if(node_count < 500) {
working_sview_config.grid_x_width = 10;
} else {
working_sview_config.grid_x_width = 20;
@@ -983,7 +983,7 @@ extern int update_grid_table(GtkTable *table, List button_list, List node_list)
table_y++;
}
- if (!node_list) {
+ if(!node_list) {
g_print("update_grid_table: no node_list given\n");
return SLURM_ERROR;
}
@@ -997,13 +997,13 @@ extern int update_grid_table(GtkTable *table, List button_list, List node_list)
int found = 0;
again:
while((grid_button = list_next(itr2))) {
- if (grid_button->inx != inx)
+ if(grid_button->inx != inx)
continue;
found = 1;
- if (cluster_dims == 4) {
+ if(cluster_dims == 4) {
/* FIXME: */
return SLURM_ERROR;
- } else if (cluster_dims == 3) {
+ } else if(cluster_dims == 3) {
int i = strlen(
sview_node_info_ptr->node_ptr->name);
int x=0, y=0, z=0, y_offset=0;
@@ -1044,7 +1044,7 @@ extern int update_grid_table(GtkTable *table, List button_list, List node_list)
"bottom-attach", (coord_y+1),
NULL);
- if (cluster_dims < 3) {
+ if(cluster_dims < 3) {
/* On linear systems we just up the
x_coord until we hit the side of
the table and then incrememnt the
@@ -1052,27 +1052,27 @@ extern int update_grid_table(GtkTable *table, List button_list, List node_list)
each 10th row.
*/
coord_x++;
- if (coord_x
+ if(coord_x
== working_sview_config.grid_x_width) {
coord_x = 0;
coord_y++;
- if (!(coord_y
+ if(!(coord_y
% working_sview_config.grid_vert))
gtk_table_set_row_spacing(
table, coord_y-1, 5);
}
- if (coord_y == table_y)
+ if(coord_y == table_y)
break;
- if (coord_x
+ if(coord_x
&& !(coord_x%working_sview_config.grid_hori))
gtk_table_set_col_spacing(
table, coord_x-1, 5);
}
break;
}
- if (!found) {
+ if(!found) {
list_iterator_reset(itr2);
goto again;
}
@@ -1097,7 +1097,7 @@ extern int get_system_stats(GtkTable *table)
List node_list = NULL;
int changed = 1;
- if ((error_code = get_new_info_node(&node_info_ptr, force_refresh))
+ if((error_code = get_new_info_node(&node_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
changed = 0;
} else if (error_code != SLURM_SUCCESS)
@@ -1107,7 +1107,7 @@ extern int get_system_stats(GtkTable *table)
node_list = create_node_info_list(node_info_ptr, changed);
- if (grid_button_list)
+ if(grid_button_list)
update_grid_table(main_grid_table, grid_button_list, node_list);
else {
grid_button_list = list_create(destroy_grid_button);
@@ -1129,10 +1129,10 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
sview_node_info_t *sview_node_info_ptr = NULL;
int default_y_offset = 0;
- if (cluster_dims == 4) {
+ if(cluster_dims == 4) {
/* FIXME: */
return SLURM_ERROR;
- } else if (cluster_dims == 3) {
+ } else if(cluster_dims == 3) {
default_y_offset = (DIM_SIZE[Z] * DIM_SIZE[Y])
+ (DIM_SIZE[Y] - DIM_SIZE[Z]);
node_count = DIM_SIZE[X];
@@ -1140,10 +1140,10 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
table_y = (DIM_SIZE[Z] * DIM_SIZE[Y]) + DIM_SIZE[Y];
} else {
node_count = list_count(node_list);
- if (!working_sview_config.grid_x_width) {
- if (node_count < 50) {
+ if(!working_sview_config.grid_x_width) {
+ if(node_count < 50) {
working_sview_config.grid_x_width = 1;
- } else if (node_count < 500) {
+ } else if(node_count < 500) {
working_sview_config.grid_x_width = 10;
} else {
working_sview_config.grid_x_width = 20;
@@ -1153,7 +1153,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
table_y++;
}
- if (!node_list) {
+ if(!node_list) {
g_print("setup_grid_table: no node_list given\n");
return SLURM_ERROR;
}
@@ -1161,10 +1161,10 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
gtk_table_resize(table, table_y, working_sview_config.grid_x_width);
itr = list_iterator_create(node_list);
while((sview_node_info_ptr = list_next(itr))) {
- if (cluster_dims == 4) {
+ if(cluster_dims == 4) {
/* FIXME: */
return SLURM_ERROR;
- } else if (cluster_dims == 3) {
+ } else if(cluster_dims == 3) {
int i = strlen(sview_node_info_ptr->node_ptr->name);
int x=0, y=0, z=0, y_offset=0;
/* On 3D system we need to translate a
@@ -1218,7 +1218,7 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
/* grid_button->button); */
/* gtk_frame_set_shadow_type(GTK_FRAME(grid_button->frame), */
/* GTK_SHADOW_ETCHED_OUT); */
- if (cluster_dims < 3) {
+ if(cluster_dims < 3) {
/* On linear systems we just up the
x_coord until we hit the side of
the table and then incrememnt the
@@ -1226,19 +1226,19 @@ extern int setup_grid_table(GtkTable *table, List button_list, List node_list)
each 10th row.
*/
coord_x++;
- if (coord_x
+ if(coord_x
== working_sview_config.grid_x_width) {
coord_x = 0;
coord_y++;
- if (!(coord_y % working_sview_config.grid_vert))
+ if(!(coord_y % working_sview_config.grid_vert))
gtk_table_set_row_spacing(
table, coord_y-1, 5);
}
- if (coord_y == table_y)
+ if(coord_y == table_y)
break;
- if (coord_x && !(coord_x%working_sview_config.grid_hori))
+ if(coord_x && !(coord_x%working_sview_config.grid_hori))
gtk_table_set_col_spacing(
table, coord_x-1, 5);
}
@@ -1265,7 +1265,7 @@ extern void sview_init_grid(bool reset_highlight)
ListIterator itr = NULL;
grid_button_t *grid_button = NULL;
- if ((error_code = get_new_info_node(&node_info_ptr, force_refresh))
+ if((error_code = get_new_info_node(&node_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
/* need to clear out old data */
set_grid_used(grid_button_list, -1, -1, false, reset_highlight);
@@ -1274,7 +1274,7 @@ extern void sview_init_grid(bool reset_highlight)
return;
}
- if (!grid_button_list) {
+ if(!grid_button_list) {
g_print("you need to run get_system_stats() first\n");
exit(0);
}
@@ -1294,7 +1294,7 @@ extern void sview_init_grid(bool reset_highlight)
break;
}
- if (!grid_button && !tried_again) {
+ if(!grid_button && !tried_again) {
/* the order should never change but just to
* make sure we don't miss it */
list_iterator_reset(itr);
@@ -1310,7 +1310,7 @@ extern void setup_popup_grid_list(popup_info_t *popup_win)
{
int def_color = MAKE_BLACK;
- if (popup_win->grid_button_list) {
+ if(popup_win->grid_button_list) {
set_grid_used(popup_win->grid_button_list,
-1, -1, false, false);
} else {
@@ -1326,7 +1326,7 @@ extern void setup_popup_grid_list(popup_info_t *popup_win)
extern void post_setup_popup_grid_list(popup_info_t *popup_win)
{
/* refresh the pointer */
- if (popup_win->model
+ if(popup_win->model
&& gtk_tree_store_iter_is_valid(GTK_TREE_STORE(popup_win->model),
&popup_win->iter)) {
gtk_tree_model_get(popup_win->model, &popup_win->iter,
@@ -1336,7 +1336,7 @@ extern void post_setup_popup_grid_list(popup_info_t *popup_win)
popup_win->node_inx = NULL;
}
- if (popup_win->node_inx) {
+ if(popup_win->node_inx) {
int j=0;
while(popup_win->node_inx[j] >= 0) {
change_grid_color(
@@ -1349,7 +1349,7 @@ extern void post_setup_popup_grid_list(popup_info_t *popup_win)
change_grid_color(popup_win->grid_button_list, -1, -1,
MAKE_BLACK, true, NODE_STATE_IDLE);
- if (working_sview_config.grid_speedup) {
+ if(working_sview_config.grid_speedup) {
gtk_widget_set_sensitive(GTK_WIDGET(popup_win->grid_table), 0);
gtk_widget_set_sensitive(GTK_WIDGET(popup_win->grid_table), 1);
}
diff --git a/src/sview/job_info.c b/src/sview/job_info.c
index 0a9b665ba5b2a24e20b2674cd54c55369b6d253d..da2c7f69f704eada11849c36859152a07dd7d277 100644
--- a/src/sview/job_info.c
+++ b/src/sview/job_info.c
@@ -454,7 +454,7 @@ static void _job_info_list_del(void *object)
if (sview_job_info) {
xfree(sview_job_info->nodes);
- if (sview_job_info->step_list)
+ if(sview_job_info->step_list)
list_destroy(sview_job_info->step_list);
xfree(sview_job_info);
}
@@ -474,7 +474,7 @@ static void _destroy_jobs_foreach(void *object)
/* jobs_foreach_common_t *jobs_foreach = (jobs_foreach_common_t *)object; */
/* if (jobs_foreach) { */
-/* if (jobs_foreach->entry) { */
+/* if(jobs_foreach->entry) { */
/* gtk_widget_destroy(jobs_foreach->entry); */
/* jobs_foreach->entry = NULL; */
/* } */
@@ -603,21 +603,21 @@ static void _set_active_combo_job(GtkComboBox *combo,
int action = 0;
gtk_tree_model_get(model, iter, type, &temp_char, -1);
- if (!temp_char)
+ if(!temp_char)
goto end_it;
switch(type) {
case SORTID_ACTION:
- if (!strcasecmp(temp_char, "None"))
+ if(!strcasecmp(temp_char, "None"))
action = 0;
- else if (!strcasecmp(temp_char, "Cancel"))
+ else if(!strcasecmp(temp_char, "Cancel"))
action = 1;
- else if (!strcasecmp(temp_char, "Suspend"))
+ else if(!strcasecmp(temp_char, "Suspend"))
action = 2;
- else if (!strcasecmp(temp_char, "Resume"))
+ else if(!strcasecmp(temp_char, "Resume"))
action = 3;
- else if (!strcasecmp(temp_char, "Checkpoint"))
+ else if(!strcasecmp(temp_char, "Checkpoint"))
action = 4;
- else if (!strcasecmp(temp_char, "Requeue"))
+ else if(!strcasecmp(temp_char, "Requeue"))
action = 5;
else
action = 0;
@@ -627,28 +627,28 @@ static void _set_active_combo_job(GtkComboBox *combo,
case SORTID_CONTIGUOUS:
case SORTID_REQUEUE:
case SORTID_ROTATE:
- if (!strcasecmp(temp_char, "yes"))
+ if(!strcasecmp(temp_char, "yes"))
action = 0;
- else if (!strcasecmp(temp_char, "no"))
+ else if(!strcasecmp(temp_char, "no"))
action = 1;
else
action = 0;
break;
case SORTID_CONNECTION:
- if (!strcasecmp(temp_char, "Torus"))
+ if(!strcasecmp(temp_char, "Torus"))
action = 0;
- else if (!strcasecmp(temp_char, "Mesh"))
+ else if(!strcasecmp(temp_char, "Mesh"))
action = 1;
- else if (!strcasecmp(temp_char, "NAV"))
+ else if(!strcasecmp(temp_char, "NAV"))
action = 2;
- else if (!strcasecmp(temp_char, "HTC_S"))
+ else if(!strcasecmp(temp_char, "HTC_S"))
action = 3;
- else if (!strcasecmp(temp_char, "HTC_D"))
+ else if(!strcasecmp(temp_char, "HTC_D"))
action = 4;
- else if (!strcasecmp(temp_char, "HTC_V"))
+ else if(!strcasecmp(temp_char, "HTC_V"))
action = 5;
- else if (!strcasecmp(temp_char, "HTC_L"))
+ else if(!strcasecmp(temp_char, "HTC_L"))
action = 6;
else
action = 0;
@@ -680,25 +680,25 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
/* need to clear global_edit_error here (just in case) */
global_edit_error = 0;
- if (!job_msg)
+ if(!job_msg)
return NULL;
switch(column) {
case SORTID_ACTION:
xfree(got_edit_signal);
- if (!strcasecmp(new_text, "None"))
+ if(!strcasecmp(new_text, "None"))
got_edit_signal = NULL;
else
got_edit_signal = xstrdup(new_text);
break;
case SORTID_TIMELIMIT:
- if (!strcasecmp(new_text, "infinite"))
+ if(!strcasecmp(new_text, "infinite"))
temp_int = INFINITE;
else
temp_int = time_str2mins((char *)new_text);
type = "timelimit";
- if (temp_int <= 0 && temp_int != INFINITE)
+ if(temp_int <= 0 && temp_int != INFINITE)
goto return_error;
job_msg->time_limit = (uint32_t)temp_int;
break;
@@ -706,7 +706,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, (char **)NULL, 10);
type = "priority";
- if (temp_int < 0)
+ if(temp_int < 0)
goto return_error;
job_msg->priority = (uint32_t)temp_int;
break;
@@ -724,11 +724,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, &p, 10);
if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if (*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
type = "min cpus per node";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
job_msg->pn_min_cpus = (uint32_t)temp_int;
break;
@@ -736,7 +736,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, (char **)NULL, 10);
type = "requested tasks";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
job_msg->num_tasks = (uint32_t)temp_int;
break;
@@ -744,7 +744,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, (char **)NULL, 10);
type = "cpus per task";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
job_msg->cpus_per_task = (uint32_t)temp_int;
break;
@@ -756,11 +756,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, &p, 10);
if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if (*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
type = "min nodes";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
job_msg->min_nodes = (uint32_t)temp_int;
break;
@@ -768,11 +768,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, &p, 10);
if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if (*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
type = "node count";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
job_msg->min_nodes = job_msg->max_nodes = (uint32_t)temp_int;
break;
@@ -780,15 +780,15 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, &p, 10);
if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if (*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
type = "max nodes";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
/* this needs to be set up for correct functionality */
- if (job_msg->min_nodes == NO_VAL)
+ if(job_msg->min_nodes == NO_VAL)
job_msg->min_nodes = (uint32_t)temp_int;
job_msg->max_nodes = (uint32_t)temp_int;
@@ -797,11 +797,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, (char **)NULL, 10);
if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if (*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
type = "min memory per node";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
job_msg->pn_min_memory = (uint32_t)temp_int;
break;
@@ -809,11 +809,11 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
temp_int = strtol(new_text, (char **)NULL, 10);
if (*p == 'k' || *p == 'K')
temp_int *= 1024;
- else if (*p == 'm' || *p == 'M')
+ else if(*p == 'm' || *p == 'M')
temp_int *= 1048576;
type = "min tmp disk per node";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
job_msg->pn_min_tmp_disk = (uint32_t)temp_int;
break;
@@ -911,7 +911,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
goto return_error;
}
- if (!job_msg->select_jobinfo)
+ if(!job_msg->select_jobinfo)
job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
@@ -927,7 +927,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
rotate = 0;
}
- if (!job_msg->select_jobinfo)
+ if(!job_msg->select_jobinfo)
job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
@@ -952,7 +952,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
conn_type = SELECT_NAV;
}
- if (!job_msg->select_jobinfo)
+ if(!job_msg->select_jobinfo)
job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
@@ -961,7 +961,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_IMAGE_BLRTS:
type = "BlrtsImage";
- if (!job_msg->select_jobinfo)
+ if(!job_msg->select_jobinfo)
job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
@@ -969,12 +969,12 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
(void *) new_text);
break;
case SORTID_IMAGE_LINUX:
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
type = "LinuxImage";
else
type = "CnloadImage";
- if (!job_msg->select_jobinfo)
+ if(!job_msg->select_jobinfo)
job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
@@ -983,7 +983,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
case SORTID_IMAGE_MLOADER:
type = "MloaderImage";
- if (!job_msg->select_jobinfo)
+ if(!job_msg->select_jobinfo)
job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
@@ -991,12 +991,12 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
(void *) new_text);
break;
case SORTID_IMAGE_RAMDISK:
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
type = "RamdiskImage";
else
type = "IoloadImage";
- if (!job_msg->select_jobinfo)
+ if(!job_msg->select_jobinfo)
job_msg->select_jobinfo
= select_g_select_jobinfo_alloc();
select_g_select_jobinfo_set(job_msg->select_jobinfo,
@@ -1007,10 +1007,10 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
case SORTID_TIME_START:
type = "start time";
job_msg->begin_time = parse_time((char *)new_text, 0);
- if (!job_msg->begin_time)
+ if(!job_msg->begin_time)
goto return_error;
- if (job_msg->begin_time < time(NULL))
+ if(job_msg->begin_time < time(NULL))
job_msg->begin_time = time(NULL);
break;
default:
@@ -1018,7 +1018,7 @@ static const char *_set_job_msg(job_desc_msg_t *job_msg, const char *new_text,
break;
}
- if (strcmp(type, "unknown"))
+ if(strcmp(type, "unknown"))
global_send_update_msg = 1;
xfree(original_ptr);
@@ -1038,15 +1038,15 @@ static void _admin_edit_combo_box_job(GtkComboBox *combo,
int column = 0;
char *name = NULL;
- if (!job_msg)
+ if(!job_msg)
return;
- if (!gtk_combo_box_get_active_iter(combo, &iter)) {
+ if(!gtk_combo_box_get_active_iter(combo, &iter)) {
g_print("nothing selected\n");
return;
}
model = gtk_combo_box_get_model(combo);
- if (!model) {
+ if(!model) {
g_print("nothing selected\n");
return;
}
@@ -1063,15 +1063,15 @@ static gboolean _admin_focus_out_job(GtkEntry *entry,
GdkEventFocus *event,
job_desc_msg_t *job_msg)
{
- if (global_entry_changed) {
+ if(global_entry_changed) {
const char *col_name = NULL;
int type = gtk_entry_get_max_length(entry);
const char *name = gtk_entry_get_text(entry);
type -= DEFAULT_ENTRY_LENGTH;
col_name = _set_job_msg(job_msg, name, type);
- if (global_edit_error) {
- if (global_edit_error_msg)
+ if(global_edit_error) {
+ if(global_edit_error_msg)
g_free(global_edit_error_msg);
global_edit_error_msg = g_strdup_printf(
"Job %d %s can't be set to %s",
@@ -1107,11 +1107,11 @@ static GtkWidget *_admin_full_edit_job(job_desc_msg_t *job_msg,
for(i = 0; i < SORTID_CNT; i++) {
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (!display_data->name)
+ if(!display_data->name)
continue;
- if (display_data->id != i)
+ if(display_data->id != i)
continue;
display_admin_edit(
table, job_msg, &row, model, iter,
@@ -1154,14 +1154,14 @@ static void _convert_char_to_job_and_step(const char *data,
{
int i = 0;
- if (!data)
+ if(!data)
return;
*jobid = atoi(data);
*stepid = NO_VAL;
while(data[i]) {
- if (data[i] == '.') {
+ if(data[i] == '.') {
i++;
- if (data[i])
+ if(data[i])
*stepid = atoi(&data[i]);
break;
}
@@ -1188,10 +1188,10 @@ static void _layout_job_record(GtkTreeView *treeview,
GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
- if (!treestore)
+ if(!treestore)
return;
- if (!job_ptr->nodes || !strcasecmp(job_ptr->nodes,"waiting...")) {
+ if(!job_ptr->nodes || !strcasecmp(job_ptr->nodes,"waiting...")) {
sprintf(running_char,"00:00:00");
nodes = "waiting...";
} else {
@@ -1228,7 +1228,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_ALLOC_NODE),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_CRAYXT)
+ if(cluster_flags & CLUSTER_FLAG_CRAYXT)
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_ALPS_RESV_ID),
@@ -1237,7 +1237,7 @@ static void _layout_job_record(GtkTreeView *treeview,
tmp_char,
sizeof(tmp_char),
SELECT_PRINT_RESV_ID));
- if (job_ptr->batch_flag)
+ if(job_ptr->batch_flag)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
@@ -1246,7 +1246,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_BATCH),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODELIST),
@@ -1276,7 +1276,7 @@ static void _layout_job_record(GtkTreeView *treeview,
find_col_name(display_data_job,
SORTID_COMMENT),
job_ptr->comment);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_CONNECTION),
@@ -1285,7 +1285,7 @@ static void _layout_job_record(GtkTreeView *treeview,
tmp_char,
sizeof(tmp_char),
SELECT_PRINT_CONNECTION));
- if (job_ptr->contiguous)
+ if(job_ptr->contiguous)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
@@ -1294,7 +1294,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_CONTIGUOUS),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)job_ptr->num_cpus,
tmp_char, sizeof(tmp_char),
UNIT_NONE);
@@ -1306,7 +1306,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_CPUS),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)job_ptr->max_cpus,
tmp_char, sizeof(tmp_char),
UNIT_NONE);
@@ -1318,7 +1318,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_CPU_MAX),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)job_ptr->num_cpus,
tmp_char, sizeof(tmp_char),
UNIT_NONE);
@@ -1330,7 +1330,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_CPU_MIN),
tmp_char);
- if (job_ptr->cpus_per_task > 0)
+ if(job_ptr->cpus_per_task > 0)
sprintf(tmp_char, "%u", job_ptr->cpus_per_task);
else
sprintf(tmp_char, " ");
@@ -1363,7 +1363,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_GRES),
job_ptr->gres);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_GEOMETRY),
@@ -1383,8 +1383,8 @@ static void _layout_job_record(GtkTreeView *treeview,
find_col_name(display_data_job,
SORTID_GROUP_ID),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG) {
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BGL)
add_display_treestore_line(
update, treestore, &iter,
find_col_name(display_data_job,
@@ -1441,7 +1441,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_CPU_REQ),
tmp_char);
- if (job_ptr->pn_min_memory > 0)
+ if(job_ptr->pn_min_memory > 0)
convert_num_unit((float)job_ptr->pn_min_memory,
tmp_char, sizeof(tmp_char), UNIT_MEGA);
else
@@ -1450,7 +1450,7 @@ static void _layout_job_record(GtkTreeView *treeview,
find_col_name(display_data_job,
SORTID_MEM_MIN),
tmp_char);
- if (job_ptr->pn_min_tmp_disk > 0)
+ if(job_ptr->pn_min_tmp_disk > 0)
convert_num_unit((float)job_ptr->pn_min_tmp_disk,
tmp_char, sizeof(tmp_char), UNIT_MEGA);
else
@@ -1465,13 +1465,13 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_NAME),
job_ptr->name);
- if (cluster_flags & CLUSTER_FLAG_AIX)
+ if(cluster_flags & CLUSTER_FLAG_AIX)
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NETWORK),
job_ptr->network);
- if (job_ptr->pn_min_memory > 0)
+ if(job_ptr->pn_min_memory > 0)
sprintf(tmp_char, "%u", job_ptr->nice - NICE_OFFSET);
else
sprintf(tmp_char, " ");
@@ -1480,7 +1480,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_NICE),
tmp_char);
- if (!(cluster_flags & CLUSTER_FLAG_BG)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BG)) {
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_NODELIST),
@@ -1495,7 +1495,7 @@ static void _layout_job_record(GtkTreeView *treeview,
job_ptr->req_nodes);
}
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
else
@@ -1507,7 +1507,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_NODES),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
else
@@ -1519,7 +1519,7 @@ static void _layout_job_record(GtkTreeView *treeview,
SORTID_NODES_MAX),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
else
@@ -1555,7 +1555,7 @@ static void _layout_job_record(GtkTreeView *treeview,
find_col_name(display_data_job,
SORTID_REASON), reason);
- if (job_ptr->requeue)
+ if(job_ptr->requeue)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
@@ -1574,7 +1574,7 @@ static void _layout_job_record(GtkTreeView *treeview,
find_col_name(display_data_job,
SORTID_RESTARTS),
tmp_char);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
add_display_treestore_line(update, treestore, &iter,
find_col_name(display_data_job,
SORTID_ROTATE),
@@ -1584,7 +1584,7 @@ static void _layout_job_record(GtkTreeView *treeview,
sizeof(tmp_char),
SELECT_PRINT_ROTATE));
- if (job_ptr->shared)
+ if(job_ptr->shared)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
@@ -1617,7 +1617,7 @@ static void _layout_job_record(GtkTreeView *treeview,
if (job_ptr->time_limit == NO_VAL)
sprintf(tmp_char, "Partition Limit");
- else if (job_ptr->time_limit == INFINITE)
+ else if(job_ptr->time_limit == INFINITE)
sprintf(tmp_char, "Infinite");
else
secs2time_str((job_ptr->time_limit * 60),
@@ -1691,12 +1691,12 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
struct group *group_info = NULL;
uint16_t term_sig = 0;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
gtk_tree_store_set(treestore, iter, SORTID_SMALL_BLOCK,
sview_job_info_ptr->small_block, -1);
gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
- if (!job_ptr->nodes || !strcasecmp(job_ptr->nodes,"waiting...")) {
+ if(!job_ptr->nodes || !strcasecmp(job_ptr->nodes,"waiting...")) {
sprintf(tmp_char,"00:00:00");
nodes = "waiting...";
} else {
@@ -1752,7 +1752,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
if (job_ptr->time_limit == NO_VAL)
sprintf(tmp_char, "Partition Limit");
- else if (job_ptr->time_limit == INFINITE)
+ else if(job_ptr->time_limit == INFINITE)
sprintf(tmp_char, "Infinite");
else
secs2time_str((job_ptr->time_limit * 60),
@@ -1782,7 +1782,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
SORTID_USER_ID, uname, -1);
xfree(uname);
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
gtk_tree_store_set(treestore, iter,
SORTID_BLOCK,
select_g_select_jobinfo_sprint(
@@ -1812,7 +1812,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
tmp_char,
sizeof(tmp_char),
SELECT_PRINT_ROTATE), -1);
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
gtk_tree_store_set(treestore, iter,
SORTID_IMAGE_BLRTS,
select_g_select_jobinfo_sprint(
@@ -1846,7 +1846,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
SELECT_PRINT_RAMDISK_IMAGE), -1);
}
- if (cluster_flags & CLUSTER_FLAG_CRAYXT)
+ if(cluster_flags & CLUSTER_FLAG_CRAYXT)
gtk_tree_store_set(treestore, iter,
SORTID_ALPS_RESV_ID,
select_g_select_jobinfo_sprint(
@@ -1864,7 +1864,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
SORTID_STATE_NUM,
job_ptr->job_state, -1);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)sview_job_info_ptr->node_cnt,
tmp_char, sizeof(tmp_char), UNIT_NONE);
else
@@ -1873,7 +1873,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_NODES, tmp_char, -1);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)job_ptr->num_cpus,
tmp_char, sizeof(tmp_char),
UNIT_NONE);
@@ -1883,7 +1883,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_CPUS, tmp_char, -1);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)job_ptr->num_cpus,
tmp_char, sizeof(tmp_char),
UNIT_NONE);
@@ -1893,7 +1893,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_CPU_MIN, tmp_char, -1);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)job_ptr->max_cpus,
tmp_char, sizeof(tmp_char),
UNIT_NONE);
@@ -1913,28 +1913,28 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
gtk_tree_store_set(treestore, iter, SORTID_NODELIST_EXC,
job_ptr->exc_nodes, -1);
- if (job_ptr->contiguous)
+ if(job_ptr->contiguous)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
gtk_tree_store_set(treestore, iter,
SORTID_CONTIGUOUS, tmp_char, -1);
- if (job_ptr->shared)
+ if(job_ptr->shared)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
gtk_tree_store_set(treestore, iter,
SORTID_SHARED, tmp_char, -1);
- if (job_ptr->batch_flag)
+ if(job_ptr->batch_flag)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
gtk_tree_store_set(treestore, iter,
SORTID_BATCH, tmp_char, -1);
- if (job_ptr->requeue)
+ if(job_ptr->requeue)
sprintf(tmp_char, "yes");
else
sprintf(tmp_char, "no");
@@ -1947,12 +1947,12 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
sprintf(tmp_char, "%u", sview_job_info_ptr->node_cnt);
gtk_tree_store_set(treestore, iter,
SORTID_NODES_MIN, tmp_char, -1);
- if (job_ptr->max_nodes > 0) {
+ if(job_ptr->max_nodes > 0) {
sprintf(tmp_char, "%u", sview_job_info_ptr->node_cnt);
gtk_tree_store_set(treestore, iter,
SORTID_NODES_MAX, tmp_char, -1);
}
- if (job_ptr->cpus_per_task > 0) {
+ if(job_ptr->cpus_per_task > 0) {
sprintf(tmp_char, "%u", job_ptr->cpus_per_task);
gtk_tree_store_set(treestore, iter,
SORTID_CPUS_PER_TASK, tmp_char, -1);
@@ -2000,7 +2000,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_PRIORITY, tmp_char, -1);
- if (WIFSIGNALED(job_ptr->exit_code))
+ if(WIFSIGNALED(job_ptr->exit_code))
term_sig = WTERMSIG(job_ptr->exit_code);
snprintf(tmp_char, sizeof(tmp_char), "%u:%u",
WEXITSTATUS(job_ptr->exit_code), term_sig);
@@ -2021,7 +2021,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
gtk_tree_store_set(treestore, iter,
SORTID_REASON, reason, -1);
- if (cluster_flags & CLUSTER_FLAG_AIX)
+ if(cluster_flags & CLUSTER_FLAG_AIX)
gtk_tree_store_set(treestore, iter,
SORTID_NETWORK, job_ptr->network, -1);
@@ -2038,7 +2038,7 @@ static void _update_job_record(sview_job_info_t *sview_job_info_ptr,
childern = gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
&step_iter, iter);
- if (gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
+ if(gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
&step_iter, iter))
_update_info_step(sview_job_info_ptr,
GTK_TREE_MODEL(treestore), &step_iter, iter);
@@ -2062,7 +2062,7 @@ static void _layout_step_record(GtkTreeView *treeview,
GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
- if (!treestore)
+ if(!treestore)
return;
convert_num_unit((float)step_ptr->num_cpus, tmp_char, sizeof(tmp_char),
@@ -2096,7 +2096,7 @@ static void _layout_step_record(GtkTreeView *treeview,
SORTID_NAME),
step_ptr->name);
- if (!step_ptr->nodes
+ if(!step_ptr->nodes
|| !strcasecmp(step_ptr->nodes,"waiting...")) {
sprintf(tmp_time,"00:00:00");
nodes = "waiting...";
@@ -2105,7 +2105,7 @@ static void _layout_step_record(GtkTreeView *treeview,
now_time -= step_ptr->start_time;
secs2time_str(now_time, tmp_time, sizeof(tmp_time));
nodes = step_ptr->nodes;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit(
(float)step_ptr->num_tasks / cpus_per_node,
tmp_char, sizeof(tmp_char), UNIT_NONE);
@@ -2137,7 +2137,7 @@ static void _layout_step_record(GtkTreeView *treeview,
if (step_ptr->time_limit == NO_VAL)
sprintf(tmp_char, "Partition Limit");
- else if (step_ptr->time_limit == INFINITE)
+ else if(step_ptr->time_limit == INFINITE)
sprintf(tmp_char, "Infinite");
else
secs2time_str((step_ptr->time_limit * 60),
@@ -2171,7 +2171,7 @@ static void _update_step_record(job_step_info_t *step_ptr,
enum job_states state;
gtk_tree_store_set(treestore, iter, SORTID_UPDATED, 1, -1);
- if (!step_ptr->nodes
+ if(!step_ptr->nodes
|| !strcasecmp(step_ptr->nodes,"waiting...")) {
sprintf(tmp_time,"00:00:00");
nodes = "waiting...";
@@ -2180,7 +2180,7 @@ static void _update_step_record(job_step_info_t *step_ptr,
now_time -= step_ptr->start_time;
secs2time_str(now_time, tmp_time, sizeof(tmp_time));
nodes = step_ptr->nodes;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit(
(float)step_ptr->num_tasks / cpus_per_node,
tmp_char, sizeof(tmp_char), UNIT_NONE);
@@ -2279,7 +2279,7 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
while(1) {
gtk_tree_store_set(GTK_TREE_STORE(model), step_iter,
SORTID_UPDATED, 0, -1);
- if (!gtk_tree_model_iter_next(model, step_iter)) {
+ if(!gtk_tree_model_iter_next(model, step_iter)) {
break;
}
}
@@ -2300,7 +2300,7 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
it is in the list */
gtk_tree_model_get(model, step_iter, SORTID_JOBID,
&stepid, -1);
- if (stepid == (int)step_ptr->step_id) {
+ if(stepid == (int)step_ptr->step_id) {
/* update with new info */
_update_step_record(step_ptr,
GTK_TREE_STORE(model),
@@ -2308,7 +2308,7 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
goto found;
}
- if (!gtk_tree_model_iter_next(model, step_iter)) {
+ if(!gtk_tree_model_iter_next(model, step_iter)) {
step_iter = NULL;
break;
}
@@ -2321,21 +2321,21 @@ static void _update_info_step(sview_job_info_t *sview_job_info_ptr,
}
list_iterator_destroy(itr);
- if (set) {
+ if(set) {
step_iter = &first_step_iter;
/* clear all steps that aren't active */
while(1) {
gtk_tree_model_get(model, step_iter,
SORTID_UPDATED, &i, -1);
- if (!i) {
- if (!gtk_tree_store_remove(
+ if(!i) {
+ if(!gtk_tree_store_remove(
GTK_TREE_STORE(model),
step_iter))
break;
else
continue;
}
- if (!gtk_tree_model_iter_next(model, step_iter)) {
+ if(!gtk_tree_model_iter_next(model, step_iter)) {
break;
}
}
@@ -2361,7 +2361,7 @@ static void _update_info_job(List info_list,
while(1) {
gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
SORTID_UPDATED, 0, -1);
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -2380,7 +2380,7 @@ static void _update_info_job(List info_list,
it is in the list */
gtk_tree_model_get(model, &iter, SORTID_JOBID,
&jobid, -1);
- if (jobid == job_ptr->job_id) {
+ if(jobid == job_ptr->job_id) {
/* update with new info */
_update_job_record(sview_job_info,
GTK_TREE_STORE(model),
@@ -2389,7 +2389,7 @@ static void _update_info_job(List info_list,
}
line++;
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -2400,7 +2400,7 @@ static void _update_info_job(List info_list,
;
}
list_iterator_destroy(itr);
- if (host)
+ if(host)
free(host);
gtk_tree_path_free(path);
/* remove all old jobs */
@@ -2419,7 +2419,7 @@ static int _sview_job_sort_aval_dec(sview_job_info_t* rec_a,
else if (size_a > size_b)
return 1;
- if (rec_a->nodes && rec_b->nodes) {
+ if(rec_a->nodes && rec_b->nodes) {
size_a = strcmp(rec_a->nodes, rec_b->nodes);
if (size_a < 0)
return -1;
@@ -2442,11 +2442,11 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
char *ionodes = NULL;
char tmp_char[50];
- if (!changed && info_list) {
+ if(!changed && info_list) {
goto update_color;
}
- if (info_list) {
+ if(info_list) {
list_flush(info_list);
list_flush(odd_info_list);
} else {
@@ -2466,7 +2466,7 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
sview_job_info_ptr->node_cnt = 0;
sview_job_info_ptr->color_inx =
job_ptr->job_id % sview_colors_cnt;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
select_g_select_jobinfo_get(job_ptr->select_jobinfo,
SELECT_JOBDATA_IONODES,
&ionodes);
@@ -2474,7 +2474,7 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
job_ptr->select_jobinfo,
SELECT_JOBDATA_NODE_CNT,
&sview_job_info_ptr->node_cnt);
- if (job_ptr->nodes && ionodes) {
+ if(job_ptr->nodes && ionodes) {
sview_job_info_ptr->small_block = 1;
snprintf(tmp_char, sizeof(tmp_char), "%s[%s]",
job_ptr->nodes, ionodes);
@@ -2489,19 +2489,19 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
} else
sview_job_info_ptr->nodes = xstrdup(job_ptr->nodes);
- if (!sview_job_info_ptr->node_cnt)
+ if(!sview_job_info_ptr->node_cnt)
sview_job_info_ptr->node_cnt = _get_node_cnt(job_ptr);
for(j = 0; j < step_info_ptr->job_step_count; j++) {
step_ptr = &(step_info_ptr->job_steps[j]);
- if (step_ptr->job_id == job_ptr->job_id) {
+ if(step_ptr->job_id == job_ptr->job_id) {
list_append(sview_job_info_ptr->step_list,
step_ptr);
}
}
list_append(odd_info_list, sview_job_info_ptr);
- if (!IS_JOB_PENDING(job_ptr) &&
+ if(!IS_JOB_PENDING(job_ptr) &&
!IS_JOB_RUNNING(job_ptr) &&
!IS_JOB_SUSPENDED(job_ptr) &&
!IS_JOB_COMPLETING(job_ptr)) {
@@ -2516,7 +2516,7 @@ static List _create_job_info_list(job_info_msg_t *job_info_ptr,
update_color:
- if (want_odd_states)
+ if(want_odd_states)
return odd_info_list;
else
return info_list;
@@ -2534,13 +2534,13 @@ void _display_info_job(List info_list, popup_info_t *popup_win)
int update = 0;
int j = 0;
- if (spec_info->search_info->int_data == NO_VAL) {
+ if(spec_info->search_info->int_data == NO_VAL) {
/* info = xstrdup("No pointer given!"); */
goto finished;
}
need_refresh:
- if (!spec_info->display_widget) {
+ if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
spec_info->display_widget =
@@ -2552,15 +2552,15 @@ need_refresh:
itr = list_iterator_create(info_list);
while((sview_job_info = (sview_job_info_t*) list_next(itr))) {
- if (sview_job_info->job_ptr->job_id ==
+ if(sview_job_info->job_ptr->job_id ==
spec_info->search_info->int_data)
break;
}
list_iterator_destroy(itr);
- if (!sview_job_info) {
+ if(!sview_job_info) {
/* not found */
- } else if (spec_info->search_info->int_data2 == NO_VAL) {
+ } else if(spec_info->search_info->int_data2 == NO_VAL) {
j=0;
while(sview_job_info->job_ptr->node_inx[j] >= 0) {
change_grid_color(
@@ -2576,7 +2576,7 @@ need_refresh:
} else {
itr = list_iterator_create(sview_job_info->step_list);
while ((step_ptr = list_next(itr))) {
- if (step_ptr->step_id ==
+ if(step_ptr->step_id ==
spec_info->search_info->int_data2) {
j=0;
while(step_ptr->node_inx[j] >= 0) {
@@ -2597,8 +2597,8 @@ need_refresh:
}
post_setup_popup_grid_list(popup_win);
- if (!found) {
- if (!popup_win->not_found) {
+ if(!found) {
+ if(!popup_win->not_found) {
char *temp = "JOB ALREADY FINISHED OR NOT FOUND\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
@@ -2609,7 +2609,7 @@ need_refresh:
GTK_TREE_STORE(model),
&iter,
temp, "");
- if (spec_info->search_info->int_data2 != NO_VAL)
+ if(spec_info->search_info->int_data2 != NO_VAL)
add_display_treestore_line(
1,
GTK_TREE_STORE(model),
@@ -2620,7 +2620,7 @@ need_refresh:
}
popup_win->not_found = true;
} else {
- if (popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
@@ -2654,21 +2654,21 @@ extern int get_new_info_job(job_info_msg_t **info_ptr,
static bool changed = 0;
static uint16_t last_flags = 0;
- if (g_job_info_ptr && !force
+ if(g_job_info_ptr && !force
&& ((now - last) < working_sview_config.refresh_delay)) {
- if (*info_ptr != g_job_info_ptr)
+ if(*info_ptr != g_job_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = g_job_info_ptr;
- if (changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
last = now;
- if (working_sview_config.show_hidden)
+ if(working_sview_config.show_hidden)
show_flags |= SHOW_ALL;
if (g_job_info_ptr) {
- if (show_flags != last_flags)
+ if(show_flags != last_flags)
g_job_info_ptr->last_update = 0;
error_code = slurm_load_jobs(g_job_info_ptr->last_update,
&new_job_ptr, show_flags);
@@ -2689,7 +2689,7 @@ extern int get_new_info_job(job_info_msg_t **info_ptr,
last_flags = show_flags;
g_job_info_ptr = new_job_ptr;
- if (g_job_info_ptr && (*info_ptr != g_job_info_ptr))
+ if(g_job_info_ptr && (*info_ptr != g_job_info_ptr))
error_code = SLURM_SUCCESS;
*info_ptr = g_job_info_ptr;
@@ -2706,12 +2706,12 @@ extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
static time_t last;
static bool changed = 0;
- if (g_step_info_ptr && !force
+ if(g_step_info_ptr && !force
&& ((now - last) < working_sview_config.refresh_delay)) {
- if (*info_ptr != g_step_info_ptr)
+ if(*info_ptr != g_step_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = g_step_info_ptr;
- if (changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
@@ -2741,7 +2741,7 @@ extern int get_new_info_job_step(job_step_info_response_msg_t **info_ptr,
g_step_info_ptr = new_step_ptr;
- if (g_step_info_ptr && (*info_ptr != g_step_info_ptr))
+ if(g_step_info_ptr && (*info_ptr != g_step_info_ptr))
error_code = SLURM_SUCCESS;
*info_ptr = g_step_info_ptr;
@@ -2815,7 +2815,7 @@ extern GtkListStore *create_model_job(int type)
0, "NAV",
1, SORTID_CONNECTION,
-1);
- if (!(cluster_flags & CLUSTER_FLAG_BGL)) {
+ if(!(cluster_flags & CLUSTER_FLAG_BGL)) {
gtk_list_store_append(model, &iter);
gtk_list_store_set(model, &iter,
0, "HTC SMP",
@@ -2862,7 +2862,7 @@ extern void admin_edit_job(GtkCellRendererText *cell,
int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
- if (!new_text || !strcmp(new_text, ""))
+ if(!new_text || !strcmp(new_text, ""))
goto no_input;
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
@@ -2874,7 +2874,7 @@ extern void admin_edit_job(GtkCellRendererText *cell,
-1);
gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
SORTID_ALLOC, &stepid, -1);
- if (stepid)
+ if(stepid)
stepid = NO_VAL;
else {
stepid = job_msg->job_id;
@@ -2883,10 +2883,10 @@ extern void admin_edit_job(GtkCellRendererText *cell,
}
type = _set_job_msg(job_msg, new_text, column);
- if (global_edit_error)
+ if(global_edit_error)
goto print_error;
- if (got_edit_signal) {
+ if(got_edit_signal) {
temp = got_edit_signal;
got_edit_signal = NULL;
admin_job(GTK_TREE_MODEL(treestore), &iter, temp, NULL);
@@ -2894,16 +2894,16 @@ extern void admin_edit_job(GtkCellRendererText *cell,
goto no_input;
}
- if (old_text && !strcmp(old_text, new_text)) {
+ if(old_text && !strcmp(old_text, new_text)) {
temp = g_strdup_printf("No change in value.");
- } else if (slurm_update_job(job_msg)
+ } else if(slurm_update_job(job_msg)
== SLURM_SUCCESS) {
gtk_tree_store_set(treestore, &iter, column, new_text, -1);
temp = g_strdup_printf("Job %d %s changed to %s",
job_msg->job_id,
type,
new_text);
- } else if (errno == ESLURM_DISABLED) {
+ } else if(errno == ESLURM_DISABLED) {
temp = g_strdup_printf(
"Can only edit %s on pending jobs.", type);
} else {
@@ -2946,8 +2946,8 @@ extern void get_info_job(GtkTable *table, display_data_t *display_data)
GtkTreePath *path = NULL;
/* reset */
- if (!table && !display_data) {
- if (display_widget)
+ if(!table && !display_data) {
+ if(display_widget)
gtk_widget_destroy(display_widget);
display_widget = NULL;
job_info_ptr = NULL;
@@ -2955,25 +2955,25 @@ extern void get_info_job(GtkTable *table, display_data_t *display_data)
return;
}
- if (display_data)
+ if(display_data)
local_display_data = display_data;
- if (!table) {
+ if(!table) {
display_data_job->set_menu = local_display_data->set_menu;
return;
}
- if (display_widget && toggled) {
+ if(display_widget && toggled) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
goto display_it;
}
- if ((job_error_code = get_new_info_job(&job_info_ptr, force_refresh))
+ if((job_error_code = get_new_info_job(&job_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA){
} else if (job_error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
view = ERROR_VIEW;
sprintf(error_char, "slurm_load_job: %s",
@@ -2985,17 +2985,17 @@ extern void get_info_job(GtkTable *table, display_data_t *display_data)
goto end_it;
}
- if ((step_error_code = get_new_info_job_step(&step_info_ptr,
+ if((step_error_code = get_new_info_job_step(&step_info_ptr,
force_refresh))
== SLURM_NO_CHANGE_IN_DATA){
- if ((!display_widget || view == ERROR_VIEW)
+ if((!display_widget || view == ERROR_VIEW)
|| (job_error_code != SLURM_NO_CHANGE_IN_DATA))
goto display_it;
changed = 0;
} else if (step_error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
view = ERROR_VIEW;
sprintf(error_char, "slurm_load_job_step: %s",
@@ -3010,11 +3010,11 @@ display_it:
info_list = _create_job_info_list(job_info_ptr, step_info_ptr,
changed, 0);
- if (!info_list)
+ if(!info_list)
return;
/* set up the grid */
- if (display_widget && GTK_IS_TREE_VIEW(display_widget)
+ if(display_widget && GTK_IS_TREE_VIEW(display_widget)
&& gtk_tree_selection_count_selected_rows(
gtk_tree_view_get_selection(
GTK_TREE_VIEW(display_widget)))) {
@@ -3023,7 +3023,7 @@ display_it:
gtk_tree_view_get_cursor(GTK_TREE_VIEW(display_widget),
&path, &focus_column);
}
- if (!path) {
+ if(!path) {
itr = list_iterator_create(info_list);
while ((sview_job_info_ptr = list_next(itr))) {
job_ptr = sview_job_info_ptr->job_ptr;
@@ -3040,11 +3040,11 @@ display_it:
list_iterator_destroy(itr);
}
- if (view == ERROR_VIEW && display_widget) {
+ if(view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
}
- if (!display_widget) {
+ if(!display_widget) {
tree_view = create_treeview(local_display_data,
&grid_button_list);
/*set multiple capability here*/
@@ -3062,7 +3062,7 @@ display_it:
SORTID_CNT, SORTID_TIME_SUBMIT, SORTID_COLOR);
}
- if (gtk_tree_selection_count_selected_rows(
+ if(gtk_tree_selection_count_selected_rows(
gtk_tree_view_get_selection(
GTK_TREE_VIEW(display_widget)))) {
GtkTreeViewColumn *focus_column = NULL;
@@ -3071,7 +3071,7 @@ display_it:
&path, &focus_column);
}
- if (path)
+ if(path)
highlight_grid(GTK_TREE_VIEW(display_widget),
SORTID_NODE_INX, SORTID_COLOR_INX,
grid_button_list);
@@ -3079,7 +3079,7 @@ display_it:
change_grid_color(grid_button_list, -1, -1,
MAKE_WHITE, true, 0);
- if (working_sview_config.grid_speedup) {
+ if(working_sview_config.grid_speedup) {
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
}
@@ -3115,24 +3115,24 @@ extern void specific_info_job(popup_info_t *popup_win)
hostset_t hostset = NULL;
int name_diff;
- if (!spec_info->display_widget)
+ if(!spec_info->display_widget)
setup_popup_info(popup_win, display_data_job, SORTID_CNT);
- if (spec_info->display_widget && popup_win->toggled) {
+ if(spec_info->display_widget && popup_win->toggled) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
goto display_it;
}
- if ((job_error_code =
+ if((job_error_code =
get_new_info_job(&job_info_ptr, popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
} else if (job_error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
spec_info->view = ERROR_VIEW;
- if (spec_info->display_widget)
+ if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
sprintf(error_char, "slurm_load_job: %s",
@@ -3146,18 +3146,18 @@ extern void specific_info_job(popup_info_t *popup_win)
goto end_it;
}
- if ((step_error_code =
+ if((step_error_code =
get_new_info_job_step(&step_info_ptr, popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if ((!spec_info->display_widget
+ if((!spec_info->display_widget
|| spec_info->view == ERROR_VIEW)
|| (job_error_code != SLURM_NO_CHANGE_IN_DATA))
goto display_it;
changed = 0;
} else if (step_error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
- if (spec_info->display_widget)
+ if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
spec_info->view = ERROR_VIEW;
sprintf(error_char, "slurm_load_job_step: %s",
@@ -3172,15 +3172,15 @@ extern void specific_info_job(popup_info_t *popup_win)
display_it:
info_list = _create_job_info_list(job_info_ptr, step_info_ptr,
changed, 1);
- if (!info_list)
+ if(!info_list)
return;
- if (spec_info->view == ERROR_VIEW && spec_info->display_widget) {
+ if(spec_info->view == ERROR_VIEW && spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
- if (spec_info->type != INFO_PAGE && !spec_info->display_widget) {
+ if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
@@ -3199,7 +3199,7 @@ display_it:
setup_popup_grid_list(popup_win);
spec_info->view = INFO_VIEW;
- if (spec_info->type == INFO_PAGE) {
+ if(spec_info->type == INFO_PAGE) {
_display_info_job(info_list, popup_win);
goto end_it;
}
@@ -3217,47 +3217,47 @@ display_it:
case JOB_PAGE:
switch(search_info->search_type) {
case SEARCH_JOB_ID:
- if (search_info->int_data
+ if(search_info->int_data
== NO_VAL) {
- if (!search_info->gchar_data)
+ if(!search_info->gchar_data)
continue;
_convert_char_to_job_and_step(
search_info->gchar_data,
&search_info->int_data,
&search_info->int_data2);
}
- if (job_ptr->job_id != search_info->int_data) {
+ if(job_ptr->job_id != search_info->int_data) {
continue;
}
/* if we ever want to display just the step
this is where we would do it */
-/* if (spec_info->search_info->int_data2 */
+/* if(spec_info->search_info->int_data2 */
/* == NO_VAL) */
/* break; */
/* step_itr = list_iterator_create( */
/* sview_job_info->step_list); */
/* while ((step_ptr = list_next(itr))) { */
-/* if (step_ptr->step_id */
+/* if(step_ptr->step_id */
/* == spec_info->search_info->int_data2) { */
/* break; */
/* } */
/* } */
break;
case SEARCH_JOB_USER:
- if (!search_info->gchar_data)
+ if(!search_info->gchar_data)
continue;
uname = uid_to_string(job_ptr->user_id);
name_diff = strcmp(uname,
search_info->gchar_data);
xfree(uname);
- if (name_diff)
+ if(name_diff)
continue;
break;
case SEARCH_JOB_STATE:
- if (search_info->int_data == NO_VAL)
+ if(search_info->int_data == NO_VAL)
continue;
- if (job_ptr->job_state != search_info->int_data)
+ if(job_ptr->job_state != search_info->int_data)
continue;
break;
default:
@@ -3265,12 +3265,12 @@ display_it:
}
break;
case PART_PAGE:
- if (strcmp(search_info->gchar_data,
+ if(strcmp(search_info->gchar_data,
job_ptr->partition))
continue;
break;
case RESV_PAGE:
- if (strcmp(search_info->gchar_data,
+ if(strcmp(search_info->gchar_data,
job_ptr->resv_name))
continue;
break;
@@ -3280,16 +3280,16 @@ display_it:
name,
sizeof(name),
SELECT_PRINT_BG_ID);
- if (strcmp(search_info->gchar_data, name))
+ if(strcmp(search_info->gchar_data, name))
continue;
break;
case NODE_PAGE:
- if (!job_ptr->nodes)
+ if(!job_ptr->nodes)
continue;
- if (!(hostset = hostset_create(search_info->gchar_data)))
+ if(!(hostset = hostset_create(search_info->gchar_data)))
continue;
- if (!hostset_intersects(hostset, job_ptr->nodes)) {
+ if(!hostset_intersects(hostset, job_ptr->nodes)) {
hostset_destroy(hostset);
continue;
}
@@ -3376,7 +3376,7 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
int i=0;
char *type;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
type = "Base partition";
else
type = "Node";
@@ -3384,7 +3384,7 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
gtk_tree_model_get(model, iter, SORTID_JOBID, &jobid, -1);
gtk_tree_model_get(model, iter, SORTID_ALLOC, &stepid, -1);
- if (stepid)
+ if(stepid)
stepid = NO_VAL;
else {
stepid = jobid;
@@ -3393,21 +3393,21 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
switch(id) {
case PART_PAGE:
- if (stepid == NO_VAL)
+ if(stepid == NO_VAL)
snprintf(title, 100, "Partition with job %d", jobid);
else
snprintf(title, 100, "Partition with job %d.%d",
jobid, stepid);
break;
case RESV_PAGE:
- if (stepid == NO_VAL)
+ if(stepid == NO_VAL)
snprintf(title, 100, "Reservation with job %d", jobid);
else
snprintf(title, 100, "Reservation with job %d.%d",
jobid, stepid);
break;
case NODE_PAGE:
- if (stepid == NO_VAL)
+ if(stepid == NO_VAL)
snprintf(title, 100,
"%s(s) running job %d", type, jobid);
else
@@ -3415,14 +3415,14 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
type, jobid, stepid);
break;
case BLOCK_PAGE:
- if (stepid == NO_VAL)
+ if(stepid == NO_VAL)
snprintf(title, 100, "Block with job %d", jobid);
else
snprintf(title, 100, "Block with job %d.%d",
jobid, stepid);
break;
case INFO_PAGE:
- if (stepid == NO_VAL)
+ if(stepid == NO_VAL)
snprintf(title, 100, "Full info for job %d", jobid);
else
snprintf(title, 100, "Full info for job %d.%d",
@@ -3434,15 +3434,15 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info)
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info)
+ if(!strcmp(popup_win->spec_info->title, title)) {
break;
}
}
list_iterator_destroy(itr);
- if (!popup_win) {
- if (id == INFO_PAGE)
+ if(!popup_win) {
+ if(id == INFO_PAGE)
popup_win = create_popup_info(id, JOB_PAGE, title);
else
popup_win = create_popup_info(JOB_PAGE, id, title);
@@ -3461,14 +3461,14 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
switch(id) {
case NODE_PAGE:
gtk_tree_model_get(model, iter, SORTID_NODELIST, &name, -1);
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
gtk_tree_model_get(model, iter,
SORTID_SMALL_BLOCK, &i, -1);
- if (i) {
+ if(i) {
i=0;
/* strip off the ionodes part */
while(name[i]) {
- if (name[i] == '[') {
+ if(name[i] == '[') {
name[i] = '\0';
break;
}
@@ -3487,7 +3487,7 @@ extern void popup_all_job(GtkTreeModel *model, GtkTreeIter *iter, int id)
popup_win->spec_info->search_info->gchar_data = name;
break;
case BLOCK_PAGE:
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
gtk_tree_model_get(model, iter,
SORTID_BLOCK, &name, -1);
popup_win->spec_info->search_info->gchar_data = name;
@@ -3525,7 +3525,7 @@ static void process_foreach_list (jobs_foreach_common_t *jobs_foreach_common)
const gchar *entry_txt = gtk_entry_get_text(
GTK_ENTRY(jobs_foreach_common->entry));
signal = _xlate_signal_name(entry_txt);
- if (signal == (uint16_t)NO_VAL) {
+ if(signal == (uint16_t)NO_VAL) {
tmp_char_ptr = g_strdup_printf(
"%s is not a valid signal.",
entry_txt);
@@ -3552,7 +3552,7 @@ static void process_foreach_list (jobs_foreach_common_t *jobs_foreach_common)
* just a regular cancel).
*/
case EDIT_CANCEL:
- if (stepid == NO_VAL)
+ if(stepid == NO_VAL)
global_error_code =
_cancel_job_id(jobid, signal);
else
@@ -3563,7 +3563,7 @@ static void process_foreach_list (jobs_foreach_common_t *jobs_foreach_common)
case EDIT_REQUEUE:
response = slurm_requeue(jobid);
- if (response) {
+ if(response) {
/* stop rest of jobs */
global_error_code = response;
tmp_char_ptr = g_strdup_printf(
@@ -3577,11 +3577,11 @@ static void process_foreach_list (jobs_foreach_common_t *jobs_foreach_common)
break;
case EDIT_SUSPEND:
//note: derive state from job_foreach..
- if (state == JOB_SUSPENDED)
+ if(state == JOB_SUSPENDED)
response = slurm_resume(jobid);
else
response = slurm_suspend(jobid);
- if (response) {
+ if(response) {
/* stop rest of jobs */
global_error_code = 1;
tmp_char_ptr = g_strdup_printf(
@@ -3596,21 +3596,21 @@ static void process_foreach_list (jobs_foreach_common_t *jobs_foreach_common)
/* note: this case only applies to
single jobs, but still gets
processed here */
- if (got_edit_signal)
+ if(got_edit_signal)
goto end_it;
- if (global_edit_error)
+ if(global_edit_error)
tmp_char_ptr = global_edit_error_msg;
- else if (!global_send_update_msg) {
+ else if(!global_send_update_msg) {
tmp_char_ptr = g_strdup_printf(
"No change detected.");
- } else if (slurm_update_job(
+ } else if(slurm_update_job(
jobs_foreach_common->job_msg)
== SLURM_SUCCESS) {
tmp_char_ptr = g_strdup_printf(
"Job %u updated successfully",
jobid);
- } else if (errno == ESLURM_DISABLED) {
+ } else if(errno == ESLURM_DISABLED) {
tmp_char_ptr = g_strdup_printf(
"Can't edit that part of "
"non-pending job %u.",
@@ -3629,7 +3629,7 @@ static void process_foreach_list (jobs_foreach_common_t *jobs_foreach_common)
}/*end switch*/
} /*spin thru selected jobs*/
- if (global_edit_error)
+ if(global_edit_error)
goto end_it;
switch(jobs_foreach_common->edit_type) {
@@ -3685,7 +3685,7 @@ static void selected_foreach_build_list(GtkTreeModel *model,
gtk_tree_model_get(model, iter, SORTID_JOBID, &jobid, -1);
gtk_tree_model_get(model, iter, SORTID_ALLOC, &stepid, -1);
- if (stepid)
+ if(stepid)
stepid = NO_VAL;
else {
stepid = jobid;
@@ -3702,12 +3702,12 @@ static void selected_foreach_build_list(GtkTreeModel *model,
list_append(foreach_list, fe_ptr); /* stuff target away*/
- if (stacked_job_list)
+ if(stacked_job_list)
xstrcat(stacked_job_list, ", ");
else
xstrcat(stacked_job_list, ": ");
- if (stepid == NO_VAL)
+ if(stepid == NO_VAL)
xstrfmtcat(stacked_job_list, "%u", jobid);
else
xstrfmtcat(stacked_job_list, "%u.%u", jobid, stepid);
@@ -3743,7 +3743,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
gtk_tree_model_get(model, iter, SORTID_JOBID, &jobid, -1);
gtk_tree_model_get(model, iter, SORTID_ALLOC, &stepid, -1);
- if (stepid)
+ if(stepid)
stepid = NO_VAL;
else {
stepid = jobid;
@@ -3752,7 +3752,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
slurm_init_job_desc_msg(job_msg);
- if (!strcasecmp("Signal", type)) {
+ if(!strcasecmp("Signal", type)) {
label = gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_OK, GTK_RESPONSE_OK);
gtk_window_set_default(GTK_WINDOW(popup), label);
@@ -3762,7 +3762,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
entry = create_entry();
label = gtk_label_new("Signal?");
edit_type = EDIT_SIGNAL;
- } else if (!strcasecmp("Requeue", type)) {
+ } else if(!strcasecmp("Requeue", type)) {
label = gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_YES, GTK_RESPONSE_OK);
gtk_window_set_default(GTK_WINDOW(popup), label);
@@ -3777,7 +3777,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
}
label = gtk_label_new(tmp_char);
edit_type = EDIT_REQUEUE;
- } else if (!strcasecmp("Cancel", type)) {
+ } else if(!strcasecmp("Cancel", type)) {
gdk_window_set_cursor(main_window->window, in_process_cursor);
label = gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_YES, GTK_RESPONSE_OK);
@@ -3786,7 +3786,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
if (row_count > 1) {
- if (stepid != NO_VAL)
+ if(stepid != NO_VAL)
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to cancel "
"these job steps?");
@@ -3795,7 +3795,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
"Are you sure you want to cancel "
"these jobs?");
} else {
- if (stepid != NO_VAL)
+ if(stepid != NO_VAL)
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to cancel "
"job %u.%u?",
@@ -3808,7 +3808,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
}
label = gtk_label_new(tmp_char);
edit_type = EDIT_CANCEL;
- } else if (!strcasecmp("Suspend/Resume", type)) {
+ } else if(!strcasecmp("Suspend/Resume", type)) {
label = gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_YES, GTK_RESPONSE_OK);
gtk_window_set_default(GTK_WINDOW(popup), label);
@@ -3816,12 +3816,12 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_tree_model_get(model, iter, SORTID_STATE_NUM, &state, -1);
- if (state == JOB_SUSPENDED)
+ if(state == JOB_SUSPENDED)
tmp_char_ptr = "resume";
else
tmp_char_ptr = "suspend";
if (row_count > 1) {
- if (stepid != NO_VAL)
+ if(stepid != NO_VAL)
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to toggle "
"suspend/resume on these "
@@ -3831,7 +3831,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
"Are you sure you want to toggle "
"suspend/resume on these jobs?");
} else {
- if (stepid != NO_VAL)
+ if(stepid != NO_VAL)
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to %s job %u.%u?",
tmp_char_ptr, jobid, stepid);
@@ -3861,7 +3861,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
- if (entry)
+ if(entry)
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(popup);
@@ -3884,7 +3884,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
/* create a list to stack the selected jobs */
foreach_list = list_create(_destroy_jobs_foreach);
/* build array of job(s) to process */
- if (treeview)
+ if(treeview)
gtk_tree_selection_selected_foreach(
gtk_tree_view_get_selection(treeview),
selected_foreach_build_list, NULL);
@@ -3900,7 +3900,7 @@ extern void admin_job(GtkTreeModel *model, GtkTreeIter *iter,
global_entry_changed = 0;
slurm_free_job_desc_msg(job_msg);
gtk_widget_destroy(popup);
- if (got_edit_signal) {
+ if(got_edit_signal) {
type = got_edit_signal;
got_edit_signal = NULL;
admin_job(model, iter, type, treeview);
@@ -3913,9 +3913,9 @@ extern void cluster_change_job()
{
display_data_t *display_data = display_data_job;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_AIX) {
+ if(cluster_flags & CLUSTER_FLAG_AIX) {
switch(display_data->id) {
case SORTID_NETWORK:
display_data->name = "Network";
@@ -3930,7 +3930,7 @@ extern void cluster_change_job()
}
}
- if (cluster_flags & CLUSTER_FLAG_CRAYXT) {
+ if(cluster_flags & CLUSTER_FLAG_CRAYXT) {
switch(display_data->id) {
case SORTID_ALPS_RESV_ID:
display_data->name = "ALPS Resv ID";
@@ -3944,7 +3944,7 @@ extern void cluster_change_job()
}
}
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case SORTID_BLOCK:
display_data->name = "BG Block";
@@ -3973,7 +3973,7 @@ extern void cluster_change_job()
default:
break;
}
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
switch(display_data->id) {
case SORTID_IMAGE_BLRTS:
display_data->name = "Image Blrts";
@@ -4038,10 +4038,10 @@ extern void cluster_change_job()
}
display_data = options_data_job;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case BLOCK_PAGE:
display_data->name = "Blocks";
diff --git a/src/sview/node_info.c b/src/sview/node_info.c
index 9df0a25332dfe6f57ee38bde1c7202e1f1491101..0e8aeb0d2cf4a391c3f7e7ccd63946627cd5fe32 100644
--- a/src/sview/node_info.c
+++ b/src/sview/node_info.c
@@ -148,7 +148,7 @@ static void _layout_node_record(GtkTreeView *treeview,
int idle_cpus = node_ptr->cpus;
GtkTreeStore *treestore =
GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
- if (!treestore)
+ if(!treestore)
return;
add_display_treestore_line(update, treestore, &iter,
@@ -167,8 +167,8 @@ static void _layout_node_record(GtkTreeView *treeview,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG) {
- if (!alloc_cpus
+ if(cluster_flags & CLUSTER_FLAG_BG) {
+ if(!alloc_cpus
&& ((node_ptr->node_state & NODE_STATE_ALLOCATED)
|| (node_ptr->node_state & NODE_STATE_COMPLETING)))
alloc_cpus = node_ptr->cpus;
@@ -188,7 +188,7 @@ static void _layout_node_record(GtkTreeView *treeview,
NODE_STATE_ERROR,
&err_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
err_cpus *= cpus_per_node;
idle_cpus -= err_cpus;
@@ -292,8 +292,8 @@ static void _update_node_record(sview_node_info_t *sview_node_info_ptr,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG) {
- if (!alloc_cpus
+ if(cluster_flags & CLUSTER_FLAG_BG) {
+ if(!alloc_cpus
&& (IS_NODE_ALLOCATED(node_ptr)
|| IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
@@ -312,7 +312,7 @@ static void _update_node_record(sview_node_info_t *sview_node_info_ptr,
NODE_STATE_ERROR,
&err_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
err_cpus *= cpus_per_node;
idle_cpus -= err_cpus;
@@ -320,10 +320,10 @@ static void _update_node_record(sview_node_info_t *sview_node_info_ptr,
gtk_tree_store_set(treestore, iter, SORTID_ERR_CPUS,
tmp_cnt, -1);
- if (IS_NODE_DRAIN(node_ptr)) {
+ if(IS_NODE_DRAIN(node_ptr)) {
/* don't worry about mixed since the
whole node is being drained. */
- } else if ((alloc_cpus && err_cpus)
+ } else if((alloc_cpus && err_cpus)
|| (idle_cpus && (idle_cpus != node_ptr->cpus))) {
node_ptr->node_state &= NODE_STATE_FLAGS;
node_ptr->node_state |= NODE_STATE_MIXED;
@@ -388,7 +388,7 @@ static void _update_info_node(List info_list, GtkTreeView *tree_view)
while(1) {
gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
SORTID_UPDATED, 0, -1);
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -406,7 +406,7 @@ static void _update_info_node(List info_list, GtkTreeView *tree_view)
it is in the list */
gtk_tree_model_get(model, &iter, SORTID_NAME,
&name, -1);
- if (!strcmp(name, node_ptr->name)) {
+ if(!strcmp(name, node_ptr->name)) {
/* update with new info */
g_free(name);
_update_node_record(sview_node_info,
@@ -416,7 +416,7 @@ static void _update_info_node(List info_list, GtkTreeView *tree_view)
}
g_free(name);
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -454,11 +454,11 @@ void _display_info_node(List info_list, popup_info_t *popup_win)
sview_node_info_t *sview_node_info = NULL;
int i = -1;
- if (!spec_info->search_info->gchar_data) {
+ if(!spec_info->search_info->gchar_data) {
goto finished;
}
need_refresh:
- if (!spec_info->display_widget) {
+ if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
spec_info->display_widget =
@@ -472,7 +472,7 @@ need_refresh:
while ((sview_node_info = (sview_node_info_t*) list_next(itr))) {
node_ptr = sview_node_info->node_ptr;
i++;
- if (!strcmp(node_ptr->name, name)) {
+ if(!strcmp(node_ptr->name, name)) {
change_grid_color(popup_win->grid_button_list,
i, i, i, true, 0);
_layout_node_record(treeview, sview_node_info, update);
@@ -481,13 +481,13 @@ need_refresh:
}
}
list_iterator_destroy(itr);
- if (!found) {
- if (!popup_win->not_found) {
+ if(!found) {
+ if(!popup_win->not_found) {
char *temp;
GtkTreeIter iter;
GtkTreeModel *model = NULL;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
temp = "BP NOT FOUND\n";
else
temp = "NODE NOT FOUND\n";
@@ -500,7 +500,7 @@ need_refresh:
}
popup_win->not_found = true;
} else {
- if (popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
@@ -532,11 +532,11 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr, int changed)
node_info_t *node_ptr = NULL;
char user[32], time_str[32];
- if (!node_info_ptr || (!changed && info_list)) {
+ if(!node_info_ptr || (!changed && info_list)) {
goto update_color;
}
- if (info_list)
+ if(info_list)
list_flush(info_list);
else
info_list = list_create(_node_info_list_del);
@@ -554,7 +554,7 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr, int changed)
list_append(info_list, sview_node_info_ptr);
sview_node_info_ptr->node_ptr = node_ptr;
sview_node_info_ptr->pos = i;
- if (node_ptr->reason &&
+ if(node_ptr->reason &&
(node_ptr->reason_uid != NO_VAL) && node_ptr->reason_time) {
struct passwd *pw = NULL;
@@ -569,12 +569,12 @@ extern List create_node_info_list(node_info_msg_t *node_info_ptr, int changed)
"%s [%s@%s]", node_ptr->reason, user, time_str);
} else
sview_node_info_ptr->reason = xstrdup(node_ptr->reason);
- if (node_ptr->boot_time) {
+ if(node_ptr->boot_time) {
slurm_make_time_str(&node_ptr->boot_time,
time_str, sizeof(time_str));
sview_node_info_ptr->boot_time = xstrdup(time_str);
}
- if (node_ptr->slurmd_start_time) {
+ if(node_ptr->slurmd_start_time) {
slurm_make_time_str(&node_ptr->slurmd_start_time,
time_str, sizeof(time_str));
sview_node_info_ptr->slurmd_start_time =
@@ -596,21 +596,21 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
static bool changed = 0;
static uint16_t last_flags = 0;
- if (g_node_info_ptr && !force
+ if(g_node_info_ptr && !force
&& ((now - last) < working_sview_config.refresh_delay)) {
- if (*info_ptr != g_node_info_ptr)
+ if(*info_ptr != g_node_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = g_node_info_ptr;
- if (changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
last = now;
- //if (working_sview_config.show_hidden)
+ //if(working_sview_config.show_hidden)
show_flags |= SHOW_ALL;
if (g_node_info_ptr) {
- if (show_flags != last_flags)
+ if(show_flags != last_flags)
g_node_info_ptr->last_update = 0;
error_code = slurm_load_node(g_node_info_ptr->last_update,
&new_node_ptr, show_flags);
@@ -631,10 +631,10 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
last_flags = show_flags;
g_node_info_ptr = new_node_ptr;
- if (g_node_info_ptr && (*info_ptr != g_node_info_ptr))
+ if(g_node_info_ptr && (*info_ptr != g_node_info_ptr))
error_code = SLURM_SUCCESS;
- if (new_node_ptr && new_node_ptr->node_array && changed) {
+ if(new_node_ptr && new_node_ptr->node_array && changed) {
int i;
node_info_t *node_ptr = NULL;
uint16_t err_cpus = 0, alloc_cpus = 0;
@@ -656,8 +656,8 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG) {
- if (!alloc_cpus
+ if(cluster_flags & CLUSTER_FLAG_BG) {
+ if(!alloc_cpus
&& (IS_NODE_ALLOCATED(node_ptr)
|| IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
@@ -671,37 +671,37 @@ extern int get_new_info_node(node_info_msg_t **info_ptr, int force)
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
err_cpus *= cpus_per_node;
idle_cpus -= err_cpus;
- if (IS_NODE_DRAIN(node_ptr)) {
+ if(IS_NODE_DRAIN(node_ptr)) {
/* don't worry about mixed since the
whole node is being drained. */
} else if ((alloc_cpus && err_cpus) ||
(idle_cpus && (idle_cpus != node_ptr->cpus))) {
node_ptr->node_state &= NODE_STATE_FLAGS;
- if (err_cpus)
+ if(err_cpus)
node_ptr->node_state
|= NODE_STATE_ERROR;
node_ptr->node_state |= NODE_STATE_MIXED;
- } else if (err_cpus) {
+ } else if(err_cpus) {
node_ptr->node_state &= NODE_STATE_FLAGS;
node_ptr->node_state |= NODE_STATE_ERROR;
}
-/* if (alloc_cpus && err_cpus && !idle_cpus) { */
+/* if(alloc_cpus && err_cpus && !idle_cpus) { */
/* node_ptr->node_state &= NODE_STATE_FLAGS; */
/* node_ptr->node_state |= NODE_STATE_AE; */
-/* } else if (alloc_cpus && err_cpus && idle_cpus) { */
+/* } else if(alloc_cpus && err_cpus && idle_cpus) { */
/* node_ptr->node_state &= NODE_STATE_FLAGS; */
/* node_ptr->node_state |= NODE_STATE_AEI; */
-/* } else if (alloc_cpus && !err_cpus && idle_cpus) { */
+/* } else if(alloc_cpus && !err_cpus && idle_cpus) { */
/* node_ptr->node_state &= NODE_STATE_FLAGS; */
/* node_ptr->node_state |= NODE_STATE_AI; */
-/* } else if (!alloc_cpus && err_cpus && idle_cpus) { */
+/* } else if(!alloc_cpus && err_cpus && idle_cpus) { */
/* node_ptr->node_state &= NODE_STATE_FLAGS; */
/* node_ptr->node_state |= NODE_STATE_EI; */
/* } */
@@ -724,7 +724,7 @@ extern int update_features_node(GtkDialog *dialog, const char *nodelist,
int no_dialog = 0;
int rc = SLURM_SUCCESS;
- if (!dialog) {
+ if(!dialog) {
snprintf(tmp_char, sizeof(tmp_char),
"Update Features for Node(s) %s?", nodelist);
@@ -755,10 +755,10 @@ extern int update_features_node(GtkDialog *dialog, const char *nodelist,
label, FALSE, FALSE, 0);
entry = create_entry();
- if (!entry)
+ if(!entry)
goto end_it;
- if (old_features)
+ if(old_features)
gtk_entry_set_text(GTK_ENTRY(entry), old_features);
gtk_box_pack_start(GTK_BOX(dialog->vbox), entry, TRUE, TRUE, 0);
@@ -768,13 +768,13 @@ extern int update_features_node(GtkDialog *dialog, const char *nodelist,
if (response == GTK_RESPONSE_OK) {
node_msg->features =
xstrdup(gtk_entry_get_text(GTK_ENTRY(entry)));
- if (!node_msg->features) {
+ if(!node_msg->features) {
edit = g_strdup_printf("No features given.");
display_edit_note(edit);
g_free(edit);
goto end_it;
}
- if (slurm_update_node(node_msg)
+ if(slurm_update_node(node_msg)
== SLURM_SUCCESS) {
edit = g_strdup_printf(
"Nodes %s updated successfully.",
@@ -793,7 +793,7 @@ extern int update_features_node(GtkDialog *dialog, const char *nodelist,
end_it:
slurm_free_update_node_msg(node_msg);
- if (no_dialog)
+ if(no_dialog)
gtk_widget_destroy(GTK_WIDGET(dialog));
return rc;
@@ -811,7 +811,7 @@ extern int update_gres_node(GtkDialog *dialog, const char *nodelist,
int no_dialog = 0;
int rc = SLURM_SUCCESS;
- if (!dialog) {
+ if(!dialog) {
snprintf(tmp_char, sizeof(tmp_char),
"Update Gres for Node(s) %s?", nodelist);
@@ -842,10 +842,10 @@ extern int update_gres_node(GtkDialog *dialog, const char *nodelist,
label, FALSE, FALSE, 0);
entry = create_entry();
- if (!entry)
+ if(!entry)
goto end_it;
- if (old_gres)
+ if(old_gres)
gtk_entry_set_text(GTK_ENTRY(entry), old_gres);
gtk_box_pack_start(GTK_BOX(dialog->vbox), entry, TRUE, TRUE, 0);
@@ -855,13 +855,13 @@ extern int update_gres_node(GtkDialog *dialog, const char *nodelist,
if (response == GTK_RESPONSE_OK) {
node_msg->gres =
xstrdup(gtk_entry_get_text(GTK_ENTRY(entry)));
- if (!node_msg->gres) {
+ if(!node_msg->gres) {
edit = g_strdup_printf("No gres given.");
display_edit_note(edit);
g_free(edit);
goto end_it;
}
- if (slurm_update_node(node_msg)
+ if(slurm_update_node(node_msg)
== SLURM_SUCCESS) {
edit = g_strdup_printf(
"Nodes %s updated successfully.",
@@ -880,7 +880,7 @@ extern int update_gres_node(GtkDialog *dialog, const char *nodelist,
end_it:
slurm_free_update_node_msg(node_msg);
- if (no_dialog)
+ if(no_dialog)
gtk_widget_destroy(GTK_WIDGET(dialog));
return rc;
@@ -899,7 +899,7 @@ extern int update_state_node(GtkDialog *dialog,
GtkWidget *entry = NULL;
int no_dialog = 0;
- if (!dialog) {
+ if(!dialog) {
dialog = GTK_DIALOG(
gtk_dialog_new_with_buttons(
type,
@@ -920,7 +920,7 @@ extern int update_state_node(GtkDialog *dialog,
node_msg->reason = NULL;
node_msg->node_names = xstrdup(nodelist);
- if (!strncasecmp("drain", type, 5)) {
+ if(!strncasecmp("drain", type, 5)) {
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to drain nodes %s?\n\n"
"Please put reason.",
@@ -928,21 +928,21 @@ extern int update_state_node(GtkDialog *dialog,
entry = create_entry();
label = gtk_label_new(tmp_char);
state = NODE_STATE_DRAIN;
- } else if (!strncasecmp("resume", type, 5)) {
+ } else if(!strncasecmp("resume", type, 5)) {
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to resume nodes %s?",
nodelist);
label = gtk_label_new(tmp_char);
state = NODE_RESUME;
} else {
- if (!strncasecmp("make", type, 4))
+ if(!strncasecmp("make", type, 4))
type = "idle";
- else if (!strncasecmp("put", type, 3))
+ else if(!strncasecmp("put", type, 3))
type = "down";
for(i = 0; i < NODE_STATE_END; i++) {
upper = node_state_string(i);
lower = str_tolower(upper);
- if (!strcmp(lower, type)) {
+ if(!strcmp(lower, type)) {
snprintf(tmp_char, sizeof(tmp_char),
"Are you sure you want to set "
"nodes %s to %s?",
@@ -955,20 +955,20 @@ extern int update_state_node(GtkDialog *dialog,
xfree(lower);
}
}
- if (!label)
+ if(!label)
goto end_it;
node_msg->node_state = (uint16_t)state;
gtk_box_pack_start(GTK_BOX(dialog->vbox), label, FALSE, FALSE, 0);
- if (entry)
+ if(entry)
gtk_box_pack_start(GTK_BOX(dialog->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(GTK_WIDGET(dialog));
i = gtk_dialog_run(dialog);
if (i == GTK_RESPONSE_OK) {
- if (entry) {
+ if(entry) {
node_msg->reason = xstrdup(
gtk_entry_get_text(GTK_ENTRY(entry)));
- if (!node_msg->reason || !strlen(node_msg->reason)) {
+ if(!node_msg->reason || !strlen(node_msg->reason)) {
lower = g_strdup_printf(
"You need a reason to do that.");
display_edit_note(lower);
@@ -980,7 +980,7 @@ extern int update_state_node(GtkDialog *dialog,
node_msg->reason_uid = getuid();
}
}
- if (slurm_update_node(node_msg)
+ if(slurm_update_node(node_msg)
== SLURM_SUCCESS) {
lower = g_strdup_printf(
"Nodes %s updated successfully.",
@@ -998,7 +998,7 @@ extern int update_state_node(GtkDialog *dialog,
}
end_it:
slurm_free_update_node_msg(node_msg);
- if (no_dialog)
+ if(no_dialog)
gtk_widget_destroy(GTK_WIDGET(dialog));
return rc;
@@ -1058,7 +1058,7 @@ extern void admin_edit_node(GtkCellRendererText *cell,
char *nodelist = NULL;
int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
- if (!new_text || !strcmp(new_text, ""))
+ if(!new_text || !strcmp(new_text, ""))
goto no_input;
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
@@ -1095,35 +1095,35 @@ extern void get_info_node(GtkTable *table, display_data_t *display_data)
ListIterator itr = NULL;
/* reset */
- if (!table && !display_data) {
- if (display_widget)
+ if(!table && !display_data) {
+ if(display_widget)
gtk_widget_destroy(display_widget);
display_widget = NULL;
return;
}
- if (display_data)
+ if(display_data)
local_display_data = display_data;
- if (!table) {
+ if(!table) {
display_data_node->set_menu = local_display_data->set_menu;
return;
}
- if (display_widget && toggled) {
+ if(display_widget && toggled) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
goto display_it;
}
- if ((error_code = get_new_info_node(&node_info_ptr, force_refresh))
+ if((error_code = get_new_info_node(&node_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if (!display_widget || view == ERROR_VIEW)
+ if(!display_widget || view == ERROR_VIEW)
goto display_it;
changed = 0;
} else if (error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
view = ERROR_VIEW;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
sprintf(error_char, "slurm_load_node: %s",
slurm_strerror(slurm_get_errno()));
@@ -1136,7 +1136,7 @@ extern void get_info_node(GtkTable *table, display_data_t *display_data)
display_it:
info_list = create_node_info_list(node_info_ptr, changed);
- if (!info_list)
+ if(!info_list)
return;
i=0;
/* set up the grid */
@@ -1147,16 +1147,16 @@ display_it:
}
list_iterator_destroy(itr);
change_grid_color(grid_button_list, -1, -1, MAKE_WHITE, true, 0);
- if (working_sview_config.grid_speedup) {
+ if(working_sview_config.grid_speedup) {
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
}
- if (view == ERROR_VIEW && display_widget) {
+ if(view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
}
- if (!display_widget) {
+ if(!display_widget) {
tree_view = create_treeview(local_display_data,
&grid_button_list);
@@ -1198,26 +1198,26 @@ extern void specific_info_node(popup_info_t *popup_win)
int i = -1;
sview_search_info_t *search_info = spec_info->search_info;
- if (!spec_info->display_widget)
+ if(!spec_info->display_widget)
setup_popup_info(popup_win, display_data_node, SORTID_CNT);
- if (node_info_ptr && popup_win->toggled) {
+ if(node_info_ptr && popup_win->toggled) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
goto display_it;
}
- if ((error_code = get_new_info_node(&node_info_ptr,
+ if((error_code = get_new_info_node(&node_info_ptr,
popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if (!spec_info->display_widget || spec_info->view == ERROR_VIEW)
+ if(!spec_info->display_widget || spec_info->view == ERROR_VIEW)
goto display_it;
changed = 0;
- } else if (error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ } else if(error_code != SLURM_SUCCESS) {
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
spec_info->view = ERROR_VIEW;
- if (spec_info->display_widget)
+ if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
sprintf(error_char, "slurm_load_node: %s",
slurm_strerror(slurm_get_errno()));
@@ -1232,14 +1232,14 @@ extern void specific_info_node(popup_info_t *popup_win)
display_it:
info_list = create_node_info_list(node_info_ptr, changed);
- if (!info_list)
+ if(!info_list)
return;
- if (spec_info->view == ERROR_VIEW && spec_info->display_widget) {
+ if(spec_info->view == ERROR_VIEW && spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
- if (spec_info->type != INFO_PAGE && !spec_info->display_widget) {
+ if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
@@ -1258,7 +1258,7 @@ display_it:
setup_popup_grid_list(popup_win);
spec_info->view = INFO_VIEW;
- if (spec_info->type == INFO_PAGE) {
+ if(spec_info->type == INFO_PAGE) {
_display_info_node(info_list, popup_win);
goto end_it;
}
@@ -1268,7 +1268,7 @@ display_it:
/* just linking to another list, don't free the inside, just
the list */
send_info_list = list_create(NULL);
- if (search_info->gchar_data) {
+ if(search_info->gchar_data) {
hostlist = hostlist_create(search_info->gchar_data);
host_itr = hostlist_iterator_create(hostlist);
}
@@ -1284,10 +1284,10 @@ display_it:
switch(search_info->search_type) {
case SEARCH_NODE_STATE:
- if (search_info->int_data == NO_VAL)
+ if(search_info->int_data == NO_VAL)
continue;
- else if (search_info->int_data != node_ptr->node_state) {
- if (IS_NODE_MIXED(node_ptr)) {
+ else if(search_info->int_data != node_ptr->node_state) {
+ if(IS_NODE_MIXED(node_ptr)) {
uint16_t alloc_cnt = 0, err_cnt = 0;
uint16_t idle_cnt = node_ptr->cpus;
select_g_select_nodeinfo_get(
@@ -1301,20 +1301,20 @@ display_it:
NODE_STATE_ERROR,
&err_cnt);
idle_cnt -= (alloc_cnt + err_cnt);
- if ((search_info->int_data
+ if((search_info->int_data
& NODE_STATE_BASE)
== NODE_STATE_ALLOCATED) {
- if (alloc_cnt)
+ if(alloc_cnt)
break;
- } else if ((search_info->int_data
+ } else if((search_info->int_data
& NODE_STATE_BASE)
== NODE_STATE_ERROR) {
- if (err_cnt)
+ if(err_cnt)
break;
- } else if ((search_info->int_data
+ } else if((search_info->int_data
& NODE_STATE_BASE)
== NODE_STATE_IDLE) {
- if (idle_cnt)
+ if(idle_cnt)
break;
}
}
@@ -1323,10 +1323,10 @@ display_it:
break;
case SEARCH_NODE_NAME:
default:
- if (!search_info->gchar_data)
+ if(!search_info->gchar_data)
continue;
while((host = hostlist_next(host_itr))) {
- if (!strcmp(host, node_ptr->name)) {
+ if(!strcmp(host, node_ptr->name)) {
free(host);
found = 1;
break;
@@ -1335,7 +1335,7 @@ display_it:
}
hostlist_iterator_reset(host_itr);
- if (!found)
+ if(!found)
continue;
break;
}
@@ -1346,7 +1346,7 @@ display_it:
list_iterator_destroy(itr);
post_setup_popup_grid_list(popup_win);
- if (search_info->gchar_data) {
+ if(search_info->gchar_data) {
hostlist_iterator_destroy(host_itr);
hostlist_destroy(hostlist);
}
@@ -1429,7 +1429,7 @@ extern void popup_all_node_name(char *name, int id)
GError *error = NULL;
char *node;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
node = "Base partition";
else
node = "Node";
@@ -1459,15 +1459,15 @@ extern void popup_all_node_name(char *name, int id)
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info)
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info)
+ if(!strcmp(popup_win->spec_info->title, title)) {
break;
}
}
list_iterator_destroy(itr);
- if (!popup_win) {
- if (id == INFO_PAGE)
+ if(!popup_win) {
+ if(id == INFO_PAGE)
popup_win = create_popup_info(id, NODE_PAGE, title);
else
popup_win = create_popup_info(NODE_PAGE, id, title);
@@ -1509,9 +1509,9 @@ extern void admin_menu_node_name(char *name, GdkEventButton *event)
GtkWidget *menuitem;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (!display_data->name)
+ if(!display_data->name)
continue;
display_data->user_data = name;
@@ -1533,19 +1533,19 @@ extern void admin_node(GtkTreeModel *model, GtkTreeIter *iter, char *type)
char *old_value = NULL;
gtk_tree_model_get(model, iter, SORTID_NAME, &name, -1);
- if (!strcasecmp("Update Features", type)) { /* get old features */
+ if(!strcasecmp("Update Features", type)) { /* get old features */
gtk_tree_model_get(model, iter, SORTID_FEATURES,
&old_value, -1);
- } else if (!strcasecmp("Update Gres", type)) { /* get old gres */
+ } else if(!strcasecmp("Update Gres", type)) { /* get old gres */
gtk_tree_model_get(model, iter, SORTID_GRES,
&old_value, -1);
}
admin_node_name(name, old_value, type);
- if (name)
+ if(name)
g_free(name);
- if (old_value)
+ if(old_value)
g_free(old_value);
return;
@@ -1560,9 +1560,9 @@ extern void admin_node_name(char *name, char *old_value, char *type)
NULL);
gtk_window_set_transient_for(GTK_WINDOW(popup), NULL);
- if (!strcasecmp("Update Features", type)) { /* update features */
+ if(!strcasecmp("Update Features", type)) { /* update features */
update_features_node(GTK_DIALOG(popup), name, old_value);
- } else if (!strcasecmp("Update Gres", type)) { /* update gres */
+ } else if(!strcasecmp("Update Gres", type)) { /* update gres */
update_gres_node(GTK_DIALOG(popup), name, old_value);
} else /* something that has to deal with a node state change */
update_state_node(GTK_DIALOG(popup), name, type);
@@ -1576,23 +1576,23 @@ extern void cluster_change_node()
{
display_data_t *display_data = options_data_node;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case BLOCK_PAGE:
display_data->name = "Blocks";
break;
}
- if (!display_data->name) {
- } else if (!strcmp(display_data->name, "Drain Node"))
+ if(!display_data->name) {
+ } else if(!strcmp(display_data->name, "Drain Node"))
display_data->name = "Drain Base Partition";
- else if (!strcmp(display_data->name, "Resume Node"))
+ else if(!strcmp(display_data->name, "Resume Node"))
display_data->name = "Resume Base Partition";
- else if (!strcmp(display_data->name, "Put Node Down"))
+ else if(!strcmp(display_data->name, "Put Node Down"))
display_data->name = "Put Base Partition Down";
- else if (!strcmp(display_data->name, "Make Node Idle"))
+ else if(!strcmp(display_data->name, "Make Node Idle"))
display_data->name =
"Make Base Partition Idle";
} else {
@@ -1602,17 +1602,17 @@ extern void cluster_change_node()
break;
}
- if (!display_data->name) {
- } else if (!strcmp(display_data->name,
+ if(!display_data->name) {
+ } else if(!strcmp(display_data->name,
"Drain Base Partitions"))
display_data->name = "Drain Nodes";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Resume Base Partitions"))
display_data->name = "Resume Nodes";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Put Base Partitions Down"))
display_data->name = "Put Nodes Down";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Make Base Partitions Idle"))
display_data->name = "Make Nodes Idle";
}
diff --git a/src/sview/part_info.c b/src/sview/part_info.c
index 0ca87175aa3c679863c4306b36896c4cabd360b3..7effd656e2b127ca98b5c6be0cb3ab849ce85d17 100644
--- a/src/sview/part_info.c
+++ b/src/sview/part_info.c
@@ -256,58 +256,58 @@ static void _set_active_combo_part(GtkComboBox *combo,
char *upper = NULL;
gtk_tree_model_get(model, iter, type, &temp_char, -1);
- if (!temp_char)
+ if(!temp_char)
goto end_it;
switch(type) {
case SORTID_DEFAULT:
case SORTID_HIDDEN:
case SORTID_ROOT:
- if (!strcmp(temp_char, "yes"))
+ if(!strcmp(temp_char, "yes"))
action = 0;
- else if (!strcmp(temp_char, "no"))
+ else if(!strcmp(temp_char, "no"))
action = 1;
else
action = 0;
break;
case SORTID_SHARE:
- if (!strncmp(temp_char, "force", 5))
+ if(!strncmp(temp_char, "force", 5))
action = 0;
- else if (!strcmp(temp_char, "no"))
+ else if(!strcmp(temp_char, "no"))
action = 1;
- else if (!strncmp(temp_char, "yes", 3))
+ else if(!strncmp(temp_char, "yes", 3))
action = 2;
- else if (!strcmp(temp_char, "exclusive"))
+ else if(!strcmp(temp_char, "exclusive"))
action = 3;
else
action = 0;
break;
case SORTID_PART_STATE:
- if (!strcmp(temp_char, "up"))
+ if(!strcmp(temp_char, "up"))
action = 0;
- else if (!strcmp(temp_char, "down"))
+ else if(!strcmp(temp_char, "down"))
action = 1;
- else if (!strcmp(temp_char, "inactive"))
+ else if(!strcmp(temp_char, "inactive"))
action = 2;
- else if (!strcmp(temp_char, "drain"))
+ else if(!strcmp(temp_char, "drain"))
action = 3;
else
action = 0;
break;
case SORTID_NODE_STATE:
- if (!strcasecmp(temp_char, "drain"))
+ if(!strcasecmp(temp_char, "drain"))
action = 0;
- else if (!strcasecmp(temp_char, "resume"))
+ else if(!strcasecmp(temp_char, "resume"))
action = 1;
else
for(i = 0; i < NODE_STATE_END; i++) {
upper = node_state_string(i);
- if (!strcmp(upper, "UNKNOWN")) {
+ if(!strcmp(upper, "UNKNOWN")) {
unknown_found++;
continue;
}
- if (!strcasecmp(temp_char, upper)) {
+ if(!strcasecmp(temp_char, upper)) {
action = i + 2 - unknown_found;
break;
}
@@ -379,7 +379,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
global_edit_error = 0;
- if (!part_msg)
+ if(!part_msg)
return NULL;
switch(column) {
@@ -414,7 +414,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
temp_int = time_str2mins((char *)new_text);
type = "timelimit";
- if ((temp_int <= 0) && (temp_int != INFINITE))
+ if((temp_int <= 0) && (temp_int != INFINITE))
goto return_error;
part_msg->max_time = (uint32_t)temp_int;
break;
@@ -434,7 +434,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
temp_int = strtol(new_text, (char **)NULL, 10);
type = "min_nodes";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
part_msg->min_nodes = (uint32_t)temp_int;
break;
@@ -446,7 +446,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
}
type = "max_nodes";
- if (temp_int <= 0 && temp_int != INFINITE)
+ if(temp_int <= 0 && temp_int != INFINITE)
goto return_error;
part_msg->max_nodes = (uint32_t)temp_int;
break;
@@ -514,7 +514,7 @@ static const char *_set_part_msg(update_part_msg_t *part_msg,
break;
}
- if (strcmp(type, "unknown"))
+ if(strcmp(type, "unknown"))
global_send_update_msg = 1;
return type;
@@ -534,15 +534,15 @@ static void _admin_edit_combo_box_part(GtkComboBox *combo,
char *name = NULL;
const char *col_name = NULL;
- if (!part_msg)
+ if(!part_msg)
return;
- if (!gtk_combo_box_get_active_iter(combo, &iter)) {
+ if(!gtk_combo_box_get_active_iter(combo, &iter)) {
g_print("nothing selected\n");
return;
}
model = gtk_combo_box_get_model(combo);
- if (!model) {
+ if(!model) {
g_print("nothing selected\n");
return;
}
@@ -551,7 +551,7 @@ static void _admin_edit_combo_box_part(GtkComboBox *combo,
gtk_tree_model_get(model, &iter, 1, &column, -1);
col_name = _set_part_msg(part_msg, name, column);
- if (name)
+ if(name)
g_free(name);
}
@@ -559,14 +559,14 @@ static gboolean _admin_focus_out_part(GtkEntry *entry,
GdkEventFocus *event,
update_part_msg_t *part_msg)
{
- if (global_entry_changed) {
+ if(global_entry_changed) {
const char *col_name = NULL;
int type = gtk_entry_get_max_length(entry);
const char *name = gtk_entry_get_text(entry);
type -= DEFAULT_ENTRY_LENGTH;
col_name = _set_part_msg(part_msg, name, type);
- if (global_edit_error) {
- if (global_edit_error_msg)
+ if(global_edit_error) {
+ if(global_edit_error_msg)
g_free(global_edit_error_msg);
global_edit_error_msg = g_strdup_printf(
"Partition %s %s can't be set to %s",
@@ -603,11 +603,11 @@ static GtkWidget *_admin_full_edit_part(update_part_msg_t *part_msg,
for(i = 0; i < SORTID_CNT; i++) {
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (!display_data->name)
+ if(!display_data->name)
continue;
- if (display_data->id != i)
+ if(display_data->id != i)
continue;
display_admin_edit(
table, part_msg, &row, model, iter,
@@ -643,7 +643,7 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
while(1) {
gtk_tree_store_set(GTK_TREE_STORE(model), sub_iter,
SORTID_UPDATED, 0, -1);
- if (!gtk_tree_model_iter_next(model, sub_iter)) {
+ if(!gtk_tree_model_iter_next(model, sub_iter)) {
break;
}
}
@@ -651,7 +651,7 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
set = 1;
}
itr = list_iterator_create(sview_part_info->sub_list);
- if (list_count(sview_part_info->sub_list) == 1) {
+ if(list_count(sview_part_info->sub_list) == 1) {
gtk_tree_store_set(GTK_TREE_STORE(model), iter,
SORTID_ONLY_LINE, 1, -1);
sview_part_sub = list_next(itr);
@@ -679,7 +679,7 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
gtk_tree_model_get(model, sub_iter,
SORTID_NODE_STATE_NUM,
&state, -1);
- if ((uint16_t)state
+ if((uint16_t)state
== sview_part_sub->node_state) {
/* update with new info */
_update_part_sub_record(
@@ -690,7 +690,7 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
}
line++;
- if (!gtk_tree_model_iter_next(model,
+ if(!gtk_tree_model_iter_next(model,
sub_iter)) {
break;
}
@@ -699,7 +699,7 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
_append_part_sub_record(sview_part_sub,
GTK_TREE_STORE(model),
iter, line);
-/* if (i == NO_VAL) */
+/* if(i == NO_VAL) */
/* line++; */
found:
;
@@ -707,21 +707,21 @@ static void _subdivide_part(sview_part_info_t *sview_part_info,
}
list_iterator_destroy(itr);
- if (set) {
+ if(set) {
sub_iter = &first_sub_iter;
/* clear all steps that aren't active */
while(1) {
gtk_tree_model_get(model, sub_iter,
SORTID_UPDATED, &i, -1);
- if (!i) {
- if (!gtk_tree_store_remove(
+ if(!i) {
+ if(!gtk_tree_store_remove(
GTK_TREE_STORE(model),
sub_iter))
break;
else
continue;
}
- if (!gtk_tree_model_iter_next(model, sub_iter)) {
+ if(!gtk_tree_model_iter_next(model, sub_iter)) {
break;
}
}
@@ -761,9 +761,9 @@ static void _layout_part_record(GtkTreeView *treeview,
itr = list_iterator_create(sview_part_info->sub_list);
while((sview_part_sub = list_next(itr))) {
- if (sview_part_sub->node_state == NODE_STATE_IDLE)
+ if(sview_part_sub->node_state == NODE_STATE_IDLE)
temp_part_sub = &idle_part_sub;
- else if (sview_part_sub->node_state == NODE_STATE_ALLOCATED)
+ else if(sview_part_sub->node_state == NODE_STATE_ALLOCATED)
temp_part_sub = &alloc_part_sub;
else
temp_part_sub = &other_part_sub;
@@ -774,7 +774,7 @@ static void _layout_part_record(GtkTreeView *treeview,
/* temp_part_sub->disk_total += sview_part_sub->disk_total; */
/* temp_part_sub->mem_total += sview_part_sub->mem_total; */
- if (!global_set) {
+ if(!global_set) {
global_set = 1;
/* store features and reasons in the others
group */
@@ -820,7 +820,7 @@ static void _layout_part_record(GtkTreeView *treeview,
}
break;
case SORTID_ALTERNATE:
- if (part_ptr->alternate)
+ if(part_ptr->alternate)
temp_char = part_ptr->alternate;
else
temp_char = "";
@@ -842,7 +842,7 @@ static void _layout_part_record(GtkTreeView *treeview,
temp_char = sview_part_sub->features;
break;
case SORTID_GROUPS:
- if (part_ptr->allow_groups)
+ if(part_ptr->allow_groups)
temp_char = part_ptr->allow_groups;
else
temp_char = "all";
@@ -872,7 +872,7 @@ static void _layout_part_record(GtkTreeView *treeview,
temp_char = part_ptr->allow_alloc_nodes;
break;
case SORTID_NODES:
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->total_nodes,
tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
@@ -912,14 +912,14 @@ static void _layout_part_record(GtkTreeView *treeview,
yes_no = 0;
break;
case SORTID_SHARE:
- if (part_ptr->max_share & SHARED_FORCE) {
+ if(part_ptr->max_share & SHARED_FORCE) {
snprintf(tmp_buf, sizeof(tmp_buf), "force:%u",
(part_ptr->max_share
& ~(SHARED_FORCE)));
temp_char = tmp_buf;
- } else if (part_ptr->max_share == 0)
+ } else if(part_ptr->max_share == 0)
temp_char = "exclusive";
- else if (part_ptr->max_share > 1) {
+ else if(part_ptr->max_share > 1) {
snprintf(tmp_buf, sizeof(tmp_buf), "yes:%u",
part_ptr->max_share);
temp_char = tmp_buf;
@@ -939,19 +939,19 @@ static void _layout_part_record(GtkTreeView *treeview,
break;
}
- if (up_down != -1) {
- if (up_down)
+ if(up_down != -1) {
+ if(up_down)
temp_char = "up";
else
temp_char = "down";
up_down = -1;
- } if (yes_no != -1) {
- if (yes_no)
+ } if(yes_no != -1) {
+ if(yes_no)
temp_char = "yes";
else
temp_char = "no";
yes_no = -1;
- } else if (limit_set != NO_VAL) {
+ } else if(limit_set != NO_VAL) {
if (limit_set == (uint32_t) INFINITE)
temp_char = "infinite";
else {
@@ -963,13 +963,13 @@ static void _layout_part_record(GtkTreeView *treeview,
limit_set = NO_VAL;
}
- if (temp_char) {
+ if(temp_char) {
add_display_treestore_line(
update, treestore, &iter,
find_col_name(display_data_part,
i),
temp_char);
- if (i == SORTID_NODES) {
+ if(i == SORTID_NODES) {
add_display_treestore_line(
update, treestore, &iter,
"Nodes (Allocated/Idle/Other)",
@@ -999,19 +999,19 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
gtk_tree_store_set(treestore, iter, SORTID_NAME, part_ptr->name, -1);
- if (part_ptr->flags & PART_FLAG_DEFAULT)
+ if(part_ptr->flags & PART_FLAG_DEFAULT)
temp_char = "yes";
else
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_DEFAULT, temp_char, -1);
- if (part_ptr->flags & PART_FLAG_HIDDEN)
+ if(part_ptr->flags & PART_FLAG_HIDDEN)
temp_char = "yes";
else
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_HIDDEN, temp_char, -1);
- if (part_ptr->alternate)
+ if(part_ptr->alternate)
temp_char = part_ptr->alternate;
else
temp_char = "";
@@ -1071,19 +1071,19 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
gtk_tree_store_set(treestore, iter, SORTID_NODES_MAX,
time_buf, -1);
- if (part_ptr->flags & PART_FLAG_ROOT_ONLY)
+ if(part_ptr->flags & PART_FLAG_ROOT_ONLY)
temp_char = "yes";
else
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_ROOT, temp_char, -1);
- if (part_ptr->max_share & SHARED_FORCE) {
+ if(part_ptr->max_share & SHARED_FORCE) {
snprintf(tmp_buf, sizeof(tmp_buf), "force:%u",
(part_ptr->max_share & ~(SHARED_FORCE)));
temp_char = tmp_buf;
- } else if (part_ptr->max_share == 0)
+ } else if(part_ptr->max_share == 0)
temp_char = "exclusive";
- else if (part_ptr->max_share > 1) {
+ else if(part_ptr->max_share > 1) {
snprintf(tmp_buf, sizeof(tmp_buf), "yes:%u",
part_ptr->max_share);
temp_char = tmp_buf;
@@ -1091,20 +1091,20 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
temp_char = "no";
gtk_tree_store_set(treestore, iter, SORTID_SHARE, temp_char, -1);
- if (part_ptr->allow_groups)
+ if(part_ptr->allow_groups)
temp_char = part_ptr->allow_groups;
else
temp_char = "all";
gtk_tree_store_set(treestore, iter, SORTID_GROUPS, temp_char, -1);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->total_nodes, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
else
sprintf(tmp_cnt, "%u", part_ptr->total_nodes);
gtk_tree_store_set(treestore, iter, SORTID_NODES, tmp_cnt, -1);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
convert_num_unit((float)part_ptr->total_cpus, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
else
@@ -1130,7 +1130,7 @@ static void _update_part_record(sview_part_info_t *sview_part_info,
childern = gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
&sub_iter, iter);
- if (gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
+ if(gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore),
&sub_iter, iter))
_subdivide_part(sview_part_info,
GTK_TREE_MODEL(treestore), &sub_iter, iter);
@@ -1162,13 +1162,13 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
gtk_tree_store_set(treestore, iter, SORTID_NODE_STATE_NUM,
sview_part_sub->node_state, -1);
- if ((sview_part_sub->node_state & NODE_STATE_BASE) == NODE_STATE_MIXED) {
- if (sview_part_sub->cpu_alloc_cnt) {
+ if((sview_part_sub->node_state & NODE_STATE_BASE) == NODE_STATE_MIXED) {
+ if(sview_part_sub->cpu_alloc_cnt) {
convert_num_unit((float)sview_part_sub->cpu_alloc_cnt,
tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
xstrfmtcat(cpu_tmp, "Alloc:%s", tmp_cnt);
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit(
(float)(sview_part_sub->cpu_alloc_cnt
/ cpus_per_node),
@@ -1177,38 +1177,38 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
xstrfmtcat(node_tmp, "Alloc:%s", tmp_cnt);
}
}
- if (sview_part_sub->cpu_error_cnt) {
+ if(sview_part_sub->cpu_error_cnt) {
convert_num_unit((float)sview_part_sub->cpu_error_cnt,
tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
- if (cpu_tmp)
+ if(cpu_tmp)
xstrcat(cpu_tmp, " ");
xstrfmtcat(cpu_tmp, "Err:%s", tmp_cnt);
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit(
(float)(sview_part_sub->cpu_error_cnt
/ cpus_per_node),
tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
- if (node_tmp)
+ if(node_tmp)
xstrcat(node_tmp, " ");
xstrfmtcat(node_tmp, "Err:%s", tmp_cnt);
}
}
- if (sview_part_sub->cpu_idle_cnt) {
+ if(sview_part_sub->cpu_idle_cnt) {
convert_num_unit((float)sview_part_sub->cpu_idle_cnt,
tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
- if (cpu_tmp)
+ if(cpu_tmp)
xstrcat(cpu_tmp, " ");
xstrfmtcat(cpu_tmp, "Idle:%s", tmp_cnt);
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
convert_num_unit(
(float)(sview_part_sub->cpu_idle_cnt
/ cpus_per_node),
tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
- if (node_tmp)
+ if(node_tmp)
xstrcat(node_tmp, " ");
xstrfmtcat(node_tmp, "Idle:%s", tmp_cnt);
}
@@ -1229,7 +1229,7 @@ static void _update_part_sub_record(sview_part_sub_t *sview_part_sub,
sizeof(tmp_cnt), UNIT_MEGA);
gtk_tree_store_set(treestore, iter, SORTID_MEM, tmp_cnt, -1);
- if (!node_tmp) {
+ if(!node_tmp) {
convert_num_unit((float)sview_part_sub->node_cnt, tmp_cnt,
sizeof(tmp_cnt), UNIT_NONE);
node_tmp = xstrdup(tmp_cnt);
@@ -1288,7 +1288,7 @@ static void _update_info_part(List info_list,
while(1) {
gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
SORTID_UPDATED, 0, -1);
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -1307,7 +1307,7 @@ static void _update_info_part(List info_list,
it is in the list */
gtk_tree_model_get(model, &iter, SORTID_NAME,
&part_name, -1);
- if (!strcmp(part_name, part_ptr->name)) {
+ if(!strcmp(part_name, part_ptr->name)) {
/* update with new info */
g_free(part_name);
_update_part_record(sview_part_info,
@@ -1318,7 +1318,7 @@ static void _update_info_part(List info_list,
g_free(part_name);
line++;
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -1329,7 +1329,7 @@ static void _update_info_part(List info_list,
;
}
list_iterator_destroy(itr);
- if (host)
+ if(host)
free(host);
gtk_tree_path_free(path);
@@ -1343,7 +1343,7 @@ static void _part_info_list_del(void *object)
sview_part_info_t *sview_part_info = (sview_part_info_t *)object;
if (sview_part_info) {
- if (sview_part_info->sub_list)
+ if(sview_part_info->sub_list)
list_destroy(sview_part_info->sub_list);
xfree(sview_part_info);
}
@@ -1356,9 +1356,9 @@ static void _destroy_part_sub(void *object)
if (sview_part_sub) {
xfree(sview_part_sub->features);
xfree(sview_part_sub->reason);
- if (sview_part_sub->hl)
+ if(sview_part_sub->hl)
hostlist_destroy(sview_part_sub->hl);
- if (sview_part_sub->node_ptr_list)
+ if(sview_part_sub->node_ptr_list)
list_destroy(sview_part_sub->node_ptr_list);
xfree(sview_part_sub);
}
@@ -1372,7 +1372,7 @@ static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
int idle_cpus = node_ptr->cpus;
uint16_t err_cpus = 0, alloc_cpus = 0;
- if (node_scaling)
+ if(node_scaling)
cpus_per_node = node_ptr->cpus / node_scaling;
xassert(sview_part_sub);
@@ -1390,13 +1390,13 @@ static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
return;
}
- if ((sview_part_sub->node_state & NODE_STATE_BASE) == NODE_STATE_MIXED) {
+ if((sview_part_sub->node_state & NODE_STATE_BASE) == NODE_STATE_MIXED) {
slurm_get_select_nodeinfo(node_ptr->select_nodeinfo,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ALLOCATED,
&alloc_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG) {
- if (!alloc_cpus
+ if(cluster_flags & CLUSTER_FLAG_BG) {
+ if(!alloc_cpus
&& (IS_NODE_ALLOCATED(node_ptr)
|| IS_NODE_COMPLETING(node_ptr)))
alloc_cpus = node_ptr->cpus;
@@ -1409,7 +1409,7 @@ static void _update_sview_part_sub(sview_part_sub_t *sview_part_sub,
SELECT_NODEDATA_SUBCNT,
NODE_STATE_ERROR,
&err_cpus);
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
err_cpus *= cpus_per_node;
idle_cpus -= err_cpus;
@@ -1465,7 +1465,7 @@ static int _insert_sview_part_sub(sview_part_info_t *sview_part_info,
ListIterator itr = list_iterator_create(sview_part_info->sub_list);
while((sview_part_sub = list_next(itr))) {
- if (sview_part_sub->node_state
+ if(sview_part_sub->node_state
== node_ptr->node_state) {
_update_sview_part_sub(sview_part_sub,
node_ptr,
@@ -1475,8 +1475,8 @@ static int _insert_sview_part_sub(sview_part_info_t *sview_part_info,
}
list_iterator_destroy(itr);
- if (!sview_part_sub) {
- if ((sview_part_sub = _create_sview_part_sub(
+ if(!sview_part_sub) {
+ if((sview_part_sub = _create_sview_part_sub(
part_ptr, node_ptr, node_scaling)))
list_push(sview_part_info->sub_list,
sview_part_sub);
@@ -1512,7 +1512,7 @@ static int _sview_part_sort_aval_dec(sview_part_info_t* rec_a,
else if (size_a > size_b)
return 1;
- if (rec_a->part_ptr->nodes && rec_b->part_ptr->nodes) {
+ if(rec_a->part_ptr->nodes && rec_b->part_ptr->nodes) {
size_a = strcmp(rec_a->part_ptr->nodes, rec_b->part_ptr->nodes);
if (size_a < 0)
return -1;
@@ -1545,11 +1545,11 @@ static List _create_part_info_list(partition_info_msg_t *part_info_ptr,
static List info_list = NULL;
int i, j2;
- if (!changed && info_list) {
+ if(!changed && info_list) {
return info_list;
}
- if (info_list)
+ if(info_list)
list_flush(info_list);
else
info_list = list_create(_part_info_list_del);
@@ -1601,15 +1601,15 @@ void _display_info_part(List info_list, popup_info_t *popup_win)
int j = 0;
int first_time = 0;
- if (!spec_info->search_info->gchar_data) {
+ if(!spec_info->search_info->gchar_data) {
//info = xstrdup("No pointer given!");
goto finished;
}
- if (!list_count(popup_win->grid_button_list))
+ if(!list_count(popup_win->grid_button_list))
first_time = 1;
need_refresh:
- if (!spec_info->display_widget) {
+ if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
spec_info->display_widget =
@@ -1622,7 +1622,7 @@ need_refresh:
itr = list_iterator_create(info_list);
while ((sview_part_info = (sview_part_info_t*) list_next(itr))) {
part_ptr = sview_part_info->part_ptr;
- if (!strcmp(part_ptr->name, name)) {
+ if(!strcmp(part_ptr->name, name)) {
j=0;
while(part_ptr->node_inx[j] >= 0) {
change_grid_color(
@@ -1641,8 +1641,8 @@ need_refresh:
list_iterator_destroy(itr);
post_setup_popup_grid_list(popup_win);
- if (!found) {
- if (!popup_win->not_found) {
+ if(!found) {
+ if(!popup_win->not_found) {
char *temp = "PARTITION DOESN'T EXSIST\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
@@ -1656,7 +1656,7 @@ need_refresh:
}
popup_win->not_found = true;
} else {
- if (popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
@@ -1690,22 +1690,22 @@ extern int get_new_info_part(partition_info_msg_t **part_ptr, int force)
static bool changed = 0;
static uint16_t last_flags = 0;
- if (g_part_info_ptr && !force
+ if(g_part_info_ptr && !force
&& ((now - last) < working_sview_config.refresh_delay)) {
- if (*part_ptr != g_part_info_ptr)
+ if(*part_ptr != g_part_info_ptr)
error_code = SLURM_SUCCESS;
*part_ptr = g_part_info_ptr;
- if (changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
last = now;
- if (working_sview_config.show_hidden)
+ if(working_sview_config.show_hidden)
show_flags |= SHOW_ALL;
if (g_part_info_ptr) {
- if (show_flags != last_flags)
+ if(show_flags != last_flags)
g_part_info_ptr->last_update = 0;
error_code = slurm_load_partitions(g_part_info_ptr->last_update,
&new_part_ptr, show_flags);
@@ -1726,7 +1726,7 @@ extern int get_new_info_part(partition_info_msg_t **part_ptr, int force)
last_flags = show_flags;
g_part_info_ptr = new_part_ptr;
- if (g_part_info_ptr && (*part_ptr != g_part_info_ptr))
+ if(g_part_info_ptr && (*part_ptr != g_part_info_ptr))
error_code = SLURM_SUCCESS;
*part_ptr = new_part_ptr;
@@ -1851,7 +1851,7 @@ extern GtkListStore *create_model_part(int type)
-1);
for(i = 0; i < NODE_STATE_END; i++) {
upper = node_state_string(i);
- if (!strcmp(upper, "UNKNOWN"))
+ if(!strcmp(upper, "UNKNOWN"))
continue;
gtk_list_store_append(model, &iter);
@@ -1885,12 +1885,12 @@ extern void admin_edit_part(GtkCellRendererText *cell,
int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
- if (!new_text || !strcmp(new_text, ""))
+ if(!new_text || !strcmp(new_text, ""))
goto no_input;
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
- if (column != SORTID_NODE_STATE) {
+ if(column != SORTID_NODE_STATE) {
slurm_init_part_desc_msg(part_msg);
gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter,
SORTID_NAME, &temp,
@@ -1901,9 +1901,9 @@ extern void admin_edit_part(GtkCellRendererText *cell,
}
type = _set_part_msg(part_msg, new_text, column);
- if (global_edit_error)
+ if(global_edit_error)
goto print_error;
- if (got_edit_signal) {
+ if(got_edit_signal) {
temp = got_edit_signal;
got_edit_signal = NULL;
admin_part(GTK_TREE_MODEL(treestore), &iter, temp);
@@ -1911,15 +1911,15 @@ extern void admin_edit_part(GtkCellRendererText *cell,
goto no_input;
}
- if (got_features_edit_signal) {
+ if(got_features_edit_signal) {
admin_part(GTK_TREE_MODEL(treestore), &iter, (char *)type);
goto no_input;
}
- if (column != SORTID_NODE_STATE && column != SORTID_FEATURES ) {
- if (old_text && !strcmp(old_text, new_text)) {
+ if(column != SORTID_NODE_STATE && column != SORTID_FEATURES ) {
+ if(old_text && !strcmp(old_text, new_text)) {
temp = g_strdup_printf("No change in value.");
- } else if (slurm_update_partition(part_msg)
+ } else if(slurm_update_partition(part_msg)
== SLURM_SUCCESS) {
gtk_tree_store_set(treestore, &iter, column,
new_text, -1);
@@ -1965,8 +1965,8 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
GtkTreePath *path = NULL;
/* reset */
- if (!table && !display_data) {
- if (display_widget)
+ if(!table && !display_data) {
+ if(display_widget)
gtk_widget_destroy(display_widget);
display_widget = NULL;
part_info_ptr = NULL;
@@ -1974,25 +1974,25 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
return;
}
- if (display_data)
+ if(display_data)
local_display_data = display_data;
- if (!table) {
+ if(!table) {
display_data_part->set_menu = local_display_data->set_menu;
return;
}
- if (display_widget && toggled) {
+ if(display_widget && toggled) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
goto display_it;
}
- if ((part_error_code = get_new_info_part(&part_info_ptr, force_refresh))
+ if((part_error_code = get_new_info_part(&part_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
// just goto the new info node
} else if (part_error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
view = ERROR_VIEW;
snprintf(error_char, 100, "slurm_load_partitions: %s",
@@ -2004,16 +2004,16 @@ extern void get_info_part(GtkTable *table, display_data_t *display_data)
goto end_it;
}
- if ((node_error_code = get_new_info_node(&node_info_ptr, force_refresh))
+ if((node_error_code = get_new_info_node(&node_info_ptr, force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if ((!display_widget || view == ERROR_VIEW)
+ if((!display_widget || view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA))
goto display_it;
changed = 0;
} else if (node_error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
view = ERROR_VIEW;
snprintf(error_char, 100, "slurm_load_node: %s",
@@ -2030,11 +2030,11 @@ display_it:
info_list = _create_part_info_list(part_info_ptr,
node_info_ptr,
changed);
- if (!info_list)
+ if(!info_list)
return;
/* set up the grid */
- if (display_widget && GTK_IS_TREE_VIEW(display_widget)
+ if(display_widget && GTK_IS_TREE_VIEW(display_widget)
&& gtk_tree_selection_count_selected_rows(
gtk_tree_view_get_selection(
GTK_TREE_VIEW(display_widget)))) {
@@ -2043,7 +2043,7 @@ display_it:
gtk_tree_view_get_cursor(GTK_TREE_VIEW(display_widget),
&path, &focus_column);
}
- if (!path) {
+ if(!path) {
itr = list_iterator_create(info_list);
while ((sview_part_info = list_next(itr))) {
part_ptr = sview_part_info->part_ptr;
@@ -2060,11 +2060,11 @@ display_it:
list_iterator_destroy(itr);
}
- if (view == ERROR_VIEW && display_widget) {
+ if(view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
}
- if (!display_widget) {
+ if(!display_widget) {
tree_view = create_treeview(local_display_data,
&grid_button_list);
@@ -2079,14 +2079,14 @@ display_it:
SORTID_CNT, SORTID_NAME, SORTID_COLOR);
}
- if (path)
+ if(path)
highlight_grid(GTK_TREE_VIEW(display_widget),
SORTID_NODE_INX, SORTID_COLOR_INX,
grid_button_list);
else
change_grid_color(grid_button_list, -1, -1,
MAKE_WHITE, true, 0);
- if (working_sview_config.grid_speedup) {
+ if(working_sview_config.grid_speedup) {
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
}
@@ -2119,23 +2119,23 @@ extern void specific_info_part(popup_info_t *popup_win)
ListIterator itr = NULL;
hostset_t hostset = NULL;
- if (!spec_info->display_widget)
+ if(!spec_info->display_widget)
setup_popup_info(popup_win, display_data_part, SORTID_CNT);
- if (spec_info->display_widget && popup_win->toggled) {
+ if(spec_info->display_widget && popup_win->toggled) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
goto display_it;
}
- if ((part_error_code = get_new_info_part(&part_info_ptr,
+ if((part_error_code = get_new_info_part(&part_info_ptr,
popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
} else if (part_error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
- if (spec_info->display_widget) {
+ if(spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
@@ -2149,18 +2149,18 @@ extern void specific_info_part(popup_info_t *popup_win)
goto end_it;
}
- if ((node_error_code = get_new_info_node(&node_info_ptr,
+ if((node_error_code = get_new_info_node(&node_info_ptr,
popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if ((!spec_info->display_widget
+ if((!spec_info->display_widget
|| spec_info->view == ERROR_VIEW)
|| (part_error_code != SLURM_NO_CHANGE_IN_DATA))
goto display_it;
changed = 0;
} else if (node_error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
- if (spec_info->display_widget)
+ if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
spec_info->view = ERROR_VIEW;
snprintf(error_char, 100, "slurm_load_node: %s",
@@ -2177,15 +2177,15 @@ display_it:
info_list = _create_part_info_list(part_info_ptr,
node_info_ptr,
changed);
- if (!info_list)
+ if(!info_list)
return;
- if (spec_info->view == ERROR_VIEW && spec_info->display_widget) {
+ if(spec_info->view == ERROR_VIEW && spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
- if (spec_info->type != INFO_PAGE && !spec_info->display_widget) {
+ if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
@@ -2205,7 +2205,7 @@ display_it:
setup_popup_grid_list(popup_win);
spec_info->view = INFO_VIEW;
- if (spec_info->type == INFO_PAGE) {
+ if(spec_info->type == INFO_PAGE) {
_display_info_part(info_list, popup_win);
goto end_it;
}
@@ -2222,13 +2222,13 @@ display_it:
switch(spec_info->type) {
case RESV_PAGE:
case NODE_PAGE:
- if (!part_ptr->nodes)
+ if(!part_ptr->nodes)
continue;
- if (!(hostset = hostset_create(
+ if(!(hostset = hostset_create(
spec_info->search_info->gchar_data)))
continue;
- if (!hostset_intersects(hostset, part_ptr->nodes)) {
+ if(!hostset_intersects(hostset, part_ptr->nodes)) {
hostset_destroy(hostset);
continue;
}
@@ -2237,17 +2237,17 @@ display_it:
case PART_PAGE:
switch(spec_info->search_info->search_type) {
case SEARCH_PARTITION_NAME:
- if (!spec_info->search_info->gchar_data)
+ if(!spec_info->search_info->gchar_data)
continue;
- if (strcmp(part_ptr->name,
+ if(strcmp(part_ptr->name,
spec_info->search_info->gchar_data))
continue;
break;
case SEARCH_PARTITION_STATE:
- if (spec_info->search_info->int_data == NO_VAL)
+ if(spec_info->search_info->int_data == NO_VAL)
continue;
- if (part_ptr->state_up !=
+ if(part_ptr->state_up !=
spec_info->search_info->int_data)
continue;
break;
@@ -2258,10 +2258,10 @@ display_it:
break;
case BLOCK_PAGE:
case JOB_PAGE:
- if (!spec_info->search_info->gchar_data)
+ if(!spec_info->search_info->gchar_data)
continue;
- if (strcmp(part_ptr->name,
+ if(strcmp(part_ptr->name,
spec_info->search_info->gchar_data))
continue;
break;
@@ -2357,11 +2357,11 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
case NODE_PAGE:
gtk_tree_model_get(model, iter, SORTID_ONLY_LINE,
&only_line, -1);
- if (!only_line)
+ if(!only_line)
gtk_tree_model_get(model, iter,
SORTID_NODE_STATE, &state, -1);
- if (cluster_flags & CLUSTER_FLAG_BG) {
- if (!state || !strlen(state))
+ if(cluster_flags & CLUSTER_FLAG_BG) {
+ if(!state || !strlen(state))
snprintf(title, 100,
"Base partition(s) in partition %s",
name);
@@ -2371,7 +2371,7 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
"that are in '%s' state",
name, state);
} else {
- if (!state || !strlen(state))
+ if(!state || !strlen(state))
snprintf(title, 100, "Node(s) in partition %s ",
name);
else
@@ -2396,15 +2396,15 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info)
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info)
+ if(!strcmp(popup_win->spec_info->title, title)) {
break;
}
}
list_iterator_destroy(itr);
- if (!popup_win) {
- if (id == INFO_PAGE)
+ if(!popup_win) {
+ if(id == INFO_PAGE)
popup_win = create_popup_info(id, PART_PAGE, title);
else
popup_win = create_popup_info(PART_PAGE, id, title);
@@ -2434,14 +2434,14 @@ extern void popup_all_part(GtkTreeModel *model, GtkTreeIter *iter, int id)
g_free(name);
/* we want to include the parent's nodes here not just
the subset */
- if (gtk_tree_model_iter_parent(model, &par_iter, iter))
+ if(gtk_tree_model_iter_parent(model, &par_iter, iter))
gtk_tree_model_get(model, &par_iter,
SORTID_NODELIST, &name, -1);
else
gtk_tree_model_get(model, iter,
SORTID_NODELIST, &name, -1);
popup_win->spec_info->search_info->gchar_data = name;
- if (state && strlen(state)) {
+ if(state && strlen(state)) {
popup_win->spec_info->search_info->search_type =
SEARCH_NODE_STATE;
gtk_tree_model_get(
@@ -2493,11 +2493,11 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
part_msg->name = xstrdup(partid);
- if (!strcasecmp("Change Part State", type)) {
+ if(!strcasecmp("Change Part State", type)) {
GtkCellRenderer *renderer = NULL;
GtkTreeModel *model2 = GTK_TREE_MODEL(
create_model_part(SORTID_PART_STATE));
- if (!model2) {
+ if(!model2) {
g_print("In change part, no model set up for %d(%s)\n",
SORTID_PART_STATE, partid);
return;
@@ -2529,7 +2529,7 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
partid);
label = gtk_label_new(tmp_char);
edit_type = EDIT_PART_STATE;
- } else if (!strcasecmp("Edit Part", type)) {
+ } else if(!strcasecmp("Edit Part", type)) {
label = gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_OK, GTK_RESPONSE_OK);
gtk_window_set_default(GTK_WINDOW(popup), label);
@@ -2543,16 +2543,16 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
label = gtk_label_new(tmp_char);
edit_type = EDIT_EDIT;
entry = _admin_full_edit_part(part_msg, model, iter);
- } else if (!strncasecmp("Update", type, 6)) {
+ } else if(!strncasecmp("Update", type, 6)) {
char *old_features = NULL;
- if (got_features_edit_signal)
+ if(got_features_edit_signal)
old_features = got_features_edit_signal;
else
gtk_tree_model_get(model, iter, SORTID_FEATURES,
&old_features, -1);
update_features_node(GTK_DIALOG(popup),
nodelist, old_features);
- if (got_features_edit_signal) {
+ if(got_features_edit_signal) {
got_features_edit_signal = NULL;
xfree(old_features);
} else
@@ -2566,18 +2566,18 @@ extern void admin_part(GtkTreeModel *model, GtkTreeIter *iter, char *type)
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
- if (entry)
+ if(entry)
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(popup);
response = gtk_dialog_run (GTK_DIALOG(popup));
if (response == GTK_RESPONSE_OK) {
- if (global_edit_error)
+ if(global_edit_error)
temp = global_edit_error_msg;
- else if (!global_send_update_msg) {
+ else if(!global_send_update_msg) {
temp = g_strdup_printf("No change detected.");
- } else if (slurm_update_partition(part_msg)
+ } else if(slurm_update_partition(part_msg)
== SLURM_SUCCESS) {
temp = g_strdup_printf(
"Partition %s updated successfully",
@@ -2597,13 +2597,13 @@ end_it:
global_entry_changed = 0;
slurm_free_update_part_msg(part_msg);
gtk_widget_destroy(popup);
- if (got_edit_signal) {
+ if(got_edit_signal) {
type = got_edit_signal;
got_edit_signal = NULL;
admin_part(model, iter, type);
xfree(type);
}
- if (got_features_edit_signal) {
+ if(got_features_edit_signal) {
type = "Update Features";
admin_part(model, iter, type);
}
@@ -2615,9 +2615,9 @@ extern void cluster_change_part()
{
display_data_t *display_data = display_data_part;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case SORTID_NODES_ALLOWED:
display_data->name = "BPs Allowed Allocating";
@@ -2643,10 +2643,10 @@ extern void cluster_change_part()
}
display_data = options_data_part;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case BLOCK_PAGE:
display_data->name = "Blocks";
@@ -2656,17 +2656,17 @@ extern void cluster_change_part()
break;
}
- if (!display_data->name) {
- } else if (!strcmp(display_data->name, "Drain Nodes"))
+ if(!display_data->name) {
+ } else if(!strcmp(display_data->name, "Drain Nodes"))
display_data->name = "Drain Base Partitions";
- else if (!strcmp(display_data->name, "Resume Nodes"))
+ else if(!strcmp(display_data->name, "Resume Nodes"))
display_data->name = "Resume Base Partitions";
- else if (!strcmp(display_data->name, "Put Nodes Down"))
+ else if(!strcmp(display_data->name, "Put Nodes Down"))
display_data->name = "Put Base Partitions Down";
- else if (!strcmp(display_data->name, "Make Nodes Idle"))
+ else if(!strcmp(display_data->name, "Make Nodes Idle"))
display_data->name =
"Make Base Partitions Idle";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Update Node Features"))
display_data->name =
"Update Base Partitions Features";
@@ -2680,20 +2680,20 @@ extern void cluster_change_part()
break;
}
- if (!display_data->name) {
- } else if (!strcmp(display_data->name,
+ if(!display_data->name) {
+ } else if(!strcmp(display_data->name,
"Drain Base Partitions"))
display_data->name = "Drain Nodes";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Resume Base Partitions"))
display_data->name = "Resume Nodes";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Put Base Partitions Down"))
display_data->name = "Put Nodes Down";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Make Base Partitions Idle"))
display_data->name = "Make Nodes Idle";
- else if (!strcmp(display_data->name,
+ else if(!strcmp(display_data->name,
"Update Node Features"))
display_data->name =
"Update Base Partitions Features";
diff --git a/src/sview/popups.c b/src/sview/popups.c
index 692d5763dde0fb92c8eaec98bf63fc32ca816696..14bc883c99f06b5ceb712042c476b1e4e2cfb2ac 100644
--- a/src/sview/popups.c
+++ b/src/sview/popups.c
@@ -71,12 +71,12 @@ void _search_entry(sview_search_info_t *sview_search_info)
char *upper = NULL, *lower = NULL;
char *type;
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
type = "Base partition";
else
type = "Node";
- if (sview_search_info->int_data == NO_VAL &&
+ if(sview_search_info->int_data == NO_VAL &&
(!sview_search_info->gchar_data
|| !strlen(sview_search_info->gchar_data))) {
g_print("nothing given to search for.\n");
@@ -117,7 +117,7 @@ void _search_entry(sview_search_info_t *sview_search_info)
id = BLOCK_PAGE;
sview_search_info->int_data =
revert_num_unit(sview_search_info->gchar_data);
- if (sview_search_info->int_data == -1)
+ if(sview_search_info->int_data == -1)
return;
snprintf(title, 100, "Block(s) of size %d cnodes",
sview_search_info->int_data);
@@ -129,7 +129,7 @@ void _search_entry(sview_search_info_t *sview_search_info)
break;
case SEARCH_PARTITION_STATE:
id = PART_PAGE;
- if (sview_search_info->int_data)
+ if(sview_search_info->int_data)
snprintf(title, 100, "Partition(s) that are up");
else
snprintf(title, 100, "Partition(s) that are down");
@@ -162,14 +162,14 @@ void _search_entry(sview_search_info_t *sview_search_info)
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info)
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info)
+ if(!strcmp(popup_win->spec_info->title, title)) {
break;
}
}
list_iterator_destroy(itr);
- if (!popup_win) {
+ if(!popup_win) {
popup_win = create_popup_info(id, id, title);
} else {
gtk_window_present(GTK_WINDOW(popup_win->popup));
@@ -224,16 +224,16 @@ static void _layout_conf_ctl(GtkTreeStore *treestore,
List ret_list = NULL;
char *select_title = "";
- if (cluster_flags & CLUSTER_FLAG_BGL)
+ if(cluster_flags & CLUSTER_FLAG_BGL)
select_title = "Bluegene/L configuration";
- else if (cluster_flags & CLUSTER_FLAG_BGP)
+ else if(cluster_flags & CLUSTER_FLAG_BGP)
select_title = "Bluegene/P configuration";
- else if (cluster_flags & CLUSTER_FLAG_BGQ)
+ else if(cluster_flags & CLUSTER_FLAG_BGQ)
select_title = "Bluegene/Q configuration";
else
return;
- if (!slurm_ctl_conf_ptr)
+ if(!slurm_ctl_conf_ptr)
return;
slurm_make_time_str((time_t *)&slurm_ctl_conf_ptr->last_update,
@@ -243,7 +243,7 @@ static void _layout_conf_ctl(GtkTreeStore *treestore,
"Configuration data as of", temp_str, "bold");
ret_list = slurm_ctl_conf_2_key_pairs(slurm_ctl_conf_ptr);
- if (ret_list) {
+ if(ret_list) {
itr = list_iterator_create(ret_list);
while((key_pair = list_next(itr))) {
add_display_treestore_line(update, treestore, &iter,
@@ -511,15 +511,15 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
gtk_dialog_add_button(GTK_DIALOG(popup),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- if (!strcmp(name, "jobid")) {
+ if(!strcmp(name, "jobid")) {
sview_search_info.search_type = SEARCH_JOB_ID;
entry = create_entry();
label = gtk_label_new("Which job id?");
- } else if (!strcmp(name, "user_jobs")) {
+ } else if(!strcmp(name, "user_jobs")) {
sview_search_info.search_type = SEARCH_JOB_USER;
entry = create_entry();
label = gtk_label_new("Which user?");
- } else if (!strcmp(name, "state_jobs")) {
+ } else if(!strcmp(name, "state_jobs")) {
display_data_t pulldown_display_data[] = {
{G_TYPE_NONE, JOB_PENDING, "Pending", TRUE, -1},
{G_TYPE_NONE, JOB_CONFIGURING, "Configuring", TRUE, -1},
@@ -536,11 +536,11 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
sview_search_info.search_type = SEARCH_JOB_STATE;
entry = create_pulldown_combo(pulldown_display_data, JOB_END);
label = gtk_label_new("Which state?");
- } else if (!strcmp(name, "partition_name")) {
+ } else if(!strcmp(name, "partition_name")) {
sview_search_info.search_type = SEARCH_PARTITION_NAME;
entry = create_entry();
label = gtk_label_new("Which partition");
- } else if (!strcmp(name, "partition_state")) {
+ } else if(!strcmp(name, "partition_state")) {
display_data_t pulldown_display_data[] = {
{G_TYPE_NONE, PARTITION_UP, "Up", TRUE, -1},
{G_TYPE_NONE, PARTITION_DOWN, "Down", TRUE, -1},
@@ -552,16 +552,16 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
sview_search_info.search_type = SEARCH_PARTITION_STATE;
entry = create_pulldown_combo(pulldown_display_data, 5);
label = gtk_label_new("Which state?");
- } else if (!strcmp(name, "node_name")) {
+ } else if(!strcmp(name, "node_name")) {
sview_search_info.search_type = SEARCH_NODE_NAME;
entry = create_entry();
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
label = gtk_label_new("Which base partition(s)?\n"
"(ranged or comma separated)");
else
label = gtk_label_new("Which node(s)?\n"
"(ranged or comma separated)");
- } else if (!strcmp(name, "node_state")) {
+ } else if(!strcmp(name, "node_state")) {
display_data_t pulldown_display_data[] = {
{G_TYPE_NONE, NODE_STATE_DOWN, "Down", TRUE, -1},
{G_TYPE_NONE, NODE_STATE_ALLOCATED | NODE_STATE_DRAIN,
@@ -582,17 +582,17 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
sview_search_info.search_type = SEARCH_NODE_STATE;
entry = create_pulldown_combo(pulldown_display_data, PAGE_CNT);
label = gtk_label_new("Which state?");
- } else if ((cluster_flags & CLUSTER_FLAG_BG)
+ } else if((cluster_flags & CLUSTER_FLAG_BG)
&& !strcmp(name, "bg_block_name")) {
sview_search_info.search_type = SEARCH_BLOCK_NAME;
entry = create_entry();
label = gtk_label_new("Which block?");
- } else if ((cluster_flags & CLUSTER_FLAG_BG)
+ } else if((cluster_flags & CLUSTER_FLAG_BG)
&& !strcmp(name, "bg_block_size")) {
sview_search_info.search_type = SEARCH_BLOCK_SIZE;
entry = create_entry();
label = gtk_label_new("Which block size?");
- } else if ((cluster_flags & CLUSTER_FLAG_BG)
+ } else if((cluster_flags & CLUSTER_FLAG_BG)
&& !strcmp(name, "bg_block_state")) {
display_data_t pulldown_display_data[] = {
{G_TYPE_NONE, RM_PARTITION_FREE, "Free", TRUE, -1},
@@ -608,9 +608,9 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
};
display_data_t *display_data = pulldown_display_data;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BGL) {
+ if(cluster_flags & CLUSTER_FLAG_BGL) {
switch(display_data->id) {
case RM_PARTITION_BUSY:
display_data->name = "Busy";
@@ -627,7 +627,7 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
sview_search_info.search_type = SEARCH_BLOCK_STATE;
entry = create_pulldown_combo(pulldown_display_data, PAGE_CNT);
label = gtk_label_new("Which state?");
- } else if (!strcmp(name, "reservation_name")) {
+ } else if(!strcmp(name, "reservation_name")) {
sview_search_info.search_type = SEARCH_RESERVATION_NAME;
entry = create_entry();
label = gtk_label_new("Which reservation");
@@ -645,7 +645,7 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
response = gtk_dialog_run (GTK_DIALOG(popup));
if (response == GTK_RESPONSE_OK) {
- if (!sview_search_info.search_type)
+ if(!sview_search_info.search_type)
goto end_it;
switch(sview_search_info.search_type) {
@@ -653,13 +653,13 @@ extern void create_search_popup(GtkAction *action, gpointer user_data)
case SEARCH_JOB_STATE:
case SEARCH_NODE_STATE:
case SEARCH_PARTITION_STATE:
- if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(entry),
+ if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(entry),
&iter)) {
g_print("nothing selected\n");
return;
}
model = gtk_combo_box_get_model(GTK_COMBO_BOX(entry));
- if (!model) {
+ if(!model) {
g_print("nothing selected\n");
return;
}
@@ -816,7 +816,7 @@ extern void change_grid_popup(GtkAction *action, gpointer user_data)
working_sview_config.grid_vert =
gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(vert_sb));
- if ((width == working_sview_config.grid_x_width)
+ if((width == working_sview_config.grid_x_width)
&& (hori == working_sview_config.grid_hori)
&& (vert == working_sview_config.grid_vert)) {
temp = g_strdup_printf("Grid: Nothing changed.");
@@ -832,14 +832,14 @@ extern void change_grid_popup(GtkAction *action, gpointer user_data)
* current we need to remake the list so the
* table gets set up correctly, so destroy it
* here and it will be remade in get_system_stats(). */
- if ((width > working_sview_config.grid_x_width)
+ if((width > working_sview_config.grid_x_width)
&& grid_button_list) {
list_destroy(grid_button_list);
grid_button_list = NULL;
refresh = 1;
}
get_system_stats(main_grid_table);
- if (refresh)
+ if(refresh)
refresh_main(NULL, NULL);
}
gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
diff --git a/src/sview/resv_info.c b/src/sview/resv_info.c
index 9b373a9582aea1b5c29c8c45978dcf53595ae1bf..3a5341a0ce01f66dd9127e0253399969912d0920 100644
--- a/src/sview/resv_info.c
+++ b/src/sview/resv_info.c
@@ -211,13 +211,13 @@ static void _set_active_combo_resv(GtkComboBox *combo,
int action = 0;
gtk_tree_model_get(model, iter, type, &temp_char, -1);
- if (!temp_char)
+ if(!temp_char)
goto end_it;
switch(type) {
case SORTID_ACTION:
- if (!strcmp(temp_char, "none"))
+ if(!strcmp(temp_char, "none"))
action = 0;
- else if (!strcmp(temp_char, "remove"))
+ else if(!strcmp(temp_char, "remove"))
action = 1;
else
action = 0;
@@ -244,7 +244,7 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
/* need to clear global_edit_error here (just in case) */
global_edit_error = 0;
- if (!resv_msg)
+ if(!resv_msg)
return NULL;
switch(column) {
@@ -254,14 +254,14 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
break;
case SORTID_ACTION:
xfree(got_edit_signal);
- if (!strcasecmp(new_text, "None"))
+ if(!strcasecmp(new_text, "None"))
got_edit_signal = NULL;
else
got_edit_signal = xstrdup(new_text);
break;
case SORTID_DURATION:
temp_int = time_str2mins((char *)new_text);
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
resv_msg->duration = temp_int;
type = "duration";
@@ -277,7 +277,7 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
case SORTID_FLAGS:
f = _parse_flags(new_text);
type = "flags";
- if (f == (uint32_t)NO_VAL)
+ if(f == (uint32_t)NO_VAL)
goto return_error;
resv_msg->flags = f;
break;
@@ -289,7 +289,7 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
temp_int = strtol(new_text, (char **)NULL, 10);
type = "Node Count";
- if (temp_int <= 0)
+ if(temp_int <= 0)
goto return_error;
resv_msg->node_cnt = temp_int;
break;
@@ -314,7 +314,7 @@ static const char *_set_resv_msg(resv_desc_msg_t *resv_msg,
break;
}
- if (strcmp(type, "unknown"))
+ if(strcmp(type, "unknown"))
global_send_update_msg = 1;
return type;
@@ -341,15 +341,15 @@ static void _admin_edit_combo_box_resv(GtkComboBox *combo,
int column = 0;
char *name = NULL;
- if (!resv_msg)
+ if(!resv_msg)
return;
- if (!gtk_combo_box_get_active_iter(combo, &iter)) {
+ if(!gtk_combo_box_get_active_iter(combo, &iter)) {
g_print("nothing selected\n");
return;
}
model = gtk_combo_box_get_model(combo);
- if (!model) {
+ if(!model) {
g_print("nothing selected\n");
return;
}
@@ -368,14 +368,14 @@ static gboolean _admin_focus_out_resv(GtkEntry *entry,
GdkEventFocus *event,
resv_desc_msg_t *resv_msg)
{
- if (global_entry_changed) {
+ if(global_entry_changed) {
const char *col_name = NULL;
int type = gtk_entry_get_max_length(entry);
const char *name = gtk_entry_get_text(entry);
type -= DEFAULT_ENTRY_LENGTH;
col_name = _set_resv_msg(resv_msg, name, type);
- if (global_edit_error) {
- if (global_edit_error_msg)
+ if(global_edit_error) {
+ if(global_edit_error_msg)
g_free(global_edit_error_msg);
global_edit_error_msg = g_strdup_printf(
"Reservation %s %s can't be set to %s",
@@ -411,11 +411,11 @@ static GtkWidget *_admin_full_edit_resv(resv_desc_msg_t *resv_msg,
for(i = 0; i < SORTID_CNT; i++) {
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (!display_data->name)
+ if(!display_data->name)
continue;
- if (display_data->id != i)
+ if(display_data->id != i)
continue;
display_admin_edit(
table, resv_msg, &row, model, iter,
@@ -592,7 +592,7 @@ static void _update_info_resv(List info_list,
while(1) {
gtk_tree_store_set(GTK_TREE_STORE(model), &iter,
SORTID_UPDATED, 0, -1);
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -611,7 +611,7 @@ static void _update_info_resv(List info_list,
it is in the list */
gtk_tree_model_get(model, &iter, SORTID_NAME,
&resv_name, -1);
- if (!strcmp(resv_name, resv_ptr->name)) {
+ if(!strcmp(resv_name, resv_ptr->name)) {
/* update with new info */
g_free(resv_name);
_update_resv_record(sview_resv_info,
@@ -622,7 +622,7 @@ static void _update_info_resv(List info_list,
g_free(resv_name);
line++;
- if (!gtk_tree_model_iter_next(model, &iter)) {
+ if(!gtk_tree_model_iter_next(model, &iter)) {
break;
}
}
@@ -633,7 +633,7 @@ static void _update_info_resv(List info_list,
;
}
list_iterator_destroy(itr);
- if (host)
+ if(host)
free(host);
gtk_tree_path_free(path);
@@ -653,7 +653,7 @@ static int _sview_resv_sort_aval_dec(sview_resv_info_t* rec_a,
else if (size_a > size_b)
return 1;
- if (rec_a->resv_ptr->node_list && rec_b->resv_ptr->node_list) {
+ if(rec_a->resv_ptr->node_list && rec_b->resv_ptr->node_list) {
size_a = strcmp(rec_a->resv_ptr->node_list,
rec_b->resv_ptr->node_list);
if (size_a < 0)
@@ -672,10 +672,10 @@ static List _create_resv_info_list(reserve_info_msg_t *resv_info_ptr,
sview_resv_info_t *sview_resv_info_ptr = NULL;
reserve_info_t *resv_ptr = NULL;
- if (!changed && info_list)
+ if(!changed && info_list)
goto update_color;
- if (info_list)
+ if(info_list)
list_flush(info_list);
else
info_list = list_create(_resv_info_list_del);
@@ -712,13 +712,13 @@ void _display_info_resv(List info_list, popup_info_t *popup_win)
int update = 0;
int j = 0;
- if (!spec_info->search_info->gchar_data) {
+ if(!spec_info->search_info->gchar_data) {
//info = xstrdup("No pointer given!");
goto finished;
}
need_refresh:
- if (!spec_info->display_widget) {
+ if(!spec_info->display_widget) {
treeview = create_treeview_2cols_attach_to_table(
popup_win->table);
spec_info->display_widget =
@@ -731,7 +731,7 @@ need_refresh:
itr = list_iterator_create(info_list);
while ((sview_resv_info = (sview_resv_info_t*) list_next(itr))) {
resv_ptr = sview_resv_info->resv_ptr;
- if (!strcmp(resv_ptr->name, name)) {
+ if(!strcmp(resv_ptr->name, name)) {
j=0;
while(resv_ptr->node_inx[j] >= 0) {
change_grid_color(
@@ -750,8 +750,8 @@ need_refresh:
list_iterator_destroy(itr);
post_setup_popup_grid_list(popup_win);
- if (!found) {
- if (!popup_win->not_found) {
+ if(!found) {
+ if(!popup_win->not_found) {
char *temp = "RESERVATION DOESN'T EXSIST\n";
GtkTreeIter iter;
GtkTreeModel *model = NULL;
@@ -765,7 +765,7 @@ need_refresh:
}
popup_win->not_found = true;
} else {
- if (popup_win->not_found) {
+ if(popup_win->not_found) {
popup_win->not_found = false;
gtk_widget_destroy(spec_info->display_widget);
@@ -798,12 +798,12 @@ extern int get_new_info_resv(reserve_info_msg_t **info_ptr,
static time_t last;
static bool changed = 0;
- if (g_resv_info_ptr && !force
+ if(g_resv_info_ptr && !force
&& ((now - last) < working_sview_config.refresh_delay)) {
- if (*info_ptr != g_resv_info_ptr)
+ if(*info_ptr != g_resv_info_ptr)
error_code = SLURM_SUCCESS;
*info_ptr = g_resv_info_ptr;
- if (changed)
+ if(changed)
return SLURM_SUCCESS;
return error_code;
}
@@ -827,7 +827,7 @@ extern int get_new_info_resv(reserve_info_msg_t **info_ptr,
g_resv_info_ptr = new_resv_ptr;
- if (g_resv_info_ptr && (*info_ptr != g_resv_info_ptr))
+ if(g_resv_info_ptr && (*info_ptr != g_resv_info_ptr))
error_code = SLURM_SUCCESS;
*info_ptr = g_resv_info_ptr;
@@ -876,7 +876,7 @@ extern void admin_edit_resv(GtkCellRendererText *cell,
int column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell),
"column"));
- if (!new_text || !strcmp(new_text, ""))
+ if(!new_text || !strcmp(new_text, ""))
goto no_input;
gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path);
@@ -890,10 +890,10 @@ extern void admin_edit_resv(GtkCellRendererText *cell,
g_free(temp);
type = _set_resv_msg(resv_msg, new_text, column);
- if (global_edit_error)
+ if(global_edit_error)
goto print_error;
- if (got_edit_signal) {
+ if(got_edit_signal) {
temp = got_edit_signal;
got_edit_signal = NULL;
admin_resv(GTK_TREE_MODEL(treestore), &iter, temp);
@@ -901,16 +901,16 @@ extern void admin_edit_resv(GtkCellRendererText *cell,
goto no_input;
}
- if (old_text && !strcmp(old_text, new_text)) {
+ if(old_text && !strcmp(old_text, new_text)) {
temp = g_strdup_printf("No change in value.");
- } else if (slurm_update_reservation(resv_msg)
+ } else if(slurm_update_reservation(resv_msg)
== SLURM_SUCCESS) {
gtk_tree_store_set(treestore, &iter, column, new_text, -1);
temp = g_strdup_printf("Reservation %s %s changed to %s",
resv_msg->name,
type,
new_text);
- } else if (errno == ESLURM_DISABLED) {
+ } else if(errno == ESLURM_DISABLED) {
temp = g_strdup_printf(
"Can only edit %s on reservations not yet started.",
type);
@@ -953,33 +953,33 @@ extern void get_info_resv(GtkTable *table, display_data_t *display_data)
GtkTreePath *path = NULL;
/* reset */
- if (!table && !display_data) {
- if (display_widget)
+ if(!table && !display_data) {
+ if(display_widget)
gtk_widget_destroy(display_widget);
display_widget = NULL;
resv_info_ptr = NULL;
return;
}
- if (display_data)
+ if(display_data)
local_display_data = display_data;
- if (!table) {
+ if(!table) {
display_data_resv->set_menu = local_display_data->set_menu;
return;
}
- if (display_widget && toggled) {
+ if(display_widget && toggled) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
goto display_it;
}
error_code = get_new_info_resv(&resv_info_ptr, force_refresh);
- if (error_code == SLURM_NO_CHANGE_IN_DATA) {
+ if(error_code == SLURM_NO_CHANGE_IN_DATA) {
changed = 0;
} else if (error_code != SLURM_SUCCESS) {
- if (view == ERROR_VIEW)
+ if(view == ERROR_VIEW)
goto end_it;
- if (display_widget)
+ if(display_widget)
gtk_widget_destroy(display_widget);
view = ERROR_VIEW;
sprintf(error_char, "slurm_load_reservations: %s",
@@ -993,10 +993,10 @@ extern void get_info_resv(GtkTable *table, display_data_t *display_data)
display_it:
info_list = _create_resv_info_list(resv_info_ptr, changed);
- if (!info_list)
+ if(!info_list)
return;
/* set up the grid */
- if (display_widget && GTK_IS_TREE_VIEW(display_widget)
+ if(display_widget && GTK_IS_TREE_VIEW(display_widget)
&& gtk_tree_selection_count_selected_rows(
gtk_tree_view_get_selection(
GTK_TREE_VIEW(display_widget)))) {
@@ -1005,7 +1005,7 @@ display_it:
gtk_tree_view_get_cursor(GTK_TREE_VIEW(display_widget),
&path, &focus_column);
}
- if (!path) {
+ if(!path) {
itr = list_iterator_create(info_list);
while ((sview_resv_info_ptr = list_next(itr))) {
resv_ptr = sview_resv_info_ptr->resv_ptr;
@@ -1026,11 +1026,11 @@ display_it:
list_iterator_destroy(itr);
}
- if (view == ERROR_VIEW && display_widget) {
+ if(view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
}
- if (!display_widget) {
+ if(!display_widget) {
tree_view = create_treeview(local_display_data,
&grid_button_list);
@@ -1045,14 +1045,14 @@ display_it:
SORTID_CNT, SORTID_TIME_START, SORTID_COLOR);
}
- if (path)
+ if(path)
highlight_grid(GTK_TREE_VIEW(display_widget),
SORTID_NODE_INX, SORTID_COLOR_INX,
grid_button_list);
else
change_grid_color(grid_button_list, -1, -1,
MAKE_WHITE, true, 0);
- if (working_sview_config.grid_speedup) {
+ if(working_sview_config.grid_speedup) {
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
}
@@ -1084,27 +1084,27 @@ extern void specific_info_resv(popup_info_t *popup_win)
hostset_t hostset = NULL;
ListIterator itr = NULL;
- if (!spec_info->display_widget) {
+ if(!spec_info->display_widget) {
setup_popup_info(popup_win, display_data_resv, SORTID_CNT);
}
- if (spec_info->display_widget && popup_win->toggled) {
+ if(spec_info->display_widget && popup_win->toggled) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
goto display_it;
}
- if ((resv_error_code =
+ if((resv_error_code =
get_new_info_resv(&resv_info_ptr, popup_win->force_refresh))
== SLURM_NO_CHANGE_IN_DATA) {
- if (!spec_info->display_widget || spec_info->view == ERROR_VIEW)
+ if(!spec_info->display_widget || spec_info->view == ERROR_VIEW)
goto display_it;
changed = 0;
} else if (resv_error_code != SLURM_SUCCESS) {
- if (spec_info->view == ERROR_VIEW)
+ if(spec_info->view == ERROR_VIEW)
goto end_it;
spec_info->view = ERROR_VIEW;
- if (spec_info->display_widget)
+ if(spec_info->display_widget)
gtk_widget_destroy(spec_info->display_widget);
sprintf(error_char, "get_new_info_resv: %s",
slurm_strerror(slurm_get_errno()));
@@ -1121,14 +1121,14 @@ display_it:
resv_list = _create_resv_info_list(resv_info_ptr, changed);
- if (!resv_list)
+ if(!resv_list)
return;
- if (spec_info->view == ERROR_VIEW && spec_info->display_widget) {
+ if(spec_info->view == ERROR_VIEW && spec_info->display_widget) {
gtk_widget_destroy(spec_info->display_widget);
spec_info->display_widget = NULL;
}
- if (spec_info->type != INFO_PAGE && !spec_info->display_widget) {
+ if(spec_info->type != INFO_PAGE && !spec_info->display_widget) {
tree_view = create_treeview(local_display_data,
&popup_win->grid_button_list);
spec_info->display_widget =
@@ -1146,7 +1146,7 @@ display_it:
setup_popup_grid_list(popup_win);
spec_info->view = INFO_VIEW;
- if (spec_info->type == INFO_PAGE) {
+ if(spec_info->type == INFO_PAGE) {
_display_info_resv(resv_list, popup_win);
goto end_it;
}
@@ -1163,29 +1163,29 @@ display_it:
case PART_PAGE:
case BLOCK_PAGE:
case NODE_PAGE:
- if (!resv_ptr->node_list)
+ if(!resv_ptr->node_list)
continue;
- if (!(hostset = hostset_create(search_info->gchar_data)))
+ if(!(hostset = hostset_create(search_info->gchar_data)))
continue;
- if (!hostset_intersects(hostset, resv_ptr->node_list)) {
+ if(!hostset_intersects(hostset, resv_ptr->node_list)) {
hostset_destroy(hostset);
continue;
}
hostset_destroy(hostset);
break;
case JOB_PAGE:
- if (strcmp(resv_ptr->name,
+ if(strcmp(resv_ptr->name,
search_info->gchar_data))
continue;
break;
case RESV_PAGE:
switch(search_info->search_type) {
case SEARCH_RESERVATION_NAME:
- if (!search_info->gchar_data)
+ if(!search_info->gchar_data)
continue;
- if (strcmp(resv_ptr->name,
+ if(strcmp(resv_ptr->name,
search_info->gchar_data))
continue;
break;
@@ -1280,7 +1280,7 @@ extern void popup_all_resv(GtkTreeModel *model, GtkTreeIter *iter, int id)
snprintf(title, 100, "Job(s) in reservation %s", name);
break;
case NODE_PAGE:
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
snprintf(title, 100,
"Base partitions(s) in reservation %s",
name);
@@ -1303,15 +1303,15 @@ extern void popup_all_resv(GtkTreeModel *model, GtkTreeIter *iter, int id)
itr = list_iterator_create(popup_list);
while((popup_win = list_next(itr))) {
- if (popup_win->spec_info)
- if (!strcmp(popup_win->spec_info->title, title)) {
+ if(popup_win->spec_info)
+ if(!strcmp(popup_win->spec_info->title, title)) {
break;
}
}
list_iterator_destroy(itr);
- if (!popup_win) {
- if (id == INFO_PAGE)
+ if(!popup_win) {
+ if(id == INFO_PAGE)
popup_win = create_popup_info(id, RESV_PAGE, title);
else
popup_win = create_popup_info(RESV_PAGE, id, title);
@@ -1382,7 +1382,7 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
resv_msg->name = xstrdup(resvid);
- if (!strcasecmp("Remove", type)) {
+ if(!strcasecmp("Remove", type)) {
resv_name_msg.name = resvid;
label = gtk_dialog_add_button(GTK_DIALOG(popup),
@@ -1415,7 +1415,7 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
label, FALSE, FALSE, 0);
- if (entry)
+ if(entry)
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
entry, TRUE, TRUE, 0);
gtk_widget_show_all(popup);
@@ -1424,7 +1424,7 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
if (response == GTK_RESPONSE_OK) {
switch(edit_type) {
case EDIT_REMOVE:
- if (slurm_delete_reservation(&resv_name_msg)
+ if(slurm_delete_reservation(&resv_name_msg)
== SLURM_SUCCESS) {
temp = g_strdup_printf(
"Reservation %s removed successfully",
@@ -1438,12 +1438,12 @@ extern void admin_resv(GtkTreeModel *model, GtkTreeIter *iter, char *type)
g_free(temp);
break;
case EDIT_EDIT:
- if (got_edit_signal)
+ if(got_edit_signal)
goto end_it;
- if (!global_send_update_msg) {
+ if(!global_send_update_msg) {
temp = g_strdup_printf("No change detected.");
- } else if (slurm_update_reservation(resv_msg)
+ } else if(slurm_update_reservation(resv_msg)
== SLURM_SUCCESS) {
temp = g_strdup_printf(
"Reservation %s updated successfully",
@@ -1466,7 +1466,7 @@ end_it:
global_entry_changed = 0;
slurm_free_resv_desc_msg(resv_msg);
gtk_widget_destroy(popup);
- if (got_edit_signal) {
+ if(got_edit_signal) {
type = got_edit_signal;
got_edit_signal = NULL;
admin_resv(model, iter, type);
@@ -1479,9 +1479,9 @@ extern void cluster_change_resv()
{
display_data_t *display_data = display_data_resv;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case SORTID_NODELIST:
display_data->name = "BP List";
@@ -1501,10 +1501,10 @@ extern void cluster_change_resv()
}
display_data = options_data_resv;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case BLOCK_PAGE:
display_data->name = "Blocks";
diff --git a/src/sview/submit_info.c b/src/sview/submit_info.c
index 615bb58f3a64089bf4455c67411d464e0995de91..088f28c8de8c89dcf615d51b2919cda648d12063 100644
--- a/src/sview/submit_info.c
+++ b/src/sview/submit_info.c
@@ -105,13 +105,13 @@ extern void row_clicked_submit(GtkTreeView *tree_view,
GtkWidget *popup = NULL;
GtkWidget *label = NULL;
char *info = NULL;
- if (line == -1) {
+ if(line == -1) {
g_error("problem getting line number");
return;
}
/* part_ptr = &new_part_ptr->partition_array[line]; */
- /* if (!(info = slurm_sprint_partition_info(part_ptr, 0))) { */
+ /* if(!(info = slurm_sprint_partition_info(part_ptr, 0))) { */
/* info = xmalloc(100); */
/* sprintf(info, "Problem getting partition info for %s", */
/* part_ptr->name); */
diff --git a/src/sview/sview.c b/src/sview/sview.c
index d1fa19ba64713b7a4007f1a409e3be8447208a4a..52b2b3bf19b245e419ab70f5579c3f059a783d5e 100644
--- a/src/sview/sview.c
+++ b/src/sview/sview.c
@@ -156,7 +156,7 @@ void *_page_thr(void *arg)
/* DEF_TIMERS; */
xfree(page);
- if (!grid_init) {
+ if(!grid_init) {
/* we need to signal any threads that are waiting */
g_mutex_lock(grid_mutex);
g_cond_signal(grid_cond);
@@ -168,7 +168,7 @@ void *_page_thr(void *arg)
g_mutex_unlock(grid_mutex);
/* if the grid isn't there just return */
- if (!grid_init)
+ if(!grid_init)
return NULL;
}
@@ -189,7 +189,7 @@ void *_page_thr(void *arg)
/* g_print("got for initeration: %s\n", TIME_STR); */
sleep(working_sview_config.refresh_delay);
g_static_mutex_lock(&sview_mutex);
- if (thread_count > 1) {
+ if(thread_count > 1) {
g_static_mutex_unlock(&sview_mutex);
break;
}
@@ -229,7 +229,7 @@ void *_grid_init_thr(void *arg)
//gdk_flush();
gdk_threads_leave();
- if (rc != SLURM_SUCCESS)
+ if(rc != SLURM_SUCCESS)
sleep(working_sview_config.refresh_delay);
else
grid_init = 1;
@@ -249,7 +249,7 @@ static void _page_switched(GtkNotebook *notebook,
{
GtkScrolledWindow *window = GTK_SCROLLED_WINDOW(
gtk_notebook_get_nth_page(notebook, page_num));
- if (!window)
+ if(!window)
return;
GtkBin *bin = GTK_BIN(&window->container);
GtkViewport *view = GTK_VIEWPORT(bin->child);
@@ -261,9 +261,9 @@ static void _page_switched(GtkNotebook *notebook,
static int started_grid_init = 0;
/* make sure we aren't adding the page, and really asking for info */
- if (adding)
+ if(adding)
return;
- else if (!grid_init && !started_grid_init) {
+ else if(!grid_init && !started_grid_init) {
/* start the thread to make the grid only once */
if (!g_thread_create(_grid_init_thr, notebook, FALSE, &error)) {
g_printerr ("Failed to create grid init thread: %s\n",
@@ -273,22 +273,22 @@ static void _page_switched(GtkNotebook *notebook,
started_grid_init = 1;
}
- if (page_running != -1)
+ if(page_running != -1)
page_running = page_num;
for(i=0; i<PAGE_CNT; i++) {
- if ((main_display_data[i].id == -1)
+ if((main_display_data[i].id == -1)
|| (main_display_data[i].extra == page_num))
break;
}
- if (main_display_data[i].extra != page_num)
+ if(main_display_data[i].extra != page_num)
return;
- if (main_display_data[i].get_info) {
+ if(main_display_data[i].get_info) {
page_running = i;
/* If we return here we would not clear the grid which
may need to be done. */
- /* if (toggled || force_refresh) { */
+ /* if(toggled || force_refresh) { */
/* (main_display_data[i].get_info)( */
/* table, &main_display_data[i]); */
/* return; */
@@ -309,10 +309,10 @@ static void _page_switched(GtkNotebook *notebook,
static void _set_admin_mode(GtkToggleAction *action)
{
// GtkAction *admin_action = NULL;
- if (action)
+ if(action)
working_sview_config.admin_mode
= gtk_toggle_action_get_active(action);
- if (!working_sview_config.admin_mode)
+ if(!working_sview_config.admin_mode)
gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
STATUS_ADMIN_MODE);
else
@@ -327,10 +327,10 @@ static void _set_admin_mode(GtkToggleAction *action)
static void _set_grid(GtkToggleAction *action)
{
- if (action)
+ if(action)
working_sview_config.show_grid
= gtk_toggle_action_get_active(action);
- if (!working_sview_config.show_grid)
+ if(!working_sview_config.show_grid)
gtk_widget_hide(grid_window);
else
gtk_widget_show(grid_window);
@@ -341,10 +341,10 @@ static void _set_grid(GtkToggleAction *action)
static void _set_hidden(GtkToggleAction *action)
{
char *tmp;
- if (action)
+ if(action)
working_sview_config.show_hidden
= gtk_toggle_action_get_active(action);
- if (!working_sview_config.show_hidden)
+ if(!working_sview_config.show_hidden)
tmp = g_strdup_printf(
"Hidden partitions and their jobs are now hidden");
else
@@ -360,10 +360,10 @@ static void _set_hidden(GtkToggleAction *action)
static void _set_ruled(GtkToggleAction *action)
{
char *tmp;
- if (action)
+ if(action)
working_sview_config.ruled_treeview
= gtk_toggle_action_get_active(action);
- if (!working_sview_config.ruled_treeview)
+ if(!working_sview_config.ruled_treeview)
tmp = g_strdup_printf(
"Tables not ruled");
else
@@ -387,7 +387,7 @@ static void _reconfigure(GtkToggleAction *action)
{
char *temp = NULL;
- if (!slurm_reconfigure())
+ if(!slurm_reconfigure())
temp = g_strdup_printf(
"Reconfigure sent to slurm successfully");
else
@@ -403,15 +403,15 @@ static void _get_current_debug(GtkRadioAction *action)
static GtkAction *debug_action = NULL;
int err_code = get_new_info_config(&slurm_ctl_conf_ptr);
- if (err_code != SLURM_ERROR)
+ if(err_code != SLURM_ERROR)
debug_level = slurm_ctl_conf_ptr->slurmctld_debug;
- if (!debug_action)
+ if(!debug_action)
debug_action = gtk_action_group_get_action(
menu_action_group, "debug_quiet");
/* Since this is the inital value we don't signal anything
changed so we need to make it happen here */
- if (debug_level == 0)
+ if(debug_level == 0)
debug_inited = 1;
sview_radio_action_set_current_value(GTK_RADIO_ACTION(debug_action),
debug_level);
@@ -427,13 +427,13 @@ static void _set_debug(GtkRadioAction *action,
beginning. This gets called when the value is
changed. And since we don't set it at the beginning we
need to check it here. */
- if (!debug_inited) {
+ if(!debug_inited) {
debug_inited = 1;
return;
}
level = gtk_radio_action_get_current_value(action);
- if (!slurm_set_debug_level(level)) {
+ if(!slurm_set_debug_level(level)) {
temp = g_strdup_printf(
"Slurmctld debug level is now set to %d", level);
} else
@@ -454,7 +454,7 @@ static void _init_pages()
{
int i;
for(i=0; i<PAGE_CNT; i++) {
- if (!main_display_data[i].get_info)
+ if(!main_display_data[i].get_info)
continue;
(main_display_data[i].get_info)(NULL, &main_display_data[i]);
}
@@ -468,15 +468,15 @@ static gboolean _delete(GtkWidget *widget,
gtk_main_quit();
ba_fini();
- if (popup_list)
+ if(popup_list)
list_destroy(popup_list);
- if (grid_button_list)
+ if(grid_button_list)
list_destroy(grid_button_list);
- if (multi_button_list)
+ if(multi_button_list)
list_destroy(multi_button_list);
- if (signal_params_list)
+ if(signal_params_list)
list_destroy(signal_params_list);
- if (cluster_list)
+ if(cluster_list)
list_destroy(cluster_list);
xfree(orig_cluster_name);
return FALSE;
@@ -495,7 +495,7 @@ static char *_get_ui_description()
" <menuitem action='jobid'/>"
" <menuitem action='user_jobs'/>"
" <menuitem action='state_jobs'/>");
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
xstrcat(ui_description,
" <separator/>"
" <menuitem action='bg_block_name'/>"
@@ -507,7 +507,7 @@ static char *_get_ui_description()
" <menuitem action='partition_name'/>"
" <menuitem action='partition_state'/>"
" <separator/>");
- if (cluster_flags & CLUSTER_FLAG_BG)
+ if(cluster_flags & CLUSTER_FLAG_BG)
xstrcat(ui_description,
" <menuitem action='node_name_bg'/>"
" <menuitem action='node_state_bg'/>");
@@ -540,7 +540,7 @@ static char *_get_ui_description()
" <menuitem action='grid'/>"
" <menuitem action='hidden'/>"
" <menuitem action='ruled'/>");
- if (!(cluster_flags & CLUSTER_FLAG_BG))
+ if(!(cluster_flags & CLUSTER_FLAG_BG))
xstrcat(ui_description,
" <menuitem action='grid_specs'/>");
@@ -718,7 +718,7 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
gtk_action_group_add_actions(menu_action_group, entries,
G_N_ELEMENTS(entries), window);
- //if (cluster_flags & CLUSTER_FLAG_BG)
+ //if(cluster_flags & CLUSTER_FLAG_BG)
gtk_action_group_add_actions(menu_action_group, bg_entries,
G_N_ELEMENTS(bg_entries), window);
//else
@@ -803,19 +803,19 @@ static void _get_info_tabs(GtkTable *table, display_data_t *display_data)
int i;
static bool init = 0;
- if (!table || init) {
+ if(!table || init) {
return;
}
init = 1;
/* This only needs to be ran once */
for(i=0; i<PAGE_CNT; i++) {
- if (main_display_data[i].id == -1)
+ if(main_display_data[i].id == -1)
break;
- if (!main_display_data[i].name || (i == TAB_PAGE))
+ if(!main_display_data[i].name || (i == TAB_PAGE))
continue;
- if (!default_sview_config.page_check_widget[i])
+ if(!default_sview_config.page_check_widget[i])
default_sview_config.page_check_widget[i] =
gtk_check_button_new_with_label(
main_display_data[i].name);
@@ -851,18 +851,18 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
int rc;
bool got_grid = 0;
- if (!gtk_combo_box_get_active_iter(combo, &iter)) {
+ if(!gtk_combo_box_get_active_iter(combo, &iter)) {
g_print("nothing selected\n");
return;
}
model = gtk_combo_box_get_model(combo);
- if (!model) {
+ if(!model) {
g_print("nothing selected\n");
return;
}
gtk_tree_model_get(model, &iter, 1, &cluster_rec, -1);
- if (!cluster_rec) {
+ if(!cluster_rec) {
g_print("no cluster_rec pointer here!");
return;
}
@@ -871,8 +871,8 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
legitimate change, so there isn't a need to check if we are
going back to the same cluster we were just at.
*/
- /* if (working_cluster_rec) { */
- /* if (!strcmp(cluster_rec->name, working_cluster_rec->name)) */
+ /* if(working_cluster_rec) { */
+ /* if(!strcmp(cluster_rec->name, working_cluster_rec->name)) */
/* return; */
/* } */
@@ -893,7 +893,7 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
g_step_info_ptr = NULL;
/* set up working_cluster_rec */
- if (cluster_dims > 1) {
+ if(cluster_dims > 1) {
/* reset from a multi-dim cluster */
working_sview_config.grid_x_width =
default_sview_config.grid_x_width;
@@ -901,9 +901,9 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
working_sview_config.grid_vert = default_sview_config.grid_vert;
}
- if (!orig_cluster_name)
+ if(!orig_cluster_name)
orig_cluster_name = slurm_get_cluster_name();
- if (!strcmp(cluster_rec->name, orig_cluster_name))
+ if(!strcmp(cluster_rec->name, orig_cluster_name))
working_cluster_rec = NULL;
else
working_cluster_rec = cluster_rec;
@@ -912,9 +912,9 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
display_data = main_display_data;
while(display_data++) {
- if (display_data->id == -1)
+ if(display_data->id == -1)
break;
- if (cluster_flags & CLUSTER_FLAG_BG) {
+ if(cluster_flags & CLUSTER_FLAG_BG) {
switch(display_data->id) {
case BLOCK_PAGE:
display_data->show = TRUE;
@@ -959,7 +959,7 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
cluster_change_node();
/* destroy old stuff */
- if (grid_button_list) {
+ if(grid_button_list) {
list_destroy(grid_button_list);
grid_button_list = NULL;
got_grid = 1;
@@ -967,9 +967,9 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
ba_fini();
/* sorry popups can't survive a cluster change */
- if (popup_list)
+ if(popup_list)
list_flush(popup_list);
- if (signal_params_list)
+ if(signal_params_list)
list_flush(signal_params_list);
/* change the node tab name if needed */
@@ -991,14 +991,14 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
node_tab = NULL;
g_object_get(node_tab, "focus-child", &node_tab, NULL);
#endif
- if (node_tab)
+ if(node_tab)
gtk_label_set_text(GTK_LABEL(node_tab),
main_display_data[NODE_PAGE].name);
/* The name in the visible tabs is easier since it is really
just a button with a label on it.
*/
- if (default_sview_config.page_check_widget[NODE_PAGE]) {
+ if(default_sview_config.page_check_widget[NODE_PAGE]) {
gtk_button_set_label(GTK_BUTTON(default_sview_config.
page_check_widget[NODE_PAGE]),
main_display_data[NODE_PAGE].name);
@@ -1006,15 +1006,15 @@ extern void _change_cluster_main(GtkComboBox *combo, gpointer extra)
/* reinit */
rc = get_system_stats(main_grid_table);
- if (rc == SLURM_SUCCESS) {
+ if(rc == SLURM_SUCCESS) {
/* It turns out if we didn't have the grid before the
new grid doesn't get set up correctly. Redoing the
system_stats fixes it. There is probably a better
way of doing this, but it doesn't happen very often
and isn't that bad to handle every once in a while.
*/
- if (!got_grid) {
- if (grid_button_list) {
+ if(!got_grid) {
+ if(grid_button_list) {
list_destroy(grid_button_list);
grid_button_list = NULL;
}
@@ -1040,17 +1040,17 @@ static GtkWidget *_create_cluster_combo()
bool got_db = slurm_get_is_association_based_accounting();
int count = 0, spot = 0;
- if (!got_db)
+ if(!got_db)
return NULL;
cluster_list = slurmdb_get_info_cluster(NULL);
- if (!cluster_list || !list_count(cluster_list)) {
- if (cluster_list)
+ if(!cluster_list || !list_count(cluster_list)) {
+ if(cluster_list)
list_destroy(cluster_list);
return NULL;
}
- if (!orig_cluster_name)
+ if(!orig_cluster_name)
orig_cluster_name = slurm_get_cluster_name();
model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
@@ -1066,7 +1066,7 @@ static GtkWidget *_create_cluster_combo()
0, cluster_rec->name,
1, cluster_rec,
-1);
- if (!strcmp(cluster_rec->name, orig_cluster_name)) {
+ if(!strcmp(cluster_rec->name, orig_cluster_name)) {
/* clear it since we found the current cluster */
working_cluster_rec = NULL;
spot = count;
@@ -1092,7 +1092,7 @@ static GtkWidget *_create_cluster_combo()
extern void refresh_main(GtkAction *action, gpointer user_data)
{
int page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_notebook));
- if (page == -1)
+ if(page == -1)
g_error("no pages in notebook for refresh\n");
force_refresh = 1;
_page_switched(GTK_NOTEBOOK(main_notebook), NULL, page, NULL);
@@ -1108,24 +1108,24 @@ extern void toggle_tab_visiblity(GtkToggleButton *toggle_button,
/* When calling the set active below it signals this again, so
to avoid an infinite loop we will just fall out.
*/
- if (already_here)
+ if(already_here)
return;
already_here = true;
page_num = display_data->extra;
visible_tab = gtk_notebook_get_nth_page(
GTK_NOTEBOOK(main_notebook), page_num);
- if (toggle_button) {
+ if(toggle_button) {
working_sview_config.page_visible[page_num] =
gtk_toggle_button_get_active(toggle_button);
}
- if (working_sview_config.page_visible[page_num])
+ if(working_sview_config.page_visible[page_num])
gtk_widget_show(visible_tab);
else
gtk_widget_hide(visible_tab);
- if (default_sview_config.page_check_widget[page_num])
+ if(default_sview_config.page_check_widget[page_num])
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(default_sview_config.
page_check_widget[page_num]),
@@ -1146,7 +1146,7 @@ extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
/* single click with the right mouse button? */
gtk_notebook_set_current_page(GTK_NOTEBOOK(main_notebook),
display_data->extra);
- if ((display_data->extra != TAB_PAGE) && (event->button == 3)) {
+ if((display_data->extra != TAB_PAGE) && (event->button == 3)) {
right_button_pressed(NULL, NULL, event,
&signal_params, TAB_CLICKED);
}
@@ -1155,7 +1155,7 @@ extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
extern void close_tab(GtkWidget *widget, GdkEventButton *event,
display_data_t *display_data)
{
- if (event->button == 3)
+ if(event->button == 3)
/* don't do anything with a right click */
return;
working_sview_config.page_visible[display_data->extra] = false;
@@ -1218,7 +1218,7 @@ int main(int argc, char *argv[])
menubar = _get_menubar_menu(main_window, main_notebook);
gtk_table_attach_defaults(GTK_TABLE(table), menubar, 0, 1, 0, 1);
- if ((combo = _create_cluster_combo())) {
+ if((combo = _create_cluster_combo())) {
GtkWidget *label = gtk_label_new("Cluster ");
gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1,
GTK_FILL, GTK_SHRINK, 0, 0);
@@ -1252,7 +1252,7 @@ int main(int argc, char *argv[])
standard_cursor = gdk_cursor_new(GDK_TOP_LEFT_ARROW);
for(i=0; i<PAGE_CNT; i++) {
- if (main_display_data[i].id == -1)
+ if(main_display_data[i].id == -1)
break;
create_page(GTK_NOTEBOOK(main_notebook),
@@ -1268,18 +1268,18 @@ int main(int argc, char *argv[])
adding = 0;
/* apply default settings */
- if (!working_sview_config.show_grid)
+ if(!working_sview_config.show_grid)
gtk_widget_hide(grid_window);
for(i=0; i<PAGE_CNT; i++) {
GtkWidget *visible_tab = NULL;
- if (main_display_data[i].id == -1)
+ if(main_display_data[i].id == -1)
break;
visible_tab = gtk_notebook_get_nth_page(
GTK_NOTEBOOK(main_notebook), i);
- if (working_sview_config.page_visible[i]
+ if(working_sview_config.page_visible[i]
|| (i == working_sview_config.default_page)
|| (i == TAB_PAGE))
gtk_widget_show(visible_tab);
@@ -1296,7 +1296,7 @@ int main(int argc, char *argv[])
pages is already this the signal doesn't happen so handle
it here.
*/
- if (gtk_notebook_get_current_page(GTK_NOTEBOOK(main_notebook))
+ if(gtk_notebook_get_current_page(GTK_NOTEBOOK(main_notebook))
== working_sview_config.default_page)
_page_switched(GTK_NOTEBOOK(main_notebook), NULL,
working_sview_config.default_page, NULL);