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

Refs #4642 Too old configuration method [#395] #408

Merged
merged 2 commits into from
Feb 12, 2019
Merged

Refs #4642 Too old configuration method [#395] #408

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
611a23a
Refs #4642 Too old configuration method.
Feb 11, 2019
0624a7a
Refs #4642 Removed unused WAN setting.
Feb 12, 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
32 changes: 1 addition & 31 deletions examples/C++/Benchmark/BenchmarkPublisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,27 +93,12 @@ bool BenchMarkPublisher::init(int transport, ReliabilityQosPolicyKind reliabilit
}
else if (transport == 2)
{
uint32_t kind = LOCATOR_KIND_TCPv4;
PParam.rtps.useBuiltinTransports = false;

Locator_t unicast_locator;
unicast_locator.kind = kind;
IPLocator::setIPv4(unicast_locator, "127.0.0.1");
unicast_locator.port = 5100;
IPLocator::setLogicalPort(unicast_locator, 7410);
PParam.rtps.defaultUnicastLocatorList.push_back(unicast_locator); // Publisher's data channel

Locator_t meta_locator;
meta_locator.kind = kind;
IPLocator::setIPv4(meta_locator, "127.0.0.1");
meta_locator.port = 5100;
IPLocator::setLogicalPort(meta_locator, 7402);
PParam.rtps.builtin.metatrafficUnicastLocatorList.push_back(meta_locator); // Publisher's meta channel

std::shared_ptr<TCPv4TransportDescriptor> descriptor = std::make_shared<TCPv4TransportDescriptor>();
descriptor->sendBufferSize = 8912896; // 8.5Mb
descriptor->receiveBufferSize = 8912896; // 8.5Mb
descriptor->set_WAN_address("127.0.0.1");
//descriptor->set_WAN_address("127.0.0.1");
richiware marked this conversation as resolved.
Show resolved Hide resolved
descriptor->add_listener_port(5100);
PParam.rtps.userTransports.push_back(descriptor);
}
Expand All @@ -123,23 +108,8 @@ bool BenchMarkPublisher::init(int transport, ReliabilityQosPolicyKind reliabilit
}
else if (transport == 4)
{
uint32_t kind = LOCATOR_KIND_TCPv6;
PParam.rtps.useBuiltinTransports = false;

Locator_t unicast_locator;
unicast_locator.kind = kind;
IPLocator::setIPv6(unicast_locator, "::1");
unicast_locator.port = 5100;
IPLocator::setLogicalPort(unicast_locator, 7410);
PParam.rtps.defaultUnicastLocatorList.push_back(unicast_locator); // Publisher's data channel

Locator_t meta_locator;
meta_locator.kind = kind;
IPLocator::setIPv6(meta_locator, "::1");
meta_locator.port = 5100;
IPLocator::setLogicalPort(meta_locator, 7402);
PParam.rtps.builtin.metatrafficUnicastLocatorList.push_back(meta_locator); // Publisher's meta channel

std::shared_ptr<TCPv6TransportDescriptor> descriptor = std::make_shared<TCPv6TransportDescriptor>();
descriptor->sendBufferSize = 8912896; // 8.5Mb
descriptor->receiveBufferSize = 8912896; // 8.5Mb
Expand Down
38 changes: 2 additions & 36 deletions examples/C++/Benchmark/BenchmarkSubscriber.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,7 @@ bool BenchMarkSubscriber::init(int transport, ReliabilityQosPolicyKind reliabili
initial_peer_locator.kind = kind;
IPLocator::setIPv4(initial_peer_locator, "127.0.0.1");
initial_peer_locator.port = 5100;
IPLocator::setLogicalPort(initial_peer_locator, 7402);
PParam.rtps.builtin.initialPeersList.push_back(initial_peer_locator); // Publisher's meta channel
IPLocator::setLogicalPort(initial_peer_locator, 7410);
PParam.rtps.builtin.initialPeersList.push_back(initial_peer_locator); // Publisher's meta channel

Locator_t unicast_locator;
unicast_locator.kind = kind;
IPLocator::setIPv4(unicast_locator, "127.0.0.1");
unicast_locator.port = 5100;
IPLocator::setLogicalPort(unicast_locator, 7411);
PParam.rtps.defaultUnicastLocatorList.push_back(unicast_locator); // Subscriber's data channel

Locator_t meta_locator;
meta_locator.kind = kind;
IPLocator::setIPv4(meta_locator, "127.0.0.1");
meta_locator.port = 5100;
IPLocator::setLogicalPort(meta_locator, 7403);
PParam.rtps.builtin.metatrafficUnicastLocatorList.push_back(meta_locator); // Subscriber's meta channel
PParam.rtps.builtin.initialPeersList.push_back(initial_peer_locator); // Publisher's channel

PParam.rtps.useBuiltinTransports = false;
std::shared_ptr<TCPv4TransportDescriptor> descriptor = std::make_shared<TCPv4TransportDescriptor>();
Expand All @@ -111,24 +94,7 @@ bool BenchMarkSubscriber::init(int transport, ReliabilityQosPolicyKind reliabili
initial_peer_locator.kind = kind;
IPLocator::setIPv6(initial_peer_locator, "::1");
initial_peer_locator.port = 5100;
IPLocator::setLogicalPort(initial_peer_locator, 7402);
PParam.rtps.builtin.initialPeersList.push_back(initial_peer_locator); // Publisher's meta channel
IPLocator::setLogicalPort(initial_peer_locator, 7410);
PParam.rtps.builtin.initialPeersList.push_back(initial_peer_locator); // Publisher's meta channel

Locator_t unicast_locator;
unicast_locator.kind = kind;
IPLocator::setIPv6(unicast_locator, "::1");
unicast_locator.port = 5100;
IPLocator::setLogicalPort(unicast_locator, 7411);
PParam.rtps.defaultUnicastLocatorList.push_back(unicast_locator); // Subscriber's data channel

Locator_t meta_locator;
meta_locator.kind = kind;
IPLocator::setIPv6(meta_locator, "::1");
meta_locator.port = 5100;
IPLocator::setLogicalPort(meta_locator, 7403);
PParam.rtps.builtin.metatrafficUnicastLocatorList.push_back(meta_locator); // Subscriber's meta channel
PParam.rtps.builtin.initialPeersList.push_back(initial_peer_locator); // Publisher's channel

PParam.rtps.useBuiltinTransports = false;
std::shared_ptr<TCPv6TransportDescriptor> descriptor = std::make_shared<TCPv6TransportDescriptor>();
Expand Down