Release 1.8.1 [5693]

.gitignore

@@ -69,6 +69,8 @@ Session.vim
 .netrwhist
 *~
 
+### VisualStudio Code ###
+*.vscode
 
 ### VisualStudio ###
 ## Ignore Visual Studio temporary files, build results, and
@@ -433,7 +435,11 @@ target/
 # Eclipse
 .cproject
 .project
+.settings
 
 .pydevproject
 
 compile_commands.json
+
+# Visual Studio Code
+.vscode

configure.ac

@@ -21,7 +21,7 @@
 #
 m4_define([version_major],[1])
 m4_define([version_minor],[8])
-m4_define([version_micro],[0])
+m4_define([version_micro],[1])
 
 AC_INIT([fastrtps], [version_major.version_minor.version_micro], [[email protected]], [eProsima FastRTPS], [http://eprosima.com/])
 CONFIG_ARGS="$*"

examples/C++/LivelinessQoS/CMakeLists.txt

@@ -0,0 +1,51 @@
+# Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cmake_minimum_required(VERSION 2.8.12)
+
+if(NOT CMAKE_VERSION VERSION_LESS 3.0)
+    cmake_policy(SET CMP0048 NEW)
+endif()
+
+project(LivelinessQoS)
+
+# Find requirements
+if(NOT fastcdr_FOUND)
+    find_package(fastcdr REQUIRED)
+endif()
+
+if(NOT fastrtps_FOUND)
+    find_package(fastrtps REQUIRED)
+endif()
+
+# Set C++11
+include(CheckCXXCompilerFlag)
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG OR
+        CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    check_cxx_compiler_flag(-std=c++11 SUPPORTS_CXX11)
+    if(SUPPORTS_CXX11)
+        add_compile_options(-std=c++11)
+    else()
+        message(FATAL_ERROR "Compiler doesn't support C++11")
+    endif()
+endif()
+
+message(STATUS "Configuring HelloWorld example...")
+file(GLOB LIVELINESSQOS_SOURCES_CXX "*.cxx")
+file(GLOB LIVELINESSQOS_SOURCES_CPP "*.cpp")
+
+add_executable(LivelinessQoS ${LIVELINESSQOS_SOURCES_CXX} ${LIVELINESSQOS_SOURCES_CPP})
+target_link_libraries(LivelinessQoS fastrtps fastcdr)
+install(TARGETS LivelinessQoS
+    RUNTIME DESTINATION examples/C++/LivelinessQoS/${BIN_INSTALL_DIR})

examples/C++/LivelinessQoS/LivelinessPublisher.cpp

@@ -0,0 +1,145 @@
+// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file LivelinessPublisher.cpp
+ *
+ */
+
+#include "LivelinessPublisher.h"
+#include <fastrtps/participant/Participant.h>
+#include <fastrtps/attributes/ParticipantAttributes.h>
+#include <fastrtps/attributes/PublisherAttributes.h>
+#include <fastrtps/publisher/Publisher.h>
+#include <fastrtps/Domain.h>
+#include <fastrtps/utils/eClock.h>
+
+#include <thread>
+
+using namespace eprosima::fastrtps;
+using namespace eprosima::fastrtps::rtps;
+
+LivelinessPublisher::LivelinessPublisher()
+    : participant_(nullptr)
+    , publisher_(nullptr)
+{
+}
+
+bool LivelinessPublisher::init(
+        LivelinessQosPolicyKind kind,
+        int liveliness_ms)
+{
+    topic_.index(0);
+    topic_.message("HelloWorld");
+
+    ParticipantAttributes PParam;
+    PParam.rtps.builtin.use_SIMPLE_RTPSParticipantDiscoveryProtocol = true;
+    PParam.rtps.builtin.use_SIMPLE_EndpointDiscoveryProtocol = true;
+    PParam.rtps.builtin.m_simpleEDP.use_PublicationReaderANDSubscriptionWriter = true;
+    PParam.rtps.builtin.m_simpleEDP.use_PublicationWriterANDSubscriptionReader = true;
+    PParam.rtps.builtin.domainId = 0;
+    PParam.rtps.builtin.use_WriterLivelinessProtocol = true;
+    PParam.rtps.setName("Participant_pub");
+    participant_ = Domain::createParticipant(PParam);
+    if(participant_==nullptr)
+    {
+        return false;
+    }
+    Domain::registerType(participant_,&type_);
+
+    PublisherAttributes Wparam;
+    Wparam.topic.topicKind = NO_KEY;
+    Wparam.topic.topicDataType = "Topic";
+    Wparam.topic.topicName = "Name";
+    Wparam.qos.m_reliability.kind = RELIABLE_RELIABILITY_QOS;
+    Wparam.topic.historyQos.kind = KEEP_LAST_HISTORY_QOS;
+    Wparam.topic.historyQos.depth = 30;
+    Wparam.qos.m_liveliness.lease_duration = Duration_t(liveliness_ms * 1e-3);
+    Wparam.qos.m_liveliness.announcement_period = Duration_t(liveliness_ms * 1e-3 * 0.5);
+    Wparam.qos.m_liveliness.kind = kind;
+    publisher_ = Domain::createPublisher(participant_, Wparam, &listener_);
+    if(publisher_ == nullptr)
+    {
+        return false;
+    }
+    return true;
+}
+
+LivelinessPublisher::~LivelinessPublisher()
+{
+    Domain::removeParticipant(participant_);
+}
+
+void LivelinessPublisher::PubListener::onPublicationMatched(Publisher* /*pub*/,MatchingInfo& info)
+{
+    if(info.status == MATCHED_MATCHING)
+    {
+        n_matched++;
+        first_connected = true;
+        std::cout << "Publisher matched" << std::endl;
+    }
+    else
+    {
+        n_matched--;
+        std::cout << "Publisher unmatched" << std::endl;
+    }
+}
+
+void LivelinessPublisher::PubListener::on_liveliness_lost(
+        Publisher *pub,
+        const LivelinessLostStatus &status)
+{
+    std::cout << "Publisher " << pub->getGuid() << " lost liveliness: " << status.total_count << std::endl;
+}
+
+void LivelinessPublisher::run(uint32_t samples, uint32_t sleep)
+{
+    std::thread thread1(&LivelinessPublisher::runThread, this, publisher_, samples, sleep);
+    thread1.join();
+}
+
+void LivelinessPublisher::runThread(
+        Publisher* pub,
+        uint32_t samples,
+        uint32_t sleep)
+{
+
+    for(uint32_t i = 0;i<samples;++i)
+    {
+        if(!publish(pub))
+        {
+            --i;
+        }
+        else
+        {
+            std::cout << "Message with index: " << topic_.index()<< " SENT by publisher " << pub->getGuid() << std::endl;
+        }
+        eClock::my_sleep(sleep);
+    }
+
+    std::cin.ignore();
+}
+
+bool LivelinessPublisher::publish(
+        Publisher* pub,
+        bool waitForListener)
+{
+    if(listener_.first_connected || !waitForListener || listener_.n_matched > 0)
+    {
+        topic_.index(topic_.index()+1);
+        pub->write((void*)&topic_);
+        return true;
+    }
+    return false;
+}

examples/C++/LivelinessQoS/LivelinessPublisher.h

@@ -0,0 +1,94 @@
+// Copyright 2019 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file LivelinessPublisher.h
+ *
+ */
+
+#ifndef LivelinessPublisher_H_
+#define LivelinessPublisher_H_
+
+#include "TopicType.h"
+#include "Topic.h"
+
+#include <fastrtps/fastrtps_fwd.h>
+#include <fastrtps/attributes/PublisherAttributes.h>
+#include <fastrtps/publisher/PublisherListener.h>
+
+#include <mutex>
+
+class LivelinessPublisher {
+public:
+
+    //! Constructor
+    LivelinessPublisher();
+
+    //! Destructor
+    virtual ~LivelinessPublisher();
+
+    //! Initialize
+    bool init(
+            eprosima::fastrtps::LivelinessQosPolicyKind kind,
+            int liveliness_ms);
+
+    //! Publish a sample
+    bool publish(
+            eprosima::fastrtps::Publisher* pub,
+            bool waitForListener = true);
+
+    //! Run for number samples
+	void run(uint32_t number, uint32_t sleep);
+
+private:
+
+    Topic topic_;
+    TopicType type_;
+
+    eprosima::fastrtps::Participant* participant_;
+    eprosima::fastrtps::Publisher* publisher_;
+
+    class PubListener : public eprosima::fastrtps::PublisherListener
+	{
+	public:
+        PubListener()
+            : n_matched(0)
+            , first_connected(false)
+        {}
+
+        ~PubListener()
+        {}
+
+        void onPublicationMatched(
+                eprosima::fastrtps::Publisher* pub,
+                eprosima::fastrtps::rtps::MatchingInfo& info) override;
+
+        void on_liveliness_lost(
+                eprosima::fastrtps::Publisher* pub,
+                const eprosima::fastrtps::LivelinessLostStatus& status) override;
+
+		int n_matched;
+        bool first_connected;
+    };
+    PubListener listener_;
+
+    void runThread(
+            eprosima::fastrtps::Publisher *pub,
+            uint32_t number,
+            uint32_t sleep);
+};
+
+
+
+#endif /* LivelinessPublisher_H_ */