-use rustc_middle::ty::{TyKind, TypeAndMut};
+use rustc_middle::ty::{layout::TyAndLayout, TyKind, TypeAndMut};
use rustc_target::abi::{LayoutOf, Size};
use crate::stacked_borrows::Tag;
+use crate::thread::BlockSetId;
use crate::*;
fn assert_ptr_target_min_size<'mir, 'tcx: 'mir>(
Ok(())
}
+fn get_at_offset<'mir, 'tcx: 'mir>(
+ ecx: &MiriEvalContext<'mir, 'tcx>,
+ op: OpTy<'tcx, Tag>,
+ offset: u64,
+ layout: TyAndLayout<'tcx>,
+ min_size: u64,
+) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
+ // Ensure that the following read at an offset to the attr pointer is within bounds
+ assert_ptr_target_min_size(ecx, op, min_size)?;
+ let op_place = ecx.deref_operand(op)?;
+ let value_place = op_place.offset(Size::from_bytes(offset), MemPlaceMeta::None, layout, ecx)?;
+ ecx.read_scalar(value_place.into())
+}
+
+fn set_at_offset<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ op: OpTy<'tcx, Tag>,
+ offset: u64,
+ value: impl Into<ScalarMaybeUndef<Tag>>,
+ layout: TyAndLayout<'tcx>,
+ min_size: u64,
+) -> InterpResult<'tcx, ()> {
+ // Ensure that the following write at an offset to the attr pointer is within bounds
+ assert_ptr_target_min_size(ecx, op, min_size)?;
+ let op_place = ecx.deref_operand(op)?;
+ let value_place = op_place.offset(Size::from_bytes(offset), MemPlaceMeta::None, layout, ecx)?;
+ ecx.write_scalar(value.into(), value_place.into())
+}
+
// pthread_mutexattr_t is either 4 or 8 bytes, depending on the platform.
// Our chosen memory layout for emulation (does not have to match the platform layout!):
// store an i32 in the first four bytes equal to the corresponding libc mutex kind constant
// (e.g. PTHREAD_MUTEX_NORMAL).
+const PTHREAD_MUTEXATTR_T_MIN_SIZE: u64 = 4;
+
fn mutexattr_get_kind<'mir, 'tcx: 'mir>(
ecx: &MiriEvalContext<'mir, 'tcx>,
attr_op: OpTy<'tcx, Tag>,
) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
- // Ensure that the following read at an offset to the attr pointer is within bounds
- assert_ptr_target_min_size(ecx, attr_op, 4)?;
- let attr_place = ecx.deref_operand(attr_op)?;
- let kind_place =
- attr_place.offset(Size::ZERO, MemPlaceMeta::None, ecx.machine.layouts.i32, ecx)?;
- ecx.read_scalar(kind_place.into())
+ get_at_offset(ecx, attr_op, 0, ecx.machine.layouts.i32, PTHREAD_MUTEXATTR_T_MIN_SIZE)
}
fn mutexattr_set_kind<'mir, 'tcx: 'mir>(
attr_op: OpTy<'tcx, Tag>,
kind: impl Into<ScalarMaybeUndef<Tag>>,
) -> InterpResult<'tcx, ()> {
- // Ensure that the following write at an offset to the attr pointer is within bounds
- assert_ptr_target_min_size(ecx, attr_op, 4)?;
- let attr_place = ecx.deref_operand(attr_op)?;
- let kind_place =
- attr_place.offset(Size::ZERO, MemPlaceMeta::None, ecx.machine.layouts.i32, ecx)?;
- ecx.write_scalar(kind.into(), kind_place.into())
+ set_at_offset(ecx, attr_op, 0, kind, ecx.machine.layouts.i32, PTHREAD_MUTEXATTR_T_MIN_SIZE)
}
// pthread_mutex_t is between 24 and 48 bytes, depending on the platform.
// bytes 0-3: reserved for signature on macOS
// (need to avoid this because it is set by static initializer macros)
// bytes 4-7: count of how many times this mutex has been locked, as a u32
+// bytes 8-11: when count > 0, id of the owner thread as a u32
// bytes 12-15 or 16-19 (depending on platform): mutex kind, as an i32
// (the kind has to be at its offset for compatibility with static initializer macros)
+// bytes 20-23: when count > 0, id of the blockset in which the blocked threads are waiting.
+
+const PTHREAD_MUTEX_T_MIN_SIZE: u64 = 24;
fn mutex_get_locked_count<'mir, 'tcx: 'mir>(
ecx: &MiriEvalContext<'mir, 'tcx>,
mutex_op: OpTy<'tcx, Tag>,
) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
- // Ensure that the following read at an offset to the mutex pointer is within bounds
- assert_ptr_target_min_size(ecx, mutex_op, 20)?;
- let mutex_place = ecx.deref_operand(mutex_op)?;
- let locked_count_place = mutex_place.offset(
- Size::from_bytes(4),
- MemPlaceMeta::None,
- ecx.machine.layouts.u32,
- ecx,
- )?;
- ecx.read_scalar(locked_count_place.into())
+ get_at_offset(ecx, mutex_op, 4, ecx.machine.layouts.u32, PTHREAD_MUTEX_T_MIN_SIZE)
}
fn mutex_set_locked_count<'mir, 'tcx: 'mir>(
mutex_op: OpTy<'tcx, Tag>,
locked_count: impl Into<ScalarMaybeUndef<Tag>>,
) -> InterpResult<'tcx, ()> {
- // Ensure that the following write at an offset to the mutex pointer is within bounds
- assert_ptr_target_min_size(ecx, mutex_op, 20)?;
- let mutex_place = ecx.deref_operand(mutex_op)?;
- let locked_count_place = mutex_place.offset(
- Size::from_bytes(4),
- MemPlaceMeta::None,
- ecx.machine.layouts.u32,
- ecx,
- )?;
- ecx.write_scalar(locked_count.into(), locked_count_place.into())
+ set_at_offset(ecx, mutex_op, 4, locked_count, ecx.machine.layouts.u32, PTHREAD_MUTEX_T_MIN_SIZE)
+}
+
+fn mutex_get_owner<'mir, 'tcx: 'mir>(
+ ecx: &MiriEvalContext<'mir, 'tcx>,
+ mutex_op: OpTy<'tcx, Tag>,
+) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
+ get_at_offset(ecx, mutex_op, 8, ecx.machine.layouts.u32, PTHREAD_MUTEX_T_MIN_SIZE)
+}
+
+fn mutex_set_owner<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ mutex_op: OpTy<'tcx, Tag>,
+ owner: impl Into<ScalarMaybeUndef<Tag>>,
+) -> InterpResult<'tcx, ()> {
+ set_at_offset(ecx, mutex_op, 8, owner, ecx.machine.layouts.u32, PTHREAD_MUTEX_T_MIN_SIZE)
}
fn mutex_get_kind<'mir, 'tcx: 'mir>(
ecx: &mut MiriEvalContext<'mir, 'tcx>,
mutex_op: OpTy<'tcx, Tag>,
) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
- // Ensure that the following read at an offset to the mutex pointer is within bounds
- assert_ptr_target_min_size(ecx, mutex_op, 20)?;
- let mutex_place = ecx.deref_operand(mutex_op)?;
- let kind_offset = if ecx.pointer_size().bytes() == 8 { 16 } else { 12 };
- let kind_place = mutex_place.offset(
- Size::from_bytes(kind_offset),
- MemPlaceMeta::None,
- ecx.machine.layouts.i32,
- ecx,
- )?;
- ecx.read_scalar(kind_place.into())
+ let offset = if ecx.pointer_size().bytes() == 8 { 16 } else { 12 };
+ get_at_offset(ecx, mutex_op, offset, ecx.machine.layouts.i32, PTHREAD_MUTEX_T_MIN_SIZE)
}
fn mutex_set_kind<'mir, 'tcx: 'mir>(
mutex_op: OpTy<'tcx, Tag>,
kind: impl Into<ScalarMaybeUndef<Tag>>,
) -> InterpResult<'tcx, ()> {
- // Ensure that the following write at an offset to the mutex pointer is within bounds
- assert_ptr_target_min_size(ecx, mutex_op, 20)?;
- let mutex_place = ecx.deref_operand(mutex_op)?;
- let kind_offset = if ecx.pointer_size().bytes() == 8 { 16 } else { 12 };
- let kind_place = mutex_place.offset(
- Size::from_bytes(kind_offset),
- MemPlaceMeta::None,
- ecx.machine.layouts.i32,
- ecx,
- )?;
- ecx.write_scalar(kind.into(), kind_place.into())
+ let offset = if ecx.pointer_size().bytes() == 8 { 16 } else { 12 };
+ set_at_offset(ecx, mutex_op, offset, kind, ecx.machine.layouts.i32, PTHREAD_MUTEX_T_MIN_SIZE)
+}
+
+fn mutex_get_blockset<'mir, 'tcx: 'mir>(
+ ecx: &MiriEvalContext<'mir, 'tcx>,
+ mutex_op: OpTy<'tcx, Tag>,
+) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
+ get_at_offset(ecx, mutex_op, 20, ecx.machine.layouts.u32, PTHREAD_MUTEX_T_MIN_SIZE)
+}
+
+fn mutex_set_blockset<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ mutex_op: OpTy<'tcx, Tag>,
+ blockset: impl Into<ScalarMaybeUndef<Tag>>,
+) -> InterpResult<'tcx, ()> {
+ set_at_offset(ecx, mutex_op, 20, blockset, ecx.machine.layouts.u32, PTHREAD_MUTEX_T_MIN_SIZE)
+}
+
+fn mutex_get_or_create_blockset<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ mutex_op: OpTy<'tcx, Tag>,
+) -> InterpResult<'tcx, BlockSetId> {
+ let blockset = mutex_get_blockset(ecx, mutex_op)?.to_u32()?;
+ if blockset == 0 {
+ // 0 is a default value and also not a valid blockset id. Need to
+ // allocate a new blockset.
+ let blockset = ecx.create_blockset()?;
+ mutex_set_blockset(ecx, mutex_op, blockset.to_u32_scalar())?;
+ Ok(blockset)
+ } else {
+ Ok(BlockSetId::new(blockset))
+ }
}
// pthread_rwlock_t is between 32 and 56 bytes, depending on the platform.
// (need to avoid this because it is set by static initializer macros)
// bytes 4-7: reader count, as a u32
// bytes 8-11: writer count, as a u32
+// bytes 12-15: when writer or reader count > 0, id of the blockset in which the
+// blocked writers are waiting.
+// bytes 16-20: when writer count > 0, id of the blockset in which the blocked
+// readers are waiting.
+
+const PTHREAD_RWLOCK_T_MIN_SIZE: u64 = 20;
fn rwlock_get_readers<'mir, 'tcx: 'mir>(
ecx: &MiriEvalContext<'mir, 'tcx>,
rwlock_op: OpTy<'tcx, Tag>,
) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
- // Ensure that the following read at an offset to the rwlock pointer is within bounds
- assert_ptr_target_min_size(ecx, rwlock_op, 12)?;
- let rwlock_place = ecx.deref_operand(rwlock_op)?;
- let readers_place = rwlock_place.offset(
- Size::from_bytes(4),
- MemPlaceMeta::None,
- ecx.machine.layouts.u32,
- ecx,
- )?;
- ecx.read_scalar(readers_place.into())
+ get_at_offset(ecx, rwlock_op, 4, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
}
fn rwlock_set_readers<'mir, 'tcx: 'mir>(
rwlock_op: OpTy<'tcx, Tag>,
readers: impl Into<ScalarMaybeUndef<Tag>>,
) -> InterpResult<'tcx, ()> {
- // Ensure that the following write at an offset to the rwlock pointer is within bounds
- assert_ptr_target_min_size(ecx, rwlock_op, 12)?;
- let rwlock_place = ecx.deref_operand(rwlock_op)?;
- let readers_place = rwlock_place.offset(
- Size::from_bytes(4),
- MemPlaceMeta::None,
- ecx.machine.layouts.u32,
- ecx,
- )?;
- ecx.write_scalar(readers.into(), readers_place.into())
+ set_at_offset(ecx, rwlock_op, 4, readers, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
}
fn rwlock_get_writers<'mir, 'tcx: 'mir>(
ecx: &MiriEvalContext<'mir, 'tcx>,
rwlock_op: OpTy<'tcx, Tag>,
) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
- // Ensure that the following read at an offset to the rwlock pointer is within bounds
- assert_ptr_target_min_size(ecx, rwlock_op, 12)?;
- let rwlock_place = ecx.deref_operand(rwlock_op)?;
- let writers_place = rwlock_place.offset(
- Size::from_bytes(8),
- MemPlaceMeta::None,
- ecx.machine.layouts.u32,
- ecx,
- )?;
- ecx.read_scalar(writers_place.into())
+ get_at_offset(ecx, rwlock_op, 8, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
}
fn rwlock_set_writers<'mir, 'tcx: 'mir>(
rwlock_op: OpTy<'tcx, Tag>,
writers: impl Into<ScalarMaybeUndef<Tag>>,
) -> InterpResult<'tcx, ()> {
- // Ensure that the following write at an offset to the rwlock pointer is within bounds
- assert_ptr_target_min_size(ecx, rwlock_op, 12)?;
- let rwlock_place = ecx.deref_operand(rwlock_op)?;
- let writers_place = rwlock_place.offset(
- Size::from_bytes(8),
- MemPlaceMeta::None,
- ecx.machine.layouts.u32,
- ecx,
- )?;
- ecx.write_scalar(writers.into(), writers_place.into())
+ set_at_offset(ecx, rwlock_op, 8, writers, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
+}
+
+fn rwlock_get_writer_blockset<'mir, 'tcx: 'mir>(
+ ecx: &MiriEvalContext<'mir, 'tcx>,
+ rwlock_op: OpTy<'tcx, Tag>,
+) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
+ get_at_offset(ecx, rwlock_op, 12, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
+}
+
+fn rwlock_set_writer_blockset<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ rwlock_op: OpTy<'tcx, Tag>,
+ blockset: impl Into<ScalarMaybeUndef<Tag>>,
+) -> InterpResult<'tcx, ()> {
+ set_at_offset(ecx, rwlock_op, 12, blockset, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
+}
+
+fn rwlock_get_or_create_writer_blockset<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ rwlock_op: OpTy<'tcx, Tag>,
+) -> InterpResult<'tcx, BlockSetId> {
+ let blockset = rwlock_get_writer_blockset(ecx, rwlock_op)?.to_u32()?;
+ if blockset == 0 {
+ // 0 is a default value and also not a valid blockset id. Need to
+ // allocate a new blockset.
+ let blockset = ecx.create_blockset()?;
+ rwlock_set_writer_blockset(ecx, rwlock_op, blockset.to_u32_scalar())?;
+ Ok(blockset)
+ } else {
+ Ok(BlockSetId::new(blockset))
+ }
+}
+
+fn rwlock_get_reader_blockset<'mir, 'tcx: 'mir>(
+ ecx: &MiriEvalContext<'mir, 'tcx>,
+ rwlock_op: OpTy<'tcx, Tag>,
+) -> InterpResult<'tcx, ScalarMaybeUndef<Tag>> {
+ get_at_offset(ecx, rwlock_op, 16, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
+}
+
+fn rwlock_set_reader_blockset<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ rwlock_op: OpTy<'tcx, Tag>,
+ blockset: impl Into<ScalarMaybeUndef<Tag>>,
+) -> InterpResult<'tcx, ()> {
+ set_at_offset(ecx, rwlock_op, 16, blockset, ecx.machine.layouts.u32, PTHREAD_RWLOCK_T_MIN_SIZE)
+}
+
+fn rwlock_get_or_create_reader_blockset<'mir, 'tcx: 'mir>(
+ ecx: &mut MiriEvalContext<'mir, 'tcx>,
+ rwlock_op: OpTy<'tcx, Tag>,
+) -> InterpResult<'tcx, BlockSetId> {
+ let blockset = rwlock_get_reader_blockset(ecx, rwlock_op)?.to_u32()?;
+ if blockset == 0 {
+ // 0 is a default value and also not a valid blockset id. Need to
+ // allocate a new blockset.
+ let blockset = ecx.create_blockset()?;
+ rwlock_set_reader_blockset(ecx, rwlock_op, blockset.to_u32_scalar())?;
+ Ok(blockset)
+ } else {
+ Ok(BlockSetId::new(blockset))
+ }
}
impl<'mir, 'tcx> EvalContextExt<'mir, 'tcx> for crate::MiriEvalContext<'mir, 'tcx> {}
let kind = mutex_get_kind(this, mutex_op)?.not_undef()?;
let locked_count = mutex_get_locked_count(this, mutex_op)?.to_u32()?;
+ let active_thread = this.get_active_thread()?;
- if kind == this.eval_libc("PTHREAD_MUTEX_NORMAL")? {
- if locked_count == 0 {
- mutex_set_locked_count(this, mutex_op, Scalar::from_u32(1))?;
- Ok(0)
- } else {
- throw_machine_stop!(TerminationInfo::Deadlock);
- }
- } else if kind == this.eval_libc("PTHREAD_MUTEX_ERRORCHECK")? {
- if locked_count == 0 {
- mutex_set_locked_count(this, mutex_op, Scalar::from_u32(1))?;
+ if locked_count == 0 {
+ // The mutex is unlocked. Let's lock it.
+ mutex_set_locked_count(this, mutex_op, Scalar::from_u32(1))?;
+ mutex_set_owner(this, mutex_op, active_thread.to_u32_scalar())?;
+ Ok(0)
+ } else {
+ // The mutex is locked. Let's check by whom.
+ let owner_thread: ThreadId =
+ mutex_get_owner(this, mutex_op)?.not_undef()?.to_u32()?.into();
+ if owner_thread != active_thread {
+ // Block the active thread.
+ let blockset = mutex_get_or_create_blockset(this, mutex_op)?;
+ this.block_active_thread(blockset)?;
Ok(0)
} else {
- this.eval_libc_i32("EDEADLK")
- }
- } else if kind == this.eval_libc("PTHREAD_MUTEX_RECURSIVE")? {
- match locked_count.checked_add(1) {
- Some(new_count) => {
- mutex_set_locked_count(this, mutex_op, Scalar::from_u32(new_count))?;
- Ok(0)
+ // Trying to acquire the same mutex again.
+ if kind == this.eval_libc("PTHREAD_MUTEX_NORMAL")? {
+ throw_machine_stop!(TerminationInfo::Deadlock);
+ } else if kind == this.eval_libc("PTHREAD_MUTEX_ERRORCHECK")? {
+ this.eval_libc_i32("EDEADLK")
+ } else if kind == this.eval_libc("PTHREAD_MUTEX_RECURSIVE")? {
+ match locked_count.checked_add(1) {
+ Some(new_count) => {
+ mutex_set_locked_count(this, mutex_op, Scalar::from_u32(new_count))?;
+ Ok(0)
+ }
+ None => this.eval_libc_i32("EAGAIN"),
+ }
+ } else {
+ throw_ub_format!("called pthread_mutex_lock on an unsupported type of mutex");
}
- None => this.eval_libc_i32("EAGAIN"),
}
- } else {
- throw_ub_format!("called pthread_mutex_lock on an unsupported type of mutex");
}
}
let kind = mutex_get_kind(this, mutex_op)?.not_undef()?;
let locked_count = mutex_get_locked_count(this, mutex_op)?.to_u32()?;
+ let active_thread = this.get_active_thread()?;
- if kind == this.eval_libc("PTHREAD_MUTEX_NORMAL")?
- || kind == this.eval_libc("PTHREAD_MUTEX_ERRORCHECK")?
- {
- if locked_count == 0 {
- mutex_set_locked_count(this, mutex_op, Scalar::from_u32(1))?;
- Ok(0)
- } else {
+ if locked_count == 0 {
+ // The mutex is unlocked. Let's lock it.
+ mutex_set_locked_count(this, mutex_op, Scalar::from_u32(1))?;
+ mutex_set_owner(this, mutex_op, active_thread.to_u32_scalar())?;
+ Ok(0)
+ } else {
+ let owner_thread: ThreadId = mutex_get_owner(this, mutex_op)?.to_u32()?.into();
+ if owner_thread != active_thread {
this.eval_libc_i32("EBUSY")
- }
- } else if kind == this.eval_libc("PTHREAD_MUTEX_RECURSIVE")? {
- match locked_count.checked_add(1) {
- Some(new_count) => {
- mutex_set_locked_count(this, mutex_op, Scalar::from_u32(new_count))?;
- Ok(0)
+ } else {
+ if kind == this.eval_libc("PTHREAD_MUTEX_NORMAL")?
+ || kind == this.eval_libc("PTHREAD_MUTEX_ERRORCHECK")?
+ {
+ this.eval_libc_i32("EBUSY")
+ } else if kind == this.eval_libc("PTHREAD_MUTEX_RECURSIVE")? {
+ match locked_count.checked_add(1) {
+ Some(new_count) => {
+ mutex_set_locked_count(this, mutex_op, Scalar::from_u32(new_count))?;
+ Ok(0)
+ }
+ None => this.eval_libc_i32("EAGAIN"),
+ }
+ } else {
+ throw_ub_format!(
+ "called pthread_mutex_trylock on an unsupported type of mutex"
+ );
}
- None => this.eval_libc_i32("EAGAIN"),
}
- } else {
- throw_ub_format!("called pthread_mutex_trylock on an unsupported type of mutex");
}
}
let kind = mutex_get_kind(this, mutex_op)?.not_undef()?;
let locked_count = mutex_get_locked_count(this, mutex_op)?.to_u32()?;
-
- if kind == this.eval_libc("PTHREAD_MUTEX_NORMAL")? {
- if locked_count != 0 {
- mutex_set_locked_count(this, mutex_op, Scalar::from_u32(0))?;
- Ok(0)
+ let owner_thread: ThreadId = mutex_get_owner(this, mutex_op)?.to_u32()?.into();
+
+ if owner_thread != this.get_active_thread()? {
+ throw_ub_format!("called pthread_mutex_unlock on a mutex owned by another thread");
+ } else if locked_count == 1 {
+ let blockset = mutex_get_or_create_blockset(this, mutex_op)?;
+ if let Some(new_owner) = this.unblock_some_thread(blockset)? {
+ // We have at least one thread waiting on this mutex. Transfer
+ // ownership to it.
+ mutex_set_owner(this, mutex_op, new_owner.to_u32_scalar())?;
} else {
- throw_ub_format!("unlocked a PTHREAD_MUTEX_NORMAL mutex that was not locked");
- }
- } else if kind == this.eval_libc("PTHREAD_MUTEX_ERRORCHECK")? {
- if locked_count != 0 {
+ // No thread is waiting on this mutex.
mutex_set_locked_count(this, mutex_op, Scalar::from_u32(0))?;
- Ok(0)
- } else {
- this.eval_libc_i32("EPERM")
}
- } else if kind == this.eval_libc("PTHREAD_MUTEX_RECURSIVE")? {
- match locked_count.checked_sub(1) {
- Some(new_count) => {
- mutex_set_locked_count(this, mutex_op, Scalar::from_u32(new_count))?;
- Ok(0)
- }
- None => {
- // locked_count was already zero
- this.eval_libc_i32("EPERM")
+ Ok(0)
+ } else {
+ if kind == this.eval_libc("PTHREAD_MUTEX_NORMAL")? {
+ throw_ub_format!("unlocked a PTHREAD_MUTEX_NORMAL mutex that was not locked");
+ } else if kind == this.eval_libc("PTHREAD_MUTEX_ERRORCHECK")? {
+ this.eval_libc_i32("EPERM")
+ } else if kind == this.eval_libc("PTHREAD_MUTEX_RECURSIVE")? {
+ match locked_count.checked_sub(1) {
+ Some(new_count) => {
+ mutex_set_locked_count(this, mutex_op, Scalar::from_u32(new_count))?;
+ Ok(0)
+ }
+ None => {
+ // locked_count was already zero
+ this.eval_libc_i32("EPERM")
+ }
}
+ } else {
+ throw_ub_format!("called pthread_mutex_unlock on an unsupported type of mutex");
}
- } else {
- throw_ub_format!("called pthread_mutex_unlock on an unsupported type of mutex");
}
}
mutex_set_kind(this, mutex_op, ScalarMaybeUndef::Undef)?;
mutex_set_locked_count(this, mutex_op, ScalarMaybeUndef::Undef)?;
+ mutex_set_blockset(this, mutex_op, ScalarMaybeUndef::Undef)?;
Ok(0)
}
let readers = rwlock_get_readers(this, rwlock_op)?.to_u32()?;
let writers = rwlock_get_writers(this, rwlock_op)?.to_u32()?;
+
if writers != 0 {
- throw_machine_stop!(TerminationInfo::Deadlock);
+ // The lock is locked by a writer.
+ assert_eq!(writers, 1);
+ let reader_blockset = rwlock_get_or_create_reader_blockset(this, rwlock_op)?;
+ this.block_active_thread(reader_blockset)?;
+ Ok(0)
} else {
match readers.checked_add(1) {
Some(new_readers) => {
let readers = rwlock_get_readers(this, rwlock_op)?.to_u32()?;
let writers = rwlock_get_writers(this, rwlock_op)?.to_u32()?;
- if readers != 0 {
- throw_machine_stop!(TerminationInfo::Deadlock);
- } else if writers != 0 {
- throw_machine_stop!(TerminationInfo::Deadlock);
+ let writer_blockset = rwlock_get_or_create_writer_blockset(this, rwlock_op)?;
+ if readers != 0 || writers != 0 {
+ this.block_active_thread(writer_blockset)?;
} else {
rwlock_set_writers(this, rwlock_op, Scalar::from_u32(1))?;
- Ok(0)
}
+ Ok(0)
}
fn pthread_rwlock_trywrlock(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> {
}
}
+ // FIXME: We should check that this lock was locked by the active thread.
fn pthread_rwlock_unlock(&mut self, rwlock_op: OpTy<'tcx, Tag>) -> InterpResult<'tcx, i32> {
let this = self.eval_context_mut();
let readers = rwlock_get_readers(this, rwlock_op)?.to_u32()?;
let writers = rwlock_get_writers(this, rwlock_op)?.to_u32()?;
+ let writer_blockset = rwlock_get_or_create_writer_blockset(this, rwlock_op)?;
if let Some(new_readers) = readers.checked_sub(1) {
+ assert_eq!(writers, 0);
rwlock_set_readers(this, rwlock_op, Scalar::from_u32(new_readers))?;
+ if new_readers == 0 {
+ if let Some(_writer) = this.unblock_some_thread(writer_blockset)? {
+ rwlock_set_writers(this, rwlock_op, Scalar::from_u32(1))?;
+ }
+ }
Ok(0)
} else if writers != 0 {
+ let reader_blockset = rwlock_get_or_create_reader_blockset(this, rwlock_op)?;
rwlock_set_writers(this, rwlock_op, Scalar::from_u32(0))?;
+ if let Some(_writer) = this.unblock_some_thread(writer_blockset)? {
+ rwlock_set_writers(this, rwlock_op, Scalar::from_u32(1))?;
+ } else {
+ let mut readers = 0;
+ while let Some(_reader) = this.unblock_some_thread(reader_blockset)? {
+ readers += 1;
+ }
+ rwlock_set_readers(this, rwlock_op, Scalar::from_u32(readers))?
+ }
Ok(0)
} else {
throw_ub_format!("unlocked an rwlock that was not locked");
rwlock_set_readers(this, rwlock_op, ScalarMaybeUndef::Undef)?;
rwlock_set_writers(this, rwlock_op, ScalarMaybeUndef::Undef)?;
+ rwlock_set_reader_blockset(this, rwlock_op, ScalarMaybeUndef::Undef)?;
+ rwlock_set_writer_blockset(this, rwlock_op, ScalarMaybeUndef::Undef)?;
Ok(0)
}
projects / rust.git / blobdiff