aeron-io · tmontgomery · Feb 4, 2020 · Jan 29, 2020 · Jan 31, 2020 · Feb 3, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,6 +38,7 @@ option(COVERAGE_BUILD "Enable code coverage" OFF)
 option(AERON_TESTS "Enable tests" ${STANDALONE_BUILD})
 option(AERON_SYSTEM_TESTS "Enable system tests" ${STANDALONE_BUILD})
 option(AERON_BUILD_SAMPLES "Enable building the sample projects" ${STANDALONE_BUILD})
+option(LINK_SAMPLES_CLIENT_SHARED "Enable shared linking for sample projects" OFF)
 option(AERON_BUILD_DOCUMENTATION "Build Aeron documentation" ${STANDALONE_BUILD})
 option(AERON_INSTALL_TARGETS "Enable installation step" ${STANDALONE_BUILD})
 if (UNIX)

diff --git a/aeron-client/src/main/cpp/Aeron.h b/aeron-client/src/main/cpp/Aeron.h
@@ -31,6 +31,7 @@
 #include "Publication.h"
 #include "Subscription.h"
 #include "Context.h"
+#include "util/Export.h"
 
 /// Top namespace for Aeron C++ API
 namespace aeron {
@@ -53,7 +54,7 @@ using namespace aeron::concurrent::broadcast;
  * <p>
  * A client application requires only one Aeron object per Media Driver.
  */
-class Aeron
+class CLIENT_EXPORT Aeron
 {
 public:
     /**

diff --git a/aeron-client/src/main/cpp/CMakeLists.txt b/aeron-client/src/main/cpp/CMakeLists.txt
@@ -14,6 +14,10 @@
 # limitations under the License.
 #
 
+if (MSVC AND "${CMAKE_SYSTEM_NAME}" MATCHES "Windows")
+    set(BUILD_SHARED_LIBS ON)
+endif ()
+
 SET(SOURCE
     Publication.cpp
     ExclusivePublication.cpp
@@ -130,11 +134,16 @@ SET(HEADERS
 
 # static library
 add_library(aeron_client STATIC ${SOURCE} ${HEADERS})
+add_library(aeron_client_shared SHARED ${SOURCE} ${HEADERS})
 
 target_include_directories(aeron_client
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
     )
 
+target_include_directories(aeron_client_shared
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+
 if (MSVC)
     string(REPLACE "/" "\\\\" NATIVE_PROJECT_SOURCE_DIR "${PROJECT_SOURCE_DIR}")
     if (${CMAKE_VERSION} VERSION_LESS "3.13.0")
@@ -150,6 +159,13 @@ target_compile_definitions(aeron_client
     PUBLIC "__PROJECT_SOURCE_DIR__=\"${NATIVE_PROJECT_SOURCE_DIR}\""
     )
 
+target_compile_definitions(aeron_client_shared
+    PUBLIC $<$<NOT:$<CONFIG:Debug>>:DISABLE_BOUNDS_CHECKS>
+    # relative file paths for use in exceptions
+    PUBLIC "__PROJECT_SOURCE_DIR__=\"${NATIVE_PROJECT_SOURCE_DIR}\""
+    PUBLIC CLIENT_SHARED DLL_EXPORT
+    )
+
 if (NOT WIN32)
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     set(THREADS_PREFER_PTHREAD_FLAG TRUE)
@@ -159,7 +175,14 @@ target_link_libraries(aeron_client
     INTERFACE ${CMAKE_THREAD_LIBS_INIT}
     )
 
+target_link_libraries(aeron_client_shared
+    INTERFACE ${CMAKE_THREAD_LIBS_INIT}
+    )
+
 if (AERON_INSTALL_TARGETS)
-    install(TARGETS aeron_client ARCHIVE DESTINATION lib)
+    install(TARGETS aeron_client_shared aeron_client
+        RUNTIME DESTINATION lib
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)
     install(DIRECTORY . DESTINATION include FILES_MATCHING PATTERN &quo
10000
t;*.h")
 endif ()
diff --git a/aeron-client/src/main/cpp/ClientConductor.h b/aeron-client/src/main/cpp/ClientConductor.h
@@ -33,6 +33,7 @@
 #include "DriverListenerAdapter.h"
 #include "LogBuffers.h"
 #include "HeartbeatTimestamp.h"
+#include "util/Export.h"
 
 namespace aeron {
 
@@ -47,7 +48,7 @@ typedef std::function<long long()> nano_clock_t;
 static const long KEEPALIVE_TIMEOUT_MS = 500;
 static const long RESOURCE_TIMEOUT_MS = 1000;
 
-class ClientConductor
+class CLIENT_EXPORT ClientConductor
 {
 public:
 

diff --git a/aeron-client/src/main/cpp/LogBuffers.h b/aeron-client/src/main/cpp/LogBuffers.h
@@ -22,14 +22,15 @@
 
 #include <util/MemoryMappedFile.h>
 #include <concurrent/logbuffer/LogBufferDescriptor.h>
+#include "util/Export.h"
 
 namespace aeron {
 
 using namespace aeron::util;
 using namespace aeron::concurrent;
 using namespace aeron::concurrent::logbuffer;
 
-class LogBuffers
+class CLIENT_EXPORT LogBuffers
 {
 public:
     explicit LogBuffers(const char *filename, bool preTouch);

diff --git a/aeron-client/src/main/cpp/Publication.h b/aeron-client/src/main/cpp/Publication.h
@@ -28,6 +28,7 @@
 #include <concurrent/status/UnsafeBufferPosition.h>
 #include "concurrent/status/StatusIndicatorReader.h"
 #include "LogBuffers.h"
+#include "util/Export.h"
 
 namespace aeron {
 
@@ -55,7 +56,7 @@ static const std::int64_t MAX_POSITION_EXCEEDED = -5;
  * @see Aeron#addPublication
  * @see Aeron#findPublication
  */
-class Publication
+class CLIENT_EXPORT Publication
 {
 public:
 

diff --git a/aeron-client/src/main/cpp/Subscription.h b/aeron-client/src/main/cpp/Subscription.h
@@ -26,6 +26,7 @@
 #include "concurrent/status/StatusIndicatorReader.h"
 #include "concurrent/AtomicArrayUpdater.h"
 #include "Image.h"
+#include "util/Export.h"
 
 namespace aeron {
 
@@ -48,7 +49,7 @@ class ClientConductor;
  *
  * @see FragmentAssembler
  */
-class Subscription
+class CLIENT_EXPORT Subscription
 {
 public:
     /// @cond HIDDEN_SYMBOLS

diff --git a/aeron-client/src/main/cpp/util/CommandOption.h b/aeron-client/src/main/cpp/util/CommandOption.h
@@ -23,12 +23,13 @@
 #include <map>
 
 #include "Exceptions.h"
+#include "util/Export.h"
 
 namespace aeron { namespace util {
 
 AERON_DECLARE_SOURCED_EXCEPTION (CommandOptionException, ExceptionCategory::EXCEPTION_CATEGORY_ERROR);
 
-class CommandOption
+class CLIENT_EXPORT CommandOption
 {
 
 private:

diff --git a/aeron-client/src/main/cpp/util/CommandOptionParser.h b/aeron-client/src/main/cpp/util/CommandOptionParser.h
@@ -22,10 +22,11 @@
 #include <iostream>
 
 #include "CommandOption.h"
+#include "util/Export.h"
 
 namespace aeron { namespace util {
 
-class CommandOptionParser
+class CLIENT_EXPORT CommandOptionParser
 {
     private:
         std::map<char, CommandOption> m_options;

diff --git a/aeron-client/src/main/cpp/util/Export.h b/aeron-client/src/main/cpp/util/Export.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014-2020 Real Logic Limited.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef AERON_UTIL_EXPORT_FILE_H
+#define AERON_UTIL_EXPORT_FILE_H
+#include <util/Platform.h>
+
+#ifdef AERON_COMPILER_MSVC
+#   if defined CLIENT_SHARED
+#       if defined DLL_EXPORT
+#           define CLIENT_EXPORT __declspec(dllexport)
+#       else
+#           define CLIENT_EXPORT __declspec(dllimport)
+#       endif
+#   else
+#       define CLIENT_EXPORT
+#   endif
+#else 
+#   define CLIENT_EXPORT
+#endif
+
+
+
+#endif // AERON_UTIL_EXPORT_FILE_H
diff --git a/aeron-client/src/main/cpp/util/MemoryMappedFile.h b/aeron-client/src/main/cpp/util/MemoryMappedFile.h
@@ -18,6 +18,7 @@
 
 #include <cstdint>
 #include <memory>
+#include "util/Export.h"
 
 #ifdef _WIN32
     #ifndef NOMINMAX
@@ -31,7 +32,7 @@
 
 namespace aeron { namespace util {
 
-class MemoryMappedFile
+class CLIENT_EXPORT MemoryMappedFile
 {
 public:
     typedef std::shared_ptr<MemoryMappedFile> ptr_t;

diff --git a/aeron-samples/src/main/cpp/CMakeLists.txt b/aeron-samples/src/main/cpp/CMakeLists.txt
@@ -14,6 +14,12 @@
 # limitations under the License.
 #
 
+set(CLIENT_LINK_LIB "aeron_client")
+if(LINK_SAMPLES_CLIENT_SHARED)
+    set(CLIENT_LINK_LIB "aeron_client_shared")
+    add_definitions(-DCLIENT_SHARED)
+endif()
+
 include_directories(${AERON_CLIENT_SOURCE_PATH})
 
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDISABLE_BOUNDS_CHECKS")
@@ -38,49 +44,49 @@ add_executable(ExclusiveThroughput ExclusiveThroughput.cpp ${HEADERS})
 add_executable(PingPong PingPong.cpp ${HEADERS})
 
 target_link_libraries(AeronStat
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(BasicPublisher
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(TimeTests
     ${CMAKE_THREAD_LIBS_INIT})
 
 target_link_libraries(BasicSubscriber
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(StreamingPublisher
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(RateSubscriber
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(Pong
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(Ping
-    aeron_client
+    ${CLIENT_LINK_LIB}
     ${HDRHISTOGRAM_LIBS})
 
 add_dependencies(Ping hdr_histogram)
 
 target_link_libraries(Throughput
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(ErrorStat
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(LossStat
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(DriverTool
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(ExclusiveThroughput
-    aeron_client)
+    ${CLIENT_LINK_LIB})
 
 target_link_libraries(PingPong
-    aeron_client
+    ${CLIENT_LINK_LIB}
     ${HDRHISTOGRAM_LIBS})
 
 add_dependencies(PingPong hdr_histogram)

diff --git a/cppbuild/cppbuild-vs.cmd b/cppbuild/cppbuild-vs.cmd
@@ -32,6 +32,11 @@ for %%o in (%*) do (
         set EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DBUILD_AERON_DRIVER=ON
 	    set PROCESSED=1
 	)
+
+	if "%%o"=="--link-samples-client-shared" (
+        set EXTRA_CMAKE_ARGS=!EXTRA_CMAKE_ARGS! -DLINK_SAMPLES_CLIENT_SHARED=ON
+	    set PROCESSED=1
+	)
 )
 
 call cppbuild/vs-helper.cmd