database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-07 19:06:32 +03:00
Code Activity

Move resowner from common JitContext to LLVM specific

Browse Source 
Only the LLVM specific code uses it since resource owners were made
extensible in commit b8bff07daa. This is
new in v17, so backpatch there to keep the branches from diverging
just yet.

Author: Andreas Karlsson <andreas@proxel.se>
Discussion: https://www.postgresql.org/message-id/fd3a2a00-6605-4e30-a118-48418b478e6e@proxel.se
This commit is contained in:
Heikki Linnakangas
2024-07-19 10:27:06 +03:00
parent 935fe79ea1
commit b0a8a7ddd3
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/jit/llvm/llvmjit.c
View File

@@ -249,7 +249,7 @@ llvm_create_context(int jitFlags)
context->base.flags = jitFlags; context->base.flags = jitFlags;
/* ensure cleanup */ /* ensure cleanup */
context->base.resowner = CurrentResourceOwner; context->resowner = CurrentResourceOwner;
ResourceOwnerRememberJIT(CurrentResourceOwner, context); ResourceOwnerRememberJIT(CurrentResourceOwner, context);
llvm_jit_context_in_use_count++; llvm_jit_context_in_use_count++;
@@ -323,8 +323,8 @@ llvm_release_context(JitContext *context)
llvm_leave_fatal_on_oom(); llvm_leave_fatal_on_oom();
if (context->resowner) if (llvm_jit_context->resowner)
ResourceOwnerForgetJIT(context->resowner, llvm_jit_context); ResourceOwnerForgetJIT(llvm_jit_context->resowner, llvm_jit_context);
} }
/* /*
@@ -1372,8 +1372,8 @@ llvm_error_message(LLVMErrorRef error)
static void static void
ResOwnerReleaseJitContext(Datum res) ResOwnerReleaseJitContext(Datum res)
{ {
JitContext *context = (JitContext *) DatumGetPointer(res); LLVMJitContext *context = (LLVMJitContext *) DatumGetPointer(res);
context->resowner = NULL; context->resowner = NULL;
jit_release_context(context); jit_release_context(&context->base);
} }

2
src/include/jit/jit.h
View File

@@ -59,8 +59,6 @@ typedef struct JitContext
/* see PGJIT_* above */ /* see PGJIT_* above */
int flags; int flags;
ResourceOwner resowner;
JitInstrumentation instr; JitInstrumentation instr;
} JitContext; } JitContext;

3
src/include/jit/llvmjit.h
View File

@@ -39,6 +39,9 @@ typedef struct LLVMJitContext
{ {
JitContext base; JitContext base;
/* used to ensure cleanup of context */
ResourceOwner resowner;
/* number of modules created */ /* number of modules created */
size_t module_generation; size_t module_generation;