Skip to content
Snippets Groups Projects
Commit 7e2c5b8c authored by jce's avatar jce
Browse files

Cleaned up the messages a little more. 

REQUEST_JOB_INFO now uses the job_info_request_msg_t instead of last_update so that in the future I will be able to request information for just one job.
Fixed a lot of bugs in the REQUEST_JOB_STEP_INFO message stuff.
parent 07e29feb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/common/slurm_protocol_defs.h
+ 3
− 3
View file @ 7e2c5b8c
...@@ -112,8 +112,6 @@ typedef enum { ...@@ -112,8 +112,6 @@ typedef enum {
RESPONSE_PARTITION_INFO, RESPONSE_PARTITION_INFO,
REQUEST_ACCTING_INFO, REQUEST_ACCTING_INFO,
RESPONSE_ACCOUNTING_INFO, RESPONSE_ACCOUNTING_INFO,
REQUEST_GET_JOB_STEP_INFO,
RESPONSE_GET_JOB_STEP_INFO,
REQUEST_UPDATE_JOB = 3001, REQUEST_UPDATE_JOB = 3001,
REQUEST_UPDATE_NODE, REQUEST_UPDATE_NODE,
...@@ -276,6 +274,7 @@ typedef struct job_descriptor ...@@ -276,6 +274,7 @@ typedef struct job_descriptor
typedef struct job_step_id typedef struct job_step_id
{ {
uint32_t last_update;
uint32_t job_id; uint32_t job_id;
uint32_t job_step_id ; uint32_t job_step_id ;
} job_step_id_t ; } job_step_id_t ;
...@@ -393,8 +392,8 @@ typedef struct job_step_info_response_msg ...@@ -393,8 +392,8 @@ typedef struct job_step_info_response_msg
typedef struct job_step_id job_step_id_msg_t ; typedef struct job_step_id job_step_id_msg_t ;
typedef struct job_step_id job_step_info_request_msg_t ; typedef struct job_step_id job_step_info_request_msg_t ;
typedef struct job_step_id job_info_request_msg_t ;
typedef struct job_table job_table_msg_t ;
typedef struct job_info_msg { typedef struct job_info_msg {
uint32_t last_update; uint32_t last_update;
...@@ -538,6 +537,7 @@ void inline slurm_free_return_code_msg ( return_code_msg_t * msg ) ; ...@@ -538,6 +537,7 @@ void inline slurm_free_return_code_msg ( return_code_msg_t * msg ) ;
void inline slurm_free_job_step_id ( job_step_id_t * msg ) ; void inline slurm_free_job_step_id ( job_step_id_t * msg ) ;
#define slurm_free_job_step_id_msg(msg) slurm_free_job_step_id((job_step_id_t*)(msg)) #define slurm_free_job_step_id_msg(msg) slurm_free_job_step_id((job_step_id_t*)(msg))
#define slurm_free_job_step_info_request_msg(msg) slurm_free_job_step_id(msg) #define slurm_free_job_step_info_request_msg(msg) slurm_free_job_step_id(msg)
#define slurm_free_job_info_request_msg(msg) slurm_free_job_step_id(msg)
void inline slurm_free_ctl_conf ( slurm_ctl_conf_info_msg_t * build_ptr ) ; void inline slurm_free_ctl_conf ( slurm_ctl_conf_info_msg_t * build_ptr ) ;
......
src/common/slurm_protocol_pack.c
+ 19
− 15
View file @ 7e2c5b8c
...@@ -104,8 +104,6 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len ) ...@@ -104,8 +104,6 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len )
switch ( msg -> msg_type ) switch ( msg -> msg_type )
{ {
case REQUEST_BUILD_INFO : case REQUEST_BUILD_INFO :
case REQUEST_JOB_INFO :
case REQUEST_JOB_STEP_INFO :
case REQUEST_NODE_INFO : case REQUEST_NODE_INFO :
case REQUEST_PARTITION_INFO : case REQUEST_PARTITION_INFO :
case REQUEST_ACCTING_INFO : case REQUEST_ACCTING_INFO :
...@@ -177,11 +175,15 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len ) ...@@ -177,11 +175,15 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len )
case REQUEST_KILL_TASKS : case REQUEST_KILL_TASKS :
pack_cancel_tasks_msg ( ( kill_tasks_msg_t * ) msg->data , ( void ** ) buffer , buf_len ) ; pack_cancel_tasks_msg ( ( kill_tasks_msg_t * ) msg->data , ( void ** ) buffer , buf_len ) ;
break ; break ;
/******** job_step_id_t Messages ********/
case REQUEST_JOB_INFO :
case REQUEST_JOB_STEP_INFO :
case REQUEST_CANCEL_JOB_STEP : case REQUEST_CANCEL_JOB_STEP :
case REQUEST_COMPLETE_JOB_STEP : case REQUEST_COMPLETE_JOB_STEP :
pack_cancel_job_step_msg ( ( job_step_id_msg_t * ) msg->data , pack_job_step_id ( ( job_step_id_t * ) msg->data ,
( void ** ) buffer , buf_len ) ; ( void ** ) buffer , buf_len ) ;
break ; break ;
case REQUEST_REVOKE_JOB_CREDENTIAL : case REQUEST_REVOKE_JOB_CREDENTIAL :
pack_revoke_credential_msg ( ( revoke_credential_msg_t * ) msg->data , ( void ** ) buffer , buf_len ) ; pack_revoke_credential_msg ( ( revoke_credential_msg_t * ) msg->data , ( void ** ) buffer , buf_len ) ;
break ; break ;
...@@ -200,9 +202,8 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len ) ...@@ -200,9 +202,8 @@ int pack_msg ( slurm_msg_t const * msg , char ** buffer , uint32_t * buf_len )
break ; break ;
case RESPONSE_JOB_ATTACH : case RESPONSE_JOB_ATTACH :
break ; break ;
case REQUEST_GET_JOB_STEP_INFO : case RESPONSE_JOB_STEP_INFO :
break ; pack_job_step_info_msg( ( slurm_msg_t * ) msg , (void ** ) buffer , buf_len ) ;
case RESPONSE_GET_JOB_STEP_INFO :
break ; break ;
case REQUEST_JOB_RESOURCE : case REQUEST_JOB_RESOURCE :
break ; break ;
...@@ -252,8 +253,6 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len ) ...@@ -252,8 +253,6 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len )
switch ( msg-> msg_type ) switch ( msg-> msg_type )
{ {
case REQUEST_BUILD_INFO : case REQUEST_BUILD_INFO :
case REQUEST_JOB_INFO :
case REQUEST_JOB_STEP_INFO :
case REQUEST_NODE_INFO : case REQUEST_NODE_INFO :
case REQUEST_PARTITION_INFO : case REQUEST_PARTITION_INFO :
case REQUEST_ACCTING_INFO : case REQUEST_ACCTING_INFO :
...@@ -326,9 +325,12 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len ) ...@@ -326,9 +325,12 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len )
unpack_cancel_tasks_msg ( ( kill_tasks_msg_t ** ) & ( msg->data ) , unpack_cancel_tasks_msg ( ( kill_tasks_msg_t ** ) & ( msg->data ) ,
( void ** ) buffer , buf_len ) ; ( void ** ) buffer , buf_len ) ;
break ; break ;
/******** job_step_id_t Messages ********/
case REQUEST_JOB_INFO :
case REQUEST_JOB_STEP_INFO :
case REQUEST_CANCEL_JOB_STEP : case REQUEST_CANCEL_JOB_STEP :
case REQUEST_COMPLETE_JOB_STEP : case REQUEST_COMPLETE_JOB_STEP :
unpack_cancel_job_step_msg ( ( job_step_id_msg_t ** ) & ( msg->data ) , unpack_job_step_id ( ( job_step_id_t ** ) & ( msg->data ) ,
( void ** ) buffer , buf_len ) ; ( void ** ) buffer , buf_len ) ;
break ; break ;
case REQUEST_REVOKE_JOB_CREDENTIAL : case REQUEST_REVOKE_JOB_CREDENTIAL :
...@@ -349,9 +351,7 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len ) ...@@ -349,9 +351,7 @@ int unpack_msg ( slurm_msg_t * msg , char ** buffer , uint32_t * buf_len )
break ; break ;
case RESPONSE_JOB_ATTACH : case RESPONSE_JOB_ATTACH :
break ; break ;
case REQUEST_GET_JOB_STEP_INFO : case RESPONSE_JOB_STEP_INFO :
break ;
case RESPONSE_GET_JOB_STEP_INFO :
unpack_job_step_info_response_msg( ( job_step_info_response_msg_t ** ) & ( msg->data ) , ( void ** ) buffer , buf_len ) ; unpack_job_step_info_response_msg( ( job_step_info_response_msg_t ** ) & ( msg->data ) , ( void ** ) buffer , buf_len ) ;
break ; break ;
case REQUEST_JOB_RESOURCE : case REQUEST_JOB_RESOURCE :
...@@ -974,13 +974,15 @@ int unpack_job_step_info_response_msg ( job_step_info_response_msg_t** msg, void ...@@ -974,13 +974,15 @@ int unpack_job_step_info_response_msg ( job_step_info_response_msg_t** msg, void
unpack32 (&(*msg)->last_update , buf_ptr, buffer_size); unpack32 (&(*msg)->last_update , buf_ptr, buffer_size);
unpack32 (&(*msg)->job_step_count , buf_ptr, buffer_size); unpack32 (&(*msg)->job_step_count , buf_ptr, buffer_size);
(*msg)->job_steps = xmalloc( sizeof(job_step_info_t) * (*msg)->job_step_count );
for ( i=0; i < (*msg)->job_step_count; i++ ) for ( i=0; i < (*msg)->job_step_count; i++ )
unpack_job_step_info_members ( &(*msg)->job_steps[i] , buf_ptr, buffer_size); unpack_job_step_info_members ( &(*msg)->job_steps[i] , buf_ptr, buffer_size);
return SLURM_SUCCESS; return SLURM_SUCCESS;
} }
void pack_job_info_msg ( slurm_msg_t * msg, void ** buf_ptr , int * buffer_size ) void pack_buffer_msg ( slurm_msg_t * msg, void ** buf_ptr , int * buffer_size )
{ {
assert ( msg != NULL ); assert ( msg != NULL );
assert ( sizeof(*msg) == sizeof(slurm_msg_t) ) ; assert ( sizeof(*msg) == sizeof(slurm_msg_t) ) ;
...@@ -1421,13 +1423,14 @@ int unpack_cancel_tasks_msg ( kill_tasks_msg_t ** msg_ptr , void ** buffer , uin ...@@ -1421,13 +1423,14 @@ int unpack_cancel_tasks_msg ( kill_tasks_msg_t ** msg_ptr , void ** buffer , uin
return 0 ; return 0 ;
} }
void pack_cancel_job_step_msg ( job_step_id_msg_t * msg , void ** buffer , uint32_t * length ) void pack_job_step_id ( job_step_id_t * msg , void ** buffer , uint32_t * length )
{ {
pack32 ( msg -> last_update , buffer , length ) ;
pack32 ( msg -> job_id , buffer , length ) ; pack32 ( msg -> job_id , buffer , length ) ;
pack32 ( msg -> job_step_id , buffer , length ) ; pack32 ( msg -> job_step_id , buffer , length ) ;
} }
int unpack_cancel_job_step_msg ( job_step_id_msg_t ** msg_ptr , void ** buffer , uint32_t * length ) int unpack_job_step_id ( job_step_id_t ** msg_ptr , void ** buffer , uint32_t * length )
{ {
job_step_id_msg_t * msg ; job_step_id_msg_t * msg ;
...@@ -1438,6 +1441,7 @@ int unpack_cancel_job_step_msg ( job_step_id_msg_t ** msg_ptr , void ** buffer , ...@@ -1438,6 +1441,7 @@ int unpack_cancel_job_step_msg ( job_step_id_msg_t ** msg_ptr , void ** buffer ,
return ENOMEM ; return ENOMEM ;
} }
unpack32 ( & msg -> last_update , buffer , length ) ;
unpack32 ( & msg -> job_id , buffer , length ) ; unpack32 ( & msg -> job_id , buffer , length ) ;
unpack32 ( & msg -> job_step_id , buffer , length ) ; unpack32 ( & msg -> job_step_id , buffer , length ) ;
*msg_ptr = msg ; *msg_ptr = msg ;
......
src/common/slurm_protocol_pack.h
+ 15
− 3
View file @ 7e2c5b8c
...@@ -51,7 +51,9 @@ int unpack_return_code ( return_code_msg_t ** msg , void ** buffer , uint32_t * ...@@ -51,7 +51,9 @@ int unpack_return_code ( return_code_msg_t ** msg , void ** buffer , uint32_t *
void pack_slurm_ctl_conf ( slurm_ctl_conf_info_msg_t * build_ptr, void ** buffer , int * buffer_size ); void pack_slurm_ctl_conf ( slurm_ctl_conf_info_msg_t * build_ptr, void ** buffer , int * buffer_size );
int unpack_slurm_ctl_conf ( slurm_ctl_conf_info_msg_t **build_buffer_ptr, void ** buffer , int * buffer_size ); int unpack_slurm_ctl_conf ( slurm_ctl_conf_info_msg_t **build_buffer_ptr, void ** buffer , int * buffer_size );
void pack_job_info_msg ( slurm_msg_t * msg , void ** buffer , int * buffer_size ); void pack_buffer_msg ( slurm_msg_t * msg , void ** buffer , int * buffer_size );
#define pack_job_info_msg(msg,buf_ptr,buffer_size) pack_buffer_msg(msg,buf_ptr,buffer_size)
#define pack_job_step_info_msg(msg,buf_ptr,buffer_size) pack_buffer_msg(msg,buf_ptr,buffer_size)
int unpack_job_info_msg ( job_info_msg_t ** msg , void ** buffer , int * buffer_size ); int unpack_job_info_msg ( job_info_msg_t ** msg , void ** buffer , int * buffer_size );
int unpack_job_info ( job_info_t ** job , void ** buf_ptr , int * buffer_size ); int unpack_job_info ( job_info_t ** job , void ** buf_ptr , int * buffer_size );
...@@ -81,8 +83,18 @@ int unpack_node_info_members ( node_info_t * node , void ** buf_ptr , int * buff ...@@ -81,8 +83,18 @@ int unpack_node_info_members ( node_info_t * node , void ** buf_ptr , int * buff
void pack_cancel_job_msg ( job_id_msg_t * msg , void ** buffer , uint32_t * length ); void pack_cancel_job_msg ( job_id_msg_t * msg , void ** buffer , uint32_t * length );
int unpack_cancel_job_msg ( job_id_msg_t ** msg_ptr , void ** buffer , uint32_t * length ); int unpack_cancel_job_msg ( job_id_msg_t ** msg_ptr , void ** buffer , uint32_t * length );
void pack_cancel_job_step_msg ( job_step_id_msg_t * msg , void ** buffer , uint32_t * length ); /* job_step_id functions */
int unpack_cancel_job_step_msg ( job_step_id_msg_t ** msg_ptr , void ** buffer , uint32_t * length ); void pack_job_step_id ( job_step_id_t * msg , void ** buffer , uint32_t * length );
int unpack_job_step_id ( job_step_id_t ** msg_ptr , void ** buffer , uint32_t * length );
/* job_step_id Macros for typedefs */
#define pack_cancel_job_step_msg(msg,buffer,length) pack_job_step_id(msg,buffer,length )
#define unpack_cancel_job_step_msg(msg_ptr,buffer,length) unpack_job_step_id(msg_ptr,buffer,length)
#define pack_job_step_id_msg(msg,buffer,length) pack_job_step_id(msg,buffer,length )
#define unpack_job_step_id_msg(msg_ptr,buffer,length) unpack_job_step_id(msg_ptr,buffer,length)
#define pack_job_step_info_request_msg(msg,buffer,length) pack_job_step_id(msg,buffer,length )
#define unpack_job_step_info_request_msg(msg_ptr,buffer,length) unpack_job_step_id(msg_ptr,buffer,length)
#define pack_job_info_request_msg(msg,buffer,length) pack_job_step_id(msg,buffer,length )
#define unpack_job_info_request_msg(msg_ptr,buffer,length) unpack_job_step_id(msg_ptr,buffer,length)
int unpack_job_step_info ( job_step_info_t ** step , void ** buf_ptr , int * buffer_size ); int unpack_job_step_info ( job_step_info_t ** step , void ** buf_ptr , int * buffer_size );
int unpack_job_step_info_members ( job_step_info_t * step , void ** buf_ptr , int * buffer_size ); int unpack_job_step_info_members ( job_step_info_t * step , void ** buf_ptr , int * buffer_size );
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung