mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

respondd: remove last references to "queue"

This commit is contained in:
lemoer 2016-08-13 04:28:31 +02:00
parent 41d58f1db4
commit 0ead34abee
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
net/respondd/src/respondd.c
View File

@ -187,10 +187,10 @@ static const struct respondd_provider_info * get_providers(const char *filename)
return ret; return ret;
} }
bool schedule_push_request(struct request_schedule *q, char* req, bool schedule_push_request(struct request_schedule *s, char* req,
struct sockaddr *addr, socklen_t addrlen, struct sockaddr *addr, socklen_t addrlen,
int64_t scheduled_time) { int64_t scheduled_time) {
if (q->length >= SCHEDULE_LEN) if (s->length >= SCHEDULE_LEN)
// schedule is full // schedule is full
return false; return false;
@ -201,12 +201,12 @@ bool schedule_push_request(struct request_schedule *q, char* req,
memcpy(&new_task->client_addr, addr, addrlen); memcpy(&new_task->client_addr, addr, addrlen);
new_task->client_addrlen = addrlen; new_task->client_addrlen = addrlen;
if (!q->list_head || q->list_head->scheduled_time > new_task->scheduled_time) { if (!s->list_head || s->list_head->scheduled_time > new_task->scheduled_time) {
new_task->next = q->list_head; new_task->next = s->list_head;
q->list_head = new_task; s->list_head = new_task;
} else { } else {
struct request_task *t; struct request_task *t;
for (t = q->list_head; t && t->next; t = t->next) { for (t = s->list_head; t && t->next; t = t->next) {
if (t->next->scheduled_time > new_task->scheduled_time) { if (t->next->scheduled_time > new_task->scheduled_time) {
break; break;
} }
@ -215,17 +215,17 @@ bool schedule_push_request(struct request_schedule *q, char* req,
t->next = new_task; t->next = new_task;
} }
q->length++; s->length++;
return true; return true;
} }
int64_t schedule_idle_time(struct request_schedule *schedule) { int64_t schedule_idle_time(struct request_schedule *s) {
if (!schedule->list_head) if (!s->list_head)
// nothing to do yet, wait nearly infinite time // nothing to do yet, wait nearly infinite time
return 3600000; return 3600000;
update_time(); update_time();
int64_t result = schedule->list_head->scheduled_time - now; int64_t result = s->list_head->scheduled_time - now;
if (result < 0) if (result < 0)
return 0; return 0;
@ -234,19 +234,19 @@ int64_t schedule_idle_time(struct request_schedule *schedule) {
} }
// the returned task is already set as processed // the returned task is already set as processed
struct request_task * schedule_pop_request(struct request_schedule *q) { struct request_task * schedule_pop_request(struct request_schedule *s) {
if (!q->list_head) if (!s->list_head)
// schedule is empty // schedule is empty
return NULL; return NULL;
if (schedule_idle_time(q) > 0) { if (schedule_idle_time(s) > 0) {
// nothing to do yet // nothing to do yet
return NULL; return NULL;
} }
struct request_task *result = q->list_head; struct request_task *result = s->list_head;
q->list_head = q->list_head->next; s->list_head = s->list_head->next;
q->length--; s->length--;
return result; return result;
} }