Merge branch 'master' into core/msg-protobuf-client-v6

eclipse-ecal · Feb 11, 2025 · aec88c4 · aec88c4
2 parents d7f652e + 045f519
commit aec88c4
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 553 deletions.
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04]
+        os: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
 
     runs-on: ${{ matrix.os }}
 
@@ -25,17 +25,17 @@ jobs:
       run: |
         sudo apt update
 
-        if [ "${{ matrix.os }}" == "ubuntu-24.04" ]; then
+        if [[ ${{ matrix.os }} == ubuntu-24.04* ]]; then
             sudo apt-get install ninja-build doxygen graphviz libcurl4-openssl-dev libprotobuf-dev libprotoc-dev protobuf-compiler libhdf5-dev libyaml-cpp-dev
             sudo apt-get install qt6-base-dev qt6-svg-dev
             sudo apt-get install libgtest-dev
             sudo apt-get install python3 python3-venv python3-dev
-        elif [ "${{ matrix.os }}" == "ubuntu-22.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-22.04* ]]; then
             sudo apt-get install ninja-build doxygen graphviz libcurl4-openssl-dev libprotobuf-dev libprotoc-dev protobuf-compiler libhdf5-dev libyaml-cpp-dev
             sudo apt-get install qtbase5-dev libqt5opengl5-dev libqt5svg5-dev 
             sudo apt-get install libgtest-dev
             sudo apt-get install python3 python3-venv python3-dev
-        elif [ "${{ matrix.os }}" == "ubuntu-20.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-20.04* ]]; then
             sudo apt-get install ninja-build doxygen graphviz libcurl4-openssl-dev libprotobuf-dev libprotoc-dev protobuf-compiler libhdf5-dev libyaml-cpp-dev
             sudo apt-get install qt5-default libqt5opengl5-dev libqt5svg5-dev 
             sudo apt-get install libgtest-dev
@@ -44,13 +44,13 @@ jobs:
 
     - name: Set variables
       run: |
-        if [ "${{ matrix.os }}" == "ubuntu-24.04" ]; then
+        if [[ ${{ matrix.os }} == ubuntu-24.04* ]]; then
           echo "ubuntu_codename=noble"        >> "$GITHUB_ENV"
           echo "python_version=3"             >> "$GITHUB_ENV"   # => default python 3 version
-        elif [ "${{ matrix.os }}" == "ubuntu-22.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-22.04* ]]; then
           echo "ubuntu_codename=jammy"        >> "$GITHUB_ENV"
           echo "python_version=3"             >> "$GITHUB_ENV"   # => default python 3 version
-        elif [ "${{ matrix.os }}" == "ubuntu-20.04" ]; then
+        elif [[ ${{ matrix.os }} == ubuntu-20.04* ]]; then
           echo "ubuntu_codename=focal"        >> "$GITHUB_ENV"
           echo "python_version=3.9"           >> "$GITHUB_ENV"
         fi
@@ -133,7 +133,7 @@ jobs:
         -DCMAKE_INSTALL_SYSCONFDIR=/etc \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-        -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu \
+        -DCMAKE_INSTALL_LIBDIR=lib/$(arch)-linux-gnu \
         -DPython_FIND_VIRTUALENV=ONLY
       shell: bash
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -342,8 +342,6 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 
 if(WIN32)
   set(CMAKE_DEBUG_POSTFIX            d)
-  set(CMAKE_MINSIZEREL_POSTFIX       minsize)
-  set(CMAKE_RELWITHDEBINFO_POSTFIX   reldbg)
 endif()
 
 # --------------------------------------------------------

diff --git a/app/play/play_gui/src/q_ecal_play.cpp b/app/play/play_gui/src/q_ecal_play.cpp
@@ -54,7 +54,7 @@ QEcalPlay::QEcalPlay()
   periodic_update_timer_->start(40);
 
   play_service_ = std::make_shared<EcalPlayService>();
-  play_service_server_.Create(play_service_);
+  play_service_server_ = std::make_unique<eCAL::protobuf::CServiceServer<eCAL::pb::play::EcalPlayService>>(play_service_);
 
   // Load default channel mapping setting
   QSettings settings;

diff --git a/app/play/play_gui/src/q_ecal_play.h b/app/play/play_gui/src/q_ecal_play.h
@@ -181,7 +181,7 @@ public slots:
 
   // Service provider
   std::shared_ptr<eCAL::pb::play::EcalPlayService> play_service_;
-  eCAL::protobuf::CServiceServer<eCAL::pb::play::EcalPlayService> play_service_server_;
+  std::unique_ptr<eCAL::protobuf::CServiceServer<eCAL::pb::play::EcalPlayService>> play_service_server_;
 
   // State Update
   QTimer* periodic_update_timer_;

diff --git a/app/rec/rec_client_cli/src/ecal_rec_cli.cpp b/app/rec/rec_client_cli/src/ecal_rec_cli.cpp
@@ -354,7 +354,7 @@ int main(int argc, char** argv)
   std::cout << header_ss.str();
 
   std::shared_ptr<eCAL::pb::rec_client::EcalRecClientService> rec_service_(std::make_shared<EcalRecService>(ecal_rec));
-  eCAL::protobuf::CServiceServer<eCAL::pb::rec_client::EcalRecClientService> rec_service_server_(rec_service_);
+  std::unique_ptr<eCAL::protobuf::CServiceServer<eCAL::pb::rec_client::EcalRecClientService>> rec_service_server_(std::make_unique<eCAL::protobuf::CServiceServer<eCAL::pb::rec_client::EcalRecClientService>>(rec_service_));
 
   while (eCAL::Ok())
   {
@@ -370,8 +370,8 @@ int main(int argc, char** argv)
   }
 
   // Shutdown service
-  rec_service_server_.Destroy();
-  rec_service_ = nullptr;
+  rec_service_server_ = nullptr;
+  rec_service_        = nullptr;
 
   // Stop recording
   ecal_rec->StopRecording();

diff --git a/app/rec/rec_gui/src/qecalrec.cpp b/app/rec/rec_gui/src/qecalrec.cpp
@@ -98,7 +98,7 @@ Date: $HOST{TIME %F %R}
                                             });
 
   rec_server_service_ = std::make_shared<RecServerService>();
-  rec_server_service_server_.Create(rec_server_service_);
+  rec_server_service_server_ = std::make_unique<eCAL::protobuf::CServiceServer<eCAL::pb::rec_server::EcalRecServerService>>(rec_server_service_);
 }
 
 QEcalRec::~QEcalRec()

diff --git a/app/rec/rec_gui/src/qecalrec.h b/app/rec/rec_gui/src/qecalrec.h
@@ -327,7 +327,7 @@ public slots:
 
   // Service provider
   std::shared_ptr<eCAL::pb::rec_server::EcalRecServerService> rec_server_service_;
-  eCAL::protobuf::CServiceServer<eCAL::pb::rec_server::EcalRecServerService> rec_server_service_server_;
+  std::unique_ptr<eCAL::protobuf::CServiceServer<eCAL::pb::rec_server::EcalRecServerService>> rec_server_service_server_;
 
   QTimer* recorder_status_poll_timer_;
   const int recorder_status_poll_time_ms_ = 100;

diff --git a/app/rec/rec_server_cli/src/ecal_rec_server_cli.cpp b/app/rec/rec_server_cli/src/ecal_rec_server_cli.cpp
@@ -1490,7 +1490,7 @@ int main(int argc, char** argv)
   {
     std::cout << "Shutting down eCAL Rec..." << std::endl;
 
-    rec_server_service_server->Destroy(); // Prevent other applications to control this recorder from now on!
+    rec_server_service_server = nullptr; // Prevent other applications to control this recorder from now on!
 
     rec_server_instance      ->StopRecording();
     rec_server_instance      ->WaitForPendingRequests();

diff --git a/app/sys/sys_gui/src/ecalsys_gui.cpp b/app/sys/sys_gui/src/ecalsys_gui.cpp
@@ -189,7 +189,7 @@ EcalsysGui::EcalsysGui(QWidget *parent)
 
   // Create the eCALSys service
   std::shared_ptr<eCALSysServiceImpl> ecalsys_service_impl = std::make_shared<eCALSysServiceImpl>(this);
-  ecalsys_service_.Create(ecalsys_service_impl);
+  ecalsys_service_ = std::make_unique<eCAL::protobuf::CServiceServer<eCAL::pb::sys::Service>>(ecalsys_service_impl);
 
   //Drag & Drop
   setAcceptDrops(true);

diff --git a/app/sys/sys_gui/src/ecalsys_gui.h b/app/sys/sys_gui/src/ecalsys_gui.h
@@ -103,7 +103,7 @@ class EcalsysGui : public QMainWindow
 
   QActionGroup*          theme_action_group_;
 
-  eCAL::protobuf::CServiceServer<eCAL::pb::sys::Service> ecalsys_service_;
+  std::unique_ptr<eCAL::protobuf::CServiceServer<eCAL::pb::sys::Service>> ecalsys_service_;
 
   // Custom Widgets
   TaskWidget*            task_widget_;