Merge branch 'master' into github_master

CMakeLists.txt

@@ -357,8 +357,8 @@ install(FILES ${PROJECT_SOURCE_DIR}/LICENSE
 set(CPACK_COMPONENT_LICENSES_HIDDEN 1)
 
 # Install examples
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/examples
-    DESTINATION .
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/examples/C++
+    DESTINATION examples/
     COMPONENT examples
     )
 

cmake/packaging/linux/autotools_generator.cmake.in

@@ -28,6 +28,10 @@ macro(generate_public_headers_for_autotools)
         foreach(@PROJECT_NAME@_PUBLIC_HEADER ${@PROJECT_NAME@_PUBLIC_HEADERS_TMP})
             set(@PROJECT_NAME@_PUBLIC_HEADERS_AUTOTOOLS "${@PROJECT_NAME@_PUBLIC_HEADERS_AUTOTOOLS} ${@PROJECT_NAME@_PUBLIC_HEADER}")
         endforeach()
+        file(GLOB_RECURSE @PROJECT_NAME@_PUBLIC_HEADERS_TMP RELATIVE ${directory} ${directory}/*.hpp)
+        foreach(@PROJECT_NAME@_PUBLIC_HEADER ${@PROJECT_NAME@_PUBLIC_HEADERS_TMP})
+            set(@PROJECT_NAME@_PUBLIC_HEADERS_AUTOTOOLS "${@PROJECT_NAME@_PUBLIC_HEADERS_AUTOTOOLS} ${@PROJECT_NAME@_PUBLIC_HEADER}")
+        endforeach()
     endforeach()
 
     set(@PROJECT_NAME@_PUBLIC_HEADERS_FILES_TMP @@PROJECT_NAME@_PUBLIC_HEADERS_FILES@)

include/fastrtps/participant/Participant.h

@@ -79,7 +79,7 @@ class RTPS_DllAPI Participant {
 
 	/**
 	 * This method returns a pointer to the Endpoint Discovery Protocol Readers (when not in Static mode)
-	 * SimpleEDP creates two readers, one for Publisher and one for Subscribers, and they are both returned
+	 * SimpleEDP creates two readers, one for Publishers and one for Subscribers, and they are both returned
 	 * as a std::pair of pointers. These readers in particular have modified listeners that allow a slave 
 	 * listener to attach its callbach to the original one, allowing for the addition of logging elements.
 	 * 
@@ -91,7 +91,7 @@ class RTPS_DllAPI Participant {
 	 * This method returns the number of Publishers that currently belong to the Participant that have 
 	 * a given topic name
 	 *
-	 * @param target_topic char* to the target topic name to match
+	 * @param target_topic Target topic name to match
 	 * @return Number of Publishers in the Participant with that topic name
 	 */
 	int get_no_publishers(char *target_topic);
@@ -100,7 +100,7 @@ class RTPS_DllAPI Participant {
 	 * This method return the number of Subscribers that currently belong to the Participant that have
 	 * a given topic name
 	 *
-	 * @param target_topic char* to the target topic name to match
+	 * @param target_topic Target topic name to match
 	 * @return Number of Subscribers in the Participant with that topic name
 	 * */
 	int get_no_subscribers(char *target_topic);

include/fastrtps/rtps/messages/RTPS_messages.h

@@ -79,6 +79,13 @@ inline std::ostream& operator<<(std::ostream& output,const Header_t& h){
 	uint16_t submessageLength;
 	uint32_t submsgLengthLarger;
 	SubmessageFlag flags;
+
+   SubmessageHeader_t():
+      submessageId(0),
+      submessageLength(0),
+	   submsgLengthLarger(0),
+      flags(0)
+   {}
 };
 
 using std::cout;

test/CMakeLists.txt

@@ -15,7 +15,10 @@
 add_subdirectory(blackbox)
 add_subdirectory(performance)
 if(NOT ((MSVC OR MSVC_IDE)))
-   add_subdirectory(profiling)
+   find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
+   if(CTEST_MEMORYCHECK_COMMAND)
+      add_subdirectory(profiling)
+   endif()
 endif()
 add_subdirectory(unittest/rtps/common)
 add_subdirectory(unittest/rtps/reader)

test/profiling/cycles/CMakeLists.txt

@@ -27,3 +27,5 @@ set_property(TEST cycles_profiling APPEND PROPERTY ENVIRONMENT
     "PROFILING_BINS=$<TARGET_FILE:RTPSCommsProfiling>\\;$<TARGET_FILE:RTPSPubSubProfiling>")
 set_property(TEST cycles_profiling APPEND PROPERTY ENVIRONMENT
              "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
+set_property(TEST cycles_profiling APPEND PROPERTY ENVIRONMENT
+             "VALGRIND_BIN=${CTEST_MEMORYCHECK_COMMAND}")

test/profiling/cycles/profiling.py

@@ -15,10 +15,11 @@
 import os, subprocess, csv, ntpath, glob
 
 binaries = os.environ.get("PROFILING_BINS").split(';')
+valgrind = os.environ.get("VALGRIND_BIN")
 
 for binary in binaries:
     filename = ntpath.basename(binary)
-    proc = subprocess.call(["valgrind", "--tool=exp-bbv","--instr-count-only=yes","--bb-out-file=bbLog_" + filename, binary, "10"])
+    proc = subprocess.call([valgrind, "--tool=exp-bbv","--instr-count-only=yes","--bb-out-file=bbLog_" + filename, binary, "10"])
 
     thread_logs = glob.glob('bbLog_*')
 

test/profiling/memory/CMakeLists.txt

@@ -26,3 +26,5 @@ set_property(TEST memory_profiling APPEND PROPERTY ENVIRONMENT
     "PROFILING_BINS=$<TARGET_FILE:RTPSCommsProfiling>\\;$<TARGET_FILE:RTPSPubSubProfiling>")
 set_property(TEST memory_profiling APPEND PROPERTY ENVIRONMENT
              "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
+set_property(TEST memory_profiling APPEND PROPERTY ENVIRONMENT
+             "VALGRIND_BIN=${CTEST_MEMORYCHECK_COMMAND}")

test/profiling/memory/profiling.py

@@ -15,12 +15,13 @@
 import os, subprocess, csv, ntpath
 
 binaries = os.environ.get("PROFILING_BINS").split(';')
+valgrind = os.environ.get("VALGRIND_BIN")
 
 for binary in binaries:
     filename = ntpath.basename(binary)
     print (binary)
     print (filename)
-    proc = subprocess.call(["valgrind", "--tool=massif","--time-unit=ms","--massif-out-file=massifLog_" + filename, binary,"100"])
+    proc = subprocess.call([valgrind, "--tool=massif","--time-unit=ms","--massif-out-file=massifLog_" + filename, binary,"100"])
 
     heap_values = []
     heap_tree_tags = []