This is a live mirror of the Perl 5 development currently hosted at
https://github.com/perl/perl5
https://perl5.git.perl.org
/
perl5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove set magic from typeglobs. Remove typeglob magic entirely.
[perl5.git]
/
malloc.c
diff --git
a/malloc.c
b/malloc.c
index
3731fc2
..
94fcb15
100644
(file)
--- a/
malloc.c
+++ b/
malloc.c
@@
-271,19
+271,18
@@
# define LOG_OF_MIN_ARENA 14
#endif
# define LOG_OF_MIN_ARENA 14
#endif
-#ifndef lint
-# if defined(DEBUGGING) && !defined(NO_RCHECK)
-# define RCHECK
-# endif
-# if defined(DEBUGGING) && !defined(NO_RCHECK) && !defined(NO_MFILL) && !defined(MALLOC_FILL)
-# define MALLOC_FILL
-# endif
-# if defined(DEBUGGING) && !defined(NO_RCHECK) && !defined(NO_FILL_CHECK) && !defined(MALLOC_FILL_CHECK)
-# define MALLOC_FILL_CHECK
-# endif
-# if defined(RCHECK) && defined(IGNORE_SMALL_BAD_FREE)
-# undef IGNORE_SMALL_BAD_FREE
-# endif
+#if defined(DEBUGGING) && !defined(NO_RCHECK)
+# define RCHECK
+#endif
+#if defined(DEBUGGING) && !defined(NO_RCHECK) && !defined(NO_MFILL) && !defined(MALLOC_FILL)
+# define MALLOC_FILL
+#endif
+#if defined(DEBUGGING) && !defined(NO_RCHECK) && !defined(NO_FILL_CHECK) && !defined(MALLOC_FILL_CHECK)
+# define MALLOC_FILL_CHECK
+#endif
+#if defined(RCHECK) && defined(IGNORE_SMALL_BAD_FREE)
+# undef IGNORE_SMALL_BAD_FREE
+#endif
/*
* malloc.c (Caltech) 2/21/82
* Chris Kingsley, kingsley@cit-20.
/*
* malloc.c (Caltech) 2/21/82
* Chris Kingsley, kingsley@cit-20.
@@
-409,7
+408,7
@@
# ifndef pTHX
# define pTHX void
# define pTHX_
# ifndef pTHX
# define pTHX void
# define pTHX_
-# ifdef HASATTRIBUTE
+# ifdef HASATTRIBUTE
_UNUSED
# define dTHX extern int Perl___notused PERL_UNUSED_DECL
# else
# define dTHX extern int Perl___notused
# define dTHX extern int Perl___notused PERL_UNUSED_DECL
# else
# define dTHX extern int Perl___notused
@@
-641,7
+640,7
@@
struct aligner {
#ifdef BUCKETS_ROOT2
# define MAX_BUCKET_BY_TABLE 13
#ifdef BUCKETS_ROOT2
# define MAX_BUCKET_BY_TABLE 13
-static u_short buck_size[MAX_BUCKET_BY_TABLE + 1] =
+static
const
u_short buck_size[MAX_BUCKET_BY_TABLE + 1] =
{
0, 0, 0, 0, 4, 4, 8, 12, 16, 24, 32, 48, 64, 80,
};
{
0, 0, 0, 0, 4, 4, 8, 12, 16, 24, 32, 48, 64, 80,
};
@@
-805,7
+804,7
@@
static u_short buck_size[MAX_BUCKET_BY_TABLE + 1] =
# define N_BLKS(bucket) n_blks[bucket]
#endif
# define N_BLKS(bucket) n_blks[bucket]
#endif
-static
u_short n_blks[LOG_OF_MIN_ARENA * BUCKETS_PER_POW2] =
+static
const u_short n_blks[LOG_OF_MIN_ARENA * BUCKETS_PER_POW2] =
{
# if BUCKETS_PER_POW2==1
0, 0,
{
# if BUCKETS_PER_POW2==1
0, 0,
@@
-828,7
+827,7
@@
static u_short n_blks[LOG_OF_MIN_ARENA * BUCKETS_PER_POW2] =
# define BLK_SHIFT(bucket) blk_shift[bucket]
#endif
# define BLK_SHIFT(bucket) blk_shift[bucket]
#endif
-static
u_short blk_shift[LOG_OF_MIN_ARENA * BUCKETS_PER_POW2] =
+static
const u_short blk_shift[LOG_OF_MIN_ARENA * BUCKETS_PER_POW2] =
{
# if BUCKETS_PER_POW2==1
0, 0,
{
# if BUCKETS_PER_POW2==1
0, 0,
@@
-876,7
+875,7
@@
static u_short blk_shift[LOG_OF_MIN_ARENA * BUCKETS_PER_POW2] =
# else
# define SIZE_TABLE_MAX 64
# endif
# else
# define SIZE_TABLE_MAX 64
# endif
-static char bucket_of[] =
+static c
onst c
har bucket_of[] =
{
# ifdef BUCKETS_ROOT2 /* Chunks of size 3*2^n. */
/* 0 to 15 in 4-byte increments. */
{
# ifdef BUCKETS_ROOT2 /* Chunks of size 3*2^n. */
/* 0 to 15 in 4-byte increments. */
@@
-1157,17
+1156,16
@@
perl_get_emergency_buffer(IV *size)
dTHX;
/* First offense, give a possibility to recover by dieing. */
/* No malloc involved here: */
dTHX;
/* First offense, give a possibility to recover by dieing. */
/* No malloc involved here: */
- GV **gvp = (GV**)hv_fetch(PL_defstash, "^M", 2, 0);
SV *sv;
char *pv;
SV *sv;
char *pv;
-
STRLEN n_a
;
+
GV **gvp = (GV**)hv_fetchs(PL_defstash, "^M", FALSE)
;
- if (!gvp) gvp = (GV**)hv_fetch
(PL_defstash, "\015", 1, 0
);
+ if (!gvp) gvp = (GV**)hv_fetch
s(PL_defstash, "\015", FALSE
);
if (!gvp || !(sv = GvSV(*gvp)) || !SvPOK(sv)
|| (SvLEN(sv) < (1<<LOG_OF_MIN_ARENA) - M_OVERHEAD))
return NULL; /* Now die die die... */
/* Got it, now detach SvPV: */
if (!gvp || !(sv = GvSV(*gvp)) || !SvPOK(sv)
|| (SvLEN(sv) < (1<<LOG_OF_MIN_ARENA) - M_OVERHEAD))
return NULL; /* Now die die die... */
/* Got it, now detach SvPV: */
- pv = SvPV
(sv, n_a
);
+ pv = SvPV
_nolen(sv
);
/* Check alignment: */
if ((PTR2UV(pv) - sizeof(union overhead)) & (NEEDED_ALIGNMENT - 1)) {
PerlIO_puts(PerlIO_stderr(),"Bad alignment of $^M!\n");
/* Check alignment: */
if ((PTR2UV(pv) - sizeof(union overhead)) & (NEEDED_ALIGNMENT - 1)) {
PerlIO_puts(PerlIO_stderr(),"Bad alignment of $^M!\n");
@@
-1175,7
+1173,7
@@
perl_get_emergency_buffer(IV *size)
}
SvPOK_off(sv);
}
SvPOK_off(sv);
- SvPV_set(sv, N
ullch
);
+ SvPV_set(sv, N
ULL
);
SvCUR_set(sv, 0);
SvLEN_set(sv, 0);
*size = malloced_size(pv) + M_OVERHEAD;
SvCUR_set(sv, 0);
SvLEN_set(sv, 0);
*size = malloced_size(pv) + M_OVERHEAD;
@@
-1251,7
+1249,7
@@
emergency_sbrk(MEM_SIZE size)
if (emergency_buffer_size) {
add_to_chain(emergency_buffer, emergency_buffer_size, 0);
emergency_buffer_size = 0;
if (emergency_buffer_size) {
add_to_chain(emergency_buffer, emergency_buffer_size, 0);
emergency_buffer_size = 0;
- emergency_buffer = N
ullch
;
+ emergency_buffer = N
ULL
;
have = 1;
}
have = 1;
}
@@
-1278,7
+1276,7
@@
emergency_sbrk(MEM_SIZE size)
MALLOC_UNLOCK;
emergency_sbrk_croak("Out of memory during request for %"UVuf" bytes, total sbrk() is %"UVuf" bytes", (UV)size, (UV)(goodsbrk + sbrk_slack));
/* NOTREACHED */
MALLOC_UNLOCK;
emergency_sbrk_croak("Out of memory during request for %"UVuf" bytes, total sbrk() is %"UVuf" bytes", (UV)size, (UV)(goodsbrk + sbrk_slack));
/* NOTREACHED */
- return N
ullch
;
+ return N
ULL
;
}
#else /* !defined(PERL_EMERGENCY_SBRK) */
}
#else /* !defined(PERL_EMERGENCY_SBRK) */
@@
-1338,7
+1336,7
@@
fill_pat_4bytes(unsigned char *s, size_t nbytes, const unsigned char *fill)
{
unsigned char *e = s + nbytes;
long *lp;
{
unsigned char *e = s + nbytes;
long *lp;
- long lfill = *(long*)fill;
+
const
long lfill = *(long*)fill;
if (PTR2UV(s) & (sizeof(long)-1)) { /* Align the pattern */
int shift = sizeof(long) - (PTR2UV(s) & (sizeof(long)-1));
if (PTR2UV(s) & (sizeof(long)-1)) { /* Align the pattern */
int shift = sizeof(long) - (PTR2UV(s) & (sizeof(long)-1));
@@
-1379,7
+1377,7
@@
cmp_pat_4bytes(unsigned char *s, size_t nbytes, const unsigned char *fill)
{
unsigned char *e = s + nbytes;
long *lp;
{
unsigned char *e = s + nbytes;
long *lp;
- long lfill = *(long*)fill;
+
const
long lfill = *(long*)fill;
if (PTR2UV(s) & (sizeof(long)-1)) { /* Align the pattern */
int shift = sizeof(long) - (PTR2UV(s) & (sizeof(long)-1));
if (PTR2UV(s) & (sizeof(long)-1)) { /* Align the pattern */
int shift = sizeof(long) - (PTR2UV(s) & (sizeof(long)-1));
@@
-1517,7
+1515,7
@@
Perl_malloc(register size_t nbytes)
|| (p->ov_next && PTR2UV(p->ov_next) < (1<<LOG_OF_MIN_ARENA)) ) {
dTHX;
PerlIO_printf(PerlIO_stderr(),
|| (p->ov_next && PTR2UV(p->ov_next) < (1<<LOG_OF_MIN_ARENA)) ) {
dTHX;
PerlIO_printf(PerlIO_stderr(),
- "Unaligned
`next'
pointer in the free "
+ "Unaligned
\"next\"
pointer in the free "
"chain 0x%"UVxf" at 0x%"UVxf"\n",
PTR2UV(p->ov_next), PTR2UV(p));
}
"chain 0x%"UVxf" at 0x%"UVxf"\n",
PTR2UV(p->ov_next), PTR2UV(p));
}
@@
-1806,7
+1804,7
@@
getpages(MEM_SIZE needed, int *nblksp, int bucket)
# endif
}
#endif
# endif
}
#endif
- ; /* Finish
`else'
*/
+ ; /* Finish
"else"
*/
sbrked_remains = require - needed;
last_op = cp;
}
sbrked_remains = require - needed;
last_op = cp;
}
@@
-1900,9
+1898,9
@@
morecore(register int bucket)
}
}
if (t && *t) {
}
}
if (t && *t) {
- write2("Unrecognized part of PERL_MALLOC_OPT:
`
");
+ write2("Unrecognized part of PERL_MALLOC_OPT:
\"
");
write2(t);
write2(t);
- write2("
'
\n");
+ write2("
\"
\n");
}
if (changed)
MallocCfg[MallocCfg_cfg_env_read] = 1;
}
if (changed)
MallocCfg[MallocCfg_cfg_env_read] = 1;
@@
-2143,7
+2141,7
@@
Perl_realloc(void *mp, size_t nbytes)
bad_free_warn = (pbf) ? atoi(pbf) : 1;
}
if (!bad_free_warn)
bad_free_warn = (pbf) ? atoi(pbf) : 1;
}
if (!bad_free_warn)
- return N
ullch
;
+ return N
ULL
;
#ifdef RCHECK
#ifdef PERL_CORE
{
#ifdef RCHECK
#ifdef PERL_CORE
{
@@
-2171,7
+2169,7
@@
Perl_realloc(void *mp, size_t nbytes)
warn("%s", "Bad realloc() ignored");
#endif
#endif
warn("%s", "Bad realloc() ignored");
#endif
#endif
- return N
ullch;
/* sanity */
+ return N
ULL;
/* sanity */
}
onb = BUCKET_SIZE_REAL(bucket);
}
onb = BUCKET_SIZE_REAL(bucket);
@@
-2356,14
+2354,14
@@
Perl_putenv(char *a)
MEM_SIZE
Perl_malloced_size(void *p)
{
MEM_SIZE
Perl_malloced_size(void *p)
{
- union overhead *ovp = (union overhead *)
+ union overhead *
const
ovp = (union overhead *)
((caddr_t)p - sizeof (union overhead) * CHUNK_SHIFT);
((caddr_t)p - sizeof (union overhead) * CHUNK_SHIFT);
- int bucket = OV_INDEX(ovp);
+
const
int bucket = OV_INDEX(ovp);
#ifdef RCHECK
/* The caller wants to have a complete control over the chunk,
disable the memory checking inside the chunk. */
if (bucket <= MAX_SHORT_BUCKET) {
#ifdef RCHECK
/* The caller wants to have a complete control over the chunk,
disable the memory checking inside the chunk. */
if (bucket <= MAX_SHORT_BUCKET) {
- MEM_SIZE size = BUCKET_SIZE_REAL(bucket);
+
const
MEM_SIZE size = BUCKET_SIZE_REAL(bucket);
ovp->ov_size = size + M_OVERHEAD - 1;
*((u_int *)((caddr_t)ovp + size + M_OVERHEAD - RMAGIC_SZ)) = RMAGIC;
}
ovp->ov_size = size + M_OVERHEAD - 1;
*((u_int *)((caddr_t)ovp + size + M_OVERHEAD - RMAGIC_SZ)) = RMAGIC;
}
@@
-2498,7
+2496,6
@@
Perl_dump_mstats(pTHX_ char *s)
buffer.total_chain, buffer.sbrked_remains);
#endif /* DEBUGGING_MSTATS */
}
buffer.total_chain, buffer.sbrked_remains);
#endif /* DEBUGGING_MSTATS */
}
-#endif /* lint */
#ifdef USE_PERL_SBRK
#ifdef USE_PERL_SBRK
@@
-2581,5
+2578,5
@@
Perl_sbrk(int size)
* indent-tabs-mode: t
* End:
*
* indent-tabs-mode: t
* End:
*
- *
vim:
ts=8 sts=4 sw=4 noet:
-*/
+ *
ex: set
ts=8 sts=4 sw=4 noet:
+
*/