Fixed osal_timer_diff bug (OpenEtherCATsociety#106)

keunjun92 · May 25, 2017 · e78bb66 · e78bb66
1 parent fb975cb
commit e78bb66
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/osal/linux/osal.c b/osal/linux/osal.c
@@ -49,11 +49,13 @@ ec_timet osal_current_time(void)
 
 void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff)
 {
-   diff->sec = end->sec - start->sec;
-   diff->usec = end->usec - start->usec;
-   if (diff->usec < 0) {
-     --diff->sec;
-     diff->usec += 1000000;
+   if (end->usec < start->usec) {
+      diff->sec = end->sec - start->sec - 1;
+      diff->usec = end->usec + 1000000 - start->usec;
+   }
+   else {
+      diff->sec = end->sec - start->sec;
+      diff->usec = end->usec - start->usec;
    }
 }
 

diff --git a/osal/vxworks/osal.c b/osal/vxworks/osal.c
@@ -92,12 +92,14 @@ ec_timet osal_current_time(void)
 
 void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff)
 {
-   diff->sec = end->sec - start->sec;                             
-   diff->usec = end->usec - start->usec;                             
-   if (diff->usec < 0) {                                              
-     --diff->sec;                                                     
-     diff->usec += 1000000;                                           
-   }                                                                         
+   if (end->usec < start->usec) {
+      diff->sec = end->sec - start->sec - 1;
+      diff->usec = end->usec + 1000000 - start->usec;
+   }
+   else {
+      diff->sec = end->sec - start->sec;
+      diff->usec = end->usec - start->usec;
+   }
 }
 
 void osal_timer_start(osal_timert * self, uint32 timeout_usec)

diff --git a/osal/win32/osal.c b/osal/win32/osal.c
@@ -42,11 +42,13 @@ ec_timet osal_current_time (void)
 
 void osal_time_diff(ec_timet *start, ec_timet *end, ec_timet *diff)
 {
-   diff->sec = end->sec - start->sec;
-   diff->usec = end->usec - start->usec;
-   if (diff->usec < 0) {
-     --diff->sec;
-     diff->usec += 1000000;
+   if (end->usec < start->usec) {
+      diff->sec = end->sec - start->sec - 1;
+      diff->usec = end->usec + 1000000 - start->usec;
+   }
+   else {
+      diff->sec = end->sec - start->sec;
+      diff->usec = end->usec - start->usec;
    }
 }