You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2017/09/17 12:30:36 UTC
[myfaces-trinidad] 13/36: TRINIDAD-1702 performance: decrease
memory of FileSystemStyleCache by reusing CSSStyle objects.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch 1.2.12.2-branch
in repository https://gitbox.apache.org/repos/asf/myfaces-trinidad.git
commit 648e79553e257cd09adcfa27d68bf80658fa91b0
Author: Jeanne Waldman <jw...@apache.org>
AuthorDate: Tue Feb 2 18:22:55 2010 +0000
TRINIDAD-1702 performance: decrease memory of FileSystemStyleCache by reusing CSSStyle objects.
---
.../style/cache/FileSystemStyleCache.java | 61 +++++++++++++++++++++-
1 file changed, 60 insertions(+), 1 deletion(-)
diff --git a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
index 518ea8d..0c17937 100644
--- a/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
+++ b/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
@@ -1426,8 +1426,66 @@ public class FileSystemStyleCache implements StyleProvider
if (name != null && value != null)
styleProperties.put(name, value);
}
+
+ // To save memory, we reuse CSSStyle objects if
+ // they have the same list of style property names and values.
+ // StyleKey is the key into the StyleKey, CSSStyle map.
+ StyleKey key = new StyleKey(styleProperties);
+ Style cachedStyle = _styleNodeToStyleMap.get(key);
+ if (cachedStyle == null)
+ {
+ // no match is cached yet, so create a new CSSStyle and cache in the map.
+ Style style = new CSSStyle(styleProperties);
+ _styleNodeToStyleMap.put(key, style);
+ return style;
+ }
+ else
+ {
+ return cachedStyle;
+ }
+ }
+
+ /**
+ * A StyleKey object is used as a key into a map so that we can share CSSStyle objects
+ * if they are equal and they have the same hashCode.
+ */
+ private static class StyleKey
+ {
+ public StyleKey(Map<String, String> styleProperties)
+ {
+ _styleProperties = styleProperties;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int hash = 17;
+ // take each style property name and value and create a hashCode from it.
+ for (Map.Entry<String, String> e : _styleProperties.entrySet())
+ {
+ String name = e.getKey();
+ hash = 37*hash + ((null == name) ? 0 : name.hashCode());
+
+ String value = e.getValue();
+ hash = 37*hash + ((null == value) ? 0 : value.hashCode());
- return new CSSStyle(styleProperties);
+ }
+ return hash;
+ }
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (!(obj instanceof StyleKey))
+ return false;
+
+ // obj at this point must be a StyleKey
+ StyleKey test = (StyleKey)obj;
+ return test._styleProperties.equals(this._styleProperties);
+ }
+
+ Map<String, String> _styleProperties;
}
@@ -1436,6 +1494,7 @@ public class FileSystemStyleCache implements StyleProvider
private final String[] _namespacePrefixArray;
private final Map<String, String> _shortStyleClassMap;
private final boolean _compress;
+ private Map<StyleKey, Style> _styleNodeToStyleMap = new ConcurrentHashMap<StyleKey, Style>();
}
private class StyleWriterFactoryImpl
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.