laruence Sun, 16 Oct 2011 01:19:55 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=318139
Log:
Merge r316812 to trunk
Changed paths:
U php/php-src/trunk/main/main.c
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2011-10-16 00:56:35 UTC (rev 318138)
+++ php/php-src/trunk/main/main.c 2011-10-16 01:19:55 UTC (rev 318139)
@@ -93,15 +93,26 @@
#include "SAPI.h"
#include "rfc1867.h"
-#if HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-# ifndef PAGE_SIZE
-# define PAGE_SIZE 4096
+#if HAVE_MMAP
+# if HAVE_UNISTD_H
+# include <unistd.h>
+# if defined(_SC_PAGESIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGESIZE);
+# elif defined(_SC_PAGE_SIZE)
+# define REAL_PAGE_SIZE sysconf(_SC_PAGE_SIZE);
+# endif
# endif
+# if HAVE_SYS_MMAN_H
+# include <sys/mman.h>
+# endif
+# ifndef REAL_PAGE_SIZE
+# ifdef PAGE_SIZE
+# define REAL_PAGE_SIZE PAGE_SIZE
+# else
+# define REAL_PAGE_SIZE 4096
+# endif
+# endif
#endif
-#ifdef PHP_WIN32
-# define PAGE_SIZE 4096
-#endif
/* }}} */
PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) =
php_register_internal_extensions;
@@ -1234,6 +1245,10 @@
php_stream *stream = php_stream_open_wrapper((char *)filename, "rb",
mode, &handle->opened_path);
if (stream) {
+#if HAVE_MMAP
+ size_t page_size = REAL_PAGE_SIZE;
+#endif
+
handle->filename = (char*)filename;
handle->free_filename = 0;
handle->handle.stream.handle = stream;
@@ -1244,7 +1259,9 @@
memset(&handle->handle.stream.mmap, 0,
sizeof(handle->handle.stream.mmap));
len = php_zend_stream_fsizer(stream TSRMLS_CC);
if (len != 0
- && ((len - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD
+#if HAVE_MMAP
+ && ((len - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD
+#endif
&& php_stream_mmap_possible(stream)
&& (p = php_stream_mmap_range(stream, 0, len,
PHP_STREAM_MAP_MODE_SHARED_READONLY, &mapped_len)) != NULL) {
handle->handle.stream.closer =
php_zend_stream_mmap_closer;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
