msgpack 0.6.0-x86-mswin32-60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +7 -0
- data/.gitignore +20 -0
- data/.travis.yml +26 -0
- data/ChangeLog +129 -0
- data/Dockerfile +62 -0
- data/LICENSE +177 -0
- data/README.rdoc +141 -0
- data/Rakefile +68 -0
- data/bench/pack.rb +23 -0
- data/bench/pack_log.rb +33 -0
- data/bench/pack_log_long.rb +65 -0
- data/bench/run.sh +14 -0
- data/bench/run_long.sh +35 -0
- data/bench/unpack.rb +21 -0
- data/bench/unpack_log.rb +34 -0
- data/bench/unpack_log_long.rb +67 -0
- data/doclib/msgpack.rb +77 -0
- data/doclib/msgpack/buffer.rb +193 -0
- data/doclib/msgpack/core_ext.rb +101 -0
- data/doclib/msgpack/error.rb +14 -0
- data/doclib/msgpack/packer.rb +134 -0
- data/doclib/msgpack/unpacker.rb +146 -0
- data/ext/java/org/msgpack/jruby/Buffer.java +221 -0
- data/ext/java/org/msgpack/jruby/Decoder.java +201 -0
- data/ext/java/org/msgpack/jruby/Encoder.java +308 -0
- data/ext/java/org/msgpack/jruby/ExtensionValue.java +136 -0
- data/ext/java/org/msgpack/jruby/MessagePackLibrary.java +107 -0
- data/ext/java/org/msgpack/jruby/Packer.java +78 -0
- data/ext/java/org/msgpack/jruby/Types.java +37 -0
- data/ext/java/org/msgpack/jruby/Unpacker.java +170 -0
- data/ext/msgpack/buffer.c +695 -0
- data/ext/msgpack/buffer.h +447 -0
- data/ext/msgpack/buffer_class.c +507 -0
- data/ext/msgpack/buffer_class.h +32 -0
- data/ext/msgpack/compat.h +114 -0
- data/ext/msgpack/core_ext.c +129 -0
- data/ext/msgpack/core_ext.h +26 -0
- data/ext/msgpack/extconf.rb +30 -0
- data/ext/msgpack/packer.c +168 -0
- data/ext/msgpack/packer.h +441 -0
- data/ext/msgpack/packer_class.c +302 -0
- data/ext/msgpack/packer_class.h +30 -0
- data/ext/msgpack/rbinit.c +33 -0
- data/ext/msgpack/rmem.c +94 -0
- data/ext/msgpack/rmem.h +109 -0
- data/ext/msgpack/sysdep.h +115 -0
- data/ext/msgpack/sysdep_endian.h +50 -0
- data/ext/msgpack/sysdep_types.h +46 -0
- data/ext/msgpack/unpacker.c +771 -0
- data/ext/msgpack/unpacker.h +122 -0
- data/ext/msgpack/unpacker_class.c +405 -0
- data/ext/msgpack/unpacker_class.h +32 -0
- data/lib/msgpack.rb +13 -0
- data/lib/msgpack/version.rb +3 -0
- data/msgpack.gemspec +31 -0
- data/msgpack.org.md +46 -0
- data/spec/cases.json +1 -0
- data/spec/cases.msg +0 -0
- data/spec/cases_compact.msg +0 -0
- data/spec/cases_spec.rb +39 -0
- data/spec/cruby/buffer_io_spec.rb +256 -0
- data/spec/cruby/buffer_packer.rb +29 -0
- data/spec/cruby/buffer_spec.rb +572 -0
- data/spec/cruby/buffer_unpacker.rb +19 -0
- data/spec/cruby/packer_spec.rb +120 -0
- data/spec/cruby/unpacker_spec.rb +305 -0
- data/spec/format_spec.rb +282 -0
- data/spec/jruby/benchmarks/shootout_bm.rb +73 -0
- data/spec/jruby/benchmarks/symbolize_keys_bm.rb +25 -0
- data/spec/jruby/msgpack/unpacker_spec.rb +290 -0
- data/spec/jruby/msgpack_spec.rb +142 -0
- data/spec/pack_spec.rb +67 -0
- data/spec/random_compat.rb +24 -0
- data/spec/spec_helper.rb +27 -0
- data/spec/unpack_spec.rb +60 -0
- metadata +208 -0
@@ -0,0 +1,447 @@
|
|
1
|
+
/*
|
2
|
+
* MessagePack for Ruby
|
3
|
+
*
|
4
|
+
* Copyright (C) 2008-2013 Sadayuki Furuhashi
|
5
|
+
*
|
6
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
+
* you may not use this file except in compliance with the License.
|
8
|
+
* You may obtain a copy of the License at
|
9
|
+
*
|
10
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
*
|
12
|
+
* Unless required by applicable law or agreed to in writing, software
|
13
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
+
* See the License for the specific language governing permissions and
|
16
|
+
* limitations under the License.
|
17
|
+
*/
|
18
|
+
#ifndef MSGPACK_RUBY_BUFFER_H__
|
19
|
+
#define MSGPACK_RUBY_BUFFER_H__
|
20
|
+
|
21
|
+
#include "compat.h"
|
22
|
+
#include "sysdep.h"
|
23
|
+
|
24
|
+
#ifndef MSGPACK_BUFFER_STRING_WRITE_REFERENCE_DEFAULT
|
25
|
+
#define MSGPACK_BUFFER_STRING_WRITE_REFERENCE_DEFAULT (512*1024)
|
26
|
+
#endif
|
27
|
+
|
28
|
+
/* at least 23 (RSTRING_EMBED_LEN_MAX) bytes */
|
29
|
+
#ifndef MSGPACK_BUFFER_STRING_WRITE_REFERENCE_MINIMUM
|
30
|
+
#define MSGPACK_BUFFER_STRING_WRITE_REFERENCE_MINIMUM 256
|
31
|
+
#endif
|
32
|
+
|
33
|
+
#ifndef MSGPACK_BUFFER_STRING_READ_REFERENCE_DEFAULT
|
34
|
+
#define MSGPACK_BUFFER_STRING_READ_REFERENCE_DEFAULT 256
|
35
|
+
#endif
|
36
|
+
|
37
|
+
/* at least 23 (RSTRING_EMBED_LEN_MAX) bytes */
|
38
|
+
#ifndef MSGPACK_BUFFER_STRING_READ_REFERENCE_MINIMUM
|
39
|
+
#define MSGPACK_BUFFER_STRING_READ_REFERENCE_MINIMUM 256
|
40
|
+
#endif
|
41
|
+
|
42
|
+
#ifndef MSGPACK_BUFFER_IO_BUFFER_SIZE_DEFAULT
|
43
|
+
#define MSGPACK_BUFFER_IO_BUFFER_SIZE_DEFAULT (32*1024)
|
44
|
+
#endif
|
45
|
+
|
46
|
+
#ifndef MSGPACK_BUFFER_IO_BUFFER_SIZE_MINIMUM
|
47
|
+
#define MSGPACK_BUFFER_IO_BUFFER_SIZE_MINIMUM (1024)
|
48
|
+
#endif
|
49
|
+
|
50
|
+
#define NO_MAPPED_STRING ((VALUE)0)
|
51
|
+
|
52
|
+
#ifdef COMPAT_HAVE_ENCODING /* see compat.h*/
|
53
|
+
extern int msgpack_rb_encindex_utf8;
|
54
|
+
extern int msgpack_rb_encindex_usascii;
|
55
|
+
extern int msgpack_rb_encindex_ascii8bit;
|
56
|
+
#endif
|
57
|
+
|
58
|
+
struct msgpack_buffer_chunk_t;
|
59
|
+
typedef struct msgpack_buffer_chunk_t msgpack_buffer_chunk_t;
|
60
|
+
|
61
|
+
struct msgpack_buffer_t;
|
62
|
+
typedef struct msgpack_buffer_t msgpack_buffer_t;
|
63
|
+
|
64
|
+
/*
|
65
|
+
* msgpack_buffer_chunk_t
|
66
|
+
* +----------------+
|
67
|
+
* | filled | free |
|
68
|
+
* +---------+------+
|
69
|
+
* ^ first ^ last
|
70
|
+
*/
|
71
|
+
struct msgpack_buffer_chunk_t {
|
72
|
+
char* first;
|
73
|
+
char* last;
|
74
|
+
void* mem;
|
75
|
+
msgpack_buffer_chunk_t* next;
|
76
|
+
VALUE mapped_string; /* RBString or NO_MAPPED_STRING */
|
77
|
+
};
|
78
|
+
|
79
|
+
union msgpack_buffer_cast_block_t {
|
80
|
+
char buffer[8];
|
81
|
+
uint8_t u8;
|
82
|
+
uint16_t u16;
|
83
|
+
uint32_t u32;
|
84
|
+
uint64_t u64;
|
85
|
+
int8_t i8;
|
86
|
+
int16_t i16;
|
87
|
+
int32_t i32;
|
88
|
+
int64_t i64;
|
89
|
+
float f;
|
90
|
+
double d;
|
91
|
+
};
|
92
|
+
|
93
|
+
struct msgpack_buffer_t {
|
94
|
+
char* read_buffer;
|
95
|
+
char* tail_buffer_end;
|
96
|
+
|
97
|
+
msgpack_buffer_chunk_t tail;
|
98
|
+
msgpack_buffer_chunk_t* head;
|
99
|
+
msgpack_buffer_chunk_t* free_list;
|
100
|
+
|
101
|
+
#ifndef DISABLE_RMEM
|
102
|
+
char* rmem_last;
|
103
|
+
char* rmem_end;
|
104
|
+
void** rmem_owner;
|
105
|
+
#endif
|
106
|
+
|
107
|
+
union msgpack_buffer_cast_block_t cast_block;
|
108
|
+
|
109
|
+
VALUE io;
|
110
|
+
VALUE io_buffer;
|
111
|
+
ID io_write_all_method;
|
112
|
+
ID io_partial_read_method;
|
113
|
+
|
114
|
+
size_t write_reference_threshold;
|
115
|
+
size_t read_reference_threshold;
|
116
|
+
size_t io_buffer_size;
|
117
|
+
|
118
|
+
VALUE owner;
|
119
|
+
};
|
120
|
+
|
121
|
+
/*
|
122
|
+
* initialization functions
|
123
|
+
*/
|
124
|
+
void msgpack_buffer_static_init();
|
125
|
+
|
126
|
+
void msgpack_buffer_static_destroy();
|
127
|
+
|
128
|
+
void msgpack_buffer_init(msgpack_buffer_t* b);
|
129
|
+
|
130
|
+
void msgpack_buffer_destroy(msgpack_buffer_t* b);
|
131
|
+
|
132
|
+
void msgpack_buffer_mark(msgpack_buffer_t* b);
|
133
|
+
|
134
|
+
void msgpack_buffer_clear(msgpack_buffer_t* b);
|
135
|
+
|
136
|
+
static inline void msgpack_buffer_set_write_reference_threshold(msgpack_buffer_t* b, size_t length)
|
137
|
+
{
|
138
|
+
if(length < MSGPACK_BUFFER_STRING_WRITE_REFERENCE_MINIMUM) {
|
139
|
+
length = MSGPACK_BUFFER_STRING_WRITE_REFERENCE_MINIMUM;
|
140
|
+
}
|
141
|
+
b->write_reference_threshold = length;
|
142
|
+
}
|
143
|
+
|
144
|
+
static inline void msgpack_buffer_set_read_reference_threshold(msgpack_buffer_t* b, size_t length)
|
145
|
+
{
|
146
|
+
if(length < MSGPACK_BUFFER_STRING_READ_REFERENCE_MINIMUM) {
|
147
|
+
length = MSGPACK_BUFFER_STRING_READ_REFERENCE_MINIMUM;
|
148
|
+
}
|
149
|
+
b->read_reference_threshold = length;
|
150
|
+
}
|
151
|
+
|
152
|
+
static inline void msgpack_buffer_set_io_buffer_size(msgpack_buffer_t* b, size_t length)
|
153
|
+
{
|
154
|
+
if(length < MSGPACK_BUFFER_IO_BUFFER_SIZE_MINIMUM) {
|
155
|
+
length = MSGPACK_BUFFER_IO_BUFFER_SIZE_MINIMUM;
|
156
|
+
}
|
157
|
+
b->io_buffer_size = length;
|
158
|
+
}
|
159
|
+
|
160
|
+
static inline void msgpack_buffer_reset_io(msgpack_buffer_t* b)
|
161
|
+
{
|
162
|
+
b->io = Qnil;
|
163
|
+
}
|
164
|
+
|
165
|
+
static inline bool msgpack_buffer_has_io(msgpack_buffer_t* b)
|
166
|
+
{
|
167
|
+
return b->io != Qnil;
|
168
|
+
}
|
169
|
+
|
170
|
+
static inline void msgpack_buffer_reset(msgpack_buffer_t* b)
|
171
|
+
{
|
172
|
+
msgpack_buffer_clear(b);
|
173
|
+
msgpack_buffer_reset_io(b);
|
174
|
+
}
|
175
|
+
|
176
|
+
|
177
|
+
/*
|
178
|
+
* writer functions
|
179
|
+
*/
|
180
|
+
|
181
|
+
static inline size_t msgpack_buffer_writable_size(const msgpack_buffer_t* b)
|
182
|
+
{
|
183
|
+
return b->tail_buffer_end - b->tail.last;
|
184
|
+
}
|
185
|
+
|
186
|
+
static inline void msgpack_buffer_write_1(msgpack_buffer_t* b, int byte)
|
187
|
+
{
|
188
|
+
(*b->tail.last++) = (char) byte;
|
189
|
+
}
|
190
|
+
|
191
|
+
static inline void msgpack_buffer_write_2(msgpack_buffer_t* b, int byte1, unsigned char byte2)
|
192
|
+
{
|
193
|
+
*(b->tail.last++) = (char) byte1;
|
194
|
+
*(b->tail.last++) = (char) byte2;
|
195
|
+
}
|
196
|
+
|
197
|
+
static inline void msgpack_buffer_write_byte_and_data(msgpack_buffer_t* b, int byte, const void* data, size_t length)
|
198
|
+
{
|
199
|
+
(*b->tail.last++) = (char) byte;
|
200
|
+
|
201
|
+
memcpy(b->tail.last, data, length);
|
202
|
+
b->tail.last += length;
|
203
|
+
}
|
204
|
+
|
205
|
+
void _msgpack_buffer_expand(msgpack_buffer_t* b, const char* data, size_t length, bool use_flush);
|
206
|
+
|
207
|
+
size_t msgpack_buffer_flush_to_io(msgpack_buffer_t* b, VALUE io, ID write_method, bool consume);
|
208
|
+
|
209
|
+
static inline size_t msgpack_buffer_flush(msgpack_buffer_t* b)
|
210
|
+
{
|
211
|
+
if(b->io == Qnil) {
|
212
|
+
return 0;
|
213
|
+
}
|
214
|
+
return msgpack_buffer_flush_to_io(b, b->io, b->io_write_all_method, true);
|
215
|
+
}
|
216
|
+
|
217
|
+
static inline void msgpack_buffer_ensure_writable(msgpack_buffer_t* b, size_t require)
|
218
|
+
{
|
219
|
+
if(msgpack_buffer_writable_size(b) < require) {
|
220
|
+
_msgpack_buffer_expand(b, NULL, require, true);
|
221
|
+
}
|
222
|
+
}
|
223
|
+
|
224
|
+
static inline void _msgpack_buffer_append_impl(msgpack_buffer_t* b, const char* data, size_t length, bool flush_to_io)
|
225
|
+
{
|
226
|
+
if(length == 0) {
|
227
|
+
return;
|
228
|
+
}
|
229
|
+
|
230
|
+
if(length <= msgpack_buffer_writable_size(b)) {
|
231
|
+
memcpy(b->tail.last, data, length);
|
232
|
+
b->tail.last += length;
|
233
|
+
return;
|
234
|
+
}
|
235
|
+
|
236
|
+
_msgpack_buffer_expand(b, data, length, flush_to_io);
|
237
|
+
}
|
238
|
+
|
239
|
+
static inline void msgpack_buffer_append(msgpack_buffer_t* b, const char* data, size_t length)
|
240
|
+
{
|
241
|
+
_msgpack_buffer_append_impl(b, data, length, true);
|
242
|
+
}
|
243
|
+
|
244
|
+
static inline void msgpack_buffer_append_nonblock(msgpack_buffer_t* b, const char* data, size_t length)
|
245
|
+
{
|
246
|
+
_msgpack_buffer_append_impl(b, data, length, false);
|
247
|
+
}
|
248
|
+
|
249
|
+
void _msgpack_buffer_append_long_string(msgpack_buffer_t* b, VALUE string);
|
250
|
+
|
251
|
+
static inline size_t msgpack_buffer_append_string(msgpack_buffer_t* b, VALUE string)
|
252
|
+
{
|
253
|
+
size_t length = RSTRING_LEN(string);
|
254
|
+
|
255
|
+
if(length > b->write_reference_threshold) {
|
256
|
+
_msgpack_buffer_append_long_string(b, string);
|
257
|
+
|
258
|
+
} else {
|
259
|
+
msgpack_buffer_append(b, RSTRING_PTR(string), length);
|
260
|
+
}
|
261
|
+
|
262
|
+
return length;
|
263
|
+
}
|
264
|
+
|
265
|
+
|
266
|
+
/*
|
267
|
+
* IO functions
|
268
|
+
*/
|
269
|
+
size_t _msgpack_buffer_feed_from_io(msgpack_buffer_t* b);
|
270
|
+
|
271
|
+
size_t _msgpack_buffer_read_from_io_to_string(msgpack_buffer_t* b, VALUE string, size_t length);
|
272
|
+
|
273
|
+
size_t _msgpack_buffer_skip_from_io(msgpack_buffer_t* b, size_t length);
|
274
|
+
|
275
|
+
|
276
|
+
/*
|
277
|
+
* reader functions
|
278
|
+
*/
|
279
|
+
|
280
|
+
static inline size_t msgpack_buffer_top_readable_size(const msgpack_buffer_t* b)
|
281
|
+
{
|
282
|
+
return b->head->last - b->read_buffer;
|
283
|
+
}
|
284
|
+
|
285
|
+
size_t msgpack_buffer_all_readable_size(const msgpack_buffer_t* b);
|
286
|
+
|
287
|
+
bool _msgpack_buffer_shift_chunk(msgpack_buffer_t* b);
|
288
|
+
|
289
|
+
static inline void _msgpack_buffer_consumed(msgpack_buffer_t* b, size_t length)
|
290
|
+
{
|
291
|
+
b->read_buffer += length;
|
292
|
+
if(b->read_buffer >= b->head->last) {
|
293
|
+
_msgpack_buffer_shift_chunk(b);
|
294
|
+
}
|
295
|
+
}
|
296
|
+
|
297
|
+
static inline int msgpack_buffer_peek_top_1(msgpack_buffer_t* b)
|
298
|
+
{
|
299
|
+
return (int) (unsigned char) b->read_buffer[0];
|
300
|
+
}
|
301
|
+
|
302
|
+
static inline int msgpack_buffer_read_top_1(msgpack_buffer_t* b)
|
303
|
+
{
|
304
|
+
int r = (int) (unsigned char) b->read_buffer[0];
|
305
|
+
|
306
|
+
_msgpack_buffer_consumed(b, 1);
|
307
|
+
|
308
|
+
return r;
|
309
|
+
}
|
310
|
+
|
311
|
+
static inline int msgpack_buffer_read_1(msgpack_buffer_t* b)
|
312
|
+
{
|
313
|
+
if(msgpack_buffer_top_readable_size(b) <= 0) {
|
314
|
+
if(b->io == Qnil) {
|
315
|
+
return -1;
|
316
|
+
}
|
317
|
+
_msgpack_buffer_feed_from_io(b);
|
318
|
+
}
|
319
|
+
|
320
|
+
int r = (int) (unsigned char) b->read_buffer[0];
|
321
|
+
_msgpack_buffer_consumed(b, 1);
|
322
|
+
|
323
|
+
return r;
|
324
|
+
}
|
325
|
+
|
326
|
+
|
327
|
+
/*
|
328
|
+
* bulk read / skip functions
|
329
|
+
*/
|
330
|
+
|
331
|
+
size_t msgpack_buffer_read_nonblock(msgpack_buffer_t* b, char* buffer, size_t length);
|
332
|
+
|
333
|
+
static inline bool msgpack_buffer_ensure_readable(msgpack_buffer_t* b, size_t require)
|
334
|
+
{
|
335
|
+
if(msgpack_buffer_top_readable_size(b) < require) {
|
336
|
+
size_t sz = msgpack_buffer_all_readable_size(b);
|
337
|
+
if(sz < require) {
|
338
|
+
if(b->io == Qnil) {
|
339
|
+
return false;
|
340
|
+
}
|
341
|
+
do {
|
342
|
+
size_t rl = _msgpack_buffer_feed_from_io(b);
|
343
|
+
sz += rl;
|
344
|
+
} while(sz < require);
|
345
|
+
}
|
346
|
+
}
|
347
|
+
return true;
|
348
|
+
}
|
349
|
+
|
350
|
+
bool _msgpack_buffer_read_all2(msgpack_buffer_t* b, char* buffer, size_t length);
|
351
|
+
|
352
|
+
static inline bool msgpack_buffer_read_all(msgpack_buffer_t* b, char* buffer, size_t length)
|
353
|
+
{
|
354
|
+
size_t avail = msgpack_buffer_top_readable_size(b);
|
355
|
+
if(avail < length) {
|
356
|
+
return _msgpack_buffer_read_all2(b, buffer, length);
|
357
|
+
}
|
358
|
+
|
359
|
+
memcpy(buffer, b->read_buffer, length);
|
360
|
+
_msgpack_buffer_consumed(b, length);
|
361
|
+
return true;
|
362
|
+
}
|
363
|
+
|
364
|
+
static inline size_t msgpack_buffer_skip_nonblock(msgpack_buffer_t* b, size_t length)
|
365
|
+
{
|
366
|
+
size_t avail = msgpack_buffer_top_readable_size(b);
|
367
|
+
if(avail < length) {
|
368
|
+
return msgpack_buffer_read_nonblock(b, NULL, length);
|
369
|
+
}
|
370
|
+
_msgpack_buffer_consumed(b, length);
|
371
|
+
return length;
|
372
|
+
}
|
373
|
+
|
374
|
+
static inline union msgpack_buffer_cast_block_t* msgpack_buffer_read_cast_block(msgpack_buffer_t* b, size_t n)
|
375
|
+
{
|
376
|
+
if(!msgpack_buffer_read_all(b, b->cast_block.buffer, n)) {
|
377
|
+
return NULL;
|
378
|
+
}
|
379
|
+
return &b->cast_block;
|
380
|
+
}
|
381
|
+
|
382
|
+
size_t msgpack_buffer_read_to_string_nonblock(msgpack_buffer_t* b, VALUE string, size_t length);
|
383
|
+
|
384
|
+
static inline size_t msgpack_buffer_read_to_string(msgpack_buffer_t* b, VALUE string, size_t length)
|
385
|
+
{
|
386
|
+
if(length == 0) {
|
387
|
+
return 0;
|
388
|
+
}
|
389
|
+
|
390
|
+
size_t avail = msgpack_buffer_top_readable_size(b);
|
391
|
+
if(avail > 0) {
|
392
|
+
return msgpack_buffer_read_to_string_nonblock(b, string, length);
|
393
|
+
} else if(b->io != Qnil) {
|
394
|
+
return _msgpack_buffer_read_from_io_to_string(b, string, length);
|
395
|
+
} else {
|
396
|
+
return 0;
|
397
|
+
}
|
398
|
+
}
|
399
|
+
|
400
|
+
static inline size_t msgpack_buffer_skip(msgpack_buffer_t* b, size_t length)
|
401
|
+
{
|
402
|
+
if(length == 0) {
|
403
|
+
return 0;
|
404
|
+
}
|
405
|
+
|
406
|
+
size_t avail = msgpack_buffer_top_readable_size(b);
|
407
|
+
if(avail > 0) {
|
408
|
+
return msgpack_buffer_skip_nonblock(b, length);
|
409
|
+
} else if(b->io != Qnil) {
|
410
|
+
return _msgpack_buffer_skip_from_io(b, length);
|
411
|
+
} else {
|
412
|
+
return 0;
|
413
|
+
}
|
414
|
+
}
|
415
|
+
|
416
|
+
|
417
|
+
VALUE msgpack_buffer_all_as_string(msgpack_buffer_t* b);
|
418
|
+
|
419
|
+
VALUE msgpack_buffer_all_as_string_array(msgpack_buffer_t* b);
|
420
|
+
|
421
|
+
static inline VALUE _msgpack_buffer_refer_head_mapped_string(msgpack_buffer_t* b, size_t length)
|
422
|
+
{
|
423
|
+
size_t offset = b->read_buffer - b->head->first;
|
424
|
+
return rb_str_substr(b->head->mapped_string, offset, length);
|
425
|
+
}
|
426
|
+
|
427
|
+
static inline VALUE msgpack_buffer_read_top_as_string(msgpack_buffer_t* b, size_t length, bool will_be_frozen)
|
428
|
+
{
|
429
|
+
#ifndef DISABLE_BUFFER_READ_REFERENCE_OPTIMIZE
|
430
|
+
/* optimize */
|
431
|
+
if(!will_be_frozen &&
|
432
|
+
b->head->mapped_string != NO_MAPPED_STRING &&
|
433
|
+
length >= b->read_reference_threshold) {
|
434
|
+
VALUE result = _msgpack_buffer_refer_head_mapped_string(b, length);
|
435
|
+
_msgpack_buffer_consumed(b, length);
|
436
|
+
return result;
|
437
|
+
}
|
438
|
+
#endif
|
439
|
+
|
440
|
+
VALUE result = rb_str_new(b->read_buffer, length);
|
441
|
+
_msgpack_buffer_consumed(b, length);
|
442
|
+
return result;
|
443
|
+
}
|
444
|
+
|
445
|
+
|
446
|
+
#endif
|
447
|
+
|
@@ -0,0 +1,507 @@
|
|
1
|
+
/*
|
2
|
+
* MessagePack for Ruby
|
3
|
+
*
|
4
|
+
* Copyright (C) 2008-2013 Sadayuki Furuhashi
|
5
|
+
*
|
6
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
+
* you may not use this file except in compliance with the License.
|
8
|
+
* You may obtain a copy of the License at
|
9
|
+
*
|
10
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
*
|
12
|
+
* Unless required by applicable law or agreed to in writing, software
|
13
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
+
* See the License for the specific language governing permissions and
|
16
|
+
* limitations under the License.
|
17
|
+
*/
|
18
|
+
|
19
|
+
#include "compat.h"
|
20
|
+
#include "ruby.h"
|
21
|
+
#include "buffer.h"
|
22
|
+
#include "buffer_class.h"
|
23
|
+
|
24
|
+
VALUE cMessagePack_Buffer;
|
25
|
+
|
26
|
+
static ID s_read;
|
27
|
+
static ID s_readpartial;
|
28
|
+
static ID s_write;
|
29
|
+
static ID s_append;
|
30
|
+
static ID s_close;
|
31
|
+
|
32
|
+
#define BUFFER(from, name) \
|
33
|
+
msgpack_buffer_t *name = NULL; \
|
34
|
+
Data_Get_Struct(from, msgpack_buffer_t, name); \
|
35
|
+
if(name == NULL) { \
|
36
|
+
rb_raise(rb_eArgError, "NULL found for " # name " when shouldn't be."); \
|
37
|
+
}
|
38
|
+
|
39
|
+
#define CHECK_STRING_TYPE(value) \
|
40
|
+
value = rb_check_string_type(value); \
|
41
|
+
if( NIL_P(value) ) { \
|
42
|
+
rb_raise(rb_eTypeError, "instance of String needed"); \
|
43
|
+
}
|
44
|
+
|
45
|
+
static void Buffer_free(void* data)
|
46
|
+
{
|
47
|
+
if(data == NULL) {
|
48
|
+
return;
|
49
|
+
}
|
50
|
+
msgpack_buffer_t* b = (msgpack_buffer_t*) data;
|
51
|
+
msgpack_buffer_destroy(b);
|
52
|
+
free(b);
|
53
|
+
}
|
54
|
+
|
55
|
+
static VALUE Buffer_alloc(VALUE klass)
|
56
|
+
{
|
57
|
+
msgpack_buffer_t* b = ALLOC_N(msgpack_buffer_t, 1);
|
58
|
+
msgpack_buffer_init(b);
|
59
|
+
|
60
|
+
return Data_Wrap_Struct(klass, msgpack_buffer_mark, Buffer_free, b);
|
61
|
+
}
|
62
|
+
|
63
|
+
static ID get_partial_read_method(VALUE io)
|
64
|
+
{
|
65
|
+
if(rb_respond_to(io, s_readpartial)) {
|
66
|
+
return s_readpartial;
|
67
|
+
} else if(rb_respond_to(io, s_read)) {
|
68
|
+
return s_read;
|
69
|
+
} else {
|
70
|
+
return s_read;
|
71
|
+
}
|
72
|
+
}
|
73
|
+
|
74
|
+
static ID get_write_all_method(VALUE io)
|
75
|
+
{
|
76
|
+
if(rb_respond_to(io, s_write)) {
|
77
|
+
return s_write;
|
78
|
+
} else if(rb_respond_to(io, s_append)) {
|
79
|
+
return s_append;
|
80
|
+
} else {
|
81
|
+
return s_write;
|
82
|
+
}
|
83
|
+
}
|
84
|
+
|
85
|
+
void MessagePack_Buffer_initialize(msgpack_buffer_t* b, VALUE io, VALUE options)
|
86
|
+
{
|
87
|
+
b->io = io;
|
88
|
+
b->io_partial_read_method = get_partial_read_method(io);
|
89
|
+
b->io_write_all_method = get_write_all_method(io);
|
90
|
+
|
91
|
+
if(options != Qnil) {
|
92
|
+
VALUE v;
|
93
|
+
|
94
|
+
v = rb_hash_aref(options, ID2SYM(rb_intern("read_reference_threshold")));
|
95
|
+
if(v != Qnil) {
|
96
|
+
msgpack_buffer_set_read_reference_threshold(b, NUM2ULONG(v));
|
97
|
+
}
|
98
|
+
|
99
|
+
v = rb_hash_aref(options, ID2SYM(rb_intern("write_reference_threshold")));
|
100
|
+
if(v != Qnil) {
|
101
|
+
msgpack_buffer_set_write_reference_threshold(b, NUM2ULONG(v));
|
102
|
+
}
|
103
|
+
|
104
|
+
v = rb_hash_aref(options, ID2SYM(rb_intern("io_buffer_size")));
|
105
|
+
if(v != Qnil) {
|
106
|
+
msgpack_buffer_set_io_buffer_size(b, NUM2ULONG(v));
|
107
|
+
}
|
108
|
+
}
|
109
|
+
}
|
110
|
+
|
111
|
+
VALUE MessagePack_Buffer_wrap(msgpack_buffer_t* b, VALUE owner)
|
112
|
+
{
|
113
|
+
b->owner = owner;
|
114
|
+
return Data_Wrap_Struct(cMessagePack_Buffer, msgpack_buffer_mark, NULL, b);
|
115
|
+
}
|
116
|
+
|
117
|
+
static VALUE Buffer_initialize(int argc, VALUE* argv, VALUE self)
|
118
|
+
{
|
119
|
+
VALUE io = Qnil;
|
120
|
+
VALUE options = Qnil;
|
121
|
+
|
122
|
+
if(argc == 0 || (argc == 1 && argv[0] == Qnil)) {
|
123
|
+
/* Qnil */
|
124
|
+
|
125
|
+
} else if(argc == 1) {
|
126
|
+
VALUE v = argv[0];
|
127
|
+
if(rb_type(v) == T_HASH) {
|
128
|
+
options = v;
|
129
|
+
} else {
|
130
|
+
io = v;
|
131
|
+
}
|
132
|
+
|
133
|
+
} else if(argc == 2) {
|
134
|
+
io = argv[0];
|
135
|
+
options = argv[1];
|
136
|
+
if(rb_type(options) != T_HASH) {
|
137
|
+
rb_raise(rb_eArgError, "expected Hash but found %s.", rb_obj_classname(io));
|
138
|
+
}
|
139
|
+
|
140
|
+
} else {
|
141
|
+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..1)", argc);
|
142
|
+
}
|
143
|
+
|
144
|
+
BUFFER(self, b);
|
145
|
+
|
146
|
+
MessagePack_Buffer_initialize(b, io, options);
|
147
|
+
|
148
|
+
return self;
|
149
|
+
}
|
150
|
+
|
151
|
+
static VALUE Buffer_clear(VALUE self)
|
152
|
+
{
|
153
|
+
BUFFER(self, b);
|
154
|
+
msgpack_buffer_clear(b);
|
155
|
+
return Qnil;
|
156
|
+
}
|
157
|
+
|
158
|
+
static VALUE Buffer_size(VALUE self)
|
159
|
+
{
|
160
|
+
BUFFER(self, b);
|
161
|
+
size_t size = msgpack_buffer_all_readable_size(b);
|
162
|
+
return SIZET2NUM(size);
|
163
|
+
}
|
164
|
+
|
165
|
+
static VALUE Buffer_empty_p(VALUE self)
|
166
|
+
{
|
167
|
+
BUFFER(self, b);
|
168
|
+
if(msgpack_buffer_top_readable_size(b) == 0) {
|
169
|
+
return Qtrue;
|
170
|
+
} else {
|
171
|
+
return Qfalse;
|
172
|
+
}
|
173
|
+
}
|
174
|
+
|
175
|
+
static VALUE Buffer_write(VALUE self, VALUE string_or_buffer)
|
176
|
+
{
|
177
|
+
BUFFER(self, b);
|
178
|
+
|
179
|
+
VALUE string = string_or_buffer; // TODO optimize if string_or_buffer is a Buffer
|
180
|
+
StringValue(string);
|
181
|
+
|
182
|
+
size_t length = msgpack_buffer_append_string(b, string);
|
183
|
+
|
184
|
+
return SIZET2NUM(length);
|
185
|
+
}
|
186
|
+
|
187
|
+
static VALUE Buffer_append(VALUE self, VALUE string_or_buffer)
|
188
|
+
{
|
189
|
+
BUFFER(self, b);
|
190
|
+
|
191
|
+
VALUE string = string_or_buffer; // TODO optimize if string_or_buffer is a Buffer
|
192
|
+
StringValue(string);
|
193
|
+
|
194
|
+
msgpack_buffer_append_string(b, string);
|
195
|
+
|
196
|
+
return self;
|
197
|
+
}
|
198
|
+
|
199
|
+
|
200
|
+
#define MAKE_EMPTY_STRING(orig) \
|
201
|
+
if(orig == Qnil) { \
|
202
|
+
orig = rb_str_buf_new(0); \
|
203
|
+
} else { \
|
204
|
+
rb_str_resize(orig, 0); \
|
205
|
+
}
|
206
|
+
|
207
|
+
static VALUE read_until_eof_rescue(VALUE args)
|
208
|
+
{
|
209
|
+
msgpack_buffer_t* b = (void*) ((VALUE*) args)[0];
|
210
|
+
VALUE out = ((VALUE*) args)[1];
|
211
|
+
unsigned long max = ((VALUE*) args)[2];
|
212
|
+
size_t* sz = (void*) ((VALUE*) args)[3];
|
213
|
+
|
214
|
+
while(true) {
|
215
|
+
size_t rl;
|
216
|
+
if(max == 0) {
|
217
|
+
if(out == Qnil) {
|
218
|
+
rl = msgpack_buffer_skip(b, b->io_buffer_size);
|
219
|
+
} else {
|
220
|
+
rl = msgpack_buffer_read_to_string(b, out, b->io_buffer_size);
|
221
|
+
}
|
222
|
+
if(rl == 0) {
|
223
|
+
break;
|
224
|
+
}
|
225
|
+
*sz += rl;
|
226
|
+
|
227
|
+
} else {
|
228
|
+
if(out == Qnil) {
|
229
|
+
rl = msgpack_buffer_skip(b, max);
|
230
|
+
} else {
|
231
|
+
rl = msgpack_buffer_read_to_string(b, out, max);
|
232
|
+
}
|
233
|
+
if(rl == 0) {
|
234
|
+
break;
|
235
|
+
}
|
236
|
+
*sz += rl;
|
237
|
+
if(max <= rl) {
|
238
|
+
break;
|
239
|
+
} else {
|
240
|
+
max -= rl;
|
241
|
+
}
|
242
|
+
}
|
243
|
+
}
|
244
|
+
|
245
|
+
return Qnil;
|
246
|
+
}
|
247
|
+
|
248
|
+
static VALUE read_until_eof_error(VALUE args)
|
249
|
+
{
|
250
|
+
/* ignore EOFError */
|
251
|
+
UNUSED(args);
|
252
|
+
return Qnil;
|
253
|
+
}
|
254
|
+
|
255
|
+
static inline size_t read_until_eof(msgpack_buffer_t* b, VALUE out, unsigned long max)
|
256
|
+
{
|
257
|
+
if(msgpack_buffer_has_io(b)) {
|
258
|
+
size_t sz = 0;
|
259
|
+
VALUE args[4] = { (VALUE)(void*) b, out, (VALUE) max, (VALUE)(void*) &sz };
|
260
|
+
rb_rescue2(read_until_eof_rescue, (VALUE)(void*) args,
|
261
|
+
read_until_eof_error, (VALUE)(void*) args,
|
262
|
+
rb_eEOFError, NULL);
|
263
|
+
return sz;
|
264
|
+
|
265
|
+
} else {
|
266
|
+
if(max == 0) {
|
267
|
+
max = ULONG_MAX;
|
268
|
+
}
|
269
|
+
if(out == Qnil) {
|
270
|
+
return msgpack_buffer_skip_nonblock(b, max);
|
271
|
+
} else {
|
272
|
+
return msgpack_buffer_read_to_string_nonblock(b, out, max);
|
273
|
+
}
|
274
|
+
}
|
275
|
+
}
|
276
|
+
|
277
|
+
static inline VALUE read_all(msgpack_buffer_t* b, VALUE out)
|
278
|
+
{
|
279
|
+
#ifndef DISABLE_BUFFER_READ_TO_S_OPTIMIZE
|
280
|
+
if(out == Qnil && !msgpack_buffer_has_io(b)) {
|
281
|
+
/* same as to_s && clear; optimize */
|
282
|
+
VALUE str = msgpack_buffer_all_as_string(b);
|
283
|
+
msgpack_buffer_clear(b);
|
284
|
+
return str;
|
285
|
+
}
|
286
|
+
#endif
|
287
|
+
MAKE_EMPTY_STRING(out);
|
288
|
+
read_until_eof(b, out, 0);
|
289
|
+
return out;
|
290
|
+
}
|
291
|
+
|
292
|
+
static VALUE Buffer_skip(VALUE self, VALUE sn)
|
293
|
+
{
|
294
|
+
BUFFER(self, b);
|
295
|
+
|
296
|
+
unsigned long n = FIX2ULONG(sn);
|
297
|
+
|
298
|
+
/* do nothing */
|
299
|
+
if(n == 0) {
|
300
|
+
return ULONG2NUM(0);
|
301
|
+
}
|
302
|
+
|
303
|
+
size_t sz = read_until_eof(b, Qnil, n);
|
304
|
+
return ULONG2NUM(sz);
|
305
|
+
}
|
306
|
+
|
307
|
+
static VALUE Buffer_skip_all(VALUE self, VALUE sn)
|
308
|
+
{
|
309
|
+
BUFFER(self, b);
|
310
|
+
|
311
|
+
unsigned long n = FIX2ULONG(sn);
|
312
|
+
|
313
|
+
/* do nothing */
|
314
|
+
if(n == 0) {
|
315
|
+
return self;
|
316
|
+
}
|
317
|
+
|
318
|
+
if(!msgpack_buffer_ensure_readable(b, n)) {
|
319
|
+
rb_raise(rb_eEOFError, "end of buffer reached");
|
320
|
+
}
|
321
|
+
|
322
|
+
msgpack_buffer_skip_nonblock(b, n);
|
323
|
+
|
324
|
+
return self;
|
325
|
+
}
|
326
|
+
|
327
|
+
static VALUE Buffer_read_all(int argc, VALUE* argv, VALUE self)
|
328
|
+
{
|
329
|
+
VALUE out = Qnil;
|
330
|
+
unsigned long n = 0;
|
331
|
+
bool all = false;
|
332
|
+
|
333
|
+
switch(argc) {
|
334
|
+
case 2:
|
335
|
+
out = argv[1];
|
336
|
+
/* pass through */
|
337
|
+
case 1:
|
338
|
+
n = FIX2ULONG(argv[0]);
|
339
|
+
break;
|
340
|
+
case 0:
|
341
|
+
all = true;
|
342
|
+
break;
|
343
|
+
default:
|
344
|
+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..2)", argc);
|
345
|
+
}
|
346
|
+
|
347
|
+
BUFFER(self, b);
|
348
|
+
|
349
|
+
if(out != Qnil) {
|
350
|
+
CHECK_STRING_TYPE(out);
|
351
|
+
}
|
352
|
+
|
353
|
+
if(all) {
|
354
|
+
return read_all(b, out);
|
355
|
+
}
|
356
|
+
|
357
|
+
if(n == 0) {
|
358
|
+
/* do nothing */
|
359
|
+
MAKE_EMPTY_STRING(out);
|
360
|
+
return out;
|
361
|
+
}
|
362
|
+
|
363
|
+
if(!msgpack_buffer_ensure_readable(b, n)) {
|
364
|
+
rb_raise(rb_eEOFError, "end of buffer reached");
|
365
|
+
}
|
366
|
+
|
367
|
+
MAKE_EMPTY_STRING(out);
|
368
|
+
msgpack_buffer_read_to_string_nonblock(b, out, n);
|
369
|
+
|
370
|
+
return out;
|
371
|
+
}
|
372
|
+
|
373
|
+
static VALUE Buffer_read(int argc, VALUE* argv, VALUE self)
|
374
|
+
{
|
375
|
+
VALUE out = Qnil;
|
376
|
+
unsigned long n = -1;
|
377
|
+
bool all = false;
|
378
|
+
|
379
|
+
switch(argc) {
|
380
|
+
case 2:
|
381
|
+
out = argv[1];
|
382
|
+
/* pass through */
|
383
|
+
case 1:
|
384
|
+
n = FIX2ULONG(argv[0]);
|
385
|
+
break;
|
386
|
+
case 0:
|
387
|
+
all = true;
|
388
|
+
break;
|
389
|
+
default:
|
390
|
+
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0..2)", argc);
|
391
|
+
}
|
392
|
+
|
393
|
+
BUFFER(self, b);
|
394
|
+
|
395
|
+
if(out != Qnil) {
|
396
|
+
CHECK_STRING_TYPE(out);
|
397
|
+
}
|
398
|
+
|
399
|
+
if(all) {
|
400
|
+
return read_all(b, out);
|
401
|
+
}
|
402
|
+
|
403
|
+
if(n == 0) {
|
404
|
+
/* do nothing */
|
405
|
+
MAKE_EMPTY_STRING(out);
|
406
|
+
return out;
|
407
|
+
}
|
408
|
+
|
409
|
+
#ifndef DISABLE_BUFFER_READ_TO_S_OPTIMIZE
|
410
|
+
if(!msgpack_buffer_has_io(b) && out == Qnil &&
|
411
|
+
msgpack_buffer_all_readable_size(b) <= n) {
|
412
|
+
/* same as to_s && clear; optimize */
|
413
|
+
VALUE str = msgpack_buffer_all_as_string(b);
|
414
|
+
msgpack_buffer_clear(b);
|
415
|
+
|
416
|
+
if(RSTRING_LEN(str) == 0) {
|
417
|
+
return Qnil;
|
418
|
+
} else {
|
419
|
+
return str;
|
420
|
+
}
|
421
|
+
}
|
422
|
+
#endif
|
423
|
+
|
424
|
+
MAKE_EMPTY_STRING(out);
|
425
|
+
read_until_eof(b, out, n);
|
426
|
+
|
427
|
+
if(RSTRING_LEN(out) == 0) {
|
428
|
+
return Qnil;
|
429
|
+
} else {
|
430
|
+
return out;
|
431
|
+
}
|
432
|
+
}
|
433
|
+
|
434
|
+
static VALUE Buffer_to_str(VALUE self)
|
435
|
+
{
|
436
|
+
BUFFER(self, b);
|
437
|
+
return msgpack_buffer_all_as_string(b);
|
438
|
+
}
|
439
|
+
|
440
|
+
static VALUE Buffer_to_a(VALUE self)
|
441
|
+
{
|
442
|
+
BUFFER(self, b);
|
443
|
+
return msgpack_buffer_all_as_string_array(b);
|
444
|
+
}
|
445
|
+
|
446
|
+
static VALUE Buffer_flush(VALUE self)
|
447
|
+
{
|
448
|
+
BUFFER(self, b);
|
449
|
+
msgpack_buffer_flush(b);
|
450
|
+
return self;
|
451
|
+
}
|
452
|
+
|
453
|
+
static VALUE Buffer_io(VALUE self)
|
454
|
+
{
|
455
|
+
BUFFER(self, b);
|
456
|
+
return b->io;
|
457
|
+
}
|
458
|
+
|
459
|
+
static VALUE Buffer_close(VALUE self)
|
460
|
+
{
|
461
|
+
BUFFER(self, b);
|
462
|
+
if(b->io != Qnil) {
|
463
|
+
return rb_funcall(b->io, s_close, 0);
|
464
|
+
}
|
465
|
+
return Qnil;
|
466
|
+
}
|
467
|
+
|
468
|
+
static VALUE Buffer_write_to(VALUE self, VALUE io)
|
469
|
+
{
|
470
|
+
BUFFER(self, b);
|
471
|
+
size_t sz = msgpack_buffer_flush_to_io(b, io, s_write, true);
|
472
|
+
return ULONG2NUM(sz);
|
473
|
+
}
|
474
|
+
|
475
|
+
void MessagePack_Buffer_module_init(VALUE mMessagePack)
|
476
|
+
{
|
477
|
+
s_read = rb_intern("read");
|
478
|
+
s_readpartial = rb_intern("readpartial");
|
479
|
+
s_write = rb_intern("write");
|
480
|
+
s_append = rb_intern("<<");
|
481
|
+
s_close = rb_intern("close");
|
482
|
+
|
483
|
+
msgpack_buffer_static_init();
|
484
|
+
|
485
|
+
cMessagePack_Buffer = rb_define_class_under(mMessagePack, "Buffer", rb_cObject);
|
486
|
+
|
487
|
+
rb_define_alloc_func(cMessagePack_Buffer, Buffer_alloc);
|
488
|
+
|
489
|
+
rb_define_method(cMessagePack_Buffer, "initialize", Buffer_initialize, -1);
|
490
|
+
rb_define_method(cMessagePack_Buffer, "clear", Buffer_clear, 0);
|
491
|
+
rb_define_method(cMessagePack_Buffer, "size", Buffer_size, 0);
|
492
|
+
rb_define_method(cMessagePack_Buffer, "empty?", Buffer_empty_p, 0);
|
493
|
+
rb_define_method(cMessagePack_Buffer, "write", Buffer_write, 1);
|
494
|
+
rb_define_method(cMessagePack_Buffer, "<<", Buffer_append, 1);
|
495
|
+
rb_define_method(cMessagePack_Buffer, "skip", Buffer_skip, 1);
|
496
|
+
rb_define_method(cMessagePack_Buffer, "skip_all", Buffer_skip_all, 1);
|
497
|
+
rb_define_method(cMessagePack_Buffer, "read", Buffer_read, -1);
|
498
|
+
rb_define_method(cMessagePack_Buffer, "read_all", Buffer_read_all, -1);
|
499
|
+
rb_define_method(cMessagePack_Buffer, "io", Buffer_io, 0);
|
500
|
+
rb_define_method(cMessagePack_Buffer, "flush", Buffer_flush, 0);
|
501
|
+
rb_define_method(cMessagePack_Buffer, "close", Buffer_close, 0);
|
502
|
+
rb_define_method(cMessagePack_Buffer, "write_to", Buffer_write_to, 1);
|
503
|
+
rb_define_method(cMessagePack_Buffer, "to_str", Buffer_to_str, 0);
|
504
|
+
rb_define_alias(cMessagePack_Buffer, "to_s", "to_str");
|
505
|
+
rb_define_method(cMessagePack_Buffer, "to_a", Buffer_to_a, 0);
|
506
|
+
}
|
507
|
+
|