packages/etmem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etmem: set scan_type optional, and fix sequence of header file

Browse Source 
Signed-off-by: chenrenhui <chenrenhui1@huawei.com>
(cherry picked from commit cf3cfb206e3106133f3e9905e94645fbcf721e40)
This commit is contained in:
chenrenhui 2024-11-07 14:35:24 +08:00 committed by openeuler-sync-bot
parent ef690fe1d3
commit a015bfe8b6
2 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
0091-etmem-set-scan_type-optional-and-fix-sequence-of-hea.patch Normal file
View File

@ -0,0 +1,56 @@
From 902aba0abb0d522cdf4c0792504b5c56d2a045de Mon Sep 17 00:00:00 2001
From: chenrenhui <chenrenhui1@huawei.com>
Date: Fri, 8 Nov 2024 05:02:38 +0800
Subject: [PATCH] etmem: set scan_type optional, and fix sequence of header
file
---
etmem/inc/etmemd_inc/etmemd_thirdparty_export.h | 2 +-
etmem/src/etmemd_src/etmemd_file.c | 3 +++
etmem/src/etmemd_src/etmemd_project.c | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/etmem/inc/etmemd_inc/etmemd_thirdparty_export.h b/etmem/inc/etmemd_inc/etmemd_thirdparty_export.h
index 9d145ce..6cd8094 100644
--- a/etmem/inc/etmemd_inc/etmemd_thirdparty_export.h
+++ b/etmem/inc/etmemd_inc/etmemd_thirdparty_export.h
@@ -16,8 +16,8 @@
#ifndef ETMEM_THIRDPARTY_EXPORT_H
#define ETMEM_THIRDPARTY_EXPORT_H
-#include "etmemd_project_exp.h"
#include "etmemd_engine_exp.h"
+#include "etmemd_project_exp.h"
#include "etmemd_task_exp.h"
#endif
diff --git a/etmem/src/etmemd_src/etmemd_file.c b/etmem/src/etmemd_src/etmemd_file.c
index d204685..0a7a75a 100644
--- a/etmem/src/etmemd_src/etmemd_file.c
+++ b/etmem/src/etmemd_src/etmemd_file.c
@@ -22,6 +22,9 @@ static int parse_item(GKeyFile *config, char *group_name, struct config_item *it
void *val;
if (!g_key_file_has_key(config, group_name, item->key, NULL)) {
+ if (strcmp(item->key, "scan_type") == 0) {
+ return item->fill(obj, "page");
+ }
if (item->option) {
return 0;
}
diff --git a/etmem/src/etmemd_src/etmemd_project.c b/etmem/src/etmemd_src/etmemd_project.c
index 5213bbd..d74834b 100644
--- a/etmem/src/etmemd_src/etmemd_project.c
+++ b/etmem/src/etmemd_src/etmemd_project.c
@@ -699,7 +699,7 @@ static bool check_swapcache_wmark_valid(struct project *proj)
static struct config_item g_project_config_items[] = {
{"name", STR_VAL, fill_project_name, false},
- {"scan_type", STR_VAL, fill_project_scan_type, false},
+ {"scan_type", STR_VAL, fill_project_scan_type, true},
{"sysmem_threshold", INT_VAL, fill_project_sysmem_threshold, true},
{"swapcache_high_wmark", INT_VAL, fill_project_swapcache_high_wmark, true},
{"swapcache_low_wmark", INT_VAL, fill_project_swapcache_low_wmark, true},
--
2.33.0

9
etmem.spec
View File

@ -1,6 +1,6 @@
Name: etmem
Version: 1.0
Release: 16
Release: 17
Summary: etmem
License: MulanPSL-2.0
URL: https://gitee.com/openeuler/etmem
@ -96,6 +96,7 @@ Patch86: 0087-etmem-fix-memory-leak-and-fd-leak.patch
Patch87: 0088-etmem-fix-multiple-etmemd-and-too-many-err-log-probl.patch
Patch88: 0089-etmem-fix-project-stop-cmd-timeout-problem.patch
Patch89: 0090-etmem-construct-etmem-debug-info-package.patch
Patch90: 0091-etmem-set-scan_type-optional-and-fix-sequence-of-hea.patch
#Dependency
BuildRequires: cmake gcc gcc-c++ glib2-devel
@ -149,6 +150,12 @@ install -m 0644 userswap/include/uswap_api.h $RPM_BUILD_ROOT%{_includedir}
%postun -p /sbin/ldconfig
%changelog
* Thu Nov 7 2024 chenrenhui <chenrenhui1@huawei.com> 1.0-17
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:set scan_type optional, and fix sequence of header file
* Wed Apr 3 2024 tangyuchen <tangyuchen5@huawei.com> 1.0-16
- Type:bugfix
- CVE:NA