Skip to content
Merged
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions tipc/src/mem/mem_queue.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use super::BuildType;
use parking_lot::Mutex;
use shared_memory::{Shmem, ShmemConf, ShmemError};
use std::marker::PhantomData;
Expand All @@ -8,7 +9,6 @@ use std::{
mem::size_of,
sync::atomic::{AtomicUsize, Ordering},
};
use super::BuildType;

#[repr(C)]
struct _MemQueue<const QUEUE_SIZE: usize, T: 'static + Copy> {
Expand All @@ -34,7 +34,7 @@ impl<const QUEUE_SIZE: usize, T: 'static + Copy> _MemQueue<QUEUE_SIZE, T> {
fn try_read(&self) -> Option<T> {
if self.has_event() {
let read = self.read_indicate.load(Ordering::Acquire);
let evt = unsafe { *(self.events[read % QUEUE_SIZE].as_ptr()) };
let evt = unsafe { self.events[read % QUEUE_SIZE].assume_init_read() };
self.read_indicate
.store(read.wrapping_add(1), Ordering::Release);
Some(evt)
Expand All @@ -47,7 +47,7 @@ impl<const QUEUE_SIZE: usize, T: 'static + Copy> _MemQueue<QUEUE_SIZE, T> {
fn try_write(&mut self, evt: T) -> Result<(), MemQueueError> {
if !self.is_full() {
let write = self.write_indicate.load(Ordering::Acquire);
unsafe { std::ptr::write(self.events[write % QUEUE_SIZE].as_mut_ptr(), evt) };
unsafe { std::ptr::write(self.events[write % QUEUE_SIZE].assume_init_mut(), evt) };
self.write_indicate
.store(write.wrapping_add(1), Ordering::Release);
Ok(())
Expand Down