diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-06-20 12:12:59 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-06-20 12:12:59 -0700 |
| commit | 560f4b148ec5873f709164869120e32ca33ae660 (patch) | |
| tree | 38ed19df2451876e25a85e783aa751c8c32a231c /lib/workqueue.c | |
| parent | 1a20eca3537abb0925dbd777224c6abf5f0e6833 (diff) | |
| parent | 11f4f0e55dbd48a4dd56e96202731d6679041594 (diff) | |
| download | quagga-560f4b148ec5873f709164869120e32ca33ae660.tar.bz2 quagga-560f4b148ec5873f709164869120e32ca33ae660.tar.xz | |
Merge branch 'master' of /home/shemminger/git/quagga into upstream
Diffstat (limited to 'lib/workqueue.c')
| -rw-r--r-- | lib/workqueue.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/lib/workqueue.c b/lib/workqueue.c index 8880b9e2..1d32d241 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -67,7 +67,6 @@ work_queue_new (struct thread_master *m, const char *queue_name) new->name = XSTRDUP (MTYPE_WORK_QUEUE_NAME, queue_name); new->master = m; SET_FLAG (new->flags, WQ_UNPLUGGED); - UNSET_FLAG (new->flags, WQ_AIM_HEAD); if ( (new->items = list_new ()) == NULL) { @@ -131,10 +130,7 @@ work_queue_add (struct work_queue *wq, void *data) } item->data = data; - if (CHECK_FLAG (wq->flags, WQ_AIM_HEAD)) - listnode_add_after (wq->items, NULL, item); - else - listnode_add (wq->items, item); + listnode_add (wq->items, item); work_queue_schedule (wq, wq->spec.hold); @@ -231,15 +227,6 @@ work_queue_unplug (struct work_queue *wq) work_queue_schedule (wq, wq->spec.hold); } -void -work_queue_aim_head (struct work_queue *wq, const unsigned aim_head) -{ - if (aim_head) - SET_FLAG (wq->flags, WQ_AIM_HEAD); - else - UNSET_FLAG (wq->flags, WQ_AIM_HEAD); -} - /* timer thread to process a work queue * will reschedule itself if required, * otherwise work_queue_item_add @@ -317,6 +304,7 @@ work_queue_run (struct thread *thread) } case WQ_REQUEUE: { + item->ran--; work_queue_item_requeue (wq, node); break; } |