Skip to content

Commit 9074d9b

Browse files
committed
libcore: rewrite io::MemBuffer.write to use memcpy (rust-lang#2004)
1 parent 7bb6584 commit 9074d9b

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

src/libcore/io.rs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -663,24 +663,21 @@ type MemBuffer = @{buf: DVec<u8>, mut pos: uint};
663663
664664
impl MemBuffer: Writer {
665665
fn write(v: &[const u8]) {
666-
// Fast path.
667-
let vlen = vec::len(v);
668-
let buf_len = self.buf.len();
669-
if self.pos == buf_len {
670-
self.buf.push_all(v);
671-
self.pos += vlen;
672-
return;
673-
}
666+
do self.buf.swap |buf| {
667+
let mut buf <- buf;
668+
let v_len = v.len();
669+
let buf_len = buf.len();
670+
671+
let count = uint::max(&buf_len, &(self.pos + v_len));
672+
vec::reserve(buf, count);
673+
unsafe { vec::unsafe::set_len(buf, count); }
674+
675+
vec::u8::memcpy(vec::mut_view(buf, self.pos, count), v, v_len);
676+
677+
self.pos += v_len;
674678
675-
// FIXME #2004--use memcpy here?
676-
let mut pos = self.pos, vpos = 0u;
677-
while vpos < vlen && pos < buf_len {
678-
self.buf.set_elt(pos, copy v[vpos]);
679-
pos += 1u;
680-
vpos += 1u;
679+
buf
681680
}
682-
self.buf.push_slice(v, vpos, vlen);
683-
self.pos += vlen;
684681
}
685682
fn seek(offset: int, whence: SeekStyle) {
686683
let pos = self.pos;

0 commit comments

Comments
 (0)