commit b35aa248b85c2a22ce485ab2d322983c793dcc81
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 14 02:10:32 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 14 02:10:33 2017 +0000
tree d932e521a5aba88e5017b3d4f6bd6aa3e47dbfb1
parent 710eaf0463f4e02c8ff15381cba06e6f53df2d9b
parent 45eb91d73a91523e7e0e706dac55941816f07e9d

Merge "Force alignment for GrantorDescriptor struct."

base/include/hidl/MQDescriptor.h

diff --git a/base/include/hidl/MQDescriptor.h b/base/include/hidl/MQDescriptor.h
index ec063f4..869917c 100644
--- a/base/include/hidl/MQDescriptor.h
+++ b/base/include/hidl/MQDescriptor.h
@@ -29,12 +29,19 @@
 typedef uint64_t RingBufferPosition;
 
 struct GrantorDescriptor {
-    uint32_t flags;
-    uint32_t fdIndex;
-    uint32_t offset;
-    size_t extent;
+    uint32_t flags __attribute__ ((aligned(4)));
+    uint32_t fdIndex __attribute__ ((aligned(4)));
+    uint32_t offset __attribute__ ((aligned(4)));
+    uint64_t extent __attribute__ ((aligned(8)));
 };
 
+static_assert(offsetof(GrantorDescriptor, flags) == 0, "wrong offset");
+static_assert(offsetof(GrantorDescriptor, fdIndex) == 4, "wrong offset");
+static_assert(offsetof(GrantorDescriptor, offset) == 8, "wrong offset");
+static_assert(offsetof(GrantorDescriptor, extent) == 16, "wrong offset");
+static_assert(sizeof(GrantorDescriptor) == 24, "wrong size");
+static_assert(__alignof(GrantorDescriptor) == 8, "wrong alignment");
+
 enum MQFlavor : uint32_t {
   /*
    * kSynchronizedReadWrite represents the wait-free synchronized flavor of the