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

Timestamp:

11/02/17 15:04:47 (6 years ago)

Author:

Sanahuja Guillaume

Message:

modifs usleep

Location:

trunk/lib/FlairCore/src

Files:

• Thread.cpp (modified) (4 diffs)
• Thread_impl.cpp (modified) (3 diffs)

trunk/lib/FlairCore/src/Thread.cpp

@@ -91 +91 @@
   if (status != 0) {
                 char errorMsg[256];
-    Err("%s, error rt_task_sleep_until (%s), resume time: %lld, actual time: "
-        "%lld\n", ObjectName().c_str(), strerror_r(-status, errorMsg, sizeof(errorMsg)), time, GetTime());
+    Err("%error rt_task_sleep_until (%s), resume time: %lld, actual time: "
+        "%lld\n",strerror_r(-status, errorMsg, sizeof(errorMsg)), time, GetTime());
         }
 // Printf("rt_task_sleep_until, resume time: %lld, actual time:
@@ -99 +99 @@
   Time current = GetTime();
   if (current < time) {
-    usleep((time - current) / 1000);
+    //usleep((time - current) / 1000);
+    struct timespec req;
+    req.tv_nsec = time - current;
+    req.tv_sec = req.tv_nsec / 1000000000;
+    req.tv_nsec %= 1000000000;
+    struct timespec rem;
+    if(nanosleep(&req,&rem)!=0) Err("error in nanosleep\n");//todo, handle EINTR
+  } else {
+    Err("error resume time is passed by %lldns\n", ( current-time));
   }
 #endif
@@ -112 +120 @@
         }
 #else
-  usleep(time * 1000);
+  //usleep(time * 1000);
+  struct timespec req;
+  req.tv_nsec = time * 1000000;
+  req.tv_sec = req.tv_nsec / 1000000000;
+  req.tv_nsec %= 1000000000;
+  struct timespec rem;
+  if(nanosleep(&req,&rem)!=0) Err("error in nanosleep\n");//todo, handle EINTR
 #endif
 }
@@ -124 +138 @@
         }
 #else
-  usleep(time);
+  //usleep(time);
+  struct timespec req;
+  req.tv_nsec = time * 1000;
+  req.tv_sec = req.tv_nsec / 1000000000;
+  req.tv_nsec %= 1000000000;
+  struct timespec rem;
+  if(nanosleep(&req,&rem)!=0) Err("error in nanosleep\n");//todo, handle EINTR
 #endif
 }

trunk/lib/FlairCore/src/Thread_impl.cpp

@@ -232 +232 @@
 #else
   self->SleepUntil(next_time);
-  next_time += period;
+  Time current = GetTime();
+  if(current>next_time+period) self->Err("overrun of %lld\n", current-next_time);
+  while (next_time < current) {
+    next_time += period;
+  }
 #endif
   ComputeLatency(GetTime());
@@ -326 +330 @@
   if(last!=0)
 #endif
-    { Printf("Thread::%s :\n", self->ObjectName().c_str()); }
+    { Printf("Thread::%s :\n", self->ObjectName().c_str()); 
+    if(period_set) {Printf("    period (ns): %lld\n", period);}}
 #ifdef __XENO__
     Printf("    number of context switches: %i\n", info.ctxswitches);
@@ -349 +354 @@
       Printf("    max latency (ns): %lld\n", max_latency);
       Printf("    latency moy (ns): %lld\n", mean_latency / cpt);
-      Printf("    itertions: %lld\n", cpt);
+      Printf("    iterations: %lld\n", cpt);
     }
   }