comparison src/os/win32/ngx_process_cycle.c @ 6379:cf5e822cf470

Dynamic modules: changed ngx_modules to cycle->modules.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 04 Feb 2016 18:30:21 +0300
parents 5e6142609e48
children 2b7dacb381ed
comparison
equal deleted inserted replaced
6378:0f203a2af17c 6379:cf5e822cf470
551 ngx_close_handle(ngx_reload_event); 551 ngx_close_handle(ngx_reload_event);
552 ngx_close_handle(ngx_master_process_event); 552 ngx_close_handle(ngx_master_process_event);
553 553
554 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit"); 554 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit");
555 555
556 for (i = 0; ngx_modules[i]; i++) { 556 for (i = 0; cycle->modules[i]; i++) {
557 if (ngx_modules[i]->exit_master) { 557 if (cycle->modules[i]->exit_master) {
558 ngx_modules[i]->exit_master(cycle); 558 cycle->modules[i]->exit_master(cycle);
559 } 559 }
560 } 560 }
561 561
562 ngx_destroy_pool(cycle->pool); 562 ngx_destroy_pool(cycle->pool);
563 563
764 ngx_int_t n; 764 ngx_int_t n;
765 ngx_cycle_t *cycle; 765 ngx_cycle_t *cycle;
766 766
767 cycle = (ngx_cycle_t *) ngx_cycle; 767 cycle = (ngx_cycle_t *) ngx_cycle;
768 768
769 for (n = 0; ngx_modules[n]; n++) { 769 for (n = 0; cycle->modules[n]; n++) {
770 if (ngx_modules[n]->init_process) { 770 if (cycle->modules[n]->init_process) {
771 if (ngx_modules[n]->init_process(cycle) == NGX_ERROR) { 771 if (cycle->modules[n]->init_process(cycle) == NGX_ERROR) {
772 /* fatal */ 772 /* fatal */
773 exit(2); 773 exit(2);
774 } 774 }
775 } 775 }
776 } 776 }
823 ngx_uint_t i; 823 ngx_uint_t i;
824 ngx_connection_t *c; 824 ngx_connection_t *c;
825 825
826 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit"); 826 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exit");
827 827
828 for (i = 0; ngx_modules[i]; i++) { 828 for (i = 0; cycle->modules[i]; i++) {
829 if (ngx_modules[i]->exit_process) { 829 if (cycle->modules[i]->exit_process) {
830 ngx_modules[i]->exit_process(cycle); 830 cycle->modules[i]->exit_process(cycle);
831 } 831 }
832 } 832 }
833 833
834 if (ngx_exiting) { 834 if (ngx_exiting) {
835 c = cycle->connections; 835 c = cycle->connections;