[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.dstore.

[Eclipse CVS Genie <genie@xxxxxxxxxxx>]

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util
In directory dev1:/tmp/cvs-serv13813/src/org/eclipse/dstore/internal/core/util

Modified Files:
	DataElementRemover.java 
Log Message:
[373507] [dstore][multithread] reduce heap memory on disconnect for server


Index: DataElementRemover.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/util/DataElementRemover.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DataElementRemover.java	13 Feb 2012 18:32:14 -0000	1.12
--- DataElementRemover.java	7 Mar 2012 14:14:16 -0000	1.13
***************
*** 19,22 ****
--- 19,23 ----
   *  David McKnight   (IBM) - [331922] [dstore] enable DataElement recycling
   *  David McKnight   (IBM) - [371401] [dstore][multithread] avoid use of static variables - causes memory leak after disconnect
+  *  David McKnight   (IBM)  - [373507] [dstore][multithread] reduce heap memory on disconnect for server
   *******************************************************************************/
  
***************
*** 38,42 ****
  	private static int numDisconnected = 0;
  	private static int numCreated = 0;
! 	private static int numGCed = 0;
  	
  	// The following determine how DataElements are chosen to be removed once they
--- 39,43 ----
  	private static int numDisconnected = 0;
  	private static int numCreated = 0;
! 	//private static int numGCed = 0;
  	
  	// The following determine how DataElements are chosen to be removed once they
***************
*** 101,105 ****
  	public static void addToGCedCount()
  	{
! 		numGCed++;
  	}
  
--- 102,106 ----
  	public static void addToGCedCount()
  	{
! 		//numGCed++;
  	}
  
***************
*** 153,157 ****
  				_dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$
  				_dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$
! 				_dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$
  				return;
  			}
--- 154,160 ----
  				_dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$
  				_dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$
! 			
! 				// no longer a helpful stat since we no longer use finalize
! 				// _dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$
  				return;
  			}
***************
*** 191,195 ****
  			_dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$
  			_dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$
! 			_dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$
  			System.gc();
  		}
--- 194,200 ----
  			_dataStore.memLog("Elements disconnected so far: " + numDisconnected); //$NON-NLS-1$
  			_dataStore.memLog("Spirit elements cleaned so far: " + numRemoved); //$NON-NLS-1$
! 			
! 			// no longer a helpful stat since we no longer use finalize
! 			// _dataStore.memLog("DataElements GCed so far: " + numGCed); //$NON-NLS-1$
  			System.gc();
  		}