Merge remote-tracking branch 'origin/main' into cpp-clock

bernardnormier · bernardnormier · commit d9cfa3176060 · 2025-02-06T11:21:37.000-05:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,13 @@
     "C_Cpp.default.cppStandard": "c++17",
     "gradle.nestedProjects": true,
     "cmake.sourceDirectory":[
+        "${workspaceFolder}/cpp/DataStorm/clock",
+        "${workspaceFolder}/cpp/DataStorm/keyFilter",
+        "${workspaceFolder}/cpp/DataStorm/minimal",
+        "${workspaceFolder}/cpp/DataStorm/node",
+        "${workspaceFolder}/cpp/DataStorm/sampleFilter",
+        "${workspaceFolder}/cpp/DataStorm/stock",
+
         "${workspaceFolder}/cpp/Ice/bidir",
         "${workspaceFolder}/cpp/Ice/callback",
         "${workspaceFolder}/cpp/Ice/context",
@@ -24,6 +31,11 @@
         "${workspaceFolder}/cpp/Ice/secure",
         "${workspaceFolder}/cpp/Ice/session",
         "${workspaceFolder}/cpp/Ice/throughput",
+
+        "${workspaceFolder}/cpp/IceStorm/clock",
+        "${workspaceFolder}/cpp/IceStorm/counter",
+        "${workspaceFolder}/cpp/IceStorm/replicated",
+        "${workspaceFolder}/cpp/IceStorm/replicated2",
     ],
     "cmake.configureSettings": {
         "Ice_HOME": "${workspaceFolder}/../ice",
diff --git a/cpp/DataStorm/clock/CMakeLists.txt b/cpp/DataStorm/clock/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(datastorm_clock CXX)
+
+include(../../cmake/common.cmake)
+
+add_executable(reader Reader.cpp)
+target_link_libraries(reader Ice::Ice Ice::DataStorm)
+
+add_executable(writer Writer.cpp)
+target_link_libraries(writer Ice::Ice Ice::DataStorm)
diff --git a/cpp/DataStorm/clock/README.md b/cpp/DataStorm/clock/README.md
@@ -1,16 +1,41 @@
+# DataStorm Clock
+
 This demo illustrates how to implement a custom encoder and decoder for the topic value type
 `chrono::system_clock::time_point`.
 
+To build the demo run:
+
+```shell
+cmake -B build -S .
+cmake --build build --config Release
+```
+
 To run the demo, start the writer and specify the name of a city:
 
+**Linux/macOS:**
+
 ```shell
-writer
+./build/writer
+```
+
+**Windows:**
+
+```shell
+build\Release\writer
 ```
 
 In a separate window, start the reader:
 
+**Linux/macOS:**
+
+```shell
+./build/reader
+```
+
+**Windows:**
+
 ```shell
-reader
+build\Release\reader
 ```
 
 The reader will print the time sent by the writer. You can start multiple writers and readers.
diff --git a/cpp/DataStorm/keyFilter/CMakeLists.txt b/cpp/DataStorm/keyFilter/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(DataStorm_KeyFilter CXX)
+
+include(../../cmake/common.cmake)
+
+add_executable(reader Reader.cpp)
+target_link_libraries(reader Ice::Ice Ice::DataStorm)
+
+add_executable(writer Writer.cpp)
+target_link_libraries(writer Ice::Ice Ice::DataStorm)
diff --git a/cpp/DataStorm/keyFilter/README.md b/cpp/DataStorm/keyFilter/README.md
@@ -1,14 +1,39 @@
+# DataStorm keyFilter
+
 This demo illustrates the use of key filters. The reader uses the `_regex` predefined key filter. The reader will only
 subscribe and receive samples for keys matching the regular expression provided on construction of the reader object.
 
+To build the demo run:
+
+```shell
+cmake -B build -S .
+cmake --build build --config Release
+```
+
 To run the demo, start the writer:
 
+**Linux/macOS:**
+
 ```shell
-writer
+./build/writer
+```
+
+**Windows:**
+
+```shell
+build\Release\writer
 ```
 
 In a separate window, start the reader:
 
+**Linux/macOS:**
+
+```shell
+./build/reader
+```
+
+**Windows:**
+
 ```shell
-reader
+build\Release\reader
 ```
diff --git a/cpp/DataStorm/minimal/CMakeLists.txt b/cpp/DataStorm/minimal/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(datastorm_minimal CXX)
+
+include(../../cmake/common.cmake)
+
+add_executable(reader Reader.cpp)
+target_link_libraries(reader Ice::Ice Ice::DataStorm)
+
+add_executable(writer Writer.cpp)
+target_link_libraries(writer Ice::Ice Ice::DataStorm)
diff --git a/cpp/DataStorm/minimal/README.md b/cpp/DataStorm/minimal/README.md
@@ -1,13 +1,38 @@
+# DataStorm Minimal
+
 This demo is the minimal DataStorm "hello world" application.
 
+To build the demo run:
+
+```shell
+cmake -B build -S .
+cmake --build build --config Release
+```
+
 To run the demo, start the writer:
 
+**Linux/macOS:**
+
 ```shell
-writer
+./build/writer
+```
+
+**Windows:**
+
+```shell
+build\Release\writer
 ```
 
 In a separate window, start the reader:
 
+**Linux/macOS:**
+
+```shell
+./build/reader
+```
+
+**Windows:**
+
 ```shell
-reader
+build\Release\reader
 ```
diff --git a/cpp/DataStorm/node/CMakeLists.txt b/cpp/DataStorm/node/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(datastorm_node CXX)
+
+include(../../cmake/common.cmake)
+
+add_executable(reader Reader.cpp)
+target_link_libraries(reader Ice::Ice Ice::DataStorm)
+
+add_executable(writer Writer.cpp)
+target_link_libraries(writer Ice::Ice Ice::DataStorm)
diff --git a/cpp/DataStorm/node/README.md b/cpp/DataStorm/node/README.md
@@ -1,8 +1,17 @@
+# DataStorm Node
+
 This demo illustrates the use of a DataStorm node to discover writers and readers without using UDP multicast.
 
 It also demonstrates how readers and writers can exchange data through the DataStorm node when the server endpoints
 of both the writers and readers are disabled.
 
+To build the demo run:
+
+```shell
+cmake -B build -S .
+cmake --build build --config Release
+```
+
 To run the demo, start a DataStorm node:
 
 ```shell
@@ -11,14 +20,30 @@ dsnode --Ice.Config=config.node
 
 In a separate window, start the writer:
 
+**Linux/macOS:**
+
 ```shell
-writer
+./build/writer
+```
+
+**Windows:**
+
+```shell
+build\Release\writer
 ```
 
 In a separate window, start the reader:
 
+**Linux/macOS:**
+
+```shell
+./build/reader
+```
+
+**Windows:**
+
 ```shell
-reader
+build\Release\reader
 ```
 
 You can start multiple readers and writers. The readers print the time sent by the writers. Stopping the DataStorm node
diff --git a/cpp/DataStorm/sampleFilter/CMakeLists.txt b/cpp/DataStorm/sampleFilter/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(datastorm_sampleFilter CXX)
+
+include(../../cmake/common.cmake)
+
+add_executable(reader Reader.cpp)
+target_link_libraries(reader Ice::Ice Ice::DataStorm)
+
+add_executable(writer Writer.cpp)
+target_link_libraries(writer Ice::Ice Ice::DataStorm)
diff --git a/cpp/DataStorm/sampleFilter/README.md b/cpp/DataStorm/sampleFilter/README.md
@@ -1,15 +1,40 @@
+# DataStorm sampleFilter
+
 This demo illustrates the use of sample filters. The reader uses the `_regex` predefined sample filter. The reader will
 only receive samples matching the regular expression provided on construction of the reader object. Note that the
 filtering of the samples is performed on the writer to minimize the number of events sent over the wire.
 
+To build the demo run:
+
+```shell
+cmake -B build -S .
+cmake --build build --config Release
+```
+
 To run the demo, start the writer:
 
+**Linux/macOS:**
+
 ```shell
-writer
+./build/writer
+```
+
+**Windows:**
+
+```shell
+build\Release\writer
 ```
 
 In a separate window, start the reader:
 
+**Linux/macOS:**
+
+```shell
+./build/reader
+```
+
+**Windows:**
+
 ```shell
-reader
+build\Release\reader
 ```
diff --git a/cpp/DataStorm/stock/CMakeLists.txt b/cpp/DataStorm/stock/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(datastorm_stock CXX)
+
+include(../../cmake/common.cmake)
+
+add_executable(reader Reader.cpp Stock.ice)
+slice2cpp_generate(reader)
+target_link_libraries(reader Ice::Ice Ice::DataStorm)
+
+add_executable(writer Writer.cpp Stock.ice)
+slice2cpp_generate(writer)
+target_link_libraries(writer Ice::Ice Ice::DataStorm)
diff --git a/cpp/DataStorm/stock/README.md b/cpp/DataStorm/stock/README.md
@@ -1,20 +1,44 @@
+# DataStorm Stock
+
 This demo illustrates the use of partial updates. The writer adds stocks to the
 topic and send partial updates to update the stock price or volume. The reader
 prints out the stock information and partial updates.
 
 The demo uses Slice to define the `Demo::Stock` class in the `Stock.ice` file.
 
-To run the demo, start the writer and specify the ticker of the stocks to write:
+To build the demo run:
+
+```shell
+cmake -B build -S .
+cmake --build build --config Release
+```
+
+To run the demo, start the writer:
+
+**Linux/macOS:**
 
+```shell
+./build/writer
 ```
-writer
+
+**Windows:**
+
+```shell
+build\Release\writer
 ```
 
-In a separate window, start the reader and specify the stock tickers you wish to
-follow:
+In a separate window, start the reader:
+
+**Linux/macOS:**
 
+```shell
+./build/reader
 ```
-reader
+
+**Windows:**
+
+```shell
+build\Release\reader
 ```
 
 You can start multiple writers and readers to publish or follow different
diff --git a/cpp/Ice/secure/README.md b/cpp/Ice/secure/README.md
@@ -35,4 +35,4 @@ In a separate window, start the client:
 **Windows:**
 
 ```shell
-./build/Release/client
+build\Release\client
diff --git a/cpp/IceStorm/clock/CMakeLists.txt b/cpp/IceStorm/clock/CMakeLists.txt
@@ -1,13 +1,13 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(clock CXX)
+project(icestorm_clock CXX)
 
 include(../../cmake/common.cmake)
 
-add_executable(publisher Publisher.cpp Clock.ice)
-slice2cpp_generate(publisher)
-target_link_libraries(publisher Ice::Ice Ice::IceStorm)
-
 add_executable(subscriber Subscriber.cpp Clock.ice)
 slice2cpp_generate(subscriber)
 target_link_libraries(subscriber Ice::Ice Ice::IceStorm)
+
+add_executable(publisher Publisher.cpp Clock.ice)
+slice2cpp_generate(publisher)
+target_link_libraries(publisher Ice::Ice Ice::IceStorm)
diff --git a/cpp/IceStorm/counter/CMakeLists.txt b/cpp/IceStorm/counter/CMakeLists.txt
diff --git a/cpp/IceStorm/counter/README.md b/cpp/IceStorm/counter/README.md
diff --git a/cpp/IceStorm/replicated/CMakeLists.txt b/cpp/IceStorm/replicated/CMakeLists.txt
diff --git a/cpp/IceStorm/replicated/README.md b/cpp/IceStorm/replicated/README.md
diff --git a/cpp/IceStorm/replicated2/CMakeLists.txt b/cpp/IceStorm/replicated2/CMakeLists.txt
diff --git a/cpp/IceStorm/replicated2/README.md b/cpp/IceStorm/replicated2/README.md
diff --git a/cpp/cmake/common.cmake b/cpp/cmake/common.cmake
