nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-21 12:07:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let circular buffers actually grow to max sz, reset _next when resizing.

Browse Source
This commit is contained in:
Michael Bebenita 2010-07-28 00:03:47 -07:00 committed by Graydon Hoare
parent c1795a1046
commit dbcc9b36b1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rt/circular_buffer.cpp
View File

@ -63,12 +63,14 @@ circular_buffer::enqueue(void *src) {
// Grow if necessary. // Grow if necessary.
if (_unread == _buffer_sz) { if (_unread == _buffer_sz) {
I(dom, _buffer_sz <= MAX_CIRCULAR_BUFFFER_SIZE); size_t new_buffer_sz = _buffer_sz << 1;
void *tmp = dom->malloc(_buffer_sz << 1); I(dom, new_buffer_sz <= MAX_CIRCULAR_BUFFFER_SIZE);
transfer(tmp); void *new_buffer = dom->malloc(new_buffer_sz);
_buffer_sz <<= 1; transfer(new_buffer);
dom->free(_buffer); dom->free(_buffer);
_buffer = (uint8_t *)tmp; _buffer = (uint8_t *)new_buffer;
_next = 0;
_buffer_sz = new_buffer_sz;
} }
dom->log(rust_log::MEM | rust_log::COMM, dom->log(rust_log::MEM | rust_log::COMM,