diff --git a/src/common/switch.h b/src/common/switch.h index 86adfee310d79e46636a55be65f8ddd3316a6f2e..47e26234a669536391c5ffd2761932bbbc57f2bb 100644 --- a/src/common/switch.h +++ b/src/common/switch.h @@ -3,7 +3,7 @@ ***************************************************************************** * Copyright (C) 2002 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Moe Jette <jette@llnl.gov>. + * Written by Morris Jette <jette1@llnl.gov>. * UCRL-CODE-2002-040. * * This file is part of SLURM, a resource management program. @@ -41,7 +41,8 @@ /* opaque data structures - no peeking! */ #ifndef __switch_jobinfo_t_defined # define __switch_jobinfo_t_defined - typedef struct switch_jobinfo *switch_jobinfo_t; + typedef struct switch_jobinfo *switch_jobinfo_t; + typedef struct switch_node_info *switch_node_info_t; #endif typedef struct slurm_switch_context * slurm_switch_context_t; diff --git a/src/plugins/switch/elan/switch_elan.c b/src/plugins/switch/elan/switch_elan.c index 989d1d0f7d86a9c3b1d531607b6dc723b5375d64..f55fbfdf791019a4ee099558debb3a05a45c38fd 100644 --- a/src/plugins/switch/elan/switch_elan.c +++ b/src/plugins/switch/elan/switch_elan.c @@ -648,6 +648,11 @@ int switch_p_job_attach ( switch_jobinfo_t jobinfo, char ***env, return SLURM_SUCCESS; } +extern int switch_get_data_jobinfo(switch_jobinfo_t switch_job, + int key, void *resulting_data) +{ + return SLURM_SUCCESS; +} static int _set_elan_ids(void) @@ -700,3 +705,42 @@ extern char *switch_p_strerror(int errnum) char *res = _lookup_slurm_api_errtab(errnum); return (res ? res : strerror(errnum)); } + +/* + * node switch state monitoring functions + * required for IBM Federation switch + */ +extern int switch_alloc_node_info(switch_node_info_t *switch_node) +{ + return SLURM_SUCCESS; +} + +extern int switch_build_node_info(switch_node_info_t switch_node) +{ + return SLURM_SUCCESS; +} + +extern int switch_pack_node_info(switch_node_info_t switch_node, + Buf buffer) +{ + return SLURM_SUCCESS; +} + +extern int switch_unpack_node_info(switch_node_info_t switch_node, + Buf buffer) +{ + return SLURM_SUCCESS; +} + +extern int switch_free_node_info(switch_node_info_t switch_node) +{ + return SLURM_SUCCESS; +} + +extern int switch_job_complete(switch_node_info_t switch_node, + char *nodelist) +{ + return SLURM_SUCCESS; +} + + diff --git a/src/plugins/switch/none/switch_none.c b/src/plugins/switch/none/switch_none.c index c4c2c52d3dd2555d991fc19ac8c37e650519f97f..265e68766782646270ba3ebda0688f22b9bf6861 100644 --- a/src/plugins/switch/none/switch_none.c +++ b/src/plugins/switch/none/switch_none.c @@ -3,7 +3,7 @@ ***************************************************************************** * Copyright (C) 2002 The Regents of the University of California. * Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). - * Written by Moe Jette <jette@llnl.gov> + * Written by Morris Jette <jette1@llnl.gov> * UCRL-CODE-2002-040. * * This file is part of SLURM, a resource management program. @@ -63,7 +63,7 @@ */ const char plugin_name[] = "switch NONE plugin"; const char plugin_type[] = "switch/none"; -const uint32_t plugin_version = 90; +const uint32_t plugin_version = 100; /* * init() is called when the plugin is loaded, before any other functions @@ -190,6 +190,12 @@ int switch_p_job_attach ( switch_jobinfo_t jobinfo, char ***env, return SLURM_SUCCESS; } +extern int switch_get_data_jobinfo(switch_jobinfo_t switch_job, + int key, void *resulting_data) +{ + return SLURM_SUCCESS; +} + /* * switch functions for other purposes */ @@ -208,3 +214,40 @@ extern char *switch_p_strerror(int errnum) return NULL; } +/* + * node switch state monitoring functions + * required for IBM Federation switch + */ +extern int switch_alloc_node_info(switch_node_info_t *switch_node) +{ + return SLURM_SUCCESS; +} + +extern int switch_build_node_info(switch_node_info_t switch_node) +{ + return SLURM_SUCCESS; +} + +extern int switch_pack_node_info(switch_node_info_t switch_node, + Buf buffer) +{ + return SLURM_SUCCESS; +} + +extern int switch_unpack_node_info(switch_node_info_t switch_node, + Buf buffer) +{ + return SLURM_SUCCESS; +} + +extern int switch_free_node_info(switch_node_info_t switch_node) +{ + return SLURM_SUCCESS; +} + +extern int switch_job_complete(switch_node_info_t switch_node, + char *nodelist) +{ + return SLURM_SUCCESS; +} +