Commit 2676e81d authored by Ramon Nou's avatar Ramon Nou
Browse files

SLURM 23 changes hostlist_t signature, we need a * now

parent c26920b1

plugins/slurm/slurmadmcli.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ slurm_spank_user_init(spank_t sp, int ac, char** av) { 
    slurm_debug("%s: %s: job id: %d", plugin_name, __func__, jobid);



    /* list of job nodes */

    hostlist_t hostlist = get_slurm_hostlist(sp);

    hostlist_t*hostlist = get_slurm_hostlist(sp);

    if(!hostlist) {

        slurm_error("%s: failed to retrieve hostlist", plugin_name);

        return -1;

plugins/slurm/utils.c

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


extern const char plugin_name[];



hostlist_t

hostlist_t *

get_slurm_hostlist(spank_t sp) {



    /* get list of nodes. /!\ at this point env SLURM_NODELIST is
@@ -72,7 +72,7 @@ get_slurm_hostlist(spank_t sp) { 


    slurm_debug("%s: SLURM_NODELIST=%s", plugin_name, nodelist);



    hostlist_t hl = NULL;

    hostlist_t * hl = NULL;

    hl = slurm_hostlist_create(nodelist);



    if(!hl) {
@@ -84,7 +84,7 @@ get_slurm_hostlist(spank_t sp) { 
}



scord_nodelist_t

scord_nodelist_create(hostlist_t hostlist) {

scord_nodelist_create(hostlist_t* hostlist) {



    ADM_node_t* nodes = NULL;

    char* host = NULL;

plugins/slurm/utils.h

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <slurm/spank.h>

#include <scord/types.h>



hostlist_t

hostlist_t *

get_slurm_hostlist(spank_t sp);



typedef struct scord_nodelist {
@@ -39,7 +39,7 @@ typedef struct scord_nodelist { 
}* scord_nodelist_t;



scord_nodelist_t

scord_nodelist_create(hostlist_t hostlist);

scord_nodelist_create(hostlist_t* hostlist);



int

scord_nodelist_get_nodecount(scord_nodelist_t nodelist);