java_gen: correctly handle of_action 64-bit alignment
of_action is different from oxm in that it is 64 bit aligned,
but the alignment is contained in the length field.
Added optional parameter "length_includes_align" to the input files
to handle this situation.
diff --git a/java_gen/java_model.py b/java_gen/java_model.py
index f2191c0..9f2bdc9 100644
--- a/java_gen/java_model.py
+++ b/java_gen/java_model.py
@@ -773,6 +773,10 @@
return int(self.ir_class.params['align']) if 'align' in self.ir_class.params else 0
@property
+ def length_includes_align(self):
+ return self.ir_class.params['length_includes_align'] == "True" if 'length_includes_align' in self.ir_class.params else False
+
+ @property
@memoize
def superclass(self):
return find(lambda c: c.version == self.version and c.c_name == self.ir_class.superclass, model.all_classes)
diff --git a/java_gen/templates/of_class.java b/java_gen/templates/of_class.java
index ef927fd..46dc1ea 100644
--- a/java_gen/templates/of_class.java
+++ b/java_gen/templates/of_class.java
@@ -327,10 +327,13 @@
//:: if not msg.is_fixed_length:
// update length field
int length = bb.writerIndex() - startIndex;
- bb.setShort(lengthIndex, length);
+ //:: if msg.align:
+ int alignedLength = ((length + ${msg.align-1})/${msg.align} * ${msg.align});
+ //:: #endif
+ bb.setShort(lengthIndex, ${"alignedLength" if msg.length_includes_align else "length"});
//:: if msg.align:
// align message to ${msg.align} bytes
- bb.writeZero( ((length + ${msg.align-1})/${msg.align} * ${msg.align}) - length);
+ bb.writeZero(alignedLength - length);
//:: #endif
//:: #end
diff --git a/loxi_front_end/parser.py b/loxi_front_end/parser.py
index f2cf4b0..4a465f7 100644
--- a/loxi_front_end/parser.py
+++ b/loxi_front_end/parser.py
@@ -56,7 +56,7 @@
type_member = P.Group(tag('type') + any_type + identifier + s('==') + integer)
data_member = P.Group(tag('data') + any_type - identifier)
-struct_param_name = kw("align")
+struct_param_name = kw("align") | kw("length_includes_align")
struct_param = P.Group(struct_param_name - s('=') - word)
struct_param_list = P.Forward()
struct_param_list << struct_param + P.Optional(s(',') - P.Optional(struct_param_list))
diff --git a/openflow_input/standard-1.2 b/openflow_input/standard-1.2
index a804643..cf146e0 100644
--- a/openflow_input/standard-1.2
+++ b/openflow_input/standard-1.2
@@ -603,7 +603,7 @@
pad(4);
};
-struct of_match_v3(align=8) {
+struct of_match_v3(align=8, length_includes_align=False) {
uint16_t type == 1;
uint16_t length;
list(of_oxm_t) oxm_list;
@@ -694,13 +694,13 @@
pad(4);
};
-struct of_action_set_field : of_action {
+struct of_action_set_field(align=8, length_includes_align=True) : of_action {
uint16_t type == 25;
uint16_t len;
of_oxm_t field;
};
-struct of_action_experimenter : of_action {
+struct of_action_experimenter(align=8, length_includes_align=True) : of_action {
uint16_t type == 65535;
uint16_t len;
uint32_t experimenter == ?;
diff --git a/openflow_input/standard-1.3 b/openflow_input/standard-1.3
index 29e6c76..0d4a8c5 100644
--- a/openflow_input/standard-1.3
+++ b/openflow_input/standard-1.3
@@ -730,7 +730,7 @@
};
// FIXME Does this need to be v4?
-struct of_match_v3(align=8) {
+struct of_match_v3(align=8, length_includes_align=False) {
uint16_t type == 1;
uint16_t length;
list(of_oxm_t) oxm_list;
@@ -829,13 +829,13 @@
pad(4);
};
-struct of_action_set_field : of_action {
+struct of_action_set_field(align=8, length_includes_align=True) : of_action {
uint16_t type == 25;
uint16_t len;
of_oxm_t field;
};
-struct of_action_experimenter : of_action {
+struct of_action_experimenter(align=8, length_includes_align=True): of_action {
uint16_t type == 65535;
uint16_t len;
uint32_t experimenter == ?;