emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gzip: make debugging of bits_sent less ugly, no code changes

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-01-31 17:00:41 +01:00
parent 26eea71c87
commit ba63d70e2d
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archival/gzip.c
View File

@ -411,6 +411,9 @@ struct globals {
#ifdef DEBUG #ifdef DEBUG
ulg bits_sent; /* bit length of the compressed data */ ulg bits_sent; /* bit length of the compressed data */
# define DEBUG_bits_sent(v) (void)(G1.bits_sent v)
#else
# define DEBUG_bits_sent(v) ((void)0)
#endif #endif
}; };
@ -540,7 +543,7 @@ static void send_bits(unsigned value, unsigned length)
#ifdef DEBUG #ifdef DEBUG
Tracev((stderr, " l %2d v %4x ", length, value)); Tracev((stderr, " l %2d v %4x ", length, value));
Assert(length > 0 && length <= 15, "invalid length"); Assert(length > 0 && length <= 15, "invalid length");
G1.bits_sent += length; DEBUG_bits_sent(+= length);
#endif #endif
BUILD_BUG_ON(BUF_SIZE != 32 && BUF_SIZE != 16); BUILD_BUG_ON(BUF_SIZE != 32 && BUF_SIZE != 16);
@ -602,9 +605,7 @@ static void bi_windup(void)
} }
G1.bi_buf = 0; G1.bi_buf = 0;
G1.bi_valid = 0; G1.bi_valid = 0;
#ifdef DEBUG DEBUG_bits_sent(= (G1.bits_sent + 7) & ~7);
G1.bits_sent = (G1.bits_sent + 7) & ~7;
#endif
} }
@ -619,13 +620,9 @@ static void copy_block(char *buf, unsigned len, int header)
if (header) { if (header) {
unsigned v = ((uint16_t)len) | ((~len) << 16); unsigned v = ((uint16_t)len) | ((~len) << 16);
put_32bit(v); put_32bit(v);
#ifdef DEBUG DEBUG_bits_sent(+= 2 * 16);
G1.bits_sent += 2 * 16;
#endif
} }
#ifdef DEBUG DEBUG_bits_sent(+= (ulg) len << 3);
G1.bits_sent += (ulg) len << 3;
#endif
while (len--) { while (len--) {
put_8bit(*buf++); put_8bit(*buf++);
} }
@ -1942,9 +1939,7 @@ static void bi_init(void)
{ {
//G1.bi_buf = 0; // globals are zeroed in pack_gzip() //G1.bi_buf = 0; // globals are zeroed in pack_gzip()
//G1.bi_valid = 0; // globals are zeroed in pack_gzip() //G1.bi_valid = 0; // globals are zeroed in pack_gzip()
#ifdef DEBUG //DEBUG_bits_sent(= 0L); // globals are zeroed in pack_gzip()
//G1.bits_sent = 0L; // globals are zeroed in pack_gzip()
#endif
} }