diff --git a/generated_for_cmake/upb/json/parser.c b/generated_for_cmake/upb/json/parser.c index f7447a335a..5445fa62a3 100644 --- a/generated_for_cmake/upb/json/parser.c +++ b/generated_for_cmake/upb/json/parser.c @@ -3339,9 +3339,6 @@ upb_json_parser *upb_json_parser_create(upb_arena *arena, upb_sink output, upb_status *status, bool ignore_json_unknown) { -#ifndef NDEBUG - const size_t size_before = upb_arena_bytesallocated(arena); -#endif upb_json_parser *p = upb_arena_malloc(arena, sizeof(upb_json_parser)); if (!p) return false; @@ -3368,10 +3365,6 @@ upb_json_parser *upb_json_parser_create(upb_arena *arena, p->ignore_json_unknown = ignore_json_unknown; - /* If this fails, uncomment and increase the value in parser.h. */ - /* fprintf(stderr, "%zd\n", upb_arena_bytesallocated(arena) - size_before); */ - UPB_ASSERT_DEBUGVAR(upb_arena_bytesallocated(arena) - size_before <= - UPB_JSON_PARSER_SIZE); return p; } diff --git a/upb/json/parser.rl b/upb/json/parser.rl index 2b89781f8d..13534706af 100644 --- a/upb/json/parser.rl +++ b/upb/json/parser.rl @@ -2902,9 +2902,6 @@ upb_json_parser *upb_json_parser_create(upb_arena *arena, upb_sink output, upb_status *status, bool ignore_json_unknown) { -#ifndef NDEBUG - const size_t size_before = upb_arena_bytesallocated(arena); -#endif upb_json_parser *p = upb_arena_malloc(arena, sizeof(upb_json_parser)); if (!p) return false; @@ -2931,10 +2928,6 @@ upb_json_parser *upb_json_parser_create(upb_arena *arena, p->ignore_json_unknown = ignore_json_unknown; - /* If this fails, uncomment and increase the value in parser.h. */ - /* fprintf(stderr, "%zd\n", upb_arena_bytesallocated(arena) - size_before); */ - UPB_ASSERT_DEBUGVAR(upb_arena_bytesallocated(arena) - size_before <= - UPB_JSON_PARSER_SIZE); return p; } diff --git a/upb/json/printer.c b/upb/json/printer.c index b0030e0e52..3a8821982f 100644 --- a/upb/json/printer.c +++ b/upb/json/printer.c @@ -1367,10 +1367,6 @@ static void json_printer_reset(upb_json_printer *p) { upb_json_printer *upb_json_printer_create(upb_arena *a, const upb_handlers *h, upb_bytessink output) { -#ifndef NDEBUG - size_t size_before = upb_arena_bytesallocated(a); -#endif - upb_json_printer *p = upb_arena_malloc(a, sizeof(upb_json_printer)); if (!p) return NULL; @@ -1380,9 +1376,6 @@ upb_json_printer *upb_json_printer_create(upb_arena *a, const upb_handlers *h, p->seconds = 0; p->nanos = 0; - /* If this fails, increase the value in printer.h. */ - UPB_ASSERT_DEBUGVAR(upb_arena_bytesallocated(a) - size_before <= - UPB_JSON_PRINTER_SIZE); return p; } diff --git a/upb/pb/decoder.c b/upb/pb/decoder.c index 8cdb234526..4f40eed4be 100644 --- a/upb/pb/decoder.c +++ b/upb/pb/decoder.c @@ -969,9 +969,6 @@ void upb_pbdecoder_reset(upb_pbdecoder *d) { upb_pbdecoder *upb_pbdecoder_create(upb_arena *a, const upb_pbdecodermethod *m, upb_sink sink, upb_status *status) { const size_t default_max_nesting = 64; -#ifndef NDEBUG - size_t size_before = upb_arena_bytesallocated(a); -#endif upb_pbdecoder *d = upb_arena_malloc(a, sizeof(upb_pbdecoder)); if (!d) return NULL; @@ -997,9 +994,6 @@ upb_pbdecoder *upb_pbdecoder_create(upb_arena *a, const upb_pbdecodermethod *m, } d->top->sink = sink; - /* If this fails, increase the value in decoder.h. */ - UPB_ASSERT_DEBUGVAR(upb_arena_bytesallocated(a) - size_before <= - UPB_PB_DECODER_SIZE); return d; } diff --git a/upb/pb/encoder.c b/upb/pb/encoder.c index 257e1474ca..ea4859ec11 100644 --- a/upb/pb/encoder.c +++ b/upb/pb/encoder.c @@ -534,9 +534,6 @@ upb_pb_encoder *upb_pb_encoder_create(upb_arena *arena, const upb_handlers *h, const size_t initial_segbufsize = 16; /* TODO(haberman): make this configurable. */ const size_t stack_size = 64; -#ifndef NDEBUG - const size_t size_before = upb_arena_bytesallocated(arena); -#endif upb_pb_encoder *e = upb_arena_malloc(arena, sizeof(upb_pb_encoder)); if (!e) return NULL; @@ -561,9 +558,6 @@ upb_pb_encoder *upb_pb_encoder_create(upb_arena *arena, const upb_handlers *h, e->subc = output.closure; e->ptr = e->buf; - /* If this fails, increase the value in encoder.h. */ - UPB_ASSERT_DEBUGVAR(upb_arena_bytesallocated(arena) - size_before <= - UPB_PB_ENCODER_SIZE); return e; } diff --git a/upb/upb.c b/upb/upb.c index 258192d79d..6af46b7c2b 100644 --- a/upb/upb.c +++ b/upb/upb.c @@ -72,7 +72,6 @@ struct upb_arena { * when we are destroyed. */ upb_alloc *block_alloc; - size_t bytes_allocated; size_t next_block_size; size_t max_block_size; @@ -99,10 +98,6 @@ static void upb_arena_addblock(upb_arena *a, void *ptr, size_t size, bool owned) { mem_block *block = ptr; - if (a->block_head) { - a->bytes_allocated += a->head.ptr - a->start; - } - block->next = a->block_head; block->owned = owned; @@ -186,7 +181,6 @@ upb_arena *upb_arena_init(void *mem, size_t n, upb_alloc *alloc) { a->head.end = NULL; a->start = NULL; a->block_alloc = &upb_alloc_global; - a->bytes_allocated = 0; a->next_block_size = 256; a->max_block_size = 16384; a->cleanup_head = NULL; @@ -236,7 +230,3 @@ bool upb_arena_addcleanup(upb_arena *a, void *ud, upb_cleanup_func *func) { return true; } - -size_t upb_arena_bytesallocated(const upb_arena *a) { - return a->bytes_allocated + (a->head.ptr - a->start); -} diff --git a/upb/upb.h b/upb/upb.h index c107cfe76d..33507a274d 100644 --- a/upb/upb.h +++ b/upb/upb.h @@ -159,7 +159,6 @@ UPB_INLINE size_t _upb_arena_alignup(size_t size) { upb_arena *upb_arena_init(void *mem, size_t n, upb_alloc *alloc); void upb_arena_free(upb_arena *a); bool upb_arena_addcleanup(upb_arena *a, void *ud, upb_cleanup_func *func); -size_t upb_arena_bytesallocated(const upb_arena *a); void *_upb_arena_slowmalloc(upb_arena *a, size_t size); UPB_INLINE upb_alloc *upb_arena_alloc(upb_arena *a) { return (upb_alloc*)a; } diff --git a/upb/upb.hpp b/upb/upb.hpp index b64d84e2ca..d8f9d4a6f8 100644 --- a/upb/upb.hpp +++ b/upb/upb.hpp @@ -57,10 +57,6 @@ class Arena { return upb_arena_addcleanup(ptr_.get(), ud, func); } - // Total number of bytes that have been allocated. It is undefined what - // Realloc() does to &arena_ counter. - size_t BytesAllocated() const { return upb_arena_bytesallocated(ptr_.get()); } - private: std::unique_ptr ptr_; };