unify queue_delayed_work() and queue_delayed_work_on()
PATCH 2/3 unify queue_delayed_work() and queue_delayed_work_on()
Change queue_delayed_work() to use queue_delayed_work_on() to avoid the code duplication (saves 133 bytes).
Q: queue_delayed_work() enqueues &dwork->work directly when delay == 0, why?
Signed-off-by Oleg Nesterov <[email protected]>
kernel/workqueue.c renamed from kernel/workqueue.c~2_factor +8 -21
@@ -180,28 +180,11 @@ void delayed_work_timer_fn(unsigned long int fastcall queue_delayed_work(struct workqueue_struct *wq,struct delayed_work *dwork,unsigned long delay) { -int ret =0 ; -struct timer_list *timer = &dwork->timer; -struct work_struct *work = &dwork->work; - -timer_stats_timer_set_start_info (timer); +timer_stats_timer_set_start_info (&dwork->timer);if (delay ==0 ) -return queue_work (wq, work); - -if (!test_and_set_bit (WORK_STRUCT_PENDING ,work_data_bits (work))) { -BUG_ON (timer_pending (timer)); -BUG_ON (!list_empty (&work->entry)); +return queue_work (wq, &dwork->work); -/* This stores cwq for the moment, for the timer_fn */ -set_wq_data (work, -per_cpu_ptr (wq->cpu_wq,raw_smp_processor_id ())); - timer->expires = jiffies + delay; - timer->data = (unsigned long )dwork; - timer->function = delayed_work_timer_fn; -add_timer (timer); - ret =1 ; - } -return ret; +return queue_delayed_work_on (-1 , wq, dwork, delay); }EXPORT_SYMBOL_GPL (queue_delayed_work);
@@ -231,7 +214,11 @@ int queue_delayed_work_on(int cpu, struc timer->expires = jiffies + delay; timer->data = (unsigned long )dwork; timer->function = delayed_work_timer_fn; -add_timer_on (timer, cpu); + +if (unlikely (cpu >=0 )) +add_timer_on (timer, cpu); +else +add_timer (timer); ret =1 ; }return ret;