Skip to content

Commit 29912b7

Browse files
committed
EH: CS-206: Introduce new GDI category objects
1 parent 7737c24 commit 29912b7

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

source/libs/sgeobj/cull/sge_job_JB_L.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,9 @@
381381
* SGE_ULONG(JB_sync_options) - sync options
382382
* Bits that have been specified to the -sync switch.
383383
*
384+
* SGE_ULONG(JB_category_id) - Category ID (CAT_id)
385+
* Category ID (CAT_id). Within the scheduler the field category refers to the category object.
386+
*
384387
*/
385388

386389
enum {
@@ -468,7 +471,8 @@ enum {
468471
JB_submission_command_line,
469472
JB_grp_list,
470473
JB_joker,
471-
JB_sync_options
474+
JB_sync_options,
475+
JB_category_id
472476
};
473477

474478
LISTDEF(JB_Type)
@@ -557,6 +561,7 @@ LISTDEF(JB_Type)
557561
SGE_LIST(JB_grp_list, ST_Type, CULL_SPOOL)
558562
SGE_LIST(JB_joker, VA_Type, CULL_SPOOL)
559563
SGE_ULONG(JB_sync_options, CULL_SPOOL)
564+
SGE_ULONG(JB_category_id, CULL_HASH)
560565
LISTEND
561566

562567
NAMEDEF(JBN)
@@ -645,6 +650,7 @@ NAMEDEF(JBN)
645650
NAME("JB_grp_list")
646651
NAME("JB_joker")
647652
NAME("JB_sync_options")
653+
NAME("JB_category_id")
648654
NAMEEND
649655

650656
#define JB_SIZE sizeof(JBN)/sizeof(char *)

source/libs/sgeobj/json/JB.json

+10
Original file line numberDiff line numberDiff line change
@@ -1061,5 +1061,15 @@
10611061
"flags": [{
10621062
"name": "SPOOL"
10631063
}]
1064+
}, {
1065+
"name": "category_id",
1066+
"summary": "Category ID (CAT_id)",
1067+
"description": [{
1068+
"line": "Category ID (CAT_id). Within the scheduler the field category refers to the category object."
1069+
}],
1070+
"type": "lUlongT",
1071+
"flags": [{
1072+
"name": "HASH"
1073+
}]
10641074
}]
10651075
}

source/libs/sgeobj/lwdb/ocs_JB_attributes.h

+5-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ enum {
113113
JB_submission_command_line,
114114
JB_grp_list,
115115
JB_joker,
116-
JB_sync_options
116+
JB_sync_options,
117+
JB_category_id
117118
};
118119

119120
constexpr const int JB_Type[] = {
@@ -202,6 +203,7 @@ constexpr const int JB_Type[] = {
202203
JB_grp_list,
203204
JB_joker,
204205
JB_sync_options,
206+
JB_category_id,
205207
AttributeStatic::END_OF_ATTRIBUTES
206208
};
207209

@@ -290,7 +292,8 @@ constexpr const int JB_Type[] = {
290292
{JB_submission_command_line, "JB_submission_command_line", AttributeStatic::STRING, nullptr, AttributeStatic::NO_POS, AttributeStatic::NO_HASH, false, true}, \
291293
{JB_grp_list, "JB_grp_list", AttributeStatic::LIST, nullptr, AttributeStatic::NO_POS, AttributeStatic::NO_HASH, false, true}, \
292294
{JB_joker, "JB_joker", AttributeStatic::LIST, nullptr, AttributeStatic::NO_POS, AttributeStatic::NO_HASH, false, true}, \
293-
{JB_sync_options, "JB_sync_options", AttributeStatic::UINT32, nullptr, AttributeStatic::NO_POS, AttributeStatic::NO_HASH, false, true} \
295+
{JB_sync_options, "JB_sync_options", AttributeStatic::UINT32, nullptr, AttributeStatic::NO_POS, AttributeStatic::NO_HASH, false, true}, \
296+
{JB_category_id, "JB_category_id", AttributeStatic::UINT32, nullptr, AttributeStatic::NO_POS, AttributeStatic::UNORDERED_UNIQUE, false, false} \
294297

295298
} // end namespace
296299

0 commit comments

Comments
 (0)