diff options
author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 17:52:20 +0000 |
---|---|---|
committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-23 17:52:20 +0000 |
commit | cd924d6e5efdf80f66283ac66987f2b339c381cf (patch) | |
tree | 89d2ccd8588e12669b93eb98117e8d76a766fbf2 /base/memory/singleton_unittest.cc | |
parent | 2e8bb832c7b3867b3a10b81621830add0dd5bfb5 (diff) | |
download | chromium_src-cd924d6e5efdf80f66283ac66987f2b339c381cf.zip chromium_src-cd924d6e5efdf80f66283ac66987f2b339c381cf.tar.gz chromium_src-cd924d6e5efdf80f66283ac66987f2b339c381cf.tar.bz2 |
Add ALIGNAS and ALIGNOF macros to ensure proper alignment of StaticMemorySingletonTraits
BUG=95006
Review URL: https://chromiumcodereview.appspot.com/9186057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/memory/singleton_unittest.cc')
-rw-r--r-- | base/memory/singleton_unittest.cc | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/base/memory/singleton_unittest.cc b/base/memory/singleton_unittest.cc index 068148f..33928a7 100644 --- a/base/memory/singleton_unittest.cc +++ b/base/memory/singleton_unittest.cc @@ -110,6 +110,19 @@ struct CallbackSingletonWithStaticTrait::Trait } }; +template <class Type> +class AlignedTestSingleton { + public: + AlignedTestSingleton() {} + ~AlignedTestSingleton() {} + static AlignedTestSingleton* GetInstance() { + return Singleton<AlignedTestSingleton, + StaticMemorySingletonTraits<AlignedTestSingleton> >::get(); + } + + Type type_; +}; + void SingletonNoLeak(CallbackFunc CallOnQuit) { CallbackSingletonWithNoLeakTrait::GetInstance()->callback_ = CallOnQuit; @@ -250,3 +263,27 @@ TEST_F(SingletonTest, Basic) { // The leaky singleton shouldn't leak since SingletonLeak has not been called. VerifiesCallbacksNotCalled(); } + +#define EXPECT_ALIGNED(ptr, align) \ + EXPECT_EQ(0u, reinterpret_cast<uintptr_t>(ptr) & (align - 1)) + +TEST_F(SingletonTest, Alignment) { + using base::AlignedMemory; + + // Create some static singletons with increasing sizes and alignment + // requirements. By ordering this way, the linker will need to do some work to + // ensure proper alignment of the static data. + AlignedTestSingleton<int32>* align4 = + AlignedTestSingleton<int32>::GetInstance(); + AlignedTestSingleton<AlignedMemory<32, 32> >* align32 = + AlignedTestSingleton<AlignedMemory<32, 32> >::GetInstance(); + AlignedTestSingleton<AlignedMemory<128, 128> >* align128 = + AlignedTestSingleton<AlignedMemory<128, 128> >::GetInstance(); + AlignedTestSingleton<AlignedMemory<4096, 4096> >* align4096 = + AlignedTestSingleton<AlignedMemory<4096, 4096> >::GetInstance(); + + EXPECT_ALIGNED(align4, 4); + EXPECT_ALIGNED(align32, 32); + EXPECT_ALIGNED(align128, 128); + EXPECT_ALIGNED(align4096, 4096); +} |