rj_schema 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (30) hide show
  1. checksums.yaml +4 -4
  2. data/ext/rj_schema/rapidjson/CMakeLists.txt +23 -1
  3. data/ext/rj_schema/rapidjson/appveyor.yml +49 -1
  4. data/ext/rj_schema/rapidjson/bin/types/alotofkeys.json +502 -0
  5. data/ext/rj_schema/rapidjson/bin/unittestschema/idandref.json +69 -0
  6. data/ext/rj_schema/rapidjson/doc/stream.md +7 -7
  7. data/ext/rj_schema/rapidjson/doc/stream.zh-cn.md +1 -1
  8. data/ext/rj_schema/rapidjson/doc/tutorial.md +15 -15
  9. data/ext/rj_schema/rapidjson/example/schemavalidator/schemavalidator.cpp +2 -0
  10. data/ext/rj_schema/rapidjson/example/traverseaspointer.cpp +39 -0
  11. data/ext/rj_schema/rapidjson/include/rapidjson/allocators.h +460 -52
  12. data/ext/rj_schema/rapidjson/include/rapidjson/document.h +350 -60
  13. data/ext/rj_schema/rapidjson/include/rapidjson/internal/strfunc.h +14 -0
  14. data/ext/rj_schema/rapidjson/include/rapidjson/pointer.h +68 -1
  15. data/ext/rj_schema/rapidjson/include/rapidjson/rapidjson.h +60 -11
  16. data/ext/rj_schema/rapidjson/include/rapidjson/schema.h +249 -102
  17. data/ext/rj_schema/rapidjson/include/rapidjson/uri.h +466 -0
  18. data/ext/rj_schema/rapidjson/test/perftest/perftest.h +5 -4
  19. data/ext/rj_schema/rapidjson/test/perftest/rapidjsontest.cpp +20 -2
  20. data/ext/rj_schema/rapidjson/test/unittest/CMakeLists.txt +2 -0
  21. data/ext/rj_schema/rapidjson/test/unittest/allocatorstest.cpp +193 -1
  22. data/ext/rj_schema/rapidjson/test/unittest/documenttest.cpp +2 -0
  23. data/ext/rj_schema/rapidjson/test/unittest/platformtest.cpp +40 -0
  24. data/ext/rj_schema/rapidjson/test/unittest/pointertest.cpp +62 -2
  25. data/ext/rj_schema/rapidjson/test/unittest/schematest.cpp +372 -7
  26. data/ext/rj_schema/rapidjson/test/unittest/uritest.cpp +718 -0
  27. data/ext/rj_schema/rapidjson/test/unittest/valuetest.cpp +12 -2
  28. data/ext/rj_schema/rj_schema.cpp +1 -1
  29. data/lib/rj_schema.rb +1 -1
  30. metadata +9 -3
@@ -0,0 +1,69 @@
1
+ {
2
+ "id": "http://example.com/root.json",
3
+ "definitions": {
4
+ "A": {
5
+ "id": "#foo",
6
+ "type": "integer"
7
+ },
8
+ "B": {
9
+ "id": "other.json",
10
+ "definitions": {
11
+ "X": {
12
+ "id": "#bar",
13
+ "type": "boolean"
14
+ },
15
+ "Y": {
16
+ "$ref": "#/definitions/X"
17
+ },
18
+ "W": {
19
+ "$ref": "#/definitions/Y"
20
+ },
21
+ "Z": {
22
+ "$ref": "#bar"
23
+ },
24
+ "N": {
25
+ "properties": {
26
+ "NX": {
27
+ "$ref": "#/definitions/X"
28
+ }
29
+ }
30
+ }
31
+ }
32
+ }
33
+ },
34
+ "properties": {
35
+ "PA1": {
36
+ "$ref": "http://example.com/root.json#/definitions/A"
37
+ },
38
+ "PA2": {
39
+ "$ref": "#/definitions/A"
40
+ },
41
+ "PA3": {
42
+ "$ref": "#foo"
43
+ },
44
+ "PX1": {
45
+ "$ref": "#/definitions/B/definitions/X"
46
+ },
47
+ "PX2Y": {
48
+ "$ref": "#/definitions/B/definitions/Y"
49
+ },
50
+ "PX3Z": {
51
+ "$ref": "#/definitions/B/definitions/Z"
52
+ },
53
+ "PX4": {
54
+ "$ref": "http://example.com/other.json#/definitions/X"
55
+ },
56
+ "PX5": {
57
+ "$ref": "other.json#/definitions/X"
58
+ },
59
+ "PX6": {
60
+ "$ref": "other.json#bar"
61
+ },
62
+ "PX7W": {
63
+ "$ref": "#/definitions/B/definitions/W"
64
+ },
65
+ "PX8N": {
66
+ "$ref": "#/definitions/B/definitions/N"
67
+ }
68
+ }
69
+ }
@@ -1,6 +1,6 @@
1
1
  # Stream
2
2
 
3
- In RapidJSON, `rapidjson::Stream` is a concept for reading/writing JSON. Here we first show how to use streams provided. And then see how to create a custom stream.
3
+ In RapidJSON, `rapidjson::Stream` is a concept for reading/writing JSON. Here we'll first show you how to use provided streams. And then see how to create a custom stream.
4
4
 
5
5
  [TOC]
6
6
 
@@ -51,7 +51,7 @@ d.Accept(writer);
51
51
  const char* output = buffer.GetString();
52
52
  ~~~~~~~~~~
53
53
 
54
- When the buffer is full, it will increases the capacity automatically. The default capacity is 256 characters (256 bytes for UTF8, 512 bytes for UTF16, etc.). User can provide an allocator and a initial capacity.
54
+ When the buffer is full, it will increases the capacity automatically. The default capacity is 256 characters (256 bytes for UTF8, 512 bytes for UTF16, etc.). User can provide an allocator and an initial capacity.
55
55
 
56
56
  ~~~~~~~~~~cpp
57
57
  StringBuffer buffer1(0, 1024); // Use its allocator, initial size = 1024
@@ -89,7 +89,7 @@ d.ParseStream(is);
89
89
  fclose(fp);
90
90
  ~~~~~~~~~~
91
91
 
92
- Different from string streams, `FileReadStream` is byte stream. It does not handle encodings. If the file is not UTF-8, the byte stream can be wrapped in a `EncodedInputStream`. It will be discussed very soon.
92
+ Different from string streams, `FileReadStream` is byte stream. It does not handle encodings. If the file is not UTF-8, the byte stream can be wrapped in a `EncodedInputStream`. We will discuss more about this later in this tutorial.
93
93
 
94
94
  Apart from reading file, user can also use `FileReadStream` to read `stdin`.
95
95
 
@@ -119,11 +119,11 @@ d.Accept(writer);
119
119
  fclose(fp);
120
120
  ~~~~~~~~~~
121
121
 
122
- It can also directs the output to `stdout`.
122
+ It can also redirect the output to `stdout`.
123
123
 
124
124
  # iostream Wrapper {#iostreamWrapper}
125
125
 
126
- Due to users' requests, RapidJSON provided official wrappers for `std::basic_istream` and `std::basic_ostream`. However, please note that the performance will be much lower than the other streams above.
126
+ Due to users' requests, RapidJSON also provides official wrappers for `std::basic_istream` and `std::basic_ostream`. However, please note that the performance will be much lower than the other streams above.
127
127
 
128
128
  ## IStreamWrapper {#IStreamWrapper}
129
129
 
@@ -181,7 +181,7 @@ As mentioned above, UTF-8 byte streams can be read directly. However, UTF-16 and
181
181
 
182
182
  Besides, it also need to handle [byte order mark (BOM)](http://en.wikipedia.org/wiki/Byte_order_mark). When reading from a byte stream, it is needed to detect or just consume the BOM if exists. When writing to a byte stream, it can optionally write BOM.
183
183
 
184
- If the encoding of stream is known in compile-time, you may use `EncodedInputStream` and `EncodedOutputStream`. If the stream can be UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE JSON, and it is only known in runtime, you may use `AutoUTFInputStream` and `AutoUTFOutputStream`. These streams are defined in `rapidjson/encodedstream.h`.
184
+ If the encoding of stream is known during compile-time, you may use `EncodedInputStream` and `EncodedOutputStream`. If the stream can be UTF-8, UTF-16LE, UTF-16BE, UTF-32LE, UTF-32BE JSON, and it is only known in runtime, you may use `AutoUTFInputStream` and `AutoUTFOutputStream`. These streams are defined in `rapidjson/encodedstream.h`.
185
185
 
186
186
  Note that, these encoded streams can be applied to streams other than file. For example, you may have a file in memory, or a custom byte stream, be wrapped in encoded streams.
187
187
 
@@ -231,7 +231,7 @@ FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
231
231
  typedef EncodedOutputStream<UTF32LE<>, FileWriteStream> OutputStream;
232
232
  OutputStream eos(bos, true); // Write BOM
233
233
 
234
- Writer<OutputStream, UTF32LE<>, UTF8<>> writer(eos);
234
+ Writer<OutputStream, UTF8<>, UTF32LE<>> writer(eos);
235
235
  d.Accept(writer); // This generates UTF32-LE file from UTF-8 in memory
236
236
 
237
237
  fclose(fp);
@@ -231,7 +231,7 @@ FileWriteStream bos(fp, writeBuffer, sizeof(writeBuffer));
231
231
  typedef EncodedOutputStream<UTF32LE<>, FileWriteStream> OutputStream;
232
232
  OutputStream eos(bos, true); // 写入 BOM
233
233
 
234
- Writer<OutputStream, UTF32LE<>, UTF8<>> writer(eos);
234
+ Writer<OutputStream, UTF8<>, UTF32LE<>> writer(eos);
235
235
  d.Accept(writer); // 这里从内存的 UTF-8 生成 UTF32-LE 文件
236
236
 
237
237
  fclose(fp);
@@ -12,7 +12,7 @@ Each JSON value is stored in a type called `Value`. A `Document`, representing t
12
12
 
13
13
  # Query Value {#QueryValue}
14
14
 
15
- In this section, we will use excerpt of `example/tutorial/tutorial.cpp`.
15
+ In this section, we will use excerpt from `example/tutorial/tutorial.cpp`.
16
16
 
17
17
  Assume we have the following JSON stored in a C string (`const char* json`):
18
18
  ~~~~~~~~~~js
@@ -85,7 +85,7 @@ assert(document["i"].IsNumber());
85
85
  // In this case, IsUint()/IsInt64()/IsUint64() also return true.
86
86
  assert(document["i"].IsInt());
87
87
  printf("i = %d\n", document["i"].GetInt());
88
- // Alternative (int)document["i"]
88
+ // Alternatively (int)document["i"]
89
89
 
90
90
  assert(document["pi"].IsNumber());
91
91
  assert(document["pi"].IsDouble());
@@ -113,7 +113,7 @@ a[2] = 3
113
113
  a[3] = 4
114
114
  ~~~~~~~~~~
115
115
 
116
- Note that, RapidJSON does not automatically convert values between JSON types. If a value is a string, it is invalid to call `GetInt()`, for example. In debug mode it will fail an assertion. In release mode, the behavior is undefined.
116
+ Note that, RapidJSON does not automatically convert values between JSON types. For example, if a value is a string, it is invalid to call `GetInt()`. In debug mode it will fail on assertion. In release mode, the behavior is undefined.
117
117
 
118
118
  In the following sections we discuss details about querying individual types.
119
119
 
@@ -168,9 +168,9 @@ Type of member pi is Number
168
168
  Type of member a is Array
169
169
  ~~~~~~~~~~
170
170
 
171
- Note that, when `operator[](const char*)` cannot find the member, it will fail an assertion.
171
+ Note that, when `operator[](const char*)` cannot find the member, it will fail on assertion.
172
172
 
173
- If we are unsure whether a member exists, we need to call `HasMember()` before calling `operator[](const char*)`. However, this incurs two lookup. A better way is to call `FindMember()`, which can check the existence of member and obtain its value at once:
173
+ If we are unsure whether a member exists, we need to call `HasMember()` before calling `operator[](const char*)`. However, this incurs two lookup. A better way is to call `FindMember()`, which can check the existence of a member and obtain its value at once:
174
174
 
175
175
  ~~~~~~~~~~cpp
176
176
  Value::ConstMemberIterator itr = document.FindMember("hello");
@@ -221,18 +221,18 @@ When obtaining the numeric values, `GetDouble()` will convert internal integer r
221
221
 
222
222
  ## Query String {#QueryString}
223
223
 
224
- In addition to `GetString()`, the `Value` class also contains `GetStringLength()`. Here explains why.
224
+ In addition to `GetString()`, the `Value` class also contains `GetStringLength()`. Here explains why:
225
225
 
226
- According to RFC 4627, JSON strings can contain Unicode character `U+0000`, which must be escaped as `"\u0000"`. The problem is that, C/C++ often uses null-terminated string, which treats ``\0'` as the terminator symbol.
226
+ According to RFC 4627, JSON strings can contain Unicode character `U+0000`, which must be escaped as `"\u0000"`. The problem is that, C/C++ often uses null-terminated string, which treats `\0` as the terminator symbol.
227
227
 
228
- To conform RFC 4627, RapidJSON supports string containing `U+0000`. If you need to handle this, you can use `GetStringLength()` to obtain the correct string length.
228
+ To conform with RFC 4627, RapidJSON supports string containing `U+0000` character. If you need to handle this, you can use `GetStringLength()` to obtain the correct string length.
229
229
 
230
- For example, after parsing a the following JSON to `Document d`:
230
+ For example, after parsing the following JSON to `Document d`:
231
231
 
232
232
  ~~~~~~~~~~js
233
233
  { "s" : "a\u0000b" }
234
234
  ~~~~~~~~~~
235
- The correct length of the value `"a\u0000b"` is 3. But `strlen()` returns 1.
235
+ The correct length of the string `"a\u0000b"` is 3, as returned by `GetStringLength()`. But `strlen()` returns 1.
236
236
 
237
237
  `GetStringLength()` can also improve performance, as user may often need to call `strlen()` for allocating buffer.
238
238
 
@@ -246,7 +246,7 @@ which accepts the length of string as parameter. This constructor supports stori
246
246
 
247
247
  ## Comparing values
248
248
 
249
- You can use `==` and `!=` to compare values. Two values are equal if and only if they are have same type and contents. You can also compare values with primitive types. Here is an example.
249
+ You can use `==` and `!=` to compare values. Two values are equal if and only if they have same type and contents. You can also compare values with primitive types. Here is an example:
250
250
 
251
251
  ~~~~~~~~~~cpp
252
252
  if (document["hello"] == document["n"]) /*...*/; // Compare values
@@ -264,7 +264,7 @@ Note that, currently if an object contains duplicated named member, comparing eq
264
264
  There are several ways to create values. After a DOM tree is created and/or modified, it can be saved as JSON again using `Writer`.
265
265
 
266
266
  ## Change Value Type {#ChangeValueType}
267
- When creating a Value or Document by default constructor, its type is Null. To change its type, call `SetXXX()` or assignment operator, for example:
267
+ When creating a `Value` or `Document` by default constructor, its type is Null. To change its type, call `SetXXX()` or assignment operator, for example:
268
268
 
269
269
  ~~~~~~~~~~cpp
270
270
  Document d; // Null
@@ -285,7 +285,7 @@ Value u(123u); // calls Value(unsigned)
285
285
  Value d(1.5); // calls Value(double)
286
286
  ~~~~~~~~~~
287
287
 
288
- To create empty object or array, you may use `SetObject()`/`SetArray()` after default constructor, or using the `Value(Type)` in one shot:
288
+ To create empty object or array, you may use `SetObject()`/`SetArray()` after default constructor, or using the `Value(Type)` in one call:
289
289
 
290
290
  ~~~~~~~~~~cpp
291
291
  Value o(kObjectType);
@@ -299,7 +299,7 @@ A very special decision during design of RapidJSON is that, assignment of value
299
299
  ~~~~~~~~~~cpp
300
300
  Value a(123);
301
301
  Value b(456);
302
- b = a; // a becomes a Null value, b becomes number 123.
302
+ a = b; // b becomes a Null value, a becomes number 456.
303
303
  ~~~~~~~~~~
304
304
 
305
305
  ![Assignment with move semantics.](diagram/move1.png)
@@ -367,7 +367,7 @@ RapidJSON provides two strategies for storing string.
367
367
 
368
368
  Copy-string is always safe because it owns a copy of the data. Const-string can be used for storing a string literal, and for in-situ parsing which will be mentioned in the DOM section.
369
369
 
370
- To make memory allocation customizable, RapidJSON requires users to pass an instance of allocator, whenever an operation may require allocation. This design is needed to prevent storing a allocator (or Document) pointer per Value.
370
+ To make memory allocation customizable, RapidJSON requires users to pass an instance of allocator, whenever an operation may require allocation. This design is needed to prevent storing an allocator (or Document) pointer per Value.
371
371
 
372
372
  Therefore, when we assign a copy-string, we call this overloaded `SetString()` with allocator:
373
373
 
@@ -2,6 +2,8 @@
2
2
 
3
3
  // The example validates JSON text from stdin with a JSON schema specified in the argument.
4
4
 
5
+ #define RAPIDJSON_HAS_STDSTRING 1
6
+
5
7
  #include "rapidjson/error/en.h"
6
8
  #include "rapidjson/filereadstream.h"
7
9
  #include "rapidjson/schema.h"
@@ -0,0 +1,39 @@
1
+ #include "rapidjson/document.h"
2
+ #include "rapidjson/filereadstream.h"
3
+ #include "rapidjson/pointer.h"
4
+ #include "rapidjson/stringbuffer.h"
5
+ #include <iostream>
6
+
7
+ using namespace rapidjson;
8
+
9
+ void traverse(const Value& v, const Pointer& p) {
10
+ StringBuffer sb;
11
+ p.Stringify(sb);
12
+ std::cout << sb.GetString() << std::endl;
13
+
14
+ switch (v.GetType()) {
15
+ case kArrayType:
16
+ for (SizeType i = 0; i != v.Size(); ++i)
17
+ traverse(v[i], p.Append(i));
18
+ break;
19
+ case kObjectType:
20
+ for (Value::ConstMemberIterator m = v.MemberBegin(); m != v.MemberEnd(); ++m)
21
+ traverse(m->value, p.Append(m->name.GetString(), m->name.GetStringLength()));
22
+ break;
23
+ default:
24
+ break;
25
+ }
26
+ }
27
+
28
+ int main(int, char*[]) {
29
+ char readBuffer[65536];
30
+ FileReadStream is(stdin, readBuffer, sizeof(readBuffer));
31
+
32
+ Document d;
33
+ d.ParseStream(is);
34
+
35
+ Pointer root;
36
+ traverse(d, root);
37
+
38
+ return 0;
39
+ }
@@ -16,6 +16,13 @@
16
16
  #define RAPIDJSON_ALLOCATORS_H_
17
17
 
18
18
  #include "rapidjson.h"
19
+ #include "internal/meta.h"
20
+
21
+ #include <memory>
22
+
23
+ #if RAPIDJSON_HAS_CXX11
24
+ #include <type_traits>
25
+ #endif
19
26
 
20
27
  RAPIDJSON_NAMESPACE_BEGIN
21
28
 
@@ -89,7 +96,14 @@ public:
89
96
  }
90
97
  return RAPIDJSON_REALLOC(originalPtr, newSize);
91
98
  }
92
- static void Free(void *ptr) { RAPIDJSON_FREE(ptr); }
99
+ static void Free(void *ptr) RAPIDJSON_NOEXCEPT { RAPIDJSON_FREE(ptr); }
100
+
101
+ bool operator==(const CrtAllocator&) const RAPIDJSON_NOEXCEPT {
102
+ return true;
103
+ }
104
+ bool operator!=(const CrtAllocator&) const RAPIDJSON_NOEXCEPT {
105
+ return false;
106
+ }
93
107
  };
94
108
 
95
109
  ///////////////////////////////////////////////////////////////////////////////
@@ -113,16 +127,64 @@ public:
113
127
  */
114
128
  template <typename BaseAllocator = CrtAllocator>
115
129
  class MemoryPoolAllocator {
130
+ //! Chunk header for perpending to each chunk.
131
+ /*! Chunks are stored as a singly linked list.
132
+ */
133
+ struct ChunkHeader {
134
+ size_t capacity; //!< Capacity of the chunk in bytes (excluding the header itself).
135
+ size_t size; //!< Current size of allocated memory in bytes.
136
+ ChunkHeader *next; //!< Next chunk in the linked list.
137
+ };
138
+
139
+ struct SharedData {
140
+ ChunkHeader *chunkHead; //!< Head of the chunk linked-list. Only the head chunk serves allocation.
141
+ BaseAllocator* ownBaseAllocator; //!< base allocator created by this object.
142
+ size_t refcount;
143
+ bool ownBuffer;
144
+ };
145
+
146
+ static const size_t SIZEOF_SHARED_DATA = RAPIDJSON_ALIGN(sizeof(SharedData));
147
+ static const size_t SIZEOF_CHUNK_HEADER = RAPIDJSON_ALIGN(sizeof(ChunkHeader));
148
+
149
+ static inline ChunkHeader *GetChunkHead(SharedData *shared)
150
+ {
151
+ return reinterpret_cast<ChunkHeader*>(reinterpret_cast<uint8_t*>(shared) + SIZEOF_SHARED_DATA);
152
+ }
153
+ static inline uint8_t *GetChunkBuffer(SharedData *shared)
154
+ {
155
+ return reinterpret_cast<uint8_t*>(shared->chunkHead) + SIZEOF_CHUNK_HEADER;
156
+ }
157
+
158
+ static const size_t kDefaultChunkCapacity = RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY; //!< Default chunk capacity.
159
+
116
160
  public:
117
161
  static const bool kNeedFree = false; //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
162
+ static const bool kRefCounted = true; //!< Tell users that this allocator is reference counted on copy
118
163
 
119
164
  //! Constructor with chunkSize.
120
165
  /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
121
166
  \param baseAllocator The allocator for allocating memory chunks.
122
167
  */
168
+ explicit
123
169
  MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
124
- chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
170
+ chunk_capacity_(chunkSize),
171
+ baseAllocator_(baseAllocator ? baseAllocator : RAPIDJSON_NEW(BaseAllocator)()),
172
+ shared_(static_cast<SharedData*>(baseAllocator_ ? baseAllocator_->Malloc(SIZEOF_SHARED_DATA + SIZEOF_CHUNK_HEADER) : 0))
125
173
  {
174
+ RAPIDJSON_ASSERT(baseAllocator_ != 0);
175
+ RAPIDJSON_ASSERT(shared_ != 0);
176
+ if (baseAllocator) {
177
+ shared_->ownBaseAllocator = 0;
178
+ }
179
+ else {
180
+ shared_->ownBaseAllocator = baseAllocator_;
181
+ }
182
+ shared_->chunkHead = GetChunkHead(shared_);
183
+ shared_->chunkHead->capacity = 0;
184
+ shared_->chunkHead->size = 0;
185
+ shared_->chunkHead->next = 0;
186
+ shared_->ownBuffer = true;
187
+ shared_->refcount = 1;
126
188
  }
127
189
 
128
190
  //! Constructor with user-supplied buffer.
@@ -136,41 +198,101 @@ public:
136
198
  \param baseAllocator The allocator for allocating memory chunks.
137
199
  */
138
200
  MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
139
- chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
201
+ chunk_capacity_(chunkSize),
202
+ baseAllocator_(baseAllocator),
203
+ shared_(static_cast<SharedData*>(AlignBuffer(buffer, size)))
204
+ {
205
+ RAPIDJSON_ASSERT(size >= SIZEOF_SHARED_DATA + SIZEOF_CHUNK_HEADER);
206
+ shared_->chunkHead = GetChunkHead(shared_);
207
+ shared_->chunkHead->capacity = size - SIZEOF_SHARED_DATA - SIZEOF_CHUNK_HEADER;
208
+ shared_->chunkHead->size = 0;
209
+ shared_->chunkHead->next = 0;
210
+ shared_->ownBaseAllocator = 0;
211
+ shared_->ownBuffer = false;
212
+ shared_->refcount = 1;
213
+ }
214
+
215
+ MemoryPoolAllocator(const MemoryPoolAllocator& rhs) RAPIDJSON_NOEXCEPT :
216
+ chunk_capacity_(rhs.chunk_capacity_),
217
+ baseAllocator_(rhs.baseAllocator_),
218
+ shared_(rhs.shared_)
219
+ {
220
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
221
+ ++shared_->refcount;
222
+ }
223
+ MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) RAPIDJSON_NOEXCEPT
140
224
  {
141
- RAPIDJSON_ASSERT(buffer != 0);
142
- RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
143
- chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
144
- chunkHead_->capacity = size - sizeof(ChunkHeader);
145
- chunkHead_->size = 0;
146
- chunkHead_->next = 0;
225
+ RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
226
+ ++rhs.shared_->refcount;
227
+ this->~MemoryPoolAllocator();
228
+ baseAllocator_ = rhs.baseAllocator_;
229
+ chunk_capacity_ = rhs.chunk_capacity_;
230
+ shared_ = rhs.shared_;
231
+ return *this;
147
232
  }
148
233
 
234
+ #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
235
+ MemoryPoolAllocator(MemoryPoolAllocator&& rhs) RAPIDJSON_NOEXCEPT :
236
+ chunk_capacity_(rhs.chunk_capacity_),
237
+ baseAllocator_(rhs.baseAllocator_),
238
+ shared_(rhs.shared_)
239
+ {
240
+ RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
241
+ rhs.shared_ = 0;
242
+ }
243
+ MemoryPoolAllocator& operator=(MemoryPoolAllocator&& rhs) RAPIDJSON_NOEXCEPT
244
+ {
245
+ RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
246
+ this->~MemoryPoolAllocator();
247
+ baseAllocator_ = rhs.baseAllocator_;
248
+ chunk_capacity_ = rhs.chunk_capacity_;
249
+ shared_ = rhs.shared_;
250
+ rhs.shared_ = 0;
251
+ return *this;
252
+ }
253
+ #endif
254
+
149
255
  //! Destructor.
150
256
  /*! This deallocates all memory chunks, excluding the user-supplied buffer.
151
257
  */
152
- ~MemoryPoolAllocator() {
258
+ ~MemoryPoolAllocator() RAPIDJSON_NOEXCEPT {
259
+ if (!shared_) {
260
+ // do nothing if moved
261
+ return;
262
+ }
263
+ if (shared_->refcount > 1) {
264
+ --shared_->refcount;
265
+ return;
266
+ }
153
267
  Clear();
154
- RAPIDJSON_DELETE(ownBaseAllocator_);
268
+ BaseAllocator *a = shared_->ownBaseAllocator;
269
+ if (shared_->ownBuffer) {
270
+ baseAllocator_->Free(shared_);
271
+ }
272
+ RAPIDJSON_DELETE(a);
155
273
  }
156
274
 
157
- //! Deallocates all memory chunks, excluding the user-supplied buffer.
158
- void Clear() {
159
- while (chunkHead_ && chunkHead_ != userBuffer_) {
160
- ChunkHeader* next = chunkHead_->next;
161
- baseAllocator_->Free(chunkHead_);
162
- chunkHead_ = next;
275
+ //! Deallocates all memory chunks, excluding the first/user one.
276
+ void Clear() RAPIDJSON_NOEXCEPT {
277
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
278
+ for (;;) {
279
+ ChunkHeader* c = shared_->chunkHead;
280
+ if (!c->next) {
281
+ break;
282
+ }
283
+ shared_->chunkHead = c->next;
284
+ baseAllocator_->Free(c);
163
285
  }
164
- if (chunkHead_ && chunkHead_ == userBuffer_)
165
- chunkHead_->size = 0; // Clear user buffer
286
+ shared_->chunkHead->size = 0;
166
287
  }
167
288
 
168
289
  //! Computes the total capacity of allocated memory chunks.
169
290
  /*! \return total capacity in bytes.
170
291
  */
171
- size_t Capacity() const {
292
+ size_t Capacity() const RAPIDJSON_NOEXCEPT {
293
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
172
294
  size_t capacity = 0;
173
- for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
295
+ for (ChunkHeader* c = shared_->chunkHead; c != 0; c = c->next)
174
296
  capacity += c->capacity;
175
297
  return capacity;
176
298
  }
@@ -178,25 +300,35 @@ public:
178
300
  //! Computes the memory blocks allocated.
179
301
  /*! \return total used bytes.
180
302
  */
181
- size_t Size() const {
303
+ size_t Size() const RAPIDJSON_NOEXCEPT {
304
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
182
305
  size_t size = 0;
183
- for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
306
+ for (ChunkHeader* c = shared_->chunkHead; c != 0; c = c->next)
184
307
  size += c->size;
185
308
  return size;
186
309
  }
187
310
 
311
+ //! Whether the allocator is shared.
312
+ /*! \return true or false.
313
+ */
314
+ bool Shared() const RAPIDJSON_NOEXCEPT {
315
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
316
+ return shared_->refcount > 1;
317
+ }
318
+
188
319
  //! Allocates a memory block. (concept Allocator)
189
320
  void* Malloc(size_t size) {
321
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
190
322
  if (!size)
191
323
  return NULL;
192
324
 
193
325
  size = RAPIDJSON_ALIGN(size);
194
- if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
326
+ if (RAPIDJSON_UNLIKELY(shared_->chunkHead->size + size > shared_->chunkHead->capacity))
195
327
  if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
196
328
  return NULL;
197
329
 
198
- void *buffer = reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
199
- chunkHead_->size += size;
330
+ void *buffer = GetChunkBuffer(shared_) + shared_->chunkHead->size;
331
+ shared_->chunkHead->size += size;
200
332
  return buffer;
201
333
  }
202
334
 
@@ -205,6 +337,7 @@ public:
205
337
  if (originalPtr == 0)
206
338
  return Malloc(newSize);
207
339
 
340
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
208
341
  if (newSize == 0)
209
342
  return NULL;
210
343
 
@@ -216,10 +349,10 @@ public:
216
349
  return originalPtr;
217
350
 
218
351
  // Simply expand it if it is the last allocation and there is sufficient space
219
- if (originalPtr == reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
352
+ if (originalPtr == GetChunkBuffer(shared_) + shared_->chunkHead->size - originalSize) {
220
353
  size_t increment = static_cast<size_t>(newSize - originalSize);
221
- if (chunkHead_->size + increment <= chunkHead_->capacity) {
222
- chunkHead_->size += increment;
354
+ if (shared_->chunkHead->size + increment <= shared_->chunkHead->capacity) {
355
+ shared_->chunkHead->size += increment;
223
356
  return originalPtr;
224
357
  }
225
358
  }
@@ -235,50 +368,325 @@ public:
235
368
  }
236
369
 
237
370
  //! Frees a memory block (concept Allocator)
238
- static void Free(void *ptr) { (void)ptr; } // Do nothing
371
+ static void Free(void *ptr) RAPIDJSON_NOEXCEPT { (void)ptr; } // Do nothing
239
372
 
240
- private:
241
- //! Copy constructor is not permitted.
242
- MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
243
- //! Copy assignment operator is not permitted.
244
- MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
373
+ //! Compare (equality) with another MemoryPoolAllocator
374
+ bool operator==(const MemoryPoolAllocator& rhs) const RAPIDJSON_NOEXCEPT {
375
+ RAPIDJSON_NOEXCEPT_ASSERT(shared_->refcount > 0);
376
+ RAPIDJSON_NOEXCEPT_ASSERT(rhs.shared_->refcount > 0);
377
+ return shared_ == rhs.shared_;
378
+ }
379
+ //! Compare (inequality) with another MemoryPoolAllocator
380
+ bool operator!=(const MemoryPoolAllocator& rhs) const RAPIDJSON_NOEXCEPT {
381
+ return !operator==(rhs);
382
+ }
245
383
 
384
+ private:
246
385
  //! Creates a new chunk.
247
386
  /*! \param capacity Capacity of the chunk in bytes.
248
387
  \return true if success.
249
388
  */
250
389
  bool AddChunk(size_t capacity) {
251
390
  if (!baseAllocator_)
252
- ownBaseAllocator_ = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator)();
253
- if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
391
+ shared_->ownBaseAllocator = baseAllocator_ = RAPIDJSON_NEW(BaseAllocator)();
392
+ if (ChunkHeader* chunk = static_cast<ChunkHeader*>(baseAllocator_->Malloc(SIZEOF_CHUNK_HEADER + capacity))) {
254
393
  chunk->capacity = capacity;
255
394
  chunk->size = 0;
256
- chunk->next = chunkHead_;
257
- chunkHead_ = chunk;
395
+ chunk->next = shared_->chunkHead;
396
+ shared_->chunkHead = chunk;
258
397
  return true;
259
398
  }
260
399
  else
261
400
  return false;
262
401
  }
263
402
 
264
- static const int kDefaultChunkCapacity = RAPIDJSON_ALLOCATOR_DEFAULT_CHUNK_CAPACITY; //!< Default chunk capacity.
265
-
266
- //! Chunk header for perpending to each chunk.
267
- /*! Chunks are stored as a singly linked list.
268
- */
269
- struct ChunkHeader {
270
- size_t capacity; //!< Capacity of the chunk in bytes (excluding the header itself).
271
- size_t size; //!< Current size of allocated memory in bytes.
272
- ChunkHeader *next; //!< Next chunk in the linked list.
273
- };
403
+ static inline void* AlignBuffer(void* buf, size_t &size)
404
+ {
405
+ RAPIDJSON_NOEXCEPT_ASSERT(buf != 0);
406
+ const uintptr_t mask = sizeof(void*) - 1;
407
+ const uintptr_t ubuf = reinterpret_cast<uintptr_t>(buf);
408
+ if (RAPIDJSON_UNLIKELY(ubuf & mask)) {
409
+ const uintptr_t abuf = (ubuf + mask) & ~mask;
410
+ RAPIDJSON_ASSERT(size >= abuf - ubuf);
411
+ buf = reinterpret_cast<void*>(abuf);
412
+ size -= abuf - ubuf;
413
+ }
414
+ return buf;
415
+ }
274
416
 
275
- ChunkHeader *chunkHead_; //!< Head of the chunk linked-list. Only the head chunk serves allocation.
276
417
  size_t chunk_capacity_; //!< The minimum capacity of chunk when they are allocated.
277
- void *userBuffer_; //!< User supplied buffer.
278
418
  BaseAllocator* baseAllocator_; //!< base allocator for allocating memory chunks.
279
- BaseAllocator* ownBaseAllocator_; //!< base allocator created by this object.
419
+ SharedData *shared_; //!< The shared data of the allocator
280
420
  };
281
421
 
422
+ namespace internal {
423
+ template<typename, typename = void>
424
+ struct IsRefCounted :
425
+ public FalseType
426
+ { };
427
+ template<typename T>
428
+ struct IsRefCounted<T, typename internal::EnableIfCond<T::kRefCounted>::Type> :
429
+ public TrueType
430
+ { };
431
+ }
432
+
433
+ template<typename T, typename A>
434
+ inline T* Realloc(A& a, T* old_p, size_t old_n, size_t new_n)
435
+ {
436
+ RAPIDJSON_NOEXCEPT_ASSERT(old_n <= SIZE_MAX / sizeof(T) && new_n <= SIZE_MAX / sizeof(T));
437
+ return static_cast<T*>(a.Realloc(old_p, old_n * sizeof(T), new_n * sizeof(T)));
438
+ }
439
+
440
+ template<typename T, typename A>
441
+ inline T *Malloc(A& a, size_t n = 1)
442
+ {
443
+ return Realloc<T, A>(a, NULL, 0, n);
444
+ }
445
+
446
+ template<typename T, typename A>
447
+ inline void Free(A& a, T *p, size_t n = 1)
448
+ {
449
+ static_cast<void>(Realloc<T, A>(a, p, n, 0));
450
+ }
451
+
452
+ #ifdef __GNUC__
453
+ RAPIDJSON_DIAG_PUSH
454
+ RAPIDJSON_DIAG_OFF(effc++) // std::allocator can safely be inherited
455
+ #endif
456
+
457
+ template <typename T, typename BaseAllocator = CrtAllocator>
458
+ class StdAllocator :
459
+ public std::allocator<T>
460
+ {
461
+ typedef std::allocator<T> allocator_type;
462
+ #if RAPIDJSON_HAS_CXX11
463
+ typedef std::allocator_traits<allocator_type> traits_type;
464
+ #else
465
+ typedef allocator_type traits_type;
466
+ #endif
467
+
468
+ public:
469
+ typedef BaseAllocator BaseAllocatorType;
470
+
471
+ StdAllocator() RAPIDJSON_NOEXCEPT :
472
+ allocator_type(),
473
+ baseAllocator_()
474
+ { }
475
+
476
+ StdAllocator(const StdAllocator& rhs) RAPIDJSON_NOEXCEPT :
477
+ allocator_type(rhs),
478
+ baseAllocator_(rhs.baseAllocator_)
479
+ { }
480
+
481
+ template<typename U>
482
+ StdAllocator(const StdAllocator<U, BaseAllocator>& rhs) RAPIDJSON_NOEXCEPT :
483
+ allocator_type(rhs),
484
+ baseAllocator_(rhs.baseAllocator_)
485
+ { }
486
+
487
+ #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
488
+ StdAllocator(StdAllocator&& rhs) RAPIDJSON_NOEXCEPT :
489
+ allocator_type(std::move(rhs)),
490
+ baseAllocator_(std::move(rhs.baseAllocator_))
491
+ { }
492
+ #endif
493
+ #if RAPIDJSON_HAS_CXX11
494
+ using propagate_on_container_move_assignment = std::true_type;
495
+ using propagate_on_container_swap = std::true_type;
496
+ #endif
497
+
498
+ /* implicit */
499
+ StdAllocator(const BaseAllocator& allocator) RAPIDJSON_NOEXCEPT :
500
+ allocator_type(),
501
+ baseAllocator_(allocator)
502
+ { }
503
+
504
+ ~StdAllocator() RAPIDJSON_NOEXCEPT
505
+ { }
506
+
507
+ template<typename U>
508
+ struct rebind {
509
+ typedef StdAllocator<U, BaseAllocator> other;
510
+ };
511
+
512
+ typedef typename traits_type::size_type size_type;
513
+ typedef typename traits_type::difference_type difference_type;
514
+
515
+ typedef typename traits_type::value_type value_type;
516
+ typedef typename traits_type::pointer pointer;
517
+ typedef typename traits_type::const_pointer const_pointer;
518
+
519
+ #if RAPIDJSON_HAS_CXX11
520
+
521
+ typedef typename std::add_lvalue_reference<value_type>::type &reference;
522
+ typedef typename std::add_lvalue_reference<typename std::add_const<value_type>::type>::type &const_reference;
523
+
524
+ pointer address(reference r) const RAPIDJSON_NOEXCEPT
525
+ {
526
+ return std::addressof(r);
527
+ }
528
+ const_pointer address(const_reference r) const RAPIDJSON_NOEXCEPT
529
+ {
530
+ return std::addressof(r);
531
+ }
532
+
533
+ size_type max_size() const RAPIDJSON_NOEXCEPT
534
+ {
535
+ return traits_type::max_size(*this);
536
+ }
537
+
538
+ template <typename ...Args>
539
+ void construct(pointer p, Args&&... args)
540
+ {
541
+ traits_type::construct(*this, p, std::forward<Args>(args)...);
542
+ }
543
+ void destroy(pointer p)
544
+ {
545
+ traits_type::destroy(*this, p);
546
+ }
547
+
548
+ #else // !RAPIDJSON_HAS_CXX11
549
+
550
+ typedef typename allocator_type::reference reference;
551
+ typedef typename allocator_type::const_reference const_reference;
552
+
553
+ pointer address(reference r) const RAPIDJSON_NOEXCEPT
554
+ {
555
+ return allocator_type::address(r);
556
+ }
557
+ const_pointer address(const_reference r) const RAPIDJSON_NOEXCEPT
558
+ {
559
+ return allocator_type::address(r);
560
+ }
561
+
562
+ size_type max_size() const RAPIDJSON_NOEXCEPT
563
+ {
564
+ return allocator_type::max_size();
565
+ }
566
+
567
+ void construct(pointer p, const_reference r)
568
+ {
569
+ allocator_type::construct(p, r);
570
+ }
571
+ void destroy(pointer p)
572
+ {
573
+ allocator_type::destroy(p);
574
+ }
575
+
576
+ #endif // !RAPIDJSON_HAS_CXX11
577
+
578
+ template <typename U>
579
+ U* allocate(size_type n = 1, const void* = 0)
580
+ {
581
+ return RAPIDJSON_NAMESPACE::Malloc<U>(baseAllocator_, n);
582
+ }
583
+ template <typename U>
584
+ void deallocate(U* p, size_type n = 1)
585
+ {
586
+ RAPIDJSON_NAMESPACE::Free<U>(baseAllocator_, p, n);
587
+ }
588
+
589
+ pointer allocate(size_type n = 1, const void* = 0)
590
+ {
591
+ return allocate<value_type>(n);
592
+ }
593
+ void deallocate(pointer p, size_type n = 1)
594
+ {
595
+ deallocate<value_type>(p, n);
596
+ }
597
+
598
+ #if RAPIDJSON_HAS_CXX11
599
+ using is_always_equal = std::is_empty<BaseAllocator>;
600
+ #endif
601
+
602
+ template<typename U>
603
+ bool operator==(const StdAllocator<U, BaseAllocator>& rhs) const RAPIDJSON_NOEXCEPT
604
+ {
605
+ return baseAllocator_ == rhs.baseAllocator_;
606
+ }
607
+ template<typename U>
608
+ bool operator!=(const StdAllocator<U, BaseAllocator>& rhs) const RAPIDJSON_NOEXCEPT
609
+ {
610
+ return !operator==(rhs);
611
+ }
612
+
613
+ //! rapidjson Allocator concept
614
+ static const bool kNeedFree = BaseAllocator::kNeedFree;
615
+ static const bool kRefCounted = internal::IsRefCounted<BaseAllocator>::Value;
616
+ void* Malloc(size_t size)
617
+ {
618
+ return baseAllocator_.Malloc(size);
619
+ }
620
+ void* Realloc(void* originalPtr, size_t originalSize, size_t newSize)
621
+ {
622
+ return baseAllocator_.Realloc(originalPtr, originalSize, newSize);
623
+ }
624
+ static void Free(void *ptr) RAPIDJSON_NOEXCEPT
625
+ {
626
+ BaseAllocator::Free(ptr);
627
+ }
628
+
629
+ private:
630
+ template <typename, typename>
631
+ friend class StdAllocator; // access to StdAllocator<!T>.*
632
+
633
+ BaseAllocator baseAllocator_;
634
+ };
635
+
636
+ #if !RAPIDJSON_HAS_CXX17 // std::allocator<void> deprecated in C++17
637
+ template <typename BaseAllocator>
638
+ class StdAllocator<void, BaseAllocator> :
639
+ public std::allocator<void>
640
+ {
641
+ typedef std::allocator<void> allocator_type;
642
+
643
+ public:
644
+ typedef BaseAllocator BaseAllocatorType;
645
+
646
+ StdAllocator() RAPIDJSON_NOEXCEPT :
647
+ allocator_type(),
648
+ baseAllocator_()
649
+ { }
650
+
651
+ StdAllocator(const StdAllocator& rhs) RAPIDJSON_NOEXCEPT :
652
+ allocator_type(rhs),
653
+ baseAllocator_(rhs.baseAllocator_)
654
+ { }
655
+
656
+ template<typename U>
657
+ StdAllocator(const StdAllocator<U, BaseAllocator>& rhs) RAPIDJSON_NOEXCEPT :
658
+ allocator_type(rhs),
659
+ baseAllocator_(rhs.baseAllocator_)
660
+ { }
661
+
662
+ /* implicit */
663
+ StdAllocator(const BaseAllocator& baseAllocator) RAPIDJSON_NOEXCEPT :
664
+ allocator_type(),
665
+ baseAllocator_(baseAllocator)
666
+ { }
667
+
668
+ ~StdAllocator() RAPIDJSON_NOEXCEPT
669
+ { }
670
+
671
+ template<typename U>
672
+ struct rebind {
673
+ typedef StdAllocator<U, BaseAllocator> other;
674
+ };
675
+
676
+ typedef typename allocator_type::value_type value_type;
677
+
678
+ private:
679
+ template <typename, typename>
680
+ friend class StdAllocator; // access to StdAllocator<!T>.*
681
+
682
+ BaseAllocator baseAllocator_;
683
+ };
684
+ #endif
685
+
686
+ #ifdef __GNUC__
687
+ RAPIDJSON_DIAG_POP
688
+ #endif
689
+
282
690
  RAPIDJSON_NAMESPACE_END
283
691
 
284
692
  #endif // RAPIDJSON_ENCODINGS_H_