a41794cdd7
Without the bloated cplus_demangle from binutils, i.e building with:
$ make NO_DEMANGLE=1 O=~acme/git/build/perf -j3 -C tools/perf/ install
Before:
text data bss dec hex filename
471851 29280 4025056 4526187 45106b /home/acme/bin/perf
After:
[acme@doppio linux-2.6-tip]$ size ~/bin/perf
text data bss dec hex filename
446886 29232 4008576 4484694 446e56 /home/acme/bin/perf
So its a 5.3% size reduction in code, but the interesting part is in the git
diff --stat output:
19 files changed, 20 insertions(+), 1909 deletions(-)
If we ever need some of the things we got from git but weren't using, we just
have to go to the git repo and get fresh, uptodate source code bits.
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
93 lines
3.0 KiB
C
93 lines
3.0 KiB
C
#ifndef __PERF_STRBUF_H
|
|
#define __PERF_STRBUF_H
|
|
|
|
/*
|
|
* Strbuf's can be use in many ways: as a byte array, or to store arbitrary
|
|
* long, overflow safe strings.
|
|
*
|
|
* Strbufs has some invariants that are very important to keep in mind:
|
|
*
|
|
* 1. the ->buf member is always malloc-ed, hence strbuf's can be used to
|
|
* build complex strings/buffers whose final size isn't easily known.
|
|
*
|
|
* It is NOT legal to copy the ->buf pointer away.
|
|
* `strbuf_detach' is the operation that detachs a buffer from its shell
|
|
* while keeping the shell valid wrt its invariants.
|
|
*
|
|
* 2. the ->buf member is a byte array that has at least ->len + 1 bytes
|
|
* allocated. The extra byte is used to store a '\0', allowing the ->buf
|
|
* member to be a valid C-string. Every strbuf function ensure this
|
|
* invariant is preserved.
|
|
*
|
|
* Note that it is OK to "play" with the buffer directly if you work it
|
|
* that way:
|
|
*
|
|
* strbuf_grow(sb, SOME_SIZE);
|
|
* ... Here, the memory array starting at sb->buf, and of length
|
|
* ... strbuf_avail(sb) is all yours, and you are sure that
|
|
* ... strbuf_avail(sb) is at least SOME_SIZE.
|
|
* strbuf_setlen(sb, sb->len + SOME_OTHER_SIZE);
|
|
*
|
|
* Of course, SOME_OTHER_SIZE must be smaller or equal to strbuf_avail(sb).
|
|
*
|
|
* Doing so is safe, though if it has to be done in many places, adding the
|
|
* missing API to the strbuf module is the way to go.
|
|
*
|
|
* XXX: do _not_ assume that the area that is yours is of size ->alloc - 1
|
|
* even if it's true in the current implementation. Alloc is somehow a
|
|
* "private" member that should not be messed with.
|
|
*/
|
|
|
|
#include <assert.h>
|
|
|
|
extern char strbuf_slopbuf[];
|
|
struct strbuf {
|
|
size_t alloc;
|
|
size_t len;
|
|
char *buf;
|
|
};
|
|
|
|
#define STRBUF_INIT { 0, 0, strbuf_slopbuf }
|
|
|
|
/*----- strbuf life cycle -----*/
|
|
extern void strbuf_init(struct strbuf *buf, ssize_t hint);
|
|
extern void strbuf_release(struct strbuf *);
|
|
extern char *strbuf_detach(struct strbuf *, size_t *);
|
|
|
|
/*----- strbuf size related -----*/
|
|
static inline ssize_t strbuf_avail(const struct strbuf *sb) {
|
|
return sb->alloc ? sb->alloc - sb->len - 1 : 0;
|
|
}
|
|
|
|
extern void strbuf_grow(struct strbuf *, size_t);
|
|
|
|
static inline void strbuf_setlen(struct strbuf *sb, size_t len) {
|
|
if (!sb->alloc)
|
|
strbuf_grow(sb, 0);
|
|
assert(len < sb->alloc);
|
|
sb->len = len;
|
|
sb->buf[len] = '\0';
|
|
}
|
|
|
|
/*----- add data in your buffer -----*/
|
|
static inline void strbuf_addch(struct strbuf *sb, int c) {
|
|
strbuf_grow(sb, 1);
|
|
sb->buf[sb->len++] = c;
|
|
sb->buf[sb->len] = '\0';
|
|
}
|
|
|
|
extern void strbuf_remove(struct strbuf *, size_t pos, size_t len);
|
|
|
|
extern void strbuf_add(struct strbuf *, const void *, size_t);
|
|
static inline void strbuf_addstr(struct strbuf *sb, const char *s) {
|
|
strbuf_add(sb, s, strlen(s));
|
|
}
|
|
|
|
__attribute__((format(printf,2,3)))
|
|
extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
|
|
|
|
/* XXX: if read fails, any partial read is undone */
|
|
extern ssize_t strbuf_read(struct strbuf *, int fd, ssize_t hint);
|
|
|
|
#endif /* __PERF_STRBUF_H */
|