Changeset 3907 in Sophya for trunk/AddOn

Timestamp:

Nov 5, 2010, 7:58:07 PM (15 years ago)

Author:

ansari

Message:

Ajout script verification donnees firmware FFT-shrink, Reza 05/11/2010

Location:

trunk/AddOn/TAcq

Files:

• ckshrink.pic (added)
• racqueth.cc (modified) (3 diffs)
• swrapsock.cc (modified) (2 diffs)
• swrapsock.h (modified) (1 diff)
• tsok.cc (modified) (6 diffs)

trunk/AddOn/TAcq/racqueth.cc

@@ -59 +59 @@
       sok.SendAll(msg,BRTCPMSGLEN);
       sok.ReceiveAll(msg,BRTCPMSGLEN);
-      if (strncmp(msg,"BAORadio-EthernetReader-OK",26)!=0) 
+      if (strncmp(msg,"BAORadio-EthernetReader-OK",26)!=0) {
+        msg[BRTCPMSGLEN-1]='\0';
+        cout << "PCIEToEthernet:ERROR/ bad Init_Acknowledge message from EthernetReader : \n  " << msg << endl;
+        usleep(10000);
         throw SocketException("PCIEToEthernet:ERROR/  Connection to EthernetReader not established ");
+      }
       cout << " PCIEToEthernet: Ethernet connection established for DMA/fiber" << i << " with " << destname_[j] << endl;
       vskt.push_back(sok);
@@ -406 +410 @@
     for(int ii=0; ii<BRTCPMSGLEN; ii++) msg[ii]='\0';
     sok.ReceiveAll(msg,BRTCPMSGLEN);
-    if (strncmp(msg,"BAORadio-PCIEToEthernet",23)!=0) 
+    if (strncmp(msg,"BAORadio-PCIEToEthernet",23)!=0) {
+      cout << " EthernetReader:ERROR, bad init message from PCIEToEthernet client -> throw SocketException" << endl;
       throw SocketException("EthernetReader:ERROR/  Bad message from PCIEToEthernet client !");
+    }
     int ia,ib,ic,id,ie;
     sscanf(msg+25,"%d %d %d %d %d",&ia,&ib,&ic,&id,&ie);
@@ -414 +420 @@
       strcpy(msg,"BAORadio-EthernetReader-BAD MMgrNbPaquet/MMgrPaquetSize()");
       sok.SendAll(msg,BRTCPMSGLEN);
+      cout << " EthernetReader:ERROR, Bad client.MMgrNbPaquet/PaquetSize NbPaq=" << ia << " PaqSz=" << ib 
+           << " Reader_PaqSz=" << memgr_.PaqSize() << endl;
+      usleep(10000);
       throw SocketException("EthernetReader:ERROR/  Bad MMgrNbPaquet/MMgrPaquetSize() from PCIEToEthernet client !");
     }

trunk/AddOn/TAcq/swrapsock.cc

@@ -166 +166 @@
   : Socket() 
 {
+  Initialize(NULL, port, nconmax);
+}
+
+/* --Methode-- */
+ServerSocket::ServerSocket(const char* inadr, int port, int nconmax)
+  : Socket() 
+{
+  Initialize(inadr, port, nconmax);
+}
+
+/* --Methode-- */
+ServerSocket::ServerSocket(string const& inadr, int port, int nconmax)
+  : Socket() 
+{
+  Initialize(inadr.c_str(), port, nconmax);
+}
+
+
+/* --Methode-- */
+void ServerSocket::Initialize(const char* str_inadr, int port, int nconmax)
+{
   int s,rc;
   s = socket(AF_INET, SOCK_STREAM, 0);
   if (s < 0) { 
-    cout << "ServerSocket() Pb socket() ErrNo=" <<  errno << endl;  
-    throw SocketException("ServerSocket() Pb socket()");
+    cout << "ServerSocket::Initialize()  Pb socketErrNo=" <<  errno << endl;  
+    throw SocketException("ServerSocket::Initialize() Pb socket()");
     }
   skt = s;
@@ -180 +201 @@
   ipskt.sin_family = AF_INET;
   ipskt.sin_port = htons(port);
-  ipskt.sin_addr.s_addr = INADDR_ANY;
+  if (str_inadr==NULL) {   // pas d'adresse IP specifie 
+    ipskt.sin_addr.s_addr = INADDR_ANY;
+  }
+  else {  // adresse IP specifie sous la forme uuu.xxx.yyy.zzz.
+    ipskt.sin_addr.s_addr = inet_addr(str_inadr);
+  }
   /* Je fais un cast explicit de sockaddr_in * (Internet) en sockaddr *   */
   rc = bind(skt, (struct sockaddr *)(&ipskt), sizeof(ipskt));
   if (rc < 0) {
     Close();
-    cout << "ServerSocket() Pb bind() ErrNo=" <<  errno << endl;  
-    throw SocketException("ServerSocket() Pb bind()");
+    cout << "ServerSocket::Initialize() Pb bind() ErrNo=" <<  errno << endl;  
+    throw SocketException("ServerSocket::Initialize() Pb bind()");
   }
 }

trunk/AddOn/TAcq/swrapsock.h

@@ -88 +88 @@
 public :
   ServerSocket(int port, int nconmax);
+  ServerSocket(const char* inadr, int port, int nconmax);
+  ServerSocket(string const& inadr, int port, int nconmax);
   Socket WaitClientConnection();
   virtual int Close();  // redefinition de la methode de Socket::Close()
 
 protected:
+  void Initialize(const char* inadr, int port, int nconmax);
+
   int portid;
   struct sockaddr_in  ipskt;

trunk/AddOn/TAcq/tsok.cc

@@ -18 +18 @@
 
 void burawtst(); 
-int serverside(); 
+int serverside(const char* adr=NULL); 
 int clientside(string& servname, string& msg, string& args);
 
@@ -31 +31 @@
   if (narg < 2) {
     cout << " Erreur Argument / tsok.cc : Socket class tests \n" 
-         << "    Usage : tsok S/C [servername=localhost] [OPEMsg=Hello] [NLoop,SizeX,SizeY] [RIOS_NPaq=16]\n" 
+         << "    Usage : tsok S/s/C [servername=localhost] [OPEMsg=Hello] [NLoop,SizeX,SizeY] [RIOS_NPaq=16]\n" 
          << "    Ex: tsok S   or  tsok C serverName or \n" 
          << "        tsok C serverName PPFSOCKET  5,1000,800 \n" 
-         << "   S : run tsok as server side \n" 
+         << "   S/s : run tsok as server side, (S: specify ServerSocket In_Adress)  \n" 
          << "   C : run tsok as client side \n"
          << "   OPEMsg : Operation select on client side (=XXX , PPFSOCKET , STOP)   \n"
@@ -42 +42 @@
   }  
   bool fgserv = false;
-  if (*arg[1] == 'S')  fgserv = true;
+  bool fginadr = false;
+  if (*arg[1] == 's')  fgserv = true;
+  else if (*arg[1] == 'S') { fgserv=true;  fginadr=true; }
   string servname = "localhost";
   if (narg > 2)  servname = arg[2];
@@ -55 +57 @@
     SophyaInit();  
     InitTim(); 
-    if (fgserv) rc=serverside();
+    if (fgserv) { 
+      if (fginadr) rc=serverside(servname.c_str());
+      else rc=serverside();
+    }
     else if (*arg[1] == 'C') rc=clientside(servname, opemsg, oargs);
     else burawtst();
@@ -76 +81 @@
 
 /* --Fonction-- */
-int serverside()
+int serverside(const char* adr)
 {
   int rc = 66;
   cout << " ======== tsok.cc / ServerSide ============ " << endl;
-  cout << " Creating server socket ... , PortId= " << PORTID << endl;
-  ServerSocket srv(PORTID, 1);
+  if (adr !=NULL)  cout << " Creating server socket InAddress=" << adr << ", PortId= " << PORTID << endl;
+  else cout << " Creating server socket ... , PortId= " << PORTID << endl;
+  ServerSocket srv(adr, PORTID, 1);
   bool fgstop = false;
   int nc = 0;
@@ -144 +150 @@
     }  // fin while(! fgbye) 
     cout << "ServerSide: Closing current socket ..." << endl;
-    skt.Close();
+    skt.Close(); 
     rc = 0;
   }  // fin while(!fgstop)