1 files changed, 81 insertions, 0 deletions
diff --git a/0011-add-cpu-usage-nano-cores-for-sandbox.patch b/0011-add-cpu-usage-nano-cores-for-sandbox.patch
new file mode 100644
index 0000000..27be05d
--- /dev/null
+++ b/0011-add-cpu-usage-nano-cores-for-sandbox.patch
@@ -0,0 +1,81 @@
+From 3dc12d7806fda8d5ceee183595e993079bee4056 Mon Sep 17 00:00:00 2001
+From: jikai <jikai11@huawei.com>
+Date: Fri, 12 Jan 2024 17:38:09 +0800
+Subject: [PATCH 11/43] add cpu usage nano cores for sandbox
+
+Signed-off-by: jikai <jikai11@huawei.com>
+---
+ .../v1/v1_cri_pod_sandbox_manager_service.cc    | 17 ++++++++++++++---
+ .../cri/v1/v1_cri_pod_sandbox_manager_service.h |  1 +
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.cc b/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.cc
+index a0c45111..76fa17bc 100644
+--- a/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.cc
++++ b/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.cc
+@@ -1024,6 +1024,7 @@ void PodSandboxManagerService::PodSandboxStatsToGRPC(const std::string &id, cons
+                                                      const std::vector<Network::NetworkInterfaceStats> &netMetrics,
+                                                      const std::unique_ptr<ContainerManagerService> &containerManager,
+                                                      std::unique_ptr<runtime::v1::PodSandboxStats> &podStats,
++                                                     sandbox::StatsInfo &oldStatsRec,
+                                                      Errors &error)
+ {
+     std::unique_ptr<runtime::v1::PodSandboxStats> podStatsPtr(
+@@ -1044,8 +1045,13 @@ void PodSandboxManagerService::PodSandboxStatsToGRPC(const std::string &id, cons
+     auto cpu = podStatsPtr->mutable_linux()->mutable_cpu();
+     cpu->set_timestamp(timestamp);
+     cpu->mutable_usage_core_nano_seconds()->set_value(cgroupMetrics.cgcpu_metrics.cpu_use_nanos);
+-    // todo
+-    // cpu->mutable_usage_nano_cores()->set_value(getNanoCores());
++    if (oldStatsRec.cpuUseNanos != 0 && timestamp > oldStatsRec.timestamp &&
++        cgroupMetrics.cgcpu_metrics.cpu_use_nanos > oldStatsRec.cpuUseNanos) {
++        uint64_t usage = cgroupMetrics.cgcpu_metrics.cpu_use_nanos - oldStatsRec.cpuUseNanos;
++        uint64_t nanoSeconds = timestamp - oldStatsRec.timestamp;
++        uint64_t usage_nano_cores = (uint64_t)(((double)usage / (double)nanoSeconds) * (double)Time_Second);
++        cpu->mutable_usage_nano_cores()->set_value(usage_nano_cores);
++    }
+ 
+     // Memory
+     auto memory = podStatsPtr->mutable_linux()->mutable_memory();
+@@ -1114,6 +1120,7 @@ auto PodSandboxManagerService::PodSandboxStats(const std::string &podSandboxID,
+         return nullptr;
+     }
+     auto &config = sandbox->GetSandboxConfig();
++    auto oldStatsRec = sandbox->GetStatsInfo();
+ 
+     auto status = PodSandboxStatus(sandbox->GetId(), tmpErr);
+     if (error.NotEmpty()) {
+@@ -1136,13 +1143,17 @@ auto PodSandboxManagerService::PodSandboxStats(const std::string &podSandboxID,
+         tmpErr.Clear();
+     }
+ 
+-    PodSandboxStatsToGRPC(sandbox->GetId(), cgroupMetrics, netMetrics, containerManager, podStats, tmpErr);
++    PodSandboxStatsToGRPC(sandbox->GetId(), cgroupMetrics, netMetrics, containerManager, podStats, oldStatsRec, tmpErr);
+     if (tmpErr.NotEmpty()) {
+         ERROR("Failed to set PodSandboxStats: %s", tmpErr.GetCMessage());
+         error.Errorf("Failed to set PodSandboxStats");
+         return nullptr;
+     }
+ 
++    // update stats info that sandbox recorded
++    sandbox::StatsInfo newStatsRec { podStats->linux().cpu().timestamp(), podStats->linux().cpu().usage_core_nano_seconds().value() };
++    sandbox->UpdateStatsInfo(newStatsRec);
++
+     return podStats;
+ }
+ 
+diff --git a/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.h b/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.h
+index 2bd28007..c3d98b8c 100644
+--- a/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.h
++++ b/src/daemon/entry/cri/v1/v1_cri_pod_sandbox_manager_service.h
+@@ -123,6 +123,7 @@ private:
+                                const std::vector<Network::NetworkInterfaceStats> &netMetrics,
+                                const std::unique_ptr<ContainerManagerService> &containerManager,
+                                std::unique_ptr<runtime::v1::PodSandboxStats> &podStats,
++                               sandbox::StatsInfo &statsInfo,
+                                Errors &error);
+     void GetFilterPodSandbox(const runtime::v1::PodSandboxStatsFilter *filter,
+                              std::vector<std::string> &podSandboxIDs, Errors &error);
+-- 
+2.34.1
+