*** empty log message ***

diff --git a/hadaq/cmds.tcl b/hadaq/cmds.tcl
index f26128379b11d362856eae5ebe7c6cbe60f5a135..1ed4c1d0a6ae39259249e5cb457c513e6f8e136f 100644 (file)
--- a/hadaq/cmds.tcl
+++ b/hadaq/cmds.tcl
@@ -129,7 +129,7 @@ proc createWorker {worker opts} {
 
        lappend workerList $worker
        regexp {^([^:]*):([^:]*)$} $worker workers($worker.name) workers($worker.agent) workers($worker.file)
-       set workers($worker.file) daq_$workers($worker.file)
+       set workers($worker.file) ./daq_$workers($worker.file)
        set workers($worker.opts) $opts
        set workers($worker.addOpts) {}
        set workers($worker.status) down

diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index d9f45e008f49b515518f0f4fbe364d4051bf6f6d..4b516c44fbee6b8ec2c655b9b7b942c9dbc4c743 100644 (file)
--- a/hadaq/netmem.c
+++ b/hadaq/netmem.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.6 1999-11-21 16:27:23 hades Rel $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.7 2000-02-18 13:44:54 muench Exp $";
 
 #define _XOPEN_SOURCE
 #include <unistd.h>
@@ -15,6 +15,8 @@ static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/had
 #include "nettrans.h"
 #include "shmtrans.h"
 
+#define MAXINPATH 32
+
 static jmp_buf terminateJmp;
 
 void sigHandler(int sig)
@@ -24,7 +26,7 @@ void sigHandler(int sig)
 
 static void usage(const char *progName)
 {
-  msglog(LOG_ERR, "Usage: %s -m nrOfMsgs [-p priority]\n", progName);
+  msglog(LOG_ERR, "Usage: %s -i inPath [-i inPath] -m nrOfMsgs [-p priority]\n", progName);
   msglog_usage();
 }
 
@@ -37,17 +39,20 @@ int main(int argc, char *argv[])
   void **hadTu;
   size_t *hadTuSize;
   int priority;
+  char *inPath[MAXINPATH];
+  int inPathCnt;
   int isStandalone;
   int nrOfMsgs;
   size_t queueSize;
 
   msglog_setlevel(argv[0], "info");
+  inPathCnt = 0;
   priority = 0;
   isStandalone = 1;
   nrOfMsgs = 0;
   queueSize = 1 * 1024 * 1024;
 
-  while ((i = getopt(argc, argv, "am:p:v:")) != -1) {
+  while ((i = getopt(argc, argv, "ai:m:p:v:")) != -1) {
     switch (i) {
     case 'a':
       isStandalone = 0;
@@ -55,6 +60,9 @@ int main(int argc, char *argv[])
     case 'm':
       nrOfMsgs = atoi(optarg);
       break;
+    case 'i':
+      inPath[inPathCnt++] = optarg;
+      break;
     case 'p':
       priority = atoi(optarg);
       break;
@@ -68,8 +76,7 @@ int main(int argc, char *argv[])
       break;
     }
   }
-  if (nrOfMsgs == 0) {
-    msglog(LOG_ERR, "missing nrOfMsgs\n");
+  if (inPathCnt == 0 || nrOfMsgs == 0 || inPathCnt != nrOfMsgs) {
     usage(argv[0]);
     exit(EXIT_FAILURE);
   }
@@ -83,10 +90,7 @@ int main(int argc, char *argv[])
     exit(EXIT_FAILURE);
   }
   for (i = 0; i < nrOfMsgs; i++) {
-    char buf[80];
-
-    sprintf(buf, "ATM:0:%d", i + 50);
-    netTrans[i] = NetTrans_create(buf, 0, worker);
+    netTrans[i] = NetTrans_create(inPath[i], 0, worker);
     if (netTrans[i] == NULL) {
         msglog(LOG_ERR, "%s, %d: %s\n", __FILE__, __LINE__, strerror(errno));
         exit(EXIT_FAILURE);

diff --git a/hadaq/nettrans.c b/hadaq/nettrans.c
index cbbe329998baa829a7344d60d8a2e398ad85f15c..73363063b6ac1ae7bf8889c55de8802ec57e42ee 100644 (file)
--- a/hadaq/nettrans.c
+++ b/hadaq/nettrans.c
@@ -1,4 +1,4 @@
-static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.9 2000-02-18 11:59:24 muench Exp $";
+static char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/nettrans.c,v 6.10 2000-02-18 13:40:12 muench Exp $";
 
 #define _XOPEN_SOURCE_EXTENDED
 #include <unistd.h>
@@ -194,6 +194,17 @@ int sendGeneric(NetTrans *my) {
                retVal = LAtm_send(my->lAtm, my->pkt, Pkt_size(my->pkt));
                break;
        case NetTransType_udp:
+#if 1 /* This limits the output data rate to 100 * mtuSize / s */
+               {
+                       static int i = 0;
+                       if (i++ % 2 != 0) {
+                               struct timespec tS, *t = &tS;
+                               t->tv_sec = 0;
+                               t->tv_nsec = 020000000;
+                               nanosleep(t, NULL);
+                       }
+               }
+#endif
                retVal = send(my->fd, my->pkt, Pkt_size(my->pkt), 0);
                break;
        }

diff --git a/hadaq/nettrans.h b/hadaq/nettrans.h
index 61a3ab82f38495eaa531203d0dd8193bbbde62b0..68c4df2a3a05e5312e390e12371ec5880e87ab3b 100644 (file)
--- a/hadaq/nettrans.h
+++ b/hadaq/nettrans.h
@@ -18,6 +18,7 @@ typedef struct NetTransS {
   NetTransType type;
   LAtm *lAtm;
   size_t mtuSize;
+  int fd;
   void *pkt;
   UInt4 seqNr;
   size_t offset;

diff --git a/hadaq/soft.tcl b/hadaq/soft.tcl
index 58286fb973cbc7c404c4e543a3b6a08efb3d4af4..307eabdd00f0360d9785fbe1ccc629fdaffd3de2 100644 (file)
--- a/hadaq/soft.tcl
+++ b/hadaq/soft.tcl
@@ -1,29 +1,12 @@
-agent create hades24 root /home/hades/lt99/eb/hadaq
-agent create hades23 hades /home/hades/lt99/show/hadaq
-agent create hades21 hades /home/hades/lt99/mdc/hadaq
-agent create hades20 hades /home/hades/lt99/rich/hadaq
-agent create hades19 hades /home/hades/lt99/tof/hadaq
-worker create hades24:evtbuild -a -p -2 -s 8 -m 4 -f runinfo.tcl
-worker create hades24:netmem -a -p -1 -m 4
-worker create hades23:memnet -a -p -1 -o ATM:0:50 -w 2500
-worker create hades23:readout -a -p -2
-worker create hades21:memnet -a -p -1 -o ATM:0:51 -w 2500
-worker create hades21:readout -a -p -2
-worker create hades20:memnet -a -p -1 -o ATM:0:52 -w 2500
-worker create hades20:readout -a -p -2
-worker create hades19:memnet -a -p -1 -o ATM:0:53 -w 2500
-worker create hades19:readout -a -p -2
-worker create hades20:ctrlctu -a -p 0
+agent create acheron muench /home/muench/hdev/daq/hadaq
+agent create mimas muench /home/muench/hdev/daq/hadaq
+worker create acheron:evtbuild -a -p -2 -s 2 -m 1
+worker create acheron:netmem -a -p -1 -m 1 -i UDP:0.0.0.0:3000
+worker create mimas:memnet -a -p -1 -w 2500 -o UDP:129.187.154.22:3000
+worker create mimas:readout -a -p -2
 group create acquisition
 group create run
-group add acquisition hades23:memnet
-group add acquisition hades23:readout
-group add acquisition hades21:memnet
-group add acquisition hades21:readout
-group add acquisition hades20:memnet
-group add acquisition hades20:readout
-group add acquisition hades19:memnet
-group add acquisition hades19:readout
-group add acquisition hades20:ctrlctu
-group add run hades24:evtbuild
-group add run hades24:netmem
+group add acquisition mimas:memnet
+group add acquisition mimas:readout
+group add run acheron:evtbuild
+group add run acheron:netmem

diff --git a/hadaq/worker.h b/hadaq/worker.h
index 0a7b0e1340b2e3f0de4471568bedff61259173b4..910a7d203f56ce4976b8ad144859c26e06f99f79 100644 (file)
--- a/hadaq/worker.h
+++ b/hadaq/worker.h
@@ -6,7 +6,7 @@
 #include "psxshm.h"
 
 typedef struct StatisticS {
-  char name[32];
+  char name[256];
   unsigned long value;
 } Statistic;