QPID-268 : (Patch supplied by Rob Godfrey) Improvements to performance of generated code

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@494650 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 92 insertions, 30 deletions

diff --git a/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
index a18338f3fe..13560f5c17 100644
--- a/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ b/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
@@ -61,7 +61,9 @@ public class JavaGenerator extends Generator
 	static private Method mbGetGenerateMethod;
 	static private Method mbMangledGetGenerateMethod;
 	static private Method mbParamListGenerateMethod;
+	static private Method mbPassedParamListGenerateMethod;
 	static private Method mbMangledParamListGenerateMethod;
+	static private Method mbMangledPassedParamListGenerateMethod;
 	static private Method mbBodyInitGenerateMethod;
 	static private Method mbMangledBodyInitGenerateMethod;
 	static private Method mbSizeGenerateMethod;
@@ -131,11 +133,22 @@ public class JavaGenerator extends Generator
 			AmqpVersionSet.class, int.class, int.class, boolean.class); }
 		catch (NoSuchMethodException e) { e.printStackTrace(); }
 		
+		
+		try { mbPassedParamListGenerateMethod = JavaGenerator.class.getDeclaredMethod(
+			"generateMbPassedParamList", String.class, AmqpField.class,
+			AmqpVersionSet.class, int.class, int.class, boolean.class); }
+		catch (NoSuchMethodException e) { e.printStackTrace(); }
+		
 		try { mbMangledParamListGenerateMethod = JavaGenerator.class.getDeclaredMethod(
 			"generateMbMangledParamList", AmqpField.class,
 			int.class, int.class, boolean.class); }
 		catch (NoSuchMethodException e) { e.printStackTrace(); }
 		
+		try { mbMangledPassedParamListGenerateMethod = JavaGenerator.class.getDeclaredMethod(
+			"generateMbMangledPassedParamList", AmqpField.class,
+			int.class, int.class, boolean.class); }
+		catch (NoSuchMethodException e) { e.printStackTrace(); }
+		
 		try { mbBodyInitGenerateMethod = JavaGenerator.class.getDeclaredMethod(
 			"generateMbBodyInit", String.class, AmqpField.class,
 			AmqpVersionSet.class, int.class, int.class, boolean.class); }
@@ -457,11 +470,11 @@ public class JavaGenerator extends Generator
 		if (token.compareTo("${CLASS}") == 0 && thisClass != null)
 			return thisClass.name;
 		if (token.compareTo("${CLASS_ID_INIT}") == 0 && thisClass != null)
-			return generateIndexInitializer("classIdMap", thisClass.indexMap, 8);
+			return generateIndexInitializer("registerClassId", thisClass.indexMap, 8);
 		if (token.compareTo("${METHOD}") == 0 && method != null)
 			return method.name;
 		if (token.compareTo("${METHOD_ID_INIT}") == 0 && method != null)
-			return generateIndexInitializer("methodIdMap", method.indexMap, 8);
+			return generateIndexInitializer("registerMethodId", method.indexMap, 8);
 		if (token.compareTo("${FIELD}") == 0 && field != null)
 			return field.name;
 		
@@ -573,6 +586,16 @@ public class JavaGenerator extends Generator
 			codeSnippet += fieldMap.parseFieldMap(mbParamListGenerateMethod,
 				mbMangledParamListGenerateMethod, 42, 4, this);
 		}
+
+		else if (token.compareTo("${mb_field_passed_parameter_list}") == 0)
+		{
+			// <cringe> The code generated by this is ugly... It puts a comma on a line by itself!
+			// TODO: Find a more elegant solution here sometime...
+			codeSnippet = fieldMap.size() > 0 ? Utils.createSpaces(42) + "," + cr : "";
+			// </cringe>
+			codeSnippet += fieldMap.parseFieldMap(mbPassedParamListGenerateMethod,
+				mbMangledPassedParamListGenerateMethod, 42, 4, this);
+		}
 		else if (token.compareTo("${mb_field_body_initialize}") == 0)
 		{
 			codeSnippet = fieldMap.parseFieldMap(mbBodyInitGenerateMethod,
@@ -721,7 +744,7 @@ public class JavaGenerator extends Generator
 			while (vItr.hasNext())
 			{
 				AmqpVersion version = vItr.next();
-				sb.append(indent + mapName + ".put(\"" + version.toString() + "\", " + index + ");" + cr);
+				sb.append(indent + mapName + "( (byte) " + version.getMajor() +", (byte) " + version.getMinor() + ", " + index + ");" + cr);
 			}
 		}
 		return sb.toString();		
@@ -746,12 +769,12 @@ public class JavaGenerator extends Generator
 					{
 						int classIndex = findIndex(thisClass.indexMap, version);
 						int methodIndex = findIndex(method.indexMap, version);
-						sb.append(indent + "classIDMethodIDVersionBodyMap.put(" + cr);
-						sb.append(indent + tab + "createMapKey((short)" + classIndex +
-								", (short)" + methodIndex + ", (byte)" + version.getMajor() +
-								", (byte)" + version.getMinor() + "), " + cr);
+						sb.append(indent + "registerMethod(" + cr);
+						sb.append(indent + tab + "(short)" + classIndex +
+							", (short)" + methodIndex + ", (byte)" + version.getMajor() +
+							", (byte)" + version.getMinor() + ", " + cr);
 						sb.append(indent + tab + Utils.firstUpper(thisClass.name) +
-								Utils.firstUpper(method.name) + "Body.class);" + cr);
+							Utils.firstUpper(method.name) + "Body.getFactory());" + cr);
 					}
 					catch (Exception e) {} // Ignore
 				}
@@ -924,6 +947,15 @@ public class JavaGenerator extends Generator
 			(nextFlag ? "," : "") + " // AMQP version(s): " + versionSet + cr;
 	}
 	
+	
+	protected String generateMbPassedParamList(String codeType, AmqpField field,
+		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
+	{
+		return Utils.createSpaces(indentSize) + field.name +
+			(nextFlag ? "," : "") + " // AMQP version(s): " + versionSet + cr;
+	}
+	
+	
 	protected String generateMbMangledParamList(AmqpField field, int indentSize,
 		int tabSize, boolean nextFlag)
 		throws AmqpTypeMappingException
@@ -943,10 +975,29 @@ public class JavaGenerator extends Generator
 		return sb.toString();		
 	}
 	
+	protected String generateMbMangledPassedParamList(AmqpField field, int indentSize,
+		int tabSize, boolean nextFlag)
+		throws AmqpTypeMappingException
+	{
+		StringBuffer sb = new StringBuffer();
+		Iterator<String> dItr = field.domainMap.keySet().iterator();
+		int domainCntr = 0;
+		while (dItr.hasNext())
+		{
+			String domainName = dItr.next();
+			AmqpVersionSet versionSet = field.domainMap.get(domainName);
+			sb.append(Utils.createSpaces(indentSize) + field.name + "_" +
+				(domainCntr++) + (nextFlag ? "," : "") + " // AMQP version(s): " +
+				versionSet + cr);
+		}
+		return sb.toString();		
+	}
+	
+	
 	protected String generateMbBodyInit(String codeType, AmqpField field,
 		AmqpVersionSet versionSet, int indentSize, int tabSize, boolean nextFlag)
 	{
-		return Utils.createSpaces(indentSize) + "body." + field.name + " = " + field.name +
+		return Utils.createSpaces(indentSize) + "this." + field.name + " = " + field.name +
 			";" + cr;
 	}
 	
@@ -960,7 +1011,7 @@ public class JavaGenerator extends Generator
 		while (dItr.hasNext())
 		{
 			dItr.next();
-			sb.append(Utils.createSpaces(indentSize) + "body." + field.name + "_" + domainCntr +
+			sb.append(Utils.createSpaces(indentSize) + "this." + field.name + "_" + domainCntr +
 					" = " + field.name + "_" + (domainCntr++) +	";" + cr);
 		}
 		return sb.toString();		
@@ -1004,23 +1055,26 @@ public class JavaGenerator extends Generator
 		int ordinal, int indentSize, int tabSize)
 	{
 		String indent = Utils.createSpaces(indentSize);
-		String bitArrayName = "bitArray_" + ordinal;
-		StringBuffer sb = new StringBuffer(indent + "boolean[] " + bitArrayName +
-			" = new boolean[] { ");
-		for (int i=0; i<bitFieldList.size(); i++)
+	
+		StringBuilder sb = new StringBuilder();
+		int i = 0;
+		while(i <bitFieldList.size())
 		{
-			if (i != 0)
+		
+			StringBuilder line = new StringBuilder();
+			
+			for (int j=0; i<bitFieldList.size() && j<8; i++, j++)
 			{
-				if ((i + 3) % 6 == 0)
-					sb.append("," + cr + indent + Utils.createSpaces(tabSize));
-				else
-					sb.append(", ");
+				if (j != 0)
+				{				
+					line.append(", ");
+				}
+				line.append(bitFieldList.get(i));
 			}
-			sb.append(bitFieldList.get(i));
+			
+			sb.append(Utils.createSpaces(indentSize) +
+				typeMap.get("bit").encodeExpression.replaceAll("#", line.toString()) + ";" + cr);
 		}
-		sb.append(" };" + cr);
-		sb.append(Utils.createSpaces(indentSize) +
-				typeMap.get("bit").encodeExpression.replaceAll("#", bitArrayName) + ";" + cr);
 		return sb.toString();
 	}
 
@@ -1038,14 +1092,22 @@ public class JavaGenerator extends Generator
 		int ordinal, int indentSize, int tabSize)
 	{
 		String indent = Utils.createSpaces(indentSize);
-		String bitArrayName = "bitArray_" + ordinal;
-		StringBuffer sb = new StringBuffer();
-		sb.append(indent +
-			typeMap.get("bit").decodeExpression.replaceAll("#", "boolean[] " + bitArrayName) +
-			";" + cr);
-		for (int i=0; i<bitFieldList.size(); i++)
+		
+		StringBuilder sb = new StringBuilder(indent);
+		sb.append("byte packedValue;");
+		sb.append(cr);
+		
+		// RG HERE!
+		
+		int i = 0;
+		while(i < bitFieldList.size())
 		{
-			sb.append(indent + bitFieldList.get(i) + " = " + bitArrayName + "[" + i + "];" + cr);
+			sb.append(indent + "packedValue = EncodingUtils.readByte(buffer);" + cr);
+			
+			for(int j = 0; i < bitFieldList.size() && j < 8; i++, j++)
+			{
+				sb.append(indent + bitFieldList.get(i) + " = ( packedValue & (byte) (1 << " + j + ") ) != 0;" + cr); 
+			}
 		}
 		return sb.toString();
 	}