proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 01:57:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #901 from qlyoung/style-fix

Browse Source 
lib: minor style fix
This commit is contained in:
ßingen 2017-08-03 17:27:30 +02:00 committed by GitHub
commit 820ea5d431
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/thread.c
View File

@ -1315,16 +1315,16 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch)
/* Process any pending cancellation requests */ /* Process any pending cancellation requests */
do_thread_cancel(m); do_thread_cancel(m);
/* Post events to ready queue. This must come before the /*
* following block * Post events to ready queue. This must come before the
* since events should occur immediately */ * following block since events should occur immediately
*/
thread_process(&m->event); thread_process(&m->event);
/* If there are no tasks on the ready queue, we will poll() /*
* until a timer * If there are no tasks on the ready queue, we will poll()
* expires or we receive I/O, whichever comes first. The * until a timer expires or we receive I/O, whichever comes
* strategy for doing * first. The strategy for doing this is:
* this is:
* *
* - If there are events pending, set the poll() timeout to zero * - If there are events pending, set the poll() timeout to zero
* - If there are no events pending, but there are timers * - If there are no events pending, but there are timers
@ -1336,9 +1336,8 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch)
* - If nothing is pending, it's time for the application to die * - If nothing is pending, it's time for the application to die
* *
* In every case except the last, we need to hit poll() at least * In every case except the last, we need to hit poll() at least
* once per * once per loop to avoid starvation by events
* loop to avoid starvation by events */ */
if (m->ready.count == 0) if (m->ready.count == 0)
tw = thread_timer_wait(m->timer, &tv); tw = thread_timer_wait(m->timer, &tv);
@ -1351,9 +1350,10 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch)
break; break;
} }
/* Copy pollfd array + # active pollfds in it. Not necessary to /*
* copy * Copy pollfd array + # active pollfds in it. Not necessary to
* the array size as this is fixed. */ * copy the array size as this is fixed.
*/
m->handler.copycount = m->handler.pfdcount; m->handler.copycount = m->handler.pfdcount;
memcpy(m->handler.copy, m->handler.pfds, memcpy(m->handler.copy, m->handler.pfds,
m->handler.copycount * sizeof(struct pollfd)); m->handler.copycount * sizeof(struct pollfd));
@ -1388,12 +1388,15 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch)
break; break;
} }
/* Since we could have received more cancellation /*
* requests during poll(), process those */ * Since we could have received more cancellation
* requests during poll(), process those
*/
do_thread_cancel(m); do_thread_cancel(m);
} else } else {
m->tick_since_io++; m->tick_since_io++;
}
/* Post timers to ready queue. */ /* Post timers to ready queue. */
monotime(&now); monotime(&now);
@ -1403,8 +1406,7 @@ struct thread *thread_fetch(struct thread_master *m, struct thread *fetch)
if (num > 0) if (num > 0)
thread_process_io(m, num); thread_process_io(m, num);
/* If we have a ready task, break the loop and return it to the /* have a ready task ==> return it to caller */
* caller */
if ((thread = thread_trim_head(&m->ready))) { if ((thread = thread_trim_head(&m->ready))) {
fetch = thread_run(m, thread, fetch); fetch = thread_run(m, thread, fetch);
if (fetch->ref) if (fetch->ref)