Merge branch 'master' into dev-speedy

Author: jfrey-xx

.appveyor.yml

@@ -12,13 +12,14 @@ environment:
 build_script:
 - cmd: cmake -Dlslgitrevision=%APPVEYOR_REPO_COMMIT% -Dlslgitbranch=%APPVEYOR_REPO_BRANCH% -S . -B build -T v140,host=x86 -A %LSLARCH%
 - sh: cmake -Dlslgitrevision=${APPVEYOR_REPO_COMMIT} -Dlslgitbranch=${APPVEYOR_REPO_BRANCH} -S . -B build
-- cmake -DLSL_UNITTESTS=1 build
+- cmake -DLSL_UNITTESTS=ON -DLSL_BUILD_EXAMPLES=ON build
 - cmd: cmake --build build --config Release -j --target package
 - sh: /usr/bin/time -v cmake --build build -j 3 --target package
 - sh: cmake -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON build
 - cd build
 - sh: sudo dpkg -i *.deb
 - sh: cpack -G DEB
+- sh: ifconfig
 - cmd: testing\Release\lsl_test_internal.exe --wait-for-keypress never
 - cmd: set PATH=Release;%PATH% && testing\Release\lsl_test_exported.exe --wait-for-keypress never
 - sh: testing/lsl_test_internal --wait-for-keypress never

.github/workflows/cppcmake.yml

@@ -30,7 +30,7 @@ jobs:
            cmake --version
            cmake -E make_directory build
            cd build
-           cmake -DLSL_UNITTESTS=1 -DCPACK_PACKAGE_DIRECTORY=${PWD}/package ..
+           cmake -DLSL_UNITTESTS=ON -DLSL_BUILD_EXAMPLES=ON -DCPACK_PACKAGE_DIRECTORY=${PWD}/package ..
     - name: make
       run: cmake --build build --config Release -j --target install
     - name: package
@@ -61,8 +61,22 @@ jobs:
       with:
         name: pkg-${{ matrix.os }}
         path: build/package
+    - name: print network config
+      shell: bash
+      run: |
+           which ifconfig && ifconfig
+           if [ which ip ]; then
+              ip link
+              ip addr
+              ip route
+              ip -6 route
+           fi
     - name: unit tests (internal functions)
       run: build/install/bin/lsl_test_internal --order rand --wait-for-keypress never --durations yes
+      timeout-minutes: 5
+      continue-on-error: true
     - name: unit tests (exported functions)
       shell: bash
-      run: build/install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes || [ "${{ matrix.os }}" = "macOS-latest" ]
+      run: build/install/bin/lsl_test_exported --order rand --wait-for-keypress never --durations yes
+      timeout-minutes: 5
+      continue-on-error: true

.gitignore

@@ -7,3 +7,6 @@
 /.vs/
 .DS_Store
 /out/
+# CLion
+.idea/
+/cmake-build-*/

.travis.yml

@@ -12,9 +12,9 @@ before_script:
 - brew upgrade cmake
 script:
 - cmake --version
-- cmake -S . -B build ${CMakeArgs} -DLSL_UNITTESTS=1
+- cmake -S . -B build ${CMakeArgs} -DLSL_UNITTESTS=ON -DLSL_EXAMPLES=ON
 - cd build
-- cmake --build . --config Release --target install
+- cmake --build . --config Release -j --target install
 - testing/lsl_test_internal || true
 - testing/lsl_test_exported
 - cpack

CMakeLists.txt

@@ -54,6 +54,8 @@ add_library(lslobj OBJECT
 	src/lsl_outlet_c.cpp
 	src/lsl_streaminfo_c.cpp
 	src/lsl_xml_element_c.cpp
+	src/netinterfaces.h
+	src/netinterfaces.cpp
 	src/portable_archive/portable_archive_exception.hpp
 	src/portable_archive/portable_archive_includes.hpp
 	src/portable_archive/portable_iarchive.hpp
@@ -129,30 +131,32 @@ add_library(lslboost OBJECT
 	lslboost/libs/chrono/src/chrono.cpp
 	lslboost/serialization_objects.cpp
 )
-if (UNIX)
-	target_sources(lslboost PRIVATE
-		lslboost/libs/thread/src/pthread/once.cpp
-		lslboost/libs/thread/src/pthread/thread.cpp
-	)
-	find_package(Threads REQUIRED)
-	target_link_libraries(lslboost PUBLIC Threads::Threads)
-	target_compile_features(lslboost PUBLIC cxx_std_11 cxx_lambda_init_captures)
-else ()  # WIN32
-	target_sources(lslboost PRIVATE
-		lslboost/libs/thread/src/win32/thread.cpp
-		lslboost/libs/thread/src/win32/tss_dll.cpp
-		lslboost/libs/thread/src/win32/tss_pe.cpp
-	)
-	target_link_libraries(lslboost PRIVATE
-		bcrypt
-		$<$<BOOL:${MINGW}>:wsock32 ws2_32 winmm>
+
+if(UNIX)
+	include(CheckSymbolExists)
+	# look for clock_gettime, if not we need to link against librt
+	check_symbol_exists(clock_gettime time.h HAS_GETTIME)
+	if(NOT HAS_GETTIME)
+		set(NEEDS_LIBRT ON CACHE INTERNAL "Link to librt")
+	endif()
+endif()
+
+find_package(Threads REQUIRED)
+target_link_libraries(lslboost
+	PUBLIC
+		Threads::Threads
+	PRIVATE
+		$<$<PLATFORM_ID:Windows>:bcrypt>
+		$<$<PLATFORM_ID:Windows>:iphlpapi>
 	)
-endif ()
+target_compile_features(lslboost PUBLIC cxx_std_11 cxx_lambda_init_captures)
 
 target_compile_definitions(lslboost
 	PUBLIC
 		BOOST_ALL_NO_LIB
+		BOOST_ASIO_STANDALONE
 		BOOST_ASIO_SEPARATE_COMPILATION
+		BOOST_THREAD_DONT_PROVIDE_INTERRUPTIONS
 		$<$<PLATFORM_ID:Windows>:_WIN32_WINNT=${LSL_WINVER}>
 	PRIVATE
 		$<$<PLATFORM_ID:Windows>:BOOST_THREAD_BUILD_DLL>
@@ -166,6 +170,7 @@ target_link_libraries(lslobj
 		lslboost
 	PUBLIC
 		$<$<AND:$<BOOL:${LSL_DEBUGLOG}>,$<PLATFORM_ID:Linux>>:dl>
+		$<$<BOOL:${NEEDS_LIBRT}>:rt>
 	)
 target_include_directories(lslobj
 	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
@@ -193,17 +198,25 @@ if(LSL_BUILD_STATIC)
 	add_library(lsl-static STATIC src/buildinfo.cpp)
 	target_compile_definitions(lsl-static PRIVATE LSL_LIBRARY_INFO_STR="${LSL_VERSION_INFO}/link:static")
 	target_link_libraries(lsl-static PUBLIC lslobj PRIVATE lslboost)
+	list(APPEND LSL_EXPORT_TARGETS lsl-static)
 	# for LSL_CPP_API export header
 	target_compile_definitions(lsl-static PUBLIC LIBLSL_STATIC)
 endif()
 
 if(LSL_FORCE_FANCY_LIBNAME)
-	set(CMAKE_DEBUG_POSTFIX "-debug")
 	math(EXPR lslplatform "8 * ${CMAKE_SIZEOF_VOID_P}")
 	set_target_properties(lsl PROPERTIES
 		PREFIX ""
 		OUTPUT_NAME "liblsl${lslplatform}"
+		DEBUG_POSTFIX "-debug"
+	)
+	if(LSL_BUILD_STATIC)
+		set_target_properties(lsl-static PROPERTIES
+			PREFIX ""
+			OUTPUT_NAME "liblsl${lslplatform}-static"
+			DEBUG_POSTFIX "-debug"
 		)
+	endif()
 endif()
 
 if(LSL_UNIXFOLDERS)

cmake/LSLCMake.cmake

@@ -6,19 +6,18 @@
 macro(LSLAPP_Setup_Boilerplate)
 endmacro()
 
-message(STATUS "Included LSL CMake helpers, rev. 12, ${CMAKE_CURRENT_LIST_DIR}")
+message(STATUS "Included LSL CMake helpers, rev. 13, ${CMAKE_CURRENT_LIST_DIR}")
 option(LSL_DEPLOYAPPLIBS "Copy library dependencies (at the moment Qt + liblsl) to the installation dir" ON)
 
-# set build type and default install dir if not done already
+# set build type and default install dir if not done already or undesired
 if(NOT CMAKE_BUILD_TYPE)
 	message(STATUS "CMAKE_BUILD_TYPE was default initialized to Release")
 	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
 endif()
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-# OR ((${MSVC_VERSION} GREATER_EQUAL 1910) AND ("${CMAKE_GENERATOR}" STREQUAL "Ninja"))
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND NOT LSL_PRESERVE_INSTALL_PREFIX)
 	set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH
 		"Where to put redistributable binaries" FORCE)
-	message(WARNING "CMAKE_INSTALL_PREFIX default initialized to ${CMAKE_INSTALL_PREFIX}")
+	message(WARNING "CMAKE_INSTALL_PREFIX default initialized to ${CMAKE_INSTALL_PREFIX}. Set LSL_PRESERVE_INSTALL_PREFIX or CMAKE_INSTALL_PREFIX to skip this.")
 endif()
 
 # Generate folders for IDE targets (e.g., VisualStudio solutions)
@@ -72,13 +71,18 @@ function(installLSLApp target)
 	endif()
 
 	# Set runtime path, i.e. where shared libs are searched relative to the exe
-	set(LIBDIRGENEXPR "../$<IF:$<BOOL:${LSL_UNIXFOLDERS}>,lib/,LSL/lib/>")
+	# CMake>=3.16: set(LIBDIR "../$<IF:$<BOOL:${LSL_UNIXFOLDERS}>,lib/,LSL/lib/>")
+	if(LSL_UNIXFOLDERS)
+		set(LIBDIR "../lib")
+	else()
+		set(LIBDIR "../LSL/lib")
+	endif()
 	if(APPLE)
 		set_property(TARGET ${target} APPEND
-			PROPERTY INSTALL_RPATH "@executable_path/;@executable_path/${LIBDIRGENEXPR}")
+			PROPERTY INSTALL_RPATH "@executable_path/;@executable_path/${LIBDIR}")
 	elseif(UNIX)
 		set_property(TARGET ${target}
-			PROPERTY INSTALL_RPATH "\$ORIGIN:\$ORIGIN/${LIBDIRGENEXPR}")
+			PROPERTY INSTALL_RPATH "\$ORIGIN:\$ORIGIN/${LIBDIR}")
 	endif()
 
 	if(LSL_UNIXFOLDERS)
@@ -173,8 +177,12 @@ function(installLSLApp target)
 		findQtInstallationTool("windeployqt")
 		install(CODE "
 			message (STATUS \"Running windeployqt on $<TARGET_FILE:${target}>\")
+			set(qml_dir $<TARGET_PROPERTY:${target},qml_directory>)
+			message(STATUS \"qml directory: \${qml_dir}\")
 			execute_process(
-				COMMAND \"${QT_DEPLOYQT_EXECUTABLE}\" --no-translations
+				COMMAND \"${QT_DEPLOYQT_EXECUTABLE}\"
+				\$<\$<BOOL:\${qml_dir}>:--qmldir \${qml_dir}>
+				--no-translations
 				--no-system-d3d-compiler --no-opengl-sw
 				--no-compiler-runtime --dry-run --list mapping
 				\"$<TARGET_FILE:${target}>\"

docs/Doxyfile

@@ -14,7 +14,7 @@ INPUT                  = ../src \
                          ../include
 FILE_PATTERNS          = *.c \
                          *.cpp \
-                        *.h
+                        *.h *.hpp
 EXCLUDE_SYMBOLS        =  lslboost
 SOURCE_BROWSER         = YES
 CLANG_ASSISTED_PARSING = NO

examples/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-project(Examples
+project(lslexamples
 	LANGUAGES C CXX
 	VERSION 0.2.0)
 find_package(LSL REQUIRED

examples/GetAllStreams.cpp

@@ -1,5 +1,9 @@
+#include <algorithm>
+#include <chrono>
 #include <iostream>
 #include <lsl_cpp.h>
+#include <map>
+#include <thread>
 
 /**
  * This example program shows how all streams that are currently present on the lab network can be
@@ -13,17 +17,41 @@ int main(int argc, char* argv[]) {
 		// discover all streams on the network
 		std::vector<lsl::stream_info> results = lsl::resolve_streams();
 
+		std::map<std::string, lsl::stream_info> found_streams;
 		// display them
-		for (auto& stream: results) std::cout << stream.as_xml() << "\n\n";
+		for (auto &stream : results) {
+			found_streams.emplace(std::make_pair(stream.uid(), stream));
+			std::cout << stream.as_xml() << "\n\n";
+		}
 
 		std::cout << "Press any key to switch to the continuous resolver test: " << std::endl;
 		std::cin.get();
 
 		lsl::continuous_resolver r;
 		while (true) {
-			std::vector<lsl::stream_info> tmp = r.results();
-			for (auto& val : tmp) std::cout << val.name() << " ";
-			std::cout << std::endl;
+			auto results = r.results();
+			for (auto &stream : results) {
+				auto uid = stream.uid();
+				if (found_streams.find(uid) == found_streams.end()) {
+					found_streams.emplace(std::make_pair(uid, stream));
+					std::cout << "Found " << stream.name() << '@' << stream.hostname() << std::endl;
+				}
+			}
+			auto n_missing = found_streams.size() - results.size();
+			if (n_missing) {
+				std::vector<std::string> missing;
+				missing.reserve(n_missing);
+				for (const auto &pair : found_streams)
+					if (std::none_of(results.begin(), results.end(),
+							[uid = pair.first](
+								const lsl::stream_info &info) { return info.uid() == uid; })) {
+						missing.push_back(pair.first);
+						std::cout << "Lost " << pair.second.name() << '@' << pair.second.hostname()
+								  << std::endl;
+					}
+				for (const auto &uid : missing) found_streams.erase(uid);
+			}
+			std::this_thread::sleep_for(std::chrono::seconds(1));
 		}
 
 	} catch (std::exception& e) { std::cerr << "Got an exception: " << e.what() << std::endl; }

examples/SendStringMarkers.cpp

@@ -25,9 +25,10 @@ int main(int argc, char* argv[]) {
 		std::random_device rd;
 		std::mt19937 gen(rd());
 		std::uniform_int_distribution<std::size_t> rnd(0, markertypes.size() - 1);
+		std::uniform_int_distribution<int> delayrnd(0, 1000);
 		while(true) {
 			// wait for a 20ms
-			std::this_thread::sleep_for(std::chrono::milliseconds(20));
+			std::this_thread::sleep_for(std::chrono::milliseconds(delayrnd(gen)));
 			// and choose the marker to send
 			std::string mrk = markertypes[rnd(gen)];
 			std::cout << "now sending: " << mrk << std::endl;