From 374f27d057a01044fb437dbbf168573dc73f151d Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 26 Jul 2002 23:02:49 +0000
Subject: [PATCH] Define combined job allocate and initiate job step

---
 src/common/slurm_protocol_defs.h | 2 ++
 src/common/slurm_protocol_pack.c | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index 585ac0a50a5..6305b5f676d 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -139,6 +139,8 @@ typedef enum {
 	RESPONSE_JOB_WILL_RUN,
 //	MESSAGE_REVOKE_JOB_CREDENTIAL,
 	REQUEST_REVOKE_JOB_CREDENTIAL,
+	REQUEST_ALLOCATION_AND_RUN_JOB_STEP,
+	RESPONSE_ALLOCATION_AND_RUN_JOB_STEP,
 
 	REQUEST_JOB_STEP_CREATE = 5001,
 	RESPONSE_JOB_STEP_CREATE,
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index b9c7c63f199..a958be35f49 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -23,6 +23,7 @@
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
 \*****************************************************************************/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -126,6 +127,7 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len )
 		case REQUEST_SUBMIT_BATCH_JOB :
 		case REQUEST_IMMEDIATE_RESOURCE_ALLOCATION : 
 		case REQUEST_JOB_WILL_RUN : 
+		case REQUEST_ALLOCATION_AND_RUN_JOB_STEP : 
 			pack_job_desc ( (job_desc_msg_t * )  msg -> data , ( void ** ) buffer , buf_len )  ;
 			break ;
 		case REQUEST_NODE_REGISTRATION_STATUS :
@@ -140,6 +142,7 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len )
 		case RESPONSE_RESOURCE_ALLOCATION :
 		case RESPONSE_IMMEDIATE_RESOURCE_ALLOCATION : 
 		case RESPONSE_JOB_WILL_RUN :
+		case RESPONSE_ALLOCATION_AND_RUN_JOB_STEP :
 			pack_resource_allocation_response_msg ( ( resource_allocation_response_msg_t * ) msg -> data , 
 				( void ** ) buffer , buf_len ) ;
 			break ;
@@ -268,6 +271,7 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len )
 		case REQUEST_SUBMIT_BATCH_JOB :
 		case REQUEST_IMMEDIATE_RESOURCE_ALLOCATION : 
 		case REQUEST_JOB_WILL_RUN : 
+		case REQUEST_ALLOCATION_AND_RUN_JOB_STEP : 
 			unpack_job_desc ( ( job_desc_msg_t **) & ( msg-> data ), ( void ** ) buffer , buf_len ) ;
 			break ;
 		case REQUEST_NODE_REGISTRATION_STATUS :
@@ -282,6 +286,7 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len )
 		case RESPONSE_RESOURCE_ALLOCATION :
 		case RESPONSE_IMMEDIATE_RESOURCE_ALLOCATION : 
 		case RESPONSE_JOB_WILL_RUN :
+		case RESPONSE_ALLOCATION_AND_RUN_JOB_STEP :
 			unpack_resource_allocation_response_msg ( ( resource_allocation_response_msg_t ** ) & ( msg -> data ) , ( void ** ) buffer , buf_len ) ;
 			break ;
 		case REQUEST_UPDATE_JOB :
@@ -1245,7 +1250,6 @@ void pack_task_exit_msg ( task_exit_msg_t * msg , void ** buffer , uint32_t * le
 
 int unpack_task_exit_msg ( task_exit_msg_t ** msg_ptr , void ** buffer , uint32_t * length )
 {
-	uint16_t uint16_tmp;
 	task_exit_msg_t * msg ;
 
 	msg = xmalloc ( sizeof ( launch_tasks_response_msg_t ) ) ;
-- 
GitLab