Skip to content

Commit 34b631f

Browse files
KalleZKalleZ
committed
Pass the TSRMS pointers to sapi_module_struct.log_message, this saves some TSRMLS_FETCH() calls in a few of our SAPI's
1 parent 65d031d commit 34b631f

File tree

14 files changed

+19
-31
lines changed

14 files changed

+19
-31
lines changed

‎ext/standard/basic_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4633,7 +4633,7 @@ PHPAPI int _php_error_log_ex(int opt_err, char *message, int message_len, char *
46334633

46344634
case 4: /* send to SAPI */
46354635
if (sapi_module.log_message) {
4636-
sapi_module.log_message(message);
4636+
sapi_module.log_message(message TSRMLS_CC);
46374637
} else {
46384638
return FAILURE;
46394639
}

‎main/SAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ struct _sapi_module_struct {
237237
char *(*read_cookies)(TSRMLS_D);
238238

239239
void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
240-
void (*log_message)(char *message);
240+
void (*log_message)(char *message TSRMLS_DC);
241241
time_t (*get_request_time)(TSRMLS_D);
242242
void (*terminate_process)(TSRMLS_D);
243243

‎main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ PHPAPI void php_log_err(char *log_message TSRMLS_DC)
567567
/* Otherwise fall back to the default logging location, if we have one */
568568

569569
if (sapi_module.log_message) {
570-
sapi_module.log_message(log_message);
570+
sapi_module.log_message(log_message TSRMLS_CC);
571571
}
572572
PG(in_error_log) = 0;
573573
}

‎sapi/apache/mod_php5.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,8 @@ static int php_apache_startup(sapi_module_struct *sapi_module)
307307

308308
/* {{{ php_apache_log_message
309309
*/
310-
static void php_apache_log_message(char *message)
310+
static void php_apache_log_message(char *message TSRMLS_DC)
311311
{
312-
TSRMLS_FETCH();
313-
314312
if (SG(server_context)) {
315313
#if MODULE_MAGIC_NUMBER >= 19970831
316314
aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, ((request_rec *) SG(server_context))->server, "%s", message);

‎sapi/apache2filter/sapi_apache2.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,10 +282,9 @@ php_apache_sapi_flush(void *server_context)
282282
}
283283
}
284284

285-
static void php_apache_sapi_log_message(char *msg)
285+
static void php_apache_sapi_log_message(char *msg TSRMLS_DC)
286286
{
287287
php_struct *ctx;
288-
TSRMLS_FETCH();
289288

290289
ctx = SG(server_context);
291290

‎sapi/apache2handler/sapi_apache2.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,10 +313,9 @@ php_apache_sapi_flush(void *server_context)
313313
}
314314
}
315315

316-
static void php_apache_sapi_log_message(char *msg)
316+
static void php_apache_sapi_log_message(char *msg TSRMLS_DC)
317317
{
318318
php_struct *ctx;
319-
TSRMLS_FETCH();
320319

321320
ctx = SG(server_context);
322321

@@ -327,12 +326,12 @@ static void php_apache_sapi_log_message(char *msg)
327326
}
328327
}
329328

330-
static void php_apache_sapi_log_message_ex(char *msg, request_rec *r)
329+
static void php_apache_sapi_log_message_ex(char *msg, request_rec *r TSRMLS_DC)
331330
{
332331
if (r) {
333332
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, msg, r->filename);
334333
} else {
335-
php_apache_sapi_log_message(msg);
334+
php_apache_sapi_log_message(msg TSRMLS_CC);
336335
}
337336
}
338337

@@ -589,12 +588,12 @@ static int php_handler(request_rec *r)
589588
}
590589

591590
if (r->finfo.filetype == 0) {
592-
php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r);
591+
php_apache_sapi_log_message_ex("script '%s' not found or unable to stat", r TSRMLS_CC);
593592
PHPAP_INI_OFF;
594593
return HTTP_NOT_FOUND;
595594
}
596595
if (r->finfo.filetype == APR_DIR) {
597-
php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r);
596+
php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as script", r TSRMLS_CC);
598597
PHPAP_INI_OFF;
599598
return HTTP_FORBIDDEN;
600599
}

‎sapi/apache_hooks/mod_php5.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,8 @@ static int php_apache_startup(sapi_module_struct *sapi_module)
430430

431431
/* {{{ php_apache_log_message
432432
*/
433-
static void php_apache_log_message(char *message)
433+
static void php_apache_log_message(char *message TSRMLS_DC)
434434
{
435-
TSRMLS_FETCH();
436-
437435
if (SG(server_context)) {
438436
#if MODULE_MAGIC_NUMBER >= 19970831
439437
aplog_error(NULL, 0, APLOG_ERR | APLOG_NOERRNO, ((request_rec *) SG(server_context))->server, "%s", message);

‎sapi/cgi/cgi_main.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,10 +676,8 @@ static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC)
676676
}
677677
}
678678

679-
static void sapi_cgi_log_message(char *message)
679+
static void sapi_cgi_log_message(char *message TSRMLS_DC)
680680
{
681-
TSRMLS_FETCH();
682-
683681
if (fcgi_is_fastcgi() && CGIG(fcgi_logging)) {
684682
fcgi_request *request;
685683

‎sapi/cli/php_cli.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static void sapi_cli_register_variables(zval *track_vars_array TSRMLS_DC) /* {{{
374374
}
375375
/* }}} */
376376

377-
static void sapi_cli_log_message(char *message) /* {{{ */
377+
static void sapi_cli_log_message(char *message TSRMLS_DC) /* {{{ */
378378
{
379379
fprintf(stderr, "%s\n", message);
380380
}
@@ -476,7 +476,7 @@ static sapi_module_struct cli_sapi_module = {
476476
sapi_cli_log_message, /* Log message */
477477
NULL, /* Get request time */
478478
NULL, /* Child terminate */
479-
479+
480480
STANDARD_SAPI_MODULE_PROPERTIES
481481
};
482482
/* }}} */

‎sapi/continuity/capi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,8 @@ static void sapi_capi_register_server_variables(zval * track_vars_array TSRMLS_D
343343

344344
}
345345

346-
static void capi_log_message(char *message)
346+
static void capi_log_message(char *message TSRMLS_DC)
347347
{
348-
TSRMLS_FETCH();
349348
capi_request_context *rc = (capi_request_context *) SG(server_context);
350349
logFmsg(0, "mod/php: %s", message);
351350
}

‎sapi/embed/php_embed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ static void php_embed_send_header(sapi_header_struct *sapi_header, void *server_
9090
{
9191
}
9292

93-
static void php_embed_log_message(char *message)
93+
static void php_embed_log_message(char *message TSRMLS_DC)
9494
{
9595
fprintf (stderr, "%s\n", message);
9696
}

‎sapi/fpm/fpm/fpm_main.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -698,10 +698,8 @@ static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC)
698698
}
699699
}
700700

701-
static void sapi_cgi_log_message(char *message)
701+
static void sapi_cgi_log_message(char *message TSRMLS_DC)
702702
{
703-
TSRMLS_FETCH();
704-
705703
if (fcgi_is_fastcgi() && CGIG(fcgi_logging)) {
706704
fcgi_request *request;
707705

‎sapi/litespeed/lsapi_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static int sapi_lsapi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
268268

269269
/* {{{ sapi_lsapi_send_headers
270270
*/
271-
static void sapi_lsapi_log_message(char *message)
271+
static void sapi_lsapi_log_message(char *message TSRMLS_DC)
272272
{
273273
int len = strlen( message );
274274
LSAPI_Write_Stderr( message, len);

‎sapi/nsapi/nsapi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,9 +773,8 @@ static void sapi_nsapi_register_server_variables(zval *track_vars_array TSRMLS_D
773773
}
774774
}
775775

776-
static void nsapi_log_message(char *message)
776+
static void nsapi_log_message(char *message TSRMLS_DC)
777777
{
778-
TSRMLS_FETCH();
779778
nsapi_request_context *rc = (nsapi_request_context *)SG(server_context);
780779

781780
if (rc) {

0 commit comments

Comments
 (0)