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.5 by root, Mon Apr 23 18:21:54 2007 UTC vs.
Revision 1.10 by root, Sun May 27 23:49:49 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,
… …
21 int alloc; 22 int alloc;
22 int size; 23 int size;
23 char data[0]; 24 char data[0];
24 }; 25 };
25 26
26 char *ptr; 27 char *ptr, *end;
27 int room;
28 int ext; 28 int ext;
29 int _size; 29 int _size;
30 30
31 chunk *first, *last; 31 chunk *first, *last;
32 32
33 void _reserve (int size); 33 void _reserve (int size);
34 void _clear ();
34 void clear (); 35 void clear ();
35 void finish (); 36 void finish ();
36 37
37public: 38public:
38 39
39 dynbuf (int initial = 4096, int extend = 16384); 40 dynbuf (int initial = 4096, int extend = 16384);
40 ~dynbuf (); 41 ~dynbuf ();
41 42
42 int size () { return _size + (ptr - last->data); } 43 int size () const { return _size + (ptr - last->data); }
44 bool empty () const { return !size (); }
43 45
44 void linearise (void *data); 46 void linearise (void *data);
45 char *linearise (); 47 char *linearise (); // does not 0-terminate(!)
48
49 int room () const { return end - ptr; }
46 50
47 char *force (int size) 51 char *force (int size)
48 { 52 {
49 if (room < size) 53 if (expect_false (ptr + size >= end))
50 _reserve (size); 54 _reserve (size);
51 55
52 return ptr; 56 return ptr;
53 } 57 }
54 58
55 char *alloc (int size) 59 char *falloc (int size)
56 { 60 {
57 char *res = force (size); 61 char *res = ptr;
58
59 room -= size;
60 ptr += size; 62 ptr += size;
61
62 return res; 63 return res;
63 } 64 }
64 65
66 char *alloc (int size)
67 {
68 force (size);
69 return falloc (size);
70 }
71
65 void fadd (char c) { --room; *ptr++ = c; } 72 void fadd (char c) { *ptr++ = c; }
66 void fadd (unsigned char c) { fadd (char (c)); } 73 void fadd (unsigned char c) { fadd (char (c)); }
74 void fadd (const void *p, int len)
75 {
76 memcpy (falloc (len), p, len);
77 }
67 78
68 void add (const void *p, int len) 79 void add (const void *p, int len)
69 { 80 {
70 memcpy (alloc (len), p, len); 81 force (len);
82 fadd (p, len);
71 } 83 }
72 84
73 void add (char c) 85 void add (char c)
74 { 86 {
75 alloc (1)[0] = c; 87 alloc (1)[0] = c;
… …
89 //void add_destructive (dynbuf &buf); 101 //void add_destructive (dynbuf &buf);
90 102
91 dynbuf &operator << (char c) { add (c); return *this; } 103 dynbuf &operator << (char c) { add (c); return *this; }
92 dynbuf &operator << (unsigned char c) { return *this << char (c); } 104 dynbuf &operator << (unsigned char c) { return *this << char (c); }
93 dynbuf &operator << (const char *s) { add (s); return *this; } 105 dynbuf &operator << (const char *s) { add (s); return *this; }
106 dynbuf &operator << (const shstr &s) { add (s); return *this; }
94 dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; } 107 dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; }
95 108
96 operator std::string (); 109 operator std::string ();
97}; 110};
98 111
… …
102 : dynbuf (initial, extend) 115 : dynbuf (initial, extend)
103 { } 116 { }
104 117
105 using dynbuf::add; 118 using dynbuf::add;
106 119
107 static const int max_sint32_size = 11;
108 static const int max_sint64_size = 20;
109
110 void add (sint32 i); 120 void add (sint32 i);
111 void add (sint64 i); 121 void add (sint64 i);
112 122
113 void printf (const char *format, ...); 123 void printf (const char *format, ...);
114}; 124};
115 125
116#endif 126#endif
127

Diff Legend

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