Changeset 3544 in Sophya for trunk/AddOn

Timestamp:

Oct 24, 2008, 12:31:52 PM (17 years ago)

Author:

ansari

Message:

debug classes RawInOutSocketStream et ajout d'envoi/reception de messages de header/trailer - Reza 24/10/2008

Location:

trunk/AddOn/TAcq

Files:

• sockrawstream.cc (modified) (2 diffs)
• sockrawstream.h (modified) (1 diff)
• tsok.cc (modified) (11 diffs)

trunk/AddOn/TAcq/sockrawstream.cc

@@ -11 +11 @@
 */
 
-
-/* --Methode-- */
-RawInOutSocketStream::RawInOutSocketStream(Socket &skt, size_t rwb_size)
+// Taille de base pour les messages echanges = Longueur header = long. Trailer
+// Longueur de trailer pour marquer la fin 
+#define   RIOS_BBSIZE  64
+
+/* --Methode-- */
+RawInOutSocketStream::RawInOutSocketStream(Socket &skt, size_t npaqbuff)
   : RawInOutStream() , _skt(skt)
 {
-  if (rwb_size < 1) rwb_size = 256;
-  _rdbuff.buff = new char[rwb_size];
-  _rdbuff.sz = rwb_size;
-  _rdbuff.cpos = rwb_size;
-
-  _wrbuff.buff = new char[rwb_size];
-  _wrbuff.sz = rwb_size;
+
+// ---- preparation de la chaine d'identification / taille du buffer 
+  const char * hdrmarq = "SIPSS-RawInOutSocketStream-Header";
+//                        0123456789012345678901234567890123456789
+  char msg[RIOS_BBSIZE];
+  for(size_t k=30; k<RIOS_BBSIZE; k++) msg[k]='\0';
+  strcpy(msg, hdrmarq);
+  if (npaqbuff < 1) npaqbuff = 1;
+  size_t sbsz =  npaqbuff*RIOS_BBSIZE;
+  sprintf(msg+48,"%ld",(long)sbsz);
+// ----- Envoi du marqueur de debut et negociation de taille du buffer 
+  Send(msg, (size_t)RIOS_BBSIZE);
+  Receive(msg, (size_t)RIOS_BBSIZE);
+  if (strcmp(msg, hdrmarq)!=0)  
+    throw SocketException("RawInOutSocketStream::RawInOutSocketStream()- ExchangeMsg check failed");
+
+  size_t rbsz = atol(msg+48);
+  size_t bufsize = (sbsz >= rbsz) ? sbsz : rbsz;
+
+//DBG  cout << "RIOSS::RawInOutSocketStream()*DBG* sbsz=" << sbsz << " rbsz=" << rbsz << " -->bufsize=" << bufsize << endl;
+ 
+  _rdbuff.buff = new char[bufsize];
+  _rdbuff.sz = bufsize;
+  _rdbuff.cpos = bufsize;
+
+  _wrbuff.buff = new char[bufsize];
+  _wrbuff.sz = bufsize;
   _wrbuff.cpos = 0;
   
@@ -30 +53 @@
 RawInOutSocketStream::~RawInOutSocketStream()
 {
-  //DBG  cout << " ---- DESTRUCTEUR ---- ~RawInOutSocketStream() " << endl;
+//  cout << " ---- DESTRUCTEUR ---- ~RawInOutSocketStream() " << endl;
+  //----- ecriture/envoi du buffer si pas vide 
   if (_wrbuff.cpos > 0) {
-    for (size_t k= _wrbuff.cpos; k<_wrbuff.sz; k++)
-      _wrbuff.buff[k] = '\0';
+    for (size_t k= _wrbuff.cpos; k<_wrbuff.sz; k++)  _wrbuff.buff[k] = '\0';
     _wrbuff.cpos = _wrbuff.sz;
     SendBuffer();
   }
+  // Envoi du marquer de fin (trailer) 
+  const char * trlmarq = "TRAILER-SIPSS-RawInOutSocketStream-Trailer";
+//                        0123456789012345678901234567890123456789
+  char msg[RIOS_BBSIZE];
+  for(size_t k=30; k<RIOS_BBSIZE; k++) msg[k]='\0';
+  strcpy(msg, trlmarq);
+  Send(msg, (size_t)RIOS_BBSIZE);
+
+  bool oktrailer=false;
+  size_t nrdt = 0;
+  size_t maxtry = 16*_rdbuff.sz / RIOS_BBSIZE;
+  while(!oktrailer && (nrdt<maxtry)) {
+    Receive(msg, (size_t)RIOS_BBSIZE);
+    nrdt++;
+    if (strcmp(msg, trlmarq)==0)  oktrailer = true;
+  }
+//DBG  cout << "RIOSS::~RawInOutSocketStream()*DBG* nrdt=" << nrdt << " Trailer:" << ((oktrailer)?" OK":" ERROR") << endl;
+
   delete [] _rdbuff.buff;
   delete [] _wrbuff.buff;
+  if (!oktrailer) 
+    throw SocketException("RawInOutSocketStream::~RawInOutSocketStream(): EndOfStream marker not found");
 }
 

trunk/AddOn/TAcq/sockrawstream.h

@@ -17 +17 @@
 class RawInOutSocketStream : public RawInOutStream {
 public:
-                      RawInOutSocketStream(Socket& skt, size_t rwb_size=1024);
+                      RawInOutSocketStream(Socket& skt, size_t npaq_buff=16);
   virtual             ~RawInOutSocketStream();
 

trunk/AddOn/TAcq/tsok.cc

@@ -17 +17 @@
 
 void burawtst(); 
-void serverside(); 
-void clientside(string& servname, string& msg, string& args);
-
+int serverside(); 
+int clientside(string& servname, string& msg, string& args);
+
+static size_t RIOS_NPAQ = 16;
+ 
+//---------------------------------------------------------------------------
+//  main program de test des classes socket  - R. Ansari 2005-2008
+//---------------------------------------------------------------------------
 int main(int narg, char *arg[])
 {
@@ -25 +30 @@
   if (narg < 2) {
     cout << " Erreur Argument / tsok.cc : Socket class tests \n" 
-         << "    Usage : tsok S/C [servername=localhost] [OPEMsg=Hello] [NLoop,SizeX,SizeY] \n" 
+         << "    Usage : tsok 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,1000 \n" 
+         << "        tsok C serverName PPFSOCKET  5,1000,800 \n" 
          << "   S : run tsok as server side \n" 
          << "   C : run tsok as client side \n"
@@ -43 +48 @@
   string oargs = "1,100,50";
   if (narg > 4) oargs = arg[4];
-
+  if (narg > 5) RIOS_NPAQ = atol(arg[5]);
+
+  int rc = 0;
   try {
     SophyaInit();  
     InitTim(); 
-    if (fgserv) serverside();
-    else if (*arg[1] == 'C') clientside(servname, opemsg, oargs);
+    if (fgserv) rc=serverside();
+    else if (*arg[1] == 'C') rc=clientside(servname, opemsg, oargs);
     else burawtst();
   }
   catch(PThrowable exc ) {
     cerr << "tsok-main() , Catched exception: \n" << exc.Msg() << endl;
+    rc=97;
   }
   catch(std::exception ex) {
     cerr << "tsok-main() , Catched std::exception " << (string)(ex.what()) << endl;
+    rc=98;
   }
   catch(...) {
     cerr << "tsok-main() , Catched ... ! " << endl;
-  }
+    rc=99;
+  }
+  cout << " --------- End of tsok.cc Rc=" << rc << " ---------------- " << endl;
 }
 
 
 /* --Fonction-- */
-void serverside()
-{
+int serverside()
+{
+  int rc = 66;
   cout << " ======== tsok.cc / ServerSide ============ " << endl;
   cout << " Creating server socket ... , PortId= " << PORTID << endl;
@@ -104 +116 @@
         //      sleep(1);
           {
-          RawInOutSocketStream sstr(skt);
+          RawInOutSocketStream sstr(skt, RIOS_NPAQ);
           PInPersist pis(&sstr, false, false);
           pis.GetObject(mx);
@@ -113 +125 @@
           {
           // cout << " --- writing back modified mx to socket stream ... " << endl;
-          RawInOutSocketStream sstr(skt);
+          RawInOutSocketStream sstr(skt, RIOS_NPAQ);
           POutPersist pos(&sstr, false);
           pos.PutObject(mx);
@@ -132 +144 @@
     cout << "ServerSide: Closing current socket ..." << endl;
     skt.Close();
+    rc = 0;
   }  // fin while(!fgstop)
   cout << " ======= End of tsok.cc / ServerSide ======== " << endl;
+  return rc;
 }
 
 /* --Fonction-- */
-void clientside(string& servname, string& msg, string& args)
-{
+int clientside(string& servname, string& msg, string& args)
+{
+  int rc = 77;
   cout << " ======== tsok.cc / ClientSide ============ " << endl;
   cout << "  ServerName= " << servname << " OpeMsg= " << msg << endl;
@@ -150 +165 @@
   cout << "  Sending Message : " << buff << endl;
   cli.Send(buff, 256);
+  rc = 0;
   if (msg == "PPFSOCKET") {
+    rc = 7;
     int nloop = 1;
     int sx = 100;
@@ -170 +187 @@
       {
       // cout << " --- writing mx to socket stream ... " << endl;
-      RawInOutSocketStream sstr(cli);
+      RawInOutSocketStream sstr(cli, RIOS_NPAQ);
       POutPersist pos(&sstr, false);
       pos.PutObject(mx);
@@ -176 +193 @@
       TMatrix<int_4> mxr;
       {
-      RawInOutSocketStream sstr(cli);
+      RawInOutSocketStream sstr(cli, RIOS_NPAQ);
       PInPersist pis(&sstr, false, false);
       pis.GetObject(mxr);
@@ -197 +214 @@
     }
     cout << "ClientSide/End of PPFSocket  NPb-Check-returnMatrix=" << npb << " /NLoop=" << nloop << endl;  
+    if (npb==0) rc=0;
+    else rc=70;
     float ttms  = tm.TotalElapsedTime();
     if (ttms < 1.e-6) ttms = 1e-6;
@@ -205 +224 @@
   cli.Send(buff, 256);
   cout << " ======= End of tsok.cc / ClientSide ======== " << endl;
+  return rc;
 }