[Nscldaq-cvscommits] SF.net SVN: nscldaq:[2697] trunk/nextgen/utilities/compatibility

[<ro...@us...>]

Revision: 2697
          http://nscldaq.svn.sourceforge.net/nscldaq/?rev=2697&view=rev
Author:   ron-fox
Date:     2012-04-10 18:09:35 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
- Allow buffer size to be set in BufferoToRing
- Honor BUFFERSIZE env variable in s800toring.

Modified Paths:
--------------
    trunk/nextgen/utilities/compatibility/BufferToRing.cpp
    trunk/nextgen/utilities/compatibility/s800toring.in

Modified: trunk/nextgen/utilities/compatibility/BufferToRing.cpp
===================================================================
--- trunk/nextgen/utilities/compatibility/BufferToRing.cpp	2012-04-10 12:36:50 UTC (rev 2696)
+++ trunk/nextgen/utilities/compatibility/BufferToRing.cpp	2012-04-10 18:09:35 UTC (rev 2697)
@@ -41,7 +41,7 @@
 
 
 
-static const size_t BUFFERSIZE(8192); // (in bytes).
+static size_t       BUFFERSIZE(8192); // (in bytes).
 static uint64_t     eventsInRun(0);   // For PhysicsEventcountItems.
 
 static std::set<int>                 okErrors;	// Acceptable errors in I/O operations.
@@ -531,8 +531,20 @@
 
 int main (int argc, char *argv[])
 {
-  std::string ringName;
 
+  // If there's an argument it must be a buffersize:
+
+  argc--; argv++;
+  if (argc) {
+    int newSize = atoi(*argv);
+    if (newSize < BUFFERSIZE) {
+      fprintf(stderr, "Buffer size specification %s must be an integer >= %d\n",
+	      *argv, BUFFERSIZE);
+      exit(EXIT_FAILURE);
+    }
+    BUFFERSIZE = newSize;
+  }
+
   uint16_t    dataBuffer[BUFFERSIZE/sizeof(uint16_t)];
 
 

Modified: trunk/nextgen/utilities/compatibility/s800toring.in
===================================================================
--- trunk/nextgen/utilities/compatibility/s800toring.in	2012-04-10 12:36:50 UTC (rev 2696)
+++ trunk/nextgen/utilities/compatibility/s800toring.in	2012-04-10 18:09:35 UTC (rev 2697)
@@ -41,7 +41,7 @@
 fi
 
 
-netcat $host $port | $DAQBIN/BufferToRing | $DAQBIN/stdintoring $ring
+netcat $host $port | $DAQBIN/BufferToRing $BUFFERSIZE | $DAQBIN/stdintoring $ring
 
 
 $DAQBIN/PopUp "S800 to ring pipeline exited"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.