Changeset 234 in flair-src for trunk/tools/FlairGCS/src/ConnectionLayout.cpp

Timestamp:

04/10/18 17:05:27 (5 years ago)

Author:

Sanahuja Guillaume

Message:

create file oscket only when necessary

File:

• trunk/tools/FlairGCS/src/ConnectionLayout.cpp (modified) (5 diffs)

trunk/tools/FlairGCS/src/ConnectionLayout.cpp

@@ -8 +8 @@
 #include <qendian.h>
 #include "communication.h"
-#include <zlib.h>
-#include <assert.h>
-
-#define COMPRESS_CHUNK 1024
-#define RX_TIME 5000
 
 ConnectionLayout::ConnectionLayout(UdtSocket *socket, QString name)
     : Layout(NULL, name, "root") {
-  isRemoteNameDefined = false;
   this->socket = socket;
-
-  total_received=0;
-  receive_timer = new QTimer(this);
-  connect(receive_timer, SIGNAL(timeout()), this, SLOT(computeRxRate()));
-  receive_timer->start(RX_TIME);
+  this->name = name;
 }
 
 ConnectionLayout::~ConnectionLayout() {
-  receive_timer->stop();
 }
 
-void ConnectionLayout::computeRxRate(void) {
-  float receive_rate=((float)total_received/(RX_TIME/1000))/1000;//in Ko/s
-  total_received=0;
-  computedRxRate(receive_rate);
+QString ConnectionLayout::getUDTStats() {
+  return socket->getUDTStats();
 }
 
 void ConnectionLayout::receive(char *buf, int size) {
-  total_received+=size-1;
   // printf("trame %x\n",buf[0]);
   // for(int i=0; i<size;i++) printf("%x ",buf[i]);
   // printf("\n");
-  switch (buf[0]) {
-  case ZLIB_HEADER: {
-    ssize_t out_size;
-    char *uncompressbuf;
-    uncompressBuffer(buf, size, &uncompressbuf, &out_size);
-    handleUncompressedFrame(uncompressbuf, out_size);
-    free(uncompressbuf);
-    break;
-  }
-  default:
-    handleUncompressedFrame(buf, size);
-  }
-  free(buf);
-}
-
-void ConnectionLayout::XmlToSend(QDomDocument doc) {
-  // printf("xml to send\n%s\n",doc.toString().toLocal8Bit().constData());
-  // xml to send a mettre dans le manager
-  QMetaObject::invokeMethod(
-      socket, "write", Qt::BlockingQueuedConnection,
-      Q_ARG(const char *, doc.toString().toLocal8Bit().constData()),
-      Q_ARG(qint64, doc.toString().toLocal8Bit().length()));
-}
-
-void ConnectionLayout::LoadXml(QDomDocument to_parse) {
-  if (!isRemoteNameDefined) {
-    printf("load xml: name not defined!\n");
-    return;
-  }
-
-  QDomElement tmp = to_parse.firstChildElement("root");
-  while (tmp.attribute("name") != remoteName && !tmp.isNull())
-    tmp = to_parse.nextSiblingElement("root");
-
-  if (!tmp.isNull()) {
-    XmlWidget::LoadXml(tmp);
-  } else {
-    printf("%s not found in xml file \n", remoteName.toLocal8Bit().constData());
-  }
-}
-
-void ConnectionLayout::handleUncompressedFrame(char *buf, ssize_t size) {
   switch ((unsigned char)buf[0]) {
   case XML_HEADER: {
@@ -92 +36 @@
     if (!doc.setContent(xml)) {
       printf("prob setContent fichier\n");
-    }
-
-    if (!isRemoteNameDefined) {
-      isRemoteNameDefined = true;
-      remoteName = doc.firstChildElement("root").attribute("name");
-      setRemoteName(remoteName);
-      SetAttribute("name", remoteName);
     }
 
@@ -127 +64 @@
 }
 
+void ConnectionLayout::XmlToSend(QDomDocument doc) {
+  // printf("xml to send\n%s\n",doc.toString().toLocal8Bit().constData());
+  
+  // xml to send a mettre dans le manager
+  socket->write(doc.toString().toLocal8Bit().constData(),doc.toString().toLocal8Bit().length());/*
+  QMetaObject::invokeMethod(
+      socket, "write", Qt::BlockingQueuedConnection,
+      Q_ARG(const char *, doc.toString().toLocal8Bit().constData()),
+      Q_ARG(qint64, doc.toString().toLocal8Bit().length()));*/
+}
+
+void ConnectionLayout::LoadXml(QDomDocument to_parse) {
+  QDomElement tmp = to_parse.firstChildElement("root");
+  while (tmp.attribute("name") != name && !tmp.isNull())
+    tmp = to_parse.nextSiblingElement("root");
+
+  if (!tmp.isNull()) {
+    XmlWidget::LoadXml(tmp);
+  } else {
+    printf("%s not found in xml file \n", name.toLocal8Bit().constData());
+  }
+}
+
 void ConnectionLayout::removeDataRemote(DataRemote *data) {
   dataremotes.removeOne(data);
@@ -135 +95 @@
 }
 
-QString ConnectionLayout::getRemoteName() { return remoteName; }
+QString ConnectionLayout::getName() { return name; }
 
 void ConnectionLayout::drawDatas(char *buf, int buf_size, uint16_t period,
@@ -144 +104 @@
 }
 
-int ConnectionLayout::uncompressBuffer(char *in, ssize_t in_size, char **out,
-                                       ssize_t *out_size) {
-  int ret;
-  unsigned have;
-  z_stream strm;
+QString ConnectionLayout::getDocRootName(char* buf, int size) {
+  QString xml;
+  QDomDocument doc;
+  xml = QString((char *)buf);
+  xml.resize(size);
 
-  // allocate inflate state
-  strm.zalloc = Z_NULL;
-  strm.zfree = Z_NULL;
-  strm.opaque = Z_NULL;
-  strm.avail_in = 0;
-  strm.next_in = Z_NULL;
-  ret = inflateInit(&strm);
-  if (ret != Z_OK)
-    return ret;
-
-  *out = (char *)malloc(COMPRESS_CHUNK);
-  if (!(*out))
-    return Z_BUF_ERROR;
-
-  strm.avail_in = in_size;
-  strm.next_in = (unsigned char *)in;
-  strm.avail_out = COMPRESS_CHUNK;
-  strm.next_out = (unsigned char *)*out;
-
-  ret = inflate(&strm, Z_NO_FLUSH);
-  assert(ret != Z_STREAM_ERROR); // state not clobbered
-  switch (ret) {
-  case Z_NEED_DICT:
-    ret = Z_DATA_ERROR; // and fall through
-  case Z_DATA_ERROR:
-  case Z_MEM_ERROR:
-    (void)inflateEnd(&strm);
-    return ret;
+  if (!doc.setContent(xml)) {
+    printf("prob setContent fichier\n");
   }
-  have = COMPRESS_CHUNK - strm.avail_out;
-  *out_size = have;
-
-  // printf("%i -> %i\n",in_size,have);
-  // printf("%s\n",*out);
-  // clean up and return
-  (void)inflateEnd(&strm);
-  return ret == Z_STREAM_END ? Z_OK : Z_DATA_ERROR;
+  
+  return doc.firstChildElement("root").attribute("name");
 }