Fixes qnx8_build issues and review findings

Author: TomaUngureanu

.bazelrc

@@ -9,16 +9,26 @@ common --registry=https://raw.githubusercontent.com/eclipse-score/bazel_registry
 common --registry=https://bcr.bazel.build
 common --credential_helper=*.qnx.com=%workspace%/scripts/internal/qnx_creds.py
 
+build:x86_64-linux --platforms=@score_bazel_platforms//:x86_64-linux
+build:x86_64-linux --define=config=x86_64-linux
+
 build:build_qnx8 --platforms=@score_bazel_platforms//:arm64-qnx8_0
 build:build_qnx8 --extra_toolchains=@toolchains_qnx_qcc//:qcc_aarch64
 build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/aarch64-unknown-qnx8_0:toolchain_aarch64_qnx8_0
-build:build_qnx8 --extra_toolchains=@score_toolchains_rust//toolchains/x86_64-unknown-linux-gnu:toolchain_x86_64_linux
-build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_x86_64
-build:build_qnx8 --extra_toolchains=@toolchains_qnx_ifs//:ifs_aarch64
+build:build_qnx8 --define=config=build_qnx8
+
+# TODO: Enable when rust toolchain for x86_64-qnx becomes available
+# build:x86_64-qnx --platforms=@score_bazel_platforms//:x86_64-qnx
+# build:x86_64-qnx --extra_toolchains=@toolchains_qnx_qcc//:qcc_x86_64
+# build:x86_64-qnx --define=config=x86_64-qnx
 
 common --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
 common --@score_baselibs//score/json:base_library=nlohmann
 
+## default is a stdout logger which looks like dlt logs
+## uncomment below to use score::mw::log instead of the stdout logger
+# build --cxxopt=-DLC_LOG_SCORE_MW_LOG
+
 build --cxxopt=-std=c++17
 build --cxxopt=-Wno-missing-template-arg-list-after-template-kw
 # Required to build baselibs dependency which uses some deprecated APIs

.github/actions/setup-rust-build/action.yml

@@ -1,24 +1,12 @@
 name: 'Setup Rust Build Environment'
-description: 'Checks out code, installs protoc, and caches cargo dependencies'
-
-inputs:
-  repo-token:
-    description: 'GitHub token for protoc downloads'
-    required: true
-
+description: 'Checks out code, and caches cargo dependencies'
 
 runs:
   using: "composite"
   steps:
     - name: Checkout Repository
       uses: actions/checkout@v4
 
-    - name: Install protoc 26.1
-      uses: arduino/setup-protoc@v3
-      with:
-        version: 26.1
-        repo-token: ${{ inputs.repo-token }}
-
     - name: Cache cargo & target
       uses: actions/cache@v3
       with:

.github/workflows/build.yml

@@ -32,12 +32,6 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4.2.2
 
-      - name: Install protoc 26.1
-        uses: arduino/setup-protoc@v3
-        with:
-          version: 26.1
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Setup Bazel
         uses: bazel-contrib/setup-bazel@0.15.0
         with:

.github/workflows/cargo_required.yml

@@ -29,12 +29,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Install protoc 26.1
-        uses: arduino/setup-protoc@v3
-        with:
-          version: 26.1
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Cache Cargo registry, git deps & target
         uses: actions/cache@v3
         with:

.github/workflows/lint_clippy.yml

@@ -0,0 +1,19 @@
+{
+    "[rust]": {
+        "editor.defaultFormatter": "rust-lang.rust-analyzer",
+        "editor.formatOnSave": true,
+        "editor.rulers": [
+            150
+        ]
+    },
+    "rust-analyzer.cargo.features": [
+        "qm"
+    ],
+    "rust-analyzer.cargo.cfgs": [
+        "!miri"
+    ],
+    "rust-analyzer.check.command": "clippy",
+    "rust-analyzer.rustfmt.overrideCommand": [
+        "${workspaceFolder}/.vscode/rustfmt.sh"
+    ]
+}

.vscode/settings.json

@@ -25,9 +25,9 @@ config_setting(
 )
 
 config_setting(
-    name = "arm64-qnx",
+    name = "build_qnx8",
     define_values = {
-        "config": "arm64-qnx",
+        "config": "build_qnx8",
     },
 )
 

config/BUILD

@@ -17,10 +17,12 @@ cc_binary(
         "control_app_cli.cpp",
     ],
     copts = select({
+        "//config:build_qnx8": [],
         "//config:x86_64-qnx": [],
         "//conditions:default": ["-pthread"],
     }),
     linkopts = select({
+        "//config:build_qnx8": [],
         "//config:x86_64-qnx": [],
         "//conditions:default": [
             "-lpthread",
@@ -40,10 +42,12 @@ cc_binary(
         "control_daemon.cpp",
     ],
     copts = select({
+        "//config:build_qnx8": [],
         "//config:x86_64-qnx": [],
         "//conditions:default": ["-pthread"],
     }),
     linkopts = select({
+        "//config:build_qnx8": [],
         "//config:x86_64-qnx": [],
         "//conditions:default": [
             "-lpthread",

demo/control_application/BUILD

@@ -16,10 +16,12 @@ cc_binary(
         "main.cpp",
     ],
     copts = select({
+        "//config:build_qnx8": [],
         "//config:x86_64-qnx": [],
         "//conditions:default": ["-pthread"],
     }),
     linkopts = select({
+        "//config:build_qnx8": [],
         "//config:x86_64-qnx": [],
         "//conditions:default": ["-lpthread"],
     }),

demo/cpp_lifecycle_app/BUILD

@@ -20,8 +20,10 @@
 #include <ctime>
 #include <string>
 
-#include <linux/prctl.h>
-#include <sys/prctl.h>
+#ifdef __linux__
+    #include <linux/prctl.h>
+    #include <sys/prctl.h>
+#endif
 
 #include "score/lcm/lifecycle_client.h"
 
@@ -96,9 +98,15 @@ void signalHandler(int)
 void set_process_name() {
     const char* identifier = getenv("PROCESSIDENTIFIER");
     if(identifier != nullptr) {
-        if(prctl(PR_SET_NAME, identifier) < 0) {
-            std::cerr << "Failed to set process name to " << identifier << std::endl;
-        }
+    #ifdef __QNXNTO__
+            if (pthread_setname_np(pthread_self(), identifier) != 0) {
+                std::cerr << "Failed to set QNX thread name" << std::endl;
+            }
+    #elif defined(__linux__)
+            if (prctl(PR_SET_NAME, identifier) < 0) {
+                std::cerr << "Failed to set process name to " << identifier << std::endl;
+            }
+    #endif
     }
 }