Unverified Commit 995d4f6d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3048 posix-cpu-timers: Implement timer_wait_running callback 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/ZX3MR4FMKAHS6BPR2F5NLXBAIKSZYP2P/ 
 
https://gitee.com/openeuler/kernel/issues/I7EQ8B 
 
Link:https://gitee.com/openeuler/kernel/pulls/3048

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 8b0df9ea d658bb36

kernel/time/posix-cpu-timers.c

+16 −0
Original line number Diff line number Diff line
@@ -1446,6 +1446,9 @@ static int do_cpu_nanosleep(const clockid_t which_clock, int flags, 
			spin_lock_irq(&timer.it_lock);

			error = posix_cpu_timer_del(&timer);

			spin_unlock_irq(&timer.it_lock);

#ifdef CONFIG_POSIX_CPU_TIMERS_TASK_WORK

			cond_resched();

#endif

		}



		if ((it.it_value.tv_sec | it.it_value.tv_nsec) == 0) {
@@ -1546,6 +1549,18 @@ static int thread_cpu_timer_create(struct k_itimer *timer) 
	return posix_cpu_timer_create(timer);

}



static void posix_cpu_timer_wait_running(struct k_itimer *timr)

{

#ifdef CONFIG_POSIX_CPU_TIMERS_TASK_WORK

	rcu_read_unlock();

	cond_resched();

	rcu_read_lock();

#else

	cpu_relax();

#endif

}





const struct k_clock clock_posix_cpu = {

	.clock_getres		= posix_cpu_clock_getres,

	.clock_set		= posix_cpu_clock_set,
@@ -1556,6 +1571,7 @@ const struct k_clock clock_posix_cpu = { 
	.timer_del		= posix_cpu_timer_del,

	.timer_get		= posix_cpu_timer_get,

	.timer_rearm		= posix_cpu_timer_rearm,

	.timer_wait_running	= posix_cpu_timer_wait_running,

};



const struct k_clock clock_process = {