---

yaml
---
r: 1214
b: refs/heads/master
c: f1df1d1
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f05ae68e555e94aa31c36b35dfb2e03952443ba
+refs/heads/master: f1df1d1a51f310553fd8bcb831215307ec2609ae

trunk/src/rt/circular_buffer.cpp

@@ -15,8 +15,9 @@ is_power_of_two(size_t value) {
 circular_buffer::circular_buffer(rust_dom *dom, size_t unit_sz) :
     dom(dom),
     unit_sz(unit_sz),
-    _buffer_sz(next_power_of_two(
+    _initial_sz(next_power_of_two(
                INITIAL_CIRCULAR_BUFFFER_SIZE_IN_UNITS * unit_sz)),
+    _buffer_sz(_initial_sz),
     _next(0),
     _unread(0),
     _buffer((uint8_t *)dom->calloc(_buffer_sz)) {
@@ -121,15 +122,13 @@ circular_buffer::dequeue(void *dst) {
     }
 
     // Shrink if possible.
-    if (_buffer_sz > INITIAL_CIRCULAR_BUFFFER_SIZE_IN_UNITS * unit_sz &&
-        _unread <= _buffer_sz / 4) {
+    if (_buffer_sz > _initial_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));
+	I(dom, _initial_sz <= _buffer_sz);
         dom->free(_buffer);
         _buffer = (uint8_t *)tmp;
         _next = 0;

trunk/src/rt/circular_buffer.h

@@ -24,6 +24,9 @@ circular_buffer : public dom_owned<circular_buffer> {
     size_t size();
 
 private:
+    // Initial size of the buffer in bytes.
+    size_t _initial_sz;
+
     // Size of the buffer in bytes, should always be a power of two so that
     // modulo arithmetic (x % _buffer_sz) can optimized away with
     // (x & (_buffer_sz - 1)).

trunk/src/test/run-pass/chan-poweroftwo.rs

@@ -39,18 +39,34 @@ impure fn test_grow() {
 }
 
 // Don't allow the buffer to shrink below it's original size
-impure fn test_shrink() {
+impure fn test_shrink1() {
     let port[i8] myport = port();
     auto mychan = chan(myport);
 
     mychan <| 0i8;
     auto x <- myport;
 }
 
+impure fn test_shrink2() {
+    let port[record] myport = port();
+    auto mychan = chan(myport);
+
+    let record val = rec(val1=0i32, val2=0i32, val3=0i32);
+
+    for each (uint i in _uint.range(0u, 100u)) {
+        mychan <| val;
+    }
+
+    for each (uint i in _uint.range(0u, 100u)) {
+        auto x <- myport;
+    }
+}
+
 impure fn main() {
     test_init();
     test_grow();
-    test_shrink();
+    test_shrink1();
+    test_shrink2();
 }
 
 // Local Variables: