Changeset 440 in flair-src for trunk

Timestamp:

Aug 25, 2021, 4:41:21 PM (3 years ago)

Author:

Sanahuja Guillaume

Message:

up

Location:

trunk/lib/FlairCore/src

Files:

• ui_com.cpp (modified) (2 diffs)
• unexported/ui_com.h (modified) (1 diff)

trunk/lib/FlairCore/src/ui_com.cpp

@@ -319 +319 @@
       }
 
+      //test to push datas
+      for (size_t i = 0; i < data_to_send.size(); i++) {
+        if (data_to_send.at(i)->SendPeriod() == resume_period && data_to_send.at(i)->IsEnabled() == true) {
+          PushDatasToSend(data_to_send.at(i));
+        }
+      }
+      //end test
+      
       // on planifie la prochaine execution
       for (size_t i = 0; i < data_to_send.size(); i++) {
@@ -344 +352 @@
   }
 }
+
+
+//called with send_mutex locked
+//in nrt
+//TODO: RT part has to put datas in pipe, then useer thread call this
+void ui_com::PushDatasToSend(const SendData *data_to_send) {
+  PushedData_t* ptr=NULL;
+  //check if we already have one buffer for this couple period/nb_buffering
+  for (size_t i = 0; i < PushedDatas.size(); i++) {
+      if (PushedDatas.at(i).period==data_to_send->SendPeriod() && PushedDatas.at(i).nb_buffering==data_to_send->NbBuffering()) {
+          Printf("match item %i, period %i nb buff %i\n",i,data_to_send->SendPeriod(),data_to_send->NbBuffering());
+          ptr=&PushedDatas.at(i);
+        }
+  }
+  //otherwire create new one
+  if(ptr==NULL) {
+    printf("no match\n");
+    PushedData_t tmp;
+    tmp.period=data_to_send->SendPeriod();
+    tmp.nb_buffering=data_to_send->NbBuffering();
+    tmp.size=0;
+    tmp.buf=NULL;
+    PushedDatas.push_back(tmp);
+    ptr=&PushedDatas.back();
+  }
+   
+  ptr->buf=(char*)realloc(ptr->buf,ptr->size+data_to_send->SendSize());
+  
+  data_to_send->CopyDatas(ptr->buf+ptr->size);
+  ptr->size+=data_to_send->SendSize();
+  Printf("nb buffered %i\n",ptr->size);
+//TODO: savoir quand a fait tous les nb buffers
+  Printf("pushed size %i period %i nb buffering %i\n",data_to_send->SendSize(),data_to_send->SendPeriod(),data_to_send->NbBuffering());
+}
+
+
 #ifdef __XENO__
 void *ui_com::user_thread(void *arg) {

trunk/lib/FlairCore/src/unexported/ui_com.h

@@ -62 +62 @@
   //private part, called to effectively send to udt
   void SendNRT(char *buf, ssize_t size,int ttl);
+  void PushDatasToSend(const flair::gui::SendData *data_to_send);
+  typedef struct {
+    char* buf;
+    ssize_t size;
+    uint16_t period;
+    uint16_t nb_buffering;
+  } PushedData_t;
+  std::vector<PushedData_t> PushedDatas;
 
   static int compressBuffer(char *in, ssize_t in_size, char **out,