aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux/time.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/os-Linux/time.c')
-rw-r--r--arch/um/os-Linux/time.c54
1 files changed, 11 insertions, 43 deletions
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 9ffc61ac8ed6..d2cb161ae2b3 100644
--- a/arch/um/os-Linux/time.c
+++ b/arch/um/os-Linux/time.c
@@ -12,8 +12,6 @@
12#include "os.h" 12#include "os.h"
13#include "user.h" 13#include "user.h"
14 14
15static int is_real_timer = 0;
16
17int set_interval(void) 15int set_interval(void)
18{ 16{
19 int usec = 1000000/UM_HZ; 17 int usec = 1000000/UM_HZ;
@@ -41,47 +39,15 @@ int timer_one_shot(int ticks)
41 return 0; 39 return 0;
42} 40}
43 41
44void disable_timer(void) 42unsigned long long disable_timer(void)
45{ 43{
46 struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }}); 44 struct itimerval time = ((struct itimerval) { { 0, 0 }, { 0, 0 } });
47 45
48 if ((setitimer(ITIMER_VIRTUAL, &disable, NULL) < 0) || 46 if(setitimer(ITIMER_VIRTUAL, &time, &time) < 0)
49 (setitimer(ITIMER_REAL, &disable, NULL) < 0))
50 printk(UM_KERN_ERR "disable_timer - setitimer failed, " 47 printk(UM_KERN_ERR "disable_timer - setitimer failed, "
51 "errno = %d\n", errno); 48 "errno = %d\n", errno);
52}
53
54int switch_timers(int to_real)
55{
56 struct itimerval disable = ((struct itimerval) { { 0, 0 }, { 0, 0 }});
57 struct itimerval enable;
58 int old, new, old_type = is_real_timer;
59
60 if(to_real == old_type)
61 return to_real;
62
63 if (to_real) {
64 old = ITIMER_VIRTUAL;
65 new = ITIMER_REAL;
66 }
67 else {
68 old = ITIMER_REAL;
69 new = ITIMER_VIRTUAL;
70 }
71
72 if (setitimer(old, &disable, &enable) < 0)
73 printk(UM_KERN_ERR "switch_timers - setitimer disable failed, "
74 "errno = %d\n", errno);
75 49
76 if((enable.it_value.tv_sec == 0) && (enable.it_value.tv_usec == 0)) 50 return tv_to_nsec(&time.it_value);
77 enable.it_value = enable.it_interval;
78
79 if (setitimer(new, &enable, NULL))
80 printk(UM_KERN_ERR "switch_timers - setitimer enable failed, "
81 "errno = %d\n", errno);
82
83 is_real_timer = to_real;
84 return old_type;
85} 51}
86 52
87unsigned long long os_nsecs(void) 53unsigned long long os_nsecs(void)
@@ -92,11 +58,13 @@ unsigned long long os_nsecs(void)
92 return timeval_to_ns(&tv); 58 return timeval_to_ns(&tv);
93} 59}
94 60
95void idle_sleep(int secs) 61extern void alarm_handler(int sig, struct sigcontext *sc);
62
63void idle_sleep(unsigned long long nsecs)
96{ 64{
97 struct timespec ts; 65 struct timespec ts = { .tv_sec = nsecs / BILLION,
66 .tv_nsec = nsecs % BILLION };
98 67
99 ts.tv_sec = secs; 68 if (nanosleep(&ts, &ts) == 0)
100 ts.tv_nsec = 0; 69 alarm_handler(SIGVTALRM, NULL);
101 nanosleep(&ts, NULL);
102} 70}