Merge pull request #191 from flaviojs/ensure-timeout-reached-cpu_idle…

…_loop Ensure the timeout time is reached in cpu_idle_loop.
GNS3 · Mar 26, 2024 · dab9a13 · dab9a13
2 parents aa47776 + db1fc77
commit dab9a13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/stable/cpu.c b/stable/cpu.c
@@ -384,7 +384,8 @@ void cpu_idle_loop(cpu_gen_t *cpu)
    pthread_mutex_lock(&cpu->idle_mutex);
    t_spc.tv_sec = expire / 1000000;
    t_spc.tv_nsec = (expire % 1000000) * 1000;
-   pthread_cond_timedwait(&cpu->idle_cond,&cpu->idle_mutex,&t_spc);
+   while(pthread_cond_timedwait(&cpu->idle_cond,&cpu->idle_mutex,&t_spc) != ETIMEDOUT) {
+   }
    pthread_mutex_unlock(&cpu->idle_mutex);
 }
 

diff --git a/unstable/cpu.c b/unstable/cpu.c
@@ -334,7 +334,8 @@ void cpu_idle_loop(cpu_gen_t *cpu)
    pthread_mutex_lock(&cpu->idle_mutex);
    t_spc.tv_sec = expire / 1000000;
    t_spc.tv_nsec = (expire % 1000000) * 1000;
-   pthread_cond_timedwait(&cpu->idle_cond,&cpu->idle_mutex,&t_spc);
+   while(pthread_cond_timedwait(&cpu->idle_cond,&cpu->idle_mutex,&t_spc) != ETIMEDOUT) {
+   }
    pthread_mutex_unlock(&cpu->idle_mutex);
 }