change buffer pool size management to take available memory into consideration

erh · erh · commit 989e7fdd2993 · 2009-05-18T09:51:44.000-04:00
diff --git a/src/main/com/mongodb/ByteDecoder.java b/src/main/com/mongodb/ByteDecoder.java
@@ -49,8 +49,7 @@ protected void done(){
         _pool.done( this );
     }
 
-    private final static int _poolSize = 6 * BUFS_PER_50M;
-    private final static SimplePool<ByteDecoder> _pool = new SimplePool<ByteDecoder>( "ByteDecoders" , _poolSize , -1 ){
+    final static SimplePool<ByteDecoder> _pool = new SimplePool<ByteDecoder>( "ByteDecoders" , NUM_ENCODERS * 3 , -1 ){
 
         protected ByteDecoder createNew(){
 	    if ( D ) System.out.println( "creating new ByteDecoder" );
diff --git a/src/main/com/mongodb/ByteEncoder.java b/src/main/com/mongodb/ByteEncoder.java
@@ -99,8 +99,7 @@ protected void done(){
         _pool.done( this );
     }
     
-    private final static int _poolSize = Math.min( Bytes.CONNECTIONS_PER_HOST , 2 * BUFS_PER_50M );
-    private final static SimplePool<ByteEncoder> _pool = new SimplePool<ByteEncoder>( "ByteEncoders" , _poolSize , -1 ){
+    final static SimplePool<ByteEncoder> _pool = new SimplePool<ByteEncoder>( "ByteEncoders" , NUM_ENCODERS , -1 ){
             protected ByteEncoder createNew(){
 		if ( D ) System.out.println( "creating new ByteEncoder" );
                 return new ByteEncoder();
diff --git a/src/main/com/mongodb/Bytes.java b/src/main/com/mongodb/Bytes.java
@@ -34,9 +34,21 @@ public class Bytes {
     public static final ByteOrder ORDER = ByteOrder.LITTLE_ENDIAN;
 
     static final int BUF_SIZE = 1024 * 1024 * 5;
-    
     static final int CONNECTIONS_PER_HOST = 10;
-    static final int BUFS_PER_50M = ( 1024 * 1024 * 50 ) / BUF_SIZE;
+    static final int NUM_ENCODERS;
+
+    static {
+        Runtime r = Runtime.getRuntime();
+        int numBufs = (int)(r.maxMemory() / BUF_SIZE);
+        numBufs = numBufs / 5;
+        if ( numBufs > CONNECTIONS_PER_HOST ){
+            numBufs = CONNECTIONS_PER_HOST;
+        }
+        if ( numBufs == 0 )
+            throw new IllegalStateException( "the mongo driver doesn't have enough memory to create its buffers" );
+
+        NUM_ENCODERS = numBufs;
+    }
 
     static final byte EOO = 0;    
     static final byte NUMBER = 1;

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ protected void done(){`
`49`	`49`	`_pool.done( this );`
`50`	`50`	`}`
`51`	`51`
`52`		`- private final static int _poolSize = 6 * BUFS_PER_50M;`
`53`		`- private final static SimplePool<ByteDecoder> _pool = new SimplePool<ByteDecoder>( "ByteDecoders" , _poolSize , -1 ){`
	`52`	`+ final static SimplePool<ByteDecoder> _pool = new SimplePool<ByteDecoder>( "ByteDecoders" , NUM_ENCODERS * 3 , -1 ){`
`54`	`53`
`55`	`54`	`protected ByteDecoder createNew(){`
`56`	`55`	`if ( D ) System.out.println( "creating new ByteDecoder" );`
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,7 @@ protected void done(){`
`99`	`99`	`_pool.done( this );`
`100`	`100`	`}`
`101`	`101`
`102`		`- private final static int _poolSize = Math.min( Bytes.CONNECTIONS_PER_HOST , 2 * BUFS_PER_50M );`
`103`		`- private final static SimplePool<ByteEncoder> _pool = new SimplePool<ByteEncoder>( "ByteEncoders" , _poolSize , -1 ){`
	`102`	`+ final static SimplePool<ByteEncoder> _pool = new SimplePool<ByteEncoder>( "ByteEncoders" , NUM_ENCODERS , -1 ){`
`104`	`103`	`protected ByteEncoder createNew(){`
`105`	`104`	`if ( D ) System.out.println( "creating new ByteEncoder" );`
`106`	`105`	`return new ByteEncoder();`