Mercurial > hg > nginx
comparison src/os/unix/ngx_process_cycle.c @ 6929:3069dd358ba2
Cancelable timers are now preserved if there are other timers.
There is no need to cancel timers early if there are other timers blocking
shutdown anyway. Preserving such timers allows nginx to continue some
periodic work till the shutdown is actually possible.
With the new approach, timers with ev->cancelable are simply ignored when
checking if there are any timers left during shutdown.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Tue, 07 Mar 2017 18:51:15 +0300 |
| parents | ca709bca4b77 |
| children | 97c99bb43737 |
comparison
equal
deleted
inserted
replaced
| 6928:e0cc454aafe4 | 6929:3069dd358ba2 |
|---|---|
| 736 ngx_setproctitle("worker process"); | 736 ngx_setproctitle("worker process"); |
| 737 | 737 |
| 738 for ( ;; ) { | 738 for ( ;; ) { |
| 739 | 739 |
| 740 if (ngx_exiting) { | 740 if (ngx_exiting) { |
| 741 ngx_event_cancel_timers(); | 741 if (ngx_event_no_timers_left() == NGX_OK) { |
| 742 | |
| 743 if (ngx_event_timer_rbtree.root == ngx_event_timer_rbtree.sentinel) | |
| 744 { | |
| 745 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting"); | 742 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting"); |
| 746 | 743 |
| 747 ngx_worker_process_exit(cycle); | 744 ngx_worker_process_exit(cycle); |
| 748 } | 745 } |
| 749 } | 746 } |