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

Jump to bottom

Iox #65 initial implementation cyclonedds to iox gateway #135

Closed
wants to merge 61 commits into from
Closed

Iox #65 initial implementation cyclonedds to iox gateway #135

wants to merge 61 commits into from

Conversation

FerdinandSpitzschnueffler
Copy link
Contributor

code contributed by @ithier

@elBoberido elBoberido linked an issue Jun 10, 2020 that may be closed by this pull request
cyclonedds to iceoryx gateway #65
Closed
@FerdinandSpitzschnueffler FerdinandSpitzschnueffler force-pushed the iox-#65-initial-implementation-cyclonedds-to-iox-gateway branch from ffeb2d0 to 79c71c2 Compare June 10, 2020 13:07
@orecham
iox-eclipse-iceoryx#65 Make skeleton buildable.
5a60e82 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Rename Channel to OutputChannel since we requi…
a95946a 
…re an InputChannel for the dds to iox direction.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Set up input channels for all services in config.
331e48b 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Begin refactoring common gateway logic into a …
532cfd9 
…base class.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Moved common dds gateway logic to a base class.
de970d9 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Begin factoring out common channel logic.
e4c2adc 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Factored out common channel logic into base cl…
bc986bf 
…ass.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Updated iox2dds gateway to use generic base cl…
8c8dd01 
…ass.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Factor out gateway running and shutdown logic …
3f50767 
…to base class.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Factor out more gateway stuff into base class.
436c61b 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Reduced amount of gateway templates - specify …
54bf1d5 
…channel instead of the terminals.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Create channels for preconfigured services.
ce3f2b7 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Declare constructors as noexcept.
620d668 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Remove unused classes.
0505fe9 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Fix deadlock with channel access.
871633e 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Fix template name in Channel class.
dd56561 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Rename module to iceoryx_dds.
0ce1ad5 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Rename module to iceoryx_dds.
38b5f67 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Update include namespace to iceoryx_dds.
4848f9c 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Add factory method to allow injection of mock …
1a8a906 
…channels when testing.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
Merge branch 'master' of ssh://sourcecode01.de.bosch.com:7999/aos/ice…
4ec6394 
…oryx_eclipse into iox-eclipse-iceoryx#65-initial-implementation-cyclonedds-to-iox-gateway
@orecham
iox-eclipse-iceoryx#65 Code cleanliness fixes.
b8a19b5 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
elBoberido
elBoberido reviewed Jun 16, 2020
View reviewed changes
iceoryx_dds/include/iceoryx_dds/internal/gateway/dds_gateway_generic.inl Outdated
// See the License for the specific language governing permissions and
// limitations under the License.

#include <cpptoml.h>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this included?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question.

@orecham
iox-eclipse-iceoryx#65 Fixed header organization.
9a7b977 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Change std::function to cxx::function_ref wher…
e7ee7c6 
…e possible

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Remove unneeded move/copy constructors.
5a2423a 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Avoid adding duplicate channels.
cee04ae 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Ignore wildcard services.
f6cd43a 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Test boundary conditions of generic dds gateway.
d74b0a2 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Add errors for gateway to enum.
5091808 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Add more error handling.
01116fd 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
Merge branch 'master' of ssh://sourcecode01.de.bosch.com:7999/aos/ice…
0fc4869 
…oryx_eclipse into iox-eclipse-iceoryx#65-initial-implementation-cyclonedds-to-iox-gateway
orecham and others added 12 commits June 23, 2020 09:33
@orecham
Merge branch 'master' into iox-eclipse-iceoryx#64-initial-implementat…
b1c4ed5 
…ion-iox-to-dds-gateway
@orecham
iox-eclipse-iceoryx#65 Code cleanliness fixes.
7f0c3ff 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Fixed header organization.
9b8a20f 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Change std::function to cxx::function_ref wher…
6eee4e3 
…e possible

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Remove unneeded move/copy constructors.
688b773 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Avoid adding duplicate channels.
64fd03a 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Ignore wildcard services.
4b3e7d0 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Test boundary conditions of generic dds gateway.
cc34dcd 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Add errors for gateway to enum.
abcc1f3 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
iox-eclipse-iceoryx#65 Add more error handling.
3a7474d 
Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
@orecham
Merge branch 'master' into iox-eclipse-iceoryx#64-initial-implementat…
eef64e2 
…ion-iox-to-dds-gateway
@FerdinandSpitzschnueffler
Merge branch 'iox-eclipse-iceoryx#65-initial-implementation-cyclonedd…
26dd024 
…s-to-iox-gateway' into iox-eclipse-iceoryx#65-initial-implementation-cyclonedds-to-iox-gateway

Signed-off-by: Lehmann Marika (CC-AD/ESW1) <[email protected]>
@FerdinandSpitzschnueffler FerdinandSpitzschnueffler force-pushed the iox-#65-initial-implementation-cyclonedds-to-iox-gateway branch from 254d97d to 26dd024 Compare June 23, 2020 07:44
elfenpiff
elfenpiff approved these changes Jun 23, 2020
View reviewed changes
iceoryx_dds/include/iceoryx_dds/gateway/dds_to_iox.hpp
template <typename channel_t = iox::dds::Channel<iox::popo::Publisher, iox::dds::data_reader_t>>
class DDS2IceoryxGateway : public iox::dds::DDSGatewayGeneric<channel_t>
{
using ChannelFactory = std::function<channel_t(const iox::capro::ServiceDescription)>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When this doesn't need to be certified then std::function is fine

@dkroenke dkroenke self-requested a review June 23, 2020 08:50
@dkroenke dkroenke closed this Jun 23, 2020
@FerdinandSpitzschnueffler FerdinandSpitzschnueffler deleted the iox-#65-initial-implementation-cyclonedds-to-iox-gateway branch June 23, 2020 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MatthiasKillat MatthiasKillat MatthiasKillat left review comments

@elBoberido elBoberido elBoberido left review comments

@orecham orecham orecham left review comments

@mossmaurice mossmaurice mossmaurice requested changes

@elfenpiff elfenpiff elfenpiff approved these changes

@budrus budrus Awaiting requested review from budrus

@dkroenke dkroenke Awaiting requested review from dkroenke

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cyclonedds to iceoryx gateway
7 participants
@FerdinandSpitzschnueffler @orecham @mossmaurice @dkroenke @elfenpiff @elBoberido @MatthiasKillat