haraldwolff
/
aasdk
mirror of https://github.com/opencardev/aasdk
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from f1xpl/feature/performance_improvements 

Feature/performance improvements
pull/1/head
Michal Szwaj 2018-03-28 17:18:57 +02:00 committed by GitHub
parent 3c8b87fcf0 75832bb652
commit 37c6c2ea10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/f1x/aasdk/IO/IOContextWrapper.hpp
View File

@ -28,11 +28,9 @@ namespace aasdk
namespace io
{
class IOContextWrapper: boost::noncopyable
class IOContextWrapper
{
public:
typedef std::shared_ptr<IOContextWrapper> Pointer;
IOContextWrapper();
explicit IOContextWrapper(boost::asio::io_service& ioService);
explicit IOContextWrapper(boost::asio::io_service::strand& strand);

56
include/f1x/aasdk/IO/Promise.hpp
View File

@ -51,13 +51,13 @@ public:
}
Promise(boost::asio::io_service& ioService)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(ioService))
: ioContextWrapper_(ioService)
{
}
Promise(boost::asio::io_service::strand& strand)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(strand))
: ioContextWrapper_(strand)
{
}
@ -76,12 +76,11 @@ public:
if(resolveHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([argument = std::move(argument), resolveHandler = std::move(resolveHandler_)]() mutable {
ioContextWrapper_.post([argument = std::move(argument), resolveHandler = std::move(resolveHandler_)]() mutable {
(*resolveHandler)(std::move(argument));
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
rejectHandler_.reset();
}
@ -92,12 +91,11 @@ public:
if(rejectHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([error = std::move(error), rejectHandler = std::move(rejectHandler_)]() mutable {
ioContextWrapper_.post([error = std::move(error), rejectHandler = std::move(rejectHandler_)]() mutable {
(*rejectHandler)(std::move(error));
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
resolveHandler_.reset();
}
@ -105,12 +103,12 @@ public:
private:
bool isPending() const
{
return ioContextWrapper_ != nullptr && ioContextWrapper_->isActive();
return ioContextWrapper_.isActive();
}
std::shared_ptr<ResolveHandler> resolveHandler_;
std::shared_ptr<RejectHandler> rejectHandler_;
IOContextWrapper::Pointer ioContextWrapper_;
IOContextWrapper ioContextWrapper_;
std::mutex mutex_;
};
@ -134,13 +132,13 @@ public:
}
Promise(boost::asio::io_service& ioService)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(ioService))
: ioContextWrapper_(ioService)
{
}
Promise(boost::asio::io_service::strand& strand)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(strand))
: ioContextWrapper_(strand)
{
}
@ -159,12 +157,11 @@ public:
if(resolveHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([resolveHandler = std::move(resolveHandler_)]() mutable {
ioContextWrapper_.post([resolveHandler = std::move(resolveHandler_)]() mutable {
(*resolveHandler)();
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
rejectHandler_.reset();
}
@ -175,12 +172,11 @@ public:
if(rejectHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([error = std::move(error), rejectHandler = std::move(rejectHandler_)]() mutable {
ioContextWrapper_.post([error = std::move(error), rejectHandler = std::move(rejectHandler_)]() mutable {
(*rejectHandler)(std::move(error));
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
resolveHandler_.reset();
}
@ -188,12 +184,12 @@ public:
private:
bool isPending() const
{
return ioContextWrapper_ != nullptr && ioContextWrapper_->isActive();
return ioContextWrapper_.isActive();
}
std::shared_ptr<ResolveHandler> resolveHandler_;
std::shared_ptr<RejectHandler> rejectHandler_;
IOContextWrapper::Pointer ioContextWrapper_;
IOContextWrapper ioContextWrapper_;
std::mutex mutex_;
};
@ -216,13 +212,13 @@ public:
}
Promise(boost::asio::io_service& ioService)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(ioService))
: ioContextWrapper_(ioService)
{
}
Promise(boost::asio::io_service::strand& strand)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(strand))
: ioContextWrapper_(strand)
{
}
@ -241,12 +237,11 @@ public:
if(resolveHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([resolveHandler = std::move(resolveHandler_)]() mutable {
ioContextWrapper_.post([resolveHandler = std::move(resolveHandler_)]() mutable {
(*resolveHandler)();
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
rejectHandler_.reset();
}
@ -257,12 +252,11 @@ public:
if(rejectHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([rejectHandler = std::move(rejectHandler_)]() mutable {
ioContextWrapper_.post([rejectHandler = std::move(rejectHandler_)]() mutable {
(*rejectHandler)();
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
resolveHandler_.reset();
}
@ -270,12 +264,12 @@ public:
private:
bool isPending() const
{
return ioContextWrapper_ != nullptr && ioContextWrapper_->isActive();
return ioContextWrapper_.isActive();
}
std::shared_ptr<ResolveHandler> resolveHandler_;
std::shared_ptr<RejectHandler> rejectHandler_;
IOContextWrapper::Pointer ioContextWrapper_;
IOContextWrapper ioContextWrapper_;
std::mutex mutex_;
};
@ -299,13 +293,13 @@ public:
}
Promise(boost::asio::io_service& ioService)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(ioService))
: ioContextWrapper_(ioService)
{
}
Promise(boost::asio::io_service::strand& strand)
: ioContextWrapper_(std::make_shared<IOContextWrapper>(strand))
: ioContextWrapper_(strand)
{
}
@ -324,12 +318,11 @@ public:
if(resolveHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([argument = std::move(argument), resolveHandler = std::move(resolveHandler_)]() mutable {
ioContextWrapper_.post([argument = std::move(argument), resolveHandler = std::move(resolveHandler_)]() mutable {
(*resolveHandler)(std::move(argument));
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
rejectHandler_.reset();
}
@ -340,12 +333,11 @@ public:
if(rejectHandler_ != nullptr && this->isPending())
{
ioContextWrapper_->post([rejectHandler = std::move(rejectHandler_)]() mutable {
ioContextWrapper_.post([rejectHandler = std::move(rejectHandler_)]() mutable {
(*rejectHandler)();
});
}
ioContextWrapper_->reset();
ioContextWrapper_.reset();
resolveHandler_.reset();
}
@ -353,12 +345,12 @@ public:
private:
bool isPending() const
{
return ioContextWrapper_ != nullptr && ioContextWrapper_->isActive();
return ioContextWrapper_.isActive();
}
std::shared_ptr<ResolveHandler> resolveHandler_;
std::shared_ptr<RejectHandler> rejectHandler_;
IOContextWrapper::Pointer ioContextWrapper_;
IOContextWrapper ioContextWrapper_;
std::mutex mutex_;
};

11
src/Transport/DataSink.cpp
View File

@ -37,7 +37,8 @@ common::DataBuffer DataSink::fill()
const auto offset = data_.size();
data_.resize(data_.size() + cChunkSize);
return common::DataBuffer(&data_[offset], cChunkSize);
auto ptr = data_.is_linearized() ? &data_[offset] : data_.linearize() + offset;
return common::DataBuffer(ptr, cChunkSize);
}
void DataSink::commit(common::Data::size_type size)
@ -47,7 +48,7 @@ void DataSink::commit(common::Data::size_type size)
throw error::Error(error::ErrorCode::DATA_SINK_COMMIT_OVERFLOW);
}
data_.resize(data_.size() - (cChunkSize - size));
data_.erase_end((cChunkSize - size));
}
common::Data::size_type DataSink::getAvailableSize()
@ -62,9 +63,9 @@ common::Data DataSink::consume(common::Data::size_type size)
throw error::Error(error::ErrorCode::DATA_SINK_CONSUME_UNDERFLOW);
}
common::Data data;
common::copy(data, common::DataConstBuffer(&data_[0], size));
data_.erase(data_.begin(), data_.begin() + size);
common::Data data(size, 0);
std::copy(data_.begin(), data_.begin() + size, data.begin());
data_.erase_begin(size);
return data;
}