diff options
| author | David Mitchell <davem@iabyn.com> | 2014-01-20 14:24:02 +0000 |
|---|---|---|
| committer | David Mitchell <davem@iabyn.com> | 2014-01-20 14:24:02 +0000 |
| commit | a78adc844d26a047e6547bbc893c9116171ba840 (patch) | |
| tree | dc5972b7373eac3c3d0d5677f2c4d8dab014e10c /util.c | |
| parent | 858cc5e3f0201ffb5745d078e91bb130c0260768 (diff) | |
| download | perl-a78adc844d26a047e6547bbc893c9116171ba840.tar.gz | |
rename sTHX to PERL_MEMORY_DEBUG_HEADER_SIZE
Originally this macro evaluated to the size of the THX pointer;
this was used with the memory pool facility to store the context of the
caller of the malloc() for debugging. Later, the header of the malloc()
stored more than just the context, so sTHX became a mismoner.
Rename it to something less misleading.
Diffstat (limited to 'util.c')
| -rw-r--r-- | util.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -114,7 +114,7 @@ Perl_safesysmalloc(MEM_SIZE size) dTHX; #endif Malloc_t ptr; - size += sTHX; + size += PERL_MEMORY_DEBUG_HEADER_SIZE; #ifdef DEBUGGING if ((SSize_t)size < 0) Perl_croak_nocontext("panic: malloc, size=%"UVuf, (UV) size); @@ -156,7 +156,7 @@ Perl_safesysmalloc(MEM_SIZE size) #ifdef MDH_HAS_SIZE header->size = size; #endif - ptr = (Malloc_t)((char*)ptr+sTHX); + ptr = (Malloc_t)((char*)ptr+PERL_MEMORY_DEBUG_HEADER_SIZE); DEBUG_m(PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) malloc %ld bytes\n",PTR2UV(ptr),(long)PL_an++,(long)size)); return ptr; } @@ -184,7 +184,7 @@ Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) Malloc_t ptr; #ifdef PERL_DEBUG_READONLY_COW const MEM_SIZE oldsize = where - ? ((struct perl_memory_debug_header *)((char *)where - sTHX))->size + ? ((struct perl_memory_debug_header *)((char *)where - PERL_MEMORY_DEBUG_HEADER_SIZE))->size : 0; #endif #if !defined(STANDARD_C) && !defined(HAS_REALLOC_PROTOTYPE) && !defined(PERL_MICRO) @@ -199,8 +199,8 @@ Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) if (!where) return safesysmalloc(size); #ifdef USE_MDH - where = (Malloc_t)((char*)where-sTHX); - size += sTHX; + where = (Malloc_t)((char*)where-PERL_MEMORY_DEBUG_HEADER_SIZE); + size += PERL_MEMORY_DEBUG_HEADER_SIZE; { struct perl_memory_debug_header *const header = (struct perl_memory_debug_header *)where; @@ -268,7 +268,7 @@ Perl_safesysrealloc(Malloc_t where,MEM_SIZE size) header->prev->next = header; maybe_protect_ro(header->prev); #endif - ptr = (Malloc_t)((char*)ptr+sTHX); + ptr = (Malloc_t)((char*)ptr+PERL_MEMORY_DEBUG_HEADER_SIZE); } /* In particular, must do that fixup above before logging anything via @@ -307,7 +307,7 @@ Perl_safesysfree(Malloc_t where) DEBUG_m( PerlIO_printf(Perl_debug_log, "0x%"UVxf": (%05ld) free\n",PTR2UV(where),(long)PL_an++)); if (where) { #ifdef USE_MDH - where = (Malloc_t)((char*)where-sTHX); + where = (Malloc_t)((char*)where-PERL_MEMORY_DEBUG_HEADER_SIZE); { struct perl_memory_debug_header *const header = (struct perl_memory_debug_header *)where; @@ -381,8 +381,8 @@ Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size) else croak_memory_wrap(); #ifdef USE_MDH - if (sTHX <= MEM_SIZE_MAX - (MEM_SIZE)total_size) - total_size += sTHX; + if (PERL_MEMORY_DEBUG_HEADER_SIZE <= MEM_SIZE_MAX - (MEM_SIZE)total_size) + total_size += PERL_MEMORY_DEBUG_HEADER_SIZE; else croak_memory_wrap(); #endif @@ -437,7 +437,7 @@ Perl_safesyscalloc(MEM_SIZE count, MEM_SIZE size) # ifdef MDH_HAS_SIZE header->size = total_size; # endif - ptr = (Malloc_t)((char*)ptr+sTHX); + ptr = (Malloc_t)((char*)ptr+PERL_MEMORY_DEBUG_HEADER_SIZE); } #endif return ptr; |