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

Timestamp:

06/23/17 17:33:03 (7 years ago)

Author:

Sanahuja Guillaume

Message:

maj imu

Location:

trunk/lib/FlairCore/src

Files:

• FrameworkManager.cpp (modified) (4 diffs)
• FrameworkManager_impl.cpp (modified) (1 diff)
• OneAxisRotation_impl.cpp (modified) (2 diffs)
• Thread_impl.cpp (modified) (6 diffs)
• unexported/FrameworkManager_impl.h (modified) (1 diff)
• unexported/Thread_impl.h (modified) (2 diffs)

trunk/lib/FlairCore/src/FrameworkManager.cpp

@@ -81 +81 @@
   for (vector<const Object *>::iterator it = Childs()->begin();
        it < Childs()->end(); it++) {
-    // Printf("child %i %s
-    // %s\n",Childs()->size(),(*it)->ObjectName().c_str(),(*it)->ObjectType().c_str());
+     //Printf("child %i %s %s\n",Childs()->size(),(*it)->ObjectName().c_str(),(*it)->ObjectType().c_str());
     if ((*it)->ObjectType() == "Thread") {
       if (*it != pimpl_) {
@@ -102 +101 @@
   for (vector<const Object *>::iterator it = Childs()->begin();
        it < Childs()->end(); it++) {
-    // Printf("child %i %s
-    // %s\n",Childs()->size(),(*it)->ObjectName().c_str(),(*it)->ObjectType().c_str());
+     //Printf("child %i %s %s\n",Childs()->size(),(*it)->ObjectName().c_str(),(*it)->ObjectType().c_str());
     if ((*it)->ObjectType() == "IODevice") {
       // Printf("del\n");
@@ -122 +120 @@
   // permet de garder l'uicom pour notifer des destructions
   while (Childs()->size() != 0) {
-    // Printf("child %i %s
-    // %s\n",Childs()->size(),Childs()->back()->ObjectName().c_str(),Childs()->back()->ObjectType().c_str());
+     //Printf("child %i %s %s\n",Childs()->size(),Childs()->back()->ObjectName().c_str(),Childs()->back()->ObjectType().c_str());
     if (Childs()->back() != NULL)
       delete Childs()->back();
@@ -135 +132 @@
 void FrameworkManager::SetupConnection(string address, uint16_t port,Time watchdogTimeout,
                                        size_t rcv_buf_size) {
-  pimpl_->SetupConnection(address, port, rcv_buf_size);
+  pimpl_->SetupConnection(address, port, watchdogTimeout,rcv_buf_size);
 }
 

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -239 +239 @@
   gcs_watchdog = new Watchdog(
       this, std::bind(&FrameworkManager_impl::ConnectionLost, this),
-      (Time)1000000000);
+      watchdogTimeout);
   gcs_watchdog->Start();
 }

trunk/lib/FlairCore/src/OneAxisRotation_impl.cpp

@@ -22 +22 @@
 #include <Euler.h>
 #include <Quaternion.h>
+#include <math.h>
 
 using std::string;
@@ -41 +42 @@
 OneAxisRotation_impl::~OneAxisRotation_impl() {}
 
-// compute rotation of each axis through ComputeRotation(Vector3D& vector)
 void OneAxisRotation_impl::ComputeRotation(Quaternion &quat) const {
-  Vector3Df rot = Vector3Df(quat.q1, quat.q2, quat.q3);
-  ComputeRotation(rot);
-  quat.q1 = rot.x;
-  quat.q2 = rot.y;
-  quat.q3 = rot.z;
+  Quaternion rot;
+  switch (rot_axe->CurrentIndex()) {
+    case 0:
+      rot=Quaternion(cosf(Euler::ToRadian(rot_value->Value()/2)),sinf(Euler::ToRadian(rot_value->Value()/2)), 0,0);
+      break;
+    case 1:
+      rot=Quaternion(cosf(Euler::ToRadian(rot_value->Value()/2)),0,sinf(Euler::ToRadian(rot_value->Value()/2)),0);
+      break;
+    case 2:
+      rot=Quaternion(cosf(Euler::ToRadian(rot_value->Value()/2)),0,0,sinf(Euler::ToRadian(rot_value->Value()/2)));
+      break;
+  }
+  quat=quat*rot;
 }
 

trunk/lib/FlairCore/src/Thread_impl.cpp

@@ -57 +57 @@
   this->priority = priority;
   period = 100 * 1000 * 1000; // 100ms par defaut
-  min_jitter = 1000 * 1000 * 1000;
-  max_jitter = 0;
-  mean_jitter = 0;
+  min_latency = 1000 * 1000 * 1000;
+  max_latency = 0;
+  mean_latency = 0;
   last = 0;
   cpt = 0;
@@ -234 +234 @@
   next_time += period;
 #endif
-  ComputeJitter(GetTime());
+  ComputeLatency(GetTime());
 }
 
@@ -324 +324 @@
   {
 #ifndef __XENO__
-// if(last!=0)
+  if(last!=0)
 #endif
     { Printf("Thread::%s :\n", self->ObjectName().c_str()); }
@@ -346 +346 @@
 #endif
     if (last != 0) {
-      Printf("    min jitter (ns): %lld\n", min_jitter);
-      Printf("    max jitter (ns): %lld\n", max_jitter);
-      Printf("    jitter moy (ns): %lld\n", mean_jitter / cpt);
+      Printf("    min latency (ns): %lld\n", min_latency);
+      Printf("    max latency (ns): %lld\n", max_latency);
+      Printf("    latency moy (ns): %lld\n", mean_latency / cpt);
       Printf("    itertions: %lld\n", cpt);
     }
@@ -370 +370 @@
 }
 
-void Thread_impl::ComputeJitter(Time time) {
+void Thread_impl::ComputeLatency(Time time) {
   Time diff, delta;
   diff = time - last;
@@ -384 +384 @@
     return;
 
-  if (delta > max_jitter)
-    max_jitter = delta;
-  if (delta < min_jitter)
-    min_jitter = delta;
-  mean_jitter += delta;
+  if (delta > max_latency)
+    max_latency = delta;
+  if (delta < min_latency)
+    min_latency = delta;
+  mean_latency += delta;
   cpt++;
 
-  // Printf("Thread::%s jitter moy (ns):
-  // %lld\n",self->ObjectName().c_str(),mean_jitter/cpt);
+  // Printf("Thread::%s latency moy (ns):
+  // %lld\n",self->ObjectName().c_str(),mean_latency/cpt);
 }
 

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

@@ -44 +44 @@
   ~FrameworkManager_impl();
   void SetupConnection(std::string address, uint16_t port,flair::core::Time watchdogTimeout,
-                       size_t rcv_buf_size = 10000);
+                       size_t rcv_buf_size);
   void SetupUserInterface(std::string xml_file);
   void SetupLogger(std::string log_path);

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

@@ -55 +55 @@
   flair::core::ConditionVariable *cond;
   uint8_t priority;
-  flair::core::Time max_jitter, min_jitter, mean_jitter;
+  flair::core::Time max_latency, min_latency, mean_latency;
   flair::core::Time last;
   uint64_t cpt;
@@ -62 +62 @@
   bool is_suspended;
   void PrintStats(void);
-  void ComputeJitter(flair::core::Time time);
+  void ComputeLatency(flair::core::Time time);
 #ifdef __XENO__
   RT_TASK task_rt;