Skip to content

Commit

Permalink
capicxx-someip-runtime 3.1.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@juergengehring
juergengehring committed Jan 25, 2018
1 parent 39841b4 commit a75aa38
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 89 deletions.
3 changes: 3 additions & 0 deletions CHANGES
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Changes
=======
v3.1.12.2
- Always call subscribe with TCP_AND_UDP subscription type
- Support for NUL (U+0000) code point within strings

v3.1.12.1
- Adapt to vSomeIP 2.8.0: Don't call subscription status handler on SubscribeEventGroupNACK for non selective subscriptions
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ message(STATUS "CommonAPI Version: ${CommonAPI_VERSION}")
find_package( Boost 1.54 COMPONENTS system thread log REQUIRED )
include_directories( ${Boost_INCLUDE_DIR} )

find_package (vsomeip 2.7.0 REQUIRED)
find_package (vsomeip 2.9.0 REQUIRED)
message(STATUS "vsomeip version: ${vsomeip_VERSION}")

include_directories (
Expand Down
4 changes: 2 additions & 2 deletions include/CommonAPI/SomeIP/Connection.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ class Connection:

virtual void processMsgQueueEntry(MsgQueueEntry &_msgQueueEntry);
virtual void processAvblQueueEntry(AvblQueueEntry &_avblQueueEntry);
virtual void processErrQueueEntry(ErrQueueEntry &_errQueueEntry);
virtual void processErrQueueEntry(ErrQueueEntry &_errQueueEntry);

template<class Function, class... Arguments>
template<class Function, class... Arguments>
void processFunctionQueueEntry(FunctionQueueEntry<Function, Arguments ...> &_functionQueueEntry);

virtual const ConnectionId_t& getConnectionId();
Expand Down
22 changes: 11 additions & 11 deletions include/CommonAPI/SomeIP/ProxyHelper.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@ template <
template <class...> class Out_, class... OutArgs_>
struct ProxyHelper<In_<InArgs_...>, Out_<OutArgs_...>> {

template <typename Proxy_ = Proxy>
static void callMethod(
Proxy_ &_proxy,
const method_id_t _methodId,
const bool _isReliable,
const bool _isLittleEndian,
const InArgs_ &... _inArgs,
CommonAPI::CallStatus &_callStatus) {
template <typename Proxy_ = Proxy>
static void callMethod(
Proxy_ &_proxy,
const method_id_t _methodId,
const bool _isReliable,
const bool _isLittleEndian,
const InArgs_ &... _inArgs,
CommonAPI::CallStatus &_callStatus) {

Message methodCall = _proxy.createMethodCall(_methodId, _isReliable);
callMethod(_proxy, methodCall, _isLittleEndian, _inArgs..., _callStatus);
}
Message methodCall = _proxy.createMethodCall(_methodId, _isReliable);
callMethod(_proxy, methodCall, _isLittleEndian, _inArgs..., _callStatus);
}

template <typename Proxy_ = Proxy>
static void callMethod(
Expand Down
72 changes: 44 additions & 28 deletions src/CommonAPI/SomeIP/Connection.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,31 @@ void ErrQueueEntry::process(std::shared_ptr<Connection> _connection) {
}

void Connection::receive(const std::shared_ptr<vsomeip::message> &_message) {
commDirectionType itsDirection =
(_message->get_message_type() < vsomeip::message_type_e::MT_NOTIFICATION ?
commDirectionType::STUBRECEIVE : commDirectionType::PROXYRECEIVE);

// avoid blocking the mainloop
bool isSendAndBlockAnswer = false;
{
std::lock_guard<std::recursive_mutex> itsLock(sendReceiveMutex_);
if(_message->get_message_type() != vsomeip::message_type_e::MT_NOTIFICATION &&
sendAndBlockAnswers_.find(_message->get_session()) != sendAndBlockAnswers_.end()) {
isSendAndBlockAnswer = true;
}
}
commDirectionType itsDirection =
(_message->get_message_type() < vsomeip::message_type_e::MT_NOTIFICATION ?
commDirectionType::STUBRECEIVE : commDirectionType::PROXYRECEIVE);

// avoid blocking the mainloop
bool isSendAndBlockAnswer = false;
{
std::lock_guard<std::recursive_mutex> itsLock(sendReceiveMutex_);
if(_message->get_message_type() != vsomeip::message_type_e::MT_NOTIFICATION &&
sendAndBlockAnswers_.find(_message->get_session()) != sendAndBlockAnswers_.end()) {
isSendAndBlockAnswer = true;
}
}

if (auto lockedContext = mainLoopContext_.lock() && !isSendAndBlockAnswer) {
(void)lockedContext;
std::shared_ptr<MsgQueueEntry> msg_queue_entry
= std::make_shared<MsgQueueEntry>(_message, itsDirection);
= std::make_shared<MsgQueueEntry>(_message, itsDirection);
watch_->pushQueue(msg_queue_entry);
} else {
if (itsDirection == commDirectionType::PROXYRECEIVE) {
handleProxyReceive(_message);
} else {
handleStubReceive(_message);
}
if (itsDirection == commDirectionType::PROXYRECEIVE) {
handleProxyReceive(_message);
} else {
handleStubReceive(_message);
}
}
}

Expand Down Expand Up @@ -127,7 +127,11 @@ void Connection::handleProxyReceive(const std::shared_ptr<vsomeip::message> &_me
callStatus = CallStatus::REMOTE_ERROR;
}

itsHandler->onMessageReply(callStatus, Message(_message));
try {
itsHandler->onMessageReply(callStatus, Message(_message));
} catch (const std::exception& e) {
COMMONAPI_ERROR("Message reply failed(", e.what(), ")");
}
return;
}

Expand All @@ -139,7 +143,11 @@ void Connection::handleProxyReceive(const std::shared_ptr<vsomeip::message> &_me
asyncTimeouts_.erase(sessionId);
sendReceiveMutex_.unlock();

itsHandler->onMessageReply(CallStatus::REMOTE_ERROR, Message(_message));
try {
itsHandler->onMessageReply(CallStatus::REMOTE_ERROR, Message(_message));
} catch (const std::exception& e) {
COMMONAPI_ERROR("Message reply failed on timeout(", e.what(), ")");
}
} else {
sendReceiveMutex_.unlock();
}
Expand Down Expand Up @@ -207,8 +215,12 @@ void Connection::handleAvailabilityChange(const service_id_t _service,
watch_->pushQueue(msg_queue_entry);
asyncTimeouts_[it->first] = std::move(it->second);
} else {
std::get<2>(it->second)->onMessageReply(
CallStatus::REMOTE_ERROR, Message(itsResponse));
try {
std::get<2>(it->second)->onMessageReply(
CallStatus::REMOTE_ERROR, Message(itsResponse));
} catch (const std::exception& e) {
COMMONAPI_ERROR("Message reply failed when service became unavailable(", e.what(), ")");
}
}
it = asyncAnswers_.erase(it);
} else {
Expand Down Expand Up @@ -273,7 +285,11 @@ void Connection::cleanup() {
watch_->pushQueue(msg_queue_entry);
asyncTimeouts_[it->first] = std::move(it->second);
} else {
std::get<2>(it->second)->onMessageReply(CallStatus::REMOTE_ERROR, Message(response));
try {
std::get<2>(it->second)->onMessageReply(CallStatus::REMOTE_ERROR, Message(response));
} catch (const std::exception& e) {
COMMONAPI_ERROR("Message reply failed on cleanup(", e.what(), ")");
}
}
it = asyncAnswers_.erase(it);
} else {
Expand Down Expand Up @@ -349,7 +365,7 @@ bool Connection::attachMainLoopContext(std::weak_ptr<MainLoopContext> mainLoopCo

bool Connection::connect(bool) {
if (!application_->init())
return false;
return false;

std::function<void(state_type_e)> connectionHandler = std::bind(&Connection::onConnectionEvent,
shared_from_this(),
Expand Down Expand Up @@ -466,12 +482,12 @@ Message Connection::sendMessageWithReplyAndBlock(
const Message& message,
const CommonAPI::CallInfo *_info) const {

if (!isConnected())
if (!isConnected())
return Message();

std::unique_lock<std::recursive_mutex> lock(sendReceiveMutex_);

std::pair<std::map<session_id_t, Message>::iterator, bool> itsAnswer;
std::pair<std::map<session_id_t, Message>::iterator, bool> itsAnswer;
application_->send(message.message_, true);
if (_info->sender_ != 0) {
COMMONAPI_DEBUG("Message sent: SenderID: ", _info->sender_,
Expand Down Expand Up @@ -601,7 +617,7 @@ void Connection::subscribe(service_id_t serviceId, instance_id_t instanceId,
eventHandler, _tag);

application_->subscribe(serviceId, instanceId, eventGroupId, major,
vsomeip::subscription_type_e::SU_PREFER_RELIABLE, eventId);
vsomeip::subscription_type_e::SU_RELIABLE_AND_UNRELIABLE, eventId);
}

void Connection::addSubscriptionStatusListener(service_id_t serviceId,
Expand Down
66 changes: 33 additions & 33 deletions src/CommonAPI/SomeIP/Factory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,27 +43,27 @@ Factory::~Factory() {
void
Factory::init() {
#ifndef _WIN32
std::lock_guard<std::mutex> itsLock(initializerMutex_);
std::lock_guard<std::mutex> itsLock(initializerMutex_);
#endif
if (!isInitialized_) {
for (auto i : initializers_) i();
initializers_.clear(); // Not needed anymore
isInitialized_ = true;
}
if (!isInitialized_) {
for (auto i : initializers_) i();
initializers_.clear(); // Not needed anymore
isInitialized_ = true;
}
}

void
Factory::registerInterface(InterfaceInitFunction _function) {
#ifndef _WIN32
std::lock_guard<std::mutex> itsLock(initializerMutex_);
std::lock_guard<std::mutex> itsLock(initializerMutex_);
#endif
if (isInitialized_) {
// We are already running --> initialize the interface library!
_function();
} else {
// We are not initialized --> save the initializer
initializers_.push_back(_function);
}
if (isInitialized_) {
// We are already running --> initialize the interface library!
_function();
} else {
// We are not initialized --> save the initializer
initializers_.push_back(_function);
}
}

void
Expand Down Expand Up @@ -198,17 +198,17 @@ Factory::registerStub(
CommonAPI::Address address(_domain, _interface, _instance);
Address someipAddress;
if (AddressTranslator::get()->translate(address, someipAddress)) {
std::shared_ptr<Connection> itsConnection = getConnection(_context);
if (itsConnection) {
std::shared_ptr<StubAdapter> adapter
= stubAdapterCreateFunctionsIterator->second(
someipAddress, itsConnection, _stub);
if (adapter) {
adapter->init(adapter);
if (registerStubAdapter(adapter))
return true;
}
}
std::shared_ptr<Connection> itsConnection = getConnection(_context);
if (itsConnection) {
std::shared_ptr<StubAdapter> adapter
= stubAdapterCreateFunctionsIterator->second(
someipAddress, itsConnection, _stub);
if (adapter) {
adapter->init(adapter);
if (registerStubAdapter(adapter))
return true;
}
}
}
}

Expand Down Expand Up @@ -351,10 +351,10 @@ Factory::getConnection(const ConnectionId_t &_connectionId) {
= std::make_shared<Connection>(_connectionId);
if (itsConnection) {
if (!itsConnection->connect(true)) {
COMMONAPI_ERROR("Failed to create connection ", _connectionId);
itsConnection.reset();
COMMONAPI_ERROR("Failed to create connection ", _connectionId);
itsConnection.reset();
} else {
connections_.insert({ _connectionId, itsConnection } );
connections_.insert({ _connectionId, itsConnection } );
}
}

Expand All @@ -380,18 +380,18 @@ Factory::getConnection(std::shared_ptr<MainLoopContext> _context) {
itsConnection = std::make_shared<Connection>(_context->getName());
if (itsConnection) {
if (!itsConnection->connect(false)) {
COMMONAPI_ERROR("Failed to create connection ",
_context->getName());
itsConnection.reset();
COMMONAPI_ERROR("Failed to create connection ",
_context->getName());
itsConnection.reset();
} else {
connections_.insert({ _context->getName(), itsConnection } );
connections_.insert({ _context->getName(), itsConnection } );
}
}
}

if (itsConnection) {
incrementConnection(itsConnection);
itsConnection->attachMainLoopContext(_context);
itsConnection->attachMainLoopContext(_context);
}

return itsConnection;
Expand Down
33 changes: 19 additions & 14 deletions src/CommonAPI/SomeIP/InputStream.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,26 +248,30 @@ InputStream& InputStream::readValue(std::string &_value, const StringDeployment
{
case StringEncoding::UTF16BE:
while (itsSize > 1 && (data[itsSize - 1] != 0x00 || data[itsSize - 2] != 0x00))
itsSize--;
itsSize--;

if (itsSize % 2 != 0) {
errorOccurred_ = true;
errorOccurred_ = true;
}

if(!hasError())
if(!hasError()) {
encoder->utf16To8((byte_t *) data, BIG_ENDIAN, itsSize - 2, status, &bytes, length);
itsSize = static_cast<uint32_t>(length);
}
break;

case StringEncoding::UTF16LE:
while (itsSize > 1 && (data[itsSize - 1] != 0x00 || data[itsSize - 2] != 0x00))
itsSize--;
itsSize--;

if (itsSize % 2 != 0) {
errorOccurred_ = true;
errorOccurred_ = true;
}

if(!hasError())
if(!hasError()) {
encoder->utf16To8((byte_t *) data, LITTLE_ENDIAN, itsSize - 2, status, &bytes, length);
itsSize = static_cast<uint32_t>(length);
}
break;

default:
Expand Down Expand Up @@ -301,14 +305,15 @@ InputStream& InputStream::readValue(std::string &_value, const StringDeployment
errorOccurred_ = true;
}
if (bytes == NULL) {
_value = "";
} else {
_value = (char*)bytes;
//only delete bytes if not allocated in this function (this is the case for deployed fixed length UTF8 strings)
if( bytes != (byte_t *) data)
delete[] bytes;
bytes = NULL;
}
_value = "";
} else {
// explicitly assign to support NUL (U+0000 code point) in UTF-8 strings
_value.assign(std::string((const char*)bytes, itsSize - 1u));
//only delete bytes if not allocated in this function (this is the case for deployed fixed length UTF8 strings)
if( bytes != (byte_t *) data)
delete[] bytes;
bytes = NULL;
}
}

return *this;
Expand Down

0 comments on commit a75aa38

Please sign in to comment.