Skip to content
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

Fix stream type on entities creation/destruction #284

Merged
merged 3 commits into from
Oct 25, 2021
+10 −4
Merged

Fix stream type on entities creation/destruction #284

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcebbb5
Fix stream type on entities creation/destruction
Acuadros95 Oct 25, 2021
c17a233
Skip status message on best effort mode
Acuadros95 Oct 25, 2021
79e7dd1
Reverse skip msg
Acuadros95 Oct 25, 2021
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
14 changes: 10 additions & 4 deletions src/cpp/processor/Processor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,9 @@ bool Processor<EndPoint>::process_create_submessage(
{
bool rv = true;
dds::xrce::CreationMode creation_mode;
dds::xrce::StreamId stream_kind = is_reliable_stream(input_packet.message->get_header().stream_id()) ?
dds::xrce::STREAMID_BUILTIN_RELIABLE : dds::xrce::STREAMID_BUILTIN_BEST_EFFORTS;

creation_mode.reuse(0 < (input_packet.message->get_subheader().flags() & dds::xrce::FLAG_REUSE));
creation_mode.replace(0 < (input_packet.message->get_subheader().flags() & dds::xrce::FLAG_REPLACE));

Expand All @@ -317,14 +320,14 @@ bool Processor<EndPoint>::process_create_submessage(
create_payload.object_representation()));

client.session().push_output_submessage(
dds::xrce::STREAMID_BUILTIN_RELIABLE,
stream_kind,
dds::xrce::STATUS,
status_payload,
std::chrono::milliseconds(0));

OutputPacket<EndPoint> output_packet;
output_packet.destination = input_packet.source;
while (client.session().get_next_output_message(dds::xrce::STREAMID_BUILTIN_RELIABLE, output_packet.message))
while (client.session().get_next_output_message(stream_kind, output_packet.message))
{
server_.push_output_packet(std::move(output_packet));
}
Expand Down Expand Up @@ -370,15 +373,18 @@ bool Processor<EndPoint>::process_delete_submessage(
}
else
{
dds::xrce::StreamId stream_kind = is_reliable_stream(input_packet.message->get_header().stream_id()) ?
dds::xrce::STREAMID_BUILTIN_RELIABLE : dds::xrce::STREAMID_BUILTIN_BEST_EFFORTS;

status_payload.result(client.delete_object(delete_payload.object_id()));

client.session().push_output_submessage(
dds::xrce::STREAMID_BUILTIN_RELIABLE,
stream_kind,
dds::xrce::STATUS,
status_payload,
std::chrono::milliseconds(0));

while (client.session().get_next_output_message(dds::xrce::STREAMID_BUILTIN_RELIABLE, output_packet.message))
while (client.session().get_next_output_message(stream_kind, output_packet.message))
{
server_.push_output_packet(std::move(output_packet));
}
Expand Down