diff options
author | Fengwei Yin <fengwei.yin@intel.com> | 2014-05-24 05:32:09 +0800 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-05-30 14:13:29 +0100 |
commit | 83e0e425c61c4e03f61114a88f117db1553cd44c (patch) | |
tree | 98c5e19957fb5dc572af416b04a52767a2691b20 /libs/input | |
parent | 63645c69e03cf3862c52cfde6cbd5f5143ccd38a (diff) | |
download | frameworks_native-83e0e425c61c4e03f61114a88f117db1553cd44c.zip frameworks_native-83e0e425c61c4e03f61114a88f117db1553cd44c.tar.gz frameworks_native-83e0e425c61c4e03f61114a88f117db1553cd44c.tar.bz2 |
x86_64: Align uint64_t/int64_t structure member to 8 bytes
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
Diffstat (limited to 'libs/input')
-rw-r--r-- | libs/input/tests/Android.mk | 11 | ||||
-rw-r--r-- | libs/input/tests/StructLayout_test.cpp | 67 |
2 files changed, 78 insertions, 0 deletions
diff --git a/libs/input/tests/Android.mk b/libs/input/tests/Android.mk index c62dff1..9612a65 100644 --- a/libs/input/tests/Android.mk +++ b/libs/input/tests/Android.mk @@ -29,5 +29,16 @@ $(foreach file,$(test_src_files), \ $(eval include $(BUILD_NATIVE_TEST)) \ ) +# NOTE: This is a compile time test, and does not need to be +# run. All assertions are static_asserts and will fail during +# buildtime if something's wrong. +include $(CLEAR_VARS) +LOCAL_SRC_FILES := StructLayout_test.cpp +LOCAL_MODULE := StructLayout_test +LOCAL_CFLAGS := -std=c++11 -O0 +LOCAL_MULTILIB := both +include $(BUILD_STATIC_LIBRARY) + + # Build the manual test programs. include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/libs/input/tests/StructLayout_test.cpp b/libs/input/tests/StructLayout_test.cpp new file mode 100644 index 0000000..83bc6ae --- /dev/null +++ b/libs/input/tests/StructLayout_test.cpp @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <input/InputTransport.h> +#include <input/Input.h> + +namespace android { + +#define CHECK_OFFSET(type, member, expected_offset) \ + static_assert((offsetof(type, member) == expected_offset), "") + +struct Foo { + uint32_t dummy; + PointerCoords coords; +}; + +void TestPointerCoordsAlignment() { + CHECK_OFFSET(Foo, coords, 8); +} + +void TestInputMessageAlignment() { + CHECK_OFFSET(InputMessage, body, 8); + + CHECK_OFFSET(InputMessage::Body::Key, seq, 0); + CHECK_OFFSET(InputMessage::Body::Key, eventTime, 8); + CHECK_OFFSET(InputMessage::Body::Key, deviceId, 16); + CHECK_OFFSET(InputMessage::Body::Key, source, 20); + CHECK_OFFSET(InputMessage::Body::Key, action, 24); + CHECK_OFFSET(InputMessage::Body::Key, flags, 28); + CHECK_OFFSET(InputMessage::Body::Key, keyCode, 32); + CHECK_OFFSET(InputMessage::Body::Key, scanCode, 36); + CHECK_OFFSET(InputMessage::Body::Key, metaState, 40); + CHECK_OFFSET(InputMessage::Body::Key, repeatCount, 44); + CHECK_OFFSET(InputMessage::Body::Key, downTime, 48); + + CHECK_OFFSET(InputMessage::Body::Motion, seq, 0); + CHECK_OFFSET(InputMessage::Body::Motion, eventTime, 8); + CHECK_OFFSET(InputMessage::Body::Motion, deviceId, 16); + CHECK_OFFSET(InputMessage::Body::Motion, source, 20); + CHECK_OFFSET(InputMessage::Body::Motion, action, 24); + CHECK_OFFSET(InputMessage::Body::Motion, flags, 28); + CHECK_OFFSET(InputMessage::Body::Motion, metaState, 32); + CHECK_OFFSET(InputMessage::Body::Motion, buttonState, 36); + CHECK_OFFSET(InputMessage::Body::Motion, edgeFlags, 40); + CHECK_OFFSET(InputMessage::Body::Motion, downTime, 48); + CHECK_OFFSET(InputMessage::Body::Motion, xOffset, 56); + CHECK_OFFSET(InputMessage::Body::Motion, yOffset, 60); + CHECK_OFFSET(InputMessage::Body::Motion, xPrecision, 64); + CHECK_OFFSET(InputMessage::Body::Motion, yPrecision, 68); + CHECK_OFFSET(InputMessage::Body::Motion, pointerCount, 72); + CHECK_OFFSET(InputMessage::Body::Motion, pointers, 80); +} + +} // namespace android |