diff --git a/VERSION b/VERSION index 8b23b8d47..a0f9a4b4b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.3.0 \ No newline at end of file +latest diff --git a/examples/recording_service/service_admin/c++11/CMakeLists.txt b/examples/recording_service/service_admin/c++11/CMakeLists.txt index 8c72e9ea8..aab6294c7 100644 --- a/examples/recording_service/service_admin/c++11/CMakeLists.txt +++ b/examples/recording_service/service_admin/c++11/CMakeLists.txt @@ -42,6 +42,7 @@ target_compile_features(Requester PRIVATE cxx_std_11) target_link_libraries( Requester RTIConnextDDS::messaging_cpp2_api + RTIConnextDDS::service_admin_cpp2 RTIConnextDDS::recording_service ${CONNEXTDDS_EXTERNAL_LIBS} ) diff --git a/examples/recording_service/service_as_lib/c++11/CMakeLists.txt b/examples/recording_service/service_as_lib/c++11/CMakeLists.txt index b15f49e0f..eb4c4a2b9 100644 --- a/examples/recording_service/service_as_lib/c++11/CMakeLists.txt +++ b/examples/recording_service/service_as_lib/c++11/CMakeLists.txt @@ -64,6 +64,7 @@ target_include_directories( target_link_libraries( ServiceAsLibExample RTIConnextDDS::cpp2_api + RTIConnextDDS::service_admin_cpp2 RTIConnextDDS::recording_service ${CONNEXTDDS_EXTERNAL_LIBS} ) diff --git a/examples/recording_service/service_as_lib/c++11/ServiceAsLibExample.cxx b/examples/recording_service/service_as_lib/c++11/ServiceAsLibExample.cxx index efa101d07..f2217faec 100644 --- a/examples/recording_service/service_as_lib/c++11/ServiceAsLibExample.cxx +++ b/examples/recording_service/service_as_lib/c++11/ServiceAsLibExample.cxx @@ -17,7 +17,7 @@ #include #include - +#include void print_usage(const char *executable) { @@ -109,7 +109,24 @@ int main(int argc, char *argv[]) embedded_service.start(); // Wait for 'running_seconds' seconds std::this_thread::sleep_for(std::chrono::seconds(running_seconds)); - embedded_service.stop(); + RTI::Service::Admin::CommandRequest request; + request.action(RTI::Service::Admin::CommandActionKind::UPDATE_ACTION); + request.resource_identifier( + service_property.application_role() + == rti::recording::ApplicationRoleKind:: + RECORD_APPLICATION + ? "/recording_services/service_as_lib/state" + : "/replay_services/service_as_lib/state"); + request.string_body("STOPPED"); + RTI::Service::Admin::CommandReply reply = + embedded_service.execute_command(request); + if (reply.retcode() + != RTI::Service::Admin::CommandReplyRetcode::OK_RETCODE) { + std::cerr << "Error stopping the service: " << reply.string_body() + << ", native error code = " << reply.native_retcode() + << std::endl; + return EXIT_FAILURE; + } } catch (const std::exception &ex) { std::cerr << "Exception: " << ex.what() << std::endl; return EXIT_FAILURE; diff --git a/resources/cmake/rticonnextdds-cmake-utils b/resources/cmake/rticonnextdds-cmake-utils index 53d2ed5d2..df51c4f0c 160000 --- a/resources/cmake/rticonnextdds-cmake-utils +++ b/resources/cmake/rticonnextdds-cmake-utils @@ -1 +1 @@ -Subproject commit 53d2ed5d27c3dd043cdaa77d773b91dc06e7d2cc +Subproject commit df51c4f0ca90443838341b69e74ec88935fa5021