Changeset 452 in flair-src for trunk/lib/FlairCore/src

Timestamp:

Oct 1, 2021, 3:42:02 PM (3 years ago)

Author:

Sanahuja Guillaume

Message:

resolve Jossue bug with mutli buffering and grpahs

File:

• trunk/lib/FlairCore/src/ui_com.cpp (modified) (5 diffs)

trunk/lib/FlairCore/src/ui_com.cpp

@@ -553 +553 @@
 //must be called with mutex locked
 void ui_com::UpdateSendData(const SendData *obj) {
+   // Printf("UpdateSendData %s\n",obj->ObjectName().c_str());
   // le mutex est deja pris par l'appellant
   size_t id, i;
@@ -615 +616 @@
       for (size_t i = 0; i < pushedDatas.size(); i++) {
           if (pushedDatas.at(i).period==obj->SendPeriod() && pushedDatas.at(i).nb_buffering==obj->NbBuffering()) {
-              //Printf("match item %i, period %i nb buff %i\n",i,obj->SendPeriod(),obj->NbBuffering());
+              //Printf("match item %i, period %i nb buff %i, size %i\n",i,obj->SendPeriod(),obj->NbBuffering(),pushedDatas.at(i).final_size);
               match=true;
             }
@@ -628 +629 @@
         tmp.final_size=0;
         for (size_t i = 0; i < datasToSend.size(); i++) {
-            //Printf("data %i/%i %i %i\n",i,datasToSend.size(),datasToSend.at(i)->SendPeriod() ,datasToSend.at(i)->NbBuffering());
+            //Printf("data %s %i/%i %i %i\n",datasToSend.at(i)->ObjectName().c_str(),i,datasToSend.size(),datasToSend.at(i)->SendPeriod() ,datasToSend.at(i)->NbBuffering());
             if (datasToSend.at(i)->IsEnabled() && datasToSend.at(i)->SendPeriod() == obj->SendPeriod() && datasToSend.at(i)->NbBuffering()==obj->NbBuffering()) {
               tmp.final_size+=datasToSend.at(i)->SendSize();
@@ -652 +653 @@
 void ui_com::UpdateDataToSendBufferSize(const SendData *obj) {
     if(!obj->IsEnabled()) return;
-    
+    //Printf("UpdateDataToSendBufferSize %s\n",obj->ObjectName().c_str());
     send_mutex->GetMutex();
     
@@ -667 +668 @@
     }
     
-    ptr->final_size=sizeof(char)+sizeof(uint16_t);//header+period
+    ptr->final_size=0;
+    //Printf("actual %i\n",ptr->final_size);
+    for (size_t i = 0; i < datasToSend.size(); i++) {
+        //Printf("data %s %i/%i %i %i\n",datasToSend.at(i)->ObjectName().c_str(),i,datasToSend.size(),datasToSend.at(i)->SendPeriod() ,datasToSend.at(i)->NbBuffering());
+        if (datasToSend.at(i)->IsEnabled() && datasToSend.at(i)->SendPeriod() == obj->SendPeriod() && datasToSend.at(i)->NbBuffering()==obj->NbBuffering()) {
+          ptr->final_size+=datasToSend.at(i)->SendSize();
+          //Printf("add %i\n",datasToSend.at(i)->SendSize());
+        }
+    }
+    ptr->final_size*=obj->NbBuffering();
+    ptr->final_size+=sizeof(char)+sizeof(uint16_t);//header+period
     if(ptr->nb_buffering>1) ptr->final_size+=sizeof(uint16_t);//+nb_buffering
-    ptr->final_size+=obj->SendSize()*obj->NbBuffering();
+        
     //Printf("final %i\n",ptr->final_size);
     free(ptr->buf);