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

Timestamp:

Sep 10, 2021, 2:37:55 PM (3 years ago)

Author:

Sanahuja Guillaume

Message:

update buffering (gcs part)
seems to work!

File:

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

trunk/lib/FlairCore/src/ui_com.cpp

@@ -389 +389 @@
   dataToSend->CopyDatas(ptr->buf+ptr->actual_size);
   ptr->actual_size+=dataToSend->SendSize();
-  Printf("nb buffered %i/%i\n",ptr->actual_size,ptr->final_size);
-  Printf("pushed size %i period %i nb buffering %i\n",dataToSend->SendSize(),dataToSend->SendPeriod(),dataToSend->NbBuffering());
+  //Printf("nb buffered %i/%i\n",ptr->actual_size,ptr->final_size);
+  //Printf("pushed size %i period %i nb buffering %i\n",dataToSend->SendSize(),dataToSend->SendPeriod(),dataToSend->NbBuffering());
   if(ptr->actual_size>=ptr->final_size) {//par securité on test aussi le cas ou supérieur
-      Printf("ready to send\n");
+      //Printf("ready to send\n");
       SendNRT(ptr->buf, ptr->actual_size,ptr->period);
       //clean
@@ -615 +615 @@
         if(bufSize!=0) bufSize+=sizeof(char)+sizeof(uint16_t)+sizeof(uint16_t);//header+period+nb_buffering
         if(bufSize!=(*pushedDatasIterator).final_size && bufSize!=0) {
-            Printf("change buf size %i->%i\n",(*pushedDatasIterator).final_size,bufSize);
+            //Printf("change buf size %i->%i\n",(*pushedDatasIterator).final_size,bufSize);
             (*pushedDatasIterator).actual_size=0;
             (*pushedDatasIterator).final_size=bufSize;
@@ -622 +622 @@
         }
         if(bufSize==0) {
-            Printf("delete buf\n");
+            //Printf("delete buf\n");
             free((*pushedDatasIterator).buf);
             pushedDatasIterator = pushedDatas.erase(pushedDatasIterator);
@@ -635 +635 @@
       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\n",i,obj->SendPeriod(),obj->NbBuffering());
               match=true;
             }
@@ -641 +641 @@
       //create new one
       if(!match) {
-        printf("no match\n");
+        //printf("no match\n");
         PushedData_t tmp;
         tmp.period=obj->SendPeriod();
@@ -648 +648 @@
         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 %i/%i %i %i\n",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();
-              Printf("add %i\n",datasToSend.at(i)->SendSize());
+              //Printf("add %i\n",datasToSend.at(i)->SendSize());
             }
         }
         tmp.final_size*=obj->NbBuffering();
         tmp.final_size+=sizeof(char)+sizeof(uint16_t)+sizeof(uint16_t);//header+period+nb_buffering
-        printf("final size %i\n",tmp.final_size);
+        //printf("final size %i\n",tmp.final_size);
         tmp.buf=(char*)malloc(tmp.final_size);
         if(tmp.buf!=NULL) {
@@ -665 +665 @@
       }
   }
-  Printf("nb buf %i\n",pushedDatas.size());
+  //Printf("nb buf %i\n",pushedDatas.size());
   return;
 }
@@ -688 +688 @@
 
 void ui_com::UpdateDataToSendBufferSize(const SendData *obj) {
+    if(!obj->IsEnabled()) return;
+    
     send_mutex->GetMutex();