Changeset 3623 in Sophya for trunk/AddOn/TAcq/pciewrap.cc

Timestamp:

May 22, 2009, 9:59:38 AM (16 years ago)

Author:

ansari

Message:

Modifications et ameliorations diverses pour programme acquisition/traitement multifibres

Reza 22/05/2009

1- Extension/amelioration classe BRPaquet et BRPaqChecker
2- Correction BUG dans RAcqMemZoneMgr bloquant l'utilisation a une seule zone memoire
3- Classe PCIEWrapper devenue virtuelle pure et introduction de la classe TestPCIWrapperNODMA
pour les smulations.

File:

• trunk/AddOn/TAcq/pciewrap.cc (modified) (1 diff)

trunk/AddOn/TAcq/pciewrap.cc

@@ -1 +1 @@
 #include "pciewrap.h"
+#include "brpaqu.h"
+
+#include "racqumem.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
-
 #include <iostream>
 
-PCIEWrapper::PCIEWrapper()
+TestPCIWrapperNODMA::TestPCIWrapperNODMA(UInt32 sz) 
+  : PCIEWrapper() , size_(sz)
 {
-// Faire l'initialisation PCI-Express ici
+  data_ = new Byte[size_];
+  frame_counter_ = 0;
+  timetag_ = 0;
+  tottransfer_ = 0;     
 }
 
-PCIEWrapper::~PCIEWrapper()
+TestPCIWrapperNODMA::~TestPCIWrapperNODMA()
 {
-// Faire le nettoyage (liberer memoire ...)
+  delete[] data_;       
 }
 
-
-// Variables pour tests 
-static uint_4 NBytes = 0;
-static uint_4 Choix = 0;
-
-uint_4  PCIEWrapper::NBytesToRead()
+UInt32 TestPCIWrapperNODMA::TransferSize()
 {
-// Lire le registre indiquant le nombre de mots prets a etre lus
-// cad transfere en memoire du PC
-int choix = rand()%5;
-if (choix < 2) {
-  Choix = choix;
-  if (choix == 0)  NBytes = 4096;
-  else NBytes = 5000;
-}
-else {
-  NBytes = 0;
-  Choix = 0;
-}
-return NBytes;  
+  return size_; 
 }
 
-uint_4  PCIEWrapper::Read(uint_1* buff, uint_4 nbytes)
+UInt64 TestPCIWrapperNODMA::TotTransferBytes()
 {
-  if (NBytes == 0)  throw PCIEWException("PCIEWrapper::Read()/Error NBytes==0");
-  if (nbytes > NBytes)  nbytes = NBytes;
-  double dx = (rand()%8+1)*0.05;
-  for(int k=0; k<nbytes; k++)  buff[k] = (uint_1)((1.+sin(dx*k))*100.);
-  if ((Choix == 1) && (nbytes>2000)) 
-    for(int k=1600; k<1900; k++) buff[k] = (uint_1)(128);
-  return nbytes;
+  return tottransfer_;
 }
+
+Byte* TestPCIWrapperNODMA::DoTransferData(int numbuff)
+{
+  frame_counter_ ++;
+  timetag_ = frame_counter_ * size_ / 2;
+  BRPaquet paq(data_, size_);
+  paq.SetHDRMarker64(pchk_.HDRTag());
+  paq.SetTRLMarker64(pchk_.TRLTag());
+  paq.SetFrameCounter(frame_counter_);
+  paq.SetTimeTag(timetag_);
+  paq.SetPaqLen((UInt16)((size_ - BRHDRSIZE - BRTRLSIZE)/4));
+  Byte* bp = paq.Data1();
+  for(UInt32 kk=0; kk<paq.DataSize(); kk++) 
+    bp[kk] = (Byte)(sin(0.0345*kk)*78.+127.5);
+  tottransfer_ += size_;
+  return data_;
+}
+
+void TestPCIWrapperNODMA::PrintStatus(ostream& os) 
+{
+  os << "TestPCIWrapperNODMA::Status, FrameCounter=" << frame_counter_ 
+     << " TimeTag=" << timetag_ << endl;
+}