Changeset 139 in flair-src for trunk

Timestamp:

Feb 14, 2017, 5:02:06 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

warn message if vrpnobject is added on running client

Location:

trunk

Files:

• demos/CircleFollower/uav/src/CircleFollower.cpp (modified) (1 diff)
• lib/FlairCore/src/Thread.cpp (modified) (1 diff)
• lib/FlairCore/src/Thread.h (modified) (1 diff)
• lib/FlairCore/src/unexported/Thread_impl.h (modified) (2 diffs)
• lib/FlairSensorActuator/src/VrpnClient_impl.cpp (modified) (1 diff)
• lib/FlairSensorActuator/src/VrpnObject_impl.cpp (modified) (3 diffs)

trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

@@ -42 +42 @@
     Uav* uav=GetUav();
 
-                VrpnClient* vrpnclient=new VrpnClient("vrpn", uav->GetDefaultVrpnAddress(),80);
-                uavVrpn = new MetaVrpnObject(uav->ObjectName());
-                getFrameworkManager()->AddDeviceToLog(uavVrpn);
-                uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
-                vrpnclient->Start();
+    VrpnClient* vrpnclient=new VrpnClient("vrpn", uav->GetDefaultVrpnAddress(),80);
+    uavVrpn = new MetaVrpnObject(uav->ObjectName());
+    getFrameworkManager()->AddDeviceToLog(uavVrpn);
+    uav->GetAhrs()->YawPlot()->AddCurve(uavVrpn->State()->Element(2),DataPlot::Green);
+    vrpnclient->Start();
                                                                                                                                  
     startCircle=new PushButton(GetButtonsLayout()->NewRow(),"start_circle");

trunk/lib/FlairCore/src/Thread.cpp

@@ -78 +78 @@
 bool Thread::IsSuspended(void) const { return pimpl_->IsSuspended(); }
 
+bool Thread::IsRunning(void) const { return pimpl_->isRunning; }
+
 void Thread::Resume(void) { pimpl_->Resume(); }
 

trunk/lib/FlairCore/src/Thread.h

@@ -176 +176 @@
   */
   bool IsSuspended(void) const;
+  
+  /*!
+  * \brief Is the thread running?
+  *
+  * \return true if thread is running (call to Start). A suspended thread is running.
+  *
+  */
+  bool IsRunning(void) const;
 
   /*!

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

@@ -49 +49 @@
   int WaitUpdate(const flair::core::IODevice *device);
   bool period_set;
+   bool isRunning;
 
 private:
@@ -58 +59 @@
   uint64_t cpt;
   flair::core::Time period;
-  bool isRunning;
   bool tobestopped;
   bool is_suspended;

trunk/lib/FlairSensorActuator/src/VrpnClient_impl.cpp

@@ -215 +215 @@
       }
     } else {//!UseXbee()
-                        if(connection->connected()==vrpn_true && !isConnected) {
-                                isConnected=true;
-                                Printf("VRPN connected\n");
-                        }
-                        if(connection->connected()==vrpn_false && isConnected) {
-                                isConnected=false;
-                                Printf("VRPN disconnected\n");
-                        }
-                        
-                        //timeout in mainloop is not well handled if not connected...
-                        if(isConnected) {
-                                //this is when trackables callbacks are called:
-                                if(connection->mainloop(&timeout)!=0) {
-                                        self->Warn("connection dropped\n");
-                                }
-                                //printf("%lld\n",GetTime()/(1000*1000));
-                                mutex->GetMutex();
-                                for (unsigned int i = 0; i < trackables.size(); i++)
-                                        trackables.at(i)->mainloop();
-                                mutex->ReleaseMutex();
-                        } else {
-                                connection->mainloop();
-                                self->SleepMS(10);
-                        }
+        if(connection->connected()==vrpn_true && !isConnected) {
+            isConnected=true;
+            Printf("VRPN connected\n");
+        }
+        if(connection->connected()==vrpn_false && isConnected) {
+            isConnected=false;
+            Printf("VRPN disconnected\n");
+        }
+        //timeout in mainloop is not well handled if not connected...
+        if(isConnected) {
+            //this is when trackables callbacks are called:
+            if(connection->mainloop(&timeout)!=0) {
+                self->Warn("connection dropped\n");
+            }
+            //printf("%lld\n",GetTime()/(1000*1000));
+            mutex->GetMutex();
+            for (unsigned int i = 0; i < trackables.size(); i++)
+                trackables.at(i)->mainloop();
+            mutex->ReleaseMutex();
+        } else {
+            connection->mainloop();
+            self->SleepMS(10);
+        }
     }
   }

trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp

@@ -56 +56 @@
   }
 
-  if (parent->UseXbee()) {
-    parent->pimpl_->AddTrackable(this, id);
-    tracker = NULL;
-  } else {
-    parent->pimpl_->AddTrackable(self);
-    tracker = new vrpn_Tracker_Remote(name.c_str(), parent->pimpl_->connection);
-    tracker->register_change_handler(this, handle_pos);
-    tracker->shutup = true;
-  }
-
   // state
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(7, 1);
@@ -91 +81 @@
   z_plot = new DataPlot1D(plot_tab->LastRowLastCol(), "z", -2, 0);
   z_plot->AddCurve(output->Element(6));
+  
+  if(parent->IsRunning()) {
+    self->Warn("adding VrpnObject on running VrpnClient can crash\n");
+  }
+  
+  if (parent->UseXbee()) {
+    tracker = NULL;
+    parent->pimpl_->AddTrackable(this, id);
+  } else {
+    tracker = new vrpn_Tracker_Remote(name.c_str(), parent->pimpl_->connection);
+    tracker->register_change_handler(this, handle_pos);
+    tracker->shutup = true;
+    parent->pimpl_->AddTrackable(self);
+  }
 }
 
@@ -106 +110 @@
 }
 
-void VrpnObject_impl::mainloop(void) { tracker->mainloop(); }
+void VrpnObject_impl::mainloop(void) { 
+     tracker->mainloop();
+}
 
 bool VrpnObject_impl::IsTracked(unsigned int timeout_ms) {