Update VPIT::XSHelpers to 18554226

diff --git a/MANIFEST b/MANIFEST
index 93b5d1f8a114c8ed393bd624a8185837a0cf4782..8885f4baeb47166555996e04ec36e3eefb5c907e 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -68,5 +68,6 @@ t/lib/Test/Leaner.pm
 t/lib/VPIT/TestHelpers.pm
 xsh/caps.h
 xsh/debug.h
+xsh/mem.h
 xsh/threads.h
 xsh/util.h

diff --git a/xsh/caps.h b/xsh/caps.h
index 4559524863696f5c51f32a9a99fd224a10818b90..6c0b9446e218f8f5f5ac40fddaef490faec09972 100644 (file)
--- a/xsh/caps.h
+++ b/xsh/caps.h
@@ -1,6 +1,10 @@
 #ifndef XSH_CAPS_H
 #define XSH_CAPS_H 1
 
+#ifdef __cplusplus
+# error C++ compilers are not supported
+#endif
+
 #define XSH_HAS_PERL(R, V, S) (PERL_REVISION > (R) || (PERL_REVISION == (R) && (PERL_VERSION > (V) || (PERL_VERSION == (V) && (PERL_SUBVERSION >= (S))))))
 
 #define XSH_HAS_PERL_BRANCH(R, V, S) (PERL_REVISION == (R) && PERL_VERSION == (V) && PERL_SUBVERSION >= (S))

diff --git a/xsh/mem.h b/xsh/mem.h
new file mode 100644 (file)
index 0000000..e1b90b3
--- /dev/null
+++ b/xsh/mem.h
@@ -0,0 +1,199 @@
+#ifndef XSH_MEM_H
+#define XSH_MEM_H 1
+
+#include "util.h" /* XSH_ASSERT() */
+
+#ifdef DEBUGGING
+# ifdef Poison
+#  define XSH_POISON(D, N, T)      Poison((D), (N), T)
+# endif
+# ifdef PoisonNew
+#  define XSH_POISON_NEW(D, N, T)  PoisonNew((D), (N), T)
+#  define XSH_HAS_POISON_NEW       1
+# endif
+# ifdef PoisonFree
+#  define XSH_POISON_FREE(D, N, T) PoisonFree((D), (N), T)
+#  define XSH_HAS_POISON_FREE      1
+# endif
+#endif
+
+#ifdef XSH_POISON
+# ifndef XSH_POISON_NEW
+#  define XSH_POISON_NEW(D, N, T)  XSH_POISON(D, N, T)
+#  define XSH_HAS_POISON_NEW       1
+# endif
+# ifndef XSH_POISON_FREE
+#  define XSH_POISON_FREE(D, N, T) XSH_POISON(D, N, T)
+#  define XSH_HAS_POISON_FREE      1
+# endif
+#endif
+
+#ifndef XSH_HAS_POISON_NEW
+# define XSH_HAS_POISON_NEW  0
+#endif
+#ifndef XSH_HAS_POISON_FREE
+# define XSH_HAS_POISON_FREE 0
+#endif
+
+/* --- Shared memory ------------------------------------------------------- */
+
+/* Context for PerlMemShared_*() functions */
+#ifdef PERL_IMPLICIT_SYS
+# define pPMS  pTHX
+# define pPMS_ pTHX_
+# define aPMS  aTHX
+# define aPMS_ aTHX_
+#else
+# define pPMS  void
+# define pPMS_
+# define aPMS
+# define aPMS_
+#endif
+
+/* ... xsh_shared_alloc() .................................................. */
+
+#if XSH_HAS_POISON_NEW
+
+static void *xsh_shared_alloc(pPMS_ size_t size) {
+#define xsh_shared_alloc(S) xsh_shared_alloc(aPMS_ (S))
+ void *p;
+
+ p = PerlMemShared_malloc(size);
+ XSH_ASSERT(p);
+
+ XSH_POISON_NEW(p, size, char);
+
+ return p;
+}
+
+#else  /*  XSH_HAS_POISON_NEW */
+
+#define xsh_shared_alloc(S) PerlMemShared_malloc(S)
+
+#endif /* !XSH_HAS_POISON_NEW */
+
+#define XSH_SHARED_ALLOC(D, N, T) ((D) = xsh_shared_alloc((N) * sizeof(T)))
+
+/* ... xsh_shared_calloc() ................................................. */
+
+#define xsh_shared_calloc(C, S) PerlMemShared_calloc((C), (S))
+
+#define XSH_SHARED_CALLOC(D, N, T) ((D) = xsh_shared_calloc((N), sizeof(T)))
+
+/* ... xsh_shared_free() ................................................... */
+
+#if XSH_HAS_POISON_FREE
+
+static void xsh_shared_free(pPMS_ void *p, size_t size) {
+#define xsh_shared_free(P, S) xsh_shared_free(aPMS_ (P), (S))
+ if (p)
+  XSH_POISON_FREE(p, size, char);
+
+ PerlMemShared_free(p);
+
+ return;
+}
+
+#else  /*  XSH_HAS_POISON_FREE */
+
+#define xsh_shared_free(P, S) PerlMemShared_free(P)
+
+#endif /* !XSH_HAS_POISON_FREE */
+
+#define XSH_SHARED_FREE(D, N, T) (xsh_shared_free((D), (N) * sizeof(T)), (D) = NULL)
+
+/* ... xsh_shared_realloc() ................................................ */
+
+#if XSH_HAS_POISON_NEW && XSH_HAS_POISON_FREE
+
+static void *xsh_shared_realloc(pPMS_ void *p, size_t old_size, size_t new_size) {
+#define xsh_shared_realloc(P, OS, NS) xsh_shared_realloc(aPMS_ (P), (OS), (NS))
+ void *q;
+
+ if (!p)
+  return xsh_shared_alloc(new_size);
+
+ if (!new_size) {
+  xsh_shared_free(p, old_size);
+  return xsh_shared_alloc(1);
+ }
+
+ if (new_size < old_size)
+  XSH_POISON_FREE(((char *) p) + new_size, old_size - new_size, char);
+
+ q = PerlMemShared_realloc(p, new_size);
+ XSH_ASSERT(q);
+
+ if (old_size < new_size)
+  XSH_POISON_NEW(((char *) q) + old_size, new_size - old_size, char);
+
+ return q;
+}
+
+#else  /*  XSH_HAS_POISON_NEW && XSH_HAS_POISON_FREE */
+
+#define xsh_shared_realloc(P, OS, NS) PerlMemShared_realloc((P), (NS))
+
+#endif /* !XSH_HAS_POISON_NEW || !XSH_HAS_POISON_FREE */
+
+#define XSH_SHARED_REALLOC(D, OL, NL, T) ((D) = xsh_shared_realloc((D), (OL) * sizeof(T), (NL) * sizeof(T)))
+
+/* ... xsh_shared_recalloc() ............................................... */
+
+static void *xsh_shared_recalloc(pPMS_ void *p, size_t old_size, size_t new_size) {
+#define xsh_shared_recalloc(P, OS, NS) xsh_shared_recalloc(aPMS_ (P), (OS), (NS))
+ void *q;
+
+#ifdef XSH_POISON_FREE
+ if (new_size < old_size)
+  XSH_POISON_FREE(((char *) p) + new_size, old_size - new_size, char);
+#endif /* XSH_POISON_FREE */
+
+ q = PerlMemShared_realloc(p, new_size);
+ XSH_ASSERT(q);
+
+ if (old_size < new_size)
+  Zero(((char *) q) + old_size, new_size - old_size, char);
+
+ return q;
+}
+
+#define XSH_SHARED_RECALLOC(D, OL, NL, T) ((D) = xsh_shared_recalloc((D), (OL) * sizeof(T), (NL) * sizeof(T)))
+
+/* --- Interpreter-local memory -------------------------------------------- */
+
+#ifndef Newx
+# define Newx(D, N, T) New(0, (D), (N), T)
+#endif
+
+#ifndef PERL_POISON
+
+#if XSH_HAS_POISON_NEW
+# define XSH_LOCAL_ALLOC(D, N, T)  (Newx((D), (N), T), XSH_POISON_NEW((D), (N), T))
+#endif
+
+#if XSH_HAS_POISON_FREE
+# define XSH_LOCAL_FREE(D, N, T) (XSH_POISON_FREE((D), (N), T), Safefree(D))
+#endif
+
+#if XSH_HAS_POISON_NEW && XSH_HAS_POISON_FREE
+# define XSH_LOCAL_REALLOC(D, OL, NL, T) ((((D) && ((NL) < (OL))) ? XSH_POISON_FREE(((T *) (D)) + (NL), (OL) - (NL), T) : NOOP), Renew((D), (NL), T), (((OL) < (NL)) ? XSH_POISON_NEW(((T *) (D)) + (OL), (NL) - (OL), T) : NOOP))
+#endif
+
+#endif /* !PERL_POISON */
+
+#ifndef XSH_LOCAL_ALLOC
+# define XSH_LOCAL_ALLOC(D, N, T) Newx((D), (N), T)
+#endif
+
+#define XSH_LOCAL_CALLOC(D, N, T) Newxz((D), (N), T)
+
+#ifndef XSH_LOCAL_FREE
+# define XSH_LOCAL_FREE(D, N, T)  Safefree(D)
+#endif
+
+#ifndef XSH_LOCAL_REALLOC
+# define XSH_LOCAL_REALLOC(D, OL, NL, T) Renew((D), (NL), T)
+#endif
+
+#endif /* XSH_MEM_H */

diff --git a/xsh/threads.h b/xsh/threads.h
index b72c63b0f6839115647050901c26aa50a98315cb..428844415087bbcb6a9f4d3435044298cd8ef529 100644 (file)
--- a/xsh/threads.h
+++ b/xsh/threads.h
@@ -3,6 +3,7 @@
 
 #include "caps.h" /* XSH_HAS_PERL(), XSH_THREADSAFE */
 #include "util.h" /* XSH_PACKAGE, dNOOP, NOOP */
+#include "mem.h"  /* XSH_SHARED_*() */
 
 #ifndef XSH_THREADS_COMPILE_TIME_PROTECTION
 # define XSH_THREADS_COMPILE_TIME_PROTECTION 0
@@ -307,7 +308,7 @@ static int xsh_teardown_late_arg_free(pTHX_ SV *sv, MAGIC *mg) {
   tok->cb(aTHX_ tok->ud);
  XSH_LOADED_UNLOCK;
 
- PerlMemShared_free(tok);
+ XSH_SHARED_FREE(tok, 1, xsh_teardown_late_token);
 
  return 0;
 }
@@ -338,7 +339,7 @@ static void xsh_teardown_late_register(pTHX_ xsh_teardown_late_cb cb, void *ud){
  } else {
   xsh_teardown_late_token *tok;
 
-  tok     = PerlMemShared_malloc(sizeof *tok);
+  XSH_SHARED_ALLOC(tok, 1, xsh_teardown_late_token);
   tok->cb = cb;
   tok->ud = ud;
 

diff --git a/xsh/util.h b/xsh/util.h
index 2e4009212e9567eee0e31b3110bf64efeffb35e6..500472364a3545615e9b38ecd5781d318a1ce177 100644 (file)
--- a/xsh/util.h
+++ b/xsh/util.h
@@ -28,13 +28,6 @@
 # define XSH_ASSERT(C)
 #endif
 
-#undef VOID2
-#ifdef __cplusplus
-# define VOID2(T, P) static_cast<T>(P)
-#else
-# define VOID2(T, P) (P)
-#endif
-
 #ifndef STMT_START
 # define STMT_START do
 #endif
@@ -66,19 +59,6 @@
 #define xsh_dup(S, P)     sv_dup((S), (P))
 #define xsh_dup_inc(S, P) SvREFCNT_inc(xsh_dup((S), (P)))
 
-/* Context for PerlMemShared_*() functions */
-#ifdef PERL_IMPLICIT_SYS
-# define pPMS  pTHX
-# define pPMS_ pTHX_
-# define aPMS  aTHX
-# define aPMS_ aTHX_
-#else
-# define pPMS  void
-# define pPMS_
-# define aPMS
-# define aPMS_
-#endif
-
 #ifdef USE_ITHREADS
 # define XSH_LOCK(M)   MUTEX_LOCK(M)
 # define XSH_UNLOCK(M) MUTEX_UNLOCK(M)