Skip to content

Optimize: optimize memory copy in MemoryBlock by move constructor and move assignment. #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 15, 2019
Merged

Optimize: optimize memory copy in MemoryBlock by move constructor and move assignment. #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8edcae4
Optimize: optimize memory copy of MemoryBlock by move constructor and…
ifplusor Jan 18, 2019
9416767
format files.
ifplusor Jan 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
364 changes: 190 additions & 174 deletions src/common/dataBlock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,177 +13,193 @@
* 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 "dataBlock.h"
#include <algorithm>

namespace rocketmq {
MemoryBlock::MemoryBlock() : size(0), data(NULL) {}

MemoryBlock::MemoryBlock(const int initialSize, const bool initialiseToZero)
: size(0), data(NULL) {
if (initialSize > 0) {
size = initialSize;
data = static_cast<char*>(initialiseToZero
? std::calloc(initialSize, sizeof(char))
: std::malloc(initialSize * sizeof(char)));
}
}

MemoryBlock::MemoryBlock(const void* const dataToInitialiseFrom,
const size_t sizeInBytes)
: size(sizeInBytes), data(NULL) {
if (size > 0) {
data = static_cast<char*>(std::malloc(size * sizeof(char)));

if (dataToInitialiseFrom != NULL) memcpy(data, dataToInitialiseFrom, size);
}
}

MemoryBlock::MemoryBlock(const MemoryBlock& other)
: size(other.size), data(NULL) {
if (size > 0) {
data = static_cast<char*>(std::malloc(size * sizeof(char)));
memcpy(data, other.data, size);
}
}

MemoryBlock::~MemoryBlock() { std::free(data); }

MemoryBlock& MemoryBlock::operator=(const MemoryBlock& other) {
if (this != &other) {
setSize(other.size, false);
memcpy(data, other.data, size);
}

return *this;
}

//==============================================================================
bool MemoryBlock::operator==(const MemoryBlock& other) const {
return matches(other.data, other.size);
}

bool MemoryBlock::operator!=(const MemoryBlock& other) const {
return !operator==(other);
}

bool MemoryBlock::matches(const void* dataToCompare, int dataSize) const {
return size == dataSize && memcmp(data, dataToCompare, size) == 0;
}

//==============================================================================
// this will resize the block to this size
void MemoryBlock::setSize(const int newSize, const bool initialiseToZero) {
if (size != newSize) {
if (newSize <= 0) {
reset();
} else {
if (data != NULL) {
data = static_cast<char*>(
data == NULL ? std::malloc(newSize * sizeof(char))
: std::realloc(data, newSize * sizeof(char)));

if (initialiseToZero && (newSize > size))
memset(data + size, 0, newSize - size);
} else {
std::free(data);
data = static_cast<char*>(initialiseToZero
? std::calloc(newSize, sizeof(char))
: std::malloc(newSize * sizeof(char)));
}

size = newSize;
}
}
}

void MemoryBlock::reset() {
std::free(data);
data = NULL;
size = 0;
}

void MemoryBlock::ensureSize(const int minimumSize,
const bool initialiseToZero) {
if (size < minimumSize) setSize(minimumSize, initialiseToZero);
}

//==============================================================================
void MemoryBlock::fillWith(const int value) { memset(data, (int)value, size); }

void MemoryBlock::append(const void* const srcData, const int numBytes) {
if (numBytes > 0) {
const int oldSize = size;
setSize(size + numBytes);
memcpy(data + oldSize, srcData, numBytes);
}
}

void MemoryBlock::replaceWith(const void* const srcData, const int numBytes) {
if (numBytes > 0) {
setSize(numBytes);
memcpy(data, srcData, numBytes);
}
}

void MemoryBlock::insert(const void* const srcData, const int numBytes,
int insertPosition) {
if (numBytes > 0) {
insertPosition = std::min(insertPosition, size);
const int trailingDataSize = size - insertPosition;
setSize(size + numBytes, false);

if (trailingDataSize > 0)
memmove(data + insertPosition + numBytes, data + insertPosition,
trailingDataSize);

memcpy(data + insertPosition, srcData, numBytes);
}
}

void MemoryBlock::removeSection(const int startByte,
const int numBytesToRemove) {
if (startByte + numBytesToRemove >= size) {
setSize(startByte);
} else if (numBytesToRemove > 0) {
memmove(data + startByte, data + startByte + numBytesToRemove,
size - (startByte + numBytesToRemove));

setSize(size - numBytesToRemove);
}
}

void MemoryBlock::copyFrom(const void* const src, int offset, int num) {
const char* d = static_cast<const char*>(src);

if (offset < 0) {
d -= offset;
num += (size_t)-offset;
offset = 0;
}

if ((size_t)offset + num > (unsigned int)size) num = size - (size_t)offset;

if (num > 0) memcpy(data + offset, d, num);
}

void MemoryBlock::copyTo(void* const dst, int offset, int num) const {
char* d = static_cast<char*>(dst);

if (offset < 0) {
memset(d, 0, (size_t)-offset);
d -= offset;
num -= (size_t)-offset;
offset = 0;
}

if ((size_t)offset + num > (unsigned int)size) {
const int newNum = (size_t)size - (size_t)offset;
memset(d + newNum, 0, num - newNum);
num = newNum;
}

if (num > 0) memcpy(d, data + offset, num);
}
}
*/
#include "dataBlock.h"
#include <algorithm>

namespace rocketmq {

MemoryBlock::MemoryBlock() : size(0), data(NULL) {}

MemoryBlock::MemoryBlock(const int initialSize, const bool initialiseToZero)
: size(0), data(NULL) {
if (initialSize > 0) {
size = initialSize;
data = static_cast<char *>(initialiseToZero
? std::calloc(initialSize, sizeof(char))
: std::malloc(initialSize * sizeof(char)));
}
}

MemoryBlock::MemoryBlock(const void *const dataToInitialiseFrom, const size_t sizeInBytes)
: size(sizeInBytes), data(NULL) {
if (size > 0) {
data = static_cast<char *>(std::malloc(size * sizeof(char)));

if (dataToInitialiseFrom != NULL) memcpy(data, dataToInitialiseFrom, size);
}
}

MemoryBlock::MemoryBlock(const MemoryBlock &other) : size(other.size), data(NULL) {
if (size > 0) {
data = static_cast<char *>(std::malloc(size * sizeof(char)));
memcpy(data, other.data, size);
}
}

MemoryBlock::MemoryBlock(MemoryBlock &&other) : size(other.size), data(other.data) {
other.size = 0;
other.data = NULL;
}

MemoryBlock::~MemoryBlock() { std::free(data); }

MemoryBlock &MemoryBlock::operator=(const MemoryBlock &other) {
if (this != &other) {
setSize(other.size, false);
memcpy(data, other.data, size);
}

return *this;
}

MemoryBlock &MemoryBlock::operator=(MemoryBlock &&other) {
if (this != &other) {
std::free(data);

size = other.size;
data = other.data;

other.size = 0;
other.data = NULL;
}

return *this;
}

//==============================================================================
bool MemoryBlock::operator==(const MemoryBlock &other) const {
return matches(other.data, other.size);
}

bool MemoryBlock::operator!=(const MemoryBlock &other) const {
return !operator==(other);
}

bool MemoryBlock::matches(const void *dataToCompare, int dataSize) const {
return size == dataSize && memcmp(data, dataToCompare, size) == 0;
}

//==============================================================================
// this will resize the block to this size
void MemoryBlock::setSize(const int newSize, const bool initialiseToZero) {
if (size != newSize) {
if (newSize <= 0) {
reset();
} else {
if (data != NULL) {
data = static_cast<char *>(
data == NULL ? std::malloc(newSize * sizeof(char))
: std::realloc(data, newSize * sizeof(char)));

if (initialiseToZero && (newSize > size))
memset(data + size, 0, newSize - size);
} else {
std::free(data);
data = static_cast<char *>(initialiseToZero
? std::calloc(newSize, sizeof(char))
: std::malloc(newSize * sizeof(char)));
}

size = newSize;
}
}
}

void MemoryBlock::reset() {
std::free(data);
data = NULL;
size = 0;
}

void MemoryBlock::ensureSize(const int minimumSize, const bool initialiseToZero) {
if (size < minimumSize) setSize(minimumSize, initialiseToZero);
}

//==============================================================================
void MemoryBlock::fillWith(const int value) {
memset(data, (int) value, size);
}

void MemoryBlock::append(const void *const srcData, const int numBytes) {
if (numBytes > 0) {
const int oldSize = size;
setSize(size + numBytes);
memcpy(data + oldSize, srcData, numBytes);
}
}

void MemoryBlock::replaceWith(const void *const srcData, const int numBytes) {
if (numBytes > 0) {
setSize(numBytes);
memcpy(data, srcData, numBytes);
}
}

void MemoryBlock::insert(const void *const srcData, const int numBytes, int insertPosition) {
if (numBytes > 0) {
insertPosition = std::min(insertPosition, size);
const int trailingDataSize = size - insertPosition;
setSize(size + numBytes, false);

if (trailingDataSize > 0)
memmove(data + insertPosition + numBytes, data + insertPosition,
trailingDataSize);

memcpy(data + insertPosition, srcData, numBytes);
}
}

void MemoryBlock::removeSection(const int startByte, const int numBytesToRemove) {
if (startByte + numBytesToRemove >= size) {
setSize(startByte);
} else if (numBytesToRemove > 0) {
memmove(data + startByte, data + startByte + numBytesToRemove, size - (startByte + numBytesToRemove));

setSize(size - numBytesToRemove);
}
}

void MemoryBlock::copyFrom(const void *const src, int offset, int num) {
const char *d = static_cast<const char *>(src);

if (offset < 0) {
d -= offset;
num += (size_t) -offset;
offset = 0;
}

if ((size_t) offset + num > (unsigned int) size) num = size - (size_t) offset;

if (num > 0) memcpy(data + offset, d, num);
}

void MemoryBlock::copyTo(void *const dst, int offset, int num) const {
char *d = static_cast<char *>(dst);

if (offset < 0) {
memset(d, 0, (size_t) -offset);
d -= offset;
num -= (size_t) -offset;
offset = 0;
}

if ((size_t) offset + num > (unsigned int) size) {
const int newNum = (size_t) size - (size_t) offset;
memset(d + newNum, 0, num - newNum);
num = newNum;
}

if (num > 0) memcpy(d, data + offset, num);
}
}
Loading