denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scheduler: Use timercmp(3) instead of a custom function

Browse Source
This commit is contained in:
Tobias Brunner
2020-06-02 14:07:06 +02:00
parent 2edc73d84e
commit aaa908dc0a
1 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/processing/scheduler.c
+10 -32
View File
@@ -93,30 +93,6 @@ struct private_scheduler_t {
condvar_t *condvar; condvar_t *condvar;
}; };
/**
* Compares two timevals, return >0 if a > b, <0 if a < b and =0 if equal
*/
static int timeval_cmp(timeval_t *a, timeval_t *b)
{
if (a->tv_sec > b->tv_sec)
{
return 1;
}
if (a->tv_sec < b->tv_sec)
{
return -1;
}
if (a->tv_usec > b->tv_usec)
{
return 1;
}
if (a->tv_usec < b->tv_usec)
{
return -1;
}
return 0;
}
/** /**
* Returns the top event without removing it. Returns NULL if the heap is empty. * Returns the top event without removing it. Returns NULL if the heap is empty.
*/ */
@@ -132,6 +108,7 @@ static event_t *peek_event(private_scheduler_t *this)
static event_t *remove_event(private_scheduler_t *this) static event_t *remove_event(private_scheduler_t *this)
{ {
event_t *event, *top; event_t *event, *top;
if (!this->event_count) if (!this->event_count)
{ {
return NULL; return NULL;
@@ -144,21 +121,22 @@ static event_t *remove_event(private_scheduler_t *this)
if (--this->event_count > 1) if (--this->event_count > 1)
{ {
/* seep down the top event */
u_int position = 1; u_int position = 1;
/* seep down the top event */
while ((position << 1) <= this->event_count) while ((position << 1) <= this->event_count)
{ {
u_int child = position << 1; u_int child = position << 1;
if ((child + 1) <= this->event_count && if ((child + 1) <= this->event_count &&
timeval_cmp(&this->heap[child + 1]->time, timercmp(&this->heap[child + 1]->time,
&this->heap[child]->time) < 0) &this->heap[child]->time, <))
{ {
/* the "right" child is smaller */ /* the "right" child is smaller */
child++; child++;
} }
if (timeval_cmp(&top->time, &this->heap[child]->time) <= 0) if (!timercmp(&top->time, &this->heap[child]->time, >))
{ {
/* the top event fires before the smaller of the two children, /* the top event fires before the smaller of the two children,
* stop */ * stop */
@@ -189,7 +167,7 @@ static job_requeue_t schedule(private_scheduler_t * this)
if ((event = peek_event(this)) != NULL) if ((event = peek_event(this)) != NULL)
{ {
if (timeval_cmp(&now, &event->time) >= 0) if (!timercmp(&now, &event->time, <))
{ {
remove_event(this); remove_event(this);
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
@@ -231,6 +209,7 @@ METHOD(scheduler_t, get_job_load, u_int,
private_scheduler_t *this) private_scheduler_t *this)
{ {
int count; int count;
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
count = this->event_count; count = this->event_count;
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
@@ -262,8 +241,8 @@ METHOD(scheduler_t, schedule_job_tv, void,
position = this->event_count; position = this->event_count;
/* then bubble it up */ /* then bubble it up */
while (position > 1 && timeval_cmp(&this->heap[position >> 1]->time, while (position > 1 &&
&event->time) > 0) timercmp(&this->heap[position >> 1]->time, &event->time, >))
{ {
/* parent has to be fired after the new event, move up */ /* parent has to be fired after the new event, move up */
this->heap[position] = this->heap[position >> 1]; this->heap[position] = this->heap[position >> 1];
@@ -354,4 +333,3 @@ scheduler_t * scheduler_create()
return &this->public; return &this->public;
} }