# define MY_CXT_CLONE NOOP
#endif
+#if I_THREADSAFE
+/* We must use preexistent global mutexes or we will never be able to destroy
+ * them. */
+# if I_HAS_PERL(5, 9, 3)
+# define I_LOADED_LOCK MUTEX_LOCK(&PL_my_ctx_mutex)
+# define I_LOADED_UNLOCK MUTEX_UNLOCK(&PL_my_ctx_mutex)
+# else
+# define I_LOADED_LOCK OP_REFCNT_LOCK
+# define I_LOADED_UNLOCK OP_REFCNT_UNLOCK
+# endif
+#else
+# define I_LOADED_LOCK NOOP
+# define I_LOADED_UNLOCK NOOP
+#endif
+
#if defined(OP_CHECK_MUTEX_LOCK) && defined(OP_CHECK_MUTEX_UNLOCK)
-# define I_CHECK_MUTEX_LOCK OP_CHECK_MUTEX_LOCK
-# define I_CHECK_MUTEX_UNLOCK OP_CHECK_MUTEX_UNLOCK
+# define I_CHECK_LOCK OP_CHECK_MUTEX_LOCK
+# define I_CHECK_UNLOCK OP_CHECK_MUTEX_UNLOCK
+#elif I_HAS_PERL(5, 9, 3)
+# define I_CHECK_LOCK OP_REFCNT_LOCK
+# define I_CHECK_UNLOCK OP_REFCNT_UNLOCK
#else
-# define I_CHECK_MUTEX_LOCK OP_REFCNT_LOCK
-# define I_CHECK_MUTEX_UNLOCK OP_REFCNT_UNLOCK
+/* Before perl 5.9.3, indirect_ck_*() calls are already protected by the
+ * I_LOADED mutex, which falls back to the OP_REFCNT mutex. Make sure we don't
+ * lock it twice. */
+# define I_CHECK_LOCK NOOP
+# define I_CHECK_UNLOCK NOOP
#endif
typedef OP *(*indirect_ck_t)(pTHX_ OP *);
static void indirect_ck_replace(pTHX_ OPCODE type, indirect_ck_t new_ck, indirect_ck_t *old_ck_p) {
#define indirect_ck_replace(T, NC, OCP) indirect_ck_replace(aTHX_ (T), (NC), (OCP))
- I_CHECK_MUTEX_LOCK;
+ I_CHECK_LOCK;
if (!*old_ck_p) {
*old_ck_p = PL_check[type];
PL_check[type] = new_ck;
}
- I_CHECK_MUTEX_UNLOCK;
+ I_CHECK_UNLOCK;
}
#endif
static void indirect_ck_restore(pTHX_ OPCODE type, indirect_ck_t *old_ck_p) {
#define indirect_ck_restore(T, OCP) indirect_ck_restore(aTHX_ (T), (OCP))
- I_CHECK_MUTEX_LOCK;
+ I_CHECK_LOCK;
if (*old_ck_p) {
PL_check[type] = *old_ck_p;
*old_ck_p = 0;
}
- I_CHECK_MUTEX_UNLOCK;
+ I_CHECK_UNLOCK;
}
/* --- Helpers ------------------------------------------------------------- */
/* ... Check if the module is loaded ....................................... */
-static U32 indirect_loaded = 0;
+static I32 indirect_loaded = 0;
#if I_THREADSAFE
static ptable *indirect_loaded_cxts = NULL;
-/* We must use preexistent global mutexes or we will never be able to destroy
- * them. */
-#if I_HAS_PERL(5, 9, 3)
-# define I_LOADED_LOCK MUTEX_LOCK(&PL_my_ctx_mutex)
-# define I_LOADED_UNLOCK MUTEX_UNLOCK(&PL_my_ctx_mutex)
-#else
-# define I_LOADED_LOCK OP_REFCNT_LOCK
-# define I_LOADED_UNLOCK OP_REFCNT_UNLOCK
-#endif
-
static int indirect_is_loaded(pTHX_ void *cxt) {
#define indirect_is_loaded(C) indirect_is_loaded(aTHX_ (C))
int res = 0;
int global_setup = 0;
if (indirect_loaded <= 0) {
+ assert(indirect_loaded == 0);
assert(!indirect_loaded_cxts);
indirect_loaded_cxts = ptable_new();
global_setup = 1;
ptable_loaded_delete(indirect_loaded_cxts, cxt);
--indirect_loaded;
} else if (indirect_loaded_cxts) {
+ assert(indirect_loaded == 1);
ptable_loaded_free(indirect_loaded_cxts);
indirect_loaded_cxts = NULL;
indirect_loaded = 0;
#else
-#define I_LOADED_LOCK NOOP
-#define I_LOADED_UNLOCK NOOP
-
#define indirect_is_loaded(C) (indirect_loaded > 0)
#define indirect_set_loaded_locked(C) ((indirect_loaded++ <= 0) ? 1 : 0)
#define indirect_clear_loaded_locked(C) ((--indirect_loaded <= 0) ? 1 : 0)
I_LOADED_UNLOCK;
+ SvREFCNT_dec(MY_CXT.global_code);
+ MY_CXT.global_code = NULL;
+
ptable_free(MY_CXT.map);
MY_CXT.map = NULL;
indirect_ck_replace(OP_LINESEQ, indirect_ck_scope, &indirect_old_ck_lineseq);
indirect_ck_replace(OP_METHOD, indirect_ck_method,
- &indirect_old_ck_method);
+ &indirect_old_ck_method);
indirect_ck_replace(OP_METHOD_NAMED, indirect_ck_method_named,
- &indirect_old_ck_method_named);
+ &indirect_old_ck_method_named);
indirect_ck_replace(OP_ENTERSUB, indirect_ck_entersub,
- &indirect_old_ck_entersub);
+ &indirect_old_ck_entersub);
}
I_LOADED_UNLOCK;