initialize ACE::pagesize_ to 0, always, and set it in ACE::round_to_pagesize ()

9 files changed, 5 insertions, 27 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 87b67193191..b09edd9e549 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -10,13 +10,7 @@
 #include "ace/Reactor.h"
 
 // Size of a VM page.
-#if defined (ACE_HAS_GETPAGESIZE)
-// This static instance member will get loaded with the system pagesize
-// on the first call to ACE::round_to_pagesize ().
 size_t ACE::pagesize_ = 0;
-#else
-size_t ACE::pagesize_ = ACE_PAGE_SIZE;
-#endif /* ACE_HAS_GETPAGESIZE */
 
 int
 ACE::register_stdin_handler (ACE_Event_Handler *eh,
@@ -640,6 +634,9 @@ ACE::round_to_pagesize (off_t len)
       ACE::pagesize_ = (size_t) sys_info.dwPageSize;
 #elif defined (ACE_HAS_GETPAGESIZE)
       ACE::pagesize_ = (size_t) ::getpagesize ();
+#else
+      // Use the default set in config.h
+      ACE::pagesize_ = ACE_PAGE_SIZE;
 #endif /* ACE_WIN32 */
     }
 
diff --git a/ace/README b/ace/README
index d2c9b5cba2c..b4e2ccd90c5 100644
--- a/ace/README
+++ b/ace/README
@@ -32,7 +32,7 @@ ACE_HAS_COMPLEX_LOCK			Platform supports non-standard readers/writer locks...
 ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 	Prototypes for both signal() and struct sigaction are consistent.
 ACE_HAS_CPLUSPLUS_HEADERS		Compiler/platform has correctly prototyped header files
 ACE_HAS_DLL				Build ACE using the frigging PC DLL nonsense...
-ACE_HAS_GETPAGESIZE			Platform supports getpagesize() call.
+ACE_HAS_GETPAGESIZE			Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be defined, except on Win32)
 ACE_HAS_GETRUSAGE                       Platform supports the getrusage() system call.
 ACE_HAS_GNU_CSTRING_H			Denotes that GNU has cstring.h as standard which redefines memchr() 
 ACE_HAS_GREENHILLS_SOCKETS		Platform is using GreenHills compiler with its weird socket headers.
@@ -177,7 +177,7 @@ ACE_NEEDS_SYSTIME_H			<time.h> doesn't automatically #include /**/ <sys/time.h>
 ACE_NEEDS_WRITEV			Platform doesn't define writev, so use our own
 ACE_NLOGGING				Turns off the LM_DEBUG and LM_ERROR logging macros...
 ACE_NTRACE				Turns off the tracing feature.
-ACE_PAGE_SIZE				Defines the page size of the system
+ACE_PAGE_SIZE				Defines the page size of the system (not used on Win32 or with ACE_HAS_GETPAGESIZE).
 ACE_REDEFINES_XTI_FUNCTIONS		Platform redefines the t_... names (UnixWare)
 ACE_SELECT_USES_INT			Platform uses int for select() rather than fd_set
 ACE_TEMPLATES_REQUIRE_PRAGMA		Compiler's template mechanism must use a pragma This is used for AIX's C++ compiler.
diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h
index 847c4153d05..d074a2c6159 100644
--- a/ace/config-irix5.2.h
+++ b/ace/config-irix5.2.h
@@ -55,7 +55,6 @@
 #define ACE_HAS_SYS_SIGLIST 
 #define ACE_HAS_SYS_FILIO_H 
 #define ACE_HAS_SEMUN 
-#define ACE_PAGE_SIZE 4096
 
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index f194c849043..317141af07f 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -113,9 +113,6 @@
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
 #define ACE_NTRACE 1
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index bb142c8a692..fc2f70969af 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -109,9 +109,6 @@
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
 #define ACE_NTRACE 1
diff --git a/ace/config-irix6.2-sgic++.h b/ace/config-irix6.2-sgic++.h
index c4b5ef02c19..aa16f2824ae 100644
--- a/ace/config-irix6.2-sgic++.h
+++ b/ace/config-irix6.2-sgic++.h
@@ -143,9 +143,6 @@
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
 #define ACE_NTRACE 1
diff --git a/ace/config-win32-msvc2.0.h b/ace/config-win32-msvc2.0.h
index 1ea7f514dde..8035840ec6f 100644
--- a/ace/config-win32-msvc2.0.h
+++ b/ace/config-win32-msvc2.0.h
@@ -208,9 +208,6 @@ inline void *operator new (unsigned int, void *p) { return p; }
 #endif /* ACE_NTRACE */
 // #define ACE_NLOGGING
 
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
 // I'm pretty sure NT lacks these
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 
diff --git a/ace/config-win32-msvc4.x.h b/ace/config-win32-msvc4.x.h
index e20a33a96e0..51f94845a6f 100644
--- a/ace/config-win32-msvc4.x.h
+++ b/ace/config-win32-msvc4.x.h
@@ -217,9 +217,6 @@
 #endif /* ACE_NTRACE */
 // #define ACE_NLOGGING
 
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
 // I'm pretty sure NT lacks these
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 
diff --git a/ace/config-winnt-4.0-msvc4.x.h b/ace/config-winnt-4.0-msvc4.x.h
index fef3e1a6d83..65b9014d896 100644
--- a/ace/config-winnt-4.0-msvc4.x.h
+++ b/ace/config-winnt-4.0-msvc4.x.h
@@ -216,9 +216,6 @@
 #endif /* ACE_NTRACE */
 // #define ACE_NLOGGING
 
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
 // I'm pretty sure NT lacks these
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS