hotspot/src/share/vm/memory/referencePolicy.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)referencePolicy.cpp  1.12 07/05/05 17:05:54 JVM"
  #endif
  /*
!  * Copyright 2000-2003 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)referencePolicy.cpp  1.12 07/05/05 17:05:54 JVM"
  #endif
  /*
!  * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 27,36 ****
--- 27,41 ----
  
  # include "incls/_precompiled.incl"
  # include "incls/_referencePolicy.cpp.incl"
  
  LRUCurrentHeapPolicy::LRUCurrentHeapPolicy() {
+   setup();
+ }
+ 
+ // Capture state (of-the-VM) information needed to evaluate the policy
+ void LRUCurrentHeapPolicy::setup() {
    _max_interval = (Universe::get_heap_free_at_last_gc() / M) * SoftRefLRUPolicyMSPerMB;
    assert(_max_interval >= 0,"Sanity check");
  }
  
  // The oop passed in is the SoftReference object, and not
*** 48,57 ****
--- 53,67 ----
  }
  
  /////////////////////// MaxHeap //////////////////////
  
  LRUMaxHeapPolicy::LRUMaxHeapPolicy() {
+   setup();
+ }
+ 
+ // Capture state (of-the-VM) information needed to evaluate the policy
+ void LRUMaxHeapPolicy::setup() {
    size_t max_heap = MaxHeapSize;
    max_heap -= Universe::get_heap_used_at_last_gc();
    max_heap /= M;
  
    _max_interval = max_heap * SoftRefLRUPolicyMSPerMB;