SystemStatus attribut in NodeLinkSup objects

src/exe/rt_linksup/src/rt_linksup.c

@@ -73,6 +73,7 @@ struct s_Node {
   gdh_tDlid		  dlid;
   pwr_tBoolean		  found;
   plc_sTimer		  *timer;
+  pwr_tStatus		  *subvalue;			  
 };
 
 static eListState	list_state = eListState_Init;
@@ -309,10 +310,14 @@ init_node (
     tid.c.bix = 1;
     
     aref.Objid = o->Node;
-    sts = gdh_ClassAttrToAttrref(pwr_eClass_Node, ".CurrentVersion", &aref);
+    sts = gdh_ClassAttrToAttrref(pwr_eClass_Node, ".SystemStatus", &aref);
     sts = gdh_SubRefObjectInfoAttrref(&aref, &o->SubId);
-    if ( EVEN(sts))
+    if ( EVEN(sts)) {
       errh_Error("Couldn't get link to Node object, %m", sts);
+      o->SystemStatus = PWR__NETTIMEOUT;
+    }
+    else
+      gdh_SubAssociateBuffer(o->SubId, (void **)&np->subvalue, sizeof(pwr_tStatus));
   }
 
   return np;
@@ -429,11 +434,13 @@ scan_nodes ()
       time_Aadd(&Timeout, &LastUpdate, &Delta);
       if (time_Acomp(&CurrentTime, &Timeout) < 0) 
 	LinkUp = 1;
+      o->SystemStatus = *np->subvalue;
     }
 
     if (o->LinkUp && !LinkUp) {
       o->LinkUp = 0;
       o->DownTime = CurrentTime;
+      o->SystemStatus = PWR__NETTIMEOUT;
     } else if (!o->LinkUp && LinkUp) {
       o->LinkUp = 1;
       o->UpTime = CurrentTime;

src/wbl/pwrb/src/pwrb_c_nodelinksup.wb_load

@@ -575,6 +575,18 @@ SObject pwrb:Class
           Attr Flags |= PWR_MASK_INVISIBLE
         EndBody
       EndObject
+      !/**
+      ! Contains the system status of the supervised node.
+      ! If the link is down, the status is PWR__NETTIMEOUT.
+      !*/
+      Object SystemStatus $Intern 43 
+        Body SysBody
+          Attr PgmName = "SystemStatus"
+          Attr TypeRef = "pwrs:Type-$Status"
+          Attr Flags |= PWR_MASK_NOEDIT
+          Attr Flags |= PWR_MASK_STATE
+        EndBody
+      EndObject
       !
       ! End Timer struct
       ! --