Delay destruction of reference return values till the current statement end

[perl/modules/Variable-Magic.git] / Magic.xs

diff --git a/Magic.xs b/Magic.xs
index f3ed0d6775754f061744351420ca66de67445011..b810d91f9db40a63c90e9a75711a8861a809967f 100644 (file)
--- a/Magic.xs
+++ b/Magic.xs
@@ -62,7 +62,9 @@
 #endif
 
 #if VMG_MULTIPLICITY && defined(USE_ITHREADS) && defined(dMY_CXT) && defined(MY_CXT) && defined(START_MY_CXT) && defined(MY_CXT_INIT) && (defined(MY_CXT_CLONE) || defined(dMY_CXT_SV))
-# define VMG_THREADSAFE 1
+# ifndef VMG_THREADSAFE
+#  define VMG_THREADSAFE 1
+# endif
 # ifndef MY_CXT_CLONE
 #  define MY_CXT_CLONE \
     dMY_CXT_SV;                                                      \
@@ -71,6 +73,7 @@
     sv_setuv(my_cxt_sv, PTR2UV(my_cxtp))
 # endif
 #else
+# undef  VMG_THREADSAFE
 # define VMG_THREADSAFE 0
 # undef  dMY_CXT
 # define dMY_CXT      dNOOP
@@ -1243,11 +1246,18 @@ static int vmg_cb_call(pTHX_ SV *cb, unsigned int flags, SV *sv, ...) {
  svr = POPs;
  if (SvOK(svr))
   ret = (int) SvIV(svr);
+ if (SvROK(svr))
+  SvREFCNT_inc(svr);
+ else
+  svr = NULL;
  PUTBACK;
 
  FREETMPS;
  LEAVE;
 
+ if (svr && !SvTEMP(svr))
+  sv_2mortal(svr);
+
  if (chain) {
   vmg_dispell_guard_new(*chain);
   *chain = NULL;
@@ -1766,13 +1776,15 @@ static void vmg_global_teardown_late_locked(pTHX) {
  MUTEX_DESTROY(&vmg_op_name_init_mutex);
  MUTEX_DESTROY(&vmg_vtable_refcount_mutex);
 
- vmg_loaded = 0;
-
  return;
 }
 
 static int vmg_global_teardown_free(pTHX_ SV *sv, MAGIC *mg) {
- vmg_global_teardown_late_locked();
+ VMG_LOADED_LOCK;
+
+ if (vmg_loaded == 0)
+  vmg_global_teardown_late_locked();
+
  VMG_LOADED_UNLOCK;
 
  return 0;
@@ -1834,32 +1846,27 @@ static signed char vmg_destruct_level(pTHX) {
 
 #endif /* VMG_THREADSAFE */
 
-static void vmg_teardown(pTHX_ void *interp) {
+static void vmg_teardown(pTHX_ void *param) {
  dMY_CXT;
 
-#if VMG_MULTIPLICITY
- if (aTHX != interp)
-  return;
-#endif
-
 #if VMG_THREADSAFE
  VMG_LOADED_LOCK;
 
- if (vmg_loaded <= 1) {
-  assert(vmg_loaded == 1);
+ if (vmg_loaded == 1) {
+  vmg_loaded = 0;
   if (vmg_destruct_level() == 0) {
    vmg_global_teardown_late_locked();
-   VMG_LOADED_UNLOCK;
   } else {
    if (!PL_strtab)
     PL_strtab = newHV();
    vmg_sv_magicext((SV *) PL_strtab, NULL, &vmg_global_teardown_vtbl, NULL, 0);
-   /* Lock until vmg_global_teardown_free() is called */
   }
  } else {
+  assert(vmg_loaded > 1);
   --vmg_loaded;
-  VMG_LOADED_UNLOCK;
  }
+
+ VMG_LOADED_UNLOCK;
 #endif
 
  if (MY_CXT.depth == 0 && MY_CXT.freed_tokens) {
@@ -1879,12 +1886,14 @@ static void vmg_setup(pTHX) {
 #if VMG_THREADSAFE
  VMG_LOADED_LOCK;
 
- if (vmg_loaded <= 0) {
-  assert(vmg_loaded == 0);
+ if (vmg_loaded == 0) {
   MUTEX_INIT(&vmg_vtable_refcount_mutex);
   MUTEX_INIT(&vmg_op_name_init_mutex);
+  vmg_loaded = 1;
+ } else {
+  assert(vmg_loaded > 0);
+  ++vmg_loaded;
  }
- ++vmg_loaded;
 
  VMG_LOADED_UNLOCK;
 #endif
@@ -1930,11 +1939,7 @@ static void vmg_setup(pTHX) {
  newCONSTSUB(stash, "VMG_OP_INFO_NAME",    newSVuv(VMG_OP_INFO_NAME));
  newCONSTSUB(stash, "VMG_OP_INFO_OBJECT",  newSVuv(VMG_OP_INFO_OBJECT));
 
-#if VMG_MULTIPLICITY
- call_atexit(vmg_teardown, aTHX);
-#else
  call_atexit(vmg_teardown, NULL);
-#endif
 
  return;
 }