1 files changed, 92 insertions, 0 deletions
diff --git a/0042-2268-bugfix-for-the-bliko-zero-value-exception-when-.patch b/0042-2268-bugfix-for-the-bliko-zero-value-exception-when-.patch
new file mode 100644
index 0000000..2c9f725
--- /dev/null
+++ b/0042-2268-bugfix-for-the-bliko-zero-value-exception-when-.patch
@@ -0,0 +1,92 @@
+From dddba4ec73b56bc2fcf3a95171fad104e962dfda Mon Sep 17 00:00:00 2001
+From: zhongtao <zhongtao17@huawei.com>
+Date: Wed, 29 Nov 2023 09:33:53 +0000
+Subject: [PATCH 42/64] =?UTF-8?q?!2268=20bugfix=20for=20the=20bliko=20zero?=
+ =?UTF-8?q?=20value=20exception=20when=20executing=20the=20stats=20command?=
+ =?UTF-8?q?=20on=20the=20oci=20container=20*=20bugfix=20for=20the=20bliko?=
+ =?UTF-8?q?=20zero=20value=20exception=20when=20executing=20the=20stats=20?=
+ =?UTF-8?q?com=E2=80=A6?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ .../modules/runtime/isula/isula_rt_ops.c      | 55 +++++++++++++------
+ 1 file changed, 38 insertions(+), 17 deletions(-)
+
+diff --git a/src/daemon/modules/runtime/isula/isula_rt_ops.c b/src/daemon/modules/runtime/isula/isula_rt_ops.c
+index 5d7ae500..1e2ecdb2 100644
+--- a/src/daemon/modules/runtime/isula/isula_rt_ops.c
++++ b/src/daemon/modules/runtime/isula/isula_rt_ops.c
+@@ -610,6 +610,43 @@ out:
+     return ret;
+ }
+ 
++static void transform_stats_info_from_runtime(shim_client_runtime_stats *stats, struct runtime_container_resources_stats_info *info)
++{
++    if (stats == NULL || stats->data == NULL) {
++        return;
++    }
++    if (stats->data->pids != NULL) {
++        info->pids_current = stats->data->pids->current;
++    }
++    if (stats->data->cpu != NULL && stats->data->cpu->usage != NULL) {
++        info->cpu_use_nanos = stats->data->cpu->usage->total;
++        info->cpu_system_use = stats->data->cpu->usage->kernel;
++    }
++    shim_client_runtime_stats_data_memory *memory = stats->data->memory;
++    if (memory != NULL && memory->usage != NULL) {
++        info->mem_used = memory->usage->usage;
++        info->mem_limit = memory->usage->limit;
++    }
++    if (memory != NULL && memory->raw != NULL) {
++        info->inactive_file_total = memory->raw->total_inactive_file;
++        info->rss_bytes = memory->raw->rss;
++        info->page_faults = memory->raw->pgfault;
++        info->major_page_faults = memory->raw->pgmajfault;
++    }
++    shim_client_runtime_stats_data_blkio *blkio = stats->data->blkio;
++    if (blkio == NULL) {
++        return;
++    }
++    for (size_t i = 0; i < blkio->io_service_bytes_recursive_len; i++) {
++        if (strcasecmp(blkio->io_service_bytes_recursive[i]->op, "read") == 0) {
++            info->blkio_read += blkio->io_service_bytes_recursive[i]->value;
++        }
++        if (strcasecmp(blkio->io_service_bytes_recursive[i]->op, "write") == 0) {
++            info->blkio_write += blkio->io_service_bytes_recursive[i]->value;
++        }
++    }
++}
++
+ static int runtime_call_stats(const char *workdir, const char *runtime, const char *id,
+                               struct runtime_container_resources_stats_info *info)
+ {
+@@ -658,23 +695,7 @@ static int runtime_call_stats(const char *workdir, const char *runtime, const ch
+         goto out;
+     }
+ 
+-    if (stats != NULL && stats->data != NULL && stats->data->pids != NULL) {
+-        info->pids_current = stats->data->pids->current;
+-    }
+-    if (stats != NULL && stats->data != NULL && stats->data->cpu != NULL && stats->data->cpu->usage) {
+-        info->cpu_use_nanos = stats->data->cpu->usage->total;
+-        info->cpu_system_use = stats->data->cpu->usage->kernel;
+-    }
+-    if (stats != NULL && stats->data != NULL && stats->data->memory != NULL && stats->data->memory->usage) {
+-        info->mem_used = stats->data->memory->usage->usage;
+-        info->mem_limit = stats->data->memory->usage->limit;
+-    }
+-    if (stats != NULL && stats->data != NULL && stats->data->memory != NULL && stats->data->memory->raw) {
+-        info->inactive_file_total = stats->data->memory->raw->total_inactive_file;
+-        info->rss_bytes = stats->data->memory->raw->rss;
+-        info->page_faults = stats->data->memory->raw->pgfault;
+-        info->major_page_faults = stats->data->memory->raw->pgmajfault;
+-    }
++    transform_stats_info_from_runtime(stats, info);
+ 
+ out:
+     free_shim_client_runtime_stats(stats);
+-- 
+2.42.0
+