commit 6d4acb12519597610322097f86850d9e404d251a
author Hridya Valsaraju <hridya@google.com> Fri Mar 03 14:24:43 2017 -0800
committer Martijn Coenen <maco@google.com> Thu Mar 09 08:27:19 2017 +0000
tree 610ddcb5b199e5d7fa56ef96b857881a488b3542
parent 33e9cdbe542c6e2c35d556bdb550535cb29fc740

Change size_t member of hidl_memory type to uint64_t

Also static_assert offsets to private members
in hidl_* types used in parcelling/unparcelling code.

Bug: 34986428 33846034
Test: hidl_test passes

Change-Id: Ib2ee81c45ee797f4933ed142160aeed250675819

base/include/hidl/HidlSupport.h

diff --git a/base/include/hidl/HidlSupport.h b/base/include/hidl/HidlSupport.h
index 7737011..14afce3 100644
--- a/base/include/hidl/HidlSupport.h
+++ b/base/include/hidl/HidlSupport.h
@@ -270,7 +270,7 @@
         return mName;
     }
 
-    size_t size() const {
+    uint64_t size() const {
         return mSize;
     }
 
@@ -280,9 +280,9 @@
     static const size_t kOffsetOfName;
 
 private:
-    hidl_handle mHandle;
-    size_t mSize;
-    hidl_string mName;
+    hidl_handle mHandle __attribute__ ((aligned(8)));
+    uint64_t mSize __attribute__ ((aligned(8)));
+    hidl_string mName __attribute__ ((aligned(8)));
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -293,6 +293,7 @@
         : mBuffer(NULL),
           mSize(0),
           mOwnsBuffer(true) {
+        static_assert(hidl_vec<T>::kOffsetOfBuffer == 0, "wrong offset");
     }
 
     hidl_vec(const hidl_vec<T> &other) : hidl_vec() {