Mercurial > hg > nginx

comparison src/os/win32/ngx_process_cycle.c @ 6482:2b7dacb381ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed ngx_pid_t formatting in ngx_sprintf() and logging.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 31 Mar 2016 02:34:04 +0300
parents cf5e822cf470
children 3a50ccd94333
comparison
equal deleted inserted replaced
6481:40bea39731d7 6482:2b7dacb381ed
579 579
580 log = cycle->log; 580 log = cycle->log;
581 581
582 ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0, "worker started"); 582 ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0, "worker started");
583 583
584 ngx_sprintf((u_char *) wtevn, "ngx_worker_term_%ul%Z", ngx_pid); 584 ngx_sprintf((u_char *) wtevn, "ngx_worker_term_%P%Z", ngx_pid);
585 events[0] = CreateEvent(NULL, 1, 0, wtevn); 585 events[0] = CreateEvent(NULL, 1, 0, wtevn);
586 if (events[0] == NULL) { 586 if (events[0] == NULL) {
587 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, 587 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
588 "CreateEvent(\"%s\") failed", wtevn); 588 "CreateEvent(\"%s\") failed", wtevn);
589 goto failed; 589 goto failed;
590 } 590 }
591 591
592 ngx_sprintf((u_char *) wqevn, "ngx_worker_quit_%ul%Z", ngx_pid); 592 ngx_sprintf((u_char *) wqevn, "ngx_worker_quit_%P%Z", ngx_pid);
593 events[1] = CreateEvent(NULL, 1, 0, wqevn); 593 events[1] = CreateEvent(NULL, 1, 0, wqevn);
594 if (events[1] == NULL) { 594 if (events[1] == NULL) {
595 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, 595 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
596 "CreateEvent(\"%s\") failed", wqevn); 596 "CreateEvent(\"%s\") failed", wqevn);
597 goto failed; 597 goto failed;
598 } 598 }
599 599
600 ngx_sprintf((u_char *) wroevn, "ngx_worker_reopen_%ul%Z", ngx_pid); 600 ngx_sprintf((u_char *) wroevn, "ngx_worker_reopen_%P%Z", ngx_pid);
601 events[2] = CreateEvent(NULL, 1, 0, wroevn); 601 events[2] = CreateEvent(NULL, 1, 0, wroevn);
602 if (events[2] == NULL) { 602 if (events[2] == NULL) {
603 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, 603 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
604 "CreateEvent(\"%s\") failed", wroevn); 604 "CreateEvent(\"%s\") failed", wroevn);
605 goto failed; 605 goto failed;
1005 { 1005 {
1006 HANDLE ev; 1006 HANDLE ev;
1007 ngx_int_t rc; 1007 ngx_int_t rc;
1008 char evn[NGX_PROCESS_SYNC_NAME]; 1008 char evn[NGX_PROCESS_SYNC_NAME];
1009 1009
1010 ngx_sprintf((u_char *) evn, "Global\\ngx_%s_%ul%Z", sig, pid); 1010 ngx_sprintf((u_char *) evn, "Global\\ngx_%s_%P%Z", sig, (ngx_pid_t) pid);
1011 1011
1012 ev = OpenEvent(EVENT_MODIFY_STATE, 0, evn); 1012 ev = OpenEvent(EVENT_MODIFY_STATE, 0, evn);
1013 if (ev == NULL) { 1013 if (ev == NULL) {
1014 ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, 1014 ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
1015 "OpenEvent(\"%s\") failed", evn); 1015 "OpenEvent(\"%s\") failed", evn);