Merge pull request iovisor#1484 from iovisor/yhs_dev

add padding to the end of structure
heatseekr · Dec 12, 2017 · e5db52b · e5db52b
2 parents b384b76 + b32b4a5
commit e5db52b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/cc/json_map_decl_visitor.cc b/src/cc/json_map_decl_visitor.cc
@@ -145,6 +145,13 @@ bool BMapDeclVisitor::VisitRecordDecl(RecordDecl *D) {
  Offset = FieldOffset + FieldSize;
  genJSONForField(F);
  }
+
+ /* Additional Padding after the last field so that the Record Size matches */
+ CharUnits RecordSize = Layout.getSize();
+ if (RecordSize > Offset) {
+ result_ += "[\"__pad_end\",\"char\",["
+ + to_string((RecordSize - Offset).getQuantity()) + "]], ";
+ }
  }
 
  if (!D->getDefinition()->field_empty())

diff --git a/tests/python/test_clang.py b/tests/python/test_clang.py
@@ -685,6 +685,7 @@ def test_padding_types(self):
  };
  u8 f1_3; /* offset 48 */
  unsigned __int128 f1_4; /* offset 64 */
+ char f1_5; /* offset 80 */
 };
 struct value_t {
  u8 src[4] __attribute__ ((aligned (8))); /* offset 0 */
@@ -694,8 +695,8 @@ def test_padding_types(self):
 """
  b = BPF(text=text)
  table = b['table1']
- self.assertEqual(ct.sizeof(table.Key), 80)
- self.assertEqual(ct.sizeof(table.Leaf), 12)
+ self.assertEqual(ct.sizeof(table.Key), 96)
+ self.assertEqual(ct.sizeof(table.Leaf), 16)
 
 
 if __name__ == "__main__":