iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] posix-timers: use schedule_timeout() in common_nsleep()

Browse Source 
common_nsleep() reimplements schedule_timeout_interruptible() for unknown
reason.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Oleg Nesterov 2005-10-30 15:02:21 -08:00 committed by Linus Torvalds
parent 33430dc593
commit 4eb9af2a8a
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/posix-timers.c
View File

@ -1295,13 +1295,6 @@ sys_clock_getres(clockid_t which_clock, struct timespec __user *tp)
return error; return error;
} }
static void nanosleep_wake_up(unsigned long __data)
{
struct task_struct *p = (struct task_struct *) __data;
wake_up_process(p);
}
/* /*
* The standard says that an absolute nanosleep call MUST wake up at * The standard says that an absolute nanosleep call MUST wake up at
* the requested time in spite of clock settings. Here is what we do: * the requested time in spite of clock settings. Here is what we do:
@ -1442,7 +1435,6 @@ static int common_nsleep(clockid_t which_clock,
int flags, struct timespec *tsave) int flags, struct timespec *tsave)
{ {
struct timespec t, dum; struct timespec t, dum;
struct timer_list new_timer;
DECLARE_WAITQUEUE(abs_wqueue, current); DECLARE_WAITQUEUE(abs_wqueue, current);
u64 rq_time = (u64)0; u64 rq_time = (u64)0;
s64 left; s64 left;
@ -1451,10 +1443,6 @@ static int common_nsleep(clockid_t which_clock,
&current_thread_info()->restart_block; &current_thread_info()->restart_block;
abs_wqueue.flags = 0; abs_wqueue.flags = 0;
init_timer(&new_timer);
new_timer.expires = 0;
new_timer.data = (unsigned long) current;
new_timer.function = nanosleep_wake_up;
abs = flags & TIMER_ABSTIME; abs = flags & TIMER_ABSTIME;
if (restart_block->fn == clock_nanosleep_restart) { if (restart_block->fn == clock_nanosleep_restart) {
@ -1490,13 +1478,8 @@ static int common_nsleep(clockid_t which_clock,
if (left < (s64)0) if (left < (s64)0)
break; break;
new_timer.expires = jiffies + left; schedule_timeout_interruptible(left);
__set_current_state(TASK_INTERRUPTIBLE);
add_timer(&new_timer);
schedule();
del_timer_sync(&new_timer);
left = rq_time - get_jiffies_64(); left = rq_time - get_jiffies_64();
} while (left > (s64)0 && !test_thread_flag(TIF_SIGPENDING)); } while (left > (s64)0 && !test_thread_flag(TIF_SIGPENDING));