]> jspc29.x-matter.uni-frankfurt.de Git - daqdata.git/commitdiff
new features added. Sergey Yurevich
authorhadaq <hadaq>
Fri, 6 Jun 2008 15:46:10 +0000 (15:46 +0000)
committerhadaq <hadaq>
Fri, 6 Jun 2008 15:46:10 +0000 (15:46 +0000)
ebctrl/ioc/ebctrlApp/Db/evtbuild.db
ebctrl/ioc/ebctrlApp/Db/netmem.db
ebctrl/ioc/ebctrlApp/src/evtbuild.c
ebctrl/ioc/ebctrlApp/src/genrunid.c
ebctrl/ioc/ebctrlApp/src/netmem.c
ebctrl/mon/ebctrl.adl
ebctrl/mon/netmemctrl.adl

index f36c9272b5c68f8162eb4b9ce45735423f8318cd..baab933fb9291800a0ae5ea707fb895f9ef6e635 100755 (executable)
@@ -25,6 +25,8 @@ record(genSub,"HAD:$(eb)") {
     field(FTH,"LONG")\r
     field(FTI,"LONG")\r
     field(FTJ,"LONG")\r
+    field(FTK,"LONG")\r
+    field(FTL,"STRING")\r
     field(FTVA,"LONG")\r
     field(FTVB,"LONG")\r
     field(FTVC,"LONG")\r
@@ -35,6 +37,8 @@ record(genSub,"HAD:$(eb)") {
     field(FTVH,"LONG")\r
     field(FTVI,"LONG")\r
     field(FTVJ,"LONG")\r
+    field(FTVK,"LONG")\r
+    field(FTVL,"SRTING")\r
     field(NOA,"50")\r
     field(NOB,"50")\r
     field(NOC,"50")\r
@@ -45,6 +49,8 @@ record(genSub,"HAD:$(eb)") {
     field(NOH,"50")\r
     field(NOI,"50")\r
     field(NOJ,"50")\r
+    field(NOK,"50")\r
+    field(NOL,"50")\r
     field(NOVA,"1")\r
     field(NOVB,"1")\r
     field(NOVC,"1")\r
@@ -55,72 +61,100 @@ record(genSub,"HAD:$(eb)") {
     field(NOVH,"1")\r
     field(NOVI,"1")\r
     field(NOVJ,"1")\r
+    field(NOVK,"1")\r
+    field(NOVL,"1")\r
     field(OUTA,"HAD:$(eb):nrOfMsgs PP NMS")\r
     field(OUTB,"HAD:$(eb):byteWrit PP NMS")    \r
-    field(OUTC,"HAD:$(eb):evtsComp PP NMS")\r
-    field(OUTD,"HAD:$(eb):evtsDisc PP NMS")\r
-    field(OUTE,"HAD:$(eb):evtsDataErr PP NMS")\r
-    field(OUTF,"HAD:$(eb):evtsTagErr PP NMS")  \r
-    field(OUTG,"HAD:$(eb):evtbuildBuff PP NMS")\r
+    field(OUTC,"HAD:$(eb):evtComp PP NMS")\r
+    field(OUTD,"HAD:$(eb):evtDisc PP NMS")\r
+    field(OUTE,"HAD:$(eb):evtDataErr PP NMS")\r
+    field(OUTF,"HAD:$(eb):evtTagErr PP NMS")   \r
+    field(OUTG,"HAD:$(eb):ebBuff PP NMS")\r
     field(OUTH,"HAD:$(eb):status PP NMS")\r
-    field(OUTI,"HAD:$(eb):evtsCompletePS PP NMS")\r
-    field(OUTJ,"HAD:$(eb):bytesWrittenPS PP NMS")      \r
+    field(OUTI,"HAD:$(eb):evtCRate PP NMS")\r
+    field(OUTJ,"HAD:$(eb):byteWRate PP NMS")   \r
+    field(OUTK,"HAD:$(eb):evtDRate PP NMS")\r
+    field(OUTL,"HAD:$(eb):byteWRateStr PP NMS")\r
 }\r
+\r
+record(stringin,"HAD:$(eb):byteWRateStr")\r
+{\r
+    field(DTYP,"Soft Channel")\r
+    field(SCAN,"Passive")\r
+    field(INP,"Constant")\r
+}\r
+\r
 record(longin,"HAD:$(eb):nrOfMsgs")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
+\r
 record(longin,"HAD:$(eb):byteWrit")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
-record(longin,"HAD:$(eb):evtsComp")\r
+\r
+record(longin,"HAD:$(eb):evtComp")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
-record(longin,"HAD:$(eb):evtsDisc")\r
+\r
+record(longin,"HAD:$(eb):evtDisc")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
-record(longin,"HAD:$(eb):evtsDataErr")\r
+\r
+record(longin,"HAD:$(eb):evtDataErr")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
-record(longin,"HAD:$(eb):evtsTagErr")\r
+\r
+record(longin,"HAD:$(eb):evtTagErr")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
+\r
 record(longin,"HAD:$(eb):status")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
-record(longin,"HAD:$(eb):evtsCompletePS")\r
+\r
+record(longin,"HAD:$(eb):evtCRate")\r
+{\r
+    field(DTYP,"Soft Channel")\r
+    field(SCAN,"Passive")\r
+    field(INP,"Constant")\r
+}\r
+\r
+record(longin,"HAD:$(eb):byteWRate")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
-record(longin,"HAD:$(eb):bytesWrittenPS")\r
+\r
+record(longin,"HAD:$(eb):evtDRate")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
     field(INP,"Constant")\r
 }\r
-record(waveform,"HAD:$(eb):evtbuildBuff")\r
+\r
+record(waveform,"HAD:$(eb):ebBuff")\r
 {\r
     field(DTYP,"Soft Channel")\r
     field(SCAN,"Passive")\r
@@ -128,6 +162,7 @@ record(waveform,"HAD:$(eb):evtbuildBuff")
     field(NELM,"100")\r
     field(FTVL,"LONG")\r
 }\r
+\r
 record(sub,"HAD:genRunId") {\r
                 field(DESC, "subroutine")\r
                 field(SCAN, "1 second")\r
@@ -136,6 +171,7 @@ record(sub,"HAD:genRunId") {
                 field(INAM, "genRunId_init")\r
                 field(SNAM, "genRunId_proc")\r
 }\r
+\r
 record(sub,"HAD:writeRunId") {\r
                 field(DESC, "subroutine")\r
                 field(SCAN, "1 second")\r
index 6fd5014ab6ef92537e5d6a0b3d14d1d3972532d7..8b0c5b3f350f76ecf288cc4fef2bb809b552b87f 100644 (file)
@@ -49,19 +49,21 @@ record(genSub,"HAD:$(eb):netmem") {
     field(NOVH,"100")
     field(OUTA,"HAD:$(eb):netmem:nrOfMsgs PP NMS")             
     field(OUTB,"HAD:$(eb):netmem:buff PP NMS")
-    field(OUTC,"HAD:$(eb):netmem:pktsReceived PP NMS")
-    field(OUTD,"HAD:$(eb):netmem:msgsReceived PP NMS")
-    field(OUTE,"HAD:$(eb):netmem:pktsDiscarded PP NMS")
-    field(OUTF,"HAD:$(eb):netmem:msgsDiscarded PP NMS")
-    field(OUTG,"HAD:$(eb):netmem:bytesReceived PP NMS")
-    field(OUTH,"HAD:$(eb):netmem:bytesReceivedPS PP NMS")
+    field(OUTC,"HAD:$(eb):netmem:pktsRcv PP NMS")
+    field(OUTD,"HAD:$(eb):netmem:msgsRcv PP NMS")
+    field(OUTE,"HAD:$(eb):netmem:pktsDis PP NMS")
+    field(OUTF,"HAD:$(eb):netmem:msgsDis PP NMS")
+    field(OUTG,"HAD:$(eb):netmem:byteRcv PP NMS")
+    field(OUTH,"HAD:$(eb):netmem:byteRRate PP NMS")
 }
+
 record(longin,"HAD:$(eb):netmem:nrOfMsgs")
 {
     field(DTYP,"Soft Channel")
     field(SCAN,"Passive")
     field(INP,"Constant")
 }
+
 record(waveform,"HAD:$(eb):netmem:buff")
 {
     field(DTYP,"Soft Channel")
@@ -70,7 +72,8 @@ record(waveform,"HAD:$(eb):netmem:buff")
     field(NELM,"100")
     field(FTVL,"LONG")
 }
-record(waveform,"HAD:$(eb):netmem:pktsReceived")
+
+record(waveform,"HAD:$(eb):netmem:pktsRcv")
 {
     field(DTYP,"Soft Channel")
     field(SCAN,"Passive")
@@ -78,7 +81,8 @@ record(waveform,"HAD:$(eb):netmem:pktsReceived")
     field(NELM,"100")
     field(FTVL,"LONG")
 }
-record(waveform,"HAD:$(eb):netmem:msgsReceived")
+
+record(waveform,"HAD:$(eb):netmem:msgsRcv")
 {
     field(DTYP,"Soft Channel")
     field(SCAN,"Passive")
@@ -86,7 +90,8 @@ record(waveform,"HAD:$(eb):netmem:msgsReceived")
     field(NELM,"100")
     field(FTVL,"LONG")
 }
-record(waveform,"HAD:$(eb):netmem:pktsDiscarded")
+
+record(waveform,"HAD:$(eb):netmem:pktsDis")
 {
     field(DTYP,"Soft Channel")
     field(SCAN,"Passive")
@@ -94,7 +99,8 @@ record(waveform,"HAD:$(eb):netmem:pktsDiscarded")
     field(NELM,"100")
     field(FTVL,"LONG")
 }
-record(waveform,"HAD:$(eb):netmem:msgsDiscarded")
+
+record(waveform,"HAD:$(eb):netmem:msgsDis")
 {
     field(DTYP,"Soft Channel")
     field(SCAN,"Passive")
@@ -102,7 +108,8 @@ record(waveform,"HAD:$(eb):netmem:msgsDiscarded")
     field(NELM,"100")
     field(FTVL,"LONG")
 }
-record(waveform,"HAD:$(eb):netmem:bytesReceived")
+
+record(waveform,"HAD:$(eb):netmem:byteRcv")
 {
     field(DTYP,"Soft Channel")
     field(SCAN,"Passive")
@@ -110,7 +117,8 @@ record(waveform,"HAD:$(eb):netmem:bytesReceived")
     field(NELM,"100")
     field(FTVL,"LONG")
 }
-record(waveform,"HAD:$(eb):netmem:bytesReceivedPS")
+
+record(waveform,"HAD:$(eb):netmem:byteRRate")
 {
     field(DTYP,"Soft Channel")
     field(SCAN,"Passive")
index 8a2385c1d3ae0ce5c6e68e337156c443c97c70b8..c5d627d96f40aa3eb13726916c1b2fb8939ba3c2 100644 (file)
@@ -1,16 +1,31 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <dbDefs.h>
 #include <registryFunction.h>
 #include <subRecord.h>
 #include <epicsExport.h>
 #include <genSubRecord.h>
+#include <stringinRecord.h>
 
 #include "worker.h"
 
 int evtbuildDebug;
 
+static char *unit (unsigned long v)
+{
+  static char retVal[6];
+  static char u[] = " kM";
+  static char b[] = "B";
+  int i;
+
+  for (i = 0; v >= 10000 && i < sizeof (u) - 2; v /= 1000, i++) {}
+  sprintf (retVal, "%4lu %c%c", v, u[i],b[0]);
+
+  return retVal;
+}
+
 long evtbuild_init( struct genSubRecord *pgsub )
 {
   return(0);
@@ -19,22 +34,24 @@ long evtbuild_init( struct genSubRecord *pgsub )
 long evtbuild_proc( struct genSubRecord *pgsub )
 {
   
-  unsigned long *out[7];
-  unsigned long *temp;
+  unsigned long *out[11];
+  static unsigned long temp[10] = {0};
   int i;
 
-  out[0] = (unsigned long *)pgsub->vala;  /* nrOfMsgs */
-  out[1] = (unsigned long *)pgsub->valb;  /* bytesWritten */
-  out[2] = (unsigned long *)pgsub->valc;  /* evtsComplete */
-  out[3] = (unsigned long *)pgsub->vald;  /* evtsDiscarded */
-  out[4] = (unsigned long *)pgsub->vale;  /* evtsDataError */
-  out[5] = (unsigned long *)pgsub->valf;  /* evtsTagError */
-  out[6] = (unsigned long *)pgsub->valg;  /* evtbuildBuff */
-  out[7] = (unsigned long *)pgsub->valh;  /* status */
-  out[8] = (unsigned long *)pgsub->vali;  /* evtsCompletePS */
-  out[8] = (unsigned long *)pgsub->valj;  /* bytesWrittenPS */
-
-  for( i=0; i<7; i++ )
+  out[0]  = (unsigned long *)pgsub->vala;  /* nrOfMsgs */
+  out[1]  = (unsigned long *)pgsub->valb;  /* bytesWritten */
+  out[2]  = (unsigned long *)pgsub->valc;  /* evtsComplete */
+  out[3]  = (unsigned long *)pgsub->vald;  /* evtsDiscarded */
+  out[4]  = (unsigned long *)pgsub->vale;  /* evtsDataError */
+  out[5]  = (unsigned long *)pgsub->valf;  /* evtsTagError */
+  out[6]  = (unsigned long *)pgsub->valg;  /* evtbuildBuff */
+  out[7]  = (unsigned long *)pgsub->valh;  /* status */
+  out[8]  = (unsigned long *)pgsub->vali;  /* evtsCompleteRate */
+  out[9]  = (unsigned long *)pgsub->valj;  /* bytesWrittenRate */
+  out[10] = (unsigned long *)pgsub->valk;  /* evtsDiscardedRate */
+  /* pgsub->vall : bytesWrittenRate in stringin record (array of char's) */
+
+  for( i=0; i<11; i++ )
     *out[i] = 0;
 
   if( Worker_getStatistic( "daq_evtbuild", "nrOfMsgs", out[0] ) == -1) {
@@ -48,17 +65,51 @@ long evtbuild_proc( struct genSubRecord *pgsub )
       printf("Worker_getStatistic::nrOfMsgs = %lu\n", (*out[0]));
   }
 
-  if( Worker_getStatistic( "daq_evtbuild", "bytesWritten", out[1] ) == -1)
+  if( Worker_getStatistic( "daq_evtbuild", "bytesWritten", out[1] ) == -1) {
+    *out[9] = 0; /* zero data rate */
     if(evtbuildDebug)
       printf("Worker_getStatistic failed for bytesWritten!\n");
+  }
+  else {
+    /* calculate data rate and convert from Bytes to kB */
+    if( ((long)(*out[1]) - (long)temp[1]) >= 0 )
+      *out[9] = (int)((*out[1] - temp[1])/1024. + 0.5);
+    else
+      *out[9] = (int)((*out[1])/1024. + 0.5);
+
+    temp[1] = *out[1];
+
+    /* convert bytesWritten from Bytes to MB */
+    *out[1] = (int)((*out[1])/1024./1024. + 0.5);
+  }
 
-  if( Worker_getStatistic( "daq_evtbuild", "evtsComplete", out[2] ) == -1)
+  if( Worker_getStatistic( "daq_evtbuild", "evtsComplete", out[2] ) == -1) {
+    *out[8] = 0; /* zero evtComp rate  */
     if(evtbuildDebug)
       printf("Worker_getStatistic failed for evtsComplete!\n");
+  }
+  else{
+    if( ((long)(*out[2]) - (long)temp[2]) >= 0 )
+      *out[8] = *out[2] - temp[2]; /* calculate evtComp rate */
+    else
+      *out[8] = *out[2];
+
+    temp[2] = *out[2];
+  }
 
-  if( Worker_getStatistic( "daq_evtbuild", "evtsDiscarded", out[3] ) == -1)
+  if( Worker_getStatistic( "daq_evtbuild", "evtsDiscarded", out[3] ) == -1) {
+    *out[10] = 0; /* zero evtDisc rate */
     if(evtbuildDebug)
       printf("Worker_getStatistic failed for evtsDiscarded!\n");
+  }
+  else {
+    if( (*out[3] - temp[3]) > 0 )
+      *out[10] = *out[3] - temp[3]; /* calculate evtDisc rate */
+    else
+      *out[10] = *out[3];
+
+    temp[3]  = *out[3];
+  }
 
   if( Worker_getStatistic( "daq_evtbuild", "evtsDataError", out[4] ) == -1)
     if(evtbuildDebug)
@@ -85,14 +136,12 @@ long evtbuild_proc( struct genSubRecord *pgsub )
     }
   }
 
-  if( Worker_getStatistic( "daq_evtbuild", "evtsCompletePS", out[8] ) == -1)
-    if(evtbuildDebug)
-      printf("Worker_getStatistic failed for evtsCompletePS!\n");
-  
-  if( Worker_getStatistic( "daq_evtbuild", "bytesWrittenPS", out[9] ) == -1)
-    if(evtbuildDebug)
-      printf("Worker_getStatistic failed for bytesWrittenPS!\n");
-
+  /*
+   *   int bytedCoverted;   
+   *   sprintf( buf, "%s", unit(*out[9]));
+   *   strcpy(pgsub->vall, buf);
+   */
   return(0);
 }
 
index 4b44a75f5536ccc129b8b1836bea9e3bb0a217ec..264fe5d7e559e5c04f014942f01dccd539457229 100644 (file)
@@ -21,7 +21,7 @@ long genRunId_proc( struct subRecord *psub )
   static long runId    = 0;
   static long runIdOld = 0;
   long timeoffset = 1200000000;        /* seconds */
-  long sizelimit  = 500*1024*1024;     /* bytes */
+  long sizelimit  = 100; /* bytes (MB) */
   int fileSize    = 0;
   int status      = 0;
   struct timeval tv;
@@ -56,12 +56,13 @@ long genRunId_proc( struct subRecord *psub )
   }
   else{
 
-    fileSize = psub->a; /* size of the data file written by event builder */
+    fileSize = psub->a; /* size (MB) of the data file written by event builder */
     status   = (int) psub->b; /* status of the event buidler (1=on/0=off) */
 
     if( status == 0 ) {
       if( genrunidDebug ) {
        printf( "genrunid.c: Event Builder is off, status: %d\n", status );
+       printf( "genrunid.c: Check permissions of EB shared memory segment\n");
        /*
         *  One of the reasons for this message might be closed permissions
         *  for (/dev/shm/daq_evtbuild.shm) shared memory access. 
index 74f272ab6d737d1e6b8ef00a3fb33761e18bc4c8..979fe0eb8fad00c9b3654ebec768493b167a30a2 100644 (file)
@@ -19,7 +19,7 @@ long netmem_init( struct genSubRecord *pgsub )
 long netmem_proc( struct genSubRecord *pgsub )
 {
 
-  unsigned long *out[2];
+  unsigned long *out[8];
   int i;
 
   out[0] = (unsigned long *)pgsub->vala;  /* number of sources */
@@ -29,7 +29,7 @@ long netmem_proc( struct genSubRecord *pgsub )
   out[4] = (unsigned long *)pgsub->vale;  /* pktsDiscarded */
   out[5] = (unsigned long *)pgsub->valf;  /* msgsDiscarded */
   out[6] = (unsigned long *)pgsub->valg;  /* bytesReceived */
-  out[7] = (unsigned long *)pgsub->valh;  /* bytesReceivedPS */
+  out[7] = (unsigned long *)pgsub->valh;  /* bytesReceivedRate */
 
   for( i=0; i<2; i++ )
     *out[1] = 0;
@@ -44,9 +44,10 @@ long netmem_proc( struct genSubRecord *pgsub )
   }
 
   char buf[100];
+
   for( i=0; i<(*out[0]); i++ ) {
 
-    sprintf( buf, "netmemBuff%d", i );
+    sprintf( buf, "%s%d", "netmemBuff", i );
 
     if( Worker_getStatistic( "daq_netmem", buf, out[1] ) == -1) {
       if(netmemDebug)
@@ -62,7 +63,7 @@ long netmem_proc( struct genSubRecord *pgsub )
 
   for( i=0; i<(*out[0]); i++ ) {
 
-    sprintf( buf, "pktsReceived%d", i );
+    sprintf( buf, "%s%d", "pktsReceived", i );
 
     if( Worker_getStatistic( "daq_netmem", buf, out[2] ) == -1) {
       if(netmemDebug)
@@ -78,7 +79,7 @@ long netmem_proc( struct genSubRecord *pgsub )
 
   for( i=0; i<(*out[0]); i++ ) {
 
-    sprintf( buf, "msgsReceived%d", i );
+    sprintf( buf, "%s%d", "msgsReceived", i );
 
     if( Worker_getStatistic( "daq_netmem", buf, out[3] ) == -1) {
       if(netmemDebug)
@@ -94,7 +95,7 @@ long netmem_proc( struct genSubRecord *pgsub )
 
   for( i=0; i<(*out[0]); i++ ) {
 
-    sprintf( buf, "pktsDiscarded%d", i );
+    sprintf( buf, "%s%d", "pktsDiscarded", i );
 
     if( Worker_getStatistic( "daq_netmem", buf, out[4] ) == -1) {
       if(netmemDebug)
@@ -110,7 +111,7 @@ long netmem_proc( struct genSubRecord *pgsub )
 
   for( i=0; i<(*out[0]); i++ ) {
 
-    sprintf( buf, "msgsDiscarded%d", i );
+    sprintf( buf, "%s%d", "msgsDiscarded", i );
 
     if( Worker_getStatistic( "daq_netmem", buf, out[5] ) == -1) {
       if(netmemDebug)
@@ -126,7 +127,7 @@ long netmem_proc( struct genSubRecord *pgsub )
 
   for( i=0; i<(*out[0]); i++ ) {
 
-    sprintf( buf, "bytesReceived%d", i );
+    sprintf( buf, "%s%d", "bytesReceived", i );
 
     if( Worker_getStatistic( "daq_netmem", buf, out[6] ) == -1) {
       if(netmemDebug)
@@ -136,13 +137,14 @@ long netmem_proc( struct genSubRecord *pgsub )
       if(netmemDebug)
         printf("netmem.c: %s = %lu\n", buf, *out[6]);
 
+      *out[6] = (int)((*out[6])/1024/1024UL + 0.5); /* convert from Bytes to MB */
       out[6]++;
     }
   }
 
   for( i=0; i<(*out[0]); i++ ) {
 
-    sprintf( buf, "bytesReceivedPS%d", i );
+    sprintf( buf, "%s%d", "bytesReceivedRate", i );
 
     if( Worker_getStatistic( "daq_netmem", buf, out[7] ) == -1) {
       if(netmemDebug)
@@ -152,6 +154,7 @@ long netmem_proc( struct genSubRecord *pgsub )
       if(netmemDebug)
         printf("netmem.c: %s = %lu\n", buf, *out[7]);
 
+      *out[7] = (int)((*out[7])/1024UL + 0.5); /* convert from Bytes to kB */
       out[7]++;
     }
   }
index cd4f5cdb70560fb4d38e76156f8cd3b4d2510ac6..5148cda722363607b644858ac4b413fbca184886 100644 (file)
@@ -1,14 +1,13 @@
-
 file {
        name="/home/scs/yurevich/test/ebctrl.adl"
        version=030101
 }
 display {
        object {
-               x=89
-               y=277
+               x=290
+               y=286
                width=640
-               height=450
+               height=460
        }
        clr=14
        bclr=29
@@ -102,7 +101,7 @@ display {
        }
        style="fill-under"
        trace[0] {
-               ydata="HAD:eb$(EB):evtbuildBuff"
+               ydata="HAD:eb$(EB):ebBuff"
                data_clr=33
        }
        trace[1] {
@@ -110,7 +109,8 @@ display {
                data_clr=60
        }
        x_axis {
-               rangeStyle="auto-scale"
+               rangeStyle="user-specified"
+               maxRange=0.000000
        }
        y1_axis {
                rangeStyle="auto-scale"
@@ -124,7 +124,7 @@ display {
                height=15
        }
        monitor {
-               chan="HAD:eb$(EB):evtsComp"
+               chan="HAD:eb$(EB):evtComp"
                clr=30
                bclr=14
        }
@@ -147,7 +147,7 @@ text {
        object {
                x=200
                y=323
-               width=90
+               width=50
                height=15
        }
        monitor {
@@ -166,7 +166,7 @@ text {
                height=15
        }
        monitor {
-               chan="HAD:eb$(EB):evtsDisc"
+               chan="HAD:eb$(EB):evtDisc"
                clr=30
                bclr=14
        }
@@ -181,7 +181,7 @@ text {
                height=15
        }
        monitor {
-               chan="HAD:eb$(EB):evtsTagErr"
+               chan="HAD:eb$(EB):evtTagErr"
                clr=30
                bclr=14
        }
@@ -268,7 +268,7 @@ text {
                height=15
        }
        monitor {
-               chan="HAD:eb$(EB):evtsDataErr"
+               chan="HAD:eb$(EB):evtDataErr"
                clr=30
                bclr=14
        }
@@ -283,7 +283,7 @@ text {
                height=15
        }
        monitor {
-               chan="HAD:eb$(EB):evtsCompPS"
+               chan="HAD:eb$(EB):evtCRate"
                clr=30
                bclr=14
        }
@@ -298,7 +298,7 @@ text {
                height=15
        }
        monitor {
-               chan="HAD:eb$(EB):byteWritPS"
+               chan="HAD:eb$(EB):byteWRate"
                clr=30
                bclr=14
        }
@@ -313,7 +313,7 @@ text {
                height=15
        }
        monitor {
-               chan="HAD:eb$(EB):evtsDiscPS"
+               chan="HAD:eb$(EB):evtDRate"
                clr=30
                bclr=14
        }
@@ -358,15 +358,15 @@ text {
 }
 text {
        object {
-               x=271
+               x=273
                y=347
-               width=25
+               width=32
                height=15
        }
        "basic attribute" {
                clr=0
        }
-       textix="/sec"
+       textix="kB/sec"
 }
 text {
        object {
@@ -384,13 +384,13 @@ text {
        object {
                x=57
                y=55
-               width=46
+               width=110
                height=15
        }
        "basic attribute" {
                clr=0
        }
-       textix="Fill levels of buffers:         evtbuild         netmem"
+       textix="Fill levels of buffers:"
 }
 polyline {
        object {
@@ -434,61 +434,61 @@ polyline {
        display[0] {
                label="EB01"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=01"
+               args="PRE=HAD, EB=01, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[1] {
                label="EB02"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=02"
+               args="PRE=HAD, EB=02, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[2] {
                label="EB03"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=03"
+               args="PRE=HAD, EB=03, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[3] {
                label="EB04"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=04"
+               args="PRE=HAD, EB=04, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[4] {
                label="EB05"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=05"
+               args="PRE=HAD, EB=05, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[5] {
                label="EB06"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=06"
+               args="PRE=HAD, EB=06, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[6] {
                label="EB07"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=07"
+               args="PRE=HAD, EB=07, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[7] {
                label="EB08"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=08"
+               args="PRE=HAD, EB=08, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[8] {
                label="EB09"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=09"
+               args="PRE=HAD, EB=09, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[9] {
                label="EB10"
                name="ebctrl.adl"
-               args="PRE=HAD, EB=10"
+               args="PRE=HAD, EB=10, SUBSYSNUM=$(SUBSYSNUM)"
                policy="replace display"
        }
        display[10] {
@@ -564,7 +564,7 @@ text {
        display[0] {
                label="EB01 netmem"
                name="netmemctrl.adl"
-               args="PRE=HAD, EB=01"
+               args="PRE=HAD, EB=01, SUBSYSNUM=$(SUBSYSNUM)"
        }
        display[1] {
                label="EB02 netmem"
@@ -615,6 +615,22 @@ text {
        bclr=29
        label="netmem"
 }
+oval {
+       object {
+               x=119
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=20
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A&1)<1"
+               chan="HAD:eb01:status"
+       }
+}
 oval {
        object {
                x=119
@@ -627,8 +643,9 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
                chan="HAD:eb01:status"
+               chanB="HAD:eb01:evtCRate"
        }
 }
 oval {
@@ -639,12 +656,13 @@ oval {
                height=12
        }
        "basic attribute" {
-               clr=20
+               clr=32
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)<1"
+               calc="(A=1)&&(B=0)"
                chan="HAD:eb01:status"
+               chanB="HAD:eb01:evtCRate"
        }
 }
 text {
@@ -663,13 +681,13 @@ text {
        object {
                x=45
                y=380
-               width=308
+               width=60
                height=15
        }
        "basic attribute" {
                clr=0
        }
-       textix="EB number:   1   2   3   4   5   6   7   8   9   10"
+       textix="EB number:"
 }
 oval {
        object {
@@ -827,8 +845,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
+               chan="HAD:eb02:status"
+               chanB="HAD:eb02:evtCRate"
+       }
+}
+oval {
+       object {
+               x=143
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
                chan="HAD:eb02:status"
+               chanB="HAD:eb02:evtCRate"
        }
 }
 oval {
@@ -843,8 +879,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
                chan="HAD:eb03:status"
+               chanB="HAD:eb03:evtCRate"
+       }
+}
+oval {
+       object {
+               x=167
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb03:status"
+               chanB="HAD:eb03:evtCRate"
        }
 }
 oval {
@@ -859,8 +913,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
+               chan="HAD:eb04:status"
+               chanB="HAD:eb04:evtCRate"
+       }
+}
+oval {
+       object {
+               x=191
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
                chan="HAD:eb04:status"
+               chanB="HAD:eb04:evtCRate"
        }
 }
 oval {
@@ -875,8 +947,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
                chan="HAD:eb05:status"
+               chanB="HAD:eb05:evtCRate"
+       }
+}
+oval {
+       object {
+               x=215
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb05:status"
+               chanB="HAD:eb05:evtCRate"
        }
 }
 oval {
@@ -891,8 +981,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
+               chan="HAD:eb06:status"
+               chanB="HAD:eb06:evtCRate"
+       }
+}
+oval {
+       object {
+               x=239
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
                chan="HAD:eb06:status"
+               chanB="HAD:eb06:evtCRate"
        }
 }
 oval {
@@ -907,8 +1015,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
+               chan="HAD:eb07:status"
+               chanB="HAD:eb07:evtCRate"
+       }
+}
+oval {
+       object {
+               x=263
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
                chan="HAD:eb07:status"
+               chanB="HAD:eb07:evtCRate"
        }
 }
 oval {
@@ -923,8 +1049,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
                chan="HAD:eb08:status"
+               chanB="HAD:eb08:evtCRate"
+       }
+}
+oval {
+       object {
+               x=287
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb08:status"
+               chanB="HAD:eb08:evtCRate"
        }
 }
 oval {
@@ -939,8 +1083,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
+               chan="HAD:eb09:status"
+               chanB="HAD:eb09:evtCRate"
+       }
+}
+oval {
+       object {
+               x=311
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
                chan="HAD:eb09:status"
+               chanB="HAD:eb09:evtCRate"
        }
 }
 oval {
@@ -955,8 +1117,26 @@ oval {
        }
        "dynamic attribute" {
                vis="calc"
-               calc="(A&1)>0"
+               calc="(A=1)&&(B#0)"
                chan="HAD:eb10:status"
+               chanB="HAD:eb10:evtCRate"
+       }
+}
+oval {
+       object {
+               x=338
+               y=396
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               vis="calc"
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb10:status"
+               chanB="HAD:eb10:evtCRate"
        }
 }
 rectangle {
@@ -984,3 +1164,310 @@ text {
        }
        textix="Event Builder $(EB) Monitor"
 }
+text {
+       object {
+               x=255
+               y=324
+               width=20
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="MB"
+}
+oval {
+       object {
+               x=370
+               y=375
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=0
+       }
+       "dynamic attribute" {
+               clr="discrete"
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb10:status"
+               chanB="HAD:eb10:evtCRate"
+       }
+}
+oval {
+       object {
+               x=370
+               y=395
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=15
+       }
+       "dynamic attribute" {
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb10:status"
+               chanB="HAD:eb10:evtCRate"
+       }
+}
+oval {
+       object {
+               x=370
+               y=415
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=32
+       }
+       "dynamic attribute" {
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb10:status"
+               chanB="HAD:eb10:evtCRate"
+       }
+}
+oval {
+       object {
+               x=370
+               y=435
+               width=12
+               height=12
+       }
+       "basic attribute" {
+               clr=20
+       }
+       "dynamic attribute" {
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb10:status"
+               chanB="HAD:eb10:evtCRate"
+       }
+}
+text {
+       object {
+               x=392
+               y=380
+               width=0
+               height=40
+       }
+       "basic attribute" {
+               clr=14
+       }
+       "dynamic attribute" {
+               calc="(A=1)&&(B=0)"
+               chan="HAD:eb10:status"
+               chanB="HAD:eb10:evtCRate"
+       }
+}
+text {
+       object {
+               x=387
+               y=415
+               width=46
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="stale"
+}
+text {
+       object {
+               x=387
+               y=435
+               width=46
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="off"
+}
+composite {
+       object {
+               x=387
+               y=375
+               width=46
+               height=15
+       }
+       "composite name"=""
+       children {
+               text {
+                       object {
+                               x=387
+                               y=375
+                               width=46
+                               height=15
+                       }
+                       "basic attribute" {
+                               clr=0
+                       }
+                       textix="disabled"
+               }
+       }
+}
+composite {
+       object {
+               x=387
+               y=395
+               width=46
+               height=15
+       }
+       "composite name"=""
+       children {
+               text {
+                       object {
+                               x=387
+                               y=395
+                               width=46
+                               height=15
+                       }
+                       "basic attribute" {
+                               clr=0
+                       }
+                       textix="on"
+               }
+       }
+}
+text {
+       object {
+               x=245
+               y=55
+               width=45
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="evtbuild"
+}
+text {
+       object {
+               x=346
+               y=55
+               width=45
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="netmem"
+}
+text {
+       object {
+               x=121
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="1"
+}
+text {
+       object {
+               x=145
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="2"
+}
+text {
+       object {
+               x=170
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="3"
+}
+text {
+       object {
+               x=194
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="4"
+}
+text {
+       object {
+               x=218
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="5"
+}
+text {
+       object {
+               x=242
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="6"
+}
+text {
+       object {
+               x=266
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="7"
+}
+text {
+       object {
+               x=290
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="8"
+}
+text {
+       object {
+               x=314
+               y=380
+               width=8
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="9"
+}
+text {
+       object {
+               x=336
+               y=380
+               width=14
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="10"
+}
index c2f05f164310129da9905094429d31d8379764e5..5f9d5fb2f68a29d08d67b732a5fc28e46705eed7 100644 (file)
@@ -5,8 +5,8 @@ file {
 }
 display {
        object {
-               x=81
-               y=273
+               x=473
+               y=190
                width=640
                height=620
        }
@@ -102,15 +102,16 @@ display {
        }
        style="fill-under"
        trace[0] {
-               ydata="HAD:eb$(EB):netmem:discPkts"
+               ydata="HAD:eb$(EB):netmem:pktsDis"
                data_clr=33
        }
        trace[1] {
-               ydata="HAD:eb$(EB):netmem:discMsgs"
+               ydata="HAD:eb$(EB):netmem:msgsDis"
                data_clr=60
        }
        x_axis {
-               rangeStyle="auto-scale"
+               rangeStyle="user-specified"
+               maxRange=0.000000
        }
        y1_axis {
                rangeStyle="auto-scale"
@@ -120,13 +121,13 @@ text {
        object {
                x=57
                y=55
-               width=46
+               width=58
                height=15
        }
        "basic attribute" {
                clr=0
        }
-       textix="Discarded:         packets         messages"
+       textix="Discarded:"
 }
 polyline {
        object {
@@ -209,15 +210,16 @@ composite {
        }
        style="fill-under"
        trace[0] {
-               ydata="HAD:eb$(EB):netmem:rcvPkts"
+               ydata="HAD:eb$(EB):netmem:pktsRcv"
                data_clr=33
        }
        trace[1] {
-               ydata="HAD:eb$(EB):netmem:rcvMsgs"
+               ydata="HAD:eb$(EB):netmem:msgsRcv"
                data_clr=60
        }
        x_axis {
-               rangeStyle="auto-scale"
+               rangeStyle="user-specified"
+               maxRange=0.000000
        }
        y1_axis {
                rangeStyle="auto-scale"
@@ -227,13 +229,13 @@ text {
        object {
                x=57
                y=235
-               width=46
+               width=50
                height=15
        }
        "basic attribute" {
                clr=0
        }
-       textix="Received:          packets         messages"
+       textix="Received:"
 }
 polyline {
        object {
@@ -304,35 +306,39 @@ composite {
        }
        style="fill-under"
        trace[0] {
-               ydata="HAD:eb$(EB):netmem:rcvBytes"
+               ydata="HAD:eb$(EB):netmem:byteRcv"
                data_clr=33
        }
        trace[1] {
-               ydata="HAD:eb$(EB):netmem:rcvBytesPS"
+               ydata="HAD:eb$(EB):netmem:byteRRate"
                data_clr=60
        }
        x_axis {
-               rangeStyle="auto-scale"
+               rangeStyle="user-specified"
+               maxRange=0.000000
        }
        y1_axis {
                rangeStyle="auto-scale"
        }
+       y2_axis {
+               rangeStyle="auto-scale"
+       }
 }
 text {
        object {
                x=57
                y=415
-               width=46
+               width=80
                height=15
        }
        "basic attribute" {
                clr=0
        }
-       textix="Received bytes:          total         per second"
+       textix="Received bytes:"
 }
 polyline {
        object {
-               x=180
+               x=185
                y=421
                width=21
                height=2
@@ -348,7 +354,7 @@ polyline {
 }
 composite {
        object {
-               x=265
+               x=300
                y=421
                width=21
                height=2
@@ -357,7 +363,7 @@ composite {
        children {
                polyline {
                        object {
-                               x=265
+                               x=282
                                y=421
                                width=21
                                height=2
@@ -367,8 +373,8 @@ composite {
                                width=2
                        }
                        points {
-                               (266,422)
-                               (285,422)
+                               (283,422)
+                               (302,422)
                        }
                }
        }
@@ -384,3 +390,75 @@ composite {
        children {
        }
 }
+text {
+       object {
+               x=170
+               y=55
+               width=58
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="packets"
+}
+text {
+       object {
+               x=265
+               y=55
+               width=58
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="messages"
+}
+text {
+       object {
+               x=170
+               y=235
+               width=58
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="packets"
+}
+text {
+       object {
+               x=265
+               y=235
+               width=58
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="messages"
+}
+text {
+       object {
+               x=205
+               y=415
+               width=50
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="MB total"
+}
+text {
+       object {
+               x=305
+               y=415
+               width=75
+               height=15
+       }
+       "basic attribute" {
+               clr=0
+       }
+       textix="kB per second"
+}