Ticket #1550: 0003-Enhmt-1550-Added-STN_queued-to-sharetree-node-object.patch

File 0003-Enhmt-1550-Added-STN_queued-to-sharetree-node-object.patch, 3.5 KB (added by markdixon, 4 years ago)

3/6

  • source/libs/sched/sgeee.c

    From d745e0089e1d91878d877748de084066f9d7c7b3 Mon Sep 17 00:00:00 2001
    From: Mark Dixon <m.c.dixon@leeds.ac.uk>
    Date: Wed, 12 Aug 2015 10:48:11 +0100
    Subject: [PATCH 3/6] Enhmt #1550 Added STN_queued to sharetree node objects
    
    Temporary field only to be used during job priority calculations.
    ---
     source/libs/sched/sgeee.c                |    4 +++-
     source/libs/sgeobj/sge_sharetree_STN_L.h |    7 +++++++
     2 files changed, 10 insertions(+), 1 deletions(-)
    
    diff --git a/source/libs/sched/sgeee.c b/source/libs/sched/sgeee.c
    index cb290e7..02013c2 100644
    a b sge_init_share_tree_node_fields( lListElem *node, 
    10061006              sn_job_ref_count_pos, sn_active_job_ref_count_pos,
    10071007              sn_usage_list_pos, sn_stt_pos, sn_ostt_pos,
    10081008              sn_ltt_pos, sn_oltt_pos, sn_shr_pos, sn_ref_pos,
    1009               sn_actual_proportion_pos;
     1009              sn_actual_proportion_pos, sn_queued_pos;
    10101010
    10111011
    10121012   if (sn_m_share_pos == -1) {
    sge_init_share_tree_node_fields( lListElem *node, 
    10261026      sn_shr_pos = lGetPosViaElem(node, STN_shr, SGE_NO_ABORT);
    10271027      sn_ref_pos = lGetPosViaElem(node, STN_ref, SGE_NO_ABORT);
    10281028      sn_actual_proportion_pos = lGetPosViaElem(node, STN_actual_proportion, SGE_NO_ABORT);
     1029      sn_queued_pos = lGetPosViaElem(node, STN_queued, SGE_NO_ABORT);
    10291030   }
    10301031
    10311032   lSetPosDouble(node, sn_m_share_pos, 0);
    sge_init_share_tree_node_fields( lListElem *node, 
    10421043   lSetPosDouble(node, sn_oltt_pos, 0);
    10431044   lSetPosDouble(node, sn_shr_pos, 0);
    10441045   lSetPosUlong(node, sn_ref_pos, 0);
     1046   lSetPosUlong(node, sn_queued_pos, 0);
    10451047   return 0;
    10461048}
    10471049
  • source/libs/sgeobj/sge_sharetree_STN_L.h

    diff --git a/source/libs/sgeobj/sge_sharetree_STN_L.h b/source/libs/sgeobj/sge_sharetree_STN_L.h
    index cdc85b1..66f9192 100644
    a b enum { 
    132132                              * used during scheduling of pending jobs,
    133133                              * set in schedd, not stored to qmaster,
    134134                              * not spooled */
     135   STN_queued,               /* Queued state of a temporary job node,
     136                              * used during scheduling of pending jobs,
     137                              * set in schedd, not stored to qmaster,
     138                              * not spooled */
    135139   STN_usage_list,           /* Node usage list used during scheduling
    136140                              * of pending jobs, set in schedd,
    137141                              * not stored to qmaster, not spooled */
    enum { 
    168172   STN_tickets_POS,
    169173   STN_jobid_POS,
    170174   STN_taskid_POS,
     175   STN_queued_POS,
    171176   STN_usage_list_POS, 
    172177   STN_version_POS     
    173178};
    LISTDEF(STN_Type) 
    204209   SGE_DOUBLE(STN_tickets, CULL_DEFAULT | CULL_JGDI_HIDDEN)                                                   
    205210   SGE_ULONG(STN_jobid, CULL_DEFAULT | CULL_JGDI_HIDDEN)                                                 
    206211   SGE_ULONG(STN_taskid, CULL_DEFAULT | CULL_JGDI_HIDDEN)                                                 
     212   SGE_ULONG(STN_queued, CULL_DEFAULT | CULL_JGDI_HIDDEN)
    207213   SGE_MAP(STN_usage_list,UA_Type, CULL_DEFAULT | CULL_JGDI_HIDDEN)                                     
    208214   SGE_ULONG(STN_version, CULL_DEFAULT | CULL_JGDI_HIDDEN)
    209215LISTEND
    NAMEDEF(STNN) 
    237243   NAME("STN_tickets")
    238244   NAME("STN_jobid")
    239245   NAME("STN_taskid")
     246   NAME("STN_queued")
    240247   NAME("STN_usage_list")
    241248   NAME("STN_version")
    242249NAMEEND