From 3da1ec8ea8a16c6228c18373169d45fab2d4a0c7 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Sat, 21 Feb 2009 00:03:36 +0000
Subject: [PATCH] change step variable name from mpi_ports to resv_ports, more
generic
---
slurm/slurm.h.in | 2 +-
src/api/job_step_info.c | 4 ++--
src/common/slurm_protocol_pack.c | 2 +-
src/slurmctld/slurmctld.h | 2 +-
src/slurmctld/step_mgr.c | 15 ++++++++-------
5 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index 46d08b2ca96..31c4855a4d0 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -864,7 +864,7 @@ typedef struct {
time_t start_time; /* step start time */
time_t run_time; /* net run time (factor out time suspended) */
char *partition; /* name of assigned partition */
- char *mpi_ports; /* ports allocated for MPI */
+ char *resv_ports; /* ports allocated for MPI */
char *nodes; /* list of nodes allocated to job_step */
char *name; /* name of job step */
char *network; /* network specs for job step */
diff --git a/src/api/job_step_info.c b/src/api/job_step_info.c
index a71be130813..c3ba0efdb1b 100644
--- a/src/api/job_step_info.c
+++ b/src/api/job_step_info.c
@@ -141,8 +141,8 @@ slurm_sprint_job_step_info ( job_step_info_t * job_step_ptr,
/****** Line 3 ******/
snprintf(tmp_line, sizeof(tmp_line),
- "MpiPorts=%s Checkpoint=%u CheckpointPath=%s\n\n",
- job_step_ptr->mpi_ports,
+ "ResvPorts=%s Checkpoint=%u CheckpointPath=%s\n\n",
+ job_step_ptr->resv_ports,
job_step_ptr->ckpt_interval, job_step_ptr->ckpt_path);
xstrcat(out, tmp_line);
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index cbaab136f55..05ba2cb2436 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -2329,7 +2329,7 @@ _unpack_job_step_info_members(job_step_info_t * step, Buf buffer)
safe_unpack_time(&step->start_time, buffer);
safe_unpack_time(&step->run_time, buffer);
safe_unpackstr_xmalloc(&step->partition, &uint32_tmp, buffer);
- safe_unpackstr_xmalloc(&step->mpi_ports, &uint32_tmp, buffer);
+ safe_unpackstr_xmalloc(&step->resv_ports, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&step->nodes, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&step->name, &uint32_tmp, buffer);
safe_unpackstr_xmalloc(&step->network, &uint32_tmp, buffer);
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 2b8e5e87c92..36ee7ac105e 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -550,12 +550,12 @@ struct step_record {
jobacctinfo_t *jobacct; /* keep track of process info in the
* step */
uint32_t mem_per_task; /* MB memory per task, 0=no limit */
- char *mpi_ports; /* ports allocated to MPI */
char *name; /* name of job step */
char *network; /* step's network specification */
uint8_t no_kill; /* 1 if no kill on node failure */
uint16_t port; /* port for srun communications */
time_t pre_sus_time; /* time step ran prior to last suspend */
+ char *resv_ports; /* ports reserved for job */
time_t start_time; /* step allocation time */
uint16_t step_id; /* step number */
slurm_step_layout_t *step_layout;/* info about how tasks are laid out
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index cdb2fe06c7e..c01c49c548a 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -164,7 +164,7 @@ static void _free_step_rec(struct step_record *step_ptr)
FREE_NULL_BITMAP(step_ptr->core_bitmap_job);
FREE_NULL_BITMAP(step_ptr->exit_node_bitmap);
FREE_NULL_BITMAP(step_ptr->step_node_bitmap);
- xfree(step_ptr->mpi_ports);
+ xfree(step_ptr->resv_ports);
xfree(step_ptr->network);
xfree(step_ptr->ckpt_path);
xfree(step_ptr);
@@ -1308,6 +1308,7 @@ step_create(job_step_create_request_msg_t *step_specs,
step_ptr->exclusive = step_specs->exclusive;
step_ptr->ckpt_path = xstrdup(step_specs->ckpt_path);
step_ptr->no_kill = step_specs->no_kill;
+if (step_specs->resv_ports)step_ptr->resv_ports=xstrdup("[1234-5678]");
/* step's name and network default to job's values if not
* specified in the step specification */
@@ -1480,7 +1481,7 @@ static void _pack_ctld_job_step_info(struct step_record *step_ptr, Buf buffer)
}
pack_time(run_time, buffer);
packstr(step_ptr->job_ptr->partition, buffer);
- packstr(step_ptr->mpi_ports, buffer);
+ packstr(step_ptr->resv_ports, buffer);
packstr(node_list, buffer);
packstr(step_ptr->name, buffer);
packstr(step_ptr->network, buffer);
@@ -2142,7 +2143,7 @@ extern void dump_job_step_state(struct step_record *step_ptr, Buf buffer)
pack_time(step_ptr->ckpt_time, buffer);
packstr(step_ptr->host, buffer);
- packstr(step_ptr->mpi_ports, buffer);
+ packstr(step_ptr->resv_ports, buffer);
packstr(step_ptr->name, buffer);
packstr(step_ptr->network, buffer);
packstr(step_ptr->ckpt_path, buffer);
@@ -2169,7 +2170,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
uint32_t core_size, cpu_count, exit_code, mem_per_task, name_len;
time_t start_time, pre_sus_time, tot_sus_time, ckpt_time;
char *host = NULL, *ckpt_path = NULL, *core_job = NULL;
- char *mpi_ports = NULL, *name = NULL, *network = NULL, *bit_fmt = NULL;
+ char *resv_ports = NULL, *name = NULL, *network = NULL, *bit_fmt = NULL;
switch_jobinfo_t switch_tmp = NULL;
check_jobinfo_t check_tmp = NULL;
slurm_step_layout_t *step_layout = NULL;
@@ -2199,7 +2200,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
safe_unpack_time(&ckpt_time, buffer);
safe_unpackstr_xmalloc(&host, &name_len, buffer);
- safe_unpackstr_xmalloc(&mpi_ports, &name_len, buffer);
+ safe_unpackstr_xmalloc(&resv_ports, &name_len, buffer);
safe_unpackstr_xmalloc(&name, &name_len, buffer);
safe_unpackstr_xmalloc(&network, &name_len, buffer);
safe_unpackstr_xmalloc(&ckpt_path, &name_len, buffer);
@@ -2238,7 +2239,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
step_ptr->cpu_count = cpu_count;
step_ptr->cpus_per_task= cpus_per_task;
step_ptr->cyclic_alloc = cyclic_alloc;
- step_ptr->mpi_ports = mpi_ports;
+ step_ptr->resv_ports = resv_ports;
step_ptr->name = name;
step_ptr->network = network;
step_ptr->no_kill = no_kill;
@@ -2294,7 +2295,7 @@ extern int load_step_state(struct job_record *job_ptr, Buf buffer)
unpack_error:
xfree(host);
- xfree(mpi_ports);
+ xfree(resv_ports);
xfree(name);
xfree(network);
xfree(ckpt_path);
--
GitLab