Changeset 3757 in Sophya for trunk/AddOn/TAcq

Timestamp:

Apr 30, 2010, 12:54:25 AM (15 years ago)

Author:

ansari

Message:

Ajout classes de transfert DMA vers Ethernet et lecture ethernet, Reza 29/04/2010

Location:

trunk/AddOn/TAcq

Files:

• acqparam_exemple.d (modified) (1 diff)
• bracqvers.h (modified) (1 diff)
• brparam.cc (modified) (6 diffs)
• brparam.h (modified) (5 diffs)
• makefile (modified) (2 diffs)
• mfacq.cc (modified) (8 diffs)
• mfacq.h (modified) (2 diffs)
• racqueth.cc (added)
• racqueth.h (added)
• racqurw.h (modified) (1 diff)
• swrapsock.cc (modified) (4 diffs)
• swrapsock.h (modified) (3 diffs)

trunk/AddOn/TAcq/acqparam_exemple.d

@@ -40 +40 @@
 #  @reducpaqsz ReducedSize Offset 
 reducpaqsz 1024 0 
+#### cartes de controle pour le mode transfert sur Ethernet
+#  Liste des machines cibles pour les envois de paquets 
+#  @ethrtargets Target1 [ Target2 ... ] 
+ethrtargets machine1 machine2 ...
+#  Activation du mode transfert direct DMA -> Ethernet , sans decoupage/verification en paquet a la source
+#  @pci2ethdirect
+#  Sur la machine destination, nombre total de liens (connexions) ethernet = NbTotalFibre
+#  @ethrnlink 4
+ethrnlink 4
 #  Pour desactiver l'ecriture des fichiers FITS
 #  @nosavesigfits

trunk/AddOn/TAcq/bracqvers.h

@@ -5 +5 @@
    Software version     LAL - 2008-2010 
 */
-#define BAOR_ACQ_VER 6.6
-#define BAOR_ACQ_VER_STR "BaoAcq_v6r6_Nov09 "
+#define BAOR_ACQ_VER 7.1
+#define BAOR_ACQ_VER_STR "BaoAcq_v7r1_Avr10 "
 
 #endif

trunk/AddOn/TAcq/brparam.cc

@@ -4 +4 @@
 #include "strutilxx.h"
 #include "bracqvers.h"
+
+#ifndef BRSPORTID
+#define BRSPORTID 6912
+#endif
 
 /* --Methode-- */
@@ -129 +133 @@
   reducoffset=0;
 
+  tcpportid=BRSPORTID;
+  pci2eth_fgdirect=false;
+  ethr_nlink = 0;
+
   skysource="";
 
@@ -181 +189 @@
   redpqsize=p.redpqsize;
   reducoffset=p.reducoffset;
+
+  pci2eth_fgdirect=p.pci2eth_fgdirect;
+  eths_targets=p.eths_targets;
+  ethr_nlink=p.ethr_nlink;
 
   skysource=p.skysource;
@@ -215 +227 @@
     reducoffset=(uint_4)conf.IParam("reducpaqsz",1,0);
   }
+  // Mot cle pour le mode envoi-reception sur ethernet 
+  tcpportid=conf.IParam("tcpportid",0,BRSPORTID);
+  if (conf.HasKey("pci2ethdirect"))  pci2eth_fgdirect = true;   // Transfer direct DMA -> Ethernet
+  if (conf.HasKey("ethrtargets")) {    // Machines destinations des paquets 
+    for(int it=0; it<conf.NbParam("ethrtargets"); it++) 
+      eths_targets.push_back(conf.SParam("ethrtargets",it));
+  }
+  ethr_nlink=conf.IParam("ethrnlink",0,0);   // Nombre de sources de paquets en reception ethernet 
+
+
   if (conf.HasKey("monitor")) {
     fgdoProc=true;
@@ -222 +244 @@
   }
   nopciLossRate=conf.DParam("nopcilossrate",0,0.);
-
   fg_hard_ctrlc=conf.HasKey("hard_ctrlc");
   if (conf.HasKey("nosavesigfits"))  savesigfits=false;
@@ -322 +343 @@
     os << " PaquetSize Reduction, ReducedSize=" << redpqsize << " Offset=" << reducoffset << endl;
   }
+  if (eths_targets.size()>0)   {
+    cout << " DMA->Ethernet NbTargets=" << eths_targets.size() << ((pci2eth_fgdirect)?" (DirectTransferMode) " : " " ) << " :" << endl;
+    for(size_t it=0; it<eths_targets.size(); it++) cout << eths_targets[it] << " , ";
+    cout << endl;
+  }
+  cout << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink << endl;
   if (fgdoProc>0) 
     os << " Monitoring  NMeanProc=" << nmeanProc << " StepProc=" << stepProc << " NMaxProc=" << nmaxProc << endl;

trunk/AddOn/TAcq/brparam.h

@@ -97 +97 @@
   // Taille des paquets apres reduction eventuelle (donc ds memory manager)
   inline uint_4 MMgrPaquetSize() { return (fgreducpsize)?redpqsize:PaqSize; }
+  // Nombre de paquets dans chaque bloc de MMgr 
+  inline uint_4 MMgrNbPaquet() { return nPaqZone; }
   // Operation de conversion/mise en ordre des donnees a la reception 
   inline BRDataFmtConv GetDataConvFg() { return swapall; };
@@ -105 +107 @@
   inline uint_4 BlocPerFile() { return NBlocPerFile; }
   // Nombre maximum de blocs MMgr traites 
-  inline uint_4 MaxNbBlocs() { return NbFiles*NBlocPerFile; }
+  inline uint_8 MaxNbBlocs() { return (uint_8)NbFiles*(uint_8)NBlocPerFile; }
+  // Nombre maximum paquets traites 
+  inline uint_8 MaxNbPaquets() { return MaxNbBlocs()*(uint_8)nPaqZone; }
 
   // Taille des paquets recus sur PCIExpress 
   inline uint_4 PatternSize() { return ((PaqSize-(BRHDRSIZE+BRTRLSIZE))/4); }
+
+  // Liste des machines cibles pour transfert sur ethernet
+  inline void SetEthTargets(vector<string>& targs) { eths_targets=targs; return; }
+  inline vector<string>& GetEthTargets() { return eths_targets; }
+  // Nombre de liens ethernet comme source de donnees (paquets) 
+  inline int NbEthLinks() { return ethr_nlink; }
 
   // Identification source ciel 
@@ -147 +157 @@
   uint_4 redpqsize; 
   uint_4 reducoffset; 
+
+  // ---- Variables specifiques em mode transfert DMA vers Ethernet 
+  int tcpportid; 
+  // Cote Send DMA -> Ethernet 
+  bool pci2eth_fgdirect;   // true -> direct transfer DMA to Ethernet  
+  vector< string > eths_targets;   // Liste des machines cibles pour les transferts DMA -> ethernet 
+  // Cote reception 
+  int ethr_nlink;    // Nombre total de source d'envoi (= nb total de fibre de fibre) 
 
   // Identification source observee dans le ciel
@@ -209 +227 @@
   // Taille des paquets apres reduction eventuelle (donc ds memory manager)
   inline uint_4 MMgrPaquetSize() { return param_->MMgrPaquetSize(); }
+  // Nombre de paquets dans chaque bloc de MMgr 
+  inline uint_4 MMgrNbPaquet() { return param_->MMgrNbPaquet(); }
   // Operation de conversion/mise en ordre des donnees a la reception 
   inline BRDataFmtConv GetDataConvFg() { return param_->GetDataConvFg(); };
@@ -217 +237 @@
   inline uint_4 BlocPerFile() { return param_->BlocPerFile(); }
   // Nombre maximum de blocs MMgr traites 
-  inline uint_4 MaxNbBlocs() { return param_->MaxNbBlocs(); }
+  inline uint_8 MaxNbBlocs() { return param_->MaxNbBlocs(); }
+  // Nombre maximum paquets traites 
+  inline uint_8 MaxNbPaquets() { return param_->MaxNbPaquets(); }
 
   // Identification source ciel 

trunk/AddOn/TAcq/makefile

@@ -21 +21 @@
         echo '---mfacq made'
 
-$(EXE)mfacq : $(OBJ)mfacq.o $(OBJ)brparam.o $(OBJ)racqumem.o $(OBJ)racqurw.o $(OBJ)racquproc.o \
-               $(OBJ)brpaqu.o $(OBJ)pciewrap.o $(OBJ)minifits.o
-        $(CXXLINK) -o $(EXE)mfacq $(OBJ)mfacq.o $(OBJ)brparam.o $(OBJ)racqumem.o $(OBJ)racqurw.o \
-              $(OBJ)racquproc.o $(OBJ)brpaqu.o $(OBJ)pciewrap.o $(OBJ)minifits.o $(SOPHYAALLSLBLIST)
-
-$(OBJ)mfacq.o : mfacq.cc brparam.h racquproc.h racqurw.h racqumem.h brpaqu.h
+$(EXE)mfacq : $(OBJ)mfacq.o $(OBJ)brparam.o $(OBJ)racqumem.o $(OBJ)racqurw.o  $(OBJ)racqueth.o \
+        $(OBJ)racquproc.o $(OBJ)brpaqu.o $(OBJ)pciewrap.o $(OBJ)minifits.o $(OBJ)swrapsock.o
+        $(CXXLINK) -o $(EXE)mfacq $(OBJ)mfacq.o $(OBJ)brparam.o $(OBJ)racqumem.o $(OBJ)racqurw.o $(OBJ)racqueth.o \
+              $(OBJ)racquproc.o $(OBJ)brpaqu.o $(OBJ)pciewrap.o $(OBJ)minifits.o $(OBJ)swrapsock.o $(SOPHYAALLSLBLIST)
+
+$(OBJ)mfacq.o : mfacq.cc brparam.h racquproc.h racqurw.h racqueth.h racqumem.h brpaqu.h
         $(CXXCOMPILE) -c -DNOPCIECARD -o $(OBJ)mfacq.o mfacq.cc 
 
@@ -50 +50 @@
         $(CXXCOMPILE) -c -o $(OBJ)racqurw.o racqurw.cc 
 
+$(OBJ)racqueth.o : racqueth.cc racqueth.h racqurw.h racqumem.h brpaqu.h
+        $(CXXCOMPILE) -c -o $(OBJ)racqueth.o racqueth.cc 
+
 $(OBJ)racquproc.o : racquproc.cc racquproc.h racqurw.h racqumem.h brpaqu.h
         $(CXXCOMPILE) -c -o $(OBJ)racquproc.o racquproc.cc 

trunk/AddOn/TAcq/mfacq.cc

@@ -9 +9 @@
 static RAcqMemZoneMgr* pMmgr=NULL;
 static  PCIEMultiReader* pPcierThr=NULL;
+static  PCIEToEthernet* pPcie2Eth=NULL;
+static  EthernetReader* pEthRdr=NULL;
 
 void Stop(int s)
@@ -15 +17 @@
   else printf("............. MAIN ... receive signal %d \n",s);
   if (pMmgr != NULL) pMmgr->Stop();
+  if (pPcie2Eth !=NULL) pPcie2Eth->Stop();
   if (pPcierThr !=NULL) pPcierThr->Stop();
-
+  if (pEthRdr !=NULL) pEthRdr->Stop();
 }
 
@@ -40 +43 @@
 
 
-  if ((narg < 2)||(strcmp(arg[1],"-h"))==0) {
+  if ((narg > 1)&&(strcmp(arg[1],"-h"))==0) {
     Usage(false);
     return 1;
   }
-  
-  string pardcfile=arg[1];
+  if (narg < 3) {
+    Usage(true);
+    return 3;
+  }
+  
+  const char* desact[3] = {"PCIE_To_Ethernet", "Ethernet_To_Disk", "PCIE_DMA_To_Disk"};
+  string action=arg[1];
+  int act = 0;
+  if ((action != "-pci2eth")&&(action != "-pci2disk")&&(action != "-eth2disk")) {
+    cout << " mfacq/Error , Bad action argument : " << action << endl;
+    return 2;
+  }
+  if (action == "-pci2eth")  act=0;
+  else if (action == "-eth2disk") act=1;
+  else if (action == "-pci2disk")  act=2;
+
+  string pardcfile=arg[2];
 #ifndef NOPCIECARD  
   string basedir="/Raid";
@@ -51 +69 @@
   string basedir="./";
 #endif 
-  if (narg>2)  basedir=arg[2];
+  vector<string> oargs;
+  if (narg>3)  {
+    basedir=arg[2];
+    for(int jj=2; jj<narg; jj++)  oargs.push_back(arg[jj]);
+  }
   try {
     // Creation/initialisation parametres Acq
     BRAcqConfig acpar;
-    acpar.ReadParamFile(arg[1]);
+    acpar.ReadParamFile(pardcfile);
     acpar.GetConfig().SetBaseDirectory(basedir); 
+    if ((act==0)&&(oargs.size()>0))
+      acpar.GetParams().SetEthTargets(oargs);
     // Creation des repertoires 
-    if (acpar.CreateOutputDirectories()!=0)  return 9;
+    if (act > 0) 
+      if (acpar.CreateOutputDirectories()!=0)  return 9;
     acpar.Print(cout);
-    struct sigaction act;  
+    struct sigaction siact;  
     if (!acpar.GetParams().fg_hard_ctrlc) {
-      act.sa_handler=Stop;
-      sigaction(SIGINT,&act,NULL);        
+      siact.sa_handler=Stop;
+      sigaction(SIGINT,&siact,NULL);        
     }
-    rc = MultiFibreAcq();    
+    switch (act) {
+    case 0:
+      rc = PCIEToEthernetTransfer();
+      break;
+    case 1:
+      rc = EthernetToMemoryAcq();
+      break;
+    case 2:
+      rc = MultiFibreAcq();
+      break;
+    }    
   }
   catch (MiniFITSException& exc) {
@@ -97 +132 @@
 void Usage(bool fgshort) 
 {
-  if (fgshort) {
-    cout << " Usage: mfacq DataCardFile [BaseDirectory] \n" << endl;
-    cout << "   Parameters in DataCard : \n"
-         << "       fibres outpathname skysource paqsize dmasizekb nbfiles \n" 
-         << "       nblocperfile acqmode memmgr monitor reducpaqsz "<< endl;
-    cout << "   BaseDirectory (default= /Raid ) " << endl;
-    return;
-  }
+  cout << " Usage: mfacq Action DataCardFile [BaseDirectory / TargetMachines] \n" << endl;
+  if (fgshort) return;
+  cout << "   Action = -pci2disk , -pci2mem -eth2disk \n " 
+       << "   Parameters in DataCard : \n"
+       << "       fibres outpathname skysource paqsize dmasizekb nbfiles \n" 
+       << "       nblocperfile acqmode memmgr monitor reducpaqsz "<< endl;
+  cout << "   BaseDirectory (default= /Raid ) " << endl;
+  cout << "   TargetMachines : List of target machines for PCIe2Ethernet " << endl;
   return;
 }
@@ -114 +149 @@
   Timer tm("mfacq/MultiFibre");
   cout << " ---------- mfacq/ MultiFibreAcq()  ------------- " << endl;
-  PCIEWrapperInterface* pciwp[4]={NULL,NULL,NULL,NULL};
+  PCIEWrapperInterface* pciwp[16]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+                                   NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
     
   BRAcqConfig bpar;
@@ -144 +180 @@
   TestPCIWrapperNODMA pciw3(bpar.RecvPaquetSize(), acpar.nopciLossRate);
   TestPCIWrapperNODMA pciw4(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw5(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw6(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw7(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw8(bpar.RecvPaquetSize(), acpar.nopciLossRate);
   pciwp[0] = &pciw1;
   pciwp[1] = &pciw2;
   pciwp[2] = &pciw3;
-  pciwp[3] = &pciw4;  
+  pciwp[3] = &pciw4;
+  pciwp[4] = &pciw5;
+  pciwp[5] = &pciw6;  
+  pciwp[6] = &pciw7;
+  pciwp[7] = &pciw8;  
 #endif 
 
@@ -197 +241 @@
 
 }
+
+/* --Nouvelle-Fonction-- */
+int PCIEToEthernetTransfer()
+{
+  Timer tm("mfacq/PCIEToEthernetTransfer");
+  cout << " ---------- mfacq/ PCIEToEthernetTransfer()  ------------- " << endl;
+  PCIEWrapperInterface* pciwp[16]={NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,
+                                   NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
+
+  pMmgr=NULL;    
+  BRAcqConfig bpar;
+  BRParList& acpar=bpar.GetParams();
+  
+  cout << " mfacq[1]/Info: PCIEToEthernet for" << acpar.NbFibers << " fibers , nZones=" 
+       << acpar.nZones << " NbPaquet/Zone=" << acpar.nPaqZone 
+       << " MmgrPaqSize=" << acpar.MMgrPaquetSize() << endl;
+  
+#ifndef NOPCIECARD  
+  for (int i=0 ;i <acpar.NFibers() ;i++) {
+    UINT32 card=(acpar.FiberNum[i]-1)/2+1;
+    UINT32 cardfiber=(acpar.FiberNum[i]-1)%2;
+    cout <<"mfacq[2] CreatePCIEWrapperV6- indice " << i <<  "INIT card " << card 
+         << " fibre " << cardfiber << endl;
+    pciwp[i] =  CreatePCIEWrapperV6(card,acpar.PatternSize(),acpar.DMASizeBytes(),acpar.activate_pattern,cardfiber);
+  }
+#else 
+  TestPCIWrapperNODMA pciw1(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw2(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw3(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw4(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw5(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw6(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw7(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  TestPCIWrapperNODMA pciw8(bpar.RecvPaquetSize(), acpar.nopciLossRate);
+  pciwp[0] = &pciw1;
+  pciwp[1] = &pciw2;
+  pciwp[2] = &pciw3;
+  pciwp[3] = &pciw4;
+  pciwp[4] = &pciw5;
+  pciwp[5] = &pciw6;  
+  pciwp[6] = &pciw7;
+  pciwp[7] = &pciw8;  
+#endif 
+
+  vector<PCIEWrapperInterface*> vec_pciw;
+  for  (int i=0 ;i<bpar.NFibers();i++)  vec_pciw.push_back( pciwp[i]);
+  cout <<"mfacq[2] Creating PCIEToEthernet  thread object " << endl;
+  PCIEToEthernet pci2eth(vec_pciw, bpar.GetParams().GetEthTargets(), bpar.GetParams());
+  //  usleep(200);  attente au cas ou ...
+  pPcie2Eth=&pci2eth;
+  tm.Split("Threads created");  
+  cout << "mfacq[3] - starting one threads: PCIEToEthernet... " << endl;
+  pci2eth.start();
+  
+  // On attend avant de declencher la terminaison des threads
+  usleep(200000);
+  
+  cout << "mfacq[5] -  Waiting for threads to finish ... " << endl;  
+  pci2eth.join();
+  cout << "mfacq[6] ---------- threads finished ---------------- " << endl;
+  tm.Split("Threads Finished");  
+ 
+#ifndef NOPCIECARD
+  for (int i=0 ;i <acpar.NbFibers ;i++) {
+    UINT32 card=(acpar.FiberNum[i]-1)/2+1;
+    UINT32 cardfiber=(acpar.FiberNum[i]-1)%2;
+    DeletePCIEWrapperV6(card,cardfiber);
+  }
+#endif    
+return 0;
+}
+
+/* --Nouvelle-Fonction-- */
+int EthernetToMemoryAcq() 
+{
+  Timer tm("mfacq/EthernetToMemoryAcq");
+  cout << " ---------- mfacq/ EthernetToMemoryAcq()  ------------- " << endl;
+    
+  BRAcqConfig bpar;
+  BRParList& acpar=bpar.GetParams();
+  
+  cout << " mfacq[1]/Info: Creating RAcqMemZoneMgr for" << acpar.NbEthLinks() << " Eth-links , nZones=" 
+       << acpar.nZones << " NbPaquet/Zone=" << acpar.nPaqZone 
+       << " MmgrPaqSize=" << acpar.MMgrPaquetSize() << endl;
+  RAcqMemZoneMgr mmgr(acpar.nZones, acpar.NbEthLinks(), acpar.nPaqZone, acpar.MMgrPaquetSize());
+  pMmgr=&mmgr;  
+  if (acpar.fgdoProc && (acpar.stepProc>0)) {
+    // Dans ce cas, toutes les zones doivent passer ds le thread de monitoring 
+    // pour etre au moins marque comme traite - seul 1/acpar.stepProc sont effectivement traite 
+    mmgr.SetFinalizedMask(((uint_4)MemZS_Saved) | ((uint_4)MemZS_Proc));
+    cout << " mfacq[1.b]/Info: Mmgr.SetFinalizedMask( MemZS_Saved | MemZS_Proc )" << endl;
+  }
+  
+
+  cout <<"mfacq[2] Creating MultiDataSaver and  MonitorProc thread objects ... " << endl;
+  MultiDataSaver DsThr(mmgr);   //   Utilise les parametres globaux BRAcqConfig
+  string ppath=bpar.OutputDirectory();
+  MonitorProc PrThr(mmgr);
+  cout << "mfacq[3] Creating   EthernetReader thread object     " << endl;
+  EthernetReader ethrdr(mmgr, bpar.GetParams(), bpar.GetParams().tcpportid, false);
+  //  usleep(200);  attente au cas ou ...
+  pEthRdr=&ethrdr;
+  tm.Split("Threads created");  
+  if (acpar.fgdoProc>0) 
+    cout << "mfacq[4] - starting three threads: EthernetReader, MultiDataSaver, MonitorProc ... " << endl;
+  else 
+    cout << "mfacq[4] - starting two threads: EthernetReader, MultiDataSaver  ... " << endl;
+
+  ethrdr.start();
+  DsThr.start();
+  if (acpar.fgdoProc>0) { // On ne demarre que si au moins NMaxProc>0
+    PrThr.start();
+  }
+  
+  // On attend avant de declencher la terminaison des threads
+  usleep(200000);
+  
+  cout << "mfacq[5] -  Waiting for threads to finish ... " << endl;  
+  ethrdr.join();
+  DsThr.join();
+  mmgr.Stop();
+  if (acpar.fgdoProc) { // On n'attend la fin que si le thread a ete demarre (NMaxProc>0)
+    PrThr.join();
+  }
+  pMmgr=NULL;  
+  cout << "mfacq[6] ---------- threads finished ---------------- " << endl;
+  tm.Split("Threads Finished");  
+ 
+  mmgr.Print(cout);
+
+return 0;
+
+}

trunk/AddOn/TAcq/mfacq.h

@@ -12 +12 @@
 #include "racqumem.h"
 #include "racqurw.h" 
+#include "racqueth.h" 
 #ifndef NOPCIECARD
 #include "racquwbin.h"
@@ -40 +41 @@
 
 
+int PCIEToEthernetTransfer();
+int EthernetToMemoryAcq();
 int MultiFibreAcq();
 

trunk/AddOn/TAcq/racqurw.h

@@ -26 +26 @@
 // Nombre maximum de fibres geres par les classes MultiReader / MultiDiskWriter
 #ifndef MAXNBFIB
-#define MAXNBFIB  4   
+#define MAXNBFIB  16   
 #endif
 

trunk/AddOn/TAcq/swrapsock.cc

@@ -23 +23 @@
   The class Socket is not intended for direct use. Only the derived classes 
   ServerSocket and ClientSocket should be used.
+  The Close() method should be called explicitly. 
 */
 
@@ -38 +39 @@
 
 /* --Methode-- */
-/*  ---  A faire plus tard ...
 Socket::Socket(Socket const & a)
+{
+  Set(a);
+}
+
+
+/* --Methode-- */
+Socket::~Socket()
+{
+  //  Close();
+}
+
+/* --Methode-- */
+void Socket::Set(Socket const & a)
 {
   skt = a.skt;
@@ -49 +62 @@
   errcnt = a.errcnt;
 }
-*/
-
-/* --Methode-- */
-Socket::~Socket()
-{
-  Close();
-}
+
 
 /* --Methode-- */
@@ -191 +198 @@
   InitConnection(srvname, port);
 }
+
+/* --Methode-- */
+ClientSocket::ClientSocket(ClientSocket const& a)
+  : Socket(a)
+{
+  portid=a.portid;
+  ipskt=a.ipskt;
+}
+
+
+/* --Methode-- */
+void ClientSocket::SetC(ClientSocket const& a)
+{
+  Set(a);
+  portid=a.portid;
+  ipskt=a.ipskt;
+  return;
+}
+
 
 /* --Methode-- */

trunk/AddOn/TAcq/swrapsock.h

@@ -36 +36 @@
 public:
   Socket(int s=-1);
-  //  Socket(Socket const & a);
+  Socket(Socket const & a);
   ~Socket();
 
@@ -42 +42 @@
   size_t Receive(char * buff, size_t len, int flag=0);
   int Close();
+  
+  inline Socket& operator=(Socket const & a)
+  { Set(a);  return (*this); }
+
   inline int SetPrtLevel(int lev=0) 
     { if (lev > 0) prtlev = lev; return prtlev; }
+  inline long NBytesSent() { return totsnd; }
+  inline long NBytesRecv() { return totrcv; }
+  
+protected:
+  void Set(Socket const & a);
 
-protected:
-  
   int skt;
   long tstart;    /*  Temps de demarrage en sec  */
@@ -89 +96 @@
   ClientSocket(string const& srvname, int port);
   ClientSocket(const char* srvname, int port);
+  ClientSocket(ClientSocket const& a);
+  inline ClientSocket& operator=(ClientSocket const& a)
+  { SetC(a);  return (*this); }
 protected:
+  void SetC(ClientSocket const& a);
   void InitConnection(const char* srvname, int port);
+
   int portid;
   struct sockaddr_in  ipskt;