From 5f05ae68e555e94aa31c36b35dfb2e03952443ba Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 7 Jan 2011 22:13:52 -0500 Subject: Don't allow circular_buffer to shrink below it's initial size --- src/rt/circular_buffer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/rt/circular_buffer.cpp') diff --git a/src/rt/circular_buffer.cpp b/src/rt/circular_buffer.cpp index 77509abb069..8f12a1154a5 100644 --- a/src/rt/circular_buffer.cpp +++ b/src/rt/circular_buffer.cpp @@ -121,13 +121,15 @@ circular_buffer::dequeue(void *dst) { } // Shrink if possible. - if (_buffer_sz >= INITIAL_CIRCULAR_BUFFFER_SIZE_IN_UNITS * unit_sz && + if (_buffer_sz > INITIAL_CIRCULAR_BUFFFER_SIZE_IN_UNITS * unit_sz && _unread <= _buffer_sz / 4) { dom->log(rust_log::MEM | rust_log::COMM, "circular_buffer is shrinking to %d bytes", _buffer_sz / 2); void *tmp = dom->malloc(_buffer_sz / 2); transfer(tmp); _buffer_sz >>= 1; + I(dom, _buffer_sz >= + next_power_of_two(INITIAL_CIRCULAR_BUFFFER_SIZE_IN_UNITS * unit_sz)); dom->free(_buffer); _buffer = (uint8_t *)tmp; _next = 0; -- cgit 1.4.1-3-g733a5