-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.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://floralicense.org/license/
-//
-// 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.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * 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.
+ *
+ */
// CLASS HEADER
#include <dali/internal/common/message-buffer.h>
const unsigned int MESSAGE_SIZE_PLUS_END_FIELD = MESSAGE_SIZE_FIELD + MESSAGE_END_FIELD;
-const unsigned int MAX_DIVISION_BY_WORD_REMAINDER = sizeof(unsigned int) - 1u; // For word alignment on ARM
+const unsigned int MAX_DIVISION_BY_WORD_REMAINDER = sizeof(Dali::Internal::MessageBuffer::WordType) - 1u; // For word alignment on ARM
+const unsigned int WORD_SIZE = sizeof(Dali::Internal::MessageBuffer::WordType);
} // unnamed namespace
{
MessageBuffer::MessageBuffer( std::size_t initialCapacity )
-: mInitialCapacity( initialCapacity / sizeof(unsigned int) ),
+: mInitialCapacity( initialCapacity / WORD_SIZE ),
mData( NULL ),
mNextSlot( NULL ),
mCapacity( 0 ),
{
DALI_ASSERT_DEBUG( 0 != size );
- std::size_t requestedSize = (size + MAX_DIVISION_BY_WORD_REMAINDER) / sizeof(unsigned int);
+ // Number of aligned words required to handle a message of size in bytes
+ std::size_t requestedSize = (size + MAX_DIVISION_BY_WORD_REMAINDER) / WORD_SIZE;
std::size_t requiredSize = requestedSize + MESSAGE_SIZE_PLUS_END_FIELD;
// Keep doubling the additional capacity until we have enough
}
// Now reserve the slot
- unsigned int* slot = mNextSlot;
+ WordType* slot = mNextSlot;
*slot++ = requestedSize; // Object size marker is stored in first word
// End marker
*mNextSlot = 0;
- return slot;
+ return reinterpret_cast<unsigned int*>(slot);
}
std::size_t MessageBuffer::GetCapacity() const
{
- return mCapacity * sizeof(unsigned int);
+ return mCapacity * WORD_SIZE;
}
MessageBuffer::Iterator MessageBuffer::Begin() const
if ( mData )
{
// Often this avoids the need to copy memory
- mData = reinterpret_cast<unsigned int*>( realloc( mData, newCapacity * sizeof(unsigned int) ) );
+
+ WordType* oldData = mData;
+ mData = reinterpret_cast<WordType*>( realloc( mData, newCapacity * WORD_SIZE ) );
+
+ // if realloc fails the old data is still valid
+ if( !mData )
+ {
+ // TODO: Process message queue to free up some data?
+ free(oldData);
+ DALI_ASSERT_DEBUG( false && "Realloc failed we're out of memory!" );
+ }
}
else
{
- mData = reinterpret_cast<unsigned int*>( malloc( newCapacity * sizeof(unsigned int) ) );
+ mData = reinterpret_cast<WordType*>( malloc( newCapacity * WORD_SIZE ) );
}
DALI_ASSERT_ALWAYS( NULL != mData );
mNextSlot = mData + mSize;
}
-MessageBuffer::Iterator::Iterator(unsigned int* current)
+MessageBuffer::Iterator::Iterator(WordType* current)
: mCurrent(current),
mMessageSize(0)
{