queue size in MB. Sergey.

diff --git a/hadaq/netmem.c b/hadaq/netmem.c
index c6ff28126244c53199472afb81fdbfbcf01e5963..11de1c1061f2f6b213c9e03f9cdbe8d7f0c5d394 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.39 2010-06-17 09:19:32 hadaq Exp $";
+static char *rcsId = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/hadaq/netmem.c,v 6.40 2010-07-07 08:43:27 hadaq Exp $";
 
 #define _POSIX_C_SOURCE 199309L
 #define SYSLOG_NAMES
@@ -59,9 +59,9 @@ static void usage(const char *progName)
 {
        syslog(LOG_ERR, "Usage: %s -i inPath [-i inPath] -m nrOfMsgs [-p priority]", progName);
        syslog(LOG_ERR, "       [-S shmem_name]              Extension of shared memory segment name.");
-       syslog(LOG_ERR, "       [-q queueSize]               Size of the queue (shared memory segments) in Bytes.");
-       syslog(LOG_ERR, "       [-Q queueNr:queueSize]       Set different queue sizes for different queue numbers,");
-       syslog(LOG_ERR, "                                    example: -Q 2:1000000 -Q 4:4000000 -Q 5:12000000");
+       syslog(LOG_ERR, "       [-q queueSize]               Size of the queue (shared memory segments) in MBytes.");
+       syslog(LOG_ERR, "       [-Q queueNr:queueSize]       Set different queue sizes in MB for different queue numbers,");
+       syslog(LOG_ERR, "                                    example: -Q 2:4 -Q 4:8 -Q 5:12");
 }
 
 static int makeQueues(TheArgs *my)
@@ -92,7 +92,7 @@ static int makeQueues(TheArgs *my)
                                break;
                        }
 
-                       my->queueSize[queueNum] = atoi(newQueueSize);
+                       my->queueSize[queueNum] = atoi(newQueueSize) * 1024 * 1024UL;
                }
        }
 
@@ -127,7 +127,7 @@ static void argsDefault(TheArgs *my)
        my->nrOfMsgs = 0;
        my->priority = 0;
        my->isStandalone = 1;
-       my->queueSize[0] = 64 * 1024 * 1024UL;
+       my->queueSize[0] = 32 * 1024 * 1024UL;
        strcpy(my->verbosity, "info");
 
        for (i = 0; i < MAXINPATH; i++) {
@@ -168,7 +168,7 @@ static int argsFromCL(TheArgs *my, int argc, char *argv[])
                        my->priority = atoi(optarg);
                        break;
                case 'q':
-                       my->queueSize[0] = strtoul(optarg, NULL, 0);
+                       my->queueSize[0] = strtoul(optarg, NULL, 0) * 1024 * 1024UL;
                        break;
                case 'Q':
                        strcpy(my->queueVarSize[my->queueVarSizeCnt++], optarg);