From 4e6f116925c4117f5adb36644f154a3a8cab711c Mon Sep 17 00:00:00 2001 From: Reece Date: Sat, 17 Dec 2022 20:14:19 +0000 Subject: [PATCH] [*] Refactor [+] IProcessSectionView::GetStart [+] IProcessSectionView::GetEnd --- .../Aurora/Process/IProcessSectionView.hpp | 4 + Source/Debug/ExceptionWatcher.Win32.cpp | 4 +- Source/Debug/Stack.Win32.cpp | 4 +- ...eamPair.cpp => AuByteBufferStreamPair.cpp} | 26 +-- ...eamPair.hpp => AuByteBufferStreamPair.hpp} | 4 +- ...cStream.cpp => AuIOAdapterAsyncStream.cpp} | 150 +++++++++--------- ...cStream.hpp => AuIOAdapterAsyncStream.hpp} | 2 +- ...teBuffer.cpp => AuIOAdapterByteBuffer.cpp} | 24 +-- ...rocessor.hpp => AuIOAdapterByteBuffer.hpp} | 2 +- ...ression.cpp => AuIOAdapterCompression.cpp} | 57 ++++--- ...ression.hpp => AuIOAdapterCompression.hpp} | 12 +- ...pterSeeking.cpp => AuIOAdapterSeeking.cpp} | 21 +-- ...pterSeeking.hpp => AuIOAdapterSeeking.hpp} | 10 +- ...rocessor.cpp => AuIOBufferedProcessor.cpp} | 4 +- ...teBuffer.hpp => AuIOBufferedProcessor.hpp} | 2 +- ...ipeProcessor.cpp => AuIOPipeProcessor.cpp} | 6 +- ...ipeProcessor.hpp => AuIOPipeProcessor.hpp} | 0 .../IO/{IOProcessor.cpp => AuIOProcessor.cpp} | 10 +- .../IO/{IOProcessor.hpp => AuIOProcessor.hpp} | 6 +- ...rocessorItem.cpp => AuIOProcessorItem.cpp} | 6 +- ...rocessorItem.hpp => AuIOProcessorItem.hpp} | 2 +- ...cessorItems.cpp => AuIOProcessorItems.cpp} | 6 +- ...cessorItems.hpp => AuIOProcessorItems.hpp} | 0 ...ssorTimers.cpp => AuIOProcessorTimers.cpp} | 6 +- ...ssorTimers.hpp => AuIOProcessorTimers.hpp} | 2 +- ...stener.cpp => AuIOSimpleEventListener.cpp} | 4 +- ...stener.hpp => AuIOSimpleEventListener.hpp} | 2 +- ...{IOSleep.Linux.cpp => AuIOSleep.Linux.cpp} | 4 +- ...{IOSleep.Linux.hpp => AuIOSleep.Linux.hpp} | 2 +- .../IO/{IOSleep.NT.cpp => AuIOSleep.NT.cpp} | 4 +- .../IO/{IOSleep.NT.hpp => AuIOSleep.NT.hpp} | 2 +- Source/IO/AuIOSleep.cpp | 23 +++ Source/IO/{IOSleep.hpp => AuIOSleep.hpp} | 2 +- ...ource.cpp => AuIOWaitableIOLoopSource.cpp} | 26 +-- ...ource.hpp => AuIOWaitableIOLoopSource.hpp} | 12 +- ...bleIOTimer.cpp => AuIOWaitableIOTimer.cpp} | 4 +- ...bleIOTimer.hpp => AuIOWaitableIOTimer.hpp} | 2 +- Source/IO/IOSleep.cpp | 23 --- Source/IO/Net/AuNetDatagramServer.NT.hpp | 3 +- Source/IO/Net/AuNetSocketChannel.cpp | 2 +- Source/IO/Net/AuNetSocketChannelInput.cpp | 2 +- Source/IO/Net/AuNetSocketChannelOutput.cpp | 2 +- Source/IO/Net/AuNetSocketServer.NT.cpp | 3 +- Source/IO/Net/AuNetStream.NT.cpp | 1 + Source/IO/Protocol/AuProtocolStack.cpp | 2 +- Source/Logging/AuLogSinks.cpp | 38 ++--- Source/Logging/AuLogger.cpp | 44 ++--- Source/Logging/AuLogging.cpp | 12 +- Source/Process/{Paths.cpp => AuPaths.cpp} | 4 +- Source/Process/{Paths.hpp => AuPaths.hpp} | 2 +- Source/Process/{Process.cpp => AuProcess.cpp} | 6 +- ...ssMap.Linux.cpp => AuProcessMap.Linux.cpp} | 4 +- ...ssMap.Linux.hpp => AuProcessMap.Linux.hpp} | 0 ...{ProcessMap.NT.cpp => AuProcessMap.NT.cpp} | 4 +- ...{ProcessMap.NT.hpp => AuProcessMap.NT.hpp} | 2 +- ...ssMap.Win32.cpp => AuProcessMap.Win32.cpp} | 6 +- ...ssMap.Win32.hpp => AuProcessMap.Win32.hpp} | 2 +- .../{ProcessMap.cpp => AuProcessMap.cpp} | 10 +- .../{ProcessMap.hpp => AuProcessMap.hpp} | 2 +- ...ns.cpp => AuProcessSectionAllocations.cpp} | 4 +- ...ns.hpp => AuProcessSectionAllocations.hpp} | 2 +- ...cpp => AuProcessSectionFileMapView.NT.cpp} | 6 +- ...hpp => AuProcessSectionFileMapView.NT.hpp} | 2 +- ...p => AuProcessSectionFileMapView.Unix.cpp} | 8 +- ...p => AuProcessSectionFileMapView.Unix.hpp} | 2 +- ...iew.NT.cpp => AuProcessSectionView.NT.cpp} | 16 +- ...iew.NT.hpp => AuProcessSectionView.NT.hpp} | 6 +- ...Unix.cpp => AuProcessSectionView.Unix.cpp} | 16 +- ...Unix.hpp => AuProcessSectionView.Unix.hpp} | 4 + ...pp => AuProcessSectionViewReserved.NT.cpp} | 18 ++- ...pp => AuProcessSectionViewReserved.NT.hpp} | 8 +- ... => AuProcessSectionViewReserved.Unix.cpp} | 16 +- ... => AuProcessSectionViewReserved.Unix.hpp} | 8 +- Source/Time/{Clock.cpp => AuClock.cpp} | 4 +- Source/Time/{Clock.hpp => AuClock.hpp} | 2 +- 75 files changed, 414 insertions(+), 339 deletions(-) rename Source/IO/{ByteBufferStreamPair.cpp => AuByteBufferStreamPair.cpp} (78%) rename Source/IO/{ByteBufferStreamPair.hpp => AuByteBufferStreamPair.hpp} (84%) rename Source/IO/{IOAdapterAsyncStream.cpp => AuIOAdapterAsyncStream.cpp} (80%) rename Source/IO/{IOAdapterAsyncStream.hpp => AuIOAdapterAsyncStream.hpp} (81%) rename Source/IO/{IOAdapterByteBuffer.cpp => AuIOAdapterByteBuffer.cpp} (61%) rename Source/IO/{IOBufferedProcessor.hpp => AuIOAdapterByteBuffer.hpp} (81%) rename Source/IO/{IOAdapterCompression.cpp => AuIOAdapterCompression.cpp} (59%) rename Source/IO/{IOAdapterCompression.hpp => AuIOAdapterCompression.hpp} (76%) rename Source/IO/{IOAdapterSeeking.cpp => AuIOAdapterSeeking.cpp} (51%) rename Source/IO/{IOAdapterSeeking.hpp => AuIOAdapterSeeking.hpp} (71%) rename Source/IO/{IOBufferedProcessor.cpp => AuIOBufferedProcessor.cpp} (98%) rename Source/IO/{IOAdapterByteBuffer.hpp => AuIOBufferedProcessor.hpp} (82%) rename Source/IO/{IOPipeProcessor.cpp => AuIOPipeProcessor.cpp} (99%) rename Source/IO/{IOPipeProcessor.hpp => AuIOPipeProcessor.hpp} (100%) rename Source/IO/{IOProcessor.cpp => AuIOProcessor.cpp} (99%) rename Source/IO/{IOProcessor.hpp => AuIOProcessor.hpp} (97%) rename Source/IO/{IOProcessorItem.cpp => AuIOProcessorItem.cpp} (96%) rename Source/IO/{IOProcessorItem.hpp => AuIOProcessorItem.hpp} (96%) rename Source/IO/{IOProcessorItems.cpp => AuIOProcessorItems.cpp} (93%) rename Source/IO/{IOProcessorItems.hpp => AuIOProcessorItems.hpp} (100%) rename Source/IO/{IOProcessorTimers.cpp => AuIOProcessorTimers.cpp} (85%) rename Source/IO/{IOProcessorTimers.hpp => AuIOProcessorTimers.hpp} (93%) rename Source/IO/{IOSimpleEventListener.cpp => AuIOSimpleEventListener.cpp} (93%) rename Source/IO/{IOSimpleEventListener.hpp => AuIOSimpleEventListener.hpp} (94%) rename Source/IO/{IOSleep.Linux.cpp => AuIOSleep.Linux.cpp} (95%) rename Source/IO/{IOSleep.Linux.hpp => AuIOSleep.Linux.hpp} (84%) rename Source/IO/{IOSleep.NT.cpp => AuIOSleep.NT.cpp} (96%) rename Source/IO/{IOSleep.NT.hpp => AuIOSleep.NT.hpp} (85%) create mode 100644 Source/IO/AuIOSleep.cpp rename Source/IO/{IOSleep.hpp => AuIOSleep.hpp} (86%) mode change 100755 => 100644 rename Source/IO/{IOWaitableIOLoopSource.cpp => AuIOWaitableIOLoopSource.cpp} (69%) rename Source/IO/{IOWaitableIOLoopSource.hpp => AuIOWaitableIOLoopSource.hpp} (82%) rename Source/IO/{IOWaitableIOTimer.cpp => AuIOWaitableIOTimer.cpp} (96%) rename Source/IO/{IOWaitableIOTimer.hpp => AuIOWaitableIOTimer.hpp} (96%) delete mode 100755 Source/IO/IOSleep.cpp rename Source/Process/{Paths.cpp => AuPaths.cpp} (99%) rename Source/Process/{Paths.hpp => AuPaths.hpp} (86%) rename Source/Process/{Process.cpp => AuProcess.cpp} (99%) rename Source/Process/{ProcessMap.Linux.cpp => AuProcessMap.Linux.cpp} (99%) rename Source/Process/{ProcessMap.Linux.hpp => AuProcessMap.Linux.hpp} (100%) rename Source/Process/{ProcessMap.NT.cpp => AuProcessMap.NT.cpp} (99%) rename Source/Process/{ProcessMap.NT.hpp => AuProcessMap.NT.hpp} (94%) rename Source/Process/{ProcessMap.Win32.cpp => AuProcessMap.Win32.cpp} (91%) rename Source/Process/{ProcessMap.Win32.hpp => AuProcessMap.Win32.hpp} (89%) rename Source/Process/{ProcessMap.cpp => AuProcessMap.cpp} (97%) rename Source/Process/{ProcessMap.hpp => AuProcessMap.hpp} (95%) rename Source/Process/{ProcessSectionAllocations.cpp => AuProcessSectionAllocations.cpp} (97%) rename Source/Process/{ProcessSectionAllocations.hpp => AuProcessSectionAllocations.hpp} (92%) rename Source/Process/{ProcessSectionFileMapView.NT.cpp => AuProcessSectionFileMapView.NT.cpp} (93%) rename Source/Process/{ProcessSectionFileMapView.NT.hpp => AuProcessSectionFileMapView.NT.hpp} (95%) rename Source/Process/{ProcessSectionFileMapView.Unix.cpp => AuProcessSectionFileMapView.Unix.cpp} (92%) mode change 100755 => 100644 rename Source/Process/{ProcessSectionFileMapView.Unix.hpp => AuProcessSectionFileMapView.Unix.hpp} (95%) mode change 100755 => 100644 rename Source/Process/{ProcessSectionView.NT.cpp => AuProcessSectionView.NT.cpp} (97%) rename Source/Process/{ProcessSectionView.NT.hpp => AuProcessSectionView.NT.hpp} (96%) rename Source/Process/{ProcessSectionView.Unix.cpp => AuProcessSectionView.Unix.cpp} (96%) mode change 100755 => 100644 rename Source/Process/{ProcessSectionView.Unix.hpp => AuProcessSectionView.Unix.hpp} (97%) mode change 100755 => 100644 rename Source/Process/{ProcessSectionViewReserved.NT.cpp => AuProcessSectionViewReserved.NT.cpp} (98%) rename Source/Process/{ProcessSectionViewReserved.NT.hpp => AuProcessSectionViewReserved.NT.hpp} (95%) rename Source/Process/{ProcessSectionViewReserved.Unix.cpp => AuProcessSectionViewReserved.Unix.cpp} (97%) mode change 100755 => 100644 rename Source/Process/{ProcessSectionViewReserved.Unix.hpp => AuProcessSectionViewReserved.Unix.hpp} (95%) mode change 100755 => 100644 rename Source/Time/{Clock.cpp => AuClock.cpp} (99%) rename Source/Time/{Clock.hpp => AuClock.hpp} (86%) diff --git a/Include/Aurora/Process/IProcessSectionView.hpp b/Include/Aurora/Process/IProcessSectionView.hpp index 88043317..d8485cbf 100644 --- a/Include/Aurora/Process/IProcessSectionView.hpp +++ b/Include/Aurora/Process/IProcessSectionView.hpp @@ -13,6 +13,10 @@ namespace Aurora::Process struct IProcessSectionView { + virtual AuUInt GetStart() = 0; + + virtual AuUInt GetEnd() = 0; + virtual AuSPtr Allocate(AuUInt uLength) = 0; virtual AuSPtr AllocateEx(AuUInt uLength, diff --git a/Source/Debug/ExceptionWatcher.Win32.cpp b/Source/Debug/ExceptionWatcher.Win32.cpp index e80f6482..fec253cb 100644 --- a/Source/Debug/ExceptionWatcher.Win32.cpp +++ b/Source/Debug/ExceptionWatcher.Win32.cpp @@ -11,7 +11,7 @@ #include "ExceptionWatcher.Win32.hpp" #include "Stack.Win32.hpp" -#include +#include #include #include @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/Source/Debug/Stack.Win32.cpp b/Source/Debug/Stack.Win32.cpp index f30bd1d1..0dec15bd 100644 --- a/Source/Debug/Stack.Win32.cpp +++ b/Source/Debug/Stack.Win32.cpp @@ -9,8 +9,8 @@ #include "Stack.hpp" #include "Stack.Win32.hpp" #include -#include -#include +#include +#include namespace Aurora::Debug { diff --git a/Source/IO/ByteBufferStreamPair.cpp b/Source/IO/AuByteBufferStreamPair.cpp similarity index 78% rename from Source/IO/ByteBufferStreamPair.cpp rename to Source/IO/AuByteBufferStreamPair.cpp index 5aee7444..0184069d 100644 --- a/Source/IO/ByteBufferStreamPair.cpp +++ b/Source/IO/AuByteBufferStreamPair.cpp @@ -1,21 +1,21 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ByteBufferStreamPair.cpp + File: AuByteBufferStreamPair.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "ByteBufferStreamPair.hpp" +#include "AuByteBufferStreamPair.hpp" namespace Aurora::IO { - ByteBufferStreamPair::ByteBufferStreamPair(const AuSPtr &buffer) : - buffer(buffer), - reader(buffer), - writer(buffer), - seeker(buffer) + ByteBufferStreamPair::ByteBufferStreamPair(const AuSPtr &pBuffer) : + pBuffer(pBuffer), + reader(pBuffer), + writer(pBuffer), + seeker(pBuffer) { } @@ -27,7 +27,7 @@ namespace Aurora::IO AuSPtr ByteBufferStreamPair::ToSeekingReader() { - if (this->buffer->flagCircular) + if (this->pBuffer->flagCircular) { SysPushErrorIO("ring buffer must not be seekable"); return {}; @@ -43,7 +43,7 @@ namespace Aurora::IO AuSPtr ByteBufferStreamPair::ToByteBuffer() { - return this->buffer; + return this->pBuffer; } AUKN_SYM AuSPtr NewByteBufferPair() @@ -58,9 +58,9 @@ namespace Aurora::IO return AuMakeShared(scalable); } - AUKN_SYM AuSPtr NewByteBufferPairEx(AuUInt length, bool permitResize) + AUKN_SYM AuSPtr NewByteBufferPairEx(AuUInt uLength, bool bPermitResize) { - auto buffer = AuMakeShared(length, false, permitResize); + auto buffer = AuMakeShared(uLength, false, bPermitResize); if (!buffer) { SysPushErrorMem(); @@ -70,9 +70,9 @@ namespace Aurora::IO return AuMakeShared(buffer); } - AUKN_SYM AuSPtr NewRingByteBuffer(AuUInt length) + AUKN_SYM AuSPtr NewRingByteBuffer(AuUInt uLength) { - auto buffer = AuMakeShared(length, false, false); + auto buffer = AuMakeShared(uLength, false, false); if (!buffer) { SysPushErrorMem(); diff --git a/Source/IO/ByteBufferStreamPair.hpp b/Source/IO/AuByteBufferStreamPair.hpp similarity index 84% rename from Source/IO/ByteBufferStreamPair.hpp rename to Source/IO/AuByteBufferStreamPair.hpp index 75506f14..df763802 100644 --- a/Source/IO/ByteBufferStreamPair.hpp +++ b/Source/IO/AuByteBufferStreamPair.hpp @@ -11,7 +11,7 @@ namespace Aurora::IO { struct ByteBufferStreamPair : IByteBufferStreamPair, AuEnableSharedFromThis { - ByteBufferStreamPair(const AuSPtr &buffer); + ByteBufferStreamPair(const AuSPtr &pBuffer); AuSPtr ToStreamReader() override; AuSPtr ToSeekingReader() override; @@ -19,7 +19,7 @@ namespace Aurora::IO AuSPtr ToByteBuffer() override; - AuSPtr buffer; + AuSPtr pBuffer; Buffered::BlobReader reader; Buffered::BlobWriter writer; Buffered::BlobSeekableReader seeker; diff --git a/Source/IO/IOAdapterAsyncStream.cpp b/Source/IO/AuIOAdapterAsyncStream.cpp similarity index 80% rename from Source/IO/IOAdapterAsyncStream.cpp rename to Source/IO/AuIOAdapterAsyncStream.cpp index a7c978b2..03ccfae6 100644 --- a/Source/IO/IOAdapterAsyncStream.cpp +++ b/Source/IO/AuIOAdapterAsyncStream.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterAsyncStream.cpp + File: AuIOAdapterAsyncStream.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOAdapterAsyncStream.hpp" -#include "IOWaitableIOLoopSource.hpp" +#include "AuIOAdapterAsyncStream.hpp" +#include "AuIOWaitableIOLoopSource.hpp" namespace Aurora::IO { @@ -23,14 +23,14 @@ namespace Aurora::IO void Close() override; EStreamError BeginRead(const AuSPtr &internalView) override; - EStreamError Dequeue(AuUInt reqLength, Memory::MemoryViewWrite &out) override; + EStreamError Dequeue(AuUInt uReqLength, Memory::MemoryViewWrite &out) override; }; struct AsyncStreamMemory : AuMemoryViewWrite { AsyncStreamMemory(const AuMemoryViewWrite &ref); AsyncStreamMemory(const AuSPtr &ref); - AsyncStreamMemory(AuUInt length); + AsyncStreamMemory(AuUInt uLength); ~AsyncStreamMemory(); bool IsValid(); @@ -62,7 +62,7 @@ namespace Aurora::IO { AsyncStreamAdapter(); - AuSPtr AllocateNextPageCached(AuUInt64 length); + AuSPtr AllocateNextPageCached(AuUInt64 uLength); virtual AuSPtr ToStreamReader() override; virtual AuSPtr ToStreamWriter() override; @@ -71,14 +71,14 @@ namespace Aurora::IO virtual bool Reset() override; - bool Init(const AuSPtr &transaction, bool isStream); + bool Init(const AuSPtr &transaction, bool bIsStream); AuSPtr lastAllocation; AuSPtr transaction; bool SetFlushOnWrite(bool value) override; - void ReserveBuffer(AuUInt64 length) override; + void ReserveBuffer(AuUInt64 uLength) override; AuUInt64 GetReadOffset() override; AuUInt64 SetReadOffset(AuUInt64 offset) override; @@ -86,19 +86,21 @@ namespace Aurora::IO AuUInt64 GetWriteOffset() override; AuUInt64 SetWriteOffset(AuUInt64 offset) override; - bool asyncActive {}; + bool bAsyncActive {}; + bool bIsStream {}; + bool bFlushOnWrite { true }; + AuUInt64 readOffset {}; AuUInt64 writeOffset {}; - bool isStream {}; - - bool flushOnWrite {true}; AuOptionalEx errorCode; int locked {}; + IOWatachableIOLoopSource source; + + // impl AsyncStreamReader reader; AsyncStreamWriter writer; - IOWatachableIOLoopSource source; }; @@ -115,7 +117,7 @@ namespace Aurora::IO } - AsyncStreamMemory::AsyncStreamMemory(AuUInt length) : AuMemoryViewWrite(AuMemory::ZAlloc(length, AuHwInfo::GetPageSize()), length) + AsyncStreamMemory::AsyncStreamMemory(AuUInt uLength) : AuMemoryViewWrite(AuMemory::ZAlloc(uLength, AuHwInfo::GetPageSize()), uLength) { this->owned = true; } @@ -136,7 +138,7 @@ namespace Aurora::IO bool AsyncStreamAdapter::SetFlushOnWrite(bool value) { - return AuExchange(this->flushOnWrite, value); + return AuExchange(this->bFlushOnWrite, value); } AuUInt64 AsyncStreamAdapter::GetReadOffset() @@ -167,14 +169,14 @@ namespace Aurora::IO return AuExchange(this->writeOffset, offset); } - bool AsyncStreamAdapter::Init(const AuSPtr &transaction, bool isStream) + bool AsyncStreamAdapter::Init(const AuSPtr &transaction, bool bIsStream) { this->transaction = transaction; this->lastAllocation.reset(); - this->asyncActive = false; + this->bAsyncActive = false; this->reader.parent = this; this->writer.parent = this; - this->isStream = isStream; + this->bIsStream = bIsStream; return true; } @@ -183,17 +185,17 @@ namespace Aurora::IO } - AuSPtr AsyncStreamAdapter::AllocateNextPageCached(AuUInt64 length) + AuSPtr AsyncStreamAdapter::AllocateNextPageCached(AuUInt64 uLength) { if (this->lastAllocation) { - if (this->lastAllocation->length >= length) + if (this->lastAllocation->length >= uLength) { return this->lastAllocation; } } - auto newMem = AuMakeShared(length); + auto newMem = AuMakeShared(uLength); if (!newMem) { SysPushErrorMem(); @@ -220,9 +222,9 @@ namespace Aurora::IO { if (parent->lastAllocation) { - auto length = parent->transaction->GetLastPacketLength(); - if (length && - parent->lastAllocation->streamIndex != length) + auto uLength = parent->transaction->GetLastPacketLength(); + if (uLength && + parent->lastAllocation->streamIndex != uLength) { AuDebugBreak(); return EStreamError::eErrorStreamInterrupted; @@ -231,7 +233,7 @@ namespace Aurora::IO parent->lastAllocation.reset(); } - if (parent->asyncActive && !parent->transaction->Complete()) + if (parent->bAsyncActive && !parent->transaction->Complete()) { AuDebugBreak(); return EStreamError::eErrorStreamInterrupted; @@ -239,7 +241,7 @@ namespace Aurora::IO // Async success or blank state parent->transaction->Reset(); - parent->asyncActive = true; + parent->bAsyncActive = true; parent->lastAllocation = AuMakeShared(internalView); if (!parent->lastAllocation) @@ -250,9 +252,9 @@ namespace Aurora::IO parent->lastAllocation->streamIndex = 0; - if (!parent->transaction->StartRead(parent->isStream ? 0 : parent->readOffset, parent->lastAllocation)) + if (!parent->transaction->StartRead(parent->bIsStream ? 0 : parent->readOffset, parent->lastAllocation)) { - parent->asyncActive = false; + parent->bAsyncActive = false; SysPushErrorNested("Couldn't start async aio read"); return EStreamError::eErrorStreamInterrupted; } @@ -260,7 +262,7 @@ namespace Aurora::IO return EStreamError::eErrorNone; } - EStreamError AsyncStreamReader::Dequeue(AuUInt reqLength, Memory::MemoryViewWrite &out) + EStreamError AsyncStreamReader::Dequeue(AuUInt uReqLength, Memory::MemoryViewWrite &out) { out = {}; @@ -272,7 +274,7 @@ namespace Aurora::IO // Transaction error if (parent->transaction->Failed()) { - parent->asyncActive = false; + parent->bAsyncActive = false; parent->transaction->Reset(); SysPushErrorIO("IO: {}", parent->transaction->GetOSErrorCode()); return EStreamError::eErrorStreamInterrupted; @@ -281,51 +283,51 @@ namespace Aurora::IO // Async error if (parent->errorCode.HasValue()) { - auto code = parent->isStream ? + auto code = parent->bIsStream ? parent->errorCode.Value() : AuExchange(parent->errorCode, {}).Value(); if (code != EStreamError::eErrorNone) { - parent->asyncActive = false; + parent->bAsyncActive = false; parent->transaction->Reset(); return code; } } - auto length = parent->transaction->GetLastPacketLength(); - if (!length) + auto uLength = parent->transaction->GetLastPacketLength(); + if (!uLength) { - parent->asyncActive = false; + parent->bAsyncActive = false; parent->transaction->Reset(); return EStreamError::eErrorNone; } auto streamIndex = parent->lastAllocation->streamIndex; - if (streamIndex == length) + if (streamIndex == uLength) { return EStreamError::eErrorNone; } - auto toRead = AuMin(parent->lastAllocation->length, length - streamIndex); - auto bRequestedLen = bool(reqLength); + auto toRead = AuMin(parent->lastAllocation->length, uLength - streamIndex); + auto bRequestedLen = bool(uReqLength); out.ptr = this->parent->lastAllocation->ToPointer() + streamIndex; - out.length = reqLength ? AuMin(toRead, reqLength) : toRead; + out.length = uReqLength ? AuMin(toRead, uReqLength) : toRead; if (bRequestedLen) { streamIndex += out.length; parent->lastAllocation->streamIndex = streamIndex; - if (!parent->isStream) + if (!parent->bIsStream) { parent->readOffset += out.length; } - if (parent->lastAllocation->streamIndex == length) + if (parent->lastAllocation->streamIndex == uLength) { - parent->asyncActive = false; + parent->bAsyncActive = false; parent->transaction->Reset(); } } @@ -344,32 +346,32 @@ namespace Aurora::IO // Read from the last tranaction, if not fully consumed if (parent->lastAllocation) { - auto length = parent->transaction->GetLastPacketLength(); - if (length && - parent->lastAllocation->streamIndex != length) + auto uLength = parent->transaction->GetLastPacketLength(); + if (uLength && + parent->lastAllocation->streamIndex != uLength) { - auto toRead = AuMin(parameters.length, length - parent->lastAllocation->streamIndex); + auto toRead = AuMin(parameters.length, uLength - parent->lastAllocation->streamIndex); if (toRead) { if (parameters.ptr) { AuMemcpy(parameters.ptr, parent->lastAllocation->Begin() + parent->lastAllocation->streamIndex, toRead); - if (parent->isStream) + if (parent->bIsStream) { parent->lastAllocation->streamIndex += toRead; } else { - parent->lastAllocation->streamIndex += length; - parent->readOffset += length; + parent->lastAllocation->streamIndex += uLength; + parent->readOffset += uLength; } } } - if (parent->isStream) + if (parent->bIsStream) { - parent->lastAllocation->streamIndex += length; + parent->lastAllocation->streamIndex += uLength; } parameters.outVariable = toRead; @@ -387,7 +389,7 @@ namespace Aurora::IO // Async error if (parent->errorCode.HasValue()) { - auto code = parent->isStream ? + auto code = parent->bIsStream ? parent->errorCode.Value() : AuExchange(parent->errorCode, {}).Value(); @@ -398,7 +400,7 @@ namespace Aurora::IO } // Async awaiting response - if (parent->asyncActive && !parent->transaction->Complete()) + if (parent->bAsyncActive && !parent->transaction->Complete()) { parameters.outVariable = 0; return EStreamError::eErrorNone; @@ -406,14 +408,14 @@ namespace Aurora::IO // Async success or blank state parent->transaction->Reset(); - parent->asyncActive = true; + parent->bAsyncActive = true; parent->lastAllocation = parent->AllocateNextPageCached(parameters.length); parent->lastAllocation->streamIndex = 0; - if (!parent->transaction->StartRead(parent->isStream ? 0 : parent->readOffset, parent->lastAllocation)) + if (!parent->transaction->StartRead(parent->bIsStream ? 0 : parent->readOffset, parent->lastAllocation)) { - parent->asyncActive = false; + parent->bAsyncActive = false; SysPushErrorNested("Couldn't start async aio read"); return EStreamError::eErrorStreamInterrupted; } @@ -454,7 +456,7 @@ namespace Aurora::IO if (parent->errorCode.HasValue()) { - auto code = parent->isStream ? + auto code = parent->bIsStream ? parent->errorCode.Value() : AuExchange(parent->errorCode, {}).Value(); @@ -486,7 +488,7 @@ namespace Aurora::IO return EStreamError::eErrorStreamInterrupted; } - if (this->parent->flushOnWrite) + if (this->parent->bFlushOnWrite) { Frame(); } @@ -534,14 +536,14 @@ namespace Aurora::IO } else { - AuUInt length {}; + AuUInt uLength {}; for (auto &a : this->writesPending) { - length += a->length; + uLength += a->length; } - buffer = this->parent->AllocateNextPageCached(length); + buffer = this->parent->AllocateNextPageCached(uLength); if (!buffer) { return; @@ -565,7 +567,7 @@ namespace Aurora::IO // Async success or blank state parent->transaction->Reset(); - parent->asyncActive = true; + parent->bAsyncActive = true; struct WriteMem : AuMemoryViewRead { @@ -586,9 +588,9 @@ namespace Aurora::IO parent->lastAllocation = buffer; parent->lastAllocation->streamIndex = 0; - if (!parent->transaction->StartWrite(parent->isStream ? 0 : parent->writeOffset, annoying)) + if (!parent->transaction->StartWrite(parent->bIsStream ? 0 : parent->writeOffset, annoying)) { - parent->asyncActive = false; + parent->bAsyncActive = false; SysPushErrorNested("Couldn't start async aio write"); return; } @@ -637,11 +639,11 @@ namespace Aurora::IO return AuSPtr(AuSharedFromThis(), &this->source); } - void AsyncStreamAdapter::ReserveBuffer(AuUInt64 length) + void AsyncStreamAdapter::ReserveBuffer(AuUInt64 uLength) { - if (!this->lastAllocation || !this->asyncActive) + if (!this->lastAllocation || !this->bAsyncActive) { - this->lastAllocation = this->AllocateNextPageCached(length); + this->lastAllocation = this->AllocateNextPageCached(uLength); } } @@ -657,7 +659,7 @@ namespace Aurora::IO this->writer.Flush(); } - if (this->asyncActive) + if (this->bAsyncActive) { if (!this->transaction->Complete()) { @@ -672,25 +674,25 @@ namespace Aurora::IO return true; } - AUKN_SYM AuSPtr NewAsyncStreamAdapter(const AuSPtr &transaction, bool isStream) + AUKN_SYM AuSPtr NewAsyncStreamAdapter(const AuSPtr &pTransaction, bool bIsStream) { - if (!transaction) + if (!pTransaction) { SysPushErrorArg(); return {}; } - auto adapter = AuMakeShared(); - if (!adapter) + auto pAdapter = AuMakeShared(); + if (!pAdapter) { return {}; } - if (!adapter->Init(transaction, isStream)) + if (!pAdapter->Init(pTransaction, bIsStream)) { return {}; } - return adapter; + return pAdapter; } } \ No newline at end of file diff --git a/Source/IO/IOAdapterAsyncStream.hpp b/Source/IO/AuIOAdapterAsyncStream.hpp similarity index 81% rename from Source/IO/IOAdapterAsyncStream.hpp rename to Source/IO/AuIOAdapterAsyncStream.hpp index 3e3df376..bda2da87 100644 --- a/Source/IO/IOAdapterAsyncStream.hpp +++ b/Source/IO/AuIOAdapterAsyncStream.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterAsyncStream.hpp + File: AuIOAdapterAsyncStream.hpp Date: 2022-6-6 Author: Reece ***/ diff --git a/Source/IO/IOAdapterByteBuffer.cpp b/Source/IO/AuIOAdapterByteBuffer.cpp similarity index 61% rename from Source/IO/IOAdapterByteBuffer.cpp rename to Source/IO/AuIOAdapterByteBuffer.cpp index 08c43aa4..ad6f8770 100644 --- a/Source/IO/IOAdapterByteBuffer.cpp +++ b/Source/IO/AuIOAdapterByteBuffer.cpp @@ -1,52 +1,52 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterByteBuffer.cpp + File: AuIOAdapterByteBuffer.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOAdapterByteBuffer.hpp" +#include "AuIOAdapterByteBuffer.hpp" namespace Aurora::IO { - AUKN_SYM AuSPtr NewByteBufferReadAdapter(const AuSPtr &buffer) + AUKN_SYM AuSPtr NewByteBufferReadAdapter(const AuSPtr &pBuffer) { - if (!buffer) + if (!pBuffer) { SysPushErrorArg(); return {}; } - return AuMakeShared(buffer); + return AuMakeShared(pBuffer); } - AUKN_SYM AuSPtr NewByteBufferLinearSeekableAdapter(const AuSPtr &buffer) + AUKN_SYM AuSPtr NewByteBufferLinearSeekableAdapter(const AuSPtr &pBuffer) { - if (!buffer) + if (!pBuffer) { SysPushErrorArg(); return {}; } - if (buffer->flagCircular) + if (pBuffer->flagCircular) { SysPushErrorIO("Seekable buffer must not be circular"); return {}; } - return AuMakeShared(buffer); + return AuMakeShared(pBuffer); } - AUKN_SYM AuSPtr NewByteBufferWriteAdapter(const AuSPtr &buffer) + AUKN_SYM AuSPtr NewByteBufferWriteAdapter(const AuSPtr &pBuffer) { - if (!buffer) + if (!pBuffer) { SysPushErrorArg(); return {}; } - return AuMakeShared(buffer); + return AuMakeShared(pBuffer); } } \ No newline at end of file diff --git a/Source/IO/IOBufferedProcessor.hpp b/Source/IO/AuIOAdapterByteBuffer.hpp similarity index 81% rename from Source/IO/IOBufferedProcessor.hpp rename to Source/IO/AuIOAdapterByteBuffer.hpp index 0862eff0..32d88d63 100644 --- a/Source/IO/IOBufferedProcessor.hpp +++ b/Source/IO/AuIOAdapterByteBuffer.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: BufferedProcessor.hpp + File: AuIOAdapterByteBuffer.hpp Date: 2022-6-6 Author: Reece ***/ diff --git a/Source/IO/IOAdapterCompression.cpp b/Source/IO/AuIOAdapterCompression.cpp similarity index 59% rename from Source/IO/IOAdapterCompression.cpp rename to Source/IO/AuIOAdapterCompression.cpp index 9f82bcb7..5ce6f03a 100644 --- a/Source/IO/IOAdapterCompression.cpp +++ b/Source/IO/AuIOAdapterCompression.cpp @@ -1,32 +1,45 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterCompression.cpp + File: AuIOAdapterCompression.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOAdapterCompression.hpp" +#include "AuIOAdapterCompression.hpp" namespace Aurora::IO { - CompressionStreamReader::CompressionStreamReader(const AuSPtr &compressionStream) : compressionStream(compressionStream) + CompressionStreamReader::CompressionStreamReader(const AuSPtr &pCompressionStream) : + pCompressionStream(pCompressionStream) + { + + } + + CompressionSeekingReader::CompressionSeekingReader(const AuSPtr &pCompressionStream) + : pCompressionStream(pCompressionStream) { } EStreamError CompressionStreamReader::IsOpen() { - return this->errored_ ? EStreamError::eErrorEndOfStream : EStreamError::eErrorNone; + return this->bErrored_ ? EStreamError::eErrorEndOfStream : EStreamError::eErrorNone; } EStreamError CompressionStreamReader::Read(const Memory::MemoryViewStreamWrite ¶meters) { - auto pair = this->compressionStream->ReadEx(parameters, true); + if (!this->pCompressionStream) + { + return EStreamError::eErrorStreamNotOpen; + } + + auto pair = this->pCompressionStream->ReadEx(parameters, true); + if (pair == AuStreamReadWrittenPair_t{}) { - this->errored_ = true; + this->bErrored_ = true; return EStreamError::eErrorEndOfStream; } @@ -38,25 +51,20 @@ namespace Aurora::IO { } - CompressionSeekingReader::CompressionSeekingReader(const AuSPtr &compressionStream) : compressionStream(compressionStream) - { - - } - EStreamError CompressionSeekingReader::IsOpen() { - return this->errored_ ? + return this->bErrored_ ? EStreamError::eErrorEndOfStream : EStreamError::eErrorNone; } EStreamError CompressionSeekingReader::ArbitraryRead(AuUInt offset, const Memory::MemoryViewStreamWrite ¶meters) { - if (this->offset != offset) + if (this->uOffset != offset) { - if (this->offset > offset) + if (this->uOffset > offset) { - if (!this->compressionStream->GoBackByProcessedN(this->offset - offset)) + if (!this->pCompressionStream->GoBackByProcessedN(this->uOffset - offset)) { SysPushErrorIO("Negative compression seek out of bounds"); return EStreamError::eErrorStreamInterrupted; @@ -64,26 +72,25 @@ namespace Aurora::IO } else { - if (!this->compressionStream->GoForwardByProcessedN(offset - this->offset)) + if (!this->pCompressionStream->GoForwardByProcessedN(offset - this->uOffset)) { SysPushErrorIO("Positive compression seek out of bounds"); return EStreamError::eErrorStreamInterrupted; } } - this->offset = offset; + this->uOffset = offset; } - auto pair = this->compressionStream->ReadEx(parameters, true); + auto pair = this->pCompressionStream->ReadEx(parameters, true); if (pair == AuStreamReadWrittenPair_t {}) { - this->errored_ = true; + this->bErrored_ = true; return EStreamError::eErrorEndOfStream; } - this->offset += pair.second; + this->uOffset += pair.second; parameters.outVariable = pair.second; - return EStreamError::eErrorNone; } @@ -91,13 +98,13 @@ namespace Aurora::IO { } - AUKN_SYM AuSPtr NewCompressionReadAdapter(const AuSPtr &compresionStream) + AUKN_SYM AuSPtr NewCompressionReadAdapter(const AuSPtr &pCompresionStream) { - return AuMakeShared(compresionStream); + return AuMakeShared(pCompresionStream); } - AUKN_SYM AuSPtr NewCompressionSeekingAdapter(const AuSPtr &compresionStream) + AUKN_SYM AuSPtr NewCompressionSeekingAdapter(const AuSPtr &pCompresionStream) { - return AuMakeShared(compresionStream); + return AuMakeShared(pCompresionStream); } } \ No newline at end of file diff --git a/Source/IO/IOAdapterCompression.hpp b/Source/IO/AuIOAdapterCompression.hpp similarity index 76% rename from Source/IO/IOAdapterCompression.hpp rename to Source/IO/AuIOAdapterCompression.hpp index 31731a12..f3b03f91 100644 --- a/Source/IO/IOAdapterCompression.hpp +++ b/Source/IO/AuIOAdapterCompression.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterCompression.hpp + File: AuIOAdapterCompression.hpp Date: 2022-6-6 Author: Reece ***/ @@ -11,7 +11,7 @@ namespace Aurora::IO { struct CompressionStreamReader : IStreamReader { - AuSPtr compressionStream; + AuSPtr pCompressionStream; CompressionStreamReader(const AuSPtr &compressionStream); @@ -19,12 +19,12 @@ namespace Aurora::IO EStreamError Read(const Memory::MemoryViewStreamWrite ¶meters) override; void Close() override; - bool errored_ {}; + bool bErrored_ {}; }; struct CompressionSeekingReader : ISeekingReader { - AuSPtr compressionStream; + AuSPtr pCompressionStream; CompressionSeekingReader(const AuSPtr &compressionStream); @@ -32,7 +32,7 @@ namespace Aurora::IO EStreamError ArbitraryRead(AuUInt offset, const Memory::MemoryViewStreamWrite ¶meters) override; void Close() override; - bool errored_ {}; - AuUInt offset {}; + bool bErrored_ {}; + AuUInt uOffset {}; }; } \ No newline at end of file diff --git a/Source/IO/IOAdapterSeeking.cpp b/Source/IO/AuIOAdapterSeeking.cpp similarity index 51% rename from Source/IO/IOAdapterSeeking.cpp rename to Source/IO/AuIOAdapterSeeking.cpp index bdfa4e63..443cebc0 100644 --- a/Source/IO/IOAdapterSeeking.cpp +++ b/Source/IO/AuIOAdapterSeeking.cpp @@ -1,46 +1,47 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterSeeking.cpp + File: AuIOAdapterSeeking.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOAdapterSeeking.hpp" +#include "AuIOAdapterSeeking.hpp" namespace Aurora::IO { - SeekingReader::SeekingReader(const AuSPtr &reader) : reader(reader) + SeekingReader::SeekingReader(const AuSPtr &pReader) : + pReader(pReader) { } EStreamError SeekingReader::IsOpen() { - return this->reader ? this->reader->IsOpen() : EStreamError::eErrorStreamNotOpen; + return this->pReader ? this->pReader->IsOpen() : EStreamError::eErrorStreamNotOpen; } EStreamError SeekingReader::Read(const Memory::MemoryViewStreamWrite ¶meters) { - auto error = this->reader ? this->reader->ArbitraryRead(this->index, parameters) : EStreamError::eErrorStreamNotOpen; + auto error = this->pReader ? this->pReader->ArbitraryRead(this->uIndex, parameters) : EStreamError::eErrorStreamNotOpen; if (error == EStreamError::eErrorNone) { - this->index += parameters.outVariable; + this->uIndex += parameters.outVariable; } return error; } void SeekingReader::Close() { - if (this->reader) + if (this->pReader) { - this->reader->Close(); + this->pReader->Close(); } } - AUKN_SYM AuSPtr NewSeekingReadAdapter(const AuSPtr &reader) + AUKN_SYM AuSPtr NewSeekingReadAdapter(const AuSPtr &pReader) { - return AuMakeShared(reader); + return AuMakeShared(pReader); } } \ No newline at end of file diff --git a/Source/IO/IOAdapterSeeking.hpp b/Source/IO/AuIOAdapterSeeking.hpp similarity index 71% rename from Source/IO/IOAdapterSeeking.hpp rename to Source/IO/AuIOAdapterSeeking.hpp index e54f55f5..fccbef7c 100644 --- a/Source/IO/IOAdapterSeeking.hpp +++ b/Source/IO/AuIOAdapterSeeking.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterSeeking.hpp + File: AuIOAdapterSeeking.hpp Date: 2022-6-6 Author: Reece ***/ @@ -11,13 +11,13 @@ namespace Aurora::IO { struct SeekingReader : IStreamReader { - AuSPtr reader; - AuUInt index {}; - - SeekingReader(const AuSPtr &reader); + SeekingReader(const AuSPtr &pReader); virtual EStreamError IsOpen() override; virtual EStreamError Read(const Memory::MemoryViewStreamWrite ¶meters) override; virtual void Close() override; + + AuSPtr pReader; + AuUInt uIndex {}; }; } \ No newline at end of file diff --git a/Source/IO/IOBufferedProcessor.cpp b/Source/IO/AuIOBufferedProcessor.cpp similarity index 98% rename from Source/IO/IOBufferedProcessor.cpp rename to Source/IO/AuIOBufferedProcessor.cpp index 188ffcd5..cb58c1fc 100644 --- a/Source/IO/IOBufferedProcessor.cpp +++ b/Source/IO/AuIOBufferedProcessor.cpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOBufferedProcessor.cpp + File: AuIOBufferedProcessor.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOBufferedProcessor.hpp" +#include "AuIOBufferedProcessor.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOAdapterByteBuffer.hpp b/Source/IO/AuIOBufferedProcessor.hpp similarity index 82% rename from Source/IO/IOAdapterByteBuffer.hpp rename to Source/IO/AuIOBufferedProcessor.hpp index 4c34ebf8..c10dfdbb 100644 --- a/Source/IO/IOAdapterByteBuffer.hpp +++ b/Source/IO/AuIOBufferedProcessor.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOAdapterByteBuffer.hpp + File: AuBufferedProcessor.hpp Date: 2022-6-6 Author: Reece ***/ diff --git a/Source/IO/IOPipeProcessor.cpp b/Source/IO/AuIOPipeProcessor.cpp similarity index 99% rename from Source/IO/IOPipeProcessor.cpp rename to Source/IO/AuIOPipeProcessor.cpp index 125e7435..82c67438 100644 --- a/Source/IO/IOPipeProcessor.cpp +++ b/Source/IO/AuIOPipeProcessor.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOPipeProcessor.cpp + File: AuIOPipeProcessor.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOProcessor.hpp" -#include "IOPipeProcessor.hpp" +#include "AuIOProcessor.hpp" +#include "AuIOPipeProcessor.hpp" #include namespace Aurora::IO diff --git a/Source/IO/IOPipeProcessor.hpp b/Source/IO/AuIOPipeProcessor.hpp similarity index 100% rename from Source/IO/IOPipeProcessor.hpp rename to Source/IO/AuIOPipeProcessor.hpp diff --git a/Source/IO/IOProcessor.cpp b/Source/IO/AuIOProcessor.cpp similarity index 99% rename from Source/IO/IOProcessor.cpp rename to Source/IO/AuIOProcessor.cpp index 93bd82a3..9c1aec28 100644 --- a/Source/IO/IOProcessor.cpp +++ b/Source/IO/AuIOProcessor.cpp @@ -1,16 +1,16 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOProcessor.cpp + File: AuIOProcessor.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOProcessorItem.hpp" -#include "IOProcessorItems.hpp" -#include "IOProcessor.hpp" -#include "IOPipeProcessor.hpp" +#include "AuIOProcessorItem.hpp" +#include "AuIOProcessorItems.hpp" +#include "AuIOProcessor.hpp" +#include "AuIOPipeProcessor.hpp" #include "Loop/Loop.hpp" #include "Loop/LoopQueue.hpp" diff --git a/Source/IO/IOProcessor.hpp b/Source/IO/AuIOProcessor.hpp similarity index 97% rename from Source/IO/IOProcessor.hpp rename to Source/IO/AuIOProcessor.hpp index bc4a533e..71d39eec 100644 --- a/Source/IO/IOProcessor.hpp +++ b/Source/IO/AuIOProcessor.hpp @@ -7,9 +7,9 @@ ***/ #pragma once -#include "IOPipeProcessor.hpp" -#include "IOProcessorItems.hpp" -#include "IOProcessorTimers.hpp" +#include "AuIOPipeProcessor.hpp" +#include "AuIOProcessorItems.hpp" +#include "AuIOProcessorTimers.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOProcessorItem.cpp b/Source/IO/AuIOProcessorItem.cpp similarity index 96% rename from Source/IO/IOProcessorItem.cpp rename to Source/IO/AuIOProcessorItem.cpp index 1dbff306..cd4dc831 100644 --- a/Source/IO/IOProcessorItem.cpp +++ b/Source/IO/AuIOProcessorItem.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOProcessorItem.cpp + File: AuIOProcessorItem.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOProcessorItem.hpp" -#include "IOProcessor.hpp" +#include "AuIOProcessorItem.hpp" +#include "AuIOProcessor.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOProcessorItem.hpp b/Source/IO/AuIOProcessorItem.hpp similarity index 96% rename from Source/IO/IOProcessorItem.hpp rename to Source/IO/AuIOProcessorItem.hpp index 301fa8ff..232b9162 100644 --- a/Source/IO/IOProcessorItem.hpp +++ b/Source/IO/AuIOProcessorItem.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOProcessorItem.hpp + File: AuIOProcessorItem.hpp Date: 2022-6-6 Author: Reece ***/ diff --git a/Source/IO/IOProcessorItems.cpp b/Source/IO/AuIOProcessorItems.cpp similarity index 93% rename from Source/IO/IOProcessorItems.cpp rename to Source/IO/AuIOProcessorItems.cpp index b1e0ee90..29bf7f63 100644 --- a/Source/IO/IOProcessorItems.cpp +++ b/Source/IO/AuIOProcessorItems.cpp @@ -7,9 +7,9 @@ ***/ #include #include -#include "IOProcessorItem.hpp" -#include "IOProcessorItems.hpp" -#include "IOProcessor.hpp" +#include "AuIOProcessorItem.hpp" +#include "AuIOProcessorItems.hpp" +#include "AuIOProcessor.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOProcessorItems.hpp b/Source/IO/AuIOProcessorItems.hpp similarity index 100% rename from Source/IO/IOProcessorItems.hpp rename to Source/IO/AuIOProcessorItems.hpp diff --git a/Source/IO/IOProcessorTimers.cpp b/Source/IO/AuIOProcessorTimers.cpp similarity index 85% rename from Source/IO/IOProcessorTimers.cpp rename to Source/IO/AuIOProcessorTimers.cpp index 8ff7b0b1..ec559af1 100644 --- a/Source/IO/IOProcessorTimers.cpp +++ b/Source/IO/AuIOProcessorTimers.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOProcessorTimers.cpp + File: AuIOProcessorTimers.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOProcessorTimers.hpp" -#include "IOProcessor.hpp" +#include "AuIOProcessorTimers.hpp" +#include "AuIOProcessor.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOProcessorTimers.hpp b/Source/IO/AuIOProcessorTimers.hpp similarity index 93% rename from Source/IO/IOProcessorTimers.hpp rename to Source/IO/AuIOProcessorTimers.hpp index 64c69235..c105ac72 100644 --- a/Source/IO/IOProcessorTimers.hpp +++ b/Source/IO/AuIOProcessorTimers.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOProcessorTimers.hpp + File: AuIOProcessorTimers.hpp Date: 2022-6-6 Author: Reece ***/ diff --git a/Source/IO/IOSimpleEventListener.cpp b/Source/IO/AuIOSimpleEventListener.cpp similarity index 93% rename from Source/IO/IOSimpleEventListener.cpp rename to Source/IO/AuIOSimpleEventListener.cpp index 98cf35b2..bb724dfe 100644 --- a/Source/IO/IOSimpleEventListener.cpp +++ b/Source/IO/AuIOSimpleEventListener.cpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOSimpleEventListener.cpp + File: AuIOSimpleEventListener.cpp Date: 2022-6-22 Author: Reece ***/ #include #include -#include "IOSimpleEventListener.hpp" +#include "AuIOSimpleEventListener.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOSimpleEventListener.hpp b/Source/IO/AuIOSimpleEventListener.hpp similarity index 94% rename from Source/IO/IOSimpleEventListener.hpp rename to Source/IO/AuIOSimpleEventListener.hpp index 8827347c..14c017ae 100644 --- a/Source/IO/IOSimpleEventListener.hpp +++ b/Source/IO/AuIOSimpleEventListener.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOSimpleEventListener.hpp + File: AuIOSimpleEventListener.hpp Date: 2022-6-22 Author: Reece ***/ diff --git a/Source/IO/IOSleep.Linux.cpp b/Source/IO/AuIOSleep.Linux.cpp similarity index 95% rename from Source/IO/IOSleep.Linux.cpp rename to Source/IO/AuIOSleep.Linux.cpp index 9a88fb20..5a3fb5d7 100644 --- a/Source/IO/IOSleep.Linux.cpp +++ b/Source/IO/AuIOSleep.Linux.cpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOSleep.Linux.cpp + File: AuIOSleep.Linux.cpp Date: 2022-5-13 Author: Reece ***/ #include #include "IO.hpp" -#include "IOSleep.Linux.hpp" +#include "AuIOSleep.Linux.hpp" #include "UNIX/IOSubmit.Linux.hpp" namespace Aurora::IO diff --git a/Source/IO/IOSleep.Linux.hpp b/Source/IO/AuIOSleep.Linux.hpp similarity index 84% rename from Source/IO/IOSleep.Linux.hpp rename to Source/IO/AuIOSleep.Linux.hpp index 51144661..ac085018 100644 --- a/Source/IO/IOSleep.Linux.hpp +++ b/Source/IO/AuIOSleep.Linux.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOSleep.Linux.hpp + File: AuIOSleep.Linux.hpp Date: 2022-5-13 Author: Reece ***/ diff --git a/Source/IO/IOSleep.NT.cpp b/Source/IO/AuIOSleep.NT.cpp similarity index 96% rename from Source/IO/IOSleep.NT.cpp rename to Source/IO/AuIOSleep.NT.cpp index 62040424..d89fcbb2 100644 --- a/Source/IO/IOSleep.NT.cpp +++ b/Source/IO/AuIOSleep.NT.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOSleep.NT.hpp + File: AuIOSleep.NT.hpp Date: 2022-5-13 Author: Reece ***/ #include #include "IO.hpp" -#include "IOSleep.NT.hpp" +#include "AuIOSleep.NT.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOSleep.NT.hpp b/Source/IO/AuIOSleep.NT.hpp similarity index 85% rename from Source/IO/IOSleep.NT.hpp rename to Source/IO/AuIOSleep.NT.hpp index 3177edc4..aa02532f 100644 --- a/Source/IO/IOSleep.NT.hpp +++ b/Source/IO/AuIOSleep.NT.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOSleep.NT.hpp + File: AuIOSleep.NT.hpp Date: 2022-5-13 Author: Reece ***/ diff --git a/Source/IO/AuIOSleep.cpp b/Source/IO/AuIOSleep.cpp new file mode 100644 index 00000000..656e0133 --- /dev/null +++ b/Source/IO/AuIOSleep.cpp @@ -0,0 +1,23 @@ +/*** + Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. + + File: AuIOSleep.cpp + Date: 2022-8-5 + Author: Reece +***/ +#include +#include "IO.hpp" +#include "AuIOSleep.hpp" + +namespace Aurora::IO +{ + AUKN_SYM bool IOSleep(AuUInt32 dwMilliseconds) + { + return WaitFor(dwMilliseconds, true); + } + + AUKN_SYM bool IOYieldFor(AuUInt32 dwMilliseconds) + { + return WaitFor(dwMilliseconds, false); + } +} \ No newline at end of file diff --git a/Source/IO/IOSleep.hpp b/Source/IO/AuIOSleep.hpp old mode 100755 new mode 100644 similarity index 86% rename from Source/IO/IOSleep.hpp rename to Source/IO/AuIOSleep.hpp index dcb1bb2f..4c7b9f41 --- a/Source/IO/IOSleep.hpp +++ b/Source/IO/AuIOSleep.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOSleep.hpp + File: AuIOSleep.hpp Date: 2022-8-5 Author: Reece ***/ diff --git a/Source/IO/IOWaitableIOLoopSource.cpp b/Source/IO/AuIOWaitableIOLoopSource.cpp similarity index 69% rename from Source/IO/IOWaitableIOLoopSource.cpp rename to Source/IO/AuIOWaitableIOLoopSource.cpp index 7811ea60..df926648 100644 --- a/Source/IO/IOWaitableIOLoopSource.cpp +++ b/Source/IO/AuIOWaitableIOLoopSource.cpp @@ -1,22 +1,24 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOWaitableIOLoopSource.cpp + File: AuIOWaitableIOLoopSource.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOWaitableIOLoopSource.hpp" +#include "AuIOWaitableIOLoopSource.hpp" namespace Aurora::IO { - IOWatachableIOLoopSource::IOWatachableIOLoopSource(const AuSPtr &source) : source(source) + IOWatachableIOLoopSource::IOWatachableIOLoopSource(const AuSPtr &pSource) : + pSource(pSource) { } - IOWatachableIOLoopSource::IOWatachableIOLoopSource(const AuSPtr& source, AuUInt32 ioTimeoutMS) : source(source), ioTimeoutMS(ioTimeoutMS) + IOWatachableIOLoopSource::IOWatachableIOLoopSource(const AuSPtr&pSource, AuUInt32 dwIoTimeoutMS) : + pSource(pSource), dwIoTimeoutMS(dwIoTimeoutMS) { } @@ -58,12 +60,12 @@ namespace Aurora::IO AuSPtr IOWatachableIOLoopSource::GetLoopSource() { - return this->source; + return this->pSource; } - AuSPtr IOWatachableIOLoopSource::SetLoopSource(const AuSPtr &ls) + AuSPtr IOWatachableIOLoopSource::SetLoopSource(const AuSPtr &pSource) { - return AuExchange(this->source, ls); + return AuExchange(this->pSource, pSource); } bool IOWatachableIOLoopSource::IsRunOnSelfIOCheckedOnTimerTick() @@ -73,16 +75,16 @@ namespace Aurora::IO AuUInt32 IOWatachableIOLoopSource::IOTimeoutInMS() { - return this->ioTimeoutMS; + return this->dwIoTimeoutMS; } - AUKN_SYM AuSPtr NewWaitableLoopSource(const AuSPtr& ptr) + AUKN_SYM AuSPtr NewWaitableLoopSource(const AuSPtr&pSource) { - return AuMakeShared(ptr); + return AuMakeShared(pSource); } - AUKN_SYM AuSPtr NewWaitableLoopSourceEx(const AuSPtr& ptr, AuUInt32 msTimeout) + AUKN_SYM AuSPtr NewWaitableLoopSourceEx(const AuSPtr&pSource, AuUInt32 dwIoTimeoutMS) { - return AuMakeShared(ptr, msTimeout); + return AuMakeShared(pSource, dwIoTimeoutMS); } } \ No newline at end of file diff --git a/Source/IO/IOWaitableIOLoopSource.hpp b/Source/IO/AuIOWaitableIOLoopSource.hpp similarity index 82% rename from Source/IO/IOWaitableIOLoopSource.hpp rename to Source/IO/AuIOWaitableIOLoopSource.hpp index 697f0093..31eb5543 100644 --- a/Source/IO/IOWaitableIOLoopSource.hpp +++ b/Source/IO/AuIOWaitableIOLoopSource.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOWaitableIOLoopSource.hpp + File: AuIOWaitableIOLoopSource.hpp Date: 2022-6-6 Author: Reece ***/ @@ -11,8 +11,8 @@ namespace Aurora::IO { struct IOWatachableIOLoopSource : IIOWatachableIOLoopSource { - IOWatachableIOLoopSource(const AuSPtr& source); - IOWatachableIOLoopSource(const AuSPtr& source, AuUInt32 ioTimeoutMS); + IOWatachableIOLoopSource(const AuSPtr&pSource); + IOWatachableIOLoopSource(const AuSPtr&pSource, AuUInt32 ioTimeoutMS); bool IsRunOnOtherTick() override; bool IsRunOnTick() override; @@ -27,10 +27,10 @@ namespace Aurora::IO AuUInt32 IOTimeoutInMS() override; AuSPtr GetLoopSource() override; - AuSPtr SetLoopSource(const AuSPtr &ls) override; + AuSPtr SetLoopSource(const AuSPtr &pSource) override; bool IsRunOnSelfIOCheckedOnTimerTick() override; - AuSPtr source; - AuUInt32 ioTimeoutMS{}; + AuSPtr pSource; + AuUInt32 dwIoTimeoutMS{}; }; } \ No newline at end of file diff --git a/Source/IO/IOWaitableIOTimer.cpp b/Source/IO/AuIOWaitableIOTimer.cpp similarity index 96% rename from Source/IO/IOWaitableIOTimer.cpp rename to Source/IO/AuIOWaitableIOTimer.cpp index ea38fcc1..894be31e 100644 --- a/Source/IO/IOWaitableIOTimer.cpp +++ b/Source/IO/AuIOWaitableIOTimer.cpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOWaitableIOTimer.cpp + File: AuIOWaitableIOTimer.cpp Date: 2022-6-6 Author: Reece ***/ #include #include -#include "IOWaitableIOTimer.hpp" +#include "AuIOWaitableIOTimer.hpp" namespace Aurora::IO { diff --git a/Source/IO/IOWaitableIOTimer.hpp b/Source/IO/AuIOWaitableIOTimer.hpp similarity index 96% rename from Source/IO/IOWaitableIOTimer.hpp rename to Source/IO/AuIOWaitableIOTimer.hpp index b05b9587..8185fdc0 100644 --- a/Source/IO/IOWaitableIOTimer.hpp +++ b/Source/IO/AuIOWaitableIOTimer.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IOWaitableIOTimer.hpp + File: AuIOWaitableIOTimer.hpp Date: 2022-6-6 Author: Reece ***/ diff --git a/Source/IO/IOSleep.cpp b/Source/IO/IOSleep.cpp deleted file mode 100755 index fc15efee..00000000 --- a/Source/IO/IOSleep.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/*** - Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - - File: IOSleep.cpp - Date: 2022-8-5 - Author: Reece -***/ -#include -#include "IO.hpp" -#include "IOSleep.hpp" - -namespace Aurora::IO -{ - AUKN_SYM bool IOSleep(AuUInt32 milliseconds) - { - return WaitFor(milliseconds, true); - } - - AUKN_SYM bool IOYieldFor(AuUInt32 milliseconds) - { - return WaitFor(milliseconds, false); - } -} \ No newline at end of file diff --git a/Source/IO/Net/AuNetDatagramServer.NT.hpp b/Source/IO/Net/AuNetDatagramServer.NT.hpp index 5dfeb275..141f1d5d 100644 --- a/Source/IO/Net/AuNetDatagramServer.NT.hpp +++ b/Source/IO/Net/AuNetDatagramServer.NT.hpp @@ -13,7 +13,8 @@ namespace Aurora::IO::Net { DatagramServerImpl(struct NetInterface *pInterface, struct NetWorker *pWorker, - const AuSPtr &pDriver); + const AuSPtr &pDriver, + AuUInt32 uDefaultPacketSize); void DoPosixTick() override; }; diff --git a/Source/IO/Net/AuNetSocketChannel.cpp b/Source/IO/Net/AuNetSocketChannel.cpp index 95a11028..c80535aa 100644 --- a/Source/IO/Net/AuNetSocketChannel.cpp +++ b/Source/IO/Net/AuNetSocketChannel.cpp @@ -13,7 +13,7 @@ #else #include "AuNetStream.Linux.hpp" #endif -#include +#include #include "AuNetWorker.hpp" #include #include diff --git a/Source/IO/Net/AuNetSocketChannelInput.cpp b/Source/IO/Net/AuNetSocketChannelInput.cpp index 216d4dfa..803ee1d0 100644 --- a/Source/IO/Net/AuNetSocketChannelInput.cpp +++ b/Source/IO/Net/AuNetSocketChannelInput.cpp @@ -10,7 +10,7 @@ #include "AuNetSocketChannelInput.hpp" #include "AuNetWorker.hpp" #include "AuNetSocketChannel.hpp" -#include +#include namespace Aurora::IO::Net { diff --git a/Source/IO/Net/AuNetSocketChannelOutput.cpp b/Source/IO/Net/AuNetSocketChannelOutput.cpp index 0167791d..82d2a09b 100644 --- a/Source/IO/Net/AuNetSocketChannelOutput.cpp +++ b/Source/IO/Net/AuNetSocketChannelOutput.cpp @@ -9,7 +9,7 @@ #include "AuNetSocket.hpp" #include "AuNetSocketChannelOutput.hpp" #include "AuNetWorker.hpp" -#include +#include #if defined(AURORA_IS_MODERNNT_DERIVED) #include "AuNetStream.NT.hpp" diff --git a/Source/IO/Net/AuNetSocketServer.NT.cpp b/Source/IO/Net/AuNetSocketServer.NT.cpp index 9f9d5a68..ca6f9280 100644 --- a/Source/IO/Net/AuNetSocketServer.NT.cpp +++ b/Source/IO/Net/AuNetSocketServer.NT.cpp @@ -16,7 +16,8 @@ namespace Aurora::IO::Net NetWorker *pWorker, const AuSPtr &pDriver, const AuSPtr &pSocketDriverFactory, - AuUInt32 maxConnections, + AuUInt32 uMaxConnections, + AuUInt32 uDefaultInputStreamSize, bool bMultiThreaded) : SocketServer(pInterface, pWorker, diff --git a/Source/IO/Net/AuNetStream.NT.cpp b/Source/IO/Net/AuNetStream.NT.cpp index cab9f404..39a45618 100644 --- a/Source/IO/Net/AuNetStream.NT.cpp +++ b/Source/IO/Net/AuNetStream.NT.cpp @@ -9,6 +9,7 @@ #include "AuNetStream.NT.hpp" #include "AuNetSocket.hpp" #include "AuNetWorker.hpp" +#include "AuNetEndpoint.hpp" #include namespace Aurora::IO::Net diff --git a/Source/IO/Protocol/AuProtocolStack.cpp b/Source/IO/Protocol/AuProtocolStack.cpp index 1dedebec..9ab256ce 100644 --- a/Source/IO/Protocol/AuProtocolStack.cpp +++ b/Source/IO/Protocol/AuProtocolStack.cpp @@ -9,7 +9,7 @@ #include "AuProtocolStack.hpp" #include "AuProtocolPiece.hpp" #include "IProtocolNext.hpp" -#include +#include namespace Aurora::IO::Protocol { diff --git a/Source/Logging/AuLogSinks.cpp b/Source/Logging/AuLogSinks.cpp index b5706228..b3777989 100644 --- a/Source/Logging/AuLogSinks.cpp +++ b/Source/Logging/AuLogSinks.cpp @@ -33,9 +33,9 @@ namespace Aurora::Logging return Sinks::NewStdSinkNew(); } - AUKN_SYM void NewStdSinkRelease(IFormattedSink *sink) + AUKN_SYM void NewStdSinkRelease(IFormattedSink *pSink) { - Sinks::NewStdSinkRelease(sink); + Sinks::NewStdSinkRelease(pSink); } AUKN_SYM IBasicSink *NewOSEventDirectorySinkNew() @@ -43,7 +43,7 @@ namespace Aurora::Logging return {}; } - AUKN_SYM void NewOSEventDirectorySinkRelease(IBasicSink *sink) + AUKN_SYM void NewOSEventDirectorySinkRelease(IBasicSink *pSink) {} @@ -55,10 +55,10 @@ namespace Aurora::Logging return {}; } - AUKN_SYM void NewDebugLoggerRelease(IBasicSink *sink) + AUKN_SYM void NewDebugLoggerRelease(IBasicSink *pSink) { #if defined(AURORA_IS_MODERNNT_DERIVED) - return Sinks::NewDebugLoggerRelease(sink); + return Sinks::NewDebugLoggerRelease(pSink); #endif } @@ -70,32 +70,32 @@ namespace Aurora::Logging return {}; } - AUKN_SYM void NewOSNamedEventDirectorySinkRelease(IBasicSink *sink) + AUKN_SYM void NewOSNamedEventDirectorySinkRelease(IBasicSink *pSink) { #if defined(AURORA_PLATFORM_WIN32) || defined(AURORA_IS_POSIX_DERIVED) - Sinks::NewOSNamedEventDirectorySinkRelease(sink); + Sinks::NewOSNamedEventDirectorySinkRelease(pSink); #endif } - AUKN_SYM IBasicSink *NewDirectorySinkNew(const AuString &path, DirectoryLogger dirInfo, bool binary) + AUKN_SYM IBasicSink *NewDirectorySinkNew(const AuString &path, DirectoryLogger dirInfo, bool bBinary) { - return Sinks::NewDirectoryLoggerNew(path, dirInfo, binary); + return Sinks::NewDirectoryLoggerNew(path, dirInfo, bBinary); } - AUKN_SYM void NewDirectorySinkRelease(IBasicSink *sink) + AUKN_SYM void NewDirectorySinkRelease(IBasicSink *pSink) { - Sinks::NewDirectoryLoggerRelease(sink); + Sinks::NewDirectoryLoggerRelease(pSink); } - AUKN_SYM IFormattedSink *NewFileSinkNew(const AuString &path, bool binary) + AUKN_SYM IFormattedSink *NewFileSinkNew(const AuString &path, bool bBinary) { - return Sinks::NewFileSinkNew(path, binary); + return Sinks::NewFileSinkNew(path, bBinary); } - AUKN_SYM void NewFileSinkRelease(IFormattedSink *sink) + AUKN_SYM void NewFileSinkRelease(IFormattedSink *pSink) { - Sinks::NewFileSinkRelease(sink); + Sinks::NewFileSinkRelease(pSink); } AUKN_SYM IIPCLogger *NewIPCSinkNew(const AuString &path, bool lengthPrefixed) @@ -103,9 +103,9 @@ namespace Aurora::Logging return Sinks::NewIPCSinkNew(path, lengthPrefixed); } - AUKN_SYM void NewIPCSinkRelease(IIPCLogger *sink) + AUKN_SYM void NewIPCSinkRelease(IIPCLogger *pSink) { - Sinks::NewIPCSinkRelease(sink); + Sinks::NewIPCSinkRelease(pSink); } AUKN_SYM IBasicSinkRB *NewRingLoggerNew(AuUInt32 maxLogEntries) @@ -113,8 +113,8 @@ namespace Aurora::Logging return Sinks::NewRingBufferNew(maxLogEntries); } - AUKN_SYM void NewRingLoggerRelease(IBasicSinkRB *sink) + AUKN_SYM void NewRingLoggerRelease(IBasicSinkRB *pSink) { - Sinks::NewRingBufferRelease(sink); + Sinks::NewRingBufferRelease(pSink); } } \ No newline at end of file diff --git a/Source/Logging/AuLogger.cpp b/Source/Logging/AuLogger.cpp index 3e473393..15843877 100644 --- a/Source/Logging/AuLogger.cpp +++ b/Source/Logging/AuLogger.cpp @@ -33,15 +33,15 @@ namespace Aurora::Logging Disable(); } - void Logger::WriteLines(AuUInt8 level, const ConsoleMessage &msg) + void Logger::WriteLines(AuUInt8 uLevel, const ConsoleMessage &msg) { try { if (msg.line.find('\n') == AuString::npos) [[likely]] { - if (WriteNow(level, msg)) + if (WriteNow(uLevel, msg)) { - AddToPushQueue(level, msg); + AddToPushQueue(uLevel, msg); } } @@ -53,9 +53,9 @@ namespace Aurora::Logging ConsoleMessage dup = msg; dup.line = line; - if (WriteNow(level, dup)) + if (WriteNow(uLevel, dup)) { - AddToPushQueue(level, dup); + AddToPushQueue(uLevel, dup); } }); } @@ -67,23 +67,23 @@ namespace Aurora::Logging } } - void Logger::WriteMessage(AuUInt8 level, const ConsoleMessage &msg) + void Logger::WriteMessage(AuUInt8 uLevel, const ConsoleMessage &msg) { // Accounts for atomic shutdown { AU_LOCK_GUARD(spin); - if (shouldFilter[level]) + if (shouldFilter[uLevel]) { return; } } - WriteLines(level, msg); + WriteLines(uLevel, msg); } - void Logger::AddToPushQueue(AuUInt8 level, const ConsoleMessage &msg) + void Logger::AddToPushQueue(AuUInt8 uLevel, const ConsoleMessage &msg) { { AU_LOCK_GUARD(gTaskSpin); @@ -94,7 +94,7 @@ namespace Aurora::Logging gLogTasks.reserve(nice*10); } - while (!AuTryInsert(gLogTasks, AuMakeTuple(this, level, msg))) + while (!AuTryInsert(gLogTasks, AuMakeTuple(this, uLevel, msg))) { SysPushErrorMem("Push failed - trying again"); spin.Unlock(); @@ -106,13 +106,13 @@ namespace Aurora::Logging Grug::DrachenlordScreech(); } - void Logger::PushFilter(AuUInt8 level, bool shouldFilter) + void Logger::PushFilter(AuUInt8 uLevel, bool bShouldFilter) { AU_LOCK_GUARD(spin); try { - while (!AuTryInsert(filters, AuMakeTuple(level, shouldFilter))) + while (!AuTryInsert(filters, AuMakeTuple(uLevel, shouldFilter))) { SysPushErrorMem("Push failed - trying again. wont be able to handle pop - wont syspanic yet"); AuThreading::Sleep(100); @@ -122,9 +122,9 @@ namespace Aurora::Logging for (auto &tuple : filters) { - auto level = AuGet<0>(tuple); + auto uLevel = AuGet<0>(tuple); auto shouldFilter = AuGet<1>(tuple); - this->shouldFilter[level] = shouldFilter; + this->shouldFilter[uLevel] = shouldFilter; } } catch (...) @@ -173,10 +173,10 @@ namespace Aurora::Logging for (const auto &logEntry : logTasks) { auto &logger = AuGet<0>(logEntry); - auto &level = AuGet<1>(logEntry); + auto &uLevel = AuGet<1>(logEntry); auto &message = AuGet<2>(logEntry); - logger->WriteLater(level, message); + logger->WriteLater(uLevel, message); } } catch (...) @@ -218,10 +218,10 @@ namespace Aurora::Logging for (const auto &logEntry : logTasks) { auto &logger = AuGet<0>(logEntry); - auto &level = AuGet<1>(logEntry); + auto &uLevel = AuGet<1>(logEntry); auto &message = AuGet<2>(logEntry); - logger->WriteLater(level, message); + logger->WriteLater(uLevel, message); } } catch (...) @@ -282,7 +282,7 @@ namespace Aurora::Logging } } - bool Logger::WriteNow(AuUInt8 level, const ConsoleMessage &msg) + bool Logger::WriteNow(AuUInt8 uLevel, const ConsoleMessage &msg) { bool ret {}; try @@ -296,7 +296,7 @@ namespace Aurora::Logging try { - ret |= sink->OnMessageNonblocking(level, msg); + ret |= sink->OnMessageNonblocking(uLevel, msg); } catch (...) { @@ -312,7 +312,7 @@ namespace Aurora::Logging return ret; } - void Logger::WriteLater(AuUInt8 level, const ConsoleMessage &msg) + void Logger::WriteLater(AuUInt8 uLevel, const ConsoleMessage &msg) { try { @@ -325,7 +325,7 @@ namespace Aurora::Logging try { - sink->OnMessageBlocking(level, msg); + sink->OnMessageBlocking(uLevel, msg); } catch (...) { diff --git a/Source/Logging/AuLogging.cpp b/Source/Logging/AuLogging.cpp index ee4b8563..1d2af1f9 100644 --- a/Source/Logging/AuLogging.cpp +++ b/Source/Logging/AuLogging.cpp @@ -12,29 +12,29 @@ namespace Aurora::Logging { - AUKN_SYM void WriteLine(AuUInt8 level, const Console::ConsoleMessage &msg) + AUKN_SYM void WriteLine(AuUInt8 uLevel, const Console::ConsoleMessage &msg) { Console::Hooks::WriteLine(msg); if (gUserLogger) { - gUserLogger->WriteMessage(level, msg); + gUserLogger->WriteMessage(uLevel, msg); } else if (!Console::gDefaultLogger) { auto tmp = Console::CreateDefaultLogger(); if (tmp) { - tmp->WriteMessage(level, msg); + tmp->WriteMessage(uLevel, msg); } } else { - Console::gDefaultLogger->WriteMessage(level, msg); + Console::gDefaultLogger->WriteMessage(uLevel, msg); } } - AUKN_SYM void SetGlobalLogger(const AuSPtr &defaultGlobalLogger) + AUKN_SYM void SetGlobalLogger(const AuSPtr &pDefaultGlobalLogger) { - gUserLogger = defaultGlobalLogger; + gUserLogger = pDefaultGlobalLogger; } } \ No newline at end of file diff --git a/Source/Process/Paths.cpp b/Source/Process/AuPaths.cpp similarity index 99% rename from Source/Process/Paths.cpp rename to Source/Process/AuPaths.cpp index 6f232cb5..756d126c 100644 --- a/Source/Process/Paths.cpp +++ b/Source/Process/AuPaths.cpp @@ -1,12 +1,12 @@ /*** Copyright (C) 2021 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: Paths.cpp + File: AuPaths.cpp Date: 2021-7-14 Author: Reece ***/ #include -#include "Paths.hpp" +#include "AuPaths.hpp" #if defined(AURORA_IS_POSIX_DERIVED) #include diff --git a/Source/Process/Paths.hpp b/Source/Process/AuPaths.hpp similarity index 86% rename from Source/Process/Paths.hpp rename to Source/Process/AuPaths.hpp index 17c8c20e..65afee86 100644 --- a/Source/Process/Paths.hpp +++ b/Source/Process/AuPaths.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2021 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: Paths.hpp + File: AuPaths.hpp Date: 2021-6-12 Author: Reece ***/ diff --git a/Source/Process/Process.cpp b/Source/Process/AuProcess.cpp similarity index 99% rename from Source/Process/Process.cpp rename to Source/Process/AuProcess.cpp index 445369b1..f476a8cc 100644 --- a/Source/Process/Process.cpp +++ b/Source/Process/AuProcess.cpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2021 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: Process.cpp + File: AuProcess.cpp Date: 2021-8-20 Author: Reece ***/ @@ -23,13 +23,13 @@ #endif #if defined(AURORA_IS_MODERNNT_DERIVED) - #include "ProcessSectionView.NT.hpp" + #include "AuProcessSectionView.NT.hpp" #endif #include #include -#include "ProcessMap.hpp" +#include "AuProcessMap.hpp" namespace Aurora::Process { diff --git a/Source/Process/ProcessMap.Linux.cpp b/Source/Process/AuProcessMap.Linux.cpp similarity index 99% rename from Source/Process/ProcessMap.Linux.cpp rename to Source/Process/AuProcessMap.Linux.cpp index 92a868ee..1a87f5bc 100644 --- a/Source/Process/ProcessMap.Linux.cpp +++ b/Source/Process/AuProcessMap.Linux.cpp @@ -6,8 +6,8 @@ Author: Reece ***/ #include -#include "ProcessMap.Linux.hpp" -#include "ProcessMap.hpp" +#include "AuProcessMap.Linux.hpp" +#include "AuProcessMap.hpp" #include #if defined(AURORA_IS_64BIT) diff --git a/Source/Process/ProcessMap.Linux.hpp b/Source/Process/AuProcessMap.Linux.hpp similarity index 100% rename from Source/Process/ProcessMap.Linux.hpp rename to Source/Process/AuProcessMap.Linux.hpp diff --git a/Source/Process/ProcessMap.NT.cpp b/Source/Process/AuProcessMap.NT.cpp similarity index 99% rename from Source/Process/ProcessMap.NT.cpp rename to Source/Process/AuProcessMap.NT.cpp index 310b0b26..6c832f7e 100644 --- a/Source/Process/ProcessMap.NT.cpp +++ b/Source/Process/AuProcessMap.NT.cpp @@ -6,8 +6,8 @@ Author: Reece ***/ #include -#include "ProcessMap.NT.hpp" -#include "ProcessMap.hpp" +#include "AuProcessMap.NT.hpp" +#include "AuProcessMap.hpp" namespace Aurora::Process { diff --git a/Source/Process/ProcessMap.NT.hpp b/Source/Process/AuProcessMap.NT.hpp similarity index 94% rename from Source/Process/ProcessMap.NT.hpp rename to Source/Process/AuProcessMap.NT.hpp index 10ecf997..f9cebceb 100644 --- a/Source/Process/ProcessMap.NT.hpp +++ b/Source/Process/AuProcessMap.NT.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: UtilProcessMap.NT.hpp + File: AuProcessMap.NT.hpp Date: 2022-1-24 Author: Reece ***/ diff --git a/Source/Process/ProcessMap.Win32.cpp b/Source/Process/AuProcessMap.Win32.cpp similarity index 91% rename from Source/Process/ProcessMap.Win32.cpp rename to Source/Process/AuProcessMap.Win32.cpp index 09365c70..1aa0997a 100644 --- a/Source/Process/ProcessMap.Win32.cpp +++ b/Source/Process/AuProcessMap.Win32.cpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2021 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessMap.Win32.cpp + File: AuProcessMap.Win32.cpp Date: 2021-6-12 Author: Reece ***/ #include -#include "ProcessMap.Win32.hpp" -#include "ProcessMap.NT.hpp" +#include "AuProcessMap.Win32.hpp" +#include "AuProcessMap.NT.hpp" #include namespace Aurora::Process diff --git a/Source/Process/ProcessMap.Win32.hpp b/Source/Process/AuProcessMap.Win32.hpp similarity index 89% rename from Source/Process/ProcessMap.Win32.hpp rename to Source/Process/AuProcessMap.Win32.hpp index 5a8f8ffd..49a5e40c 100644 --- a/Source/Process/ProcessMap.Win32.hpp +++ b/Source/Process/AuProcessMap.Win32.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2021 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessMap.Win32.hpp + File: AuProcessMap.Win32.hpp Date: 2021-6-12 Author: Reece ***/ diff --git a/Source/Process/ProcessMap.cpp b/Source/Process/AuProcessMap.cpp similarity index 97% rename from Source/Process/ProcessMap.cpp rename to Source/Process/AuProcessMap.cpp index 3b0ae776..06742a47 100644 --- a/Source/Process/ProcessMap.cpp +++ b/Source/Process/AuProcessMap.cpp @@ -1,23 +1,23 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessMap.cpp + File: AuProcessMap.cpp Date: 2022-1-23 Author: Reece ***/ #include -#include "ProcessMap.hpp" +#include "AuProcessMap.hpp" #if defined(AURORA_PLATFORM_WIN32) - #include "ProcessMap.Win32.hpp" + #include "AuProcessMap.Win32.hpp" #endif #if defined(AURORA_IS_MODERNNT_DERIVED) - #include "ProcessMap.NT.hpp" + #include "AuProcessMap.NT.hpp" #endif #if defined(AURORA_IS_LINUX_DERIVED) - #include "ProcessMap.Linux.hpp" + #include "AuProcessMap.Linux.hpp" #endif namespace Aurora::Process diff --git a/Source/Process/ProcessMap.hpp b/Source/Process/AuProcessMap.hpp similarity index 95% rename from Source/Process/ProcessMap.hpp rename to Source/Process/AuProcessMap.hpp index 9e11872b..9b911092 100644 --- a/Source/Process/ProcessMap.hpp +++ b/Source/Process/AuProcessMap.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessMap.hpp + File: AuProcessMap.hpp Date: 2022-1-23 Author: Reece ***/ diff --git a/Source/Process/ProcessSectionAllocations.cpp b/Source/Process/AuProcessSectionAllocations.cpp similarity index 97% rename from Source/Process/ProcessSectionAllocations.cpp rename to Source/Process/AuProcessSectionAllocations.cpp index 8f435f29..46df6e82 100644 --- a/Source/Process/ProcessSectionAllocations.cpp +++ b/Source/Process/AuProcessSectionAllocations.cpp @@ -1,12 +1,12 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionAllocations.cpp + File: AuProcessSectionAllocations.cpp Date: 2022-09-30 Author: Reece ***/ #include -#include "ProcessSectionAllocations.hpp" +#include "AuProcessSectionAllocations.hpp" namespace Aurora::Process { diff --git a/Source/Process/ProcessSectionAllocations.hpp b/Source/Process/AuProcessSectionAllocations.hpp similarity index 92% rename from Source/Process/ProcessSectionAllocations.hpp rename to Source/Process/AuProcessSectionAllocations.hpp index 50aa8447..655f993d 100644 --- a/Source/Process/ProcessSectionAllocations.hpp +++ b/Source/Process/AuProcessSectionAllocations.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionAllocations.hpp + File: AuProcessSectionAllocations.hpp Date: 2022-09-30 Author: Reece ***/ diff --git a/Source/Process/ProcessSectionFileMapView.NT.cpp b/Source/Process/AuProcessSectionFileMapView.NT.cpp similarity index 93% rename from Source/Process/ProcessSectionFileMapView.NT.cpp rename to Source/Process/AuProcessSectionFileMapView.NT.cpp index c31f8f5d..aeefa1b8 100644 --- a/Source/Process/ProcessSectionFileMapView.NT.cpp +++ b/Source/Process/AuProcessSectionFileMapView.NT.cpp @@ -6,9 +6,9 @@ Author: Reece ***/ #include -#include "ProcessSectionFileMapView.NT.hpp" -#include "ProcessSectionViewReserved.NT.hpp" -#include "ProcessSectionView.NT.hpp" +#include "AuProcessSectionFileMapView.NT.hpp" +#include "AuProcessSectionViewReserved.NT.hpp" +#include "AuProcessSectionView.NT.hpp" namespace Aurora::Process { diff --git a/Source/Process/ProcessSectionFileMapView.NT.hpp b/Source/Process/AuProcessSectionFileMapView.NT.hpp similarity index 95% rename from Source/Process/ProcessSectionFileMapView.NT.hpp rename to Source/Process/AuProcessSectionFileMapView.NT.hpp index ce89e802..97282503 100644 --- a/Source/Process/ProcessSectionFileMapView.NT.hpp +++ b/Source/Process/AuProcessSectionFileMapView.NT.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionFileMapView.NT.hpp + File: AuProcessSectionFileMapView.NT.hpp Date: 2022-08-09 Author: Reece ***/ diff --git a/Source/Process/ProcessSectionFileMapView.Unix.cpp b/Source/Process/AuProcessSectionFileMapView.Unix.cpp old mode 100755 new mode 100644 similarity index 92% rename from Source/Process/ProcessSectionFileMapView.Unix.cpp rename to Source/Process/AuProcessSectionFileMapView.Unix.cpp index 3bc9cc65..edf43160 --- a/Source/Process/ProcessSectionFileMapView.Unix.cpp +++ b/Source/Process/AuProcessSectionFileMapView.Unix.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionFileMapView.Unix.cpp + File: AuProcessSectionFileMapView.Unix.cpp Date: 2022-08-09 Author: Reece ***/ #include -#include "ProcessSectionFileMapView.Unix.hpp" -#include "ProcessSectionViewReserved.Unix.hpp" -#include "ProcessSectionView.Unix.hpp" +#include "AuProcessSectionFileMapView.Unix.hpp" +#include "AuProcessSectionViewReserved.Unix.hpp" +#include "AuProcessSectionView.Unix.hpp" #include namespace Aurora::Process diff --git a/Source/Process/ProcessSectionFileMapView.Unix.hpp b/Source/Process/AuProcessSectionFileMapView.Unix.hpp old mode 100755 new mode 100644 similarity index 95% rename from Source/Process/ProcessSectionFileMapView.Unix.hpp rename to Source/Process/AuProcessSectionFileMapView.Unix.hpp index b2325a66..759a6abc --- a/Source/Process/ProcessSectionFileMapView.Unix.hpp +++ b/Source/Process/AuProcessSectionFileMapView.Unix.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionFileMapView.Unix.hpp + File: AuProcessSectionFileMapView.Unix.hpp Date: 2022-08-09 Author: Reece ***/ diff --git a/Source/Process/ProcessSectionView.NT.cpp b/Source/Process/AuProcessSectionView.NT.cpp similarity index 97% rename from Source/Process/ProcessSectionView.NT.cpp rename to Source/Process/AuProcessSectionView.NT.cpp index 96fd10c4..91de7f34 100644 --- a/Source/Process/ProcessSectionView.NT.cpp +++ b/Source/Process/AuProcessSectionView.NT.cpp @@ -1,20 +1,30 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionView.NT.cpp + File: AuProcessSectionView.NT.cpp Date: 2022-08-09 Author: Reece ***/ #include -#include "ProcessSectionView.NT.hpp" +#include "AuProcessSectionView.NT.hpp" #include "Process.hpp" #include -#include "ProcessSectionFileMapView.NT.hpp" +#include "AuProcessSectionFileMapView.NT.hpp" #include #include namespace Aurora::Process { + AuUInt ProcessSectionView::GetStart() + { + return AuNumericLimits::min(); + } + + AuUInt ProcessSectionView::GetEnd() + { + return AuNumericLimits::max(); + } + AuSPtr ProcessSectionView::Allocate(AuUInt uLength) { PageTable table {}; diff --git a/Source/Process/ProcessSectionView.NT.hpp b/Source/Process/AuProcessSectionView.NT.hpp similarity index 96% rename from Source/Process/ProcessSectionView.NT.hpp rename to Source/Process/AuProcessSectionView.NT.hpp index abd6b9c4..8bd16d12 100644 --- a/Source/Process/ProcessSectionView.NT.hpp +++ b/Source/Process/AuProcessSectionView.NT.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionView.NT.hpp + File: AuProcessSectionView.NT.hpp Date: 2022-08-09 Author: Reece ***/ @@ -15,6 +15,10 @@ namespace Aurora::Process AuThreadPrimitives::SpinLock spinlock; AuList> allocations; + AuUInt GetStart() override; + + AuUInt GetEnd() override; + AuSPtr Allocate(AuUInt uLength) override; AuSPtr MapFileByPath(const AuString &str, diff --git a/Source/Process/ProcessSectionView.Unix.cpp b/Source/Process/AuProcessSectionView.Unix.cpp old mode 100755 new mode 100644 similarity index 96% rename from Source/Process/ProcessSectionView.Unix.cpp rename to Source/Process/AuProcessSectionView.Unix.cpp index fe21244d..b704c0a0 --- a/Source/Process/ProcessSectionView.Unix.cpp +++ b/Source/Process/AuProcessSectionView.Unix.cpp @@ -1,15 +1,15 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionView.Unix.hpp + File: AuProcessSectionView.Unix.hpp Date: 2022-08-10 Author: Reece ***/ #include -#include "ProcessSectionView.Unix.hpp" +#include "AuProcessSectionView.Unix.hpp" #include "Process.hpp" #include -#include "ProcessSectionFileMapView.Unix.hpp" +#include "AuProcessSectionFileMapView.Unix.hpp" #include #include #include @@ -18,6 +18,16 @@ namespace Aurora::Process { + AuUInt ProcessSectionView::GetStart() + { + return AuNumericLimits::min(); + } + + AuUInt ProcessSectionView::GetEnd() + { + return AuNumericLimits::max(); + } + AuSPtr ProcessSectionView::Allocate(AuUInt uLength) { if (!uLength) diff --git a/Source/Process/ProcessSectionView.Unix.hpp b/Source/Process/AuProcessSectionView.Unix.hpp old mode 100755 new mode 100644 similarity index 97% rename from Source/Process/ProcessSectionView.Unix.hpp rename to Source/Process/AuProcessSectionView.Unix.hpp index 6f6cef74..25d1edc0 --- a/Source/Process/ProcessSectionView.Unix.hpp +++ b/Source/Process/AuProcessSectionView.Unix.hpp @@ -11,6 +11,10 @@ namespace Aurora::Process { struct ProcessSectionView : IProcessSectionView, AuEnableSharedFromThis { + AuUInt GetStart() override; + + AuUInt GetEnd() override; + AuSPtr Allocate(AuUInt length) override; AuSPtr MapFileByPath(const AuString &str, diff --git a/Source/Process/ProcessSectionViewReserved.NT.cpp b/Source/Process/AuProcessSectionViewReserved.NT.cpp similarity index 98% rename from Source/Process/ProcessSectionViewReserved.NT.cpp rename to Source/Process/AuProcessSectionViewReserved.NT.cpp index 0d52346c..86049c28 100644 --- a/Source/Process/ProcessSectionViewReserved.NT.cpp +++ b/Source/Process/AuProcessSectionViewReserved.NT.cpp @@ -1,16 +1,16 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionViewReserved.NT.cpp + File: AuProcessSectionViewReserved.NT.cpp Date: 2022-9-30 Author: Reece ***/ #include -#include "ProcessSectionViewReserved.NT.hpp" +#include "AuProcessSectionViewReserved.NT.hpp" #include "Process.hpp" #include -#include "ProcessSectionFileMapView.NT.hpp" -#include "ProcessSectionView.NT.hpp" +#include "AuProcessSectionFileMapView.NT.hpp" +#include "AuProcessSectionView.NT.hpp" #include #include @@ -44,6 +44,16 @@ namespace Aurora::Process ULONG UnmapFlags ); + AuUInt ProcessSectionViewReserved::GetStart() + { + return (AuUInt)this->pBaseAddress; + } + + AuUInt ProcessSectionViewReserved::GetEnd() + { + return this->GetStart() + this->uMaxLength; + } + bool ProcessSectionViewReserved::Init(AuUInt uLength) { this->uMaxLength = uLength; diff --git a/Source/Process/ProcessSectionViewReserved.NT.hpp b/Source/Process/AuProcessSectionViewReserved.NT.hpp similarity index 95% rename from Source/Process/ProcessSectionViewReserved.NT.hpp rename to Source/Process/AuProcessSectionViewReserved.NT.hpp index bce8ff0b..fd60b330 100644 --- a/Source/Process/ProcessSectionViewReserved.NT.hpp +++ b/Source/Process/AuProcessSectionViewReserved.NT.hpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionViewReserved.NT.hpp + File: AuProcessSectionViewReserved.NT.hpp Date: 2022-09-30 Author: Reece ***/ #pragma once -#include "ProcessSectionAllocations.hpp" +#include "AuProcessSectionAllocations.hpp" namespace Aurora::Process { @@ -20,6 +20,10 @@ namespace Aurora::Process bool AllocateAddress(AuUInt uOffset, AuUInt uLength, AuUInt &uAddressOut); bool ReleaseAndCoaleceAddress(AuUInt uOffset, AuUInt uLength); + AuUInt GetStart() override; + + AuUInt GetEnd() override; + AuSPtr Allocate(AuUInt uLength) override; AuSPtr MapFileByPath(const AuString &str, diff --git a/Source/Process/ProcessSectionViewReserved.Unix.cpp b/Source/Process/AuProcessSectionViewReserved.Unix.cpp old mode 100755 new mode 100644 similarity index 97% rename from Source/Process/ProcessSectionViewReserved.Unix.cpp rename to Source/Process/AuProcessSectionViewReserved.Unix.cpp index 6dbf41e8..06cca7c9 --- a/Source/Process/ProcessSectionViewReserved.Unix.cpp +++ b/Source/Process/AuProcessSectionViewReserved.Unix.cpp @@ -1,15 +1,15 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionViewReserved.Unix.cpp + File: AuProcessSectionViewReserved.Unix.cpp Date: 2022-11-15 Author: Reece ***/ #include -#include "ProcessSectionViewReserved.Unix.hpp" +#include "AuProcessSectionViewReserved.Unix.hpp" #include "Process.hpp" #include -#include "ProcessSectionFileMapView.Unix.hpp" +#include "AuProcessSectionFileMapView.Unix.hpp" #include #include #include @@ -26,6 +26,16 @@ namespace Aurora::Process } } + AuUInt ProcessSectionViewReserved::GetStart() + { + return (AuUInt)this->pBaseAddress; + } + + AuUInt ProcessSectionViewReserved::GetEnd() + { + return this->GetStart() + this->uMaxLength; + } + bool ProcessSectionViewReserved::Init(AuUInt uLength) { this->uMaxLength = uLength; diff --git a/Source/Process/ProcessSectionViewReserved.Unix.hpp b/Source/Process/AuProcessSectionViewReserved.Unix.hpp old mode 100755 new mode 100644 similarity index 95% rename from Source/Process/ProcessSectionViewReserved.Unix.hpp rename to Source/Process/AuProcessSectionViewReserved.Unix.hpp index 3a51dcf6..56b7c6af --- a/Source/Process/ProcessSectionViewReserved.Unix.hpp +++ b/Source/Process/AuProcessSectionViewReserved.Unix.hpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: ProcessSectionViewReserved.Unix.hpp + File: AuProcessSectionViewReserved.Unix.hpp Date: 2022-11-15 Author: Reece ***/ #pragma once -#include "ProcessSectionAllocations.hpp" +#include "AuProcessSectionAllocations.hpp" namespace Aurora::Process { @@ -18,6 +18,10 @@ namespace Aurora::Process char *pBaseAddress {}; + AuUInt GetStart() override; + + AuUInt GetEnd() override; + AuSPtr Allocate(AuUInt length) override; AuSPtr MapFileByPath(const AuString &str, diff --git a/Source/Time/Clock.cpp b/Source/Time/AuClock.cpp similarity index 99% rename from Source/Time/Clock.cpp rename to Source/Time/AuClock.cpp index 1692bc3c..46ef5d14 100644 --- a/Source/Time/Clock.cpp +++ b/Source/Time/AuClock.cpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2021 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: Clock.cpp + File: AuClock.cpp Date: 2021-6-13 Author: Reece Note: Screw it, std::chrono has been widly shilled at C++11s answer to all these painful macros, asm linkage, and all the other bullshit that pulling clock counters entails. @@ -16,7 +16,7 @@ I'll wave the white flag and use the STL in here for.now ***/ #include -#include "Clock.hpp" +#include "AuClock.hpp" #if defined(AURORA_IS_MODERNNT_DERIVED) diff --git a/Source/Time/Clock.hpp b/Source/Time/AuClock.hpp similarity index 86% rename from Source/Time/Clock.hpp rename to Source/Time/AuClock.hpp index 693af3c1..26ed8796 100644 --- a/Source/Time/Clock.hpp +++ b/Source/Time/AuClock.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2021 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: Clock.hpp + File: AuClock.hpp Date: 2021-6-13 Author: Reece ***/