Changeset 3627 in Sophya for trunk/AddOn

Timestamp:

May 22, 2009, 6:33:35 PM (16 years ago)

Author:

ansari

Message:

Amelioration gestion arguments ds tmtacq.cc , Reza 21/05/2009

File:

• trunk/AddOn/TAcq/tmtacq.cc (modified) (3 diffs)

trunk/AddOn/TAcq/tmtacq.cc

@@ -57 +57 @@
   
  if (narg < 8) {
-   cout << "\n Usage: tmtacq CardNum PaquetSize NFrameDMA NFiles NBlocPerFile NMaxProc DataDirPath [AcqMode] [NPaqMemZone][HardCtlC]" << endl;
+   cout << "\n Usage: tmtacq CardNum PaquetSize NFrameDMA NFiles NBlocPerFile NMaxProc DataDirPath [AcqMode] [MemZoneMgr][HardCtlC]" << endl;
    cout << " - CardNum : PCI-Express card number (=1,2)" << endl;
    cout << " - PaquetSize or FrameSize (=DATA+HDR+TRL_Size)  " << endl;
@@ -90 +90 @@
    cout << "   mononsw->Test with a single thread PCIEReaderChecker, But no swap paquet " << endl;
    cout << endl;
-   cout << " - NPaqMemZone : Number of paquets in one memory data bloc (Default=128) " << endl;
+   cout << " - MemZoneMgr: nZones,NPaq =Number of Zones and number of paquet in each zone (Default=8,128) " << endl;
    cout << " -HardCtlC : Y y (direct interrpution by CtrlC ) default (no) " << endl;
   return 1;
@@ -153 +153 @@
   cout << "tmtacq[1] - starting acq program under card " << card <<  " FrameSize= " << sizeFrame << endl;
 
-  uint_4 nZones = 10;  // Nombre de zones memoires
+  uint_4 nZones = 8;  // Nombre de zones memoires
   uint_4 nPaqZone = 128;  // 128 Paquets / zone memoire - valeur par defaut
-  if (narg > 9)    // pour traiter eventuellement un arret brutal par CtlC mettre le 9eme arg a Y
-    { string val = arg[9];
-      if ( ( val == "Y")||( val == "y")) ; 
-      else {
-        act.sa_handler=Stop;
-        sigaction(SIGINT,&act,NULL);    
-        if ( atoi(arg[9]) > 0)  nPaqZone=atoi(arg[9]);
-      }
-    }
-  else {
+  if (narg > 9)  { 
+    int ia1, ia2;
+    sscanf(arg[9],"%d,%d", &ia1, &ia2);
+    nZones = ia1;  nPaqZone = ia2; 
+  }
+
+  bool fg_hard_ctrlc = false;
+  if (narg > 10)    // pour traiter eventuellement un arret brutal par CtlC mettre le 10eme arg a Y
+    if ((*arg[10]=='y')||(*arg[10]=='Y'))  fg_hard_ctrlc=true;
+  if (!fg_hard_ctrlc) {
     act.sa_handler=Stop;
     sigaction(SIGINT,&act,NULL);        
   }
+
   uint_4 PaqSZ =sizeFrame;  // Taille de paquets 
   // uint_4 dmaSize  = nbFrameDMA*PaqSZ ;  // plantage