EH: CS-675 Enhance monitoring so that it can observe more than 256 threads

Author: ernst-bablick

source/libs/uti/msg_utilib.h

@@ -154,7 +154,7 @@
 #define MSG_UTI_MONITOR_MEMERROREXT             _MESSAGE(59133, _("not enough memory for monitor extension"))
 #define MSG_UTI_MONITOR_TETEXT_FF               _MESSAGE(59134, _("pending: %.2f executed: %.2f/s"))
 #define MSG_UTI_MONITOR_EDTEXT_FFFFFFFF         _MESSAGE(59135, _("clients: %.2f mod: %.2f/s ack: %.2f/s blocked: %.2f busy: %.2f | events: %.2f/s added: %.2f/s skipt: %.2f/s"))
-#define MSG_UTI_MONITOR_LISEXT_FFFF             _MESSAGE(59136, _("in (g:%.2f a:%.2f e:%.2f r:%.2f)/s"))
+#define MSG_UTI_MONITOR_LISEXT_FFFFFFF          _MESSAGE(59136, _("in (g:%.2f a:%.2f e:%.2f r:%.2f)/s GDI (g:%.2f,t:%.2f,p:%.2f)/s"))
 #define MSG_UTI_MONITOR_SCHEXT_UUUUUUUUUU       _MESSAGE(59137, _("malloc:                   arena(" sge_U32CFormat ") |ordblks(" sge_U32CFormat ") | smblks(" sge_U32CFormat ") | hblksr(" sge_U32CFormat ") | hblhkd(" sge_U32CFormat ") usmblks(" sge_U32CFormat ") | fsmblks(" sge_U32CFormat ") | uordblks(" sge_U32CFormat ") | fordblks(" sge_U32CFormat ") | keepcost(" sge_U32CFormat ")"))
 #define MSG_UTI_DAEMONIZE_CANT_PIPE             _MESSAGE(59140, _("can't create pipe"))
 #define MSG_UTI_DAEMONIZE_CANT_FCNTL_PIPE       _MESSAGE(59141, _("can't set daemonize pipe to not blocking mode"))

source/libs/uti/sge_monitor.cc

@@ -718,13 +718,17 @@ static void ext_gdi_output(dstring *message, void *monitoring_extension, double
 *     MT-NOTE: ext_lis_output() is MT safe 
 *******************************************************************************/
 static void ext_lis_output(dstring *message, void *monitoring_extension, double time) {
-   auto *gdi_ext = (m_lis_t *) monitoring_extension;
-
-   sge_dstring_sprintf_append(message, MSG_UTI_MONITOR_LISEXT_FFFF,
-                              gdi_ext->inc_gdi / time,
-                              gdi_ext->inc_ack / time,
-                              gdi_ext->inc_ece / time,
-                              gdi_ext->inc_rep / time);
+   auto *lis_ext = (m_lis_t *) monitoring_extension;
+
+   sge_dstring_sprintf_append(message, MSG_UTI_MONITOR_LISEXT_FFFFFFF,
+                              lis_ext->inc_gdi / time,
+                              lis_ext->inc_ack / time,
+                              lis_ext->inc_ece / time,
+                              lis_ext->inc_rep / time,
+                              lis_ext->gdi_get_count / time,
+                              lis_ext->gdi_trig_count / time,
+                              lis_ext->gdi_perm_count / time
+                              );
 }
 
 

source/libs/uti/sge_monitor.h

@@ -316,13 +316,21 @@ typedef struct {
    u_long32 inc_ack; /* ack requests */
    u_long32 inc_ece; /* event client exits */
    u_long32 inc_rep; /* report request */
+
+   u_long32 gdi_get_count;    /* counts the gdi get requests */
+   u_long32 gdi_trig_count;   /* counts the gdi trig requests */
+   u_long32 gdi_perm_count;   /* counts the gdi perm requests */
 } m_lis_t;
 
 #define MONITOR_INC_GDI(monitor)    if ((monitor->monitor_time > 0) && (monitor->ext_type == LIS_EXT)) ((m_lis_t*)(monitor->ext_data))->inc_gdi++
 #define MONITOR_INC_ACK(monitor)    if ((monitor->monitor_time > 0) && (monitor->ext_type == LIS_EXT)) ((m_lis_t*)(monitor->ext_data))->inc_ack++
 #define MONITOR_INC_ECE(monitor)    if ((monitor->monitor_time > 0) && (monitor->ext_type == LIS_EXT)) ((m_lis_t*)(monitor->ext_data))->inc_ece++
 #define MONITOR_INC_REP(monitor)    if ((monitor->monitor_time > 0) && (monitor->ext_type == LIS_EXT)) ((m_lis_t*)(monitor->ext_data))->inc_rep++
 
+#define MONITOR_LIS_GDI_GET(monitor)    if ((monitor->monitor_time > 0) && (monitor->ext_type == LIS_EXT)) ((m_lis_t*)(monitor->ext_data))->gdi_get_count++
+#define MONITOR_LIS_GDI_TRIG(monitor)   if ((monitor->monitor_time > 0) && (monitor->ext_type == LIS_EXT)) ((m_lis_t*)(monitor->ext_data))->gdi_trig_count++
+#define MONITOR_LIS_GDI_PERM(monitor)   if ((monitor->monitor_time > 0) && (monitor->ext_type == LIS_EXT)) ((m_lis_t*)(monitor->ext_data))->gdi_perm_count++
+
 /* event master thread extension */
 
 typedef struct {