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

[+] Overlapped stdout/in/err processes API

Browse Source
This commit is contained in:
Reece Wilson 2022-05-03 11:10:04 +01:00
parent 45975e4755
commit 97cdbc9f27
7 changed files with 95 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Include/Aurora/Processes/IProcess.hpp
View File

@ -76,5 +76,17 @@ namespace Aurora::Processes
* @return
*/
virtual bool Write(const Memory::MemoryViewStreamRead &source) = 0;
/**
* @brief Returns a asynchronous file stream transaction of pipe pair: stdout, stdin
* @return
*/
virtual AuSPtr<IO::FS::IAsyncTransaction> NewAsyncTransaction() = 0;
/**
* @brief Returns a asynchronous file stream transaction of pipe pair: stdout, INVALID
* @return
*/
virtual AuSPtr<IO::FS::IAsyncTransaction> NewErrorStreamAsyncTransaction() = 0;
};
}

13
Source/IO/FS/Async.NT.cpp
View File

@ -51,6 +51,11 @@ namespace Aurora::IO::FS
FileHandle::~FileHandle()
{
if (this->writeHandle != this->handle)
{
AuWin32CloseHandle(this->writeHandle);
}
this->writeHandle = INVALID_HANDLE_VALUE;
AuWin32CloseHandle(this->handle);
}
@ -103,14 +108,16 @@ namespace Aurora::IO::FS
this->directIO = directIO;
this->handle = fileHandle;
this->writeHandle = fileHandle;
this->readOnly = openMode == EFileOpenMode::eRead;
return true;
}
void FileHandle::Init(HANDLE h)
void FileHandle::Init(HANDLE read, HANDLE write)
{
this->directIO = true;
this->handle = h;
this->handle = read;
this->writeHandle = write;
this->readOnly = false;
}
@ -272,7 +279,7 @@ namespace Aurora::IO::FS
this->overlap_.Offset = offset & 0xFFFFFFFF;
this->overlap_.OffsetHigh = (offset >> 32) & 0xFFFFFFFF;
auto ret = ::WriteFileEx(this->handle_->handle, memoryView->ptr, memoryView->length, &overlap_, GenericCompletionRoutine);
auto ret = ::WriteFileEx(this->handle_->writeHandle, memoryView->ptr, memoryView->length, &overlap_, GenericCompletionRoutine);
return TranslateNtStatus(this, ret);
}

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

@ -14,9 +14,9 @@ namespace Aurora::IO::FS
~FileHandle();
bool Init(const AuString &path, EFileOpenMode openMode, bool directIO, EFileAdvisoryLockLevel lock);
void Init(HANDLE h);
void Init(HANDLE read, HANDLE write);
HANDLE handle {INVALID_HANDLE_VALUE};
HANDLE handle {INVALID_HANDLE_VALUE}, writeHandle {INVALID_HANDLE_VALUE};
AuString path;
bool readOnly;
bool directIO;

2
Source/IPC/IPCPipe.NT.cpp
View File

@ -111,7 +111,7 @@ namespace Aurora::IPC
this->fsHandle_ = AuMakeShared<IO::FS::FileHandle>();
this->fsStream_ = AuMakeShared<IO::FS::NtAsyncFileStream>();
this->fsHandle_->Init(this->GetPipeHandle());
this->fsHandle_->Init(this->GetPipeHandle(), this->GetPipeHandle());
this->fsStream_->Init(this->fsHandle_);
TryConnect();

2
Source/IPC/IPCPipe.Unix.cpp
View File

@ -183,7 +183,7 @@ namespace Aurora::IPC
bool IPCPipeImpl::Write(const Memory::MemoryViewStreamRead &read)//, bool nonblock)
{
bool nonblock = false;
bool nonblock = true;
auto handle = this->fds[1];
auto control = ::fcntl(handle, F_GETFL);
auto ref = control;

60
Source/Processes/Process.NT.cpp
View File

@ -17,6 +17,7 @@
#include "ArgvQuote.hpp"
#include <Source/IO/FS/FS.hpp>
#include <Source/IO/FS/Async.NT.hpp>
namespace Aurora::Processes
{
@ -121,12 +122,17 @@ namespace Aurora::Processes
void ProcessImpl::ShutdownPipes()
{
AuWin32CloseHandle(this->pipeStdOutRead_);
AuWin32CloseHandle(this->pipeStdOutWrite_);
AuWin32CloseHandle(this->pipeStdErrRead_);
AuWin32CloseHandle(this->pipeStdErrWrite_);
AuWin32CloseHandle(this->pipeStdInRead_);
AuWin32CloseHandle(this->pipeStdInWrite_);
//AuWin32CloseHandle(this->pipeStdOutRead_);
//AuWin32CloseHandle(this->pipeStdErrRead_);
//AuWin32CloseHandle(this->pipeStdInWrite_);
this->pipeStdInWrite_ = this->pipeStdOutRead_ = this->pipeStdErrRead_ = INVALID_HANDLE_VALUE;
this->fsHandle_.reset();
this->fsStream_.reset();
this->fsErrorHandle_.reset();
this->fsErrorStream_.reset();
}
bool ProcessImpl::Read(EStandardHandle stream, const AuMemoryViewStreamWrite &destination, bool nonblock)
@ -187,7 +193,7 @@ namespace Aurora::Processes
return false;
}
return WriteFile(pipeStdInWrite_, in.ptr, size, &size, NULL) && size == in.length;
return WriteFile(this->pipeStdInWrite_, in.ptr, size, &size, NULL) && size == in.length;
}
bool ProcessImpl::Init()
@ -276,9 +282,55 @@ namespace Aurora::Processes
}
}
if (this->startup_.fwdIn || this->startup_.fwdOut)
{
this->fsHandle_ = AuMakeShared<IO::FS::FileHandle>();
if (!this->fsHandle_)
{
return false;
}
this->fsStream_ = AuMakeShared<IO::FS::NtAsyncFileStream>();
if (!this->fsStream_)
{
return false;
}
this->fsHandle_->Init(this->pipeStdOutRead_, this->pipeStdInWrite_);
this->fsStream_->Init(this->fsHandle_);
}
if (this->startup_.fwdErr)
{
this->fsErrorHandle_ = AuMakeShared<IO::FS::FileHandle>();
if (!this->fsErrorHandle_)
{
return false;
}
this->fsErrorStream_ = AuMakeShared<IO::FS::NtAsyncFileStream>();
if (!this->fsErrorStream_)
{
return false;
}
this->fsErrorHandle_->Init(this->pipeStdErrRead_, INVALID_HANDLE_VALUE);
this->fsErrorStream_->Init(this->fsErrorHandle_);
}
return true;
}
AuSPtr<AuIOFS::IAsyncTransaction> ProcessImpl::NewAsyncTransaction()
{
return this->fsStream_ ? this->fsStream_->NewTransaction() : AuSPtr<AuIOFS::IAsyncTransaction> {};
}
AuSPtr<AuIOFS::IAsyncTransaction> ProcessImpl::NewErrorStreamAsyncTransaction()
{
return this->fsErrorStream_ ? this->fsErrorStream_->NewTransaction() : AuSPtr<AuIOFS::IAsyncTransaction> {};
}
bool ProcessImpl::Start()
{
if (this->process_ != INVALID_HANDLE_VALUE)

15
Source/Processes/Process.NT.hpp
View File

@ -7,6 +7,8 @@
***/
#pragma once
#include <Source/IO/FS/Async.NT.hpp>
namespace Aurora::Processes
{
class ProcessImpl : public IProcess
@ -27,9 +29,12 @@ namespace Aurora::Processes
AuSInt GetExitCode() override;
void ShutdownPipes();
bool Read(EStandardHandle stream, const AuMemoryViewStreamWrite &destination, bool nonblock) override;
bool Write(const AuMemoryViewStreamRead &source) override;
AuSPtr<IO::FS::IAsyncTransaction> NewAsyncTransaction() override;
AuSPtr<IO::FS::IAsyncTransaction> NewErrorStreamAsyncTransaction() override;
bool Start() override;
@ -43,7 +48,13 @@ namespace Aurora::Processes
HANDLE pipeStdErrWrite_ {INVALID_HANDLE_VALUE};
HANDLE pipeStdInRead_ {INVALID_HANDLE_VALUE};
HANDLE pipeStdInWrite_ {INVALID_HANDLE_VALUE};
AuSPtr<IO::FS::FileHandle> fsHandle_;
AuSPtr<IO::FS::NtAsyncFileStream> fsStream_;
AuSPtr<IO::FS::FileHandle> fsErrorHandle_;
AuSPtr<IO::FS::NtAsyncFileStream> fsErrorStream_;
StartupParmaters startup_;
ESpawnType type_;