Merge e659332 into 8c87dbc

dist/threads-shared/shared.xs

@@ -1290,6 +1290,21 @@ S_shared_signal_hook(pTHX) {
 }
 #endif
 
+#ifdef noshutdownhook
+
+static shutdown_proc_t old_shutdownhook;
+
+static void
+shared_shutdown() {
+    PerlInterpreter* my_perl;
+    SHARED_CONTEXT;
+    perl_destruct(PL_sharedsv_space);
+    perl_free(PL_sharedsv_space);
+    PL_sharedsv_space = NULL;
+    old_shutdownhook();
+}
+#endif
+
 /* Saves a space for keeping SVs wider than an interpreter. */
 
 static void
@@ -1305,6 +1320,12 @@ Perl_sharedsv_init(pTHX)
         LEAVE; /* This balances the ENTER at the end of perl_construct.  */
         PERL_SET_CONTEXT((aTHX = caller_perl));
         recursive_lock_init(aTHX_ &PL_sharedsv_lock);
+#ifdef noshutdownhook
+		OP_CHECK_MUTEX_LOCK;
+        old_shutdownhook = PL_shutdownhook;
+        PL_shutdownhook = &shared_shutdown;
+		OP_CHECK_MUTEX_UNLOCK;
+#endif
     }
     PL_lockhook = &Perl_sharedsv_locksv;
     PL_sharehook = &Perl_sharedsv_share;

dosish.h

@@ -49,7 +49,7 @@
 
 #ifndef PERL_SYS_TERM_BODY
 #  define PERL_SYS_TERM_BODY()                         \
-    HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM;      \
+    SHUTDOWN_TERM; HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM;      \
     OP_CHECK_MUTEX_TERM; OP_REFCNT_TERM; PERLIO_TERM;  \
     MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM;    \
     ENV_TERM;

embed.fnc

@@ -2824,6 +2824,7 @@ AdpbD	|void	|sv_nolocking	|NULLOK SV *sv
 Adp	|bool	|sv_destroyable	|NULLOK SV *sv
 AdpbD	|void	|sv_nounlocking	|NULLOK SV *sv
 Adp	|int	|nothreadhook
+AdpTG	|void	|noshutdownhook
 p	|void	|init_constants
 
 #if defined(PERL_IN_DOOP_C)

embed.h

@@ -407,6 +407,7 @@
 #define newXS_flags(a,b,c,d,e)	Perl_newXS_flags(aTHX_ a,b,c,d,e)
 #define new_stackinfo(a,b)	Perl_new_stackinfo(aTHX_ a,b)
 #define new_version(a)		Perl_new_version(aTHX_ a)
+#define noshutdownhook		Perl_noshutdownhook
 #define nothreadhook()		Perl_nothreadhook(aTHX)
 #define op_append_elem(a,b,c)	Perl_op_append_elem(aTHX_ a,b,c)
 #define op_append_list(a,b,c)	Perl_op_append_list(aTHX_ a,b,c)

perl.c

@@ -447,6 +447,19 @@ Perl_nothreadhook(pTHX)
     return 0;
 }
 
+/*
+=for apidoc noshutdownhook
+
+Stub that provides shutdown hook.
+
+=cut
+*/
+
+void
+Perl_noshutdownhook()
+{
+}
+
 #ifdef DEBUG_LEAKING_SCALARS_FORK_DUMP
 void
 Perl_dump_sv_child(pTHX_ SV *sv)

perl.h

@@ -3221,6 +3221,8 @@ freeing any remaining Perl interpreters.
 #define PERL_SYS_INIT3(argc, argv, env)	Perl_sys_init3(argc, argv, env)
 #define PERL_SYS_TERM()			Perl_sys_term()
 
+#define SHUTDOWN_TERM PL_shutdownhook();
+
 #ifndef PERL_WRITE_MSG_TO_CONSOLE
 #  define PERL_WRITE_MSG_TO_CONSOLE(io, msg, len) PerlIO_write(io, msg, len)
 #endif
@@ -4900,6 +4902,7 @@ typedef int  (*thrhook_proc_t) (pTHX);
 typedef OP* (*PPADDR_t[]) (pTHX);
 typedef bool (*destroyable_proc_t) (pTHX_ SV *sv);
 typedef void (*despatch_signals_proc_t) (pTHX);
+typedef void (*shutdown_proc_t)();
 
 #if defined(__DYNAMIC__) && defined(PERL_DARWIN) && defined(PERL_CORE)
 #  include <crt_externs.h>	/* for the env array */

perlvars.h

@@ -290,6 +290,8 @@ PERLVAR(G, user_prop_mutex, perl_mutex)    /* Mutex for manipulating
                                               PL_user_defined_properties */
 #endif
 
+PERLVARI(G, shutdownhook, shutdown_proc_t, &Perl_noshutdownhook);
+
 /* these record the best way to perform certain IO operations while
  * atomically setting FD_CLOEXEC. On the first call, a probe is done
  * and the result recorded for use by subsequent calls.

proto.h

@@ -2597,6 +2597,7 @@ PERL_CALLCONV_NO_RET void	Perl_noperl_die(const char* pat, ...)
 #define PERL_ARGS_ASSERT_NOPERL_DIE	\
 	assert(pat)
 
+PERL_CALLCONV void	Perl_noshutdownhook(void);
 PERL_CALLCONV int	Perl_nothreadhook(pTHX);
 #define PERL_ARGS_ASSERT_NOTHREADHOOK
 PERL_CALLCONV void	Perl_notify_parser_that_changed_to_utf8(pTHX);

unixish.h

@@ -153,6 +153,7 @@ int afstat(int fd, struct stat *statb);
 
 #ifndef PERL_SYS_TERM_BODY
 #  define PERL_SYS_TERM_BODY()                         \
+    SHUTDOWN_TERM;                                     \
     HINTS_REFCNT_TERM; KEYWORD_PLUGIN_MUTEX_TERM;      \
     OP_CHECK_MUTEX_TERM; OP_REFCNT_TERM; PERLIO_TERM;  \
     MALLOC_TERM; LOCALE_TERM; USER_PROP_MUTEX_TERM;    \

vms/vmsish.h

@@ -309,7 +309,7 @@ struct interp_intern {
 
 #define BIT_BUCKET "/dev/null"
 #define PERL_SYS_INIT_BODY(c,v)	MALLOC_CHECK_TAINT2(*c,*v) vms_image_init((c),(v)); PERLIO_INIT; MALLOC_INIT
-#define PERL_SYS_TERM_BODY()    HINTS_REFCNT_TERM; OP_REFCNT_TERM;      \
+#define PERL_SYS_TERM_BODY()    SHUTDOWN_TERM; HINTS_REFCNT_TERM; OP_REFCNT_TERM;      \
                                 PERLIO_TERM; MALLOC_TERM; LOCALE_TERM;  \
                                 ENV_TERM;
 #define dXSUB_SYS dNOOP

win32/win32.c

@@ -5036,6 +5036,7 @@ Perl_win32_init(int *argcp, char ***argvp)
 void
 Perl_win32_term(void)
 {
+    SHUTDOWN_TERM;
     HINTS_REFCNT_TERM;
     OP_REFCNT_TERM;
     PERLIO_TERM;