From b853755c383627111c70d130c24acfaac70543d9 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 14 Apr 2009 20:14:06 +0000
Subject: [PATCH] replace bzero with memset since bzero is deprecated
---
slurm/slurm.h.in | 4 ++--
src/api/slurm_hostlist.c | 2 +-
src/api/step_launch.c | 2 +-
src/common/hostlist.c | 2 +-
src/common/parse_time.c | 4 +++-
.../filetxt/accounting_storage_filetxt.c | 2 +-
.../accounting_storage/mysql/accounting_storage_mysql.c | 6 +++---
.../accounting_storage/pgsql/accounting_storage_pgsql.c | 2 +-
src/plugins/mpi/mpichgm/mpichgm.c | 2 +-
src/plugins/mpi/mpichmx/mpichmx.c | 2 +-
src/slurmctld/job_mgr.c | 8 ++++----
src/slurmctld/proc_req.c | 4 ++--
src/slurmctld/reservation.c | 4 ++--
src/slurmctld/step_mgr.c | 2 +-
src/slurmd/slurmstepd/mgr.c | 8 +++++++-
src/sreport/cluster_reports.c | 6 +++---
src/strigger/strigger.c | 4 ++--
17 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index f464f0507e8..2ee3de67590 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -2435,8 +2435,8 @@ extern int slurm_hostlist_push_host PARAMS((hostlist_t hl, const char *host));
* slurm_hostlist_ranged_string() will write a bracketed hostlist representation
* where possible.
*/
-extern size_t slurm_hostlist_ranged_string PARAMS((hostlist_t hl,
- size_t n, char *buf));
+extern ssize_t slurm_hostlist_ranged_string PARAMS((hostlist_t hl,
+ size_t n, char *buf));
/*
* slurm_hostlist_shift():
diff --git a/src/api/slurm_hostlist.c b/src/api/slurm_hostlist.c
index bc1bd7ffdf9..16e9fb06b3b 100644
--- a/src/api/slurm_hostlist.c
+++ b/src/api/slurm_hostlist.c
@@ -77,7 +77,7 @@ extern int slurm_hostlist_push_host(hostlist_t hl, const char *host)
return hostlist_push_host(hl, host);
}
-extern size_t slurm_hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
+extern ssize_t slurm_hostlist_ranged_string(hostlist_t hl, size_t n, char *buf)
{
return hostlist_ranged_string(hl, n, buf);
}
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index 2e3b7d280fd..2978e5b4fe6 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -618,7 +618,7 @@ static int _connect_srun_cr(char *addr)
error("failed creating cr socket: %m");
return -1;
}
- bzero(&sa, sizeof(sa));
+ memset(&sa, 0, sizeof(sa));
sa.sun_family = AF_UNIX;
strcpy(sa.sun_path, addr);
diff --git a/src/common/hostlist.c b/src/common/hostlist.c
index 1eb896d7a75..4ab3cc8fb4d 100644
--- a/src/common/hostlist.c
+++ b/src/common/hostlist.c
@@ -2551,7 +2551,7 @@ _get_boxes(char *buf, int max_len)
static void
_clear_grid(void)
{
- bzero(axis, sizeof(axis));
+ memset(axis, 0, sizeof(axis));
axis_min_x = HOSTLIST_BASE;
axis_min_y = HOSTLIST_BASE;
diff --git a/src/common/parse_time.c b/src/common/parse_time.c
index 12879d00285..a70435cba5a 100644
--- a/src/common/parse_time.c
+++ b/src/common/parse_time.c
@@ -42,7 +42,9 @@
#include <stdio.h>
#include <time.h>
+#include <string.h>
#include <strings.h>
+
#ifndef __USE_ISOC99
# define __USE_ISOC99 /* isblank() */
#endif
@@ -470,7 +472,7 @@ extern time_t parse_time(char *time_str, int past)
}
/* convert the time into time_t format */
- bzero(&res_tm, sizeof(res_tm));
+ memset(&res_tm, 0, sizeof(res_tm));
res_tm.tm_sec = second;
res_tm.tm_min = minute;
res_tm.tm_hour = hour;
diff --git a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
index 4aa2d130ee1..c08ad1853fb 100644
--- a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
+++ b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
@@ -742,7 +742,7 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
if (jobacct == NULL) {
/* JobAcctGather=jobacct_gather/none, no data to process */
- bzero(&dummy_jobacct, sizeof(dummy_jobacct));
+ memset(&dummy_jobacct, 0, sizeof(dummy_jobacct));
jobacct = &dummy_jobacct;
}
diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index 8621d511b61..deed2f4cabd 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -4595,7 +4595,7 @@ end_it:
* since you can't query on mod time here and I don't
* want to rewrite code to make it happen
*/
- //bzero(&assoc_cond, sizeof(acct_association_cond_t));
+ //memset(&assoc_cond, 0, sizeof(acct_association_cond_t));
if(!(assoc_list =
acct_storage_p_get_associations(mysql_conn,
@@ -5804,7 +5804,7 @@ extern List acct_storage_p_modify_associations(
* want to rewrite code to make it happen
*/
- //bzero(&local_assoc_cond, sizeof(acct_association_cond_t));
+ //memset(&local_assoc_cond, 0, sizeof(acct_association_cond_t));
if(!(local_assoc_list =
acct_storage_p_get_associations(mysql_conn,
@@ -11002,7 +11002,7 @@ extern int jobacct_storage_p_step_complete(mysql_conn_t *mysql_conn,
if (jobacct == NULL) {
/* JobAcctGather=jobacct_gather/none, no data to process */
- bzero(&dummy_jobacct, sizeof(dummy_jobacct));
+ memset(&dummy_jobacct, 0, sizeof(dummy_jobacct));
jobacct = &dummy_jobacct;
}
diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
index 0fda3468fea..6f0bb6cfd9f 100644
--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
+++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c
@@ -1532,7 +1532,7 @@ extern int jobacct_storage_p_step_complete(PGconn *acct_pgsql_db,
if (jobacct == NULL) {
/* JobAcctGather=jobacct_gather/none, no data to process */
- bzero(&dummy_jobacct, sizeof(dummy_jobacct));
+ memset(&dummy_jobacct, 0, sizeof(dummy_jobacct));
jobacct = &dummy_jobacct;
}
diff --git a/src/plugins/mpi/mpichgm/mpichgm.c b/src/plugins/mpi/mpichgm/mpichgm.c
index 8c5ff02ae49..05295c74e58 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpichgm.c
@@ -227,7 +227,7 @@ static int _gmpi_establish_map(gmpi_state_t *st)
if (setsockopt(newfd, SOL_SOCKET, SO_REUSEADDR,
(void *)&j, sizeof(j)))
error("setsockopt in GMPI master: %m");
- bzero(&addr, sizeof(addr));
+ memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl(iaddrs[i]);
addr.sin_port = htons(dp->remote_port);
diff --git a/src/plugins/mpi/mpichmx/mpichmx.c b/src/plugins/mpi/mpichmx/mpichmx.c
index 2b00bfdf7cf..17c3c89c3ce 100644
--- a/src/plugins/mpi/mpichmx/mpichmx.c
+++ b/src/plugins/mpi/mpichmx/mpichmx.c
@@ -230,7 +230,7 @@ static int _gmpi_establish_map(gmpi_state_t *st)
if (setsockopt(newfd, SOL_SOCKET, SO_REUSEADDR,
(void *)&j, sizeof(j)))
error("setsockopt in GMPI master: %m");
- bzero(&addr, sizeof(addr));
+ memset(&addr, 0, sizeof(addr));
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl(iaddrs[i]);
addr.sin_port = htons(dp->remote_port);
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 9b823a89eb0..43eb2bac5b8 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -792,7 +792,7 @@ static int _load_job_state(Buf buffer)
}
if(qos) {
- bzero(&qos_rec, sizeof(acct_qos_rec_t));
+ memset(&qos_rec, 0, sizeof(acct_qos_rec_t));
qos_rec.id = qos;
if((assoc_mgr_fill_in_qos(acct_db_conn, &qos_rec,
accounting_enforce,
@@ -3167,7 +3167,7 @@ _copy_job_desc_to_job_record(job_desc_msg_t * job_desc,
strstr(job_ptr->comment, "QOS:")) {
acct_qos_rec_t qos_rec;
- bzero(&qos_rec, sizeof(acct_qos_rec_t));
+ memset(&qos_rec, 0, sizeof(acct_qos_rec_t));
if (strstr(job_ptr->comment, "FLAGS:PREEMPTOR"))
qos_rec.name = "expedite";
@@ -4579,7 +4579,7 @@ int update_job(job_desc_msg_t * job_specs, uid_t uid)
if (wiki_sched && strstr(job_ptr->comment, "QOS:")) {
acct_qos_rec_t qos_rec;
- bzero(&qos_rec, sizeof(acct_qos_rec_t));
+ memset(&qos_rec, 0, sizeof(acct_qos_rec_t));
if (strstr(job_ptr->comment, "FLAGS:PREEMPTOR"))
qos_rec.name = "expedite";
@@ -6813,7 +6813,7 @@ extern int job_checkpoint(checkpoint_msg_t *ckpt_ptr, uid_t uid,
goto reply;
}
- bzero((void *)&resp_data, sizeof(checkpoint_resp_msg_t));
+ memset((void *)&resp_data, 0, sizeof(checkpoint_resp_msg_t));
if (job_ptr->batch_flag) { /* operate on batch job */
if ((ckpt_ptr->op == CHECK_CREATE) ||
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index ce470378c68..260db183699 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -374,7 +374,7 @@ void _fill_ctld_conf(slurm_ctl_conf_t * conf_ptr)
{
slurm_ctl_conf_t *conf = slurm_conf_lock();
- bzero(conf_ptr, sizeof(slurm_ctl_conf_t));
+ memset(conf_ptr, 0, sizeof(slurm_ctl_conf_t));
conf_ptr->last_update = time(NULL);
conf_ptr->accounting_storage_enforce =
@@ -1252,7 +1252,7 @@ static void _slurm_rpc_complete_batch_script(slurm_msg_t * msg)
slurm_strerror(comp_msg->slurm_rc));
if (error_code == SLURM_SUCCESS) {
update_node_msg_t update_node_msg;
- bzero(&update_node_msg, sizeof(update_node_msg_t));
+ memset(&update_node_msg, 0, sizeof(update_node_msg_t));
update_node_msg.node_names =
comp_msg->node_name;
update_node_msg.node_state = NODE_STATE_DRAIN;
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index 95ab28085aa..8466700278a 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -1754,7 +1754,7 @@ static void _validate_node_choice(slurmctld_resv_t *resv_ptr)
/* Reservation includes DOWN, DRAINED/DRAINING, FAILING or
* NO_RESPOND nodes. Generate new request using _select_nodes()
* in attempt to replace this nodes */
- bzero(&resv_desc, sizeof(reserve_request_msg_t));
+ memset(&resv_desc, 0, sizeof(reserve_request_msg_t));
resv_desc.start_time = resv_ptr->start_time;
resv_desc.end_time = resv_ptr->end_time;
resv_desc.features = resv_ptr->features;
@@ -1994,7 +1994,7 @@ static int _resize_resv(slurmctld_resv_t *resv_ptr, uint32_t node_cnt)
/* Must increase node count. Make this look like new request so
* we can use _select_nodes() for selecting the nodes */
- bzero(&resv_desc, sizeof(reserve_request_msg_t));
+ memset(&resv_desc, 0, sizeof(reserve_request_msg_t));
resv_desc.start_time = resv_ptr->start_time;
resv_desc.end_time = resv_ptr->end_time;
resv_desc.features = resv_ptr->features;
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 72e18b92844..c0d06b15885 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -1711,7 +1711,7 @@ extern int job_step_checkpoint(checkpoint_msg_t *ckpt_ptr,
goto reply;
}
- bzero((void *)&resp_data, sizeof(checkpoint_resp_msg_t));
+ memset((void *)&resp_data, 0, sizeof(checkpoint_resp_msg_t));
step_ptr = find_step_record(job_ptr, ckpt_ptr->step_id);
if (step_ptr == NULL) {
rc = ESLURM_INVALID_JOB_ID;
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index f0cb23bb636..5e5bf4be1ea 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -1272,9 +1272,15 @@ _log_task_exit(unsigned long taskid, unsigned long pid, int status)
verbose("task %lu (%lu) exited with exit code %d.",
taskid, pid, WEXITSTATUS(status));
else if (WIFSIGNALED(status))
+ /* WCOREDUMP isn't available on AIX */
verbose("task %lu (%lu) exited. Killed by signal %d%s.",
taskid, pid, WTERMSIG(status),
- WCOREDUMP(status) ? " (core dumped)" : "");
+#ifdef WCOREDUMP
+ WCOREDUMP(status) ? " (core dumped)" : ""
+#else
+ ""
+#endif
+ );
else
verbose("task %lu (%lu) exited with status 0x%04x.",
taskid, pid, status);
diff --git a/src/sreport/cluster_reports.c b/src/sreport/cluster_reports.c
index 3d331421ef1..c38cabab466 100644
--- a/src/sreport/cluster_reports.c
+++ b/src/sreport/cluster_reports.c
@@ -610,7 +610,7 @@ extern int cluster_account_by_user(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- bzero(&cluster_cond, sizeof(acct_cluster_cond_t));
+ memset(&cluster_cond, 0, sizeof(acct_cluster_cond_t));
assoc_cond->with_sub_accts = 1;
@@ -914,7 +914,7 @@ extern int cluster_user_by_account(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- bzero(&cluster_cond, sizeof(acct_cluster_cond_t));
+ memset(&cluster_cond, 0, sizeof(acct_cluster_cond_t));
_set_assoc_cond(&i, argc, argv, assoc_cond, format_list);
@@ -1201,7 +1201,7 @@ extern int cluster_user_by_wckey(int argc, char *argv[])
print_fields_list = list_create(destroy_print_field);
- bzero(&cluster_cond, sizeof(acct_cluster_cond_t));
+ memset(&cluster_cond, 0, sizeof(acct_cluster_cond_t));
_set_wckey_cond(&i, argc, argv, wckey_cond, format_list);
diff --git a/src/strigger/strigger.c b/src/strigger/strigger.c
index ebb4cd1a741..e2ae1822881 100644
--- a/src/strigger/strigger.c
+++ b/src/strigger/strigger.c
@@ -99,7 +99,7 @@ static int _clear_trigger(void)
trigger_info_t ti;
char tmp_c[128];
- bzero(&ti, sizeof(trigger_info_t));
+ memset(&ti, 0, sizeof(trigger_info_t));
ti.trig_id = params.trigger_id;
ti.user_id = params.user_id;
if (params.job_id) {
@@ -129,7 +129,7 @@ static int _set_trigger(void)
trigger_info_t ti;
char tmp_c[128];
- bzero(&ti, sizeof(trigger_info_t));
+ memset(&ti, 0, sizeof(trigger_info_t));
if (params.job_id) {
ti.res_type = TRIGGER_RES_TYPE_JOB;
snprintf(tmp_c, sizeof(tmp_c), "%u", params.job_id);
--
GitLab