ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/dynbuf.h
(Generate patch)

Comparing deliantra/server/include/dynbuf.h (file contents):
Revision 1.4 by root, Mon Apr 23 18:09:57 2007 UTC vs.
Revision 1.8 by root, Sat May 26 15:44:03 2007 UTC

… …
2#define DYNBUF_H__ 2#define DYNBUF_H__
3 3
4#include <cstring> 4#include <cstring>
5#include <cassert> 5#include <cassert>
6 6
7#include "util.h"
7#include "shstr.h" 8#include "shstr.h"
8 9
9// this is a "buffer" that can grow fast 10// this is a "buffer" that can grow fast
10// and is still somewhat space-efficient. 11// and is still somewhat space-efficient.
11// unlike obstacks or other data structures, 12// unlike obstacks or other data structures,
… …
16{ 17{
17protected: 18protected:
18 struct chunk 19 struct chunk
19 { 20 {
20 chunk *next; 21 chunk *next;
22 int alloc;
21 int size; 23 int size;
22 char data[0]; 24 char data[0];
23 }; 25 };
24 26
25 char *ptr; 27 char *ptr, *end;
26 int room;
27 int ext; 28 int ext;
28 int _size; 29 int _size;
29 30
30 chunk *first, *last; 31 chunk *first, *last;
31 32
32 void _reserve (int size); 33 void _reserve (int size);
34 void _clear ();
33 void clear (); 35 void clear ();
34 void finish (); 36 void finish ();
35 37
36public: 38public:
37 39
38 dynbuf (int initial = 4096, int extend = 16384); 40 dynbuf (int initial = 4096, int extend = 16384);
39 ~dynbuf (); 41 ~dynbuf ();
40 42
41 int size () { return _size + (ptr - last->data); } 43 int size () const { return _size + (ptr - last->data); }
44 bool empty () const { return !size (); }
42 45
43 void linearise (void *data); 46 void linearise (void *data);
44 char *linearise (); 47 char *linearise (); // does not 0-terminate(!)
48
49 int room () const { return end - ptr; }
45 50
46 char *force (int size) 51 char *force (int size)
47 { 52 {
48 if (room < size) 53 if (expect_false (ptr + size >= end))
49 _reserve (size); 54 _reserve (size);
50 55
51 return ptr; 56 return ptr;
52 } 57 }
53 58
54 char *alloc (int size) 59 char *alloc (int size)
55 { 60 {
56 char *res = force (size); 61 char *res = force (size);
57
58 room -= size;
59 ptr += size; 62 ptr += size;
60
61 return res; 63 return res;
62 } 64 }
63 65
64 void fadd (char c) { --room; *ptr++ = c; } 66 void fadd (char c) { *ptr++ = c; }
65 void fadd (unsigned char c) { fadd (char (c)); } 67 void fadd (unsigned char c) { fadd (char (c)); }
66 68
67 void add (const void *p, int len) 69 void add (const void *p, int len)
68 { 70 {
69 memcpy (alloc (len), p, len); 71 memcpy (alloc (len), p, len);
… …
88 //void add_destructive (dynbuf &buf); 90 //void add_destructive (dynbuf &buf);
89 91
90 dynbuf &operator << (char c) { add (c); return *this; } 92 dynbuf &operator << (char c) { add (c); return *this; }
91 dynbuf &operator << (unsigned char c) { return *this << char (c); } 93 dynbuf &operator << (unsigned char c) { return *this << char (c); }
92 dynbuf &operator << (const char *s) { add (s); return *this; } 94 dynbuf &operator << (const char *s) { add (s); return *this; }
95 dynbuf &operator << (const shstr &s) { add (s); return *this; }
93 dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; } 96 dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; }
94 97
95 operator std::string (); 98 operator std::string ();
96}; 99};
97 100
… …
111 114
112 void printf (const char *format, ...); 115 void printf (const char *format, ...);
113}; 116};
114 117
115#endif 118#endif
119

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines