Skip to content

subtle pybuffer updates #3043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 15, 2021
Merged

subtle pybuffer updates #3043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b822fa
io buffers use PyMemoryView::release
youknowone Sep 13, 2021
9189de3
clean up imports
youknowone Sep 13, 2021
6a309cb
memoryview validation tool
youknowone Sep 12, 2021
5befe49
PyMemoryView::getitem_slice reuse common convert_slice
youknowone Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 47 additions & 53 deletions vm/src/builtins/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
use crate::buffer::{BufferOptions, PyBuffer, PyBufferInternal};
use crate::builtins::bytes::{PyBytes, PyBytesRef};
use crate::builtins::list::{PyList, PyListRef};
use crate::builtins::pystr::{PyStr, PyStrRef};
use crate::builtins::pytype::PyTypeRef;
use crate::builtins::slice::PySliceRef;
use crate::builtins::{PyBytes, PyBytesRef, PyList, PyListRef, PyStr, PyStrRef, PyTypeRef};
use crate::bytesinner::bytes_to_hex;
use crate::common::{
borrow::{BorrowedValue, BorrowedValueMut},
Expand All @@ -12,7 +9,7 @@ use crate::common::{
rc::PyRc,
};
use crate::function::{FuncArgs, OptionalArg};
use crate::sliceable::{convert_slice, saturate_range, wrap_index, SequenceIndex};
use crate::sliceable::{convert_slice, wrap_index, SequenceIndex};
use crate::slots::{AsBuffer, Comparable, Hashable, PyComparisonOp, SlotConstructor};
use crate::stdlib::pystruct::_struct::FormatSpec;
use crate::utils::Either;
Expand All @@ -22,8 +19,7 @@ use crate::{
};
use crossbeam_utils::atomic::AtomicCell;
use itertools::Itertools;
use num_bigint::BigInt;
use num_traits::{One, Signed, ToPrimitive, Zero};
use num_traits::ToPrimitive;
use std::fmt::Debug;
use std::ops::Deref;

Expand All @@ -37,7 +33,7 @@ pub struct PyMemoryViewNewArgs {
#[derive(Debug)]
pub struct PyMemoryView {
buffer: PyBuffer,
pub(crate) released: AtomicCell<bool>,
released: AtomicCell<bool>,
// start should always less or equal to the stop
// start and stop pointing to the memory index not slice index
// if length is not zero than [start, stop)
Expand All @@ -61,6 +57,24 @@ impl SlotConstructor for PyMemoryView {

#[pyimpl(with(Hashable, Comparable, AsBuffer, SlotConstructor))]
impl PyMemoryView {
#[cfg(debug_assertions)]
fn validate(self) -> Self {
let options = &self.buffer.options;
let bytes_len = options.len * options.itemsize;
let buffer_len = self.buffer.internal.obj_bytes().len();
let t1 = self.stop - self.start == bytes_len;
let t2 = buffer_len >= self.stop;
let t3 = buffer_len >= self.start + bytes_len;
assert!(t1);
assert!(t2);
assert!(t3);
self
}
#[cfg(not(debug_assertions))]
fn validate(self) -> Self {
self
}

fn parse_format(format: &str, vm: &VirtualMachine) -> PyResult<FormatSpec> {
FormatSpec::parse(format, vm)
}
Expand All @@ -80,7 +94,8 @@ impl PyMemoryView {
step: 1,
format_spec,
hash: OnceCell::new(),
})
}
.validate())
}

pub fn from_buffer_range(
Expand All @@ -99,7 +114,8 @@ impl PyMemoryView {
step: 1,
format_spec,
hash: OnceCell::new(),
})
}
.validate())
}

fn as_contiguous(&self) -> Option<BorrowedValue<[u8]>> {
Expand Down Expand Up @@ -238,25 +254,20 @@ impl PyMemoryView {

fn getitem_by_slice(zelf: PyRef<Self>, slice: PySliceRef, vm: &VirtualMachine) -> PyResult {
// slicing a memoryview return a new memoryview
let start = slice.start_index(vm)?;
let stop = slice.stop_index(vm)?;
let step = slice.step_index(vm)?.unwrap_or_else(BigInt::one);
if step.is_zero() {
return Err(vm.new_value_error("slice step cannot be zero".to_owned()));
}
let newstep: BigInt = step.clone() * zelf.step;
let len = zelf.buffer.options.len;
let (range, step, is_negative_step) = convert_slice(&slice, len, vm)?;
let abs_step = step.unwrap();
let step = if is_negative_step {
-(abs_step as isize)
} else {
abs_step as isize
};
let newstep = step * zelf.step;
let itemsize = zelf.buffer.options.itemsize;

let format_spec = zelf.format_spec.clone();

if newstep == BigInt::one() {
let range = saturate_range(&start, &stop, len);
let range = if range.end < range.start {
range.start..range.start
} else {
range
};
if newstep == 1 {
let newlen = range.end - range.start;
let start = zelf.start + range.start * itemsize;
let stop = zelf.start + range.end * itemsize;
Expand All @@ -273,38 +284,11 @@ impl PyMemoryView {
format_spec,
hash: OnceCell::new(),
}
.validate()
.into_object(vm));
}

let (start, stop) = if step.is_negative() {
(
stop.map(|x| {
if x == -BigInt::one() {
len + BigInt::one()
} else {
x + 1
}
}),
start.map(|x| {
if x == -BigInt::one() {
BigInt::from(len)
} else {
x + 1
}
}),
)
} else {
(start, stop)
};

let range = saturate_range(&start, &stop, len);
let newlen = if range.end > range.start {
// overflow is not possible as dividing a positive integer
((range.end - range.start - 1) / step.abs())
.to_usize()
.unwrap()
+ 1
} else {
if range.start >= range.end {
return Ok(PyMemoryView {
buffer: zelf.buffer.clone_with_options(BufferOptions {
len: 0,
Expand All @@ -318,9 +302,16 @@ impl PyMemoryView {
format_spec,
hash: OnceCell::new(),
}
.validate()
.into_object(vm));
};

// overflow is not possible as dividing a positive integer
let newlen = ((range.end - range.start - 1) / abs_step)
.to_usize()
.unwrap()
+ 1;

// newlen will be 0 if step is overflowed
let newstep = newstep.to_isize().unwrap_or(-1);

Expand Down Expand Up @@ -348,6 +339,7 @@ impl PyMemoryView {
format_spec,
hash: OnceCell::new(),
}
.validate()
.into_object(vm))
}

Expand Down Expand Up @@ -541,6 +533,7 @@ impl PyMemoryView {
hash: OnceCell::new(),
..*zelf
}
.validate()
.into_ref(vm))
}

Expand Down Expand Up @@ -610,6 +603,7 @@ impl PyMemoryView {
hash: OnceCell::new(),
..*zelf
}
.validate()
.into_ref(vm))
}

Expand Down
4 changes: 2 additions & 2 deletions vm/src/stdlib/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,7 @@ mod _io {
// TODO: loop if write() raises an interrupt
let res = vm.call_method(raw, "write", (memobj.clone(),));

memobj.released.store(true);
memobj.release();
self.buffer = std::mem::take(&mut writebuf.data.lock());

res?
Expand Down Expand Up @@ -1132,7 +1132,7 @@ mod _io {
let res =
vm.call_method(self.raw.as_ref().unwrap(), "readinto", (memobj.clone(),));

memobj.released.store(true);
memobj.release();
std::mem::swap(v, &mut readbuf.data.lock());

res?
Expand Down