From 19e90ed622cd4657c84864f84cefd6ae614847e8 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 17 May 2013 13:39:14 -0700
Subject: [PATCH] INFINIBAND - change acct_gather_infiniband_g_update_node to
acct_gather_infiniband_g_node_init
---
src/common/slurm_acct_gather_infiniband.c | 8 ++++----
src/common/slurm_acct_gather_infiniband.h | 2 +-
.../none/acct_gather_infiniband_none.c | 2 +-
.../ofed/acct_gather_infiniband_ofed.c | 3 +--
src/slurmd/slurmstepd/mgr.c | 2 +-
5 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/common/slurm_acct_gather_infiniband.c b/src/common/slurm_acct_gather_infiniband.c
index cae961cc23e..b2ec99b2652 100644
--- a/src/common/slurm_acct_gather_infiniband.c
+++ b/src/common/slurm_acct_gather_infiniband.c
@@ -49,7 +49,7 @@
#include "src/slurmd/slurmstepd/slurmstepd_job.h"
typedef struct slurm_acct_gather_infiniband_ops {
- int (*update_node_infiniband) (void);
+ int (*node_init) (void);
void (*conf_options) (s_p_options_t **full_options,
int *full_options_cnt);
void (*conf_set) (s_p_hashtbl_t *tbl);
@@ -59,7 +59,7 @@ typedef struct slurm_acct_gather_infiniband_ops {
* declared for slurm_acct_gather_infiniband_ops_t.
*/
static const char *syms[] = {
- "acct_gather_infiniband_p_update_node",
+ "acct_gather_infiniband_p_node_init",
"acct_gather_infiniband_p_conf_options",
"acct_gather_infiniband_p_conf_set",
};
@@ -119,14 +119,14 @@ extern int acct_gather_infiniband_fini(void)
return rc;
}
-extern int acct_gather_infiniband_g_update_node(void)
+extern int acct_gather_infiniband_g_node_init(void)
{
int retval = SLURM_ERROR;
if (slurm_acct_gather_infiniband_init() < 0)
return retval;
- retval = (*(ops.update_node_infiniband))();
+ retval = (*(ops.node_init))();
return retval;
}
diff --git a/src/common/slurm_acct_gather_infiniband.h b/src/common/slurm_acct_gather_infiniband.h
index 5ea4776b4f8..7818d352865 100644
--- a/src/common/slurm_acct_gather_infiniband.h
+++ b/src/common/slurm_acct_gather_infiniband.h
@@ -74,7 +74,7 @@ struct network_data {
extern int acct_gather_infiniband_init(void); /* load the plugin */
extern int acct_gather_infiniband_fini(void); /* unload the plugin */
-extern int acct_gather_infiniband_g_update_node(void);
+extern int acct_gather_infiniband_g_node_init(void);
/*
* Define plugin local conf for acct_gather.conf
*
diff --git a/src/plugins/acct_gather_infiniband/none/acct_gather_infiniband_none.c b/src/plugins/acct_gather_infiniband/none/acct_gather_infiniband_none.c
index 57799fa99d3..91975448f93 100644
--- a/src/plugins/acct_gather_infiniband/none/acct_gather_infiniband_none.c
+++ b/src/plugins/acct_gather_infiniband/none/acct_gather_infiniband_none.c
@@ -103,7 +103,7 @@ extern int fini(void)
return SLURM_SUCCESS;
}
-extern int acct_gather_infiniband_p_update_node(void)
+extern int acct_gather_infiniband_p_node_init(void)
{
return SLURM_SUCCESS;
}
diff --git a/src/plugins/acct_gather_infiniband/ofed/acct_gather_infiniband_ofed.c b/src/plugins/acct_gather_infiniband/ofed/acct_gather_infiniband_ofed.c
index ef6a03bd791..2fce83dd573 100644
--- a/src/plugins/acct_gather_infiniband/ofed/acct_gather_infiniband_ofed.c
+++ b/src/plugins/acct_gather_infiniband/ofed/acct_gather_infiniband_ofed.c
@@ -490,9 +490,8 @@ extern int fini(void)
* for fields < 32 bits in length.
*/
-extern int acct_gather_infiniband_p_update_node(void)
+extern int acct_gather_infiniband_p_node_init(void)
{
- uint32_t profile;
int rc = SLURM_SUCCESS;
acct_gather_profile_g_get(ACCT_GATHER_PROFILE_RUNNING, &profile);
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index 4c8c9dc4779..2aa1e8d4193 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -998,7 +998,7 @@ job_manager(slurmd_job_t *job)
}
acct_gather_profile_g_node_step_start(job);
- acct_gather_infiniband_g_update_node();
+ acct_gather_infiniband_g_node_init();
/* calls pam_setup() and requires pam_finish() if successful */
if ((rc = _fork_all_tasks(job, &io_initialized)) < 0) {
--
GitLab