respondd: serve_request does not depend on request schedule any longer
This commit is contained in:
parent
aba6c46bd7
commit
af773b88f6
|
@ -504,12 +504,7 @@ void send_response(int sock, struct json_object *result, bool compress,
|
||||||
json_object_put(result);
|
json_object_put(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
void serve_request(struct request_schedule *schedule, int sock) {
|
void serve_request(struct request_task *task, int sock) {
|
||||||
struct request_task* task = schedule_pop_request(schedule);
|
|
||||||
|
|
||||||
if (!task)
|
|
||||||
return;
|
|
||||||
|
|
||||||
bool compress;
|
bool compress;
|
||||||
struct json_object *result = handle_request(task->request, &compress);
|
struct json_object *result = handle_request(task->request, &compress);
|
||||||
|
|
||||||
|
@ -522,8 +517,6 @@ void serve_request(struct request_schedule *schedule, int sock) {
|
||||||
compress,
|
compress,
|
||||||
&task->client_addr
|
&task->client_addr
|
||||||
);
|
);
|
||||||
|
|
||||||
free(task);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
|
@ -621,7 +614,14 @@ int main(int argc, char **argv) {
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
accept_request(&schedule, sock, max_multicast_delay);
|
accept_request(&schedule, sock, max_multicast_delay);
|
||||||
serve_request(&schedule, sock);
|
|
||||||
|
struct request_task* task = schedule_pop_request(&schedule);
|
||||||
|
|
||||||
|
if (!task)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
serve_request(task, sock);
|
||||||
|
free(task);
|
||||||
}
|
}
|
||||||
|
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
Loading…
Reference in New Issue