new version: 2020.3.2

Avoid downloading data corresponding to files shipped in FGData.

.gitignore

@@ -15,3 +15,5 @@ install_manifest.txt
 build*
 Build
 CMakeLists.txt.user
+3rdparty/expat_2.2.6/
+nbproject

3rdparty/expat/CMakeLists.txt

@@ -1,7 +1,7 @@
 
 configure_file (
     "${PROJECT_SOURCE_DIR}/3rdparty/expat/expat_config_cmake.in"
-    "${PROJECT_BINARY_DIR}/3rdparty/expat/expat_config.h"
+    "${PROJECT_BINARY_DIR}/3rdparty/expat/simgear_expat_config.h"
 )
 
 set(expat_sources 

3rdparty/expat/xmlparse.c

@@ -18,6 +18,8 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
+#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
+#include "simgear_expat_config.h"
 #elif defined(HAVE_EXPAT_CONFIG_H)
 #include "expat_config.h"
 #endif /* ndef COMPILED_FROM_DSP */

3rdparty/expat/xmlrole.c

@@ -12,6 +12,8 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
+#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
+#include "simgear_expat_config.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include "expat_config.h"

3rdparty/expat/xmltok.c

@@ -12,6 +12,8 @@
 #include "amigaconfig.h"
 #elif defined(__WATCOMC__)
 #include "watcomconfig.h"
+#elif defined(HAVE_SIMGEAR_EXPAT_CONFIG_H)
+#include "simgear_expat_config.h"
 #else
 #ifdef HAVE_EXPAT_CONFIG_H
 #include "expat_config.h"

3rdparty/udns/udns_init.c

@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#ifdef WINDOWS
+#if defined(_WINDOWS) || defined(WINDOWS)
 # include <winsock2.h>          /* includes <windows.h> */
 # include <iphlpapi.h>		/* for dns server addresses etc */
 #else
@@ -53,7 +53,7 @@ static void dns_set_srch_internal(struct dns_ctx *ctx, char *srch) {
     dns_add_srch(ctx, srch);
 }
 
-#ifdef WINDOWS
+#if defined(_WINDOWS) || defined(WINDOWS)
 
 #ifndef NO_IPHLPAPI
 /* Apparently, some systems does not have proper headers for IPHLPAIP to work.
@@ -217,7 +217,7 @@ int dns_init(struct dns_ctx *ctx, int do_open) {
     ctx = &dns_defctx;
   dns_reset(ctx);
 
-#ifdef WINDOWS
+#if defined(_WINDOWS) || defined(WINDOWS)
   if (dns_initns_iphlpapi(ctx) != 0)
     dns_initns_registry(ctx);
   /*XXX WINDOWS: probably good to get default domain and search list too...

3rdparty/udns/udns_resolver.c

@@ -24,7 +24,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#ifdef WINDOWS
+#if defined(_WINDOWS) || defined(WINDOWS)
 # include <winsock2.h>          /* includes <windows.h> */
 # include <ws2tcpip.h>          /* needed for struct in6_addr */
 #else
@@ -392,7 +392,7 @@ dns_set_tmcbck(struct dns_ctx *ctx, dns_utm_fn *fn, void *data) {
 }
 
 static unsigned dns_nonrandom_32(void) {
-#ifdef WINDOWS
+#if defined(_WINDOWS) || defined(WINDOWS)
   FILETIME ft;
   GetSystemTimeAsFileTime(&ft);
   return ft.dwLowDateTime;
@@ -551,7 +551,7 @@ int dns_open(struct dns_ctx *ctx) {
     ctx->dnsc_qstatus = DNS_E_TEMPFAIL;
     return -1;
   }
-#ifdef WINDOWS
+#if defined(_WINDOWS) || defined(WINDOWS)
   { unsigned long on = 1;
     if (ioctlsocket(sock, FIONBIO, &on) == SOCKET_ERROR) {
       closesocket(sock);
@@ -991,7 +991,7 @@ again: /* receive the reply */
      * or remote.  On local errors, we should stop, while
      * remote errors should be ignored (for now anyway).
      */
-#ifdef WINDOWS
+#if defined(_WINDOWS) || defined(WINDOWS)
     if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
     if (errno == EAGAIN)

3rdparty/udns/udns_rr_a.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#ifndef WINDOWS
+#if !defined(_WINDOWS) && !defined(WINDOWS)
 # include <sys/types.h>
 # include <netinet/in.h>
 #endif

CMakeLists.txt

@@ -10,6 +10,15 @@ if(COMMAND cmake_policy)
    if(POLICY CMP0067)
        cmake_policy(SET CMP0067 NEW)
    endif()
+    
+  # OpenGL VND policy : use the old definition for now, until we can audit this
+  if(POLICY CMP0072)
+        cmake_policy(SET CMP0072 OLD)
+  endif()
+
+   if(POLICY CMP0093)
+       cmake_policy(SET CMP0093 NEW)
+   endif()
 endif()
 
 
@@ -40,7 +49,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
 # read 'version' file into a variable (stripping any newlines or spaces)
-file(READ version versionFile)
+file(READ simgear-version versionFile)
 string(STRIP ${versionFile} SIMGEAR_VERSION)
 
 project(SimGear VERSION ${SIMGEAR_VERSION} LANGUAGES C CXX)
@@ -134,6 +143,7 @@ if (NOT ENABLE_SIMD AND ENABLE_SIMD_CODE)
 endif()
 
 include (DetectArch)
+include (ExportDebugSymbols)
 
 # until the fstream fix is applied and generally available in OSG,
 # keep the compatability link option as the default
@@ -150,7 +160,7 @@ endif()
 
 
 if (MSVC)
-  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} PATH)
+  GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_BINARY_DIR} DIRECTORY)
   if (CMAKE_CL_64)
     SET(TEST_3RDPARTY_DIR "${PARENT_DIR}/3rdparty.x64")
   else (CMAKE_CL_64)
@@ -161,6 +171,11 @@ if (MSVC)
   else (EXISTS ${TEST_3RDPARTY_DIR})
     set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
   endif (EXISTS ${TEST_3RDPARTY_DIR})
+
+  # override CMake default RelWithDebInfo flags. This is important to ensure
+  # good performance
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Zi /O2 /Ob2 /D NDEBUG")
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Zi /O2 /Ob2 /D NDEBUG")
 else (MSVC)
   set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
 endif (MSVC)
@@ -173,15 +188,17 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
 
   set( OSG_MSVC "msvc" )
   if (${MSVC_VERSION_MAJOR} EQUAL "19")
-    if (${MSVC_VERSION_MINOR} EQUAL "00")
-      set( OSG_MSVC ${OSG_MSVC}140 )
-    else ()
+    if (${MSVC_VERSION_MINOR} GREATER_EQUAL "20")
+      set( OSG_MSVC ${OSG_MSVC}142 )
+    elseif (${MSVC_VERSION_MINOR} GREATER_EQUAL "10")
       set( OSG_MSVC ${OSG_MSVC}141 )
+    else ()
+      set( OSG_MSVC ${OSG_MSVC}140 )
     endif ()
   elseif (${MSVC_VERSION_MAJOR} EQUAL "18")
     set( OSG_MSVC ${OSG_MSVC}120 )
   else ()
-    message(FATAL_ERROR "Visual Studio 2013/15/17 is required")
+    message(FATAL_ERROR "Visual Studio 2013 or higher is required")
   endif ()
 
   if (CMAKE_CL_64)
@@ -198,7 +215,7 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
     # if this variable was not set by the user, set it to 3rdparty root's
     # parent dir, which is the normal location for people using our
     # windows-3rd-party repo
-    GET_FILENAME_COMPONENT(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} PATH)
+    get_filename_component(MSVC_ROOT_PARENT_DIR ${MSVC_3RDPARTY_ROOT} DIRECTORY)
     set(BOOST_INCLUDEDIR ${MSVC_ROOT_PARENT_DIR})
     message(STATUS "BOOST_INCLUDEDIR is ${BOOST_INCLUDEDIR}")
   endif()
@@ -216,7 +233,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD
 endif()
 
 find_package(Boost REQUIRED)
-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION -DBOOST_NO_STDLIB_CONFIG")
 include(BoostTestTargets)
 
 if(SIMGEAR_HEADLESS)
@@ -261,7 +278,14 @@ else()
     endif()
 endif(SIMGEAR_HEADLESS)
 
-find_package(ZLIB 1.2.4 REQUIRED)
+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+    # As of 2020-08-01, OpenBSD's system zlib is slightly old, but it's usable
+    # with a workaround in simgear/io/iostreams/gzfstream.cxx.
+    find_package(ZLIB 1.2.3 REQUIRED)
+else()
+    find_package(ZLIB 1.2.4 REQUIRED)
+endif()
+
 find_package(CURL REQUIRED)
 
 if (SYSTEM_EXPAT)
@@ -271,9 +295,6 @@ if (SYSTEM_EXPAT)
 
 else()
     message(STATUS "Using built-in expat code")
-    # XML_STATIC is important to avoid sg_expat_external.h
-    # declaring symbols as declspec(import)
-    add_definitions(-DHAVE_EXPAT_CONFIG_H -DXML_STATIC)
     set(EXPAT_INCLUDE_DIRS
             ${PROJECT_SOURCE_DIR}/3rdparty/expat
             ${PROJECT_BINARY_DIR}/3rdparty/expat)
@@ -292,11 +313,10 @@ endif()
 if(ENABLE_RTI)
     find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)
-      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
+      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig:$ENV{PKG_CONFIG_PATH}")
       pkg_check_modules(RTI hla-rti13)
     endif(PKG_CONFIG_FOUND)
     if(RTI_FOUND)
-      SET(RTI_INCLUDE_DIR "${RTI_INCLUDE_DIRS}")
       message(STATUS "RTI: ENABLED")
     else()
       message(STATUS "RTI: DISABLED")
@@ -410,16 +430,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
       message(WARNING "GCC 4.4 will be required soon, please upgrade")
     endif()
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(CMAKE_C_FLAGS
-        "${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline")
-      set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline")
-    elseif (ENABLE_SIMD)
-      if (X86 OR X86_64)
-        set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
-        set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
-      endif()
+    if (X86 OR X86_64)
+        set(SIMD_COMPILER_FLAGS "-msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
     endif()
 
     # certain GCC versions don't provide the atomic builds, and hence
@@ -428,6 +440,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     check_cxx_source_compiles(
        "int main() { unsigned mValue; return __sync_add_and_fetch(&mValue, 1); }"
         GCC_ATOMIC_BUILTINS_FOUND)
+
+      # override CMake default RelWithDebInfo flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO  "-O3 -g -DNDEBUG")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
 if (CLANG)
@@ -438,17 +454,11 @@ if (CLANG)
     # fix Boost compilation :(
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 
-    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(CMAKE_C_FLAGS
-        "${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
-      set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
-    elseif (ENABLE_SIMD)
-      if (X86 OR X86_64)
-        set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
-        set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
-      endif()
-    endif()
+    # override CMake default RelWithDebInfo flags.
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO  "-O3 -g -DNDEBUG")
+
+    set(SIMD_COMPILER_FLAGS "-msse2 -mfpmath=sse -ftree-vectorize -ftree-slp-vectorize")
 endif()
 
 if (ENABLE_OPENMP)
@@ -480,14 +490,8 @@ if(WIN32)
 
     if(MSVC)
         set(MSVC_FLAGS "-DWIN32 -DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS /MP")
-        if(ENABLE_SIMD)
-          if (X86)
-            SET(CMAKE_C_FLAGS_RELEASE "/O2 /arch:SSE /arch:SSE2")
-            SET(CMAKE_CXX_FLAGS_RELEASE "/O2 /arch:SSE /arch:SSE2")
-          else()
-            SET(CMAKE_C_FLAGS_RELEASE "/O2")
-            SET(CMAKE_CXX_FLAGS_RELEASE "/O2")
-          endif()
+        if (X86)
+          set(SIMD_COMPILER_FLAGS "/arch:SSE /arch:SSE2")
         endif()
 
         if (NOT OSG_FSTREAM_EXPORT_FIXED)
@@ -511,6 +515,20 @@ if(WIN32)
     set( RT_LIBRARY "winmm" )
 endif(WIN32)
 
+# append the SIMD flags if requested
+if (ENABLE_SIMD)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SIMD_COMPILER_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIMD_COMPILER_FLAGS}")
+
+  # set for multi-configuration generators
+  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${SIMD_COMPILER_FLAGS}")
+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${SIMD_COMPILER_FLAGS}")
+
+  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${SIMD_COMPILER_FLAGS}")
+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${SIMD_COMPILER_FLAGS}")
+endif()
+
+
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS_C} ${MSVC_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS_CXX} ${MSVC_FLAGS} ${BOOST_CXX_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${MSVC_LD_FLAGS}")
@@ -521,6 +539,10 @@ include(CheckCXXFeatures)
 # ahead of system-installed libs
 include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
+    include_directories("/usr/X11R6/include")
+endif()
+
 add_definitions(-DHAVE_CONFIG_H)
 
 # configure a header file to pass some of the CMake settings

CMakeModules/BoostTestTargets.cmake

@@ -46,11 +46,17 @@ set(BOOST_TEST_TARGET_PREFIX "test")
 if(NOT Boost_FOUND)
 	find_package(Boost 1.34.0 QUIET)
 endif()
-if("${Boost_VERSION}0" LESS "1034000")
+
+if (NOT Boost_VERSION_MACRO)
+	# Compatibility with pre CMP0093 (CMake 3.15)
+	set(Boost_VERSION_MACRO ${Boost_VERSION})
+endif()
+
+if("${Boost_VERSION_MACRO}0" LESS "1034000")
 	set(_shared_msg
 		"NOTE: boost::test-based targets and tests cannot "
 		"be added: boost >= 1.34.0 required but not found. "
-		"(found: '${Boost_VERSION}'; want >=103400) ")
+		"(found: '${Boost_VERSION_MACRO}'; want >=103400) ")
 	if(ENABLE_TESTS)
 		message(FATAL_ERROR
 			${_shared_msg}
@@ -66,7 +72,7 @@ endif()
 include(GetForceIncludeDefinitions)
 include(CopyResourcesToBuildTree)
 
-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
+if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
 	set(_boosttesttargets_libs)
 	set(_boostConfig "BoostTestTargetsIncluded.h")
 	if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
@@ -80,7 +86,7 @@ if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
 			set(_boostConfig "BoostTestTargetsDynamic.h")
 		endif()
 	endif()
-	get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+	get_filename_component(_moddir ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
 	configure_file("${_moddir}/${_boostConfig}"
 		"${CMAKE_CURRENT_BINARY_DIR}/BoostTestTargetConfig.h"
 		COPYONLY)
@@ -129,7 +135,7 @@ function(add_boost_test _name)
 			"Syntax error in use of add_boost_test: at least one source file required!")
 	endif()
 
-	if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
+	if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
 
 		include_directories(${Boost_INCLUDE_DIRS})
 
@@ -221,7 +227,7 @@ function(add_boost_test _name)
 			set(_test_command ${_target_name})
 		endif()
 
-		if(TESTS AND ( "${Boost_VERSION}" VERSION_GREATER "103799" ))
+		if(TESTS AND ( "${Boost_VERSION_MACRO}" VERSION_GREATER "103799" ))
 			foreach(_test ${TESTS})
 				add_test(
 					${_name}-${_test}

CMakeModules/CopyResourcesToBuildTree.cmake

@@ -30,12 +30,12 @@ function(copy_resources_to_build_tree _target)
 	endif()
 
 	get_target_property(_path ${_target} LOCATION)
-	get_filename_component(_path "${_path}" PATH)
+	get_filename_component(_path "${_path}" DIRECTORY)
 
 	if(NOT MSVC AND NOT "${CMAKE_GENERATOR}" MATCHES "Makefiles")
 		foreach(_config ${CMAKE_CONFIGURATION_TYPES})
 			get_target_property(_path${_config} ${_target} LOCATION_${_config})
-			get_filename_component(_path${_config} "${_path${_config}}" PATH)
+			get_filename_component(_path${_config} "${_path${_config}}" DIRECTORY)
 			add_custom_command(TARGET ${_target}
 						POST_BUILD
 						COMMAND

CMakeModules/ExportDebugSymbols.cmake

@@ -0,0 +1,26 @@
+
+
+# placehodler target for other ones to depend upon
+add_custom_target(
+    debug_symbols
+)
+
+function(export_debug_symbols target)
+
+    if (NOT SIMGEAR_SHARED)
+        return()
+    endif()
+
+    if (APPLE)
+        add_custom_target(${target}.dSYM
+            COMMENT "Generating dSYM files for ${target}"
+            COMMAND dsymutil --out=${target}.dSYM $<TARGET_FILE:${target}>
+            DEPENDS $<TARGET_FILE:${target}>
+        ) 
+
+        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${target}.dSYM DESTINATION symbols OPTIONAL)
+
+        add_dependencies(debug_symbols ${target}.dSYM)
+    endif()
+
+endfunction()

SimGearConfig.cmake.in

@@ -18,6 +18,16 @@ set(USE_AEONWAVE @USE_AEONWAVE@)
 
 set(ENABLE_SIMD @ENABLE_SIMD@)
 
+# OpenRTI support
+set(ENABLE_RTI @ENABLE_RTI@)
+if(ENABLE_RTI)
+  set(RTI_FOUND @RTI_FOUND@)
+  if(RTI_FOUND)
+    set(RTI_INCLUDE_DIRS @RTI_INCLUDE_DIRS@)
+    set(RTI_LDFLAGS @RTI_LDFLAGS@)
+  endif(RTI_FOUND)
+endif(ENABLE_RTI)
+
 # Alternative terrain engine based on pagedLOD
 
 set(ENABLE_GDAL @ENABLE_GDAL@)

simgear-version

@@ -0,0 +1 @@
+2020.3.2

simgear/CMakeLists.txt

@@ -6,6 +6,7 @@ foreach( mylibfolder
         bvh
         debug
         embedded_resources
+        emesary
         ephemeris
         io
         magvar
@@ -64,6 +65,9 @@ if(SIMGEAR_SHARED)
         set_property(TARGET SimGearScene PROPERTY VERSION   ${SIMGEAR_VERSION})
         set_property(TARGET SimGearScene PROPERTY SOVERSION ${SIMGEAR_SOVERSION})
     endif()
+
+    export_debug_symbols(SimGearCore)
+    export_debug_symbols(SimGearScene)
 else()
     message(STATUS "Library building mode: STATIC LIBRARIES")
 
@@ -114,11 +118,22 @@ target_include_directories(SimGearCore BEFORE PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:include>)
 
+# so simgear/simgear_config.h is found
+target_include_directories(SimGearCore BEFORE PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
+    $<INSTALL_INTERFACE:include>)
+
 target_include_directories(SimGearCore PUBLIC
   ${Boost_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
 target_include_directories(SimGearCore PRIVATE
   ${EXPAT_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})
 
+if (NOT SYSTEM_EXPAT)
+    # XML_STATIC is important to avoid sg_expat_external.h
+    # declaring symbols as declspec(import)
+    target_compile_definitions(SimGearCore PRIVATE HAVE_SIMGEAR_EXPAT_CONFIG_H XML_STATIC)
+endif()
+
     install(TARGETS SimGearCore
             EXPORT SimGearTargets
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -143,40 +158,42 @@ if (NOT SIMGEAR_HEADLESS)
     endif()
 endif()
 
+# we expose ZLib in some of our headers
+target_link_libraries(SimGearCore PUBLIC ${ZLIB_LIBRARY})
 
-target_link_libraries(SimGearCore
-    ${ZLIB_LIBRARY}
+target_link_libraries(SimGearCore PRIVATE
     ${RT_LIBRARY}
     ${DL_LIBRARY}
     ${CMAKE_THREAD_LIBS_INIT}
     ${COCOA_LIBRARY}
     ${CURL_LIBRARIES}
-    ${WINSOCK_LIBRARY})
+    ${WINSOCK_LIBRARY}
+    ${SHLWAPI_LIBRARY})
 
 if(SYSTEM_EXPAT)
-    target_link_libraries(SimGearCore
-        ${EXPAT_LIBRARIES})
+    target_link_libraries(SimGearCore PRIVATE ${EXPAT_LIBRARIES})
 endif()
 
 if(ENABLE_DNS AND SYSTEM_UDNS)
-    target_link_libraries(SimGearCore
-        ${UDNS_LIBRARIES})
+    target_link_libraries(SimGearCore PRIVATE ${UDNS_LIBRARIES})
 endif()
 
 if(NOT SIMGEAR_HEADLESS)
     target_include_directories(SimGearScene PRIVATE ${PROJECT_SOURCE_DIR}/simgear/canvas/ShivaVG/include)
 
-    target_link_libraries(SimGearScene
+    target_link_libraries(SimGearScene PUBLIC         
         SimGearCore
-        ${ZLIB_LIBRARY}
         ${OPENSCENEGRAPH_LIBRARIES}
+    )
+
+    target_link_libraries(SimGearScene PRIVATE
+        ${ZLIB_LIBRARY}
         ${OPENAL_LIBRARY}
         ${OPENGL_LIBRARY}
         ${JPEG_LIBRARY})
 
     if(ENABLE_GDAL)
-        target_link_libraries(SimGearScene
-            ${GDAL_LIBRARIES})
+        target_link_libraries(SimGearScene PRIVATE ${GDAL_LIBRARIES})
     endif()
 
     # only actually needed by canvas/KeyboardEvent.cxx
@@ -188,5 +205,5 @@ if(ENABLE_RTI)
     set_property(SOURCE hla/RTI13InteractionClass.cxx hla/RTI13ObjectClass.cxx
         hla/RTI13ObjectInstance.cxx hla/RTI13Federate.cxx
         hla/RTI13FederateFactory.cxx
-        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIR}")
+        APPEND PROPERTY COMPILE_FLAGS "-I${RTI_INCLUDE_DIRS}")
 endif(ENABLE_RTI)

simgear/bvh/BVHPager.cxx

@@ -20,9 +20,9 @@
 #include "BVHPager.hxx"
 
 #include <list>
+#include <mutex>
 
 #include <simgear/threads/SGThread.hxx>
-#include <simgear/threads/SGGuard.hxx>
 
 #include "BVHPageNode.hxx"
 #include "BVHPageRequest.hxx"
@@ -37,12 +37,12 @@ struct BVHPager::_PrivateData : protected SGThread {
     struct _LockedQueue {
         void _push(const _Request& request)
         {
-            SGGuard<SGMutex> scopeLock(_mutex);
+            std::lock_guard<std::mutex> scopeLock(_mutex);
             _requestList.push_back(request);
         }
         _Request _pop()
         {
-            SGGuard<SGMutex> scopeLock(_mutex);
+            std::lock_guard<std::mutex> scopeLock(_mutex);
             if (_requestList.empty())
                 return _Request();
             _Request request;
@@ -51,7 +51,7 @@ struct BVHPager::_PrivateData : protected SGThread {
             return request;
         }
     private:
-        SGMutex _mutex;
+        std::mutex _mutex;
         _RequestList _requestList;
     };
     
@@ -62,7 +62,7 @@ struct BVHPager::_PrivateData : protected SGThread {
         }
         void _push(const _Request& request)
         {
-            SGGuard<SGMutex> scopeLock(_mutex);
+            std::lock_guard<std::mutex> scopeLock(_mutex);
             bool needSignal = _requestList.empty();
             _requestList.push_back(request);
             if (needSignal)
@@ -70,7 +70,7 @@ struct BVHPager::_PrivateData : protected SGThread {
         }
         _Request _pop()
         {
-            SGGuard<SGMutex> scopeLock(_mutex);
+            std::lock_guard<std::mutex> scopeLock(_mutex);
             while (_requestList.empty())
                 _waitCondition.wait(_mutex);
             _Request request;
@@ -79,7 +79,7 @@ struct BVHPager::_PrivateData : protected SGThread {
             return request;
         }
     private:
-        SGMutex _mutex;
+        std::mutex _mutex;
         SGWaitCondition _waitCondition;
         _RequestList _requestList;
     };

simgear/canvas/CanvasMgr.hxx

@@ -28,42 +28,39 @@ namespace simgear
 namespace canvas
 {
 
-  class CanvasMgr:
-    public PropertyBasedMgr
-  {
-    public:
+class CanvasMgr : public PropertyBasedMgr
+{
+public:
+    /**
+     * @param node    Root node of branch used to control canvasses
+     */
+    CanvasMgr(SGPropertyNode_ptr node);
 
-      /**
-       * @param node    Root node of branch used to control canvasses
-       */
-      CanvasMgr(SGPropertyNode_ptr node);
+    /**
+     * Create a new canvas
+     *
+     * @param name    Name of the new canvas
+     */
+    CanvasPtr createCanvas(const std::string& name = "");
 
-      /**
-       * Create a new canvas
-       *
-       * @param name    Name of the new canvas
-       */
-      CanvasPtr createCanvas(const std::string& name = "");
+    /**
+     * Get ::Canvas by index
+     *
+     * @param index Index of texture node in /canvas/by-index/
+     */
+    CanvasPtr getCanvas(size_t index) const;
 
-      /**
-       * Get ::Canvas by index
-       *
-       * @param index Index of texture node in /canvas/by-index/
-       */
-      CanvasPtr getCanvas(size_t index) const;
+    /**
+     * Get ::Canvas by name
+     *
+     * @param name Value of child node "name" in
+     *             /canvas/by-index/texture[i]/name
+     */
+    CanvasPtr getCanvas(const std::string& name) const;
 
-      /**
-       * Get ::Canvas by name
-       *
-       * @param name Value of child node "name" in
-       *             /canvas/by-index/texture[i]/name
-       */
-      CanvasPtr getCanvas(const std::string& name) const;
-
-    protected:
-
-      void elementCreated(PropertyBasedElementPtr element) override;
-  };
+protected:
+    void elementCreated(PropertyBasedElementPtr element) override;
+};
 
 } // namespace canvas
 } // namespace simgear

simgear/canvas/CanvasWindow.hxx

@@ -68,8 +68,8 @@ namespace canvas
               Element* parent = 0 );
       virtual ~Window();
 
-      virtual void update(double delta_time_sec);
-      virtual void valueChanged(SGPropertyNode* node);
+      void update(double delta_time_sec) override;
+      void valueChanged(SGPropertyNode* node) override;
 
       const SGVec2<float> getPosition() const;
       const SGRect<float>  getScreenRegion() const;
@@ -84,8 +84,8 @@ namespace canvas
       bool isResizable() const;
       bool isCapturingEvents() const;
 
-      virtual void setVisible(bool visible);
-      virtual bool isVisible() const;
+      void setVisible(bool visible) override;
+      bool isVisible() const override;
 
       /**
        * Moves window on top of all other windows with the same z-index.

simgear/canvas/ODGauge.cxx

@@ -250,10 +250,16 @@ namespace canvas
 
     if( !texture )
     {
+      // It shouldn't be necessary to allocate an image for the
+      // texture that is the target of dynamic rendering, but
+      // otherwise OSG won't construct all the mipmaps for the texture
+      // and dynamic mipmap generation doesn't work.
+      osg::Image* image = new osg::Image;
+      image->allocateImage(_size_x, _size_y, 1, GL_RGBA, GL_UNSIGNED_BYTE);
       texture = new osg::Texture2D;
       texture->setResizeNonPowerOfTwoHint(false);
-      texture->setTextureSize(_size_x, _size_y);
-      texture->setInternalFormat(GL_RGBA);
+      texture->setImage(image);
+      texture->setUnRefImageDataAfterApply(true);
     }
 
     updateSampling();

simgear/canvas/ShivaVG/src/shConfig.h

@@ -31,6 +31,11 @@
     // FreeBSD
     #define VG_API_FREEBSD
 
+#elif defined(__OpenBSD__)
+
+    // FreeBSD
+    #define VG_API_OPENBSD
+
 #else
 
     // Unsupported system

simgear/canvas/ShivaVG/src/shDefs.h

@@ -34,7 +34,7 @@
 #include <math.h>
 #include <float.h>
 
-#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__)
+#if !defined(VG_API_MACOSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
 #  include <malloc.h>
 #endif
 
@@ -161,7 +161,7 @@ SHfloat getMaxFloat();
 
 /* OpenGL headers */
 
-#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD)
+#if defined(VG_API_LINUX) || defined(VG_API_FREEBSD) || defined(VG_API_OPENBSD)
     #include <GL/gl.h>
     #include <GL/glx.h>
 #elif defined(VG_API_MACOSX)

simgear/canvas/ShivaVG/src/shPath.c

@@ -1193,7 +1193,7 @@ VG_API_CALL VGboolean vgInterpolatePath(VGPath dstPath, VGPath startPath,
   SHfloat *procData1, *procData2;
   SHint procSegCount1=0, procSegCount2=0;
   SHint procDataCount1=0, procDataCount2=0;
-  SHuint8 *newSegs, *newData;
+  SHuint8 *newSegs, *newData=0;
   void *userData[4];
   SHint segment1, segment2;
   SHint segindex, s,d,i;

simgear/canvas/canvas_fwd.hxx

@@ -26,11 +26,9 @@
 #include <osg/ref_ptr>
 #include <osgText/Font>
 
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
+#include <functional>
 #include <map>
+#include <memory>
 #include <vector>
 
 namespace simgear
@@ -62,8 +60,8 @@ namespace canvas
 
 #define SG_FWD_DECL(name)\
   class name;\
-  typedef boost::shared_ptr<name> name##Ptr;\
-  typedef boost::weak_ptr<name> name##WeakPtr;
+  typedef std::shared_ptr<name> name##Ptr;\
+  typedef std::weak_ptr<name> name##WeakPtr;
 
   SG_FWD_DECL(Placement)
   SG_FWD_DECL(SystemAdapter)
@@ -85,10 +83,10 @@ namespace canvas
   typedef osg::ref_ptr<osgText::Font> FontPtr;
 
   typedef std::vector<PlacementPtr> Placements;
-  typedef boost::function<Placements( SGPropertyNode*,
-                                      CanvasPtr )> PlacementFactory;
+  typedef std::function<Placements( SGPropertyNode*,
+                                    CanvasPtr )> PlacementFactory;
 
-  typedef boost::function<void(const EventPtr&)> EventListener;
+  typedef std::function<void(const EventPtr&)> EventListener;
 
 } // namespace canvas
 } // namespace simgear

simgear/canvas/elements/CanvasElement.hxx

@@ -29,9 +29,6 @@
 #include <osg/BoundingBox>
 #include <osg/MatrixTransform>
 
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-
 namespace osg
 {
   class Drawable;
@@ -62,9 +59,9 @@ namespace canvas
           OSGUserData(ElementPtr element);
       };
 
-      typedef boost::function<bool(Element&, const SGPropertyNode*)>
+      typedef std::function<bool(Element&, const SGPropertyNode*)>
               StyleSetterFunc;
-      typedef boost::function<void(Element&, const SGPropertyNode*)>
+      typedef std::function<void(Element&, const SGPropertyNode*)>
               StyleSetterFuncUnchecked;
       struct StyleSetter:
         public SGReferenced
@@ -319,7 +316,7 @@ namespace canvas
       StyleSetter
       addStyle( const std::string& name,
                 const std::string& type,
-                const boost::function<void (Derived&, T2)>& setter,
+                const std::function<void (Derived&, T2)>& setter,
                 bool inheritable = true )
       {
         StyleInfo& style_info = _style_setters[ name ];
@@ -345,13 +342,10 @@ namespace canvas
         if( style->func )
           style = style->next = new StyleSetter;
 
-        style->func = boost::bind
-        (
-          &type_match<Derived>::call,
-          _1,
-          _2,
-          bindStyleSetter<T1>(name, setter)
-        );
+        style->func = std::bind(&type_match<Derived>::call,
+                                std::placeholders::_1,
+                                std::placeholders::_2,
+                                bindStyleSetter<T1>(name, setter));
         return *style;
       }
 
@@ -363,7 +357,7 @@ namespace canvas
       StyleSetter
       addStyle( const std::string& name,
                 const std::string& type,
-                const boost::function<void (Derived&, T)>& setter,
+                const std::function<void (Derived&, T)>& setter,
                 bool inheritable = true )
       {
         return addStyle<T, T>(name, type, setter, inheritable);
@@ -384,7 +378,7 @@ namespace canvas
         (
           name,
           type,
-          boost::function<void (Derived&, T)>(setter),
+          std::function<void (Derived&, T)>(setter),
           inheritable
         );
       }
@@ -405,7 +399,7 @@ namespace canvas
         (
           name,
           type,
-          boost::function<void (Derived&, T2)>(setter),
+          std::function<void (Derived&, T2)>(setter),
           inheritable
         );
       }
@@ -424,7 +418,7 @@ namespace canvas
         (
           name,
           type,
-          boost::function<void (Derived&, const std::string&)>(setter),
+          std::function<void (Derived&, const std::string&)>(setter),
           inheritable
         );
       }
@@ -487,7 +481,7 @@ namespace canvas
       StyleSetter
       addStyle( const std::string& name,
                 const std::string& type,
-                const boost::function<void (Other&, T2)>& setter,
+                const std::function<void (Other&, T2)>& setter,
                 OtherRef Derived::*instance_ref,
                 bool inheritable = true )
       {
@@ -517,7 +511,7 @@ namespace canvas
         (
           name,
           type,
-          boost::function<void (Other&, const std::string&)>(setter),
+          std::function<void (Other&, const std::string&)>(setter),
           instance_ref,
           inheritable
         );
@@ -525,44 +519,37 @@ namespace canvas
 
       template<typename T, class Derived, class Other, class OtherRef>
       static
-      boost::function<void (Derived&, T)>
+      std::function<void (Derived&, T)>
       bindOther( void (Other::*setter)(T), OtherRef Derived::*instance_ref )
       {
-        return boost::bind(setter, boost::bind(instance_ref, _1), _2);
+        return std::bind(setter,
+                         std::bind(instance_ref, std::placeholders::_1),
+                         std::placeholders::_2);
       }
 
       template<typename T, class Derived, class Other, class OtherRef>
       static
-      boost::function<void (Derived&, T)>
-      bindOther( const boost::function<void (Other&, T)>& setter,
+      std::function<void (Derived&, T)>
+      bindOther( const std::function<void (Other&, T)>& setter,
                  OtherRef Derived::*instance_ref )
       {
-        return boost::bind
-        (
-          setter,
-          boost::bind
-          (
-            &reference_from_pointer<Other, OtherRef>,
-            boost::bind(instance_ref, _1)
-          ),
-          _2
-        );
+        return std::bind(setter,
+                         std::bind(&reference_from_pointer<Other, OtherRef>,
+                                   std::bind(instance_ref, std::placeholders::_1)),
+                         std::placeholders::_2);
       }
 
       template<typename T1, typename T2, class Derived>
       static
       StyleSetterFuncUnchecked
       bindStyleSetter( const std::string& name,
-                       const boost::function<void (Derived&, T2)>& setter )
+                       const std::function<void (Derived&, T2)>& setter )
       {
-        return boost::bind
-        (
-          setter,
-          // We will only call setters with Derived instances, so we can safely
-          // cast here.
-          boost::bind(&derived_cast<Derived>, _1),
-          boost::bind(&getValue<T1>, _2)
-        );
+        return std::bind(setter,
+                         // We will only call setters with Derived instances, so we can safely
+                         // cast here.
+                         std::bind(&derived_cast<Derived>, std::placeholders::_1),
+                         std::bind(&getValue<T1>, std::placeholders::_2));
       }
 
       bool isStyleEmpty(const SGPropertyNode* child) const;

simgear/canvas/elements/CanvasImage.cxx

@@ -838,5 +838,143 @@ namespace canvas
     return false;
   }
 
+  void Image::fillRect(const SGRect<int>& rect, const std::string& c)
+  {
+    osg::Vec4 color(1,1,1,1);
+    if(!c.empty() && !parseColor(c, color))
+      return;
+    
+    fillRect(rect, color);
+  }
+
+void fillRow(GLubyte* row, GLuint pixel, GLuint width, GLuint pixelBytes)
+{
+  GLubyte* dst = row;
+  for (GLuint x = 0; x < width; ++x) {
+    memcpy(dst, &pixel, pixelBytes);
+    dst += pixelBytes;
+  }
+}
+
+SGRect<int> intersectRect(const SGRect<int>& a, const SGRect<int>& b)
+{
+  SGVec2<int> m1 = max(a.getMin(), b.getMin());
+  SGVec2<int> m2 = min(a.getMax(), b.getMax());
+  return SGRect<int>(m1, m2);
+}
+
+  void Image::fillRect(const SGRect<int>& rect, const osg::Vec4& color)
+  {
+    osg::ref_ptr<osg::Image> image = _texture->getImage();
+    if (!image) {
+      allocateImage();
+      image = _texture->getImage();
+    }
+      
+      if (image->getDataVariance() != osg::Object::DYNAMIC) {
+          image->setDataVariance(osg::Object::DYNAMIC);
+      }
+      
+    const auto format = image->getInternalTextureFormat();
+    
+    auto clippedRect = intersectRect(rect, SGRect<int>(0, 0, image->s(), image->t()));
+    if ((clippedRect.width() == 0) || (clippedRect.height() == 0)) {
+      return;
+    }
+    
+    GLubyte* rowData = nullptr;
+    size_t rowByteSize = 0;
+    GLuint pixelWidth = clippedRect.width();
+    GLuint pixel = 0;
+    GLuint pixelBytes = 0;
+    
+    switch (format) {
+    case GL_RGBA8:
+    case GL_RGBA:
+        rowByteSize = pixelWidth * 4;
+        rowData = static_cast<GLubyte*>(alloca(rowByteSize));
+        
+        // assume litte-endian, so read out backwards, hence when we memcpy
+        // the data, it ends up in RGBA order
+        pixel = color.asABGR();
+        pixelBytes = 4;
+        fillRow(rowData, pixel, pixelWidth, pixelBytes);
+        break;
+    
+    case GL_RGB8:
+    case GL_RGB:
+        rowByteSize = pixelWidth * 3;
+        rowData = static_cast<GLubyte*>(alloca(rowByteSize));
+        pixel = color.asABGR();
+        pixelBytes = 3;
+        fillRow(rowData, pixel, pixelWidth, pixelBytes);
+        break;
+        
+    default:
+      SG_LOG(SG_IO, SG_WARN, "Image::fillRect: unsupported internal image format:" << format);
+      return;
+    }
+    
+    for (int row=clippedRect.t(); row < clippedRect.b(); ++row) {
+      GLubyte* imageData = image->data(clippedRect.l(), row);
+      memcpy(imageData, rowData, rowByteSize);
+    }
+      
+    image->dirty();
+    auto c = getCanvas().lock();
+    c->enableRendering(true); // force a repaint
+  }
+
+  void Image::setPixel(int x, int y, const std::string& c)
+  {
+    osg::Vec4 color(1,1,1,1);
+    if(!c.empty() && !parseColor(c, color))
+      return;
+    
+    setPixel(x, y, color);
+  }
+
+  void Image::setPixel(int x, int y, const osg::Vec4& color)
+  {
+    osg::ref_ptr<osg::Image> image = _texture->getImage();
+    if (!image) {
+        allocateImage();
+        image = _texture->getImage();
+    }
+     
+    if (image->getDataVariance() != osg::Object::DYNAMIC) {
+      image->setDataVariance(osg::Object::DYNAMIC);
+    }
+      
+    image->setColor(color, x, y);
+  }
+
+    void Image::dirtyPixels()
+    {
+        osg::ref_ptr<osg::Image> image = _texture->getImage();
+        if (!image)
+            return;
+        image->dirty();
+        auto c = getCanvas().lock();
+        c->enableRendering(true); // force a repaint
+    }
+
+  void Image::allocateImage()
+  {
+    osg::Image* image = new osg::Image;
+    // default to RGBA
+    image->allocateImage(_node->getIntValue("size[0]"), _node->getIntValue("size[1]"), 1, GL_RGBA, GL_UNSIGNED_BYTE);
+    image->setInternalTextureFormat(GL_RGBA);
+    _texture->setImage(image);
+  }
+
+
+osg::ref_ptr<osg::Image> Image::getImage() const
+{
+    if (!_texture)
+        return {};
+    return _texture->getImage();
+}
+
 } // namespace canvas
 } // namespace simgear

simgear/canvas/elements/CanvasImage.hxx

@@ -101,6 +101,28 @@ namespace canvas
        */
       void setSourceRect(const SGRect<float>& sourceRect);
 
+      /**
+       * fill the specified rectangle of the image, with an RGB value
+       */
+      void fillRect(const SGRect<int>& rect, const std::string& color);
+      
+      /**
+       * fill the specified rectangle of the image, with an RGB value
+       */
+      void fillRect(const SGRect<int>& rect, const osg::Vec4& color);
+      
+      void setPixel(int x, int y, const std::string& color);
+      
+      void setPixel(int x, int y, const osg::Vec4& color);
+
+      /**
+        * mark the image pixels as modified, so the canvas is re-painted
+       */
+      void dirtyPixels();
+      
+      osg::ref_ptr<osg::Image> getImage() const;
+      
+    //  void setRow(int row, int offset, )
     protected:
       enum ImageAttributes
       {
@@ -125,6 +147,8 @@ namespace canvas
                       HTTP::Request& request,
                       const std::string& type );
 
+      void allocateImage();
+      
       osg::ref_ptr<osg::Texture2D> _texture;
       // TODO optionally forward events to canvas
       CanvasWeakPtr _src_canvas;

simgear/canvas/elements/CanvasText.cxx

@@ -53,26 +53,31 @@ namespace canvas
       TextLine lineAt(size_t i) const;
 
       /// Get nearest line to given y-coordinate
+#if OSG_VERSION_LESS_THAN(3,6,5)
       TextLine nearestLine(float pos_y) const;
-
-
       SGVec2i sizeForWidth(int w) const;
-
-      osg::BoundingBox
-#if OSG_VERSION_LESS_THAN(3,3,2)
-      computeBound()
 #else
-      computeBoundingBox()
+      TextLine nearestLine(float pos_y);
+      SGVec2i sizeForWidth(int w);
+#endif
+
+#if OSG_VERSION_LESS_THAN(3,3,2)
+      osg::BoundingBox computeBound() const override;
+#else
+      osg::BoundingBox computeBoundingBox() const override;
 #endif
-      const override;
 
     protected:
       friend class TextLine;
 
       canvas::Text *_text_element;
 
-      void computePositions(unsigned int contextID) const override;
-  };
+#if OSG_VERSION_LESS_THAN(3,5,6)
+     void computePositions(unsigned int contextID) const override;
+#else
+     void computePositionsImplementation() override;
+#endif
+};
 
   class TextLine
   {
@@ -122,6 +127,7 @@ namespace canvas
 
     _quads = &text->_textureGlyphQuadMap.begin()->second;
 
+#if OSG_VERSION_LESS_THAN(3,5,6)
     GlyphQuads::LineNumbers const& line_numbers = _quads->_lineNumbers;
     GlyphQuads::LineNumbers::const_iterator begin_it =
       std::lower_bound(line_numbers.begin(), line_numbers.end(), _line);
@@ -133,6 +139,9 @@ namespace canvas
     _begin = begin_it - line_numbers.begin();
     _end = std::upper_bound(begin_it, line_numbers.end(), _line)
          - line_numbers.begin();
+#else
+  // TODO: Need 3.5.6 version of this
+#endif
   }
 
   //----------------------------------------------------------------------------
@@ -161,34 +170,40 @@ namespace canvas
 
     if( empty() )
       return pos;
-#if OSG_VERSION_LESS_THAN(3,3,5)
-    GlyphQuads::Coords2 const& coords = _quads->_coords;
+
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,6)
+    // TODO: need 3.5.6 version of this.
 #else
-    GlyphQuads::Coords2 refCoords = _quads->_coords;
-    GlyphQuads::Coords2::element_type &coords = *refCoords.get();
+#if OSG_VERSION_LESS_THAN(3,3,5)
+      GlyphQuads::Coords2 const& coords = _quads->_coords;
+#else
+      GlyphQuads::Coords2 refCoords = _quads->_coords;
+      GlyphQuads::Coords2::element_type &coords = *refCoords.get();
 #endif
-    size_t global_i = _begin + i;
 
-    if( global_i == _begin )
-      // before first character of line
-      pos.x() = coords[_begin * 4].x();
-    else if( global_i == _end )
-      // After Last character of line
-      pos.x() = coords[(_end - 1) * 4 + 2].x();
-    else
-    {
-      float prev_l = coords[(global_i - 1) * 4].x(),
-            prev_r = coords[(global_i - 1) * 4 + 2].x(),
-            cur_l = coords[global_i * 4].x();
+      size_t global_i = _begin + i;
 
-      if( prev_l == prev_r )
-        // If previous character width is zero set to begin of next character
-        // (Happens eg. with spaces)
-        pos.x() = cur_l;
+      if (global_i == _begin)
+          // before first character of line
+          pos.x() = coords[_begin * 4].x();
+      else if (global_i == _end)
+          // After Last character of line
+          pos.x() = coords[(_end - 1) * 4 + 2].x();
       else
-        // position at center between characters
-        pos.x() = 0.5 * (prev_r + cur_l);
-    }
+      {
+          float prev_l = coords[(global_i - 1) * 4].x(),
+              prev_r = coords[(global_i - 1) * 4 + 2].x(),
+              cur_l = coords[global_i * 4].x();
+
+          if (prev_l == prev_r)
+              // If previous character width is zero set to begin of next character
+              // (Happens eg. with spaces)
+              pos.x() = cur_l;
+          else
+              // position at center between characters
+              pos.x() = 0.5 * (prev_r + cur_l);
+      }
+#endif
 
     return pos;
   }
@@ -196,17 +211,22 @@ namespace canvas
   //----------------------------------------------------------------------------
   osg::Vec2 TextLine::nearestCursor(float x) const
   {
-    if( empty() )
+    if (empty())
       return cursorPos(0);
 
-    GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
-    #if OSG_VERSION_LESS_THAN(3,3,5)
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,6)
+  // TODO: need 3.5.7 version of this.
+	return cursorPos(0);
+#else
+#if OSG_VERSION_LESS_THAN(3,3,5)
     GlyphQuads::Coords2 const& coords = _quads->_coords;
 #else
     GlyphQuads::Coords2 refCoords = _quads->_coords;
     GlyphQuads::Coords2::element_type &coords = *refCoords.get();
 #endif
 
+    GlyphQuads::Glyphs const& glyphs = _quads->_glyphs;
+
     float const HIT_FRACTION = 0.6;
     float const character_width = _text->getCharacterHeight()
                                 * _text->getCharacterAspectRatio();
@@ -225,6 +245,7 @@ namespace canvas
     }
 
     return cursorPos(i - _begin);
+#endif
   }
 
   //----------------------------------------------------------------------------
@@ -303,9 +324,16 @@ namespace canvas
   }
 
   //----------------------------------------------------------------------------
+#if OSG_VERSION_LESS_THAN(3,6,5)
   TextLine Text::TextOSG::nearestLine(float pos_y) const
   {
     osgText::Font const* font = getActiveFont();
+#else
+  TextLine Text::TextOSG::nearestLine(float pos_y)
+  {
+    auto font = getActiveFont();
+#endif
+
     if( !font || lineCount() <= 0 )
       return TextLine(0, this);
 
@@ -327,12 +355,21 @@ namespace canvas
   // simplified version of osgText::Text::computeGlyphRepresentation() to
   // just calculate the size for a given weight. Glpyh calculations/creating
   // is not necessary for this...
+#if OSG_VERSION_LESS_THAN(3,6,5)
   SGVec2i Text::TextOSG::sizeForWidth(int w) const
+#else
+  SGVec2i Text::TextOSG::sizeForWidth(int w)
+#endif
   {
     if( _text.empty() )
       return SGVec2i(0, 0);
 
+#if OSG_VERSION_LESS_THAN(3,6,5)
     osgText::Font* activefont = const_cast<osgText::Font*>(getActiveFont());
+#else
+    auto activefont = getActiveFont();
+#endif
+
     if( !activefont )
       return SGVec2i(-1, -1);
 
@@ -612,19 +649,16 @@ namespace canvas
   }
 
   //----------------------------------------------------------------------------
-  osg::BoundingBox
 #if OSG_VERSION_LESS_THAN(3,3,2)
-  Text::TextOSG::computeBound()
+  osg::BoundingBox Text::TextOSG::computeBound() const
 #else
-  Text::TextOSG::computeBoundingBox()
+  osg::BoundingBox Text::TextOSG::computeBoundingBox() const
 #endif
-  const
   {
-    osg::BoundingBox bb =
 #if OSG_VERSION_LESS_THAN(3,3,2)
-      osgText::Text::computeBound();
+      osg::BoundingBox bb = osgText::Text::computeBound();
 #else
-      osgText::Text::computeBoundingBox();
+      osg::BoundingBox bb = osgText::Text::computeBoundingBox();
 #endif
 
 #if OSG_VERSION_LESS_THAN(3,1,0)
@@ -640,7 +674,7 @@ namespace canvas
     return bb;
   }
 
-  //----------------------------------------------------------------------------
+#if OSG_VERSION_LESS_THAN(3,5,6)
   void Text::TextOSG::computePositions(unsigned int contextID) const
   {
     if( _textureGlyphQuadMap.empty() || _layout == VERTICAL )
@@ -710,6 +744,14 @@ namespace canvas
     return osgText::Text::computePositions(contextID);
   }
 
+#else
+  void Text::TextOSG::computePositionsImplementation()
+  {
+    TextBase::computePositionsImplementation();
+  }
+#endif
+ //----------------------------------------------------------------------------
+
   //----------------------------------------------------------------------------
   const std::string Text::TYPE_NAME = "text";
 

simgear/canvas/layout/BoxLayout.cxx

@@ -73,7 +73,7 @@ namespace canvas
                               int stretch,
                               uint8_t alignment )
   {
-    ItemData item_data = {0};
+    ItemData item_data = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
     item_data.layout_item = item;
     item_data.stretch = std::max(0, stretch);
 

simgear/canvas/layout/Layout.cxx

@@ -18,6 +18,9 @@
 
 #include <simgear_config.h>
 #include "Layout.hxx"
+
+#include <algorithm>
+
 #include <simgear/debug/logstream.hxx>
 
 namespace simgear

simgear/canvas/layout/NasalWidget.cxx

@@ -150,7 +150,7 @@ namespace canvas
   //----------------------------------------------------------------------------
   bool NasalWidget::hasHeightForWidth() const
   {
-    return !_height_for_width.empty() || !_min_height_for_width.empty();
+    return _height_for_width || _min_height_for_width;
   }
 
   //----------------------------------------------------------------------------
@@ -186,7 +186,7 @@ namespace canvas
   int NasalWidget::callHeightForWidthFunc( const HeightForWidthFunc& hfw,
                                            int w ) const
   {
-    if( hfw.empty() )
+    if( !hfw )
       return -1;
 
     try
@@ -239,17 +239,17 @@ namespace canvas
   //----------------------------------------------------------------------------
   int NasalWidget::heightForWidthImpl(int w) const
   {
-    return callHeightForWidthFunc( _height_for_width.empty()
-                                 ? _min_height_for_width
-                                 : _height_for_width, w );
+    return callHeightForWidthFunc( _height_for_width
+                                 ? _height_for_width
+                                 : _min_height_for_width, w );
   }
 
   //----------------------------------------------------------------------------
   int NasalWidget::minimumHeightForWidthImpl(int w) const
   {
-    return callHeightForWidthFunc( _min_height_for_width.empty()
-                                 ? _height_for_width
-                                 : _min_height_for_width, w );
+    return callHeightForWidthFunc( _min_height_for_width
+                                 ? _min_height_for_width
+                                 : _height_for_width, w );
   }
 
 

simgear/canvas/layout/NasalWidget.hxx

@@ -40,8 +40,8 @@ namespace canvas
   {
     public:
 
-      typedef boost::function<void (nasal::Me, const SGRecti&)> SetGeometryFunc;
-      typedef boost::function<int (nasal::Me, int)> HeightForWidthFunc;
+      typedef std::function<void (nasal::Me, const SGRecti&)> SetGeometryFunc;
+      typedef std::function<int (nasal::Me, int)> HeightForWidthFunc;
 
       /**
        *

simgear/debug/BufferedLogCallback.cxx

@@ -18,30 +18,29 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
- 
+
 #include <simgear_config.h>
 #include <simgear/debug/BufferedLogCallback.hxx>
-     
-#include <boost/foreach.hpp>
-     
+
 #include <simgear/sg_inlines.h>
 #include <simgear/threads/SGThread.hxx>
-#include <simgear/threads/SGGuard.hxx>
 
 #include <cstdlib> // for malloc
-     
+#include <cstring>
+#include <mutex>
+
 namespace simgear
 {
 
 class BufferedLogCallback::BufferedLogCallbackPrivate
 {
 public:
-    SGMutex m_mutex;
+    std::mutex m_mutex;
     vector_cstring m_buffer;
     unsigned int m_stamp;
     unsigned int m_maxLength;
 };
-   
+
 BufferedLogCallback::BufferedLogCallback(sgDebugClass c, sgDebugPriority p) :
 	simgear::LogCallback(c,p),
     d(new BufferedLogCallbackPrivate)
@@ -52,19 +51,19 @@ BufferedLogCallback::BufferedLogCallback(sgDebugClass c, sgDebugPriority p) :
 
 BufferedLogCallback::~BufferedLogCallback()
 {
-    BOOST_FOREACH(unsigned char* msg, d->m_buffer) {
+    for (auto msg : d->m_buffer) {
         free(msg);
     }
 }
- 
-void BufferedLogCallback::operator()(sgDebugClass c, sgDebugPriority p, 
+
+void BufferedLogCallback::operator()(sgDebugClass c, sgDebugPriority p,
         const char* file, int line, const std::string& aMessage)
 {
     SG_UNUSED(file);
     SG_UNUSED(line);
-    
+
     if (!shouldLog(c, p)) return;
-    
+
     vector_cstring::value_type msg;
     if (aMessage.size() >= d->m_maxLength) {
         msg = (vector_cstring::value_type) malloc(d->m_maxLength);
@@ -73,29 +72,29 @@ void BufferedLogCallback::operator()(sgDebugClass c, sgDebugPriority p,
     } else {
         msg = (vector_cstring::value_type) strdup(aMessage.c_str());
     }
-    
-    SGGuard<SGMutex> g(d->m_mutex);
+
+    std::lock_guard<std::mutex> g(d->m_mutex);
     d->m_buffer.push_back(msg);
     d->m_stamp++;
 }
- 
+
 unsigned int BufferedLogCallback::stamp() const
 {
     return d->m_stamp;
 }
- 
+
 unsigned int BufferedLogCallback::threadsafeCopy(vector_cstring& aOutput)
 {
-    SGGuard<SGMutex> g(d->m_mutex);
+    std::lock_guard<std::mutex> g(d->m_mutex);
     size_t sz = d->m_buffer.size();
     aOutput.resize(sz);
     memcpy(aOutput.data(), d->m_buffer.data(), sz * sizeof(vector_cstring::value_type));
     return d->m_stamp;
-} 
- 
+}
+
 void BufferedLogCallback::truncateAt(unsigned int t)
 {
     d->m_maxLength = t;
 }
- 
+
 } // of namespace simgear

simgear/debug/BufferedLogCallback.hxx

@@ -26,7 +26,7 @@
 #include <vector>
 #include <memory> // for std::unique_ptr
 
-#include <simgear/debug/logstream.hxx>
+#include <simgear/debug/LogCallback.hxx>
 
 namespace simgear
 {

simgear/debug/CMakeLists.txt

@@ -1,7 +1,10 @@
 
 include (SimGearComponent)
 
-set(HEADERS debug_types.h logstream.hxx BufferedLogCallback.hxx OsgIoCapture.hxx)
-set(SOURCES logstream.cxx BufferedLogCallback.cxx)
+set(HEADERS debug_types.h 
+    logstream.hxx BufferedLogCallback.hxx OsgIoCapture.hxx
+    LogCallback.hxx LogEntry.hxx)
+set(SOURCES logstream.cxx BufferedLogCallback.cxx
+    LogCallback.cxx LogEntry.cxx)
 
 simgear_component(debug debug "${SOURCES}" "${HEADERS}")

simgear/debug/LogCallback.cxx

@@ -0,0 +1,116 @@
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+
+#include <simgear_config.h>
+
+#include "LogCallback.hxx"
+
+using namespace simgear;
+
+LogCallback::LogCallback(sgDebugClass c, sgDebugPriority p) : m_class(c),
+                                                              m_priority(p)
+{
+}
+
+void LogCallback::operator()(sgDebugClass c, sgDebugPriority p,
+                             const char* file, int line, const std::string& aMessage)
+{
+    // override me
+}
+
+bool LogCallback::doProcessEntry(const LogEntry& e)
+{
+    return false;
+}
+
+void LogCallback::processEntry(const LogEntry& e)
+{
+    if (doProcessEntry(e))
+        return; // derived class used the new API
+
+    // call the old API
+    (*this)(e.debugClass, e.debugPriority, e.file, e.line, e.message);
+}
+
+
+bool LogCallback::shouldLog(sgDebugClass c, sgDebugPriority p) const
+{
+    if ((c & m_class) != 0 && p >= m_priority)
+        return true;
+    if (c == SG_OSG) // always have OSG logging as it OSG logging is configured separately.
+        return true;
+    return false;
+}
+
+void LogCallback::setLogLevels(sgDebugClass c, sgDebugPriority p)
+{
+    m_priority = p;
+    m_class = c;
+}
+const char* LogCallback::debugPriorityToString(sgDebugPriority p)
+{
+    switch (p) {
+    case SG_DEV_ALERT:
+    case SG_ALERT:
+        return "ALRT";
+    case SG_BULK: return "BULK";
+    case SG_DEBUG: return "DBUG";
+    case SG_MANDATORY_INFO:
+    case SG_INFO:
+        return "INFO";
+    case SG_POPUP: return "POPU";
+    case SG_DEV_WARN:
+    case SG_WARN:
+        return "WARN";
+
+    default: return "UNKN";
+    }
+}
+
+const char* LogCallback::debugClassToString(sgDebugClass c)
+{
+    switch (c) {
+    case SG_NONE: return "none";
+    case SG_TERRAIN: return "terrain";
+    case SG_ASTRO: return "astro";
+    case SG_FLIGHT: return "flight";
+    case SG_INPUT: return "input";
+    case SG_GL: return "opengl";
+    case SG_VIEW: return "view";
+    case SG_COCKPIT: return "cockpit";
+    case SG_GENERAL: return "general";
+    case SG_MATH: return "math";
+    case SG_EVENT: return "event";
+    case SG_AIRCRAFT: return "aircraft";
+    case SG_AUTOPILOT: return "autopilot";
+    case SG_IO: return "io";
+    case SG_CLIPPER: return "clipper";
+    case SG_NETWORK: return "network";
+    case SG_ATC: return "atc";
+    case SG_NASAL: return "nasal";
+    case SG_INSTR: return "instruments";
+    case SG_SYSTEMS: return "systems";
+    case SG_AI: return "ai";
+    case SG_ENVIRONMENT: return "environment";
+    case SG_SOUND: return "sound";
+    case SG_NAVAID: return "navaid";
+    case SG_GUI: return "gui";
+    case SG_TERRASYNC: return "terrasync";
+    case SG_PARTICLES: return "particles";
+    case SG_HEADLESS: return "headless";
+    case SG_OSG: return "OSG";
+    default: return "unknown";
+    }
+}

simgear/debug/LogCallback.hxx

@@ -0,0 +1,56 @@
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+
+#pragma once
+
+#include <string>
+
+#include "LogEntry.hxx"
+#include "debug_types.h"
+
+namespace simgear {
+
+class LogCallback
+{
+public:
+    virtual ~LogCallback() = default;
+
+    // newer API: return true if you handled the message, otherwise
+    // the old API will be called
+    virtual bool doProcessEntry(const LogEntry& e);
+
+    // old API, kept for compatability
+    virtual void operator()(sgDebugClass c, sgDebugPriority p,
+                            const char* file, int line, const std::string& aMessage);
+
+    void setLogLevels(sgDebugClass c, sgDebugPriority p);
+
+    void processEntry(const LogEntry& e);
+
+protected:
+    LogCallback(sgDebugClass c, sgDebugPriority p);
+
+    bool shouldLog(sgDebugClass c, sgDebugPriority p) const;
+
+    static const char* debugClassToString(sgDebugClass c);
+    static const char* debugPriorityToString(sgDebugPriority p);
+
+private:
+    sgDebugClass m_class;
+    sgDebugPriority m_priority;
+};
+
+
+} // namespace simgear

simgear/debug/LogEntry.cxx

@@ -0,0 +1,45 @@
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+
+#include <simgear_config.h>
+
+#include "LogEntry.hxx"
+
+#include <cstring> // for strdup
+
+namespace simgear {
+
+LogEntry::~LogEntry()
+{
+    if (freeFilename) {
+        free(const_cast<char*>(file));
+    }
+}
+
+LogEntry::LogEntry(const LogEntry& c) : debugClass(c.debugClass),
+                                        debugPriority(c.debugPriority),
+                                        originalPriority(c.originalPriority),
+                                        file(c.file),
+                                        line(c.line),
+                                        message(c.message),
+                                        freeFilename(c.freeFilename)
+{
+    if (c.freeFilename) {
+        file = strdup(c.file);
+    }
+}
+
+} // namespace simgear

simgear/debug/LogEntry.hxx

@@ -0,0 +1,54 @@
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+
+#pragma once
+
+#include <string>
+
+#include "debug_types.h"
+
+namespace simgear {
+/**
+ * storage of a single log entry. This is used to pass log entries from
+ * the various threads to the logging thread, and also to store the startup
+ * entries
+ */
+class LogEntry
+{
+public:
+    LogEntry(sgDebugClass c, sgDebugPriority p,
+             sgDebugPriority op,
+             const char* f, int l, const std::string& msg) : debugClass(c), debugPriority(p), originalPriority(op),
+                                                             file(f), line(l),
+                                                             message(msg)
+    {
+    }
+
+    LogEntry(const LogEntry& c);
+    LogEntry& operator=(const LogEntry& c) = delete;
+
+    ~LogEntry();
+
+    const sgDebugClass debugClass;
+    const sgDebugPriority debugPriority;
+    const sgDebugPriority originalPriority;
+    const char* file;
+    const int line;
+    const std::string message;
+
+    bool freeFilename = false; ///< if true, we own, and therefore need to free, the memory pointed to by 'file'
+};
+
+} // namespace simgear

simgear/debug/OsgIoCapture.hxx

@@ -2,14 +2,13 @@
 
 #include <osg/Notify>
 
-using namespace osg;
-
+#include <simgear/debug/logstream.hxx>
 
 /**
- * merge OSG output into our logging system, so it gets recorded to file,
- * and so we can display a GUI console with renderer issues, especially
- * shader compilation warnings and errors.
- */
+* merge OSG output into our logging system, so it gets recorded to file,
+* and so we can display a GUI console with renderer issues, especially
+* shader compilation warnings and errors.
+*/
 class NotifyLogger : public osg::NotifyHandler
 {
 public:
@@ -22,24 +21,33 @@ public:
         if (strstr(message, "the final reference count was")) {
             // as this is going to segfault ignore the translation of severity and always output the message.
             SG_LOG(SG_GL, SG_ALERT, message);
-            int* trigger_segfault = 0;
-            *trigger_segfault     = 0;
+#ifndef DEBUG
+            throw new std::string(message);
+            //int* trigger_segfault = 0;
+            //*trigger_segfault     = 0;
+#endif
             return;
         }
-        SG_LOG(SG_GL, translateSeverity(severity), message);
+        char*tmessage = strdup(message);
+        char*lf = strrchr(tmessage, '\n');
+        if (lf)
+            *lf = 0;
+
+        SG_LOG(SG_OSG, translateSeverity(severity), tmessage);
+        free(tmessage);
     }
 
 private:
     sgDebugPriority translateSeverity(osg::NotifySeverity severity) {
         switch (severity) {
-            case osg::ALWAYS:
-            case osg::FATAL:      return SG_ALERT;
-            case osg::WARN:       return SG_WARN;
-            case osg::NOTICE:
-            case osg::INFO:       return SG_INFO;
-            case osg::DEBUG_FP:
-            case osg::DEBUG_INFO: return SG_DEBUG;
-            default:              return SG_ALERT;
+        case osg::ALWAYS:
+        case osg::FATAL:      return SG_ALERT;
+        case osg::WARN:       return SG_WARN;
+        case osg::NOTICE:
+        case osg::INFO:       return SG_INFO;
+        case osg::DEBUG_FP:
+        case osg::DEBUG_INFO: return SG_DEBUG;
+        default:              return SG_ALERT;
         }
     }
 };

simgear/debug/debug_types.h

@@ -1,3 +1,5 @@
+#pragma once
+
 /** \file debug_types.h
  *  Define the various logging classes and priorities
  */
@@ -35,7 +37,10 @@ typedef enum {
     SG_TERRASYNC   = 0x01000000,
     SG_PARTICLES   = 0x02000000,
     SG_HEADLESS    = 0x04000000,
-    SG_UNDEFD      = 0x08000000, // For range checking
+    // SG_OSG (OSG notify) - will always be displayed regardless of FG log settings as OSG log level is configured 
+    // separately and thus it makes more sense to allow these message through.
+    SG_OSG         = 0x08000000,
+    SG_UNDEFD      = 0x10000000, // For range checking
 
     SG_ALL         = 0xFFFFFFFF
 } sgDebugClass;
@@ -49,16 +54,17 @@ typedef enum {
  * appended, or the priority Nasal reports to compiled code will change.
  */
 typedef enum {
-    SG_BULK = 1,       // For frequent messages
-    SG_DEBUG,          // Less frequent debug type messages
-    SG_INFO,           // Informatory messages
-    SG_WARN,           // Possible impending problem
-    SG_ALERT,          // Very possible impending problem
-    SG_POPUP,          // Severe enough to alert using a pop-up window
+    SG_BULK = 1, // For frequent messages
+    SG_DEBUG,    // Less frequent debug type messages
+    SG_INFO,     // Informatory messages
+    SG_WARN,     // Possible impending problem
+    SG_ALERT,    // Very possible impending problem
+    SG_POPUP,    // Severe enough to alert using a pop-up window
     // SG_EXIT,        // Problem (no core)
     // SG_ABORT        // Abandon ship (core)
 
-    SG_DEV_WARN,       // Warning for developers, translated to other priority
-    SG_DEV_ALERT       // Alert for developers, translated
-} sgDebugPriority;
+    SG_DEV_WARN,  // Warning for developers, translated to other priority
+    SG_DEV_ALERT, // Alert for developers, translated
 
+    SG_MANDATORY_INFO // information, but should always be shown
+} sgDebugPriority;

simgear/debug/logstream.cxx

@@ -24,20 +24,22 @@
 
 #include "logstream.hxx"
 
+#include <cstring>
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <algorithm>
-
-#include <boost/foreach.hpp>
+#include <mutex>
 
 #include <simgear/sg_inlines.h>
 #include <simgear/threads/SGThread.hxx>
 #include <simgear/threads/SGQueue.hxx>
-#include <simgear/threads/SGGuard.hxx>
 
+#include "LogCallback.hxx"
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/misc/strutils.hxx>
+#include <simgear/timing/timestamp.hxx>
 
 #if defined (SG_WINDOWS)
 // for AllocConsole, OutputDebugString
@@ -46,84 +48,55 @@
     #include <io.h>
 #endif
 
-
-
 //////////////////////////////////////////////////////////////////////////////
 
-namespace simgear
-{
 
-LogCallback::LogCallback(sgDebugClass c, sgDebugPriority p) :
-	m_class(c),
-	m_priority(p)
-{
-}
-
-bool LogCallback::shouldLog(sgDebugClass c, sgDebugPriority p) const
-{
-	 return ((c & m_class) != 0 && p >= m_priority);
-}
-
-void LogCallback::setLogLevels( sgDebugClass c, sgDebugPriority p )
-{
-	m_priority = p;
-	m_class = c;
-}
-
-const char* LogCallback::debugClassToString(sgDebugClass c)
-{
-    switch (c) {
-        case SG_NONE:       return "none";
-        case SG_TERRAIN:    return "terrain";
-        case SG_ASTRO:      return "astro";
-        case SG_FLIGHT:     return "flight";
-        case SG_INPUT:      return "input";
-        case SG_GL:         return "opengl";
-        case SG_VIEW:       return "view";
-        case SG_COCKPIT:    return "cockpit";
-        case SG_GENERAL:    return "general";
-        case SG_MATH:       return "math";
-        case SG_EVENT:      return "event";
-        case SG_AIRCRAFT:   return "aircraft";
-        case SG_AUTOPILOT:  return "autopilot";
-        case SG_IO:         return "io";
-        case SG_CLIPPER:    return "clipper";
-        case SG_NETWORK:    return "network";
-        case SG_ATC:        return "atc";
-        case SG_NASAL:      return "nasal";
-        case SG_INSTR:      return "instruments";
-        case SG_SYSTEMS:    return "systems";
-        case SG_AI:         return "ai";
-        case SG_ENVIRONMENT:return "environment";
-        case SG_SOUND:      return "sound";
-        case SG_NAVAID:     return "navaid";
-        case SG_GUI:        return "gui";
-        case SG_TERRASYNC:  return "terrasync";
-        case SG_PARTICLES:  return "particles";
-        case SG_HEADLESS:   return "headless";
-        default:            return "unknown";
-    }
-}
-
-} // of namespace simgear
-
-//////////////////////////////////////////////////////////////////////////////
 
 class FileLogCallback : public simgear::LogCallback
 {
 public:
+    SGTimeStamp logTimer;
     FileLogCallback(const SGPath& aPath, sgDebugClass c, sgDebugPriority p) :
 	    simgear::LogCallback(c, p)
     {
         m_file.open(aPath, std::ios_base::out | std::ios_base::trunc);
+        logTimer.stamp();
     }
 
-    virtual void operator()(sgDebugClass c, sgDebugPriority p,
-        const char* file, int line, const std::string& message)
+    void operator()(sgDebugClass c, sgDebugPriority p,
+                    const char* file, int line, const std::string& message) override
     {
         if (!shouldLog(c, p)) return;
-        m_file << debugClassToString(c) << ":" << (int) p
-            << ":" << file << ":" << line << ":" << message << std::endl;
+
+
+//        fprintf(stderr, "%7.2f [%.8s]:%-10s %s\n", logTimer.elapsedMSec() / 1000.0, debugPriorityToString(p), debugClassToString(c), aMessage.c_str());
+        m_file
+            << std::fixed
+            << std::setprecision(2)
+            << std::setw(8)
+            << std::right
+            << (logTimer.elapsedMSec() / 1000.0)
+            << std::setw(8)
+            << std::left
+            << " ["+std::string(debugPriorityToString(p))+"]:"
+            << std::setw(10)
+            << std::left
+            << debugClassToString(c)
+            ;
+        if (file) {
+            /* <line> can be -ve to indicate that m_fileLine was false, but we
+            want to show file:line information regardless of m_fileLine. */
+            m_file
+                << file
+                << ":"
+                << abs(line)
+                << ": "
+                ;
+            }
+        m_file
+            << message << std::endl;
+        //m_file << debugClassToString(c) << ":" << (int)p
+        //    << ":" << file << ":" << line << ":" << message << std::endl;
     }
 private:
     sg_ofstream m_file;
@@ -132,9 +105,12 @@ private:
 class StderrLogCallback : public simgear::LogCallback
 {
 public:
+    SGTimeStamp logTimer;
+
     StderrLogCallback(sgDebugClass c, sgDebugPriority p) :
 		simgear::LogCallback(c, p)
     {
+        logTimer.stamp();
     }
 
 #if defined (SG_WINDOWS)
@@ -144,12 +120,19 @@ public:
     }
 #endif
 
-    virtual void operator()(sgDebugClass c, sgDebugPriority p,
-        const char* file, int line, const std::string& aMessage)
+    void operator()(sgDebugClass c, sgDebugPriority p,
+                    const char* file, int line, const std::string& aMessage) override
     {
         if (!shouldLog(c, p)) return;
+        //fprintf(stderr, "%s\n", aMessage.c_str());
 
-        fprintf(stderr, "%s\n", aMessage.c_str());
+        if (file && line > 0) {
+            fprintf(stderr, "%8.2f %s:%i: [%.8s]:%-10s %s\n", logTimer.elapsedMSec()/1000.0, file, line, debugPriorityToString(p), debugClassToString(c), aMessage.c_str());
+        }
+        else {
+            fprintf(stderr, "%8.2f [%.8s]:%-10s %s\n", logTimer.elapsedMSec()/1000.0, debugPriorityToString(p), debugClassToString(c), aMessage.c_str());
+        }
+        //    file, line, aMessage.c_str());
         //fprintf(stderr, "%s:%d:%s:%d:%s\n", debugClassToString(c), p,
         //    file, line, aMessage.c_str());
         fflush(stderr);
@@ -167,8 +150,8 @@ public:
     {
     }
 
-    virtual void operator()(sgDebugClass c, sgDebugPriority p,
-        const char* file, int line, const std::string& aMessage)
+    void operator()(sgDebugClass c, sgDebugPriority p,
+                    const char* file, int line, const std::string& aMessage) override
     {
         if (!shouldLog(c, p)) return;
 
@@ -183,28 +166,6 @@ public:
 class logstream::LogStreamPrivate : public SGThread
 {
 private:
-    /**
-     * storage of a single log entry. This is used to pass log entries from
-     * the various threads to the logging thread, and also to store the startup
-     * entries
-     */
-    class LogEntry
-    {
-    public:
-        LogEntry(sgDebugClass c, sgDebugPriority p,
-            const char* f, int l, const std::string& msg) :
-            debugClass(c), debugPriority(p), file(f), line(l),
-                message(msg)
-        {
-        }
-
-        const sgDebugClass debugClass;
-        const sgDebugPriority debugPriority;
-        const char* file;
-        const int line;
-        const std::string message;
-    };
-
     /**
      * RAII object to pause the logging thread if it's running, and restart it.
      * used to safely make configuration changes.
@@ -243,10 +204,10 @@ public:
          *    window; stdout/stderr will not appear (except in logfiles as they do now)
          * 4) When started from the Console (with --console) open a new console window
          * 5) Ensure that IO redirection still works when started from the console
-         * 
+         *
          * Notes:
          * 1) fgfs needs to be a GUI subsystem app - which it already is
-         * 2) What can't be done is to make the cmd prompt run fgfs synchronously; 
+         * 2) What can't be done is to make the cmd prompt run fgfs synchronously;
          * this is only something that can be done via "start /wait fgfs".
          */
 
@@ -270,7 +231,7 @@ public:
 			}
         } else {
             /*
-            * Attempt to attach to the console process of the parent process; when launched from cmd.exe this should be the console, 
+            * Attempt to attach to the console process of the parent process; when launched from cmd.exe this should be the console,
             * when launched via the RUN menu explorer, or another GUI app that wasn't started from the console this will fail.
             * When it fails we will redirect to the NUL device. This is to ensure that we have valid streams.
             * Later on in the initialisation sequence the --console option will be processed and this will cause the requestConsole() to
@@ -300,7 +261,7 @@ public:
             if (!stdout_isNull){
                 if (!m_stdout_isRedirectedAlready)
                     freopen("conout$", "w", stdout);
-                else 
+                else
                     /*
                     * for already redirected streams we need to attach the stream to the OS handle that is open.
                     * - this comes from part of the answer http://stackoverflow.com/a/13841522
@@ -319,7 +280,7 @@ public:
             }
         }
         //http://stackoverflow.com/a/25927081
-        //Clear the error state for each of the C++ standard stream objects. 
+        //Clear the error state for each of the C++ standard stream objects.
         std::wcout.clear();
         std::cout.clear();
         std::wcerr.clear();
@@ -328,22 +289,34 @@ public:
 
         m_callbacks.push_back(new StderrLogCallback(m_logClass, m_logPriority));
         m_consoleCallbacks.push_back(m_callbacks.back());
-#if defined (SG_WINDOWS) && !defined(NDEBUG)
-		m_callbacks.push_back(new WinDebugLogCallback(m_logClass, m_logPriority));
-		m_consoleCallbacks.push_back(m_callbacks.back());
+        
+#if defined (SG_WINDOWS)
+        const char* winDebugEnv = ::getenv("SG_WINDEBUG");
+        const bool b = winDebugEnv ? simgear::strutils::to_bool(std::string{winDebugEnv}) : false;
+        if (b) {
+            m_callbacks.push_back(new WinDebugLogCallback(m_logClass, m_logPriority));
+            m_consoleCallbacks.push_back(m_callbacks.back());
+        }
 #endif
     }
 
     ~LogStreamPrivate()
     {
         removeCallbacks();
+
+        // house-keeping, avoid leak warnings if we exit before disabling
+        // startup logging
+        {
+            std::lock_guard<std::mutex> g(m_lock);
+            clearStartupEntriesLocked();
+        }
     }
 
-    SGMutex m_lock;
-    SGBlockingQueue<LogEntry> m_entries;
+    std::mutex m_lock;
+    SGBlockingQueue<simgear::LogEntry> m_entries;
 
     // log entries posted during startup
-    std::vector<LogEntry> m_startupEntries;
+    std::vector<simgear::LogEntry> m_startupEntries;
     bool m_startupLogging = false;
 
     typedef std::vector<simgear::LogCallback*> CallbackVec;
@@ -361,13 +334,16 @@ public:
     bool m_stdout_isRedirectedAlready = false;
 #endif
     bool m_developerMode = false;
+    bool m_fileLine = false;
 
     // test suite mode.
     bool m_testMode = false;
 
+    std::vector<std::string> _popupMessages;
+
     void startLog()
     {
-        SGGuard<SGMutex> g(m_lock);
+        std::lock_guard<std::mutex> g(m_lock);
         if (m_isRunning) return;
         m_isRunning = true;
         start();
@@ -379,44 +355,54 @@ public:
             return;
         }
 
-        m_startupLogging = on;
+        {
+            std::lock_guard<std::mutex> g(m_lock);
+            m_startupLogging = on;
+            clearStartupEntriesLocked();
+        }
+    }
+
+    void clearStartupEntriesLocked()
+    {
         m_startupEntries.clear();
     }
 
-    virtual void run()
+    void run() override
     {
         while (1) {
-            LogEntry entry(m_entries.pop());
+            simgear::LogEntry entry(m_entries.pop());
             // special marker entry detected, terminate the thread since we are
             // making a configuration change or quitting the app
-            if ((entry.debugClass == SG_NONE) && !strcmp(entry.file, "done")) {
+            if ((entry.debugClass == SG_NONE) && entry.file && !strcmp(entry.file, "done")) {
                 return;
             }
-
-            if (m_startupLogging) {
-                // save to the startup list for not-yet-added callbacks to
-                // pull down on startup
-                m_startupEntries.push_back(entry);
+            {
+                std::lock_guard<std::mutex> g(m_lock);
+                if (m_startupLogging) {
+                    // save to the startup list for not-yet-added callbacks to
+                    // pull down on startup
+                    m_startupEntries.push_back(entry);
+                }
             }
-
             // submit to each installed callback in turn
             for (simgear::LogCallback* cb : m_callbacks) {
-                (*cb)(entry.debugClass, entry.debugPriority,
-                    entry.file, entry.line, entry.message);
+                cb->processEntry(entry);
             }
         } // of main thread loop
     }
 
     bool stop()
     {
-        SGGuard<SGMutex> g(m_lock);
-        if (!m_isRunning) {
-            return false;
-        }
+        {
+            std::lock_guard<std::mutex> g(m_lock);
+            if (!m_isRunning) {
+                return false;
+            }
 
-        // log a special marker value, which will cause the thread to wakeup,
-        // and then exit
-        log(SG_NONE, SG_ALERT, "done", -1, "");
+            // log a special marker value, which will cause the thread to wakeup,
+            // and then exit
+            log(SG_NONE, SG_ALERT, "done", -1, "", false);
+        }
         join();
 
         m_isRunning = false;
@@ -430,9 +416,8 @@ public:
 
         // we clear startup entries not using this, so always safe to run
         // this code, container will simply be empty
-        for (auto entry : m_startupEntries) {
-            (*cb)(entry.debugClass, entry.debugPriority,
-               entry.file, entry.line, entry.message);
+        for (const auto& entry : m_startupEntries) {
+            cb->processEntry(entry);
         }
     }
 
@@ -460,9 +445,9 @@ public:
         PauseThread pause(this);
         m_logPriority = p;
         m_logClass = c;
-		BOOST_FOREACH(simgear::LogCallback* cb, m_consoleCallbacks) {
-	        cb->setLogLevels(c, p);
-		}
+        for (auto cb : m_consoleCallbacks) {
+            cb->setLogLevels(c, p);
+        }
     }
 
     bool would_log( sgDebugClass c, sgDebugPriority p ) const
@@ -470,16 +455,27 @@ public:
         // Testing mode, so always log.
         if (m_testMode) return true;
 
+        // SG_OSG (OSG notify) - will always be displayed regardless of FG log settings as OSG log level is configured
+        // separately and thus it makes more sense to allow these message through.
+        if (static_cast<unsigned>(p) == static_cast<unsigned>(SG_OSG)) return true;
+
         p = translatePriority(p);
         if (p >= SG_INFO) return true;
         return ((c & m_logClass) != 0 && p >= m_logPriority);
     }
 
     void log( sgDebugClass c, sgDebugPriority p,
-            const char* fileName, int line, const std::string& msg)
+            const char* fileName, int line, const std::string& msg,
+             bool freeFilename)
     {
-        p = translatePriority(p);
-        LogEntry entry(c, p, fileName, line, msg);
+        auto tp = translatePriority(p);
+        if (!m_fileLine) {
+            /* This prevents output of file:line in StderrLogCallback. */
+            line = -line;
+        }
+
+        simgear::LogEntry entry(c, tp, p, fileName, line, msg);
+        entry.freeFilename = freeFilename;
         m_entries.push(entry);
     }
 
@@ -490,7 +486,7 @@ public:
         }
 
         if (in == SG_DEV_ALERT) {
-            return m_developerMode ? SG_POPUP : SG_WARN;
+            return m_developerMode ? SG_ALERT : SG_WARN;
         }
 
         return in;
@@ -500,7 +496,7 @@ public:
 /////////////////////////////////////////////////////////////////////////////
 
 static std::unique_ptr<logstream> global_logstream;
-static SGMutex global_logStreamLock;
+static std::mutex global_logStreamLock;
 
 logstream::logstream()
 {
@@ -510,8 +506,8 @@ logstream::logstream()
 
 logstream::~logstream()
 {
-    popup_msgs.clear();
     d->stop();
+    d.reset();
 }
 
 void
@@ -525,6 +521,10 @@ void logstream::setDeveloperMode(bool devMode)
     d->m_developerMode = devMode;
 }
 
+void logstream::setFileLine(bool fileLine)
+{
+    d->m_fileLine = fileLine;
+}
 
 void
 logstream::addCallback(simgear::LogCallback* cb)
@@ -542,7 +542,14 @@ void
 logstream::log( sgDebugClass c, sgDebugPriority p,
         const char* fileName, int line, const std::string& msg)
 {
-    d->log(c, p, fileName, line, msg);
+    d->log(c, p, fileName, line, msg, false);
+}
+
+void
+logstream::logCopyingFilename( sgDebugClass c, sgDebugPriority p,
+         const char* fileName, int line, const std::string& msg)
+{
+    d->log(c, p, strdup(fileName), line, msg, true);
 }
 
 
@@ -603,17 +610,18 @@ void logstream::hexdump(sgDebugClass c, sgDebugPriority p, const char* fileName,
 void
 logstream::popup( const std::string& msg)
 {
-    popup_msgs.push_back(msg);
+    std::lock_guard<std::mutex> g(d->m_lock);
+    d->_popupMessages.push_back(msg);
 }
 
 std::string
 logstream::get_popup()
 {
-    std::string rv = "";
-    if (!popup_msgs.empty())
-    {
-        rv = popup_msgs.front();
-        popup_msgs.erase(popup_msgs.begin());
+    std::string rv;
+    std::lock_guard<std::mutex> g(d->m_lock);
+    if (!d->_popupMessages.empty()) {
+        rv = d->_popupMessages.front();
+        d->_popupMessages.erase(d->_popupMessages.begin());
     }
     return rv;
 }
@@ -621,7 +629,8 @@ logstream::get_popup()
 bool
 logstream::has_popup()
 {
-    return (popup_msgs.size() > 0) ? true : false;
+    std::lock_guard<std::mutex> g(d->m_lock);
+    return !d->_popupMessages.empty();
 }
 
 bool
@@ -654,6 +663,16 @@ logstream::set_log_classes( sgDebugClass c)
     d->setLogLevels(c, d->m_logPriority);
 }
 
+sgDebugPriority logstream::priorityFromString(const std::string& s)
+{
+    if (s == "bulk") return SG_BULK;
+    if (s == "debug") return SG_DEBUG;
+    if (s == "info") return SG_INFO;
+    if (s == "warn") return SG_WARN;
+    if (s == "alert") return SG_ALERT;
+
+    throw std::invalid_argument("Couldn't parse log prioirty:" + s);
+}
 
 logstream&
 sglog()
@@ -664,7 +683,7 @@ sglog()
     // http://www.aristeia.com/Papers/DDJ_Jul_Aug_2004_revised.pdf
     // in the absence of portable memory barrier ops in Simgear,
     // let's keep this correct & safe
-    SGGuard<SGMutex> g(global_logStreamLock);
+    std::lock_guard<std::mutex> g(global_logStreamLock);
 
     if( !global_logstream )
         global_logstream.reset(new logstream);
@@ -738,14 +757,14 @@ namespace simgear
 {
 
 void requestConsole()
-{ 
+{
     sglog().requestConsole();
 }
 
 
 void shutdownLogging()
 {
-    SGGuard<SGMutex> g(global_logStreamLock);
+    std::lock_guard<std::mutex> g(global_logStreamLock);
     global_logstream.reset();
 }
 

simgear/debug/logstream.hxx

@@ -37,26 +37,8 @@ class SGPath;
       
 namespace simgear
 {
-     
-class LogCallback
-{
-public:
-    virtual ~LogCallback() {}
-    virtual void operator()(sgDebugClass c, sgDebugPriority p, 
-        const char* file, int line, const std::string& aMessage) = 0;
-
-	void setLogLevels(sgDebugClass c, sgDebugPriority p);
-protected:
-	LogCallback(sgDebugClass c, sgDebugPriority p);
-
-	bool shouldLog(sgDebugClass c, sgDebugPriority p) const;
-
-    static const char* debugClassToString(sgDebugClass c);
-private:
-	sgDebugClass m_class;
-	sgDebugPriority m_priority;
-};
 
+class LogCallback;
 /**
  * Helper force a console on platforms where it might optional, when
  * we need to show a console. This basically means Windows at the
@@ -104,6 +86,11 @@ public:
     
     sgDebugPriority get_log_priority() const;
 
+    /**
+        @brief convert a string value to a log prioirty.
+        throws std::invalid_argument if the string is not valid
+     */
+    static sgDebugPriority priorityFromString(const std::string& s);
     /**
      * set developer mode on/off. In developer mode, SG_DEV_WARN messags
      * are treated as warnings. In normal (non-developer) mode they are
@@ -111,12 +98,26 @@ public:
      */
     void setDeveloperMode(bool devMode);
 
+    /**
+     * set output of file:line mode on/off. If on, all log messages are
+     * prefixed by the file:line of the caller of SG_LOG().
+     */
+    void setFileLine(bool fileLine);
+
     /**
      * the core logging method
      */
     void log( sgDebugClass c, sgDebugPriority p,
             const char* fileName, int line, const std::string& msg);
 
+    // overload of above, which can transfer ownership of the file-name.
+    // this is unecesary overhead when logging from C++, since __FILE__ points
+    // to constant data, but it's needed when the filename is Nasal data (for
+    // example) since during shutdown the filename is freed by Nasal GC
+    // asynchronously with the logging thread.
+    void logCopyingFilename( sgDebugClass c, sgDebugPriority p,
+             const char* fileName, int line, const std::string& msg);
+    
     /**
     * output formatted hex dump of memory block
     */
@@ -178,8 +179,6 @@ private:
     // constructor
     logstream();
 
-    std::vector<std::string> popup_msgs;
-
     class LogStreamPrivate;
 
     std::unique_ptr<LogStreamPrivate> d;
@@ -203,9 +202,11 @@ logstream& sglog();
     } } while(0)
 #ifdef FG_NDEBUG
 # define SG_LOG(C,P,M)	do { if((P) == SG_POPUP) SG_LOGX(C,P,M) } while(0)
+# define SG_LOG_NAN(C,P,M) SG_LOG(C,P,M)
 # define SG_HEXDUMP(C,P,MEM,LEN)
 #else
 # define SG_LOG(C,P,M)	SG_LOGX(C,P,M)
+# define SG_LOG_NAN(C,P,M) do { SG_LOGX(C,P,M); throw std::overflow_error(M); } while(0)
 # define SG_LOG_HEXDUMP(C,P,MEM,LEN) if(sglog().would_log(C,P)) sglog().hexdump(C, P, __FILE__, __LINE__, MEM, LEN)
 #endif
 

simgear/emesary/CMakeLists.txt

@@ -0,0 +1,33 @@
+
+
+include (SimGearComponent)
+
+set(HEADERS 
+    Emesary.hxx
+    INotification.hxx
+    IReceiver.hxx
+    ITransmitter.hxx
+    ReceiptStatus.hxx
+    Transmitter.hxx
+    notifications.hxx
+    )
+    
+set(SOURCES 
+    Emesary.cxx
+    )
+
+simgear_component(emesary emesary "${SOURCES}" "${HEADERS}")
+
+
+if(ENABLE_TESTS)
+
+add_executable(test_emesary test_emesary.cxx)
+
+set_target_properties(test_emesary PROPERTIES
+  COMPILE_DEFINITIONS "SRC_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}\"" )
+
+target_link_libraries(test_emesary ${TEST_LIBS})
+add_test(emesary ${EXECUTABLE_OUTPUT_PATH}/test_emesary)
+
+
+endif(ENABLE_TESTS)

simgear/emesary/Emesary.cxx

@@ -0,0 +1,31 @@
+/*---------------------------------------------------------------------------
+*
+*	Title                : Emesary - class based inter-object communication
+*
+*	File Type            : Implementation File
+*
+*	Description          : Emesary main.
+*	                     : This only needs to instance the GlobalTransmitter as all of the 
+*	                     : logic is in the header files (by design)
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*	Author               : Richard Harrison (richard@zaretto.com)
+*
+*	Creation Date        : 18 March 2002
+*
+*	Version              : $Header: $
+*
+*  Copyright © 2002 Richard Harrison           All Rights Reserved.
+*
+*---------------------------------------------------------------------------*/
+
+#include "simgear/emesary/Emesary.hxx"
+
+namespace simgear
+{
+    namespace Emesary
+    {
+      
+    }
+}

simgear/emesary/Emesary.hxx

@@ -0,0 +1,48 @@
+#ifndef EMESARY_hxx
+#define EMESARY_hxx
+/*---------------------------------------------------------------------------
+*
+*  Title                : Emesary - class based inter-object communication
+*
+*  File Type            : Implementation File
+*
+*  Description          : Provides generic inter-object communication. For an object to receive a message it
+*                       : must first register with a Transmitter, such as GlobalTransmitter, and implement the
+*                       : IReceiver interface. That's it.
+*                       : To send a message use a Transmitter with an object. That's all there is to it.
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*  Author               : Richard Harrison (richard@zaretto.com)
+*
+*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
+*
+*  Version              : $Header: $
+*
+*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
+*
+*---------------------------------------------------------------------------*/
+#include <typeinfo>
+
+#include "ReceiptStatus.hxx"
+#include "INotification.hxx"
+#include "IReceiver.hxx"
+#include "ITransmitter.hxx"
+#include "Transmitter.hxx"
+#include <simgear/structure/Singleton.hxx>
+
+namespace simgear
+{
+    namespace Emesary
+    {
+        class GlobalTransmitter : public simgear::Singleton<Transmitter>
+        {
+        public:
+            GlobalTransmitter()
+            {
+            }
+            virtual ~GlobalTransmitter() {}
+        };
+    }
+}
+#endif

simgear/emesary/INotification.hxx

@@ -0,0 +1,54 @@
+#ifndef INOTIFICATION_hxx
+#define INOTIFICATION_hxx
+/*---------------------------------------------------------------------------
+*
+*  Title                : Emesary - Notification base class
+*
+*  File Type            : Implementation File
+*
+*  Description          : Base class (interface) for all Notifications.
+*                       : This is also compatible with the usual implementation of how we
+*                       : implement queued notifications.
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*  Author               : Richard Harrison (richard@zaretto.com)
+*
+*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
+*
+*  Version              : $Header: $
+*
+*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
+*
+*---------------------------------------------------------------------------*/
+namespace simgear
+{
+    namespace Emesary
+    {
+        /// Interface (base class) for all notifications. 
+        class INotification
+        {
+        public:
+            // text representation of notification type. must be unique across all notifications
+            virtual const char *GetType() = 0;
+
+            /// Used to control the sending of notifications. If this returns false then the Transmitter 
+            /// should not send this notification.
+            virtual bool IsReadyToSend() { return true; }
+
+            /// Used to control the timeout. If this notification has timed out - then the processor is entitled 
+            /// to true.
+            virtual bool IsTimedOut() { return false; }
+
+            /// when this notification has completed the processing recipient must set this to true.
+            /// the processing recipient is responsible for follow on notifications.
+            /// a notification can remain as complete until the transmit queue decides to remove it from the queue.
+            /// there is no requirement that elements are removed immediately upon completion merely that once complete
+            /// the transmitter should not notify any more elements.
+            /// The current notification loop may be completed - following the usual convention unless Completed or Abort
+            /// is returned as the status.
+            virtual bool IsComplete() { return true; }
+        };
+    }
+}
+#endif

simgear/emesary/IReceiver.hxx

@@ -0,0 +1,47 @@
+#ifndef IRECEIVER_hxx
+#define IRECEIVER_hxx
+/*---------------------------------------------------------------------------
+*
+*  Title                : Emesary - Receiver base class
+*
+*  File Type            : Implementation File
+*
+*  Description          : Base class for all recipients.
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*  Author               : Richard Harrison (richard@zaretto.com)
+*
+*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
+*
+*  Version              : $Header: $
+*
+*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
+*
+*---------------------------------------------------------------------------*/
+namespace simgear
+{
+    namespace Emesary
+    {
+
+        /// Interface (base class) for a recipeint.
+        class IReceiver
+        {
+        public:
+            /// Receive notification - must be implemented
+            virtual ReceiptStatus Receive(INotification& message) = 0;
+
+            /// Called when registered at a transmitter
+            virtual void OnRegisteredAtTransmitter(class Transmitter *p)
+            {
+            }
+
+            /// Called when de-registered at a transmitter
+            virtual void OnDeRegisteredAtTransmitter(class Transmitter *p)
+            {
+            }
+        };
+
+    }
+}
+#endif

simgear/emesary/ITransmitter.hxx

@@ -0,0 +1,52 @@
+#ifndef ITRANSMITTER_hxx
+#define ITRANSMITTER_hxx
+/*---------------------------------------------------------------------------
+*
+*  Title                : Emesary - Transmitter base class
+*
+*  File Type            : Implementation File
+*
+*  Description          : Base class for all transmitters.
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*  Author               : Richard Harrison (richard@zaretto.com)
+*
+*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
+*
+*  Version              : $Header: $
+*
+*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
+*
+*---------------------------------------------------------------------------*/
+
+namespace simgear
+{
+    namespace Emesary
+    {
+        /// Interface (base clasee) for a transmitter.
+        ///  Transmits Message derived objects. Each instance of this class provides a
+        ///  event/databus to which any number of receivers can attach to.
+        class ITransmitter
+        {
+        public:
+            // Registers a recipient to receive message from this transmitter
+            virtual void Register(IReceiver& R) = 0;
+            // Removes a recipient from from this transmitter
+            virtual void DeRegister(IReceiver& R) = 0;
+
+
+            //Notify all registered recipients. Stop when receipt status of abort or finished are received.
+            //The receipt status from this method will be
+            // - OK > message handled
+            // - Fail > message not handled. A status of Abort from a recipient will result in our status
+            //          being fail as Abort means that the message was not and cannot be handled, and
+            //          allows for usages such as access controls.
+            virtual ReceiptStatus NotifyAll(INotification& M) = 0;
+
+            /// number of recipients
+            virtual int Count() = 0;
+        };
+    }
+}
+#endif

simgear/emesary/ReceiptStatus.hxx

@@ -0,0 +1,54 @@
+#ifndef RECEIPTSTATUS_hxx
+#define RECEIPTSTATUS_hxx
+/*---------------------------------------------------------------------------
+*
+*  Title                : Emesary - Transmitter base class
+*
+*  File Type            : Implementation File
+*
+*  Description          : Defines the receipt status that can be returned from 
+*                       : a receive method.
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*  Author               : Richard Harrison (richard@zaretto.com)
+*
+*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
+*
+*  Version              : $Header: $
+*
+*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
+*
+*---------------------------------------------------------------------------*/
+namespace simgear
+{
+    namespace Emesary
+    {
+        enum ReceiptStatus
+        {
+            /// Processing completed successfully
+            ReceiptStatusOK = 0,
+
+            /// Individual item failure
+            ReceiptStatusFail = 1,
+
+            /// Fatal error; stop processing any further recipieints of this message. Implicitly fail
+            ReceiptStatusAbort = 2,
+
+            /// Definitive completion - do not send message to any further recipieints
+            ReceiptStatusFinished = 3,
+
+            /// Return value when method doesn't process a message.
+            ReceiptStatusNotProcessed = 4,
+
+            /// Message has been sent but the return status cannot be determined as it has not been processed by the recipient. 
+            /// e.g. a queue or outgoing bridge
+            ReceiptStatusPending = 5,
+
+            /// Message has been definitively handled but the return value cannot be determined. The message will not be sent any further
+            /// e.g. a point to point forwarding bridge
+            ReceiptStatusPendingFinished = 6,
+        };
+    }
+}
+#endif

simgear/emesary/Transmitter.hxx

@@ -0,0 +1,203 @@
+#ifndef TRANSMITTER_hxx
+#define TRANSMITTER_hxx
+/*---------------------------------------------------------------------------
+*
+*  Title                : Emesary - Transmitter base class
+*
+*  File Type            : Implementation File
+*
+*  Description          : Defines the receipt status that can be returned from
+*                       : a receive method.
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*  Author               : Richard Harrison (richard@zaretto.com)
+*
+*  Creation Date        : 18 March 2002, rewrite 2017, simgear version 2019
+*
+*  Version              : $Header: $
+*
+*  Copyright (C)2019 Richard Harrison            Licenced under GPL2 or later.
+*
+*---------------------------------------------------------------------------*/
+
+#include <algorithm>
+#include <string>
+#include <list>
+#include <set>
+#include <vector>
+#include <atomic>
+#include <mutex>
+
+namespace simgear
+{
+    namespace Emesary
+    {
+        // Implementation of a ITransmitter
+        class Transmitter : public ITransmitter
+        {
+        protected:
+            typedef std::list<IReceiver *> RecipientList;
+            RecipientList recipient_list;
+            RecipientList deleted_recipients;
+            int CurrentRecipientIndex = 0;
+            std::mutex _lock;
+            std::atomic<int> receiveDepth;
+            std::atomic<int> sentMessageCount;
+
+            void UnlockList()
+            {
+                _lock.unlock();
+            }
+            void LockList()
+            {
+                _lock.lock();
+            }
+        public:
+            Transmitter() : receiveDepth(0), sentMessageCount(0)
+            {
+            }
+
+            virtual ~Transmitter()
+            {
+            }
+
+            // Registers an object to receive messsages from this transmitter.
+            // This object is added to the top of the list of objects to be notified. This is deliberate as
+            // the sequence of registration and message receipt can influence the way messages are processing
+            // when ReceiptStatus of Abort or Finished are encountered. So it was a deliberate decision that the
+            // most recently registered recipients should process the messages/events first.
+            virtual void Register(IReceiver& r)
+            {
+                LockList();
+                recipient_list.push_back(&r);
+                r.OnRegisteredAtTransmitter(this);
+                if (std::find(deleted_recipients.begin(), deleted_recipients.end(), &r) != deleted_recipients.end())
+                    deleted_recipients.remove(&r);
+
+                UnlockList();
+            }
+
+            //  Removes an object from receving message from this transmitter
+            virtual void DeRegister(IReceiver& R)
+            {
+                LockList();
+                //printf("Remove %x\n", &R);
+                if (recipient_list.size())
+                {
+                    if (std::find(recipient_list.begin(), recipient_list.end(), &R) != recipient_list.end())
+                    {
+                        recipient_list.remove(&R);
+                        R.OnDeRegisteredAtTransmitter(this);
+                        if (std::find(deleted_recipients.begin(), deleted_recipients.end(), &R) == deleted_recipients.end())
+                            deleted_recipients.push_back(&R);
+                    }
+                }
+                UnlockList();
+            }
+
+            // Notify all registered recipients. Stop when receipt status of abort or finished are received.
+            // The receipt status from this method will be
+            //  - OK > message handled
+            //  - Fail > message not handled. A status of Abort from a recipient will result in our status
+            //           being fail as Abort means that the message was not and cannot be handled, and
+            //           allows for usages such as access controls.
+            virtual ReceiptStatus NotifyAll(INotification& M)
+            {
+                ReceiptStatus return_status = ReceiptStatusNotProcessed;
+
+                sentMessageCount++;
+                try
+                {
+                    LockList();
+                    if (receiveDepth == 0)
+                        deleted_recipients.clear();
+                    receiveDepth++;
+                    std::vector<IReceiver*> temp(recipient_list.size());
+                    int idx = 0;
+                    for (RecipientList::iterator i = recipient_list.begin(); i != recipient_list.end(); i++)
+                    {
+                        temp[idx++] = *i;
+                    }
+                    UnlockList();
+                    int tempSize = temp.size();
+                    for (int index = 0; index < tempSize; index++)
+                    {
+                        IReceiver* R = temp[index];
+                        LockList();
+                        if (deleted_recipients.size())
+                        {
+                            if (std::find(deleted_recipients.begin(), deleted_recipients.end(), R) != deleted_recipients.end())
+                            {
+                                UnlockList();
+                                continue;
+                            }
+                        }
+                        UnlockList();
+                        if (R)
+                        {
+                            ReceiptStatus rstat = R->Receive(M);
+                            switch (rstat)
+                            {
+                            case ReceiptStatusFail:
+                                return_status = ReceiptStatusFail;
+                                break;
+                            case ReceiptStatusPending:
+                                return_status = ReceiptStatusPending;
+                                break;
+                            case ReceiptStatusPendingFinished:
+                                return rstat;
+
+                            case ReceiptStatusNotProcessed:
+                                break;
+                            case ReceiptStatusOK:
+                                if (return_status == ReceiptStatusNotProcessed)
+                                    return_status = rstat;
+                                break;
+
+                            case ReceiptStatusAbort:
+                                return ReceiptStatusAbort;
+
+                            case ReceiptStatusFinished:
+                                return ReceiptStatusOK;
+                            }
+                        }
+
+                    }
+                }
+                catch (...)
+                {
+                    throw;
+                    // return_status = ReceiptStatusAbort;
+                }
+                receiveDepth--;
+                return return_status;
+            }
+
+            // number of currently registered recipients
+            virtual int Count()
+            {
+                LockList();
+                return recipient_list.size();
+                UnlockList();
+            }
+
+            // number of sent messages.
+            int SentMessageCount()
+            {
+                return sentMessageCount;
+            }
+
+            // ascertain if a receipt status can be interpreted as failure.
+            static bool Failed(ReceiptStatus receiptStatus)
+            {
+                //
+                // failed is either Fail or Abort.
+                // NotProcessed isn't a failure because it hasn't been processed.
+                return receiptStatus == ReceiptStatusFail
+                    || receiptStatus == ReceiptStatusAbort;
+            }
+        };
+    }
+}
+#endif

simgear/emesary/notifications.hxx

@@ -0,0 +1,68 @@
+#ifndef NOTIFICATIONS_hxx
+#define NOTIFICATIONS_hxx
+/*---------------------------------------------------------------------------
+*
+*	Title                : Emesary - class based inter-object communication
+*
+*	File Type            : Implementation File
+*
+*	Description          : simgear notifications
+*
+*  References           : http://www.chateau-logic.com/content/class-based-inter-object-communication
+*
+*	Author               : Richard Harrison (richard@zaretto.com)
+*
+*	Creation Date        : 18 March 2002, rewrite 2017
+*
+*	Version              : $Header: $
+*
+*  Copyright <20> 2002 - 2017 Richard Harrison           All Rights Reserved.
+*
+*---------------------------------------------------------------------------*/
+
+#include "INotification.hxx"
+
+namespace simgear
+{
+    namespace Notifications
+    {
+        class MainLoopNotification : public simgear::Emesary::INotification
+        {
+        public:
+            enum Type { Started, Stopped, Begin, End };
+            MainLoopNotification(Type v) : _type(v) {}
+
+            virtual Type GetValue() { return _type; }
+            virtual const char *GetType() { return "MainLoop"; }
+
+        protected:
+            Type _type;
+        };
+
+        class NasalGarbageCollectionConfigurationNotification : public simgear::Emesary::INotification
+        {
+        public:
+            NasalGarbageCollectionConfigurationNotification(bool canWait, bool active) : CanWait(canWait), Active(active) {}
+
+            virtual bool GetCanWait() { return CanWait; }
+            virtual bool GetActive() { return Active; }
+            virtual const char *GetType() { return "NasalGarbageCollectionConfiguration"; }
+            virtual bool SetWait(bool wait) {
+                if (wait == CanWait)
+                    return false;
+                CanWait = wait;
+                return true;
+            }
+            virtual bool SetActive(bool active) {
+                if (active == Active)
+                    return false;
+                Active = active;
+                return true;
+            }
+        public:
+            bool CanWait;
+            bool Active;
+        };
+    }
+}
+#endif

simgear/emesary/test_emesary.cxx

@@ -0,0 +1,130 @@
+////////////////////////////////////////////////////////////////////////
+// Test harness for Emesary.
+////////////////////////////////////////////////////////////////////////
+
+#include <simgear_config.h>
+#include <simgear/compiler.h>
+
+#include <iostream>
+
+#include <simgear/threads/SGThread.hxx>
+#include <simgear/emesary/Emesary.hxx>
+
+using std::cout;
+using std::cerr;
+using std::endl;
+
+std::atomic<int> nthread {0};
+std::atomic<int> noperations {0};
+const int MaxIterations = 9999;
+
+class TestThreadNotification : public simgear::Emesary::INotification
+{
+protected:
+    const char *baseValue;
+public:
+    TestThreadNotification(const char *v) : baseValue(v) {}
+
+    virtual const char* GetType () { return baseValue; }
+};
+
+class TestThreadRecipient : public simgear::Emesary::IReceiver
+{
+public:
+    TestThreadRecipient() : receiveCount(0)
+    {
+    }
+
+    std::atomic<int> receiveCount;
+
+    virtual simgear::Emesary::ReceiptStatus Receive(simgear::Emesary::INotification &n)
+    {
+        if (n.GetType() == (const char*)this)
+        {
+            // Unused: TestThreadNotification *tn = dynamic_cast<TestThreadNotification *>(&n);
+            receiveCount++;
+
+            TestThreadNotification onwardNotification("AL");
+            simgear::Emesary::GlobalTransmitter::instance()->NotifyAll(onwardNotification);
+            
+            return simgear::Emesary::ReceiptStatusOK;
+        }
+
+        return simgear::Emesary::ReceiptStatusOK;
+    }
+};
+
+class EmesaryTestThread : public SGThread
+{
+protected:
+    virtual void run() {
+        int threadId = nthread.fetch_add(1);
+
+        //System.Threading.Interlocked.Increment(ref nthread);
+        //var rng = new Random();
+        TestThreadRecipient r;
+        char temp[100];
+        sprintf(temp, "Notif %d", threadId);
+        printf("starting thread %s\n", temp);
+        TestThreadNotification tn((const char*)&r);
+        for (int i = 0; i < MaxIterations; i++)
+        {
+            simgear::Emesary::GlobalTransmitter::instance()->Register(r);
+            simgear::Emesary::GlobalTransmitter::instance()->NotifyAll(tn);
+            simgear::Emesary::GlobalTransmitter::instance()->DeRegister(r);
+            //System.Threading.Thread.Sleep(rng.Next(MaxSleep));
+            noperations++;
+        }
+        printf("%s invocations %d\n", temp, (int)r.receiveCount);
+        printf("finish thread %s\n", temp);
+    }
+};
+
+class EmesaryTest
+{
+public:
+
+    void Emesary_MultiThreadTransmitterTest()
+    {
+        int num_threads = 12;
+        std::list<EmesaryTestThread*> threads;
+
+        for (int i = 0; i < num_threads; i++)
+        {
+            EmesaryTestThread *thread = new EmesaryTestThread();
+            threads.push_back(thread);
+            thread->start();
+        }
+        for (std::list<EmesaryTestThread*>::iterator i = threads.begin(); i != threads.end(); i++)
+        {
+            (*i)->join();
+        }
+    }
+};
+
+void testEmesaryThreaded()
+{
+    TestThreadRecipient r;
+    TestThreadNotification tn((const char*)&r);
+    simgear::Emesary::GlobalTransmitter::instance()->Register(r);
+    for (int i = 0; i < MaxIterations*MaxIterations; i++)
+    {
+        simgear::Emesary::GlobalTransmitter::instance()->NotifyAll(tn);
+        //System.Threading.Thread.Sleep(rng.Next(MaxSleep));
+        noperations++;
+    }
+    simgear::Emesary::GlobalTransmitter::instance()->DeRegister(r);
+    printf("invocations %d\n", simgear::Emesary::GlobalTransmitter::instance()->SentMessageCount());
+
+    EmesaryTest t;
+    t.Emesary_MultiThreadTransmitterTest();
+}
+
+
+int main(int ac, char ** av)
+{
+    testEmesaryThreaded();
+
+    std::cout << "all tests passed" << std::endl;
+    return 0;
+}

simgear/environment/metar.cxx

@@ -38,9 +38,12 @@
 #  include <simgear_config.h>
 #endif
 
+#include <iomanip>
 #include <string>
 #include <time.h>
 #include <cstring>
+#include <ostream>
+#include <sstream>
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/exception.hxx>
@@ -155,6 +158,320 @@ SGMetar::~SGMetar()
 }
 
 
+static const char *azimuthName(double d)
+{
+	const char *dir[] = {
+		"N", "NNE", "NE", "ENE",
+		"E", "ESE", "SE", "SSE",
+		"S", "SSW", "SW", "WSW",
+		"W", "WNW", "NW", "NNW"
+	};
+	d += 11.25;
+	while (d < 0)
+		d += 360;
+	while (d >= 360)
+		d -= 360;
+	return dir[int(d / 22.5)];
+}
+
+
+// round double to 10^g
+static double rnd(double r, int g = 0)
+{
+	double f = pow(10.0, g);
+	return f * floor(r / f + 0.5);
+}
+
+
+/* A manipulator that can use spaces to emulate tab characters. */
+struct Tab
+{
+    /* If <stops> is 0, we simply insert tab characters. Otherwise we insert
+    spaces to align with the next column at multiple of <stops>. */
+    explicit Tab(int stops)
+    :
+    _stops(stops)
+    {}
+    int _stops;
+};
+
+std::ostream& operator << (std::ostream& out, const Tab& t)
+{
+    if (t._stops == 0) {
+        return out << '\t';
+    }
+    
+    std::ostringstream& out2 = *(std::ostringstream*) &out;
+    std::string s = out2.str();
+    
+    if (t._stops < 0) {
+        if (!s.size() || s[s.size()-1] != ' ') {
+            out << ' ';
+        }
+        return out;
+    }
+    
+    auto nl = s.rfind('\n');
+    if (nl < 0) nl = 0;
+    int column = 0;
+    for (auto i = nl+1; i != s.size(); ++i) {
+        if (s[i] == '\t')
+            column = (column + t._stops) / t._stops * t._stops;
+        else
+            column += 1;
+    }
+    int column2 = (column + t._stops) / t._stops * t._stops;
+    for (int i=column; i<column2; ++i) {
+        out << ' ';
+    }
+    return out;
+}
+
+/* Manipulator for SGMetarVisibility using a Tab. */
+struct SGMetarVisibilityManip
+{
+    explicit SGMetarVisibilityManip(const SGMetarVisibility& v, const Tab& tab)
+    :
+    _v(v),
+    _tab(tab)
+    {}
+    const SGMetarVisibility&    _v;
+    const Tab&                  _tab;
+};
+
+std::ostream& operator << (std::ostream& out, const SGMetarVisibilityManip& v)
+{
+	int m = v._v.getModifier();
+	const char *mod;
+	if (m == SGMetarVisibility::GREATER_THAN)
+		mod = ">=";
+	else if (m == SGMetarVisibility::LESS_THAN)
+		mod = "<";
+	else
+		mod = "";
+	out << mod;
+
+	double dist = rnd(v._v.getVisibility_m(), 1);
+	if (dist < 1000.0)
+		out << rnd(dist, 1) << " m";
+	else
+		out << rnd(dist / 1000.0, -1) << " km";
+
+	const char *dir = "";
+	int i;
+	if ((i = v._v.getDirection()) != -1) {
+		dir = azimuthName(i);
+		out << " " << dir;
+	}
+        out << v._tab << v._tab << v._tab << v._tab << v._tab;
+        out << mod << rnd(v._v.getVisibility_sm(), -1) << " US-miles " << dir;
+        return out;
+}
+
+
+std::string SGMetar::getDescription(int tabstops) const
+{
+        std::ostringstream  out;
+	const char *s;
+	char buf[256];
+	double d;
+	int i, lineno;
+        Tab tab(tabstops);
+        
+	if ((i = getReportType()) == SGMetar::AUTO)
+		out << "(METAR automatically generated)\n";
+	else if (i == SGMetar::COR)
+		out << "(METAR manually corrected)\n";
+	else if (i == SGMetar::RTD)
+		out << "(METAR routine delayed)\n";
+        
+	out << "Airport-Id:" << tab << tab << getId() << "\n";
+
+	// date/time
+	int year = getYear();
+	int month = getMonth();
+	out << "Report time:" << tab << tab << year << '/' << month << '/' << getDay();
+	out << ' ' << getHour() << ':';
+	out << std::setw(2) << std::setfill('0') << getMinute() << " UTC\n";
+
+
+	// visibility
+	SGMetarVisibility minvis = getMinVisibility();
+	SGMetarVisibility maxvis = getMaxVisibility();
+	double min = minvis.getVisibility_m();
+	double max = maxvis.getVisibility_m();
+	if (min != NaN) {
+		if (max != NaN) {
+			out << "min. Visibility:" << tab << SGMetarVisibilityManip(minvis, tab) << "\n";
+			out << "max. Visibility:" << tab << SGMetarVisibilityManip(maxvis, tab) << "\n";
+		} else {
+			out << "Visibility:" << tab << tab << SGMetarVisibilityManip(minvis, tab) << "\n";
+                }
+	}
+
+
+	// directed visibility
+	const SGMetarVisibility *dirvis = getDirVisibility();
+	for (i = 0; i < 8; i++, dirvis++)
+		if (dirvis->getVisibility_m() != NaN)
+			out << tab << tab << tab << SGMetarVisibilityManip(*dirvis, tab) << "\n";
+
+
+	// vertical visibility
+	SGMetarVisibility vertvis = getVertVisibility();
+	if ((d = vertvis.getVisibility_ft()) != NaN)
+		out << "Vert. visibility:" << tab << SGMetarVisibilityManip(vertvis, tab) << "\n";
+	else if (vertvis.getModifier() == SGMetarVisibility::NOGO)
+		out << "Vert. visibility:" << tab << "impossible to determine" << "\n";
+
+
+	// wind
+	d = getWindSpeed_kmh();
+	out << "Wind:" << tab << tab << tab;
+	if (d < .1)
+		out << "none" << "\n";
+	else {
+		if ((i = getWindDir()) == -1)
+			out << "from variable directions";
+		else
+			out << "from the " << azimuthName(i) << " (" << i << " deg)";
+		out << " at " << rnd(d, -1) << " km/h";
+
+		out << tab << tab << rnd(getWindSpeed_kt(), -1) << " kt";
+		out << " = " << rnd(getWindSpeed_mph(), -1) << " mph";
+		out << " = " << rnd(getWindSpeed_mps(), -1) << " m/s";
+		out << "\n";
+
+		d = getGustSpeed_kmh();
+                if (d != NaN && d != 0) {
+			out << tab << tab << tab << "with gusts at " << rnd(d, -1) << " km/h";
+			out << tab << tab << tab << rnd(getGustSpeed_kt(), -1) << " kt";
+			out << " = " << rnd(getGustSpeed_mph(), -1) << " mph";
+			out << " = " << rnd(getGustSpeed_mps(), -1) << " m/s";
+			out << "\n";
+		}
+
+		int from = getWindRangeFrom();
+		int to = getWindRangeTo();
+		if (from != to) {
+			out << tab << tab << tab << "variable from " << azimuthName(from);
+			out << " to " << azimuthName(to);
+			out << " (" << from << "deg --" << to << " deg)" << "\n";
+		}
+	}
+
+
+	// temperature/humidity/air pressure
+	if ((d = getTemperature_C()) != NaN) {
+		out << "Temperature:" << tab << tab << d << " C" << tab << tab << tab << tab << tab;
+		out << rnd(getTemperature_F(), -1) << " F" << "\n";
+
+		if ((d = getDewpoint_C()) != NaN) {
+			out << "Dewpoint:" << tab << tab << d << " C" << tab << tab << tab << tab << tab;
+			out << rnd(getDewpoint_F(), -1) << " F"  << "\n";
+			out << "Rel. Humidity: " << tab << tab << rnd(getRelHumidity()) << " %" << "\n";
+		}
+	}
+	if ((d = getPressure_hPa()) != NaN) {
+		out << "Pressure:" << tab << tab << rnd(d) << " hPa" << tab << tab << tab << tab;
+		out << rnd(getPressure_inHg(), -2) << " in. Hg" << "\n";
+	}
+
+
+	// weather phenomena
+	vector<string> wv = getWeather();
+	vector<string>::iterator weather;
+	for (i = 0, weather = wv.begin(); weather != wv.end(); weather++, i++) {
+		out << (i ? ", " : "Weather:") << tab << tab << weather->c_str();
+	}
+	if (i)
+		out << "\n";
+
+
+	// cloud layers
+	const char *coverage_string[5] = {
+		"clear skies", "few clouds", "scattered clouds", "broken clouds", "sky overcast"
+	};
+	vector<SGMetarCloud> cv = getClouds();
+	vector<SGMetarCloud>::iterator cloud;
+	for (lineno = 0, cloud = cv.begin(); cloud != cv.end(); cloud++, lineno++) {
+                if (lineno) out << tab << tab << tab;
+                else    out << "Sky condition:" << tab << tab;
+
+		if ((i = cloud->getCoverage()) != -1)
+			out << coverage_string[i];
+		if ((d = cloud->getAltitude_ft()) != NaN)
+			out << " at " << rnd(d, 1) << " ft";
+		if ((s = cloud->getTypeLongString()))
+			out << " (" << s << ')';
+		if (d != NaN)
+			out << tab << tab << tab << rnd(cloud->getAltitude_m(), 1) << " m";
+		out << "\n";
+	}
+
+
+	// runways
+	map<string, SGMetarRunway> rm = getRunways();
+	map<string, SGMetarRunway>::iterator runway;
+	for (runway = rm.begin(); runway != rm.end(); runway++) {
+		lineno = 0;
+		if (!strcmp(runway->first.c_str(), "ALL"))
+			out << "All runways:" << tab << tab;
+		else
+			out << "Runway " << runway->first << ":" << tab << tab;
+		SGMetarRunway rwy = runway->second;
+
+		// assemble surface string
+		vector<string> surface;
+		if ((s = rwy.getDepositString()) && strlen(s))
+			surface.push_back(s);
+		if ((s = rwy.getExtentString()) && strlen(s))
+			surface.push_back(s);
+		if ((d = rwy.getDepth()) != NaN) {
+			sprintf(buf, "%.1lf mm", d * 1000.0);
+			surface.push_back(buf);
+		}
+		if ((s = rwy.getFrictionString()) && strlen(s))
+			surface.push_back(s);
+		if ((d = rwy.getFriction()) != NaN) {
+			sprintf(buf, "friction: %.2lf", d);
+			surface.push_back(buf);
+		}
+
+		if (! surface.empty()) {
+			vector<string>::iterator rwysurf = surface.begin();
+			for (i = 0; rwysurf != surface.end(); rwysurf++, i++) {
+				if (i)
+					out << ", ";
+				out << *rwysurf;
+			}
+			lineno++;
+		}
+
+		// assemble visibility string
+		SGMetarVisibility minvis = rwy.getMinVisibility();
+		SGMetarVisibility maxvis = rwy.getMaxVisibility();
+		if ((d = minvis.getVisibility_m()) != NaN) {
+			if (lineno++)
+				out << "\n" << tab << tab << tab;
+			out << SGMetarVisibilityManip(minvis, tab);
+		}
+		if (maxvis.getVisibility_m() != d) {
+			out << "\n" << tab << tab << tab << SGMetarVisibilityManip(maxvis, tab) << "\n";
+			lineno++;
+		}
+
+		if (rwy.getWindShear()) {
+			if (lineno++)
+				out << "\n" << tab << tab << tab;
+			out << "critical wind shear" << "\n";
+		}
+		out << "\n";
+	}
+	out << "\n";
+        return out.str();
+}
+
 void SGMetar::useCurrentDate()
 {
 	struct tm now;
@@ -314,11 +631,15 @@ bool SGMetar::scanWind()
 	int dir;
 	if (!strncmp(m, "VRB", 3))
 		m += 3, dir = -1;
+	else if (!strncmp(m, "///", 3))	// direction not measurable
+		m += 3, dir = -1;
 	else if (!scanNumber(&m, &dir, 3))
 		return false;
 
 	int i;
-	if (!scanNumber(&m, &i, 2, 3))
+	if (!strncmp(m, "//", 2))	// speed not measurable
+		m += 2, i = -1;
+	else if (!scanNumber(&m, &i, 2, 3))
 		return false;
 	double speed = i;
 
@@ -338,6 +659,8 @@ bool SGMetar::scanWind()
 		m += 3, factor = SG_KMH_TO_MPS;
 	else if (!strncmp(m, "MPS", 3))
 		m += 3, factor = 1.0;
+	else if (!strncmp(m, " ", 1))		// default to Knots
+		factor = SG_KT_TO_MPS;
 	else
 		return false;
 	if (!scanBoundary(&m))
@@ -635,6 +958,8 @@ bool SGMetar::scanWeather()
 		weather += string(a->text) + " ";
 		if (!strcmp(a->id, "RA"))
 			_rain = w.intensity;
+		else if (!strcmp(a->id, "DZ"))
+			_rain = LIGHT;
 		else if (!strcmp(a->id, "HA"))
 			_hail = w.intensity;
 		else if (!strcmp(a->id, "SN"))

simgear/environment/metar.hxx

@@ -235,6 +235,11 @@ public:
 	inline const std::vector<std::string>& getWeather()		const	{ return _weather; }
 	inline const std::vector<struct Weather> getWeather2()	const   { return _weather2; }
 
+        /* Returns human-readable description. If tabtops is 0, we use tab
+        characters. If +ve we use spaces to pad to multiple of <tabstops>. If
+        -1 all sequences of tabs are represented by a single space. */
+        std::string     getDescription(int tabstops)   const;
+
 protected:
 	std::string	_url;
 	int	_grpcount;

simgear/environment/precipitation.cxx

@@ -44,6 +44,10 @@ SGPrecipitation::SGPrecipitation() :
 void SGPrecipitation::setEnabled( bool value )
 {
     _enabled = value;
+    if (!_enabled) {
+        _precipitationEffect->snow(0);
+        _precipitationEffect->rain(0);
+    }
 }
 
 void SGPrecipitation::setDropletExternal( bool value )
@@ -64,6 +68,9 @@ bool SGPrecipitation::getEnabled() const
  */
 osg::Group* SGPrecipitation::build(void)
 {
+    if (!_enabled) 
+        return nullptr;
+
     osg::ref_ptr<osg::Group> group = new osg::Group;
 
     _precipitationEffect->snow(0);	
@@ -227,6 +234,9 @@ void SGPrecipitation::setWindProperty(double heading, double speed)
  */
 bool SGPrecipitation::update(void)
 {
+    if (!_enabled)
+        return false;
+
     if (this->_freeze) {
         if (this->_rain_intensity > 0) {
 		this->_snow_intensity = this->_rain_intensity;

simgear/environment/test_metar.cxx

@@ -76,12 +76,29 @@ void test_sensor_failure_cloud()
     SG_CHECK_EQUAL_EP2(m1.getPressure_hPa(), 1025, TEST_EPSILON);
 }
 
+void test_sensor_failure_wind()
+{
+    SGMetar m1("2020/10/23 16:55 LIVD 231655Z /////KT 9999 OVC025 10/08 Q1020 RMK OVC VIS MIN 9999 BLU");
+    SG_CHECK_EQUAL(m1.getWindDir(), -1);
+    SG_CHECK_EQUAL_EP2(m1.getWindSpeed_kt(), -1, TEST_EPSILON);
+}
+
+void test_wind_unit_not_specified()
+{
+    SGMetar m1("2020/10/23 11:58 KLSV 231158Z 05010G14 10SM CLR 16/M04 A2992 RMK SLPNO WND DATA ESTMD ALSTG/SLP ESTMD 10320 20124 5//// $");
+    SG_CHECK_EQUAL(m1.getWindDir(), 50);
+    SG_CHECK_EQUAL_EP2(m1.getWindSpeed_kt(), 10.0, TEST_EPSILON);
+    SG_CHECK_EQUAL_EP2(m1.getGustSpeed_kt(), 14.0, TEST_EPSILON);
+}
+
 int main(int argc, char* argv[])
 {
     try {
         test_basic();
         test_sensor_failure_weather();
         test_sensor_failure_cloud();
+        test_sensor_failure_wind();
+        test_wind_unit_not_specified();
     } catch (sg_exception& e) {
         cerr << "got exception:" << e.getMessage() << endl;
         return -1;

simgear/environment/visual_enviro.cxx

@@ -191,52 +191,11 @@ SGEnviro::~SGEnviro(void) {
 
   // OSGFIXME
   return;
-	list_of_lightning::iterator iLightning;
-	for( iLightning = lightnings.begin() ; iLightning != lightnings.end() ; ++iLightning ) {
-		delete (*iLightning);
-	}
-	lightnings.clear();
 }
 
 void SGEnviro::startOfFrame( SGVec3f p, SGVec3f up, double lon, double lat, double alt, double delta_time) {
   // OSGFIXME
   return;
-	view_in_cloud = false;
-	// ask the impostor cache to do some cleanup
-	last_cloud_turbulence = cloud_turbulence;
-	cloud_turbulence = 0.0;
-	elapsed_time += delta_time;
-	min_time_before_lt -= delta_time;
-	dt = delta_time;
-#if 0
-	sgMat4 T1, LON, LAT;
-    sgVec3 axis;
-
-    sgMakeTransMat4( T1, p );
-
-    sgSetVec3( axis, 0.0, 0.0, 1.0 );
-    sgMakeRotMat4( LON, lon, axis );
-
-    sgSetVec3( axis, 0.0, 1.0, 0.0 );
-    sgMakeRotMat4( LAT, 90.0 - lat, axis );
-
-    sgMat4 TRANSFORM;
-
-    sgCopyMat4( TRANSFORM, T1 );
-    sgPreMultMat4( TRANSFORM, LON );
-    sgPreMultMat4( TRANSFORM, LAT );
-
-    sgCoord pos;
-    sgSetCoord( &pos, TRANSFORM );
-
-	sgMakeCoordMat4( transform, &pos );
-  #endif
-    last_lon = lon;
-    last_lat = lat;
-	last_alt = alt;
-
-	radarEcho.clear();
-	precipitation_max_alt = 400.0;
 }
 
 void SGEnviro::endOfFrame(void) {
@@ -291,10 +250,6 @@ void SGEnviro::set_lightning_enable_state(bool enable) {
 void SGEnviro::setLight(SGVec4f adj_fog_color) {
   // OSGFIXME
   return;
-	 fog_color = adj_fog_color;
-	if( false ) {
-	//    ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, l->scene_diffuse() );
-	}
 }
 #if 0
 void SGEnviro::callback_cloud(float heading, float alt, float radius, int family, float dist, int cloudId) {
@@ -431,9 +386,6 @@ void SGEnviro::set_sampleGroup(SGSampleGroup *sgr) {
 void SGEnviro::drawPrecipitation(double rain_norm, double snow_norm, double hail_norm, double pitch, double roll, double heading, double hspeed) {
   // OSGFIXME
   return;
-	if( precipitation_enable_state && rain_norm > 0.0)
-	  if( precipitation_max_alt >= last_alt )
-		drawRain(pitch, roll, heading, hspeed, rain_norm);
 }
 
 
@@ -471,10 +423,6 @@ void SGLightning::lt_Render(void) {
 void SGEnviro::addLightning(double lon, double lat, double alt) {
   // OSGFIXME
   return;
-	if( lightnings.size() > 10)
-		return;
-	SGLightning *lt= new SGLightning(lon, lat, alt);
-	lightnings.push_back(lt);
 }
 
 void SGEnviro::drawLightning(void) {

simgear/ephemeris/ephemeris.cxx

@@ -31,7 +31,7 @@
 
 
 // Constructor
-SGEphemeris::SGEphemeris( const std::string &path ) {
+SGEphemeris::SGEphemeris( const SGPath& path ) {
     our_sun = new Star;
     moon = new MoonPos;
     mercury = new Mercury;
@@ -44,7 +44,7 @@ SGEphemeris::SGEphemeris( const std::string &path ) {
     nplanets = 7;
     for ( int i = 0; i < nplanets; ++i )
       planets[i] = SGVec3d::zeros();
-    stars = new SGStarData( SGPath(path) );
+    stars = new SGStarData(path);
 }
 
 

simgear/ephemeris/ephemeris.hxx

@@ -97,7 +97,7 @@ public:
      * calling the constructor you need to provide a path pointing to
      * your star database file.
      * @param path path to your star database */
-    SGEphemeris( const std::string &path );
+    SGEphemeris( const SGPath &path );
 
     /** Destructor */
     ~SGEphemeris( void );

simgear/hla/RTIFederateFactoryRegistry.cxx

@@ -19,11 +19,13 @@
 #  include <simgear_config.h>
 #endif
 
+#include <mutex>
+
 #include <simgear/compiler.h>
 
 #include "RTIFederateFactoryRegistry.hxx"
 
-#include "simgear/threads/SGGuard.hxx"
+#include "simgear/threads/SGThread.hxx"
 #include "RTIFederate.hxx"
 
 namespace simgear {
@@ -39,7 +41,7 @@ RTIFederateFactoryRegistry::~RTIFederateFactoryRegistry()
 SGSharedPtr<RTIFederate>
 RTIFederateFactoryRegistry::create(const std::string& name, const std::list<std::string>& stringList) const
 {
-    SGGuard<SGMutex> guard(_mutex);
+    std::lock_guard<std::mutex> guard(_mutex);
     for (FederateFactoryList::const_iterator i = _federateFactoryList.begin(); i != _federateFactoryList.end(); ++i) {
         SGSharedPtr<RTIFederate> federate = (*i)->create(name, stringList);
         if (!federate.valid())
@@ -52,7 +54,7 @@ RTIFederateFactoryRegistry::create(const std::string& name, const std::list<std:
 void
 RTIFederateFactoryRegistry::registerFactory(RTIFederateFactory* factory)
 {
-    SGGuard<SGMutex> guard(_mutex);
+    std::lock_guard<std::mutex> guard(_mutex);
     _federateFactoryList.push_back(factory);
 }
 

simgear/io/CMakeLists.txt

@@ -35,10 +35,12 @@ set(SOURCES
     sg_socket.cxx
     sg_socket_udp.cxx
     HTTPClient.cxx
+    HTTPTestApi_private.hxx
     HTTPFileRequest.cxx
     HTTPMemoryRequest.cxx
     HTTPRequest.cxx
     HTTPRepository.cxx
+    HTTPRepository_private.hxx
     untar.cxx
     )
 
@@ -81,6 +83,7 @@ add_test(binobj ${EXECUTABLE_OUTPUT_PATH}/test_binobj)
 
 add_executable(test_repository test_repository.cxx)
 target_link_libraries(test_repository ${TEST_LIBS})
+target_compile_definitions(test_repository PUBLIC BUILDING_TESTSUITE)
 add_test(http_repository ${EXECUTABLE_OUTPUT_PATH}/test_repository)
 
 add_executable(test_untar test_untar.cxx)

simgear/io/DNSClient.cxx

@@ -156,8 +156,13 @@ static void dnscbTXT(struct dns_ctx *ctx, struct dns_rr_txt *result, void *data)
         r->ttl = result->dnstxt_ttl;
         for (int i = 0; i < result->dnstxt_nrr; i++) {
           //TODO: interprete the .len field of dnstxt_txt?
-          string txt = string((char*)result->dnstxt_txt[i].txt);
-          r->entries.push_back( txt );
+          auto rawTxt = reinterpret_cast<char*>(result->dnstxt_txt[i].txt);
+          if (!rawTxt) {
+              continue;
+          }
+
+          const string txt{rawTxt};
+          r->entries.push_back(txt);
           string_list tokens = simgear::strutils::split( txt, "=", 1 );
           if( tokens.size() == 2 ) {
             r->attributes[tokens[0]] = tokens[1];

simgear/io/HTTPClient.cxx

@@ -33,13 +33,10 @@
 #include <errno.h>
 #include <map>
 #include <stdexcept>
-
-#include <boost/foreach.hpp>
-#include <boost/algorithm/string/case_conv.hpp>
+#include <mutex>
 
 #include <simgear/simgear_config.h>
 
-#include <curl/multi.h>
 
 #include <simgear/io/sg_netChat.hxx>
 
@@ -49,6 +46,9 @@
 #include <simgear/timing/timestamp.hxx>
 #include <simgear/structure/exception.hxx>
 
+#include "HTTPClient_private.hxx"
+#include "HTTPTestApi_private.hxx"
+
 #if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
 #include "version.h"
 #else
@@ -66,48 +66,20 @@ namespace HTTP
 extern const int DEFAULT_HTTP_PORT = 80;
 const char* CONTENT_TYPE_URL_ENCODED = "application/x-www-form-urlencoded";
 
-class Connection;
-typedef std::multimap<std::string, Connection*> ConnectionDict;
-typedef std::list<Request_ptr> RequestList;
-
-class Client::ClientPrivate
-{
-public:
-    CURLM* curlMulti;
-
-    void createCurlMulti()
-    {
-        curlMulti = curl_multi_init();
-        // see https://curl.haxx.se/libcurl/c/CURLMOPT_PIPELINING.html
-        // we request HTTP 1.1 pipelining
-        curl_multi_setopt(curlMulti, CURLMOPT_PIPELINING, 1 /* aka CURLPIPE_HTTP1 */);
+void Client::ClientPrivate::createCurlMulti() {
+  curlMulti = curl_multi_init();
+  // see https://curl.haxx.se/libcurl/c/CURLMOPT_PIPELINING.html
+  // we request HTTP 1.1 pipelining
+  curl_multi_setopt(curlMulti, CURLMOPT_PIPELINING, 1 /* aka CURLPIPE_HTTP1 */);
 #if (LIBCURL_VERSION_MINOR >= 30)
-        curl_multi_setopt(curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS, (long) maxConnections);
-        curl_multi_setopt(curlMulti, CURLMOPT_MAX_PIPELINE_LENGTH,
-                          (long) maxPipelineDepth);
-        curl_multi_setopt(curlMulti, CURLMOPT_MAX_HOST_CONNECTIONS,
-                          (long) maxHostConnections);
+  curl_multi_setopt(curlMulti, CURLMOPT_MAX_TOTAL_CONNECTIONS,
+                    (long)maxConnections);
+  curl_multi_setopt(curlMulti, CURLMOPT_MAX_PIPELINE_LENGTH,
+                    (long)maxPipelineDepth);
+  curl_multi_setopt(curlMulti, CURLMOPT_MAX_HOST_CONNECTIONS,
+                    (long)maxHostConnections);
 #endif
-    }
-
-    typedef std::map<Request_ptr, CURL*> RequestCurlMap;
-    RequestCurlMap requests;
-
-    std::string userAgent;
-    std::string proxy;
-    int proxyPort;
-    std::string proxyAuth;
-    unsigned int maxConnections;
-    unsigned int maxHostConnections;
-    unsigned int maxPipelineDepth;
-
-    RequestList pendingRequests;
-
-    SGTimeStamp timeTransferSample;
-    unsigned int bytesTransferred;
-    unsigned int lastTransferRate;
-    uint64_t totalBytesDownloaded;
-};
+}
 
 Client::Client() :
     d(new ClientPrivate)
@@ -122,7 +94,12 @@ Client::Client() :
     d->maxPipelineDepth = 5;
     setUserAgent("SimGear-" SG_STRINGIZE(SIMGEAR_VERSION));
 
+    d->tlsCertificatePath = SGPath::fromEnv("SIMGEAR_TLS_CERT_PATH");
+
     static bool didInitCurlGlobal = false;
+    static std::mutex initMutex;
+
+    std::lock_guard<std::mutex> g(initMutex);
     if (!didInitCurlGlobal) {
       curl_global_init(CURL_GLOBAL_ALL);
       didInitCurlGlobal = true;
@@ -160,6 +137,14 @@ void Client::setMaxPipelineDepth(unsigned int depth)
 #endif
 }
 
+void Client::reset()
+{
+    curl_multi_cleanup(d->curlMulti);
+    d.reset(new ClientPrivate);
+    d->tlsCertificatePath = SGPath::fromEnv("SIMGEAR_TLS_CERT_PATH");
+    d->createCurlMulti();
+}
+
 void Client::update(int waitTimeout)
 {
     if (d->requests.empty()) {
@@ -170,32 +155,22 @@ void Client::update(int waitTimeout)
     }
 
     int remainingActive, messagesInQueue;
-#if defined(SG_MAC)
-    // Mac 10.8 libCurl lacks this, let's keep compat for now
-    fd_set curlReadFDs, curlWriteFDs, curlErrorFDs;
-    int maxFD;
-    curl_multi_fdset(d->curlMulti,
-                     &curlReadFDs,
-                     &curlWriteFDs,
-                     &curlErrorFDs,
-                     &maxFD);
-    
-    struct timeval timeout;
-    long t;
-    
-    curl_multi_timeout(d->curlMulti, &t);
-    if ((t < 0) || (t > waitTimeout)) {
-        t = waitTimeout;
-    }
-    
-    timeout.tv_sec = t / 1000;
-    timeout.tv_usec = (t % 1000) * 1000;
-    ::select(maxFD, &curlReadFDs, &curlWriteFDs, &curlErrorFDs, &timeout);
-#else
     int numFds;
-    curl_multi_wait(d->curlMulti, NULL, 0, waitTimeout, &numFds);
-#endif
-    curl_multi_perform(d->curlMulti, &remainingActive);
+    CURLMcode mc = curl_multi_wait(d->curlMulti, NULL, 0, waitTimeout, &numFds);
+    if (mc != CURLM_OK) {
+        SG_LOG(SG_IO, SG_WARN, "curl_multi_wait failed:" << curl_multi_strerror(mc));
+        return;
+    }
+
+    mc = curl_multi_perform(d->curlMulti, &remainingActive);
+    if (mc == CURLM_CALL_MULTI_PERFORM) {
+        // we could loop here, but don't want to get blocked
+        // also this shouldn't  ocurr in any modern libCurl
+        curl_multi_perform(d->curlMulti, &remainingActive);
+    } else if (mc != CURLM_OK) {
+        SG_LOG(SG_IO, SG_WARN, "curl_multi_perform failed:" << curl_multi_strerror(mc));
+        return;
+    }
 
     CURLMsg* msg;
     while ((msg = curl_multi_info_read(d->curlMulti, &messagesInQueue))) {
@@ -220,12 +195,23 @@ void Client::update(int waitTimeout)
           assert(it->second == e);
           d->requests.erase(it);
 
-        if (msg->data.result == 0) {
-          req->responseComplete();
-        } else {
-          SG_LOG(SG_IO, SG_WARN, "CURL Result:" << msg->data.result << " " << curl_easy_strerror(msg->data.result));
-          req->setFailure(msg->data.result, curl_easy_strerror(msg->data.result));
-        }
+          bool doProcess = true;
+          if (d->testsuiteResponseDoneCallback) {
+            doProcess =
+                !d->testsuiteResponseDoneCallback(msg->data.result, req);
+          }
+
+          if (doProcess) {
+            if (msg->data.result == 0) {
+              req->responseComplete();
+            } else {
+              SG_LOG(SG_IO, SG_WARN,
+                     "CURL Result:" << msg->data.result << " "
+                                    << curl_easy_strerror(msg->data.result));
+              req->setFailure(msg->data.result,
+                              curl_easy_strerror(msg->data.result));
+            }
+          }
 
         curl_multi_remove_handle(d->curlMulti, e);
         curl_easy_cleanup(e);
@@ -270,11 +256,25 @@ void Client::makeRequest(const Request_ptr& r)
     curl_easy_setopt(curlRequest, CURLOPT_HEADERFUNCTION, requestHeaderCallback);
     curl_easy_setopt(curlRequest, CURLOPT_HEADERDATA, r.get());
 
+#if !defined(CURL_MAX_READ_SIZE)
+	const int CURL_MAX_READ_SIZE = 512 * 1024;
+#endif
+
+    curl_easy_setopt(curlRequest, CURLOPT_BUFFERSIZE, CURL_MAX_READ_SIZE);
     curl_easy_setopt(curlRequest, CURLOPT_USERAGENT, d->userAgent.c_str());
     curl_easy_setopt(curlRequest, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 
+    if (sglog().would_log(SG_TERRASYNC, SG_DEBUG)) {
+        curl_easy_setopt(curlRequest, CURLOPT_VERBOSE, 1);
+    }
+
     curl_easy_setopt(curlRequest, CURLOPT_FOLLOWLOCATION, 1);
 
+    if (!d->tlsCertificatePath.isNull()) {
+        const auto utf8 = d->tlsCertificatePath.utf8Str();
+        curl_easy_setopt(curlRequest, CURLOPT_CAINFO, utf8.c_str());
+    }
+
     if (!d->proxy.empty()) {
       curl_easy_setopt(curlRequest, CURLOPT_PROXY, d->proxy.c_str());
       curl_easy_setopt(curlRequest, CURLOPT_PROXYPORT, d->proxyPort);
@@ -285,7 +285,7 @@ void Client::makeRequest(const Request_ptr& r)
       }
     }
 
-    std::string method = boost::to_lower_copy(r->method());
+    const std::string method = strutils::lowercase (r->method());
     if (method == "get") {
       curl_easy_setopt(curlRequest, CURLOPT_HTTPGET, 1);
     } else if (method == "put") {
@@ -472,12 +472,26 @@ size_t Client::requestReadCallback(char *ptr, size_t size, size_t nmemb, void *u
   return actualBytes;
 }
 
+bool isRedirectStatus(int code)
+{
+    return ((code >= 300) && (code < 400));
+}
+
 size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t nitems, void *userdata)
 {
   size_t byteSize = size * nitems;
   Request* req = static_cast<Request*>(userdata);
   std::string h = strutils::simplify(std::string(rawBuffer, byteSize));
 
+  if (req->readyState() >= HTTP::Request::HEADERS_RECEIVED) {
+      // this can happen with chunked transfers (secondary chunks)
+      // or redirects
+      if (isRedirectStatus(req->responseCode())) {
+          req->responseStart(h);
+          return byteSize;
+      }
+  }
+
   if (req->readyState() == HTTP::Request::OPENED) {
     req->responseStart(h);
     return byteSize;
@@ -504,8 +518,8 @@ size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t nitems
       return byteSize;
   }
 
-  std::string key = strutils::simplify(h.substr(0, colonPos));
-  std::string lkey = boost::to_lower_copy(key);
+  const std::string key = strutils::simplify(h.substr(0, colonPos));
+  const std::string lkey = strutils::lowercase (key);
   std::string value = strutils::strip(h.substr(colonPos + 1));
 
   req->responseHeader(lkey, value);
@@ -528,6 +542,17 @@ void Client::clearAllConnections()
     d->createCurlMulti();
 }
 
+/////////////////////////////////////////////////////////////////////
+
+void TestApi::setResponseDoneCallback(Client *cl, ResponseDoneCallback cb) {
+  cl->d->testsuiteResponseDoneCallback = cb;
+}
+
+void TestApi::markRequestAsFailed(Request_ptr req, int curlCode,
+                                  const std::string &message) {
+  req->setFailure(curlCode, message);
+}
+
 } // of namespace HTTP
 
 } // of namespace simgear

simgear/io/HTTPClient.hxx

@@ -24,7 +24,8 @@
 #ifndef SG_HTTP_CLIENT_HXX
 #define SG_HTTP_CLIENT_HXX
 
-#include <memory> // for std::unique_ptr
+#include <functional>
+#include <memory>   // for std::unique_ptr
 #include <stdint.h> // for uint_64t
 
 #include <simgear/io/HTTPFileRequest.hxx>
@@ -47,6 +48,8 @@ public:
 
     void update(int waitTimeout = 0);
 
+    void reset();
+
     void makeRequest(const Request_ptr& r);
 
     void cancelRequest(const Request_ptr& r, std::string reason = std::string());
@@ -123,6 +126,7 @@ private:
 
     friend class Connection;
     friend class Request;
+    friend class TestApi;
 
     class ClientPrivate;
     std::unique_ptr<ClientPrivate> d;

simgear/io/HTTPClient_private.hxx

@@ -0,0 +1,68 @@
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+
+#pragma once
+
+#include <list>
+#include <map>
+
+#include "HTTPClient.hxx"
+#include "HTTPRequest.hxx"
+
+#include <simgear/timing/timestamp.hxx>
+
+#include <curl/multi.h>
+
+namespace simgear {
+namespace HTTP {
+
+typedef std::list<Request_ptr> RequestList;
+
+using ResponseDoneCallback =
+    std::function<bool(int curlResult, Request_ptr req)>;
+
+class Client::ClientPrivate {
+public:
+  CURLM *curlMulti;
+
+  void createCurlMulti();
+
+  typedef std::map<Request_ptr, CURL *> RequestCurlMap;
+  RequestCurlMap requests;
+
+  std::string userAgent;
+  std::string proxy;
+  int proxyPort;
+  std::string proxyAuth;
+  unsigned int maxConnections;
+  unsigned int maxHostConnections;
+  unsigned int maxPipelineDepth;
+
+  RequestList pendingRequests;
+
+  SGTimeStamp timeTransferSample;
+  unsigned int bytesTransferred;
+  unsigned int lastTransferRate;
+  uint64_t totalBytesDownloaded;
+
+  SGPath tlsCertificatePath;
+
+  // only used by unit-tests / test-api, but
+  // only costs us a pointe here to declare it.
+  ResponseDoneCallback testsuiteResponseDoneCallback;
+};
+
+} // namespace HTTP
+
+} // namespace simgear

simgear/io/HTTPRepository.hxx

@@ -20,6 +20,7 @@
 #ifndef SG_IO_HTTP_REPOSITORY_HXX
 #define SG_IO_HTTP_REPOSITORY_HXX
 
+#include <functional>
 #include <memory>
 
 #include <simgear/misc/sg_path.hxx>
@@ -32,49 +33,83 @@ class HTTPRepoPrivate;
 class HTTPRepository
 {
 public:
-    enum ResultCode {
-        REPO_NO_ERROR = 0,
-        REPO_ERROR_NOT_FOUND,
-        REPO_ERROR_SOCKET,
-        SVN_ERROR_XML,
-        SVN_ERROR_TXDELTA,
-        REPO_ERROR_IO,
-        REPO_ERROR_CHECKSUM,
-        REPO_ERROR_FILE_NOT_FOUND,
-        REPO_ERROR_HTTP,
-        REPO_ERROR_CANCELLED,
-        REPO_PARTIAL_UPDATE
+  enum ResultCode {
+    REPO_NO_ERROR = 0,
+    REPO_ERROR_NOT_FOUND,
+    REPO_ERROR_SOCKET,
+    SVN_ERROR_XML,
+    SVN_ERROR_TXDELTA,
+    REPO_ERROR_IO,
+    REPO_ERROR_CHECKSUM,
+    REPO_ERROR_FILE_NOT_FOUND,
+    REPO_ERROR_HTTP,
+    REPO_ERROR_CANCELLED,
+    REPO_PARTIAL_UPDATE ///< repository is working, but file-level failures
+                        ///< occurred
+  };
+
+  HTTPRepository(const SGPath &root, HTTP::Client *cl);
+  virtual ~HTTPRepository();
+
+  virtual SGPath fsBase() const;
+
+  virtual void setBaseUrl(const std::string &url);
+  virtual std::string baseUrl() const;
+
+  virtual HTTP::Client *http() const;
+
+  virtual void update();
+
+  virtual bool isDoingSync() const;
+
+  /**
+        @brief call this periodically to progress non-network tasks
+     */
+  void process();
+
+  virtual ResultCode failure() const;
+
+  virtual size_t bytesToDownload() const;
+
+  virtual size_t bytesDownloaded() const;
+
+  /**
+   * optionally provide the location of an installer copy of this
+   * repository. When a file is missing it will be copied from this tree.
+   */
+  void setInstalledCopyPath(const SGPath &copyPath);
+
+  static std::string resultCodeAsString(ResultCode code);
+
+  enum class SyncAction { Add, Update, Delete, UpToDate };
+
+  enum EntryType { FileType, DirectoryType, TarballType };
+
+  struct SyncItem {
+    const std::string directory; // relative path in the repository
+    const EntryType type;
+    const std::string filename;
+    const SyncAction action;
+    const SGPath pathOnDisk; // path the entry does / will have
+  };
+
+    using SyncPredicate = std::function<bool(const SyncItem &item)>;
+
+    void setFilter(SyncPredicate sp);
+
+    struct Failure {
+      SGPath path;
+      ResultCode error;
     };
 
-    HTTPRepository(const SGPath& root, HTTP::Client* cl);
-    virtual ~HTTPRepository();
-
-    virtual SGPath fsBase() const;
-
-    virtual void setBaseUrl(const std::string& url);
-    virtual std::string baseUrl() const;
-
-    virtual HTTP::Client* http() const;
-
-    virtual void update();
-
-    virtual bool isDoingSync() const;
-
-    virtual ResultCode failure() const;
-
-    virtual size_t bytesToDownload() const;
-
-    virtual size_t bytesDownloaded() const;
+    using FailureVec = std::vector<Failure>;
 
     /**
-     * optionally provide the location of an installer copy of this
-     * repository. When a file is missing it will be copied from this tree.
+     * @brief return file-level failures
      */
-    void setInstalledCopyPath(const SGPath& copyPath);
-    
-    static std::string resultCodeAsString(ResultCode code);
+    FailureVec failures() const;
 
-private:
+  private:
     bool isBare() const;
 
     std::unique_ptr<HTTPRepoPrivate> _d;

simgear/io/HTTPRepository_private.hxx

@@ -0,0 +1,126 @@
+// HTTPRepository.cxx -- plain HTTP TerraSync remote client
+//
+// Copyright (C) 20126  James Turner <zakalawe@mac.com>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+// USA.
+
+#pragma once
+
+#include <deque>
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include <simgear/io/HTTPClient.hxx>
+#include <simgear/misc/sg_path.hxx>
+
+#include "HTTPRepository.hxx"
+
+namespace simgear {
+
+class HTTPDirectory;
+using HTTPDirectory_ptr = std::unique_ptr<HTTPDirectory>;
+
+class HTTPRepoGetRequest : public HTTP::Request {
+public:
+  HTTPRepoGetRequest(HTTPDirectory *d, const std::string &u)
+      : HTTP::Request(u), _directory(d) {}
+
+  virtual void cancel();
+
+  size_t contentSize() const { return _contentSize; }
+
+  void setContentSize(size_t sz) { _contentSize = sz; }
+
+protected:
+  HTTPDirectory *_directory;
+  size_t _contentSize = 0;
+};
+
+using RepoRequestPtr = SGSharedPtr<HTTPRepoGetRequest>;
+
+class HTTPRepoPrivate {
+public:
+
+
+  HTTPRepository::FailureVec failures;
+  int maxPermittedFailures = 16;
+
+  HTTPRepoPrivate(HTTPRepository *parent)
+      : p(parent), isUpdating(false), status(HTTPRepository::REPO_NO_ERROR),
+        totalDownloaded(0) {
+    ;
+  }
+
+  ~HTTPRepoPrivate();
+
+  HTTPRepository *p; // link back to outer
+  HTTP::Client *http;
+  std::string baseUrl;
+  SGPath basePath;
+  bool isUpdating;
+  HTTPRepository::ResultCode status;
+  HTTPDirectory_ptr rootDir;
+  size_t totalDownloaded;
+  HTTPRepository::SyncPredicate syncPredicate;
+
+  HTTP::Request_ptr updateFile(HTTPDirectory *dir, const std::string &name,
+                               size_t sz);
+  HTTP::Request_ptr updateDir(HTTPDirectory *dir, const std::string &hash,
+                              size_t sz);
+
+  void failedToGetRootIndex(HTTPRepository::ResultCode st);
+  void failedToUpdateChild(const SGPath &relativePath,
+                           HTTPRepository::ResultCode fileStatus);
+
+  void updatedChildSuccessfully(const SGPath &relativePath);
+
+  void checkForComplete();
+
+  typedef std::vector<RepoRequestPtr> RequestVector;
+  RequestVector queuedRequests, activeRequests;
+
+  void makeRequest(RepoRequestPtr req);
+
+  enum class RequestFinish { Done, Retry };
+
+  void finishedRequest(const RepoRequestPtr &req, RequestFinish retryRequest);
+
+  HTTPDirectory *getOrCreateDirectory(const std::string &path);
+  bool deleteDirectory(const std::string &relPath, const SGPath &absPath);
+
+
+  typedef std::vector<HTTPDirectory_ptr> DirectoryVector;
+  DirectoryVector directories;
+
+  void scheduleUpdateOfChildren(HTTPDirectory *dir);
+
+  SGPath installedCopyPath;
+
+  int countDirtyHashCaches() const;
+  void flushHashCaches();
+
+  enum ProcessResult { ProcessContinue, ProcessDone, ProcessFailed };
+
+  using RepoProcessTask = std::function<ProcessResult(HTTPRepoPrivate *repo)>;
+
+  void addTask(RepoProcessTask task);
+
+  std::deque<RepoProcessTask> pendingTasks;
+};
+
+} // namespace simgear

simgear/io/HTTPRequest.cxx

@@ -18,6 +18,9 @@
 #include <simgear_config.h>
 #include "HTTPRequest.hxx"
 
+#include <cstring>
+#include <algorithm> // for std::min
+
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/strutils.hxx>
@@ -53,6 +56,15 @@ Request::~Request()
 
 }
 
+void Request::prepareForRetry() {
+  setReadyState(UNSENT);
+  _willClose = false;
+  _connectionCloseHeader = false;
+  _responseStatus = 0;
+  _responseLength = 0;
+  _receivedBodyBytes = 0;
+}
+
 //------------------------------------------------------------------------------
 Request* Request::done(const Callback& cb)
 {
@@ -190,13 +202,16 @@ void Request::onDone()
 //------------------------------------------------------------------------------
 void Request::onFail()
 {
-  SG_LOG
-  (
-    SG_IO,
-    SG_INFO,
-    "request failed:" << url() << " : "
-                      << responseCode() << "/" << responseReason()
-  );
+  // log if we FAIELD< but not if we CANCELLED
+  if (_ready_state == FAILED) {
+    SG_LOG
+    (
+      SG_IO,
+      SG_INFO,
+      "request failed:" << url() << " : "
+                        << responseCode() << "/" << responseReason()
+    );
+  }
 }
 
 //------------------------------------------------------------------------------
@@ -328,15 +343,30 @@ unsigned int Request::responseLength() const
   return _responseLength;
 }
 
+//------------------------------------------------------------------------------
+void Request::setSuccess(int code)
+{
+    _responseStatus = code;
+    _responseReason.clear();
+    if( !isComplete() ) {
+        setReadyState(DONE);
+    }
+}
+    
 //------------------------------------------------------------------------------
 void Request::setFailure(int code, const std::string& reason)
 {
+  // we use -1 for cancellation, don't be noisy in that case
+  if (code >= 0) { 
     SG_LOG(SG_IO, SG_WARN, "HTTP request: set failure:" << code << " reason " << reason);
+  }
+
   _responseStatus = code;
   _responseReason = reason;
 
-  if( !isComplete() )
-    setReadyState(FAILED);
+  if( !isComplete() ) {
+    setReadyState(code < 0 ? CANCELLED : FAILED);
+  }
 }
 
 //------------------------------------------------------------------------------
@@ -360,6 +390,12 @@ void Request::setReadyState(ReadyState state)
 
     _cb_fail(this);
   }
+  else if (state == CANCELLED )
+  {
+    onFail(); // do this for compatability
+    onAlways();
+    _cb_fail(this);
+  }
   else
     return;
 
@@ -389,7 +425,7 @@ bool Request::serverSupportsPipelining() const
 //------------------------------------------------------------------------------
 bool Request::isComplete() const
 {
-  return _ready_state == DONE || _ready_state == FAILED;
+  return _ready_state == DONE || _ready_state == FAILED || _ready_state == CANCELLED;
 }
 
 //------------------------------------------------------------------------------

simgear/io/HTTPRequest.hxx

@@ -28,8 +28,6 @@
 #include <simgear/structure/SGSharedPtr.hxx>
 #include <simgear/math/sg_types.hxx>
 
-#include <boost/bind.hpp>
-
 class SGPropertyNode;
 
 namespace simgear
@@ -46,7 +44,7 @@ class Request:
   public SGReferenced
 {
 public:
-    typedef boost::function<void(Request*)> Callback;
+    typedef std::function<void(Request*)> Callback;
 
     enum ReadyState
     {
@@ -56,7 +54,8 @@ public:
       HEADERS_RECEIVED,
       LOADING,
       DONE,
-      FAILED
+      FAILED,
+      CANCELLED
     };
 
     virtual ~Request();
@@ -82,7 +81,7 @@ public:
     template<class C>
     Request* done(C* instance, void (C::*mem_func)(Request*))
     {
-      return done(boost::bind(mem_func, instance, _1));
+      return done(std::bind(mem_func, instance, std::placeholders::_1));
     }
 
     /**
@@ -97,7 +96,7 @@ public:
     template<class C>
     Request* fail(C* instance, void (C::*mem_func)(Request*))
     {
-      return fail(boost::bind(mem_func, instance, _1));
+      return fail(std::bind(mem_func, instance, std::placeholders::_1));
     }
 
     /**
@@ -112,7 +111,7 @@ public:
     template<class C>
     Request* always(C* instance, void (C::*mem_func)(Request*))
     {
-      return always(boost::bind(mem_func, instance, _1));
+      return always(std::bind(mem_func, instance, std::placeholders::_1));
     }
 
     /**
@@ -209,7 +208,9 @@ public:
      */
     bool serverSupportsPipelining() const;
 
-protected:
+    virtual void prepareForRetry();
+
+  protected:
     Request(const std::string& url, const std::string method = "GET");
 
     virtual void requestStart();
@@ -223,12 +224,14 @@ protected:
     virtual void onFail();
     virtual void onAlways();
 
-    void setFailure(int code, const std::string& reason);
+    void setSuccess(int code);
+    void setFailure(int code, const std::string &reason);
 
-private:
+  private:
     friend class Client;
     friend class Connection;
     friend class ContentDecoder;
+    friend class TestApi;
 
     Request(const Request&); // = delete;
     Request& operator=(const Request&); // = delete;

simgear/io/HTTPTestApi_private.hxx

@@ -0,0 +1,45 @@
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+
+#pragma once
+
+#include <functional>
+
+#include "HTTPRequest.hxx"
+
+namespace simgear {
+namespace HTTP {
+
+class Client;
+
+using ResponseDoneCallback =
+    std::function<bool(int curlResult, Request_ptr req)>;
+
+/**
+ * @brief this API is for unit-testing HTTP code.
+ * Don't use it for anything else. It's for unit-testing.
+ */
+class TestApi {
+public:
+  // alow test suite to manipulate requests to simulate network errors;
+  // without this, it's hard to provoke certain failures in a loop-back
+  // network sitation.
+  static void setResponseDoneCallback(Client *cl, ResponseDoneCallback cb);
+
+  static void markRequestAsFailed(Request_ptr req, int curlCode,
+                                  const std::string &message);
+};
+
+} // namespace HTTP
+} // namespace simgear

simgear/io/httpget.cxx

@@ -5,8 +5,6 @@
 #include <signal.h>
 
 #include <iostream>
-#include <boost/foreach.hpp>
-
 
 #include <simgear/io/sg_file.hxx>
 #include <simgear/io/HTTPClient.hxx>
@@ -29,17 +27,17 @@ public:
         _complete(false),
         _file(NULL)
     {
-        
+
     }
-    
+
     void setFile(SGFile* f)
     {
         _file = f;
     }
-    
+
     bool complete() const
         { return _complete; }
-        
+
     void addHeader(const string& h)
     {
         int colonPos = h.find(':');
@@ -47,22 +45,22 @@ public:
             cerr << "malformed header: " << h << endl;
             return;
         }
-        
+
         string key = h.substr(0, colonPos);
         requestHeader(key) = h.substr(colonPos + 1);
     }
-    
+
 protected:
     virtual void onDone()
     {
         _complete = true;
-    }  
+    }
 
     virtual void gotBodyData(const char* s, int n)
     {
         _file->write(s, n);
     }
-private:    
+private:
     bool _complete;
     SGFile* _file;
 };
@@ -74,7 +72,7 @@ int main(int argc, char* argv[])
     string proxy, proxyAuth;
     string_list headers;
     string url;
-    
+
     for (int a=0; a<argc;++a) {
         if (argv[a][0] == '-') {
             if (!strcmp(argv[a], "--user-agent")) {
@@ -105,7 +103,7 @@ int main(int argc, char* argv[])
             proxyHost = proxy.substr(0, colonPos);
             proxyPort = strutils::to_int(proxy.substr(colonPos + 1));
         }
-        
+
         cl.setProxy(proxyHost, proxyPort, proxyAuth);
     }
 
@@ -123,23 +121,23 @@ int main(int argc, char* argv[])
     }
 
     ARequest* req = new ARequest(url);
-    BOOST_FOREACH(string h, headers) {
+    for (const auto& h : headers) {
         req->addHeader(h);
     }
-    
+
     req->setFile(outFile);
     cl.makeRequest(req);
-    
+
     while (!req->complete()) {
         cl.update();
         SGTimeStamp::sleepForMSec(100);
     }
-        
+
     if (req->responseCode() != 200) {
         cerr << "got response:" << req->responseCode() << endl;
         cerr << "\treason:" << req->responseReason() << endl;
         return EXIT_FAILURE;
     }
-    
+
     return EXIT_SUCCESS;
 }

simgear/io/iostreams/gzcontainerfile.cxx

@@ -71,10 +71,10 @@ static const uint32_t EndianMagic = 0x11223344;
  * gzContainerWriter
  **************************************************************************/
 
-gzContainerWriter::gzContainerWriter(const std::string& name,
+gzContainerWriter::gzContainerWriter(const SGPath& name,
                                      const std::string& fileMagic) :
         sg_gzofstream(name, ios_out | ios_binary),
-        filename(name)
+        filename(name.utf8Str())
 {
     /* write byte-order marker **************************************/
     write((char*)&EndianMagic, sizeof(EndianMagic));
@@ -138,10 +138,10 @@ gzContainerWriter::writeContainer(ContainerType Type, SGPropertyNode* root)
  * gzContainerReader
  **************************************************************************/
 
-gzContainerReader::gzContainerReader(const std::string& name,
+gzContainerReader::gzContainerReader(const SGPath& name,
                                      const std::string& fileMagic) :
         sg_gzifstream(SGPath(name), ios_in | ios_binary),
-        filename(name)
+        filename(name.utf8Str())
 {
     bool ok = (good() && !eof());
 

simgear/io/iostreams/gzcontainerfile.hxx

@@ -35,7 +35,7 @@ typedef int ContainerType;
 class gzContainerReader : public sg_gzifstream
 {
 public:
-    gzContainerReader( const std::string& name,
+    gzContainerReader( const SGPath& name,
                        const std::string& fileMagic);
 
     bool readContainerHeader(ContainerType* pType, size_t* pSize);
@@ -48,7 +48,7 @@ private:
 class gzContainerWriter : public sg_gzofstream
 {
 public:
-    gzContainerWriter( const std::string& name,
+    gzContainerWriter( const SGPath& name,
                        const std::string& fileMagic);
 
     bool writeContainerHeader(ContainerType Type, size_t Size);

simgear/io/iostreams/gzfstream.cxx

@@ -185,6 +185,9 @@ gzfilebuf::setcompressionstrategy( int comp_strategy )
 
 z_off_t
 gzfilebuf::approxOffset() {
+    #ifdef __OpenBSD__
+    z_off_t res = 0;
+    #else
     z_off_t res = gzoffset(file);
 
     if (res == -1) {
@@ -201,7 +204,7 @@ gzfilebuf::approxOffset() {
         SG_LOG( SG_GENERAL, SG_ALERT, errMsg );
         throw sg_io_exception(errMsg);
     }
-
+    #endif
     return res;
 }
 

simgear/io/iostreams/sgstream.cxx

@@ -212,7 +212,7 @@ sg_ifstream::sg_ifstream(const SGPath& path, ios_openmode io_mode)
 #if defined(SG_WINDOWS)
 	std::wstring ps = path.wstr();
 #else
-    std::string ps = path.local8BitStr();
+    std::string ps = path.utf8Str();
 #endif
 	std::ifstream::open(ps.c_str(), io_mode);
 }
@@ -222,17 +222,31 @@ void sg_ifstream::open( const SGPath& name, ios_openmode io_mode )
 #if defined(SG_WINDOWS)
 	std::wstring ps = name.wstr();
 #else
-	std::string ps = name.local8BitStr();
+	std::string ps = name.utf8Str();
 #endif
     std::ifstream::open(ps.c_str(), io_mode);
 }
 
+std::string sg_ifstream::read_all()
+{
+	this->seekg(0, std::ios::end); // seek to end
+	const auto pos = this->tellg();
+
+	std::string result;
+	result.resize(pos);
+
+	this->seekg(0, std::ios::beg);
+	this->read(const_cast<char*>(result.data()), pos);
+    return result;
+}
+
+
 sg_ofstream::sg_ofstream(const SGPath& path, ios_openmode io_mode)
 {
 #if defined(SG_WINDOWS)
 	std::wstring ps = path.wstr();
 #else
-	std::string ps = path.local8BitStr();
+	std::string ps = path.utf8Str();
 #endif
     std::ofstream::open(ps.c_str(), io_mode);
 }
@@ -242,7 +256,7 @@ void sg_ofstream::open( const SGPath& name, ios_openmode io_mode )
 #if defined(SG_WINDOWS)
 	std::wstring ps = name.wstr();
 #else
-	std::string ps = name.local8BitStr();
+	std::string ps = name.utf8Str();
 #endif
     std::ofstream::open(ps.c_str(), io_mode);
 }

simgear/io/iostreams/sgstream.hxx

@@ -196,6 +196,10 @@ public:
 
     void open( const SGPath& name,
 	       ios_openmode io_mode = ios_in|ios_binary );
+    
+    /// read the entire stream into a buffer. Use on files, etc - not recommended on streams
+    /// which never EOF, will bvlock forever.
+    std::string read_all();
 };
 
 class sg_ofstream : public std::ofstream

simgear/io/iostreams/zlibstream_test.cxx

@@ -431,7 +431,7 @@ void test_ZlibDecompressorIStream_readPutbackEtc()
     try {
       // 'Z' is not the last character read from the stream
       decompressor.putback('Z');
-    } catch (std::ios_base::failure) {
+    } catch (const std::ios_base::failure&) {
       gotException = true;
     } catch (const std::exception& e) {
       // gcc fails to catch std::ios_base::failure due to an inconsistent C++11

simgear/io/raw_socket.cxx

@@ -36,6 +36,7 @@
 #include <cstring>
 #include <cassert>
 #include <cstdio> // for snprintf
+#include <mutex>
 #include <errno.h>
 
 #if defined(WINSOCK)
@@ -213,7 +214,7 @@ private:
       return ok;
     }
 
-    SGMutex _lock;
+    std::mutex _lock;
     SGWaitCondition _wait;
 
     typedef std::map<string, simgear::IPAddress*> AddressCache;

simgear/io/sg_binobj.cxx

@@ -42,6 +42,7 @@
 
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/misc/strutils.hxx>
 #include <simgear/math/SGGeometry.hxx>
 #include <simgear/structure/exception.hxx>
 
@@ -160,7 +161,7 @@ public:
         }
     }
 
-    float readInt()
+    int32_t readInt()
     {
         unsigned int* p = reinterpret_cast<unsigned int*>(ptr + offset);
         if ( sgIsBigEndian() ) {
@@ -563,6 +564,12 @@ bool SGBinObject::read_bin( const SGPath& file ) {
     // read headers
     unsigned int header;
     sgReadUInt( fp, &header );
+
+    if (sgReadError()) {
+        gzclose(fp);
+        throw sg_io_exception("Unable to read BTG header: " + simgear::strutils::error_string(errno), sg_location(file));
+    }
+
     if ( ((header & 0xFF000000) >> 24) == 'S' &&
          ((header & 0x00FF0000) >> 16) == 'G' ) {
 

simgear/io/sg_binobj.hxx

@@ -34,18 +34,15 @@
 #include <simgear/math/sg_types.hxx>
 #include <simgear/math/SGMath.hxx>
 
-#include <vector>
+#include <array>
 #include <string>
-#include <boost/array.hpp>
+#include <vector>
 
 #define MAX_TC_SETS     (4)
 #define MAX_VAS         (8)
 
-// I really want to pass around fixed length arrays, as the size 
-// has to be hardcoded
-// but it's a C++0x feature use boost in its absence
-typedef boost::array<int_list, MAX_TC_SETS> tci_list;
-typedef boost::array<int_list, MAX_VAS>     vai_list;
+typedef std::array<int_list, MAX_TC_SETS> tci_list;
+typedef std::array<int_list, MAX_VAS>     vai_list;
 
 /** STL Structure used to store (integer index) object information */
 typedef std::vector < int_list > group_list;

simgear/io/sg_file.cxx

@@ -64,6 +64,41 @@ SGFile::SGFile( int existingFd ) :
 SGFile::~SGFile() {
 }
 
+#include <simgear/misc/sg_hash.hxx>
+#include <simgear/structure/exception.hxx>
+#include "simgear/misc/strutils.hxx"
+
+std::string SGFile::computeHash()
+{
+    if (!file_name.exists())
+        return {};
+        
+    simgear::sha1nfo info;
+    sha1_init(&info);
+    
+    // unique_ptr with custom deleter for exception safety
+    const int bufSize = 1024 * 1024;
+    std::unique_ptr<char, std::function<void(char*)>> buf{static_cast<char*>(malloc(bufSize)), 
+        [](char* p) { free(p); }};
+
+    if (!buf) {
+        SG_LOG(SG_IO, SG_ALERT, "Failed to malloc buffer for SHA1 check");
+    }
+
+    size_t readLen;
+    SGBinaryFile f(file_name);
+    if (!f.open(SG_IO_IN)) {
+        SG_LOG(SG_IO, SG_ALERT, "SGFile::computeHash: Failed to open " << file_name);
+        return {};
+    }
+    while ((readLen = f.read(buf.get(), bufSize)) > 0) {
+        sha1_write(&info, buf.get(), readLen);
+    }
+
+    f.close();
+    std::string hashBytes((char*)sha1_result(&info), HASH_LENGTH);
+    return simgear::strutils::encodeHex(hashBytes);
+}
 
 // open the file based on specified direction
 bool SGFile::open( const SGProtocolDir d ) {

simgear/io/sg_file.hxx

@@ -87,6 +87,9 @@ public:
 
     /** @return true of eof conditions exists */
     virtual bool eof() const { return eof_flag; };
+
+    std::string computeHash();
+
 };
 
 class SGBinaryFile : public SGFile {

simgear/io/test_DNS.cxx

@@ -7,8 +7,6 @@
 #include <thread>
 #include <atomic>
 
-#include <boost/algorithm/string/case_conv.hpp>
-
 #include <simgear/simgear_config.h>
 
 #include "DNSClient.hxx"

simgear/io/test_HTTP.cxx

@@ -1,12 +1,10 @@
 #include <cstdlib>
-
+#include <cstring>
 #include <iostream>
 #include <map>
 #include <sstream>
 #include <cerrno>
 
-#include <boost/algorithm/string/case_conv.hpp>
-
 #include <simgear/simgear_config.h>
 
 #include "HTTPClient.hxx"
@@ -61,23 +59,23 @@ public:
     std::map<string, string> headers;
 protected:
 
-    virtual void onDone()
+    void onDone() override
     {
         complete = true;
     }
-
-    virtual void onFail()
+ 
+    void onFail() override
     {
         failed = true;
     }
 
-    virtual void gotBodyData(const char* s, int n)
+    void gotBodyData(const char* s, int n) override
     {
-        //std::cout << "got body data:'" << string(s, n) << "'" <<std::endl;
+    //    std::cout << "got body data:'" << string(s, n) << "'" <<std::endl;
         bodyData += string(s, n);
     }
 
-    virtual void responseHeader(const string& header, const string& value)
+    void responseHeader(const string& header, const string& value) override
     {
         Request::responseHeader(header, value);
         headers[header] =  value;
@@ -273,7 +271,23 @@ public:
             d << "\r\n"; // final CRLF to terminate the headers
             d << contentStr;
             push(d.str().c_str());
-
+        } else if (path == "/test_redirect") {
+            string contentStr("<html>See <a href=\"wibble\">Here</a></html>");
+            stringstream d;
+            d << "HTTP/1.1 " << 302 << " " << "Found" << "\r\n";
+            d << "Location:" << " http://localhost:2000/was_redirected" << "\r\n";
+            d << "Content-Length:" << contentStr.size() << "\r\n";
+            d << "\r\n"; // final CRLF to terminate the headers
+            d << contentStr;
+            push(d.str().c_str());
+        } else if (path == "/was_redirected") {
+            string contentStr(BODY1);
+            stringstream d;
+            d << "HTTP/1.1 " << 200 << " " << reasonForCode(200) << "\r\n";
+            d << "Content-Length:" << contentStr.size() << "\r\n";
+            d << "\r\n"; // final CRLF to terminate the headers
+            d << contentStr;
+            push(d.str().c_str());
         } else {
           TestServerChannel::processRequestHeaders();
         }
@@ -365,6 +379,26 @@ void waitForFailed(HTTP::Client* cl, TestRequest* tr)
     cerr << "timed out waiting for failure" << endl;
 }
 
+using CompletionCheck = std::function<bool()>;
+
+bool waitFor(HTTP::Client* cl, CompletionCheck ccheck)
+{
+    SGTimeStamp start(SGTimeStamp::now());
+    while (start.elapsedMSec() <  10000) {
+        cl->update();
+        testServer.poll();
+
+        if (ccheck()) {
+            return true;
+        }
+        SGTimeStamp::sleepForMSec(15);
+    }
+
+    cerr << "timed out" << endl;
+    return false;
+}
+
+
 int main(int argc, char* argv[])
 {
     sglog().setLogLevels( SG_ALL, SG_INFO );
@@ -440,6 +474,8 @@ int main(int argc, char* argv[])
 
 // larger get request
     for (unsigned int i=0; i<body2Size; ++i) {
+        // this contains embeded 0s on purpose, i.e it's
+        // not text data but binary
         body2[i] = (i << 4) | (i >> 2);
     }
 
@@ -584,9 +620,10 @@ cout << "testing proxy close" << endl;
         HTTP::Request_ptr own3(tr3);
         cl.makeRequest(tr3);
 
-        waitForComplete(&cl, tr3);
-        SG_VERIFY(tr->complete);
-        SG_VERIFY(tr2->complete);
+        SG_VERIFY(waitFor(&cl, [tr, tr2, tr3]() {
+            return tr->complete && tr2->complete &&tr3->complete; 
+        }));
+
         SG_CHECK_EQUAL(tr->bodyData, string(BODY1));
 
         SG_CHECK_EQUAL(tr2->responseLength(), strlen(BODY3));
@@ -615,9 +652,9 @@ cout << "testing proxy close" << endl;
         HTTP::Request_ptr own3(tr3);
         cl.makeRequest(tr3);
 
-        waitForComplete(&cl, tr3);
-        SG_VERIFY(tr->complete);
-        SG_VERIFY(tr2->complete);
+        SG_VERIFY(waitFor(&cl, [tr, tr2, tr3]() {
+            return tr->complete && tr2->complete &&tr3->complete; 
+        }));
 
         SG_CHECK_EQUAL(tr->responseLength(), strlen(BODY1));
         SG_CHECK_EQUAL(tr->responseBytesReceived(), strlen(BODY1));
@@ -744,8 +781,15 @@ cout << "testing proxy close" << endl;
         SG_CHECK_EQUAL(tr3->bodyData, string(BODY1));
     }
 
+    // disabling this test for now, since it seems to have changed depending
+    // on the libCurl version. (Or some other configuration which is currently
+    // not apparent).
+    // old behaviour: Curl sends the second request soon after makeRequest
+    // new behaviour: Curl waits for the first request to complete, before
+    // sending the second request (i.e acts as if HTTP pipelining is disabled)
+#if 0
     {
-        cout << "get-during-response-send" << endl;
+        cout << "get-during-response-send\n\n" << endl;
         cl.clearAllConnections();
         //test_get_during_send
 
@@ -765,7 +809,10 @@ cout << "testing proxy close" << endl;
         HTTP::Request_ptr own2(tr2);
         cl.makeRequest(tr2);
 
-        waitForComplete(&cl, tr2);
+        SG_VERIFY(waitFor(&cl, [tr, tr2]() {
+            return tr->isComplete() && tr2->isComplete();
+        }));
+        
         SG_CHECK_EQUAL(tr->responseCode(), 200);
         SG_CHECK_EQUAL(tr->bodyData, string(BODY3));
         SG_CHECK_EQUAL(tr->responseBytesReceived(), strlen(BODY3));
@@ -773,6 +820,25 @@ cout << "testing proxy close" << endl;
         SG_CHECK_EQUAL(tr2->bodyData, string(BODY1));
         SG_CHECK_EQUAL(tr2->responseBytesReceived(), strlen(BODY1));
     }
+#endif
+    
+    {
+        cout << "redirect test" << endl;
+        // redirect test
+        testServer.disconnectAll();
+        cl.clearAllConnections();
+        
+        TestRequest* tr = new TestRequest("http://localhost:2000/test_redirect");
+        HTTP::Request_ptr own(tr);
+        cl.makeRequest(tr);
+        
+        waitForComplete(&cl, tr);
+        SG_CHECK_EQUAL(tr->responseCode(), 200);
+        SG_CHECK_EQUAL(tr->responseReason(), string("OK"));
+        SG_CHECK_EQUAL(tr->responseLength(), strlen(BODY1));
+        SG_CHECK_EQUAL(tr->responseBytesReceived(), strlen(BODY1));
+        SG_CHECK_EQUAL(tr->bodyData, string(BODY1));
+    }
 
     cout << "all tests passed ok" << endl;
     return EXIT_SUCCESS;

simgear/io/test_HTTP.hxx

@@ -1,6 +1,7 @@
 #ifndef SIMGEAR_IO_TEST_HTTP_HXX
 #define SIMGEAR_IO_TEST_HTTP_HXX
 
+#include <algorithm>
 #include <sstream>
 #include <vector>
 
@@ -30,7 +31,6 @@ public:
 
     virtual ~TestServerChannel()
     {
-        std::cerr << "dtor test server channel" << std::endl;
     }
 
     virtual void collectIncomingData(const char* s, int n)
@@ -139,8 +139,8 @@ public:
 
     void sendErrorResponse(int code, bool close, std::string content)
     {
-        std::cerr << "sending error " << code << " for " << path << std::endl;
-        std::cerr << "\tcontent:" << content << std::endl;
+     //   std::cerr << "sending error " << code << " for " << path << std::endl;
+       // std::cerr << "\tcontent:" << content << std::endl;
 
         std::stringstream headerData;
         headerData << "HTTP/1.1 " << code << " " << reasonForCode(code) << "\r\n";
@@ -168,7 +168,6 @@ public:
 
     virtual void handleClose (void)
     {
-        std::cerr << "channel close" << std::endl;
         NetBufferChannel::handleClose();
     }
 

simgear/io/test_repository.cxx

@@ -1,17 +1,18 @@
+#include <cassert>
 #include <cstdlib>
+#include <errno.h>
+#include <fcntl.h>
+#include <functional>
 #include <iostream>
 #include <map>
 #include <sstream>
-#include <errno.h>
-#include <fcntl.h>
-
-#include <boost/algorithm/string/case_conv.hpp>
 
 #include <simgear/simgear_config.h>
 
-#include "test_HTTP.hxx"
-#include "HTTPRepository.hxx"
 #include "HTTPClient.hxx"
+#include "HTTPRepository.hxx"
+#include "HTTPTestApi_private.hxx"
+#include "test_HTTP.hxx"
 
 #include <simgear/misc/strutils.hxx>
 #include <simgear/misc/sg_hash.hxx>
@@ -26,6 +27,8 @@
 
 using namespace simgear;
 
+using TestApi = simgear::HTTP::TestApi;
+
 std::string dataForFile(const std::string& parentName, const std::string& name, int revision)
 {
     std::ostringstream os;
@@ -46,6 +49,9 @@ std::string hashForData(const std::string& d)
     return strutils::encodeHex(sha1_result(&info), HASH_LENGTH);
 }
 
+class TestRepoEntry;
+using AccessCallback = std::function<void(TestRepoEntry &entry)>;
+
 class TestRepoEntry
 {
 public:
@@ -71,7 +77,8 @@ public:
     int requestCount;
     bool getWillFail;
     bool returnCorruptData;
-    std::unique_ptr<SGCallback> accessCallback;
+
+    AccessCallback accessCallback;
 
     void clearRequestCounts();
 
@@ -271,8 +278,8 @@ public:
                 return;
             }
 
-            if (entry->accessCallback.get()) {
-                (*entry->accessCallback)();
+            if (entry->accessCallback) {
+              entry->accessCallback(*entry);
             }
 
             if (entry->getWillFail) {
@@ -283,20 +290,29 @@ public:
             entry->requestCount++;
 
             std::string content;
+            bool closeSocket = false;
+            size_t contentSize = 0;
+
             if (entry->returnCorruptData) {
                 content = dataForFile("!$£$!" + entry->parent->name,
                                       "corrupt_" + entry->name,
                                       entry->revision);
+                contentSize = content.size();
             } else {
-                content = entry->data();
+              content = entry->data();
+              contentSize = content.size();
             }
 
             std::stringstream d;
             d << "HTTP/1.1 " << 200 << " " << reasonForCode(200) << "\r\n";
-            d << "Content-Length:" << content.size() << "\r\n";
+            d << "Content-Length:" << contentSize << "\r\n";
             d << "\r\n"; // final CRLF to terminate the headers
             d << content;
             push(d.str().c_str());
+
+            if (closeSocket) {
+              closeWhenDone();
+            }
         } else {
             sendErrorResponse(404, false, "");
         }
@@ -393,6 +409,7 @@ void waitForUpdateComplete(HTTP::Client* cl, HTTPRepository* repo)
         cl->update();
         testServer.poll();
 
+        repo->process();
         if (!repo->isDoingSync()) {
             return;
         }
@@ -402,6 +419,16 @@ void waitForUpdateComplete(HTTP::Client* cl, HTTPRepository* repo)
     std::cerr << "timed out" << std::endl;
 }
 
+void runForTime(HTTP::Client *cl, HTTPRepository *repo, int msec = 15) {
+  SGTimeStamp start(SGTimeStamp::now());
+  while (start.elapsedMSec() < msec) {
+    cl->update();
+    testServer.poll();
+    repo->process();
+    SGTimeStamp::sleepForMSec(1);
+  }
+}
+
 void testBasicClone(HTTP::Client* cl)
 {
     std::unique_ptr<HTTPRepository> repo;
@@ -619,9 +646,19 @@ void testAbandonCorruptFiles(HTTP::Client* cl)
     repo->setBaseUrl("http://localhost:2000/repo");
     repo->update();
     waitForUpdateComplete(cl, repo.get());
-    if (repo->failure() != HTTPRepository::REPO_ERROR_CHECKSUM) {
-        std::cerr << "Got failure state:" << repo->failure() << std::endl;
-        throw sg_exception("Bad result from corrupt files test");
+    if (repo->failure() != HTTPRepository::REPO_PARTIAL_UPDATE) {
+      std::cerr << "Got failure state:" << repo->failure() << std::endl;
+      throw sg_exception("Bad result from corrupt files test");
+    }
+
+    auto failedFiles = repo->failures();
+    if (failedFiles.size() != 1) {
+      throw sg_exception("Bad result from corrupt files test");
+    }
+
+    if (failedFiles.front().path.utf8Str() != "dirB/subdirG/fileBGA") {
+      throw sg_exception("Bad path from corrupt files test:" +
+                         failedFiles.front().path.utf8Str());
     }
 
     repo.reset();
@@ -658,15 +695,21 @@ void testServerModifyDuringSync(HTTP::Client* cl)
     repo.reset(new HTTPRepository(p, cl));
     repo->setBaseUrl("http://localhost:2000/repo");
 
-    global_repo->findEntry("dirA/fileAA")->accessCallback.reset(make_callback(&modifyBTree));
+    global_repo->findEntry("dirA/fileAA")->accessCallback =
+        [](const TestRepoEntry &r) {
+          std::cout << "Modifying sub-tree" << std::endl;
+          global_repo->findEntry("dirB/subdirA/fileBAC")->revision++;
+          global_repo->defineFile("dirB/subdirZ/fileBZA");
+          global_repo->findEntry("dirB/subdirB/fileBBB")->revision++;
+        };
 
     repo->update();
     waitForUpdateComplete(cl, repo.get());
 
-    global_repo->findEntry("dirA/fileAA")->accessCallback.reset();
+    global_repo->findEntry("dirA/fileAA")->accessCallback = AccessCallback{};
 
-    if (repo->failure() != HTTPRepository::REPO_ERROR_CHECKSUM) {
-        throw sg_exception("Bad result from modify during sync test");
+    if (repo->failure() != HTTPRepository::REPO_PARTIAL_UPDATE) {
+      throw sg_exception("Bad result from modify during sync test");
     }
 
     std::cout << "Passed test modify server during sync" << std::endl;
@@ -756,6 +799,103 @@ void testCopyInstalledChildren(HTTP::Client* cl)
     std::cout << "passed Copy installed children" << std::endl;
 }
 
+void testRetryAfterSocketFailure(HTTP::Client *cl) {
+  global_repo->clearRequestCounts();
+  global_repo->clearFailFlags();
+
+  std::unique_ptr<HTTPRepository> repo;
+  SGPath p(simgear::Dir::current().path());
+  p.append("http_repo_retry_after_socket_fail");
+  simgear::Dir pd(p);
+  if (pd.exists()) {
+    pd.removeChildren();
+  }
+
+  repo.reset(new HTTPRepository(p, cl));
+  repo->setBaseUrl("http://localhost:2000/repo");
+
+  int aaFailsRemaining = 2;
+  int subdirBAFailsRemaining = 2;
+  TestApi::setResponseDoneCallback(
+      cl, [&aaFailsRemaining, &subdirBAFailsRemaining](int curlResult,
+                                                       HTTP::Request_ptr req) {
+        if (req->url() == "http://localhost:2000/repo/dirA/fileAA") {
+          if (aaFailsRemaining == 0)
+            return false;
+
+          --aaFailsRemaining;
+          TestApi::markRequestAsFailed(req, 56, "Simulated socket failure");
+          return true;
+        } else if (req->url() ==
+                   "http://localhost:2000/repo/dirB/subdirA/.dirindex") {
+          if (subdirBAFailsRemaining == 0)
+            return false;
+
+          --subdirBAFailsRemaining;
+          TestApi::markRequestAsFailed(req, 56, "Simulated socket failure");
+          return true;
+        } else {
+          return false;
+        }
+      });
+
+  repo->update();
+  waitForUpdateComplete(cl, repo.get());
+
+  if (repo->failure() != HTTPRepository::REPO_NO_ERROR) {
+    throw sg_exception("Bad result from retry socket failure test");
+  }
+
+  verifyFileState(p, "dirA/fileAA");
+  verifyFileState(p, "dirB/subdirA/fileBAA");
+  verifyFileState(p, "dirB/subdirA/fileBAC");
+
+  verifyRequestCount("dirA/fileAA", 3);
+  verifyRequestCount("dirB/subdirA", 3);
+  verifyRequestCount("dirB/subdirA/fileBAC", 1);
+}
+
+void testPersistentSocketFailure(HTTP::Client *cl) {
+  global_repo->clearRequestCounts();
+  global_repo->clearFailFlags();
+
+  std::unique_ptr<HTTPRepository> repo;
+  SGPath p(simgear::Dir::current().path());
+  p.append("http_repo_persistent_socket_fail");
+  simgear::Dir pd(p);
+  if (pd.exists()) {
+    pd.removeChildren();
+  }
+
+  repo.reset(new HTTPRepository(p, cl));
+  repo->setBaseUrl("http://localhost:2000/repo");
+
+  TestApi::setResponseDoneCallback(
+      cl, [](int curlResult, HTTP::Request_ptr req) {
+        const auto url = req->url();
+        if (url.find("http://localhost:2000/repo/dirB") == 0) {
+          TestApi::markRequestAsFailed(req, 56, "Simulated socket failure");
+          return true;
+        }
+
+        return false;
+      });
+
+  repo->update();
+  waitForUpdateComplete(cl, repo.get());
+
+  if (repo->failure() != HTTPRepository::REPO_PARTIAL_UPDATE) {
+    throw sg_exception("Bad result from retry socket failure test");
+  }
+
+  verifyFileState(p, "dirA/fileAA");
+  verifyRequestCount("dirA/fileAA", 1);
+
+  verifyRequestCount("dirD/fileDA", 1);
+  verifyRequestCount("dirD/subdirDA/fileDAA", 1);
+  verifyRequestCount("dirD/subdirDB/fileDBA", 1);
+}
+
 int main(int argc, char* argv[])
 {
   sglog().setLogLevels( SG_ALL, SG_INFO );
@@ -801,6 +941,8 @@ int main(int argc, char* argv[])
     cl.clearAllConnections();
 
     testCopyInstalledChildren(&cl);
+    testRetryAfterSocketFailure(&cl);
+    testPersistentSocketFailure(&cl);
 
     std::cout << "all tests passed ok" << std::endl;
     return 0;

simgear/io/text_DNS.cxx

@@ -5,8 +5,6 @@
 #include <sstream>
 #include <errno.h>
 
-#include <boost/algorithm/string/case_conv.hpp>
-
 #include <simgear/simgear_config.h>
 
 #include "HTTPClient.hxx"

simgear/io/untar.cxx

@@ -31,6 +31,8 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/io/sg_file.hxx>
 #include <simgear/misc/sg_dir.hxx>
+#include <simgear/misc/strutils.hxx>
+
 #include <simgear/io/iostreams/sgstream.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/package/unzip.h>
@@ -48,6 +50,8 @@ namespace simgear
 			assert(outer);
 		}
 
+        virtual ~ArchiveExtractorPrivate() = default;
+        
 		typedef enum {
 			INVALID = 0,
 			READING_HEADER,
@@ -338,7 +342,7 @@ public:
         }
         
         if (!isSafePath(tarPath)) {
-            SG_LOG(SG_IO, SG_WARN, "bad tar path:" << tarPath);
+            SG_LOG(SG_IO, SG_WARN, "unsafe tar path, skipping::" << tarPath);
             skipCurrentEntry = true;
         }
 
@@ -504,7 +508,7 @@ public:
 #endif
 		unzFile zip = unzOpen2(bufferName, &memoryAccessFuncs);
 
-		const size_t BUFFER_SIZE = 32 * 1024;
+		const size_t BUFFER_SIZE = 1024 * 1024;
 		void* buf = malloc(BUFFER_SIZE);
 
 		try {
@@ -530,24 +534,28 @@ public:
 			state = END_OF_ARCHIVE;
 		}
 		catch (sg_exception&) {
-			state = BAD_ARCHIVE;
-		}
-
-		free(buf);
-		unzClose(zip);
-	}
-
-	void extractCurrentFile(unzFile zip, char* buffer, size_t bufferSize)
-	{
-		unz_file_info fileInfo;
-		unzGetCurrentFileInfo(zip, &fileInfo,
-			buffer, bufferSize,
-			NULL, 0,  /* extra field */
-			NULL, 0 /* comment field */);
-
+            state = BAD_ARCHIVE;
+        }
+        
+        free(buf);
+        unzClose(zip);
+    }
+    
+    void extractCurrentFile(unzFile zip, char* buffer, size_t bufferSize)
+    {
+        unz_file_info fileInfo;
+        int result = unzGetCurrentFileInfo(zip, &fileInfo,
+                                           buffer, bufferSize,
+                                           NULL, 0,  /* extra field */
+                                           NULL, 0 /* comment field */);
+        if (result != Z_OK) {
+            throw sg_io_exception("Failed to get zip current file info");
+        }
+        
 		std::string name(buffer);
 		if (!isSafePath(name)) {
-			throw sg_format_exception("Bad zip path", name);
+            SG_LOG(SG_IO, SG_WARN, "unsafe zip path, skipping::" << name);
+            return;
 		}
 
 		auto filterResult = filterPath(name);
@@ -566,7 +574,7 @@ public:
 			return;
 		}
 
-		int result = unzOpenCurrentFile(zip);
+		result = unzOpenCurrentFile(zip);
 		if (result != UNZ_OK) {
 			throw sg_io_exception("opening current zip file failed", sg_location(name));
 		}
@@ -586,7 +594,7 @@ public:
 
 		outFile.open(path, std::ios::binary | std::ios::trunc | std::ios::out);
 		if (outFile.fail()) {
-			throw sg_io_exception("failed to open output file for writing", path);
+			throw sg_io_exception("failed to open output file for writing:" + strutils::error_string(errno), path);
 		}
 
 		while (!eof) {
@@ -614,10 +622,7 @@ ArchiveExtractor::ArchiveExtractor(const SGPath& rootPath) :
 {
 }
 
-ArchiveExtractor::~ArchiveExtractor()
-{
-
-}
+ArchiveExtractor::~ArchiveExtractor() = default;
 
 void ArchiveExtractor::extractBytes(const uint8_t* bytes, size_t count)
 {
@@ -635,7 +640,7 @@ void ArchiveExtractor::extractBytes(const uint8_t* bytes, size_t count)
 			d.reset(new ZipExtractorPrivate(this));
 		}
 		else {
-			SG_LOG(SG_IO, SG_ALERT, "Invcalid archive type");
+			SG_LOG(SG_IO, SG_WARN, "Invalid archive type");
 			_invalidDataType = true;
 			return;
 		}
@@ -725,8 +730,10 @@ ArchiveExtractor::DetermineResult ArchiveExtractor::isTarData(const uint8_t* byt
         }
 
         int result = inflate(&z, Z_SYNC_FLUSH);
-        if (result != Z_OK) {
-            SG_LOG(SG_IO, SG_WARN, "inflate failed:" << result);
+        if ((result == Z_OK) || (result == Z_STREAM_END)) {
+            // all good
+        } else {
+            SG_LOG(SG_IO, SG_WARN, "isTarData: Zlib inflate failed:" << result);
             inflateEnd(&z);
             return Invalid; // not tar data
         }

simgear/io/untar.hxx

@@ -34,7 +34,7 @@ class ArchiveExtractor
 {
 public:
 	ArchiveExtractor(const SGPath& rootPath);
-	~ArchiveExtractor();
+	virtual ~ArchiveExtractor();
 
 	enum DetermineResult
 	{

simgear/math/SGGeodesy.cxx

@@ -537,6 +537,13 @@ SGGeodesy::advanceRadM(const SGGeoc& geoc, double course, double distance,
   }
 }
 
+SGGeoc SGGeodesy::advanceDegM(const SGGeoc &geoc, double course,
+                              double distance) {
+  SGGeoc result;
+  advanceRadM(geoc, course * SG_DEGREES_TO_RADIANS, distance, result);
+  return result;
+}
+
 double
 SGGeodesy::courseRad(const SGGeoc& from, const SGGeoc& to)
 {

simgear/math/SGGeodesy.hxx

@@ -65,6 +65,9 @@ public:
   // Geocentric course/distance computation
   static void advanceRadM(const SGGeoc& geoc, double course, double distance,
                           SGGeoc& result);
+
+  static SGGeoc advanceDegM(const SGGeoc &geoc, double course, double distance);
+
   static double courseRad(const SGGeoc& from, const SGGeoc& to);
   static double distanceRad(const SGGeoc& from, const SGGeoc& to);
   static double distanceM(const SGGeoc& from, const SGGeoc& to);

simgear/math/SGVec2.hxx

@@ -193,8 +193,8 @@ min(S s, SGVec2<T> v)
 template<typename T>
 inline
 SGVec2<T>
-max(const SGVec2<T>& v1, const SGVec2<T>& v2)
-{ v1 = simd4::max(v1.simd2(), v2.simd2()); return v1; }
+max(SGVec2<T> v1, const SGVec2<T>& v2)
+{ v1.simd2() = simd4::max(v1.simd2(), v2.simd2()); return v1; }
 template<typename S, typename T>
 inline
 SGVec2<T>
@@ -375,6 +375,29 @@ interpolate(T tau, const SGVec2<T>& v1, const SGVec2<T>& v2)
   return r;
 }
 
+// Helper function for point_in_triangle
+template <typename T>
+inline
+T
+pt_determine(const SGVec2<T>& pt1, const SGVec2<T>& pt2, const SGVec2<T>& pt3)
+{
+  return (pt1.x()-pt3.x()) * (pt2.y()-pt3.y()) - (pt2.x() - pt3.x()) * (pt1.y() - pt3.y());
+}
+
+// Is testpt inside the triangle formed by the other three points?
+template <typename T>
+inline
+bool
+point_in_triangle(const SGVec2<T>& testpt, const SGVec2<T>& pt1, const SGVec2<T>& pt2, const SGVec2<T>& pt3)
+{
+  T d1 = pt_determine(testpt,pt1,pt2);
+  T d2 = pt_determine(testpt,pt2,pt3);
+  T d3 = pt_determine(testpt,pt3,pt1);
+  bool has_neg = (d1 < 0) || (d2 < 0) || (d3 < 0);
+  bool has_pos = (d1 > 0) || (d2 > 0) || (d3 > 0);
+  return !(has_neg && has_pos);
+}
+
 #ifndef NDEBUG
 template<typename T>
 inline

simgear/math/interpolater.cxx

@@ -56,8 +56,6 @@ SGInterpTable::SGInterpTable(const SGPropertyNode* interpolation)
 // file
 SGInterpTable::SGInterpTable( const std::string& file )
 {
-    SG_LOG( SG_MATH, SG_INFO, "Initializing Interpolator for " << file );
-
     sg_gzifstream in( SGPath::fromUtf8(file) );
     if ( !in.is_open() ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
@@ -78,8 +76,6 @@ SGInterpTable::SGInterpTable( const std::string& file )
 // file
 SGInterpTable::SGInterpTable( const SGPath& file )
 {
-    SG_LOG( SG_MATH, SG_INFO, "Initializing Interpolator for " << file );
-
     sg_gzifstream in( file );
     if ( !in.is_open() ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );

simgear/misc/CMakeLists.txt

@@ -19,6 +19,8 @@ set(HEADERS
     tabbed_values.hxx
     texcoord.hxx
     test_macros.hxx
+    lru_cache.hxx
+    simgear_optional.hxx
     )
 
 set(SOURCES

simgear/misc/CSSBorder.cxx

@@ -18,8 +18,6 @@
 
 #include "CSSBorder.hxx"
 
-#include <boost/lexical_cast.hpp>
-#include <boost/range.hpp>
 #include <boost/tokenizer.hpp>
 
 namespace simgear
@@ -114,9 +112,9 @@ namespace simgear
           std::max
           (
             0.f,
-            boost::lexical_cast<float>
+            std::stof
             (
-              rel ? boost::make_iterator_range(tok->begin(), tok->end() - 1)
+              rel ? std::string(tok->begin(), tok->end() - 1)
                   : *tok
             )
             /

simgear/misc/ListDiff.hxx

@@ -21,7 +21,6 @@
 #define SG_LISTDIFF_HXX_
 
 #include <vector>
-#include <boost/function.hpp>
 
 namespace simgear
 {
@@ -30,7 +29,7 @@ namespace simgear
   struct ListDiff
   {
     typedef std::vector<T> List;
-    typedef boost::function<void (T)> Callback;
+    typedef std::function<void (T)> Callback;
 
     /**
      * Perform list diff in-place (modifies both lists) and call cb_add for

simgear/misc/ResourceManager.cxx

@@ -49,6 +49,11 @@ ResourceManager* ResourceManager::instance()
     return static_manager;
 }    
 
+bool ResourceManager::haveInstance()
+{
+    return static_manager != nullptr;
+}
+
 ResourceManager::~ResourceManager()
 {
     assert(this == static_manager);
@@ -56,6 +61,15 @@ ResourceManager::~ResourceManager()
     std::for_each(_providers.begin(), _providers.end(), 
         [](ResourceProvider* p) { delete p; });
 }
+
+void ResourceManager::reset()
+{
+    if (static_manager) {
+        delete static_manager;
+        static_manager = nullptr;
+    }
+}
+
 /**
  * trivial provider using a fixed base path
  */
@@ -107,6 +121,8 @@ void ResourceManager::removeProvider(ResourceProvider* aProvider)
         SG_LOG(SG_GENERAL, SG_DEV_ALERT, "unknown provider doing remove");
         return;
     }
+
+    _providers.erase(it);
 }
 
 SGPath ResourceManager::findPath(const std::string& aResource, SGPath aContext)

simgear/misc/ResourceManager.hxx

@@ -45,8 +45,12 @@ public:
       PRIORITY_HIGH = 1000
     } Priority;
 
-    static ResourceManager* instance();    
-    
+    static ResourceManager* instance();
+
+    static bool haveInstance();
+
+    static void reset();
+
     /**
      * add a simple fixed resource location, to resolve against
      */