From 6c4e741a0aa4d8201cdb8a64786583338e8e48ad Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 10 Dec 2008 17:48:34 +0000
Subject: [PATCH] added wckey to the mix. It doesn't do anything just yet, but
is there for pack/unpack
---
src/slurmctld/job_mgr.c | 9 ++++++++-
src/slurmctld/slurmctld.h | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 746007e9ff6..7c4990c0722 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -518,6 +518,7 @@ static void _dump_job_state(struct job_record *dump_job_ptr, Buf buffer)
packstr(dump_job_ptr->nodes, buffer);
packstr(dump_job_ptr->partition, buffer);
packstr(dump_job_ptr->name, buffer);
+ packstr(dump_job_ptr->wckey, buffer);
packstr(dump_job_ptr->alloc_node, buffer);
packstr(dump_job_ptr->account, buffer);
packstr(dump_job_ptr->comment, buffer);
@@ -562,7 +563,7 @@ static int _load_job_state(Buf buffer)
char *nodes = NULL, *partition = NULL, *name = NULL, *resp_host = NULL;
char *account = NULL, *network = NULL, *mail_user = NULL;
char *comment = NULL, *nodes_completing = NULL, *alloc_node = NULL;
- char *licenses = NULL, *state_desc;
+ char *licenses = NULL, *state_desc = NULL, *wckey = NULL;
struct job_record *job_ptr;
struct part_record *part_ptr;
int error_code;
@@ -614,6 +615,7 @@ static int _load_job_state(Buf buffer)
safe_unpackstr_xmalloc(&nodes, &name_len, buffer);
safe_unpackstr_xmalloc(&partition, &name_len, buffer);
safe_unpackstr_xmalloc(&name, &name_len, buffer);
+ safe_unpackstr_xmalloc(&wckey, &name_len, buffer);
safe_unpackstr_xmalloc(&alloc_node, &name_len, buffer);
safe_unpackstr_xmalloc(&account, &name_len, buffer);
safe_unpackstr_xmalloc(&comment, &name_len, buffer);
@@ -733,6 +735,9 @@ static int _load_job_state(Buf buffer)
xfree(job_ptr->name); /* in case duplicate record */
job_ptr->name = name;
name = NULL; /* reused, nothing left to free */
+ xfree(job_ptr->wckey); /* in case duplicate record */
+ job_ptr->wckey = wckey;
+ wckey = NULL; /* reused, nothing left to free */
xfree(job_ptr->network);
job_ptr->network = network;
network = NULL; /* reused, nothing left to free */
@@ -845,6 +850,7 @@ unpack_error:
xfree(nodes_completing);
xfree(partition);
xfree(state_desc);
+ xfree(wckey);
select_g_free_jobinfo(&select_jobinfo);
return SLURM_FAILURE;
}
@@ -3589,6 +3595,7 @@ void pack_job(struct job_record *dump_job_ptr, Buf buffer)
pack32((uint32_t) 0, buffer);
packstr(dump_job_ptr->name, buffer);
+ packstr(dump_job_ptr->wckey, buffer);
packstr(dump_job_ptr->alloc_node, buffer);
pack_bit_fmt(dump_job_ptr->node_bitmap, buffer);
pack32(dump_job_ptr->num_procs, buffer);
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index 0d2decb9591..05668460f33 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -467,6 +467,7 @@ struct job_record {
uint32_t total_procs; /* number of allocated processors,
* for accounting */
uint32_t user_id; /* user the job runs as */
+ char *wckey; /* optional wckey */
};
/* Job dependency specification, used in "depend_list" within job_record */
--
GitLab