AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[*] af5c8e86c0 20hrs ago: AuSPtr<AuMemoryViewXXX>s werent fully eliminated

Browse Source
This commit is contained in:
Reece Wilson 2024-07-13 16:34:44 +01:00
parent 124e9d1d0a
commit 3d652ed605
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Include/Aurora/IO/Net/IDatagramServer.hpp
View File

@ -12,7 +12,7 @@ namespace Aurora::IO::Net
struct IDatagramServer : virtual ISocketBase struct IDatagramServer : virtual ISocketBase
{ {
virtual void SendPacket(const NetEndpoint &destination, virtual void SendPacket(const NetEndpoint &destination,
const AuSPtr<AuMemoryViewRead> &pPacketData, const AuMemoryViewRead &packetData,
const AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>> &pCalback) = 0; const AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>> &pCalback) = 0;
virtual AuSPtr<IDatagramDriver> GetDatagramDriver() = 0; virtual AuSPtr<IDatagramDriver> GetDatagramDriver() = 0;

4
Source/IO/FS/Async.Linux.hpp
View File

@ -55,8 +55,8 @@ namespace Aurora::IO::FS
bool Init(const AuSPtr<IIOHandle> &handle); bool Init(const AuSPtr<IIOHandle> &handle);
bool StartRead(AuUInt64 offset, const AuSPtr<AuMemoryViewWrite> &memoryView) override; bool StartRead(AuUInt64 offset, const AuMemoryViewWrite &memoryView) override;
bool StartWrite(AuUInt64 offset, const AuSPtr<AuMemoryViewRead> &memoryView) override; bool StartWrite(AuUInt64 offset, const AuMemoryViewRead &memoryView) override;
bool Complete() override; bool Complete() override;

6
Source/IO/Net/AuNetDatagramServer.cpp
View File

@ -52,14 +52,14 @@ namespace Aurora::IO::Net
} }
void DatagramServer::SendPacket(const NetEndpoint &destination, void DatagramServer::SendPacket(const NetEndpoint &destination,
const AuSPtr<AuMemoryViewRead> &pPacketData, const AuMemoryViewRead &packetData,
const AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>> &pCalback2) const AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>> &pCalback2)
{ {
AuSPtr<AuIO::IAsyncFinishedSubscriberFunctional> pCallback; AuSPtr<AuIO::IAsyncFinishedSubscriberFunctional> pCallback;
if (pCalback2) if (pCalback2)
{ {
pCallback = AuMakeShared<AuIO::IAsyncFinishedSubscriberFunctional>([uSourceLength = pPacketData->length, pCallback = AuMakeShared<AuIO::IAsyncFinishedSubscriberFunctional>([uSourceLength = packetData.length,
pCalback2 = AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>>(pCalback2)](AuUInt64 uOffset, AuUInt32 uLength) pCalback2 = AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>>(pCalback2)](AuUInt64 uOffset, AuUInt32 uLength)
{ {
if (uSourceLength != uLength) if (uSourceLength != uLength)
@ -99,7 +99,7 @@ namespace Aurora::IO::Net
pTransaction->SetCallback(pCallback); pTransaction->SetCallback(pCallback);
if (!pTransaction->StartWrite(0, pPacketData)) if (!pTransaction->StartWrite(0, packetData))
{ {
NetError error; NetError error;
NetError_SetCurrent(error); NetError_SetCurrent(error);

2
Source/IO/Net/AuNetDatagramServer.hpp
View File

@ -14,7 +14,7 @@ namespace Aurora::IO::Net
struct DatagramServer : virtual SocketServerImpl, virtual IDatagramServer struct DatagramServer : virtual SocketServerImpl, virtual IDatagramServer
{ {
void SendPacket(const NetEndpoint &destination, void SendPacket(const NetEndpoint &destination,
const AuSPtr<AuMemoryViewRead> &pPacketData, const AuMemoryViewRead &pPacketData,
const AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>> &pCalback) override; const AuSPtr<AuAsync::PromiseCallback<AuNullS, NetError>> &pCalback) override;
DatagramServer(struct NetInterface *pInterface, DatagramServer(struct NetInterface *pInterface,

4
Source/IO/UNIX/IOSubmit.Linux.cpp
View File

@ -52,8 +52,8 @@ namespace Aurora::IO::UNIX
pinSelf = this->pin_; pinSelf = this->pin_;
pinMem = this->memPin_; pinMem = this->memPin_;
auto cp1 = context->readView; auto cp1 = this->readView;
auto cp2 = context->writeView; auto cp2 = this->writeView;
if (AuExchange(this->bIsReadPending, false)) if (AuExchange(this->bIsReadPending, false))
{ {

6
Source/IO/UNIX/IOSubmit.Linux.hpp
View File

@ -25,8 +25,8 @@ namespace Aurora::IO::UNIX
bool LIOS_Cancel(); bool LIOS_Cancel();
bool HasState(); bool HasState();
void SetMemory(const AuSPtr<AuMemoryViewRead> &view); void SetMemory(const AuMemoryViewRead &view);
void SetMemory(const AuSPtr<AuMemoryViewWrite> &view); void SetMemory(const AuMemoryViewWrite &view);
AuUInt64 GetData(); AuUInt64 GetData();
AuUInt64 GetBuf(); AuUInt64 GetBuf();
@ -47,6 +47,8 @@ namespace Aurora::IO::UNIX
// TODO: // TODO:
AuSPtr<void> pin_; AuSPtr<void> pin_;
AuSPtr<void> memPin_; AuSPtr<void> memPin_;
AuMemoryViewRead readView;
AuMemoryViewWrite writeView;
private: private:
AuUInt64 dataPtr_ {}; AuUInt64 dataPtr_ {};
AuUInt dataLen_ {}; AuUInt dataLen_ {};