Mercurial > hg > nginx-mail
diff src/misc/ngx_google_perftools_module.c @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | be4f34123024 |
children |
line wrap: on
line diff
--- a/src/misc/ngx_google_perftools_module.c +++ b/src/misc/ngx_google_perftools_module.c @@ -8,7 +8,7 @@ #include <ngx_core.h> /* - * declare Profiler here interface because + * declare Profiler interface here because * <google/profiler.h> is C++ header file */ @@ -73,7 +73,7 @@ ngx_google_perftools_create_conf(ngx_cyc } /* - * set by pcalloc() + * set by ngx_pcalloc() * * gptcf->profiles = { 0, NULL }; */ @@ -101,7 +101,6 @@ ngx_google_perftools_worker(ngx_cycle_t } if (getenv("CPUPROFILE")) { - /* disable inherited Profiler enabled in master process */ ProfilerStop(); } @@ -109,7 +108,6 @@ ngx_google_perftools_worker(ngx_cycle_t ngx_sprintf(profile, "%V.%d%Z", &gptcf->profiles, ngx_pid); if (ProfilerStart(profile)) { - /* start ITIMER_PROF timer */ ProfilerRegisterThread();