From bf8acbd30e3163c9a973da8b6a3a7fc24aa162c3 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 9 Dec 2015 14:22:45 -0800
Subject: [PATCH] Move initialize_tres_list and rename
sacctmgr_initialize_g_tres_list function to common.c from last commit.
---
src/sacctmgr/association_functions.c | 42 +++++++++++-----------------
src/sacctmgr/common.c | 11 ++++++++
src/sacctmgr/sacctmgr.h | 1 +
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/sacctmgr/association_functions.c b/src/sacctmgr/association_functions.c
index 950f3846391..b11be7e4835 100644
--- a/src/sacctmgr/association_functions.c
+++ b/src/sacctmgr/association_functions.c
@@ -319,16 +319,6 @@ extern int sacctmgr_set_assoc_cond(slurmdb_assoc_cond_t *assoc_cond,
return set;
}
-extern void initialize_tres_list(void)
-{
- if (!g_tres_list) {
- slurmdb_tres_cond_t tres_cond;
- memset(&tres_cond, 0, sizeof(slurmdb_tres_cond_t));
- tres_cond.with_deleted = 1;
- g_tres_list = slurmdb_tres_get(db_conn, &tres_cond);
- }
-}
-
extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
char *type, char *value,
int command_len, int option)
@@ -372,7 +362,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
set = 1;
}
} else if (!strncasecmp(type, "GrpCPUMins", MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"GrpCPUMins") == SLURM_SUCCESS) {
@@ -386,7 +376,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "GrpCPURunMins", MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"GrpCPURunMins") == SLURM_SUCCESS) {
@@ -399,7 +389,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "GrpCpus", MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"GrpCpus") == SLURM_SUCCESS) {
@@ -416,7 +406,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
"GrpJobs") == SLURM_SUCCESS)
set = 1;
} else if (!strncasecmp(type, "GrpMemory", MAX(command_len, 4))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"GrpMemory") == SLURM_SUCCESS) {
@@ -429,7 +419,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "GrpNodes", MAX(command_len, 4))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"GrpNodes") == SLURM_SUCCESS) {
@@ -447,7 +437,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
"GrpSubmitJobs") == SLURM_SUCCESS)
set = 1;
} else if (!strncasecmp(type, "GrpTRES", MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if ((tmp_char = slurmdb_format_tres_str(
value, g_tres_list, 1))) {
@@ -458,7 +448,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "GrpTRESMins", MAX(command_len, 8))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if ((tmp_char = slurmdb_format_tres_str(
value, g_tres_list, 1))) {
@@ -469,7 +459,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "GrpTRESRunMins", MAX(command_len, 8))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if ((tmp_char = slurmdb_format_tres_str(
value, g_tres_list, 1))) {
@@ -490,7 +480,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
}
} else if (!strncasecmp(type, "MaxCPUMinsPerJob",
MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"MaxCPUMinsPerJob") == SLURM_SUCCESS) {
@@ -503,7 +493,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "MaxCPURunMins", MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"MaxCPURunMins") == SLURM_SUCCESS) {
@@ -516,7 +506,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "MaxCpusPerJob", MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"MaxCpusPerJob") == SLURM_SUCCESS) {
@@ -533,7 +523,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
"MaxJobs") == SLURM_SUCCESS)
set = 1;
} else if (!strncasecmp(type, "MaxNodesPerJob", MAX(command_len, 4))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if (get_uint64(value, &tmp64,
"MaxNodes") == SLURM_SUCCESS) {
@@ -550,7 +540,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
"MaxSubmitJobs") == SLURM_SUCCESS)
set = 1;
} else if (!strncasecmp(type, "MaxTRESPerJob", MAX(command_len, 7))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if ((tmp_char = slurmdb_format_tres_str(
value, g_tres_list, 1))) {
@@ -561,7 +551,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "MaxTRESPerNode", MAX(command_len, 11))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if ((tmp_char = slurmdb_format_tres_str(
value, g_tres_list, 1))) {
@@ -573,7 +563,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
}
} else if (!strncasecmp(type, "MaxTRESMinsPerJob",
MAX(command_len, 8))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if ((tmp_char = slurmdb_format_tres_str(
value, g_tres_list, 1))) {
@@ -584,7 +574,7 @@ extern int sacctmgr_set_assoc_rec(slurmdb_assoc_rec_t *assoc,
xfree(tmp_char);
}
} else if (!strncasecmp(type, "MaxTRESRunMins", MAX(command_len, 8))) {
- initialize_tres_list();
+ sacctmgr_initialize_g_tres_list();
if ((tmp_char = slurmdb_format_tres_str(
value, g_tres_list, 1))) {
diff --git a/src/sacctmgr/common.c b/src/sacctmgr/common.c
index 3ff6b6f0312..3c6f5f6ea46 100644
--- a/src/sacctmgr/common.c
+++ b/src/sacctmgr/common.c
@@ -1943,3 +1943,14 @@ extern int sacctmgr_validate_cluster_list(List cluster_list)
return rc;
}
+
+
+extern void sacctmgr_initialize_g_tres_list(void)
+{
+ if (!g_tres_list) {
+ slurmdb_tres_cond_t tres_cond;
+ memset(&tres_cond, 0, sizeof(slurmdb_tres_cond_t));
+ tres_cond.with_deleted = 1;
+ g_tres_list = slurmdb_tres_get(db_conn, &tres_cond);
+ }
+}
diff --git a/src/sacctmgr/sacctmgr.h b/src/sacctmgr/sacctmgr.h
index aca2e098a9a..a75776b1c56 100644
--- a/src/sacctmgr/sacctmgr.h
+++ b/src/sacctmgr/sacctmgr.h
@@ -337,6 +337,7 @@ extern slurmdb_cluster_rec_t *sacctmgr_find_cluster_from_list(
extern slurmdb_wckey_rec_t *sacctmgr_find_wckey_from_list(
List wckey_list, char *user, char *name, char *cluster);
+extern void sacctmgr_initialize_g_tres_list(void);
/* file_functions.c */
extern int print_file_add_limits_to_line(char **line,
--
GitLab