commit 758c9cc7b7d89d2b516cfdcc71dcdd1b800c8189
author Andreas Wundsam <andreas.wundsam@bigswitch.com> Thu Aug 01 22:16:06 2013 -0700
committer Andreas Wundsam <andreas.wundsam@bigswitch.com> Thu Aug 01 22:16:06 2013 -0700
tree 0868c0befc1d1aa4eff6b62a128fd48005c7d5e3
parent fef7d5f0cab6432f956ded099c0d084238710055

java_gen: align messages (for OFMatchv3)

java_gen/templates/of_class.java

diff --git a/java_gen/templates/of_class.java b/java_gen/templates/of_class.java
index fb1d027..05018d3 100644
--- a/java_gen/templates/of_class.java
+++ b/java_gen/templates/of_class.java
@@ -153,6 +153,11 @@
     // fixme: todo ${prop.name}
 //:: #endif
 //:: #endfor
+            //:: if msg.align:
+            // align message to ${msg.align} bytes
+            bb.skipBytes(((length + ${msg.align-1})/${msg.align} * ${msg.align} ) - length );
+            //:: #endif
+
             return new ${impl_class}(
                     ${",\n                      ".join(
                          [ prop.name for prop in msg.data_members])}
@@ -205,13 +210,14 @@
 //:: #endif
 //:: #endfor
 
-//:: if msg.is_fixed_length:
-            return LENGTH;
-//:: else:
+//:: if not msg.is_fixed_length:
             // update length field
             int length = bb.writerIndex() - startIndex;
             bb.setShort(startIndex + 2, length);
-            return length;
+            //:: if msg.align:
+            // align message to ${msg.align} bytes
+            bb.writeZero( ((length + ${msg.align-1})/${msg.align} * ${msg.align}) - length);
+            //:: #endif
 //:: #end
 
         }