Changeset 3544 in Sophya for trunk/AddOn/TAcq/sockrawstream.cc

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

File:

• trunk/AddOn/TAcq/sockrawstream.cc (modified) (2 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");
 }