packages/opengauss-dcf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!41 【sync 24.03 LTS SP1分支至22.03 LTS SP4】更新dcf至6.0.0

Browse Source 
From: @hengliue 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2025-01-02 09:09:27 +00:00 committed by Gitee
commit 4c3d01ae7b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 166 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
0001-add-loongarch64-support.patch
View File

@ -1,84 +0,0 @@
From 8bc1a92d8f9275bf608ebf7b4b49cf64484f2d45 Mon Sep 17 00:00:00 2001
From: herengui <herengui@kylinsec.com.cn>
Date: Mon, 22 May 2023 11:31:12 +0800
Subject: [PATCH] add loongarch64 support
Signed-off-by: herengui <herengui@kylinsec.com.cn>
---
CMakeLists.txt | 2 ++
src/common/cm_concurrency/cm_spinlock.h | 3 +++
src/common/cm_concurrency/cm_thread.c | 2 +-
src/common/cm_utils/cm_checksum.h | 2 +-
src/common/cm_utils/cm_memory.h | 3 +++
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81d310b..54ffffe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,8 @@ if (UNIX)
endif (USE_H1620)
add_compile_options(-mtune=cortex-a72 -fsigned-char -g -ggdb3 -march=armv8-a+crc -funwind-tables)
+ elseif (OS_ARCH STREQUAL "loongarch64")
+ add_compile_options(-march=loongarch64 )
else ()
add_compile_options(-msse4.2 )
endif ()
diff --git a/src/common/cm_concurrency/cm_spinlock.h b/src/common/cm_concurrency/cm_spinlock.h
index 7965853..ef4755d 100644
--- a/src/common/cm_concurrency/cm_spinlock.h
+++ b/src/common/cm_concurrency/cm_spinlock.h
@@ -68,6 +68,9 @@ typedef struct st_spin_statis {
{ \
__asm__ volatile("nop"); \
}
+#elif defined(__loongarch__)
+#define fas_cpu_pause() \
+ {}
#else
#define fas_cpu_pause() \
{ \
diff --git a/src/common/cm_concurrency/cm_thread.c b/src/common/cm_concurrency/cm_thread.c
index 2d0aa2a..266abba 100644
--- a/src/common/cm_concurrency/cm_thread.c
+++ b/src/common/cm_concurrency/cm_thread.c
@@ -294,7 +294,7 @@ uint32 cm_get_current_thread_id()
{
#if (defined __x86_64__)
#define __SYS_GET_SPID 186
-#elif (defined __aarch64__)
+#elif defined(__aarch64__) || defined(__loongarch__)
#define __SYS_GET_SPID 178
#endif
#define gettid() syscall(__SYS_GET_SPID)
diff --git a/src/common/cm_utils/cm_checksum.h b/src/common/cm_utils/cm_checksum.h
index 85bb9fa..8e05e5a 100644
--- a/src/common/cm_utils/cm_checksum.h
+++ b/src/common/cm_utils/cm_checksum.h
@@ -26,7 +26,7 @@
#include "cm_defs.h"
-#if defined(__arm__) || defined(__aarch64__)
+#if defined(__arm__) || defined(__aarch64__) || defined(__loongarch__)
#ifdef __has_include
#if __has_include(<arm_acle.h>)
#include <arm_acle.h>
diff --git a/src/common/cm_utils/cm_memory.h b/src/common/cm_utils/cm_memory.h
index 988b78e..d6494fb 100644
--- a/src/common/cm_utils/cm_memory.h
+++ b/src/common/cm_utils/cm_memory.h
@@ -56,6 +56,9 @@ extern "C" {
__asm__ volatile("dmb ish" :: \
: "memory"); \
}
+#elif defined(__loongarch__)
+#define CM_MFENCE \
+ {}
#else
#define CM_MFENCE \
{ \
--
2.40.1

80
01-boundcheck.patch
View File

@ -1,80 +0,0 @@
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/CMakeLists.txt DCF-5.0.1-edit/CMakeLists.txt
*** DCF-5.0.1/CMakeLists.txt 2024-05-07 17:22:01.091857616 +0800
--- DCF-5.0.1-edit/CMakeLists.txt 2024-05-07 17:20:19.623110156 +0800
***************
*** 10,16 ****
set(CJSON_PATH "${DCF_LIBRARY}/cJSON/lib")
set(VERSION_SRC ${PROJECT_SOURCE_DIR}/src/dcf_version.c)
! set(vpp_libsecurec "securec")
set(CMAKE_INSTALL_PREFIX $ENV{dcf_install_prefix})
--- 10,16 ----
set(CJSON_PATH "${DCF_LIBRARY}/cJSON/lib")
set(VERSION_SRC ${PROJECT_SOURCE_DIR}/src/dcf_version.c)
! set(vpp_libsecurec "boundscheck")
set(CMAKE_INSTALL_PREFIX $ENV{dcf_install_prefix})
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/src/dcf_interface.c DCF-5.0.1-edit/src/dcf_interface.c
*** DCF-5.0.1/src/dcf_interface.c 2024-05-07 17:22:01.099857675 +0800
--- DCF-5.0.1-edit/src/dcf_interface.c 2024-05-07 17:20:19.631110215 +0800
***************
*** 39,45 ****
#include "elc_status_check.h"
#include "util_perf_stat.h"
#include "cm_ip.h"
! #include "cJSON.h"
#include "util_profile_stat.h"
#include "stream.h"
#include "cb_func.h"
--- 39,45 ----
#include "elc_status_check.h"
#include "util_perf_stat.h"
#include "cm_ip.h"
! #include "cjson/cJSON.h"
#include "util_profile_stat.h"
#include "stream.h"
#include "cb_func.h"
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/src/metadata/metadata.c DCF-5.0.1-edit/src/metadata/metadata.c
*** DCF-5.0.1/src/metadata/metadata.c 2024-05-07 17:22:01.103857704 +0800
--- DCF-5.0.1-edit/src/metadata/metadata.c 2024-05-07 17:20:19.635110245 +0800
***************
*** 32,38 ****
#include "md_stream.h"
#include "md_param.h"
#include "md_store.h"
! #include "cJSON.h"
#ifdef __cplusplus
extern "C" {
--- 32,38 ----
#include "md_stream.h"
#include "md_param.h"
#include "md_store.h"
! #include "cjson/cJSON.h"
#ifdef __cplusplus
extern "C" {
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-5.0.1/src/utils/util_profile_stat.h DCF-5.0.1-edit/src/utils/util_profile_stat.h
*** DCF-5.0.1/src/utils/util_profile_stat.h 2024-05-07 17:22:01.107857734 +0800
--- DCF-5.0.1-edit/src/utils/util_profile_stat.h 2024-05-07 17:20:19.639110274 +0800
***************
*** 37,43 ****
#include "cm_num.h"
#include "cm_latch.h"
#include "cm_file.h"
! #include "cJSON.h"
#define DEFAULT_STAT_INTERVAL 3
#define MAX_ITEM_COUNT 100
--- 37,43 ----
#include "cm_num.h"
#include "cm_latch.h"
#include "cm_file.h"
! #include "cjson/cJSON.h"
#define DEFAULT_STAT_INTERVAL 3
#define MAX_ITEM_COUNT 100

76
DCF-1.0.0-sw.patch
View File

@ -1,76 +0,0 @@
diff -Nuar DCF-1.0.0.org/CMakeLists.txt DCF-1.0.0.sw/CMakeLists.txt
--- DCF-1.0.0.org/CMakeLists.txt 2022-06-13 11:22:02.120000000 +0000
+++ DCF-1.0.0.sw/CMakeLists.txt 2022-06-13 11:22:51.510000000 +0000
@@ -89,7 +89,7 @@
add_compile_options(-mtune=cortex-a72 -fsigned-char -g -ggdb3 -march=armv8-a+crc -funwind-tables)
else ()
- add_compile_options(-msse4.2 )
+ add_compile_options( )
endif ()
Add_Definitions(-DWSEC_COMPILE_CAC_OPENSSL -DWSEC_AES_GCM_SUPPORT -DWSEC_USE_OPENSSL_110)
else ()
@@ -106,4 +106,4 @@
OPTION(TEST "option for test module" ON)
if (TEST)
add_subdirectory(test)
-endif()
\ No newline at end of file
+endif()
diff -Nuar DCF-1.0.0.org/src/common/cm_concurrency/cm_spinlock.h DCF-1.0.0.sw/src/common/cm_concurrency/cm_spinlock.h
--- DCF-1.0.0.org/src/common/cm_concurrency/cm_spinlock.h 2022-06-13 11:22:02.090000000 +0000
+++ DCF-1.0.0.sw/src/common/cm_concurrency/cm_spinlock.h 2022-06-13 16:12:03.530000000 +0000
@@ -68,6 +68,9 @@
{ \
__asm__ volatile("nop"); \
}
+#elif defined(__sw_64__)
+#define fas_cpu_pause() \
+ {}
#else
#define fas_cpu_pause() \
{ \
diff -Nuar DCF-1.0.0.org/src/common/cm_concurrency/cm_thread.c DCF-1.0.0.sw/src/common/cm_concurrency/cm_thread.c
--- DCF-1.0.0.org/src/common/cm_concurrency/cm_thread.c 2022-06-13 11:22:02.100000000 +0000
+++ DCF-1.0.0.sw/src/common/cm_concurrency/cm_thread.c 2022-06-13 16:39:23.220000000 +0000
@@ -296,6 +296,8 @@
#define __SYS_GET_SPID 186
#elif (defined __aarch64__)
#define __SYS_GET_SPID 178
+#elif (defined __sw_64__)
+#define __SYS_GET_SPID 378
#endif
#define gettid() syscall(__SYS_GET_SPID)
diff -Nuar DCF-1.0.0.org/src/common/cm_utils/cm_checksum.h DCF-1.0.0.sw/src/common/cm_utils/cm_checksum.h
--- DCF-1.0.0.org/src/common/cm_utils/cm_checksum.h 2022-06-13 11:22:02.100000000 +0000
+++ DCF-1.0.0.sw/src/common/cm_utils/cm_checksum.h 2022-06-13 16:33:54.130000000 +0000
@@ -26,7 +26,7 @@
#include "cm_defs.h"
-#if defined(__arm__) || defined(__aarch64__)
+#if defined(__arm__) || defined(__aarch64__) || defined(__sw_64__)
#ifdef __has_include
#if __has_include(<arm_acle.h>)
#include <arm_acle.h>
diff -Nuar DCF-1.0.0.org/src/common/cm_utils/cm_memory.h DCF-1.0.0.sw/src/common/cm_utils/cm_memory.h
--- DCF-1.0.0.org/src/common/cm_utils/cm_memory.h 2022-06-13 11:22:02.100000000 +0000
+++ DCF-1.0.0.sw/src/common/cm_utils/cm_memory.h 2022-06-13 16:10:02.430000000 +0000
@@ -50,12 +50,15 @@
__asm {mfence } \
}
#endif
-#elif defined(__arm__) || defined(__aarch64__)
+#elif defined(__arm__) || defined(__aarch64__)
#define CM_MFENCE \
{ \
__asm__ volatile("dmb ish" :: \
: "memory"); \
}
+#elif defined(__sw_64__)
+#define CM_MFENCE \
+ {}
#else
#define CM_MFENCE \
{ \

BIN
DCF-5.0.1.tar.gz
View File

Binary file not shown.

74
DCF-6.0.0-add-riscv64-support.patch Normal file
View File

@ -0,0 +1,74 @@
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/CMakeLists.txt DCF-6.0.0-edit/CMakeLists.txt
*** DCF-6.0.0/CMakeLists.txt 2024-11-02 17:04:54.937886579 +0800
--- DCF-6.0.0-edit/CMakeLists.txt 2024-11-02 17:04:05.634252331 +0800
***************
*** 84,89 ****
--- 84,91 ----
add_compile_options(-mtune=cortex-a72 -fsigned-char -g -ggdb3 -march=armv8-a+crc -funwind-tables)
elseif (OS_ARCH STREQUAL "x86_64")
add_compile_options(-msse4.2 )
+ else ()
+ add_compile_options()
endif ()
Add_Definitions(-DWSEC_COMPILE_CAC_OPENSSL -DWSEC_AES_GCM_SUPPORT -DWSEC_USE_OPENSSL_110)
else ()
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_concurrency/cm_spinlock.h DCF-6.0.0-edit/src/common/cm_concurrency/cm_spinlock.h
*** DCF-6.0.0/src/common/cm_concurrency/cm_spinlock.h 2024-11-02 17:38:45.539451623 +0800
--- DCF-6.0.0-edit/src/common/cm_concurrency/cm_spinlock.h 2024-11-02 17:37:19.778567408 +0800
***************
*** 63,69 ****
uint64 fails;
} spin_statis_t;
! #if defined(__arm__) || defined(__aarch64__) || defined(__loongarch__)
#define fas_cpu_pause() \
{ \
__asm__ volatile("nop"); \
--- 63,69 ----
uint64 fails;
} spin_statis_t;
! #if defined(__arm__) || defined(__aarch64__) || defined(__loongarch__) || defined(__riscv)
#define fas_cpu_pause() \
{ \
__asm__ volatile("nop"); \
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_concurrency/cm_thread.c DCF-6.0.0-edit/src/common/cm_concurrency/cm_thread.c
*** DCF-6.0.0/src/common/cm_concurrency/cm_thread.c 2024-11-02 17:38:45.539451623 +0800
--- DCF-6.0.0-edit/src/common/cm_concurrency/cm_thread.c 2024-11-02 17:37:19.779567360 +0800
***************
*** 296,302 ****
#define __SYS_GET_SPID 186
#elif (defined __aarch64__)
#define __SYS_GET_SPID 178
! #elif (defined __loongarch__)
#include<sys/syscall.h>
#define __SYS_GET_SPID SYS_gettid
#endif
--- 296,302 ----
#define __SYS_GET_SPID 186
#elif (defined __aarch64__)
#define __SYS_GET_SPID 178
! #elif (defined __loongarch__) || (defined __riscv)
#include<sys/syscall.h>
#define __SYS_GET_SPID SYS_gettid
#endif
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_utils/cm_memory.h DCF-6.0.0-edit/src/common/cm_utils/cm_memory.h
*** DCF-6.0.0/src/common/cm_utils/cm_memory.h 2024-11-02 17:38:45.539451623 +0800
--- DCF-6.0.0-edit/src/common/cm_utils/cm_memory.h 2024-11-02 17:37:19.781567264 +0800
***************
*** 62,68 ****
__asm__ volatile("mfence" :: \
: "memory"); \
}
! #elif defined(__loongarch__)
#define CM_MFENCE \
{ \
__asm__ volatile("" :: \
--- 62,68 ----
__asm__ volatile("mfence" :: \
: "memory"); \
}
! #elif defined(__loongarch__) || defined(__riscv)
#define CM_MFENCE \
{ \
__asm__ volatile("" :: \

78
DCF-6.0.0-sw.patch Normal file
View File

@ -0,0 +1,78 @@
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/CMakeLists.txt DCF-6.0.0-edit/CMakeLists.txt
*** DCF-6.0.0/CMakeLists.txt 2024-11-02 17:04:54.937886579 +0800
--- DCF-6.0.0-edit/CMakeLists.txt 2024-11-02 17:04:05.634252331 +0800
***************
*** 84,89 ****
--- 84,91 ----
add_compile_options(-mtune=cortex-a72 -fsigned-char -g -ggdb3 -march=armv8-a+crc -funwind-tables)
elseif (OS_ARCH STREQUAL "x86_64")
add_compile_options(-msse4.2 )
+ else ()
+ add_compile_options()
endif ()
Add_Definitions(-DWSEC_COMPILE_CAC_OPENSSL -DWSEC_AES_GCM_SUPPORT -DWSEC_USE_OPENSSL_110)
else ()
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_concurrency/cm_spinlock.h DCF-6.0.0-edit/src/common/cm_concurrency/cm_spinlock.h
*** DCF-6.0.0/src/common/cm_concurrency/cm_spinlock.h 2024-11-02 17:04:54.937886579 +0800
--- DCF-6.0.0-edit/src/common/cm_concurrency/cm_spinlock.h 2024-11-02 17:04:32.631956892 +0800
***************
*** 68,73 ****
--- 68,76 ----
{ \
__asm__ volatile("nop"); \
}
+ #elif defined(__sw_64__)
+ #define fas_cpu_pause() \
+ {}
#else
#define fas_cpu_pause() \
{ \
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_concurrency/cm_thread.c DCF-6.0.0-edit/src/common/cm_concurrency/cm_thread.c
*** DCF-6.0.0/src/common/cm_concurrency/cm_thread.c 2024-11-02 17:04:54.937886579 +0800
--- DCF-6.0.0-edit/src/common/cm_concurrency/cm_thread.c 2024-11-02 17:04:32.631956892 +0800
***************
*** 296,301 ****
--- 296,303 ----
#define __SYS_GET_SPID 186
#elif (defined __aarch64__)
#define __SYS_GET_SPID 178
+ #elif (defined __sw_64__)
+ #define __SYS_GET_SPID 378
#elif (defined __loongarch__)
#include<sys/syscall.h>
#define __SYS_GET_SPID SYS_gettid
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_utils/cm_checksum.h DCF-6.0.0-edit/src/common/cm_utils/cm_checksum.h
*** DCF-6.0.0/src/common/cm_utils/cm_checksum.h 2024-11-02 17:04:54.937886579 +0800
--- DCF-6.0.0-edit/src/common/cm_utils/cm_checksum.h 2024-11-02 17:04:05.637252187 +0800
***************
*** 26,32 ****
#include "cm_defs.h"
! #if defined(__arm__) || defined(__aarch64__)
#ifdef __has_include
#if __has_include(<arm_acle.h>)
#include <arm_acle.h>
--- 26,32 ----
#include "cm_defs.h"
! #if defined(__arm__) || defined(__aarch64__) || defined(__sw_64__)
#ifdef __has_include
#if __has_include(<arm_acle.h>)
#include <arm_acle.h>
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' DCF-6.0.0/src/common/cm_utils/cm_memory.h DCF-6.0.0-edit/src/common/cm_utils/cm_memory.h
*** DCF-6.0.0/src/common/cm_utils/cm_memory.h 2024-11-02 17:04:54.937886579 +0800
--- DCF-6.0.0-edit/src/common/cm_utils/cm_memory.h 2024-11-02 17:04:32.631956892 +0800
***************
*** 56,61 ****
--- 56,64 ----
__asm__ volatile("dmb ish" :: \
: "memory"); \
}
+ #elif defined(__sw_64__)
+ #define CM_MFENCE \
+ {}
#elif defined(__i386__) || defined(__x86_64__)
#define CM_MFENCE \
{ \

BIN
DCF-6.0.0.tar.gz Normal file
View File

Binary file not shown.

24
opengauss-dcf.spec
View File

@ -1,16 +1,15 @@
Name: DCF
Version: 5.0.1
Release: 7
Version: 6.0.0
Release: 9
Summary: A distributed consensus framework library
License: MulanPSL-2.0
URL: https://gitee.com/opengauss/DCF
Source0: %{name}-%{version}.tar.gz
Patch1: 01-boundcheck.patch
Patch2: DCF-1.0.0-sw.patch
Patch3: 0001-add-loongarch64-support.patch
Patch1: DCF-6.0.0-sw.patch
Patch2: DCF-6.0.0-add-riscv64-support.patch
BuildRequires: cmake gcc gcc-c++ lz4-devel openssl-devel zstd-devel libboundscheck cjson-devel
BuildRequires: tar cmake gcc gcc-c++ lz4-devel openssl-devel zstd-devel libboundscheck cjson-devel
%description
@ -19,12 +18,11 @@ DCF is A distributed consensus framework library for openGauss
%prep
%setup -q
%patch1 -p1
%ifarch sw_64
%patch2 -p1
%patch -P1 -p1
%endif
%ifarch loongarch64
%patch3 -p1
%ifarch riscv64
%patch -P2 -p1
%endif
%build
@ -48,6 +46,12 @@ cp output/lib/libdcf.* %{buildroot}/%{_libdir}
%{_libdir}/libdcf.so
%changelog
* Sat Nov 2 2024 liuheng <liuheng76@huawei.com> - 6.0.0-9
- Update version to 6.0.0
* Mon Oct 28 2024 Funda Wang <fundawang@yeah.net> - 5.0.1-8
- adopt to cmake macro change
* Mon May 6 2024 liuheng <liuheng76@huawei.com> - 5.0.1-7
- Update version to 5.0.1