nxt_event_timer has been renamed to nxt_timer.

This commit is contained in:
Igor Sysoev
2017-01-30 16:47:50 +03:00
parent 952291c93c
commit bb87fa11ca
26 changed files with 521 additions and 532 deletions

View File

@@ -84,8 +84,8 @@ nxt_event_conn_job_sendfile_start(nxt_task_t *task, void *obj, void *data)
c->blocked = 1;
if (c->write_timer.state != NXT_EVENT_TIMER_DISABLED) {
c->write_timer.state = NXT_EVENT_TIMER_BLOCKED;
if (c->write_timer.state != NXT_TIMER_DISABLED) {
c->write_timer.state = NXT_TIMER_BLOCKED;
}
nxt_job_start(task, &jbs->job, nxt_event_conn_job_sendfile_handler);
@@ -210,10 +210,10 @@ nxt_event_conn_job_sendfile_return(nxt_task_t *task, void *obj, void *data)
}
if (sent != 0 && c->write_state->autoreset_timer) {
nxt_event_timer_disable(&c->write_timer);
nxt_timer_disable(&c->write_timer);
} else if (c->write_timer.state == NXT_EVENT_TIMER_BLOCKED) {
c->write_timer.state = NXT_EVENT_TIMER_ACTIVE;
} else if (c->write_timer.state == NXT_TIMER_BLOCKED) {
c->write_timer.state = NXT_TIMER_ACTIVE;
}
if (c->socket.error == 0