refactor: fix compiler warnings across runtime and utils

- std::reference_wrapper causing the compiler to
  trigger SFINAE trait checks on RunContext while
  it was still an incomplete type. So replace it
  with raw pointer
- Fixed some warnings caused by the use of C++20
  extensions
- Add [[nodiscard]], noexcept, explicit enum types
- Extract RuntimeLayer to separate compilation unit

Signed-off-by: Yuming He <ComixHe1895@outlook.com>

Author: ComixHe

apps/ll-driver-detect/src/nvidia_driver_detector.cpp

@@ -82,7 +82,9 @@ NVIDIADriverDetector::getPackageInfoFromRemoteRepo(const std::string &packageNam
 
     LINGLONG_TRACE("Check if NVIDIA driver package exists in repository");
 
-    GraphicsDriverInfo driverInfo{ getDriverIdentify(), packageName };
+    GraphicsDriverInfo driverInfo;
+    driverInfo.identify = getDriverIdentify();
+    driverInfo.packageName = packageName;
     // Execute ll-cli search command to check driver package existence
     auto ret = linglong::utils::Cmd("ll-cli").exec({ "--json", "search", packageName });
     if (!ret) {
@@ -192,7 +194,9 @@ NVIDIADriverDetector::getInstalledGraphicsDriverInfo(const std::string &packageN
 
     LINGLONG_TRACE("Get installed NVIDIA graphics driver info");
 
-    GraphicsDriverInfo driverInfo{ getDriverIdentify(), packageName };
+    GraphicsDriverInfo driverInfo;
+    driverInfo.identify = getDriverIdentify();
+    driverInfo.packageName = packageName;
 
     auto listResult = linglong::utils::Cmd("ll-cli").exec({ "--json", "list", "--type=extension" });
     if (!listResult) {

libs/linglong/CMakeLists.txt

@@ -107,6 +107,8 @@ pfl_add_library(
   src/linglong/runtime/container_builder.h
   src/linglong/runtime/container.cpp
   src/linglong/runtime/container.h
+  src/linglong/runtime/layer.cpp
+  src/linglong/runtime/layer.h
   src/linglong/runtime/overlayfs_driver.cpp
   src/linglong/runtime/overlayfs_driver.h
   src/linglong/runtime/run_context.cpp

libs/linglong/src/linglong/cli/cli.cpp

@@ -29,7 +29,6 @@
 #include "linglong/common/dir.h"
 #include "linglong/common/error.h"
 #include "linglong/common/strings.h"
-#include "linglong/oci-cfg-generators/container_cfg_builder.h"
 #include "linglong/package/layer_file.h"
 #include "linglong/package/reference.h"
 #include "linglong/repo/config.h"
@@ -42,7 +41,6 @@
 #include "linglong/utils/gettext.h"
 #include "linglong/utils/namespace.h"
 #include "linglong/utils/runtime_config.h"
-#include "linglong/utils/xdg/directory.h"
 #include "linglong/utils/xdp.h"
 #include "ocppi/runtime/ExecOption.hpp"
 #include "ocppi/runtime/RunOption.hpp"

libs/linglong/src/linglong/cli/cli.h

@@ -10,7 +10,6 @@
 #include "linglong/api/dbus/v1/task.h"
 #include "linglong/api/types/v1/CommonOptions.hpp"
 #include "linglong/api/types/v1/PackageInfoDisplay.hpp"
-#include "linglong/api/types/v1/RepositoryCacheLayersItem.hpp"
 #include "linglong/cli/interactive_notifier.h"
 #include "linglong/cli/printer.h"
 #include "linglong/common/serialize/json.h"

libs/linglong/src/linglong/package_manager/package_task.cpp

@@ -15,8 +15,6 @@
 
 #include <utility>
 
-const auto TASK_DONE = 100;
-
 namespace linglong::service {
 
 PackageTask::PackageTask(std::function<void(Task &)> job, QObject *parent)

libs/linglong/src/linglong/repo/ostree_repo.cpp

@@ -1352,7 +1352,7 @@ OSTreeRepo::getRefStatistics(const RefMetaData &meta) const noexcept
     }
     g_clear_error(&gErr);
 
-    RefStatistics stat = { 0 };
+    RefStatistics stat{};
 
 #if OSTREE_CHECK_VERSION(2020, 1)
     g_autoptr(GPtrArray) sizes = NULL;
@@ -2100,12 +2100,12 @@ utils::error::Result<void> OSTreeRepo::exportDir(const std::string &appID,
                 && common::strings::ends_with(target_path.string(), ".desktop")) {
                 auto desktopExists = false;
                 // 如果要导出的desktop已存在，则覆盖导出（无论是在default还是overlay中），避免桌面和任务栏的快捷方式失效
-                const std::string appDirs[] = { oldAppDir, newAppDir };
+                const std::array<std::string, 2> appDirs{ oldAppDir, newAppDir };
                 for (const auto &appDir : appDirs) {
                     // 如果目标文件存在，删除再导出
-                    std::filesystem::path linkpath =
+                    const std::filesystem::path linkpath =
                       target_path.string().replace(0, oldAppDir.string().length(), appDir);
-                    auto status = std::filesystem::symlink_status(linkpath, ec);
+                    std::ignore = std::filesystem::symlink_status(linkpath, ec);
                     if (!ec) {
                         desktopExists = true;
                         auto target = source_path.lexically_relative(linkpath.parent_path());

libs/linglong/src/linglong/runtime/container.cpp

@@ -22,6 +22,7 @@
 
 #include <cassert>
 #include <fstream>
+#include <memory>
 #include <utility>
 
 #include <unistd.h>
@@ -143,10 +144,9 @@ auto ContainerContext::create(RunContext &context, CreateOptions options)
         }
     }
 
-    auto containerContext =
-      std::unique_ptr<ContainerContext>{ new ContainerContext(std::move(containerID),
-                                                              std::move(*bundleDir),
-                                                              std::move(options.appCache)) };
+    auto containerContext = std::make_unique<ContainerContext>(containerID,
+                                                               std::move(*bundleDir),
+                                                               std::move(options.appCache));
 
     return containerContext;
 }

libs/linglong/src/linglong/runtime/container.h

@@ -51,7 +51,7 @@ class ContainerContext
     [[nodiscard]] auto getBundleDir() const -> const std::filesystem::path &;
     [[nodiscard]] auto getContainerCache() const -> const std::optional<std::filesystem::path> &;
     void addSecurityContext(std::unique_ptr<SecurityContext> securityContext);
-    auto setupOverlayFS(RunContext &context, bool readOnly) -> utils::error::Result<void>;
+    auto setupOverlayFS(RunContext &context, bool persistent) -> utils::error::Result<void>;
     auto genLdConf(const std::string &ldConf, bool overlayEnabled) -> utils::error::Result<void>;
 
 private:

libs/linglong/src/linglong/runtime/container_builder.cpp

@@ -62,7 +62,8 @@ auto getXDPDocumentsMountPoint() noexcept -> utils::error::Result<std::filesyste
         return LINGLONG_ERR("Documents portal mount point reply is empty");
     }
 
-    const auto &value = reply.arguments().constFirst();
+    auto arguments = reply.arguments();
+    const auto &value = arguments.constFirst();
     if (!value.canConvert<QByteArray>()) {
         return LINGLONG_ERR(
           fmt::format("unexpected Documents portal mount point type: {}", value.typeName()));
@@ -306,7 +307,7 @@ auto ContainerBuilder::prepareContainer(runtime::RunContext &context,
     }
 
     PreparedContainer prepared{
-        .runContext = context,
+        .runContext = &context,
         .context = std::move(*containerContext),
         .mode = mode,
     };
@@ -323,7 +324,7 @@ auto ContainerBuilder::prepareContainer(runtime::RunContext &context,
     auto uid = getuid();
     auto gid = getgid();
 
-    prepared.cfgBuilder.setAppId(prepared.runContext.get().getTargetID())
+    prepared.cfgBuilder.setAppId(prepared.runContext->getTargetID())
       .setBundlePath(prepared.context->getBundleDir())
       .addUIdMapping(uid, uid, 1)
       .addGIdMapping(gid, gid, 1)
@@ -353,8 +354,7 @@ auto ContainerBuilder::finalizeContainer(PreparedContainer &prepared) noexcept
     bool useOverlayMode = true;
     bool needGenLdConf = false;
     if (prepared.mode == ContainerMode::Init) {
-        auto &runContext = prepared.runContext.get();
-        const auto &appLayer = runContext.getAppLayer();
+        const auto &appLayer = prepared.runContext->getAppLayer();
         if (!appLayer) {
             return LINGLONG_ERR("app layer not found");
         }
@@ -407,8 +407,7 @@ auto ContainerBuilder::configureBuildContainer(PreparedContainer &prepared,
         prepared.cfgBuilder.isolateNetWork();
     }
 
-    auto &runContext = prepared.runContext.get();
-    auto res = normalizeContainerRootfs(options.basePath, runContext.getConfig());
+    auto res = normalizeContainerRootfs(options.basePath, prepared.runContext->getConfig());
     if (!res) {
         return LINGLONG_ERR(res);
     }
@@ -460,7 +459,7 @@ auto ContainerBuilder::configureInitContainer(PreparedContainer &prepared) noexc
 {
     LINGLONG_TRACE("configure init container");
 
-    auto &runContext = prepared.runContext.get();
+    auto &runContext = *prepared.runContext;
 
     prepared.cfgBuilder.bindXDGRuntime().bindHostRoot().bindHostStatics().forwardDefaultEnv();
 
@@ -582,7 +581,7 @@ auto ContainerBuilder::configureRunContainer(PreparedContainer &prepared,
     capabilities.insert(capabilities.end(), extraCapabilities.begin(), extraCapabilities.end());
     prepared.cfgBuilder.setCapabilities(std::move(capabilities));
 
-    auto &runContext = prepared.runContext.get();
+    auto &runContext = *prepared.runContext;
     for (const auto &type : options.getSecurityContexts()) {
         auto manager = getSecurityContextManager(type);
         if (!manager) {

libs/linglong/src/linglong/runtime/container_builder.h

@@ -95,7 +95,7 @@ class ContainerBuilder
       -> utils::error::Result<std::unique_ptr<Container>>;
 
 private:
-    enum class ContainerMode {
+    enum class ContainerMode : uint8_t {
         Init,
         Build,
         Run,
@@ -104,7 +104,7 @@ class ContainerBuilder
     struct PreparedContainer
     {
         generator::ContainerCfgBuilder cfgBuilder;
-        std::reference_wrapper<runtime::RunContext> runContext;
+        runtime::RunContext *runContext{ nullptr };
         std::unique_ptr<ContainerContext> context;
         ContainerMode mode{ ContainerMode::Run };
     };