refactoring

This commit is contained in:
iperov 2021-11-07 10:03:15 +04:00
commit 30ba51edf7
24 changed files with 663 additions and 459 deletions

View file

@ -37,7 +37,7 @@ class MPSPSCMRRingData:
# Initialize first block at 0 index
wid = 0
wid_uuid = uuid.uuid4().bytes_le
wid_uuid = uuid.uuid4().bytes
wid_heap_offset = 0
wid_data_size = 0
@ -82,7 +82,7 @@ class MPSPSCMRRingData:
raise Exception('data_size more than heap_size')
fmv = FormattedMemoryViewIO(self._shared_mem.get_mv())
wid_uuid = uuid.uuid4().bytes_le
wid_uuid = uuid.uuid4().bytes
if self._write_lock is not None:
self._write_lock.acquire()

View file

@ -49,7 +49,7 @@ class MPWeakHeap:
# Entire block
fmv.seek(self._first_block_offset)
fmv.write_fmt('qq', self._heap_size-self._first_block_offset, 0), fmv.write(uuid.uuid4().bytes_le)
fmv.write_fmt('qq', self._heap_size-self._first_block_offset, 0), fmv.write(uuid.uuid4().bytes)
def add_data(self, data : Union[bytes, bytearray, memoryview] ) -> 'MPWeakHeap.DataRef':
@ -92,7 +92,7 @@ class MPWeakHeap:
if block_remain_size >= block_header_size:
# the remain space of the block is enough for next block, split the block
next_block_offset = cur_block_offset + block_new_size
fmv.seek(next_block_offset), fmv.write_fmt('qq', block_remain_size, 0), fmv.write(uuid.uuid4().bytes_le)
fmv.seek(next_block_offset), fmv.write_fmt('qq', block_remain_size, 0), fmv.write(uuid.uuid4().bytes)
else:
# otherwise do not split
next_block_offset = cur_block_offset + block_size
@ -101,7 +101,7 @@ class MPWeakHeap:
block_new_size = block_size
# update current block structure
uid = uuid.uuid4().bytes_le
uid = uuid.uuid4().bytes
fmv.seek(cur_block_offset), fmv.write_fmt('qq', block_new_size, data_size ), fmv.write(uid)
# update ring_head_block_offset
@ -135,7 +135,7 @@ class MPWeakHeap:
next_block_size, = fmv.get_fmt('q')
# erase data of next block
fmv.write_fmt('qq', 0, 0), fmv.write(uuid.uuid4().bytes_le)
fmv.write_fmt('qq', 0, 0), fmv.write(uuid.uuid4().bytes)
# overwrite current block size with expanded block size
fmv.seek(cur_block_offset)

View file

@ -11,7 +11,6 @@ def _host_thread_proc(wref):
break
ref._host_process_messages(0.005)
del ref
print('_host_thread_proc exit')
class SPMTWorker:
def __init__(self, *sub_args, **sub_kwargs):
@ -152,7 +151,7 @@ class SPMTWorker:
break
self._threads_running = False
self._threads_exit_barrier.wait()
self._on_sub_finalize()