# HG changeset patch # User Igor Sysoev # Date 1205836587 0 # Node ID e5ce4e2de846e7187adc66e0d7b950b9891bf0fb # Parent 52b6be1e2cab20f2931c5b10b4a66ec5451933b8 ngx_google_perftools_module diff --git a/auto/lib/conf b/auto/lib/conf --- a/auto/lib/conf +++ b/auto/lib/conf @@ -42,3 +42,7 @@ fi if [ $USE_PERL = YES ]; then . auto/lib/perl/conf fi + +if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then + . auto/lib/google-perftools/conf +fi diff --git a/auto/lib/google-perftools/conf b/auto/lib/google-perftools/conf new file mode 100644 --- /dev/null +++ b/auto/lib/google-perftools/conf @@ -0,0 +1,33 @@ + +# Copyright (C) Igor Sysoev + + + ngx_feature="Google perftools" + ngx_feature_name= + ngx_feature_run=no + ngx_feature_incs= + ngx_feature_path= + ngx_feature_libs="-lprofiler" + ngx_feature_test="ProfilerStop()" + . auto/feature + + +if [ $ngx_found = no ]; then + + # FreeBSD port + + ngx_feature="Google perftools in /usr/local/" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lprofiler" + else + ngx_feature_libs="-L/usr/local/lib -lprofiler" + fi + + . auto/feature +fi + + +if [ $ngx_found = yes ]; then + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" +fi diff --git a/auto/make b/auto/make --- a/auto/make +++ b/auto/make @@ -6,7 +6,8 @@ mkdir -p $NGX_OBJS/src/core $NGX_OBJS/sr $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \ $NGX_OBJS/src/http $NGX_OBJS/src/http/modules \ $NGX_OBJS/src/http/modules/perl \ - $NGX_OBJS/src/mail + $NGX_OBJS/src/mail \ + $NGX_OBJS/src/misc ngx_objs_dir=$NGX_OBJS$ngx_regex_dirsep @@ -127,6 +128,9 @@ END fi +ngx_all_srcs="$ngx_all_srcs $NGX_MISC_SRCS" + + if test -n "$NGX_ADDON_SRCS"; then cat << END >> $NGX_MAKEFILE @@ -309,6 +313,32 @@ END fi +# the misc sources + +if test -n "$NGX_MISC_SRCS"; then + + ngx_cc="\$(CC) $ngx_compile_opt \$(CFLAGS) $ngx_use_pch \$(ALL_INCS)" + + for ngx_src in $NGX_MISC_SRCS + do + ngx_src=`echo $ngx_src | sed -e "s/\//$ngx_regex_dirsep/g"` + ngx_obj=`echo $ngx_src \ + | sed -e "s#^\(.*\.\)cpp\\$#$ngx_objs_dir\1$ngx_objext#g" \ + -e "s#^\(.*\.\)cc\\$#$ngx_objs_dir\1$ngx_objext#g" \ + -e "s#^\(.*\.\)c\\$#$ngx_objs_dir\1$ngx_objext#g" \ + -e "s#^\(.*\.\)S\\$#$ngx_objs_dir\1$ngx_objext#g"` + + cat << END >> $NGX_MAKEFILE + +$ngx_obj: \$(CORE_DEPS) $ngx_cont$ngx_src + $ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX + +END + done + +fi + + # the addons sources if test -n "$NGX_ADDON_SRCS"; then diff --git a/auto/modules b/auto/modules --- a/auto/modules +++ b/auto/modules @@ -375,6 +375,12 @@ if [ $MAIL = YES ]; then fi +if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then + modules="$modules $NGX_GOOGLE_PERFTOOLS_MODULE" + NGX_MISC_SRCS="$NGX_MISC_SRCS $NGX_GOOGLE_PERFTOOLS_SRCS" +fi + + cat << END > $NGX_MODULES_C #include diff --git a/auto/options b/auto/options --- a/auto/options +++ b/auto/options @@ -115,6 +115,8 @@ ZLIB_ASM=NO USE_PERL=NO NGX_PERL=perl +NGX_GOOGLE_PERFTOOLS=NO + NGX_CPU_CACHE_LINE= @@ -201,6 +203,8 @@ do --without-mail_imap_module) MAIL_IMAP=NO ;; --without-mail_smtp_module) MAIL_SMTP=NO ;; + --with-google_perftools_module) NGX_GOOGLE_PERFTOOLS=YES ;; + --add-module=*) NGX_ADDONS="$NGX_ADDONS $value" ;; --with-cc=*) CC="$value" ;; @@ -317,6 +321,8 @@ cat << END --without-mail_imap_module disable ngx_mail_imap_module --without-mail_smtp_module disable ngx_mail_smtp_module + --with-google_perftools_module enable ngx_google_perftools_module + --add-module=PATH enable an external module --with-cc=PATH set path to C compiler diff --git a/auto/sources b/auto/sources --- a/auto/sources +++ b/auto/sources @@ -460,3 +460,7 @@ MAIL_AUTH_HTTP_SRCS="src/mail/ngx_mail_a MAIL_PROXY_MODULE="ngx_mail_proxy_module" MAIL_PROXY_SRCS="src/mail/ngx_mail_proxy_module.c" + +NGX_GOOGLE_PERFTOOLS_MODULE=ngx_google_perftools_module +NGX_GOOGLE_PERFTOOLS_SRCS=src/misc/ngx_google_perftools_module.c + diff --git a/src/misc/ngx_google_perftools_module.c b/src/misc/ngx_google_perftools_module.c new file mode 100644 --- /dev/null +++ b/src/misc/ngx_google_perftools_module.c @@ -0,0 +1,127 @@ + +/* + * Copyright (C) Igor Sysoev + */ + + +#include +#include + +/* + * declare Profiler here interface because + * is C++ header file + */ + +int ProfilerStart(u_char* fname); +void ProfilerStop(void); +void ProfilerRegisterThread(void); + + +static void *ngx_google_perftools_create_conf(ngx_cycle_t *cycle); +static ngx_int_t ngx_google_perftools_worker(ngx_cycle_t *cycle); + + +typedef struct { + ngx_str_t profiles; +} ngx_google_perftools_conf_t; + + +static ngx_command_t ngx_google_perftools_commands[] = { + + { ngx_string("google_perftools_profiles"), + NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, + ngx_conf_set_str_slot, + 0, + offsetof(ngx_google_perftools_conf_t, profiles), + NULL }, + + ngx_null_command +}; + + +static ngx_core_module_t ngx_google_perftools_module_ctx = { + ngx_string("google_perftools"), + ngx_google_perftools_create_conf, + NULL +}; + + +ngx_module_t ngx_google_perftools_module = { + NGX_MODULE_V1, + &ngx_google_perftools_module_ctx, /* module context */ + ngx_google_perftools_commands, /* module directives */ + NGX_CORE_MODULE, /* module type */ + NULL, /* init master */ + NULL, /* init module */ + ngx_google_perftools_worker, /* init process */ + NULL, /* init thread */ + NULL, /* exit thread */ + NULL, /* exit process */ + NULL, /* exit master */ + NGX_MODULE_V1_PADDING +}; + + +static void * +ngx_google_perftools_create_conf(ngx_cycle_t *cycle) +{ + ngx_google_perftools_conf_t *gptcf; + + gptcf = ngx_pcalloc(cycle->pool, sizeof(ngx_google_perftools_conf_t)); + if (gptcf == NULL) { + return NULL; + } + + /* + * set by pcalloc() + * + * gptcf->profiles = { 0, NULL }; + */ + + return gptcf; +} + + +static ngx_int_t +ngx_google_perftools_worker(ngx_cycle_t *cycle) +{ + u_char *profile; + ngx_google_perftools_conf_t *gptcf; + + gptcf = (ngx_google_perftools_conf_t *) + ngx_get_conf(cycle->conf_ctx, ngx_google_perftools_module); + + if (gptcf->profiles.len == 0) { + return NGX_OK; + } + + profile = ngx_alloc(gptcf->profiles.len + NGX_INT_T_LEN + 2, cycle->log); + if (profile == NULL) { + return NGX_OK; + } + + if (getenv("CPUPROFILE")) { + + /* disable inherited Profiler enabled in master process */ + ProfilerStop(); + } + + ngx_sprintf(profile, "%V.%d%Z", &gptcf->profiles, ngx_pid); + + if (ProfilerStart(profile)) { + + /* start ITIMER_PROF timer */ + ProfilerRegisterThread(); + + } else { + ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_errno, + "ProfilerStart(%s) failed", profile); + } + + ngx_free(profile); + + return NGX_OK; +} + + +/* ProfilerStop() is called on Profiler destruction */