Author: mturk
Date: Thu Apr 13 23:33:09 2006
New Revision: 394031
URL: http://svn.apache.org/viewcvs?rev=394031&view=rev
Log:
Fix #38985 by properly reporting >4G memory.
Modified:
tomcat/connectors/trunk/jni/native/os/unix/system.c
Modified: tomcat/connectors/trunk/jni/native/os/unix/system.c
URL:
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/os/unix/system.c?rev=394031&r1=394030&r2=394031&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/os/unix/system.c (original)
+++ tomcat/connectors/trunk/jni/native/os/unix/system.c Thu Apr 13 23:33:09 2006
@@ -122,12 +122,12 @@
if (sysinfo(&info))
rv = apr_get_os_error();
else {
- pvals[0] = (jlong)info.totalram;
- pvals[1] = (jlong)info.freeram;
- pvals[2] = (jlong)info.totalswap;
- pvals[3] = (jlong)info.freeswap;
- pvals[4] = (jlong)info.sharedram;
- pvals[5] = (jlong)info.bufferram;
+ pvals[0] = (jlong)(info.totalram * info.mem_unit);
+ pvals[1] = (jlong)(info.freeram * info.mem_unit);
+ pvals[2] = (jlong)(info.totalswap * info.mem_unit);
+ pvals[3] = (jlong)(info.freeswap * info.mem_unit);
+ pvals[4] = (jlong)(info.sharedram * info.mem_unit);
+ pvals[5] = (jlong)(info.bufferram * info.mem_unit);
pvals[6] = (jlong)(100 - (info.freeram * 100 / info.totalram));
rv = APR_SUCCESS;
}
@@ -293,7 +293,7 @@
*
*/
}
-
+
#elif defined(DARWIN)
uint64_t mem_total;
@@ -327,7 +327,7 @@
TCN_ALLOC_CSTRING(val);
UNREFERENCED(o);
-
+
/* TODO: Make ${ENVAR} expansion */
str = (*e)->NewStringUTF(e, J2S(val));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
