update

Author: flw5469

src/internal_modules/roc_core/target_posix_ext/roc_core/semaphore.cpp

@@ -9,8 +9,8 @@
 #include "roc_core/semaphore.h"
 #include "roc_core/cpu_instructions.h"
 #include "roc_core/errno_to_str.h"
-#include "roc_core/panic.h"
 #include "roc_core/log.h"
+#include "roc_core/panic.h"
 
 #include <errno.h>
 #include <time.h>
@@ -41,30 +41,31 @@ bool Semaphore::timed_wait(nanoseconds_t deadline) {
 
     nanoseconds_t converted_deadline = deadline;
 
-    // convert deadline's domain into CLOCK_REALTIME if sem_clockwait is not available
-    #ifndef ROC_HAVE_SEM_CLOCKWAIT
-    converted_deadline += (core::timestamp(core::ClockUnix)-core::timestamp(core::ClockMonotonic));
-    #endif
+// convert deadline's domain into CLOCK_REALTIME if sem_clockwait is not available
+#ifndef ROC_HAVE_SEM_CLOCKWAIT
+    converted_deadline +=
+        (core::timestamp(core::ClockUnix) - core::timestamp(core::ClockMonotonic));
+#endif
 
-    roc_log(roc::LogDebug,"origin time is %" PRId64"\n", deadline);
-    roc_log(roc::LogDebug,"time is %" PRId64"\n", converted_deadline);
-    roc_log(roc::LogDebug,"now time is %" PRId64"\n", core::timestamp(core::ClockMonotonic));
+    roc_log(roc::LogDebug, "origin time is %" PRId64 "\n", deadline);
+    roc_log(roc::LogDebug, "time is %" PRId64 "\n", converted_deadline);
+    roc_log(roc::LogDebug, "now time is %" PRId64 "\n",
+            core::timestamp(core::ClockMonotonic));
 
     timespec ts;
     ts.tv_sec = long(converted_deadline / Second);
     ts.tv_nsec = long(converted_deadline % Second);
-    
-    for (;;) {
 
-        #ifdef ROC_HAVE_SEM_CLOCKWAIT
-        if (sem_clockwait(&sem_, CLOCK_MONOTONIC , &ts) == 0) {
+    for (;;) {
+#ifdef ROC_HAVE_SEM_CLOCKWAIT
+        if (sem_clockwait(&sem_, CLOCK_MONOTONIC, &ts) == 0) {
             return true;
         }
-        #else
+#else
         if (sem_timedwait(&sem_, &ts) == 0) {
-          return true;
+            return true;
         }
-        #endif 
+#endif
 
         if (errno == ETIMEDOUT) {
             return false;

src/tests/roc_pipeline/test_state_tracker.cpp

@@ -14,12 +14,12 @@
 #include "roc_core/atomic.h"
 #include "roc_core/heap_arena.h"
 #include "roc_core/noop_arena.h"
+#include "roc_core/semaphore.h"
 #include "roc_core/thread.h"
 #include "roc_core/time.h"
 #include "roc_pipeline/config.h"
 #include "roc_pipeline/receiver_endpoint.h"
 #include "roc_pipeline/receiver_session_group.h"
-#include "roc_core/semaphore.h"
 
 namespace roc {
 namespace pipeline {
@@ -88,31 +88,30 @@ TEST(state_tracker, multiple_timeout) {
     StateTracker state_tracker;
     TestThread** threads_ptr = new TestThread*[10];
 
-    //set threads that last for 1 second
+    // set threads that last for 1 second
     for (int i = 0; i < 10; i++) {
-        threads_ptr[i] =
-            new TestThread(state_tracker, sndio::DeviceState_Active,
-                           core::timestamp(core::ClockMonotonic) + core::Millisecond * 1000);
+        threads_ptr[i] = new TestThread(state_tracker, sndio::DeviceState_Active,
+                                        core::timestamp(core::ClockMonotonic)
+                                            + core::Millisecond * 1000);
     }
 
-    //wait for start, then check if threads are running
+    // wait for start, then check if threads are running
     for (int i = 0; i < 10; i++) {
         CHECK(threads_ptr[i]->start());
         // CHECK(threads_ptr[i]->running());
         // roc_log(LogDebug, "check running %d\n", i);
-
     }
     core::sleep_for(core::ClockMonotonic, core::Millisecond * 10);
     for (int i = 0; i < 10; i++) {
-      //roc_log(LogDebug, "check running %d\n", i);
-      CHECK(threads_ptr[i]->running());
+        // roc_log(LogDebug, "check running %d\n", i);
+        CHECK(threads_ptr[i]->running());
     }
 
-    //sleep for 2 seconds, making the threads timeout
+    // sleep for 2 seconds, making the threads timeout
     roc_log(LogDebug, "started running");
     core::sleep_for(core::ClockMonotonic, core::Millisecond * 2000);
 
-    //check if threads are stopped
+    // check if threads are stopped
     for (int i = 0; i < 10; i++) {
         CHECK(!threads_ptr[i]->running());
     }
@@ -130,7 +129,7 @@ TEST(state_tracker, multiple_switch) {
     StateTracker state_tracker;
     TestThread** threads_ptr = new TestThread*[10];
 
-    //set threads without waiting time
+    // set threads without waiting time
     for (int i = 0; i < 10; i++) {
         threads_ptr[i] = new TestThread(state_tracker, sndio::DeviceState_Active, -1);
     }
@@ -141,20 +140,20 @@ TEST(state_tracker, multiple_switch) {
 
     roc_log(LogDebug, "started running");
 
-    //wait for threads starting
+    // wait for threads starting
     core::sleep_for(core::ClockMonotonic, core::Millisecond * 500);
 
-    //check if the threads have started
+    // check if the threads have started
     for (int i = 0; i < 10; i++) {
         CHECK(threads_ptr[i]->running());
     }
 
-    //register a packet
+    // register a packet
     core::sleep_for(core::ClockMonotonic, core::Millisecond * 500);
     state_tracker.register_packet();
     core::sleep_for(core::ClockMonotonic, core::Millisecond * 500);
 
-    //check if the threads have been stopped
+    // check if the threads have been stopped
     for (int i = 0; i < 10; i++) {
         CHECK(!(threads_ptr[i]->running()));
     }