1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6745225: Memory leak while drawing Attributed String

Browse Source 
Reviewed-by: jgodinez, dougfelt
This commit is contained in:
Phil Race 2009-03-23 10:40:54 -07:00
parent 7f2828e070
commit 4db0a48b10
3 changed files with 111 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jdk/src/share/classes/sun/font/FileFontStrike.java
View File

@ -26,6 +26,7 @@
package sun.font;
import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.awt.Rectangle;
@ -842,15 +843,29 @@ public class FileFontStrike extends PhysicalStrike {
return fileFont.getGlyphOutlineBounds(pScalerContext, glyphCode);
}
private ConcurrentHashMap<Integer, GeneralPath> outlineMap;
private
WeakReference<ConcurrentHashMap<Integer,GeneralPath>> outlineMapRef;
GeneralPath getGlyphOutline(int glyphCode, float x, float y) {
if (outlineMap == null) {
outlineMap = new ConcurrentHashMap<Integer, GeneralPath>();
GeneralPath gp = null;
ConcurrentHashMap<Integer, GeneralPath> outlineMap = null;
if (outlineMapRef != null) {
outlineMap = outlineMapRef.get();
if (outlineMap != null) {
gp = (GeneralPath)outlineMap.get(glyphCode);
}
}
GeneralPath gp = (GeneralPath)outlineMap.get(glyphCode);
if (gp == null) {
gp = fileFont.getGlyphOutline(pScalerContext, glyphCode, 0, 0);
if (outlineMap == null) {
outlineMap = new ConcurrentHashMap<Integer, GeneralPath>();
outlineMapRef =
new WeakReference
<ConcurrentHashMap<Integer,GeneralPath>>(outlineMap);
}
outlineMap.put(glyphCode, gp);
}
gp = (GeneralPath)gp.clone(); // mutable!

2
jdk/src/share/classes/sun/font/GlyphLayout.java
View File

@ -338,6 +338,8 @@ public final class GlyphLayout {
cache = new ConcurrentHashMap<SDKey, SDCache>(10);
cacheRef = new
SoftReference<ConcurrentHashMap<SDKey, SDCache>>(cache);
} else if (cache.size() >= 512) {
cache.clear();
}
cache.put(key, res);
}

90
jdk/test/java/awt/font/LineBreakMeasurer/FRCTest.java Normal file
View File

@ -0,0 +1,90 @@
/*
* Copyright 2008-9 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6448405 6519513 6745225
* @summary static HashMap cache in LineBreakMeasurer can grow wihout bounds
* @run main/othervm/timeout=600 -client -Xms16m -Xmx16m FRCTest
*/
import java.awt.*;
import java.awt.image.*;
import java.awt.font.*;
import java.awt.geom.*;
import java.text.*;
import java.util.Hashtable;
public class FRCTest {
static AttributedString vanGogh = new AttributedString(
"Many people believe that Vincent van Gogh painted his best works " +
"during the two-year period he spent in Provence. Here is where he " +
"painted The Starry Night--which some consider to be his greatest " +
"work of all. However, as his artistic brilliance reached new " +
"heights in Provence, his physical and mental health plummeted. ",
new Hashtable());
public static void main(String[] args) {
// First test the behaviour of Graphics2D.getFontRenderContext();
BufferedImage bi = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
Graphics2D g2d = bi.createGraphics();
AffineTransform g2dTx = new AffineTransform(2,0,2,0,1,1);
g2d.setTransform(g2dTx);
AffineTransform frcTx = g2d.getFontRenderContext().getTransform();
AffineTransform frcExpected = new AffineTransform(2,0,2,0,0,0);
if (!frcTx.equals(frcExpected)) {
throw new RuntimeException("FRC Tx may have translate?");
}
// Now test that using different translates with LBM is OK
// This test doesn't prove a lot since showing a leak really
// requires a basher test that can run for a long time.
for (int x=0;x<100;x++) {
for (int y=0;y<100;y++) {
AttributedCharacterIterator aci = vanGogh.getIterator();
AffineTransform tx = AffineTransform.getTranslateInstance(x, y);
FontRenderContext frc = new FontRenderContext(tx, false, false);
LineBreakMeasurer lbm = new LineBreakMeasurer(aci, frc);
lbm.setPosition(aci.getBeginIndex());
while (lbm.getPosition() < aci.getEndIndex()) {
lbm.nextLayout(100f);
}
}
}
for (int x=0;x<25;x++) {
for (int y=0;y<25;y++) {
AttributedCharacterIterator aci = vanGogh.getIterator();
double rot = Math.random()*.4*Math.PI - .2*Math.PI;
AffineTransform tx = AffineTransform.getRotateInstance(rot);
FontRenderContext frc = new FontRenderContext(tx, false, false);
LineBreakMeasurer lbm = new LineBreakMeasurer(aci, frc);
lbm.setPosition(aci.getBeginIndex());
while (lbm.getPosition() < aci.getEndIndex()) {
lbm.nextLayout(100f);
}
}
}
}
}