Skip to content

Commit

Permalink
Merged revisions 86791 via svnmerge from
Browse files Browse the repository at this point in the history
svn+ssh://[email protected]/python/branches/py3k

........
  r86791 | stefan.krah | 2010-11-26 11:54:09 +0100 (Fri, 26 Nov 2010) | 1 line

  Indentation cleanup.
........
  • Loading branch information
cloud-tester committed Nov 26, 2010
1 parent 1e5d318 commit 918c90c
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Objects/obmalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ typedef uchar block;
/* Pool for small blocks. */
struct pool_header {
union { block *_padding;
uint count; } ref; /* number of allocated blocks */
uint count; } ref; /* number of allocated blocks */
block *freeblock; /* pool's free list head */
struct pool_header *nextpool; /* next pool of this size class */
struct pool_header *prevpool; /* previous pool "" */
Expand Down Expand Up @@ -404,7 +404,7 @@ compensating for that a pool_header's nextpool and prevpool members
immediately follow a pool_header's first two members:
union { block *_padding;
uint count; } ref;
uint count; } ref;
block *freeblock;
each of which consume sizeof(block *) bytes. So what usedpools[i+i] really
Expand Down Expand Up @@ -709,7 +709,7 @@ extremely desirable that it be this fast.
#undef Py_ADDRESS_IN_RANGE

#if defined(__GNUC__) && ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) || \
(__GNUC__ >= 4))
(__GNUC__ >= 4))
#define Py_NO_INLINE __attribute__((__noinline__))
#else
#define Py_NO_INLINE
Expand Down Expand Up @@ -1514,7 +1514,7 @@ _PyObject_DebugReallocApi(char api, void *p, size_t nbytes)
if (nbytes > original_nbytes) {
/* growing: mark new extra memory clean */
memset(q + original_nbytes, CLEANBYTE,
nbytes - original_nbytes);
nbytes - original_nbytes);
}

return q;
Expand Down Expand Up @@ -1641,11 +1641,11 @@ _PyObject_DebugDumpAddress(const void *p)
fputs("FORBIDDENBYTE, as expected.\n", stderr);
else {
fprintf(stderr, "not all FORBIDDENBYTE (0x%02x):\n",
FORBIDDENBYTE);
FORBIDDENBYTE);
for (i = 0; i < SST; ++i) {
const uchar byte = tail[i];
fprintf(stderr, " at tail+%d: 0x%02x",
i, byte);
i, byte);
if (byte != FORBIDDENBYTE)
fputs(" *** OUCH", stderr);
fputc('\n', stderr);
Expand Down Expand Up @@ -1751,7 +1751,7 @@ _PyObject_DebugMallocStats(void)
char buf[128];

fprintf(stderr, "Small block threshold = %d, in %u size classes.\n",
SMALL_REQUEST_THRESHOLD, numclasses);
SMALL_REQUEST_THRESHOLD, numclasses);

for (i = 0; i < numclasses; ++i)
numpools[i] = numblocks[i] = numfreeblocks[i] = 0;
Expand Down Expand Up @@ -1807,7 +1807,7 @@ _PyObject_DebugMallocStats(void)
fputc('\n', stderr);
fputs("class size num pools blocks in use avail blocks\n"
"----- ---- --------- ------------- ------------\n",
stderr);
stderr);

for (i = 0; i < numclasses; ++i) {
size_t p = numpools[i];
Expand All @@ -1822,7 +1822,7 @@ _PyObject_DebugMallocStats(void)
"%11" PY_FORMAT_SIZE_T "u "
"%15" PY_FORMAT_SIZE_T "u "
"%13" PY_FORMAT_SIZE_T "u\n",
i, size, p, b, f);
i, size, p, b, f);
allocated_bytes += b * size;
available_bytes += f * size;
pool_header_bytes += p * POOL_OVERHEAD;
Expand Down

0 comments on commit 918c90c

Please sign in to comment.