From 49287f2a730545af73776135b7563c3d6dcf1e4c Mon Sep 17 00:00:00 2001 From: Reece Date: Wed, 14 Dec 2022 05:03:37 +0000 Subject: [PATCH] [*] Minor cleanup/refactor --- .../Aurora/Compression/ICompressionStream.hpp | 26 +++++----- Source/Console/ConsoleTTY/ConsoleTTY.cpp | 9 ++-- Source/Grug/{AuREADME.md => README.md} | 0 Source/IO/IPC/{IPC.cpp => AuIPC.cpp} | 0 .../IO/IPC/{IPCHandle.cpp => AuIPCHandle.cpp} | 4 +- .../IO/IPC/{IPCHandle.hpp => AuIPCHandle.hpp} | 2 +- .../{IPCMemory.NT.cpp => AuIPCMemory.NT.cpp} | 52 +++++++++++-------- .../{IPCMemory.NT.hpp => AuIPCMemory.NT.hpp} | 16 +++--- ...PCMemory.Unix.cpp => AuIPCMemory.Unix.cpp} | 47 ++++++++++------- ...PCMemory.Unix.hpp => AuIPCMemory.Unix.hpp} | 15 +++--- ...ex.Linux.cpp => AuIPCMutexFutex.Linux.cpp} | 10 ++-- ...ex.Linux.hpp => AuIPCMutexFutex.Linux.hpp} | 4 +- .../IPC/{IPCPipe.NT.cpp => AuIPCPipe.NT.cpp} | 6 +-- .../IPC/{IPCPipe.NT.hpp => AuIPCPipe.NT.hpp} | 4 +- .../{IPCPipe.Unix.cpp => AuIPCPipe.Unix.cpp} | 6 +-- .../{IPCPipe.Unix.hpp => AuIPCPipe.Unix.hpp} | 2 +- ...es.Linux.cpp => AuIPCPrimitives.Linux.cpp} | 2 +- ...es.Linux.hpp => AuIPCPrimitives.Linux.hpp} | 2 +- ...imitives.NT.cpp => AuIPCPrimitives.NT.cpp} | 6 +-- ...imitives.NT.hpp => AuIPCPrimitives.NT.hpp} | 2 +- 20 files changed, 118 insertions(+), 97 deletions(-) rename Source/Grug/{AuREADME.md => README.md} (100%) rename Source/IO/IPC/{IPC.cpp => AuIPC.cpp} (100%) rename Source/IO/IPC/{IPCHandle.cpp => AuIPCHandle.cpp} (99%) rename Source/IO/IPC/{IPCHandle.hpp => AuIPCHandle.hpp} (98%) rename Source/IO/IPC/{IPCMemory.NT.cpp => AuIPCMemory.NT.cpp} (73%) rename Source/IO/IPC/{IPCMemory.NT.hpp => AuIPCMemory.NT.hpp} (61%) rename Source/IO/IPC/{IPCMemory.Unix.cpp => AuIPCMemory.Unix.cpp} (76%) rename Source/IO/IPC/{IPCMemory.Unix.hpp => AuIPCMemory.Unix.hpp} (69%) rename Source/IO/IPC/{IPCMutexFutex.Linux.cpp => AuIPCMutexFutex.Linux.cpp} (99%) mode change 100755 => 100644 rename Source/IO/IPC/{IPCMutexFutex.Linux.hpp => AuIPCMutexFutex.Linux.hpp} (94%) mode change 100755 => 100644 rename Source/IO/IPC/{IPCPipe.NT.cpp => AuIPCPipe.NT.cpp} (99%) rename Source/IO/IPC/{IPCPipe.NT.hpp => AuIPCPipe.NT.hpp} (95%) rename Source/IO/IPC/{IPCPipe.Unix.cpp => AuIPCPipe.Unix.cpp} (99%) rename Source/IO/IPC/{IPCPipe.Unix.hpp => AuIPCPipe.Unix.hpp} (98%) rename Source/IO/IPC/{IPCPrimitives.Linux.cpp => AuIPCPrimitives.Linux.cpp} (99%) rename Source/IO/IPC/{IPCPrimitives.Linux.hpp => AuIPCPrimitives.Linux.hpp} (97%) rename Source/IO/IPC/{IPCPrimitives.NT.cpp => AuIPCPrimitives.NT.cpp} (98%) rename Source/IO/IPC/{IPCPrimitives.NT.hpp => AuIPCPrimitives.NT.hpp} (83%) diff --git a/Include/Aurora/Compression/ICompressionStream.hpp b/Include/Aurora/Compression/ICompressionStream.hpp index 87673253..0504a1a8 100644 --- a/Include/Aurora/Compression/ICompressionStream.hpp +++ b/Include/Aurora/Compression/ICompressionStream.hpp @@ -17,19 +17,19 @@ namespace Aurora::Compression * If the stream buffer runs out of memory, {bytesRead, 0} is expected, and although * `GetAvailableProcessedBytes()` will still return some data, the decompressed data * or uncompressed stream will be dropped in part, and you should destroy from the stream object - * @param bytesFromUnprocessedInputSource + * @param dwBytesFromUnprocessedInputSource * @return */ - virtual AuStreamReadWrittenPair_t Ingest(AuUInt32 bytesFromUnprocessedInputSource) = 0; + virtual AuStreamReadWrittenPair_t Ingest(AuUInt32 dwBytesFromUnprocessedInputSource) = 0; /** - * @brief Returns the available bytes for immediate release + * @brief Returns the available bytes for immediate release by ::Read (or ::ReadEx(..., false)) * @return */ virtual AuUInt32 GetAvailableProcessedBytes() = 0; /** - * @brief Returns the internal overhead to store the seekable stream buffer + * @brief Returns the allocation overhead of the seekable stream buffer * @return */ virtual AuUInt32 GetInternalBufferSize() = 0; @@ -39,31 +39,31 @@ namespace Aurora::Compression * If the destination is null and the length is a nonzero value, the stream seeks ahead * If the destination is null and the length is a zero, {0, GetAvailableProcessedBytes} is returned * @param destination - * @param ingestUntilEOS should continue to poll Ingest with an arbitrary page size to fulfill destination.length + * @param bIngestUntilEOS should continue to poll Ingest with an arbitrary page size to fulfill destination.length * @return Bytes read / written */ - virtual AuStreamReadWrittenPair_t ReadEx(const Memory::MemoryViewWrite & /*opt*/ destination, bool ingestUntilEOS = true) = 0; + virtual AuStreamReadWrittenPair_t ReadEx(const Memory::MemoryViewWrite & /*opt*/ destination, bool bIngestUntilEOS = true) = 0; /** * @brief Reads 'minimumProcessed', optionally into the first buffer, from the internal stream buffer - * @param destination + * @param dwOffset * @return Bytes written */ virtual AuUInt32 Read(const Memory::MemoryViewWrite & /*opt*/ destination) = 0; /** - * @brief Seek processed read functions backwards - * @param offset + * @brief Seek processed ::Read/::ReadEx backwards + * @param dwOffset * @return */ - virtual bool GoBackByProcessedN (AuUInt32 offset) = 0; + virtual bool GoBackByProcessedN (AuUInt32 dwOffset) = 0; /** - * @brief Seek read processed forward - * @param offset + * @brief Seek processed ::Read/::ReadEx forwards + * @param dwOffset * @return */ - virtual bool GoForwardByProcessedN(AuUInt32 offset) = 0; + virtual bool GoForwardByProcessedN(AuUInt32 dwOffset) = 0; /// Compression only virtual bool Flush() = 0; diff --git a/Source/Console/ConsoleTTY/ConsoleTTY.cpp b/Source/Console/ConsoleTTY/ConsoleTTY.cpp index 8c52e35f..403d625b 100644 --- a/Source/Console/ConsoleTTY/ConsoleTTY.cpp +++ b/Source/Console/ConsoleTTY/ConsoleTTY.cpp @@ -1175,13 +1175,14 @@ namespace Aurora::Console::ConsoleTTY return; } - TTYSetPos(pos); - #if defined(AURORA_IS_MODERNNT_DERIVED) DWORD idc; auto line2 = AuLocale::ConvertFromUTF8(in); + SetConsoleCursorPosition(GetTTYHandle(), COORD { AuStaticCast(pos.first), AuStaticCast(pos.second) }); WriteConsoleW(GetTTYHandle(), line2.data(), AuUInt32(line2.size()), &idc, NULL); #else + TTYSetPos(pos); + ConsoleStd::WriteStdOutBlocking2(in.data(), in.size()); #endif @@ -1198,7 +1199,6 @@ namespace Aurora::Console::ConsoleTTY return; } - TTYSetPos(pos); #if defined(AURORA_IS_MODERNNT_DERIVED) DWORD idc; @@ -1218,12 +1218,15 @@ namespace Aurora::Console::ConsoleTTY auto line2 = AuLocale::ConvertFromUTF8(in); SetConsoleTextAttribute(hConsole, attrib); + SetConsoleCursorPosition(GetTTYHandle(), COORD { AuStaticCast(pos.first), AuStaticCast(pos.second) }); WriteConsoleW(hConsole, line2.data(), AuUInt32(line2.size()), &idc, NULL); SetConsoleTextAttribute(hConsole, FOREGROUND_WHITE); } //WriteConsoleA(GetTTYHandle(), in.data(), AuUInt32(in.size()), &idc, NULL); #else + TTYSetPos(pos); + AuString writeLine; const char *pAnsiCode = diff --git a/Source/Grug/AuREADME.md b/Source/Grug/README.md similarity index 100% rename from Source/Grug/AuREADME.md rename to Source/Grug/README.md diff --git a/Source/IO/IPC/IPC.cpp b/Source/IO/IPC/AuIPC.cpp similarity index 100% rename from Source/IO/IPC/IPC.cpp rename to Source/IO/IPC/AuIPC.cpp diff --git a/Source/IO/IPC/IPCHandle.cpp b/Source/IO/IPC/AuIPCHandle.cpp similarity index 99% rename from Source/IO/IPC/IPCHandle.cpp rename to Source/IO/IPC/AuIPCHandle.cpp index c369ac01..e0b20799 100644 --- a/Source/IO/IPC/IPCHandle.cpp +++ b/Source/IO/IPC/AuIPCHandle.cpp @@ -1,13 +1,13 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCHandle.cpp + File: AuIPCHandle.cpp Date: 2022-4-13 Author: Reece ***/ #include #include "IPC.hpp" -#include "IPCHandle.hpp" +#include "AuIPCHandle.hpp" namespace Aurora::IO::IPC { diff --git a/Source/IO/IPC/IPCHandle.hpp b/Source/IO/IPC/AuIPCHandle.hpp similarity index 98% rename from Source/IO/IPC/IPCHandle.hpp rename to Source/IO/IPC/AuIPCHandle.hpp index 7c745f6f..40eb5b83 100644 --- a/Source/IO/IPC/IPCHandle.hpp +++ b/Source/IO/IPC/AuIPCHandle.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCHandle.hpp + File: AuIPCHandle.hpp Date: 2022-4-13 Author: Reece ***/ diff --git a/Source/IO/IPC/IPCMemory.NT.cpp b/Source/IO/IPC/AuIPCMemory.NT.cpp similarity index 73% rename from Source/IO/IPC/IPCMemory.NT.cpp rename to Source/IO/IPC/AuIPCMemory.NT.cpp index 9159e281..0a7500b6 100644 --- a/Source/IO/IPC/IPCMemory.NT.cpp +++ b/Source/IO/IPC/AuIPCMemory.NT.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCMemory.NT.cpp + File: AuIPCMemory.NT.cpp Date: 2022-4-15 Author: Reece ***/ #include #include "IPC.hpp" -#include "IPCHandle.hpp" -#include "IPCMemory.NT.hpp" +#include "AuIPCHandle.hpp" +#include "AuIPCMemory.NT.hpp" namespace Aurora::IO::IPC { @@ -16,17 +16,23 @@ namespace Aurora::IO::IPC // Shared memory ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - IPCSharedMemoryImpl::IPCSharedMemoryImpl(HANDLE handle, void *ptr, const IPC::IPCHandle &ipcHandle) : - base_(ptr), len_(ipcHandle.values[0].token.word), handle_(handle), ipcHandle_(ipcHandle) + IPCSharedMemoryImpl::IPCSharedMemoryImpl(HANDLE handle, + void *pBase, + const IPC::IPCHandle &ipcHandle) : + pBase_(pBase), + uLen_(ipcHandle.values[0].token.word), + handle_(handle), + ipcHandle_(ipcHandle) { } IPCSharedMemoryImpl::~IPCSharedMemoryImpl() { - if (this->base_) + if (this->pBase_) { - ::UnmapViewOfFile(this->base_); + ::UnmapViewOfFile(this->pBase_); + this->pBase_ = nullptr; } AuWin32CloseHandle(this->handle_); @@ -34,12 +40,12 @@ namespace Aurora::IO::IPC Memory::MemoryViewWrite IPCSharedMemoryImpl::GetMemory() { - return AuMemoryViewWrite(this->base_, this->len_); + return AuMemoryViewWrite(this->pBase_, this->uLen_); } AuUInt IPCSharedMemoryImpl::GetLength() { - return this->len_; + return this->uLen_; } AuString IPCSharedMemoryImpl::ExportToString() @@ -47,12 +53,12 @@ namespace Aurora::IO::IPC return this->ipcHandle_.ToString(); } - AUKN_SYM AuSPtr NewSharedMemory(AuUInt length) + AUKN_SYM AuSPtr NewSharedMemory(AuUInt uLength) { IPC::IPCHandle handle; IPC::IPCToken token; token.NewId(); - token.word = length; + token.word = uLength; handle.PushId(EIPCHandleType::eIPCMemory, token); @@ -61,11 +67,11 @@ namespace Aurora::IO::IPC nullptr, PAGE_READWRITE, #if defined(AURORA_IS_64BIT) - AuBitsToHigher(length), - AuBitsToLower(length), + AuBitsToHigher(uLength), + AuBitsToLower(uLength), #else 0, - length, + uLength, #endif path.c_str()); @@ -79,7 +85,7 @@ namespace Aurora::IO::IPC FILE_MAP_ALL_ACCESS, 0, 0, - length); + uLength); if (!map) { SysPushErrorIO(); @@ -87,8 +93,8 @@ namespace Aurora::IO::IPC return {}; } - auto object = AuMakeShared(file, map, handle); - if (!object) + auto pObject = AuMakeShared(file, map, handle); + if (!pObject) { SysPushErrorMem(); ::UnmapViewOfFile(map); @@ -96,7 +102,7 @@ namespace Aurora::IO::IPC return {}; } - return object; + return pObject; } AUKN_SYM AuSPtr ImportSharedMemory(const AuString &handleString) @@ -116,7 +122,7 @@ namespace Aurora::IO::IPC return {}; } - auto length = token->token.word; + auto uLength = token->token.word; auto path = token->token.ToNTPath(); auto file = ::OpenFileMappingA(FILE_MAP_ALL_ACCESS, FALSE, @@ -132,7 +138,7 @@ namespace Aurora::IO::IPC FILE_MAP_ALL_ACCESS, 0, 0, - length); + uLength); if (!map) { SysPushErrorIO(); @@ -140,8 +146,8 @@ namespace Aurora::IO::IPC return {}; } - auto object = AuMakeShared(file, map, handle); - if (!object) + auto pObject = AuMakeShared(file, map, handle); + if (!pObject) { SysPushErrorMem(); ::UnmapViewOfFile(map); @@ -149,6 +155,6 @@ namespace Aurora::IO::IPC return {}; } - return object; + return pObject; } } \ No newline at end of file diff --git a/Source/IO/IPC/IPCMemory.NT.hpp b/Source/IO/IPC/AuIPCMemory.NT.hpp similarity index 61% rename from Source/IO/IPC/IPCMemory.NT.hpp rename to Source/IO/IPC/AuIPCMemory.NT.hpp index 9bb66a5d..9a7c52df 100644 --- a/Source/IO/IPC/IPCMemory.NT.hpp +++ b/Source/IO/IPC/AuIPCMemory.NT.hpp @@ -1,20 +1,22 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCMemory.NT.hpp + File: AuIPCMemory.NT.hpp Date: 2022-4-15 Author: Reece ***/ #pragma once #include -#include +#include namespace Aurora::IO::IPC { struct IPCSharedMemoryImpl : IPCSharedMemory { - IPCSharedMemoryImpl(HANDLE handle, void *ptr, const IPC::IPCHandle &ipcHandle); + IPCSharedMemoryImpl(HANDLE handle, + void *pBase, + const IPC::IPCHandle &ipcHandle); ~IPCSharedMemoryImpl(); virtual Memory::MemoryViewWrite GetMemory() override; @@ -24,9 +26,9 @@ namespace Aurora::IO::IPC private: IPC::IPCHandle ipcHandle_; - bool owns_; - HANDLE handle_{}; - void *base_{}; - AuUInt len_ {}; + HANDLE handle_ {}; + void *pBase_ {}; + AuUInt uLen_ {}; + bool bOwns_; }; } \ No newline at end of file diff --git a/Source/IO/IPC/IPCMemory.Unix.cpp b/Source/IO/IPC/AuIPCMemory.Unix.cpp similarity index 76% rename from Source/IO/IPC/IPCMemory.Unix.cpp rename to Source/IO/IPC/AuIPCMemory.Unix.cpp index 47b9fff4..b7959291 100644 --- a/Source/IO/IPC/IPCMemory.Unix.cpp +++ b/Source/IO/IPC/AuIPCMemory.Unix.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCMemory.Unix.cpp + File: AuIPCMemory.Unix.cpp Date: 2022-4-14 Author: Reece ***/ #include #include "IPC.hpp" -#include "IPCHandle.hpp" -#include "IPCMemory.Unix.hpp" +#include "AuIPCHandle.hpp" +#include "AuIPCMemory.Unix.hpp" #include #include /* For mode constants */ @@ -34,17 +34,24 @@ namespace Aurora::IO::IPC return path; } - IPCSharedMemoryImpl::IPCSharedMemoryImpl(int fd, void *ptr, const IPC::IPCHandle &handle, bool owns) : - fd_(fd), base_(ptr), len_(handle.values[0].token.word), owns_(owns), handle_(handle) + IPCSharedMemoryImpl::IPCSharedMemoryImpl(int fd, + void *pBase, + const IPC::IPCHandle &handle, + bool bOwns) : + fd_(fd), + pBase_(ptr), + uLen_(handle.values[0].token.word), + bOwns_(bOwns), + handle_(handle) { } IPCSharedMemoryImpl::~IPCSharedMemoryImpl() { - if (this->base_) + if (this->pBase_) { - ::munmap(this->base_, this->len_); + ::munmap(this->pBase_, this->uLen_); } int fd {-1}; @@ -56,12 +63,12 @@ namespace Aurora::IO::IPC Memory::MemoryViewWrite IPCSharedMemoryImpl::GetMemory() { - return AuMemoryViewWrite(this->base_, this->len_); + return AuMemoryViewWrite(this->pBase_, this->uLen_); } AuUInt IPCSharedMemoryImpl::GetLength() { - return this->len_; + return this->uLen_; } AuString IPCSharedMemoryImpl::ExportToString() @@ -69,12 +76,12 @@ namespace Aurora::IO::IPC return this->handle_.ToString(); } - AUKN_SYM AuSPtr NewSharedMemory(AuUInt length) + AUKN_SYM AuSPtr NewSharedMemory(AuUInt uLength) { IPC::IPCHandle handle; IPC::IPCToken token; token.pid = handle.pid; - token.word = length; + token.word = uLength; token.NewId(); handle.PushId(EIPCHandleType::eIPCMemory, token); @@ -87,14 +94,14 @@ namespace Aurora::IO::IPC return {}; } - if (::ftruncate(fd, length) == -1) + if (::ftruncate(fd, uLength) == -1) { SysPushErrorMem(); ::close(fd); return {}; } - auto map = ::mmap(nullptr, length, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + auto map = ::mmap(nullptr, uLength, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); if (map == MAP_FAILED) { SysPushErrorIO(); @@ -102,16 +109,16 @@ namespace Aurora::IO::IPC return {}; } - auto object = AuMakeShared(fd, map, handle, true); - if (!object) + auto pObject = AuMakeShared(fd, map, handle, true); + if (!pObject) { SysPushErrorMem(); - ::munmap(map, length); + ::munmap(map, uLength); ::close(fd); return {}; } - return object; + return pObject; } AuSPtr ImportSharedMemoryEx(const IPCToken &token) @@ -135,8 +142,8 @@ namespace Aurora::IO::IPC IPC::IPCHandle handle; handle.PushId(EIPCHandleType::eIPCMemory, token); - auto object = AuMakeShared(fd, map, handle, false); - if (!object) + auto pObject = AuMakeShared(fd, map, handle, false); + if (!pObject) { SysPushErrorMem(); ::munmap(map, token.word); @@ -144,7 +151,7 @@ namespace Aurora::IO::IPC return {}; } - return object; + return pObject; } AUKN_SYM AuSPtr ImportSharedMemory(const AuString &handleString) diff --git a/Source/IO/IPC/IPCMemory.Unix.hpp b/Source/IO/IPC/AuIPCMemory.Unix.hpp similarity index 69% rename from Source/IO/IPC/IPCMemory.Unix.hpp rename to Source/IO/IPC/AuIPCMemory.Unix.hpp index a3000791..db564b48 100644 --- a/Source/IO/IPC/IPCMemory.Unix.hpp +++ b/Source/IO/IPC/AuIPCMemory.Unix.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCMemory.Unix.hpp + File: AuIPCMemory.Unix.hpp Date: 2022-4-14 Author: Reece ***/ @@ -14,7 +14,10 @@ namespace Aurora::IO::IPC { struct IPCSharedMemoryImpl : IPCSharedMemory { - IPCSharedMemoryImpl(int fd, void *ptr, const IPC::IPCHandle &handle, bool owns); + IPCSharedMemoryImpl(int fd, + void *pBase, + const IPC::IPCHandle &handle, + bool bOwns); ~IPCSharedMemoryImpl(); virtual Memory::MemoryViewWrite GetMemory() override; @@ -24,10 +27,10 @@ namespace Aurora::IO::IPC IPC::IPCHandle handle_; private: - bool owns_; - int fd_{}; - void *base_{}; - AuUInt len_ {}; + void *pBase_ {}; + AuUInt uLen_ {}; + int fd_ {}; + bool bOwns_; }; AuString GetServerPath(const IPC::IPCToken &handle); diff --git a/Source/IO/IPC/IPCMutexFutex.Linux.cpp b/Source/IO/IPC/AuIPCMutexFutex.Linux.cpp old mode 100755 new mode 100644 similarity index 99% rename from Source/IO/IPC/IPCMutexFutex.Linux.cpp rename to Source/IO/IPC/AuIPCMutexFutex.Linux.cpp index e9697041..cabce55b --- a/Source/IO/IPC/IPCMutexFutex.Linux.cpp +++ b/Source/IO/IPC/AuIPCMutexFutex.Linux.cpp @@ -1,17 +1,17 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCMutexFutex.Linux.cpp + File: AuIPCMutexFutex.Linux.cpp Date: 2022- Author: Reece Note: ***/ #include #include "IPC.hpp" -#include "IPCHandle.hpp" -#include "IPCMutexFutex.Linux.hpp" -#include "IPCPrimitives.Linux.hpp" -#include "IPCMemory.Unix.hpp" +#include "AuIPCHandle.hpp" +#include "AuIPCMutexFutex.Linux.hpp" +#include "AuIPCPrimitives.Linux.hpp" +#include "AuIPCMemory.Unix.hpp" // LINUX SYSCALL APIS #include diff --git a/Source/IO/IPC/IPCMutexFutex.Linux.hpp b/Source/IO/IPC/AuIPCMutexFutex.Linux.hpp old mode 100755 new mode 100644 similarity index 94% rename from Source/IO/IPC/IPCMutexFutex.Linux.hpp rename to Source/IO/IPC/AuIPCMutexFutex.Linux.hpp index c3f4b996..d335b528 --- a/Source/IO/IPC/IPCMutexFutex.Linux.hpp +++ b/Source/IO/IPC/AuIPCMutexFutex.Linux.hpp @@ -1,7 +1,7 @@ #pragma once -#include "IPCHandle.hpp" -#include "IPCPrimitives.Linux.hpp" +#include "AuIPCHandle.hpp" +#include "AuIPCPrimitives.Linux.hpp" namespace Aurora::IO::IPC { diff --git a/Source/IO/IPC/IPCPipe.NT.cpp b/Source/IO/IPC/AuIPCPipe.NT.cpp similarity index 99% rename from Source/IO/IPC/IPCPipe.NT.cpp rename to Source/IO/IPC/AuIPCPipe.NT.cpp index a79361ff..e625d8df 100644 --- a/Source/IO/IPC/IPCPipe.NT.cpp +++ b/Source/IO/IPC/AuIPCPipe.NT.cpp @@ -1,20 +1,20 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPipe.NT.cpp + File: AuIPCPipe.NT.cpp Date: 2022-4-15 Author: Reece ***/ #include #include "IPC.hpp" -#include "IPCHandle.hpp" +#include "AuIPCHandle.hpp" #include #include #include #include -#include "IPCPipe.NT.hpp" +#include "AuIPCPipe.NT.hpp" namespace Aurora::IO::IPC { diff --git a/Source/IO/IPC/IPCPipe.NT.hpp b/Source/IO/IPC/AuIPCPipe.NT.hpp similarity index 95% rename from Source/IO/IPC/IPCPipe.NT.hpp rename to Source/IO/IPC/AuIPCPipe.NT.hpp index 117e4502..a4df6b5e 100644 --- a/Source/IO/IPC/IPCPipe.NT.hpp +++ b/Source/IO/IPC/AuIPCPipe.NT.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPipe.NT.hpp + File: AuIPCPipe.NT.hpp Date: 2022-4-15 Author: Reece ***/ @@ -9,7 +9,7 @@ #include "IPC.hpp" -#include +#include namespace Aurora::IO::IPC { diff --git a/Source/IO/IPC/IPCPipe.Unix.cpp b/Source/IO/IPC/AuIPCPipe.Unix.cpp similarity index 99% rename from Source/IO/IPC/IPCPipe.Unix.cpp rename to Source/IO/IPC/AuIPCPipe.Unix.cpp index a748484f..e5f6e0ec 100644 --- a/Source/IO/IPC/IPCPipe.Unix.cpp +++ b/Source/IO/IPC/AuIPCPipe.Unix.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPipe.Linux.cpp + File: AuIPCPipe.Linux.cpp Date: 2022-4-14 Author: Reece ***/ #include #include "IPC.hpp" -#include "IPCHandle.hpp" -#include "IPCPipe.Unix.hpp" +#include "AuIPCHandle.hpp" +#include "AuIPCPipe.Unix.hpp" #include #include #include diff --git a/Source/IO/IPC/IPCPipe.Unix.hpp b/Source/IO/IPC/AuIPCPipe.Unix.hpp similarity index 98% rename from Source/IO/IPC/IPCPipe.Unix.hpp rename to Source/IO/IPC/AuIPCPipe.Unix.hpp index 084d1392..84fd3248 100644 --- a/Source/IO/IPC/IPCPipe.Unix.hpp +++ b/Source/IO/IPC/AuIPCPipe.Unix.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPipe.Unix.hpp + File: AuIPCPipe.Unix.hpp Date: 2022-4-14 Author: Reece ***/ diff --git a/Source/IO/IPC/IPCPrimitives.Linux.cpp b/Source/IO/IPC/AuIPCPrimitives.Linux.cpp similarity index 99% rename from Source/IO/IPC/IPCPrimitives.Linux.cpp rename to Source/IO/IPC/AuIPCPrimitives.Linux.cpp index c50a10c7..62090e6a 100644 --- a/Source/IO/IPC/IPCPrimitives.Linux.cpp +++ b/Source/IO/IPC/AuIPCPrimitives.Linux.cpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPrimitives.Linux.cpp + File: AuIPCPrimitives.Linux.cpp Date: 2022-4-13 Author: Reece ***/ diff --git a/Source/IO/IPC/IPCPrimitives.Linux.hpp b/Source/IO/IPC/AuIPCPrimitives.Linux.hpp similarity index 97% rename from Source/IO/IPC/IPCPrimitives.Linux.hpp rename to Source/IO/IPC/AuIPCPrimitives.Linux.hpp index 5857ce81..3335fea5 100644 --- a/Source/IO/IPC/IPCPrimitives.Linux.hpp +++ b/Source/IO/IPC/AuIPCPrimitives.Linux.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPrimitives.Linux.hpp + File: AuIPCPrimitives.Linux.hpp Date: 2022-4-13 Author: Reece ***/ diff --git a/Source/IO/IPC/IPCPrimitives.NT.cpp b/Source/IO/IPC/AuIPCPrimitives.NT.cpp similarity index 98% rename from Source/IO/IPC/IPCPrimitives.NT.cpp rename to Source/IO/IPC/AuIPCPrimitives.NT.cpp index 29dc8e11..420261cb 100644 --- a/Source/IO/IPC/IPCPrimitives.NT.cpp +++ b/Source/IO/IPC/AuIPCPrimitives.NT.cpp @@ -1,14 +1,14 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPrimitives.NT.cpp + File: AuIPCPrimitives.NT.cpp Date: 2022-4-13 Author: Reece ***/ #include #include "IPC.hpp" -#include "IPCHandle.hpp" -#include "IPCPrimitives.NT.hpp" +#include "AuIPCHandle.hpp" +#include "AuIPCPrimitives.NT.hpp" #include #include diff --git a/Source/IO/IPC/IPCPrimitives.NT.hpp b/Source/IO/IPC/AuIPCPrimitives.NT.hpp similarity index 83% rename from Source/IO/IPC/IPCPrimitives.NT.hpp rename to Source/IO/IPC/AuIPCPrimitives.NT.hpp index d9acefa0..1027c183 100644 --- a/Source/IO/IPC/IPCPrimitives.NT.hpp +++ b/Source/IO/IPC/AuIPCPrimitives.NT.hpp @@ -1,7 +1,7 @@ /*** Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved. - File: IPCPrimitives.NT.hpp + File: AuIPCPrimitives.NT.hpp Date: 2022-4-13 Author: Reece ***/