From 06dbee797862e964d43c12762b3d96be3ac40a84 Mon Sep 17 00:00:00 2001 From: chenxiaobin19 <1025221611@qq.com> Date: Tue, 5 Mar 2024 20:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3CalculateContextSize=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=AD=A3=E7=A1=AE=E7=9A=84=E7=BB=93=E6=9E=84=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gausskernel/runtime/executor/instrument.cpp | 4 ++++ src/include/storage/ipc.h | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gausskernel/runtime/executor/instrument.cpp b/src/gausskernel/runtime/executor/instrument.cpp index b36da82b7..a30b80bcf 100644 --- a/src/gausskernel/runtime/executor/instrument.cpp +++ b/src/gausskernel/runtime/executor/instrument.cpp @@ -434,7 +434,11 @@ void SetInstrNull() void CalculateContextSize(MemoryContext ctx, int64* memory_size) { +#ifndef ENABLE_MEMORY_CHECK AllocSetContext* aset = (AllocSetContext*)ctx; +#else + AsanSetContext* aset = (AsanSetContext*)ctx; +#endif MemoryContext child; if (ctx == NULL) diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h index fd6185279..e3343e18f 100644 --- a/src/include/storage/ipc.h +++ b/src/include/storage/ipc.h @@ -75,7 +75,6 @@ extern void shmem_exit(int code); extern void on_proc_exit(pg_on_exit_callback function, Datum arg); extern void before_shmem_exit(pg_on_exit_callback function, Datum arg); extern void on_shmem_exit(pg_on_exit_callback function, Datum arg); -extern void before_shmem_exit(pg_on_exit_callback function, Datum arg); extern void cancel_shmem_exit(pg_on_exit_callback function, Datum arg); extern void on_exit_reset(void);