Commit 735bb12b authored by Stefan Krah's avatar Stefan Krah

Indentation cleanup.

parent 67f953c5
...@@ -249,7 +249,7 @@ typedef uchar block; ...@@ -249,7 +249,7 @@ typedef uchar block;
/* Pool for small blocks. */ /* Pool for small blocks. */
struct pool_header { struct pool_header {
union { block *_padding; union { block *_padding;
uint count; } ref; /* number of allocated blocks */ uint count; } ref; /* number of allocated blocks */
block *freeblock; /* pool's free list head */ block *freeblock; /* pool's free list head */
struct pool_header *nextpool; /* next pool of this size class */ struct pool_header *nextpool; /* next pool of this size class */
struct pool_header *prevpool; /* previous pool "" */ struct pool_header *prevpool; /* previous pool "" */
...@@ -404,7 +404,7 @@ compensating for that a pool_header's nextpool and prevpool members ...@@ -404,7 +404,7 @@ compensating for that a pool_header's nextpool and prevpool members
immediately follow a pool_header's first two members: immediately follow a pool_header's first two members:
union { block *_padding; union { block *_padding;
uint count; } ref; uint count; } ref;
block *freeblock; block *freeblock;
each of which consume sizeof(block *) bytes. So what usedpools[i+i] really each of which consume sizeof(block *) bytes. So what usedpools[i+i] really
...@@ -709,7 +709,7 @@ extremely desirable that it be this fast. ...@@ -709,7 +709,7 @@ extremely desirable that it be this fast.
#undef Py_ADDRESS_IN_RANGE #undef Py_ADDRESS_IN_RANGE
#if defined(__GNUC__) && ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) || \ #if defined(__GNUC__) && ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1) || \
(__GNUC__ >= 4)) (__GNUC__ >= 4))
#define Py_NO_INLINE __attribute__((__noinline__)) #define Py_NO_INLINE __attribute__((__noinline__))
#else #else
#define Py_NO_INLINE #define Py_NO_INLINE
...@@ -1514,7 +1514,7 @@ _PyObject_DebugReallocApi(char api, void *p, size_t nbytes) ...@@ -1514,7 +1514,7 @@ _PyObject_DebugReallocApi(char api, void *p, size_t nbytes)
if (nbytes > original_nbytes) { if (nbytes > original_nbytes) {
/* growing: mark new extra memory clean */ /* growing: mark new extra memory clean */
memset(q + original_nbytes, CLEANBYTE, memset(q + original_nbytes, CLEANBYTE,
nbytes - original_nbytes); nbytes - original_nbytes);
} }
return q; return q;
...@@ -1641,11 +1641,11 @@ _PyObject_DebugDumpAddress(const void *p) ...@@ -1641,11 +1641,11 @@ _PyObject_DebugDumpAddress(const void *p)
fputs("FORBIDDENBYTE, as expected.\n", stderr); fputs("FORBIDDENBYTE, as expected.\n", stderr);
else { else {
fprintf(stderr, "not all FORBIDDENBYTE (0x%02x):\n", fprintf(stderr, "not all FORBIDDENBYTE (0x%02x):\n",
FORBIDDENBYTE); FORBIDDENBYTE);
for (i = 0; i < SST; ++i) { for (i = 0; i < SST; ++i) {
const uchar byte = tail[i]; const uchar byte = tail[i];
fprintf(stderr, " at tail+%d: 0x%02x", fprintf(stderr, " at tail+%d: 0x%02x",
i, byte); i, byte);
if (byte != FORBIDDENBYTE) if (byte != FORBIDDENBYTE)
fputs(" *** OUCH", stderr); fputs(" *** OUCH", stderr);
fputc('\n', stderr); fputc('\n', stderr);
...@@ -1751,7 +1751,7 @@ _PyObject_DebugMallocStats(void) ...@@ -1751,7 +1751,7 @@ _PyObject_DebugMallocStats(void)
char buf[128]; char buf[128];
fprintf(stderr, "Small block threshold = %d, in %u size classes.\n", 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) for (i = 0; i < numclasses; ++i)
numpools[i] = numblocks[i] = numfreeblocks[i] = 0; numpools[i] = numblocks[i] = numfreeblocks[i] = 0;
...@@ -1809,7 +1809,7 @@ _PyObject_DebugMallocStats(void) ...@@ -1809,7 +1809,7 @@ _PyObject_DebugMallocStats(void)
fputc('\n', stderr); fputc('\n', stderr);
fputs("class size num pools blocks in use avail blocks\n" fputs("class size num pools blocks in use avail blocks\n"
"----- ---- --------- ------------- ------------\n", "----- ---- --------- ------------- ------------\n",
stderr); stderr);
for (i = 0; i < numclasses; ++i) { for (i = 0; i < numclasses; ++i) {
size_t p = numpools[i]; size_t p = numpools[i];
...@@ -1824,7 +1824,7 @@ _PyObject_DebugMallocStats(void) ...@@ -1824,7 +1824,7 @@ _PyObject_DebugMallocStats(void)
"%11" PY_FORMAT_SIZE_T "u " "%11" PY_FORMAT_SIZE_T "u "
"%15" PY_FORMAT_SIZE_T "u " "%15" PY_FORMAT_SIZE_T "u "
"%13" PY_FORMAT_SIZE_T "u\n", "%13" PY_FORMAT_SIZE_T "u\n",
i, size, p, b, f); i, size, p, b, f);
allocated_bytes += b * size; allocated_bytes += b * size;
available_bytes += f * size; available_bytes += f * size;
pool_header_bytes += p * POOL_OVERHEAD; pool_header_bytes += p * POOL_OVERHEAD;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment