Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http://issues.apache.org/activemq/browse/AMQ-1001 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@467676 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-10-25 15:02:22 +00:00
parent 0ba4b93c37
commit aa54a8bec6
3 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-core/src/main/java/org/apache/activemq/command/WireFormatInfo.java
View File

@ -253,6 +253,18 @@ public class WireFormatInfo implements Command, MarshallAware {
setProperty("MaxInactivityDuration", new Long(maxInactivityDuration));
}
/**
* @throws IOException
*/
public int getCacheSize() throws IOException {
Integer i = (Integer) getProperty("CacheSize");
return i == null ? 0 : i.intValue();
}
public void setCacheSize(int cacheSize) throws IOException {
setProperty("CacheSize", new Integer(cacheSize));
}
public Response visit(CommandVisitor visitor) throws Exception {
return visitor.processWireFormat(this);
}

39
activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
View File

@ -43,7 +43,7 @@ final public class OpenWireFormat implements WireFormat {
static final byte NULL_TYPE = CommandTypes.NULL;
private static final int MARSHAL_CACHE_SIZE = Short.MAX_VALUE/2;
private static final int MARSHAL_CACHE_PREFERED_SIZE = MARSHAL_CACHE_SIZE-100;
private static final int MARSHAL_CACHE_FREE_SPACE = 100;
private DataStreamMarshaller dataMarshallers[];
private int version = 2;
@ -53,12 +53,13 @@ final public class OpenWireFormat implements WireFormat {
private boolean tightEncodingEnabled=false;
private boolean sizePrefixDisabled=false;
private HashMap marshallCacheMap = new HashMap();
// The following fields are used for value caching
private short nextMarshallCacheIndex=0;
private short nextMarshallCacheEvictionIndex=0;
private short nextMarshallCacheEvictionIndex=0;
private HashMap marshallCacheMap = new HashMap();
private DataStructure marshallCache[];
private DataStructure unmarshallCache[];
private DataStructure marshallCache[] = new DataStructure[MARSHAL_CACHE_SIZE];
private DataStructure unmarshallCache[] = new DataStructure[MARSHAL_CACHE_SIZE];
private WireFormatInfo preferedWireFormatInfo;
public OpenWireFormat() {
@ -466,13 +467,13 @@ final public class OpenWireFormat implements WireFormat {
public void runMarshallCacheEvictionSweep() {
// Do we need to start evicting??
while( marshallCacheMap.size() > MARSHAL_CACHE_PREFERED_SIZE ) {
while( marshallCacheMap.size() > marshallCache.length - MARSHAL_CACHE_FREE_SPACE ) {
marshallCacheMap.remove(marshallCache[nextMarshallCacheEvictionIndex]);
marshallCache[nextMarshallCacheEvictionIndex]=null;
nextMarshallCacheEvictionIndex++;
if( nextMarshallCacheEvictionIndex >= MARSHAL_CACHE_SIZE ) {
if( nextMarshallCacheEvictionIndex >= marshallCache.length ) {
nextMarshallCacheEvictionIndex=0;
}
@ -485,12 +486,12 @@ final public class OpenWireFormat implements WireFormat {
public Short addToMarshallCache(DataStructure o) {
short i = nextMarshallCacheIndex++;
if( nextMarshallCacheIndex >= MARSHAL_CACHE_SIZE ) {
if( nextMarshallCacheIndex >= marshallCache.length ) {
nextMarshallCacheIndex=0;
}
// We can only cache that item if there is space left.
if( marshallCacheMap.size() < MARSHAL_CACHE_SIZE ) {
if( marshallCacheMap.size() < marshallCache.length ) {
marshallCache[i] = o;
Short index = new Short(i);
marshallCacheMap.put(o, index);
@ -572,6 +573,26 @@ final public class OpenWireFormat implements WireFormat {
this.tightEncodingEnabled = info.isTightEncodingEnabled() && preferedWireFormatInfo.isTightEncodingEnabled();
this.sizePrefixDisabled = info.isSizePrefixDisabled() && preferedWireFormatInfo.isSizePrefixDisabled();
if( cacheEnabled ) {
int size = Math.min(preferedWireFormatInfo.getCacheSize(), info.getCacheSize());
if( size == 0 ) {
size = MARSHAL_CACHE_SIZE;
}
marshallCache = new DataStructure[size];
unmarshallCache = new DataStructure[size];
nextMarshallCacheIndex=0;
nextMarshallCacheEvictionIndex =0;
marshallCacheMap = new HashMap();
} else {
marshallCache=null;
unmarshallCache=null;
nextMarshallCacheIndex=0;
nextMarshallCacheEvictionIndex=0;
marshallCacheMap = null;
}
}
protected int min(int version1, int version2) {

10
activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormatFactory.java
View File

@ -37,6 +37,7 @@ public class OpenWireFormatFactory implements WireFormatFactory {
private boolean tightEncodingEnabled=true;
private boolean sizePrefixDisabled=false;
private long maxInactivityDuration=30*1000;
private int cacheSize=1024;
public WireFormat createWireFormat() {
WireFormatInfo info = new WireFormatInfo();
@ -49,6 +50,7 @@ public class OpenWireFormatFactory implements WireFormatFactory {
info.setTightEncodingEnabled(tightEncodingEnabled);
info.setSizePrefixDisabled(sizePrefixDisabled);
info.seMaxInactivityDuration(maxInactivityDuration);
info.setCacheSize(cacheSize);
} catch (Exception e) {
IllegalStateException ise = new IllegalStateException("Could not configure WireFormatInfo");
ise.initCause(e);
@ -115,4 +117,12 @@ public class OpenWireFormatFactory implements WireFormatFactory {
public void setMaxInactivityDuration(long maxInactivityDuration) {
this.maxInactivityDuration = maxInactivityDuration;
}
public int getCacheSize() {
return cacheSize;
}
public void setCacheSize(int cacheSize) {
this.cacheSize = cacheSize;
}
}