rasmus Fri May 18 12:15:02 2007 UTC
Modified files:
/TSRM tsrm_virtual_cwd.c
/php-src/ext/standard basic_functions.c lcg.c php_ext_syslog.h
php_lcg.h syslog.c
Log:
MFB syscall optimizations
# boredom on the plane to China...
http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.c?r1=1.106&r2=1.107&diff_format=u
Index: TSRM/tsrm_virtual_cwd.c
diff -u TSRM/tsrm_virtual_cwd.c:1.106 TSRM/tsrm_virtual_cwd.c:1.107
--- TSRM/tsrm_virtual_cwd.c:1.106 Thu Apr 12 15:29:10 2007
+++ TSRM/tsrm_virtual_cwd.c Fri May 18 12:15:01 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tsrm_virtual_cwd.c,v 1.106 2007/04/12 15:29:10 dmitry Exp $ */
+/* $Id: tsrm_virtual_cwd.c,v 1.107 2007/05/18 12:15:01 rasmus Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -517,7 +517,7 @@
}
if (use_cache) {
- t = CWDG(realpath_cache_ttl)?time(NULL):0;
+ t = CWDG(realpath_cache_ttl)?sapi_get_request_time(TSRMLS_C):0;
if ((bucket = realpath_cache_find(path, path_length, t
TSRMLS_CC)) != NULL) {
int len = bucket->realpath_len;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.856&r2=1.857&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.856
php-src/ext/standard/basic_functions.c:1.857
--- php-src/ext/standard/basic_functions.c:1.856 Thu May 10 16:27:16 2007
+++ php-src/ext/standard/basic_functions.c Fri May 18 12:15:01 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.856 2007/05/10 16:27:16 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.857 2007/05/18 12:15:01 rasmus Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4138,8 +4138,6 @@
#endif
BG(user_shutdown_function_names) = NULL;
- PHP_RINIT(lcg)(INIT_FUNC_ARGS_PASSTHRU);
-
PHP_RINIT(filestat)(INIT_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU);
@@ -4192,8 +4190,10 @@
PHP_RSHUTDOWN(filestat)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#ifdef HAVE_SYSLOG_H
+#ifdef PHP_WIN32
PHP_RSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
+#endif
PHP_RSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_RSHUTDOWN(streams)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/lcg.c?r1=1.44&r2=1.45&diff_format=u
Index: php-src/ext/standard/lcg.c
diff -u php-src/ext/standard/lcg.c:1.44 php-src/ext/standard/lcg.c:1.45
--- php-src/ext/standard/lcg.c:1.44 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/lcg.c Fri May 18 12:15:01 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: lcg.c,v 1.44 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: lcg.c,v 1.45 2007/05/18 12:15:01 rasmus Exp $ */
#include "php.h"
#include "php_lcg.h"
@@ -106,14 +106,6 @@
return SUCCESS;
}
-PHP_RINIT_FUNCTION(lcg)
-{
- if (!LCG(seeded)) {
- lcg_seed(TSRMLS_C);
- }
- return SUCCESS;
-}
-
/* {{{ proto float lcg_value() U
Returns a value from the combined linear congruential generator */
PHP_FUNCTION(lcg_value)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_ext_syslog.h?r1=1.15&r2=1.16&diff_format=u
Index: php-src/ext/standard/php_ext_syslog.h
diff -u php-src/ext/standard/php_ext_syslog.h:1.15
php-src/ext/standard/php_ext_syslog.h:1.16
--- php-src/ext/standard/php_ext_syslog.h:1.15 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/php_ext_syslog.h Fri May 18 12:15:01 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ext_syslog.h,v 1.15 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_ext_syslog.h,v 1.16 2007/05/18 12:15:01 rasmus Exp $ */
#ifndef PHP_EXT_SYSLOG_H
#define PHP_EXT_SYSLOG_H
@@ -27,7 +27,9 @@
PHP_MINIT_FUNCTION(syslog);
PHP_RINIT_FUNCTION(syslog);
+#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog);
+#endif
PHP_MSHUTDOWN_FUNCTION(syslog);
PHP_FUNCTION(openlog);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_lcg.h?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/standard/php_lcg.h
diff -u php-src/ext/standard/php_lcg.h:1.23 php-src/ext/standard/php_lcg.h:1.24
--- php-src/ext/standard/php_lcg.h:1.23 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/php_lcg.h Fri May 18 12:15:01 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_lcg.h,v 1.23 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_lcg.h,v 1.24 2007/05/18 12:15:01 rasmus Exp $ */
#ifndef PHP_LCG_H
#define PHP_LCG_H
@@ -33,7 +33,6 @@
PHP_FUNCTION(lcg_value);
PHP_MINIT_FUNCTION(lcg);
-PHP_RINIT_FUNCTION(lcg);
#ifdef ZTS
#define LCG(v) TSRMG(lcg_globals_id, php_lcg_globals *, v)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/syslog.c?r1=1.54&r2=1.55&diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.54 php-src/ext/standard/syslog.c:1.55
--- php-src/ext/standard/syslog.c:1.54 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/syslog.c Fri May 18 12:15:01 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: syslog.c,v 1.54 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: syslog.c,v 1.55 2007/05/18 12:15:01 rasmus Exp $ */
#include "php.h"
@@ -114,13 +114,13 @@
}
+#ifdef PHP_WIN32
PHP_RSHUTDOWN_FUNCTION(syslog)
{
-#ifdef PHP_WIN32
closelog();
-#endif
return SUCCESS;
}
+#endif
PHP_MSHUTDOWN_FUNCTION(syslog)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
