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

Timestamp:

Jun 23, 2016, 10:15:30 AM (8 years ago)

Author:

Bayard Gildas

Message:

Modif. pour ajour manette émulée (EmulatedController)

Location:

trunk/lib/FlairCore/src

Files:

• IODevice.cpp (modified) (2 diffs)
• IODevice.h (modified) (1 diff)
• Thread_impl.cpp (modified) (2 diffs)

trunk/lib/FlairCore/src/IODevice.cpp

@@ -27 +27 @@
 namespace core {
 
-IODevice::IODevice(const Object *parent, string name)
-    : Object(parent, name, "IODevice") {
-  pimpl_ = new IODevice_impl(this);
+IODevice::IODevice(const Object* parent,string name): Object(parent,name,"IODevice") {
+    pimpl_=new IODevice_impl(this);
+    lastUpdate=GetTime();
 }
 
@@ -48 +48 @@
   }
 
-  if (data != NULL) {
-    if (getFrameworkManager()->IsLogging() == true)
-      pimpl_->WriteLog(data->DataTime());
+    if(data!=NULL) {
+        lastUpdate=data->DataTime();
+        if(getFrameworkManager()->IsLogging()==true) pimpl_->WriteLog(data->DataTime());
 
     data->pimpl_->Circle();

trunk/lib/FlairCore/src/IODevice.h

@@ -114 +114 @@
   virtual DataType const &GetOutputDataType() const;
 
-protected:
-  /*!
-  * \brief Process the childs of type IODevice, and log if needed
-  *
-  * This method must be called after computing datas;
-  * generally at the end of the reimplemented UpdateFrom or after acquiring
-  *datas in case of a sensor. \n
-  * It will call UpdateFrom methods of each child of type IODevice,
-  * and log all datas (this IODevice and its childs)
-  * if logging is enabled (see SetDataToLog(), AddDeviceToLog(),
-  * FrameworkManager::StartLog and FrameworkManager::AddDeviceToLog). \n
-  * If a thread is waiting on this IODevice (see Thread::WaitUpdate), it will be
-  *resumed.
-  *
-  * \param data data to process
-  */
-  void ProcessUpdate(io_data *data);
+            Time lastUpdate;
+        protected:
+            /*!
+            * \brief Process the childs of type IODevice, and log if needed
+            *
+            * This method must be called after computing datas;
+            * generally at the end of the reimplemented UpdateFrom or after acquiring datas in case of a sensor. \n
+            * It will call UpdateFrom methods of each child of type IODevice,
+            * and log all datas (this IODevice and its childs)
+            * if logging is enabled (see SetDataToLog(), AddDeviceToLog(),
+            * FrameworkManager::StartLog and FrameworkManager::AddDeviceToLog). \n
+            * If a thread is waiting on this IODevice (see Thread::WaitUpdate), it will be resumed.
+            *
+            * \param data data to process
+            */
+            void ProcessUpdate(io_data* data);
 
 private:

trunk/lib/FlairCore/src/Thread_impl.cpp

@@ -28 +28 @@
 #else
 #include <sys/resource.h>
+#include <unistd.h>
+#include <sys/syscall.h>
 #endif
 
@@ -153 +155 @@
 }
 #else
-void *Thread_impl::main_nrt(void *arg) {
-  Thread_impl *caller = (Thread_impl *)arg;
+void* Thread_impl::main_nrt(void * arg)
+{
+    Thread_impl *caller = (Thread_impl*)arg;
+/*string th_name=getFrameworkManager()->ObjectName()+ "-" + caller->self->ObjectName();
+caller->self->Info("pthread '%s' created with TID %x\n",th_name.c_str(),(pid_t)syscall(SYS_gettid));*/
 
   caller->self->Run();