diff --git a/src/backend/postmaster/launch_backend.c b/src/backend/postmaster/launch_backend.c index d6c63896a65..bdf490c31d0 100644 --- a/src/backend/postmaster/launch_backend.c +++ b/src/backend/postmaster/launch_backend.c @@ -63,6 +63,7 @@ #include "utils/builtins.h" #include "utils/datetime.h" #include "utils/guc.h" +#include "utils/injection_point.h" #include "utils/memutils.h" #include "utils/timestamp.h" @@ -104,6 +105,9 @@ typedef struct void *UsedShmemSegAddr; slock_t *ShmemLock; struct bkend *ShmemBackendArray; +#ifdef USE_INJECTION_POINTS + struct InjectionPointsCtl *ActiveInjectionPoints; +#endif #ifndef HAVE_SPINLOCKS PGSemaphore *SpinlockSemaArray; #endif @@ -722,6 +726,10 @@ save_backend_variables(BackendParameters *param, ClientSocket *client_sock, param->ShmemLock = ShmemLock; param->ShmemBackendArray = ShmemBackendArray; +#ifdef USE_INJECTION_POINTS + param->ActiveInjectionPoints = ActiveInjectionPoints; +#endif + #ifndef HAVE_SPINLOCKS param->SpinlockSemaArray = SpinlockSemaArray; #endif @@ -981,6 +989,10 @@ restore_backend_variables(BackendParameters *param) ShmemLock = param->ShmemLock; ShmemBackendArray = param->ShmemBackendArray; +#ifdef USE_INJECTION_POINTS + ActiveInjectionPoints = param->ActiveInjectionPoints; +#endif + #ifndef HAVE_SPINLOCKS SpinlockSemaArray = param->SpinlockSemaArray; #endif diff --git a/src/backend/utils/misc/injection_point.c b/src/backend/utils/misc/injection_point.c index 3c63a8ace86..ab327779902 100644 --- a/src/backend/utils/misc/injection_point.c +++ b/src/backend/utils/misc/injection_point.c @@ -85,7 +85,7 @@ typedef struct InjectionPointsCtl InjectionPointEntry entries[MAX_INJECTION_POINTS]; } InjectionPointsCtl; -static InjectionPointsCtl *ActiveInjectionPoints; +NON_EXEC_STATIC InjectionPointsCtl *ActiveInjectionPoints; /* * Backend local cache of injection callbacks already loaded, stored in diff --git a/src/include/utils/injection_point.h b/src/include/utils/injection_point.h index a61d5d44391..6e417cedc60 100644 --- a/src/include/utils/injection_point.h +++ b/src/include/utils/injection_point.h @@ -37,4 +37,8 @@ extern void InjectionPointAttach(const char *name, extern void InjectionPointRun(const char *name); extern bool InjectionPointDetach(const char *name); +#ifdef EXEC_BACKEND +extern PGDLLIMPORT struct InjectionPointsCtl *ActiveInjectionPoints; +#endif + #endif /* INJECTION_POINT_H */