Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 11:38:21 +02:00
Code Activity

Made BfpFile_Read cancelable

Browse source
This commit is contained in:
Brian Fiete 2021-12-31 10:27:09 -05:00
parent befc60aa63
commit 1201289f78
2 changed files with 137 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

129
IDEHelper/Compiler/CeMachine.cpp
View file

@ -4597,6 +4597,56 @@ static void CeSetAddrVal(void* ptr, int64 val, int32 ptrSize)
*(int64*)(ptr) = (int64)val;
}
class CeAsyncOperation
{
public:
CeInternalData* mInternalData;
int mRefCount;
void* mData;
int mDataSize;
int mReadSize;
BfpFileResult mResult;
public:
CeAsyncOperation()
{
mInternalData = NULL;
mRefCount = 1;
mData = NULL;
mDataSize = 0;
mReadSize = 0;
mResult = BfpFileResult_Ok;
}
~CeAsyncOperation()
{
mInternalData->Release();
delete mData;
}
void AddRef()
{
BfpSystem_InterlockedExchangeAdd32((uint32*)&mRefCount, 1);
}
void Release()
{
if (BfpSystem_InterlockedExchangeAdd32((uint32*)&mRefCount, (uint32)-1) == 1)
delete this;
}
void Run()
{
mReadSize = BfpFile_Read(mInternalData->mFile, mData, mDataSize, -1, &mResult);
Release();
}
static void RunProc(void* ptr)
{
((CeAsyncOperation*)ptr)->Run();
}
};
bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8* startFramePtr, BfType*& returnType)
{
auto ceModule = mCeMachine->mCeModule;
@ -4996,10 +5046,10 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
if (*fastFinishPtr)
break;
if (sleepMS > 200)
if (sleepMS > 20)
{
BfpThread_Sleep(200);
sleepMS -= 200;
BfpThread_Sleep(20);
sleepMS -= 20;
continue;
}
BfpThread_Sleep(sleepMS);
@ -5310,9 +5360,76 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
CE_CHECKADDR(bufferPtr, bufferSize);
CE_CHECKADDR(outResultAddr, 4);
BfpFileResult fileResult = BfpFileResult_UnknownError;
CeInternalData* internalData = NULL;
CE_GET_INTERNAL(internalData, (int)fileId, CeInternalData::Kind_File);
int64 result = BfpFile_Read(internalData->mFile, memStart + bufferPtr, bufferSize, timeoutMS, (BfpFileResult*)(memStart + outResultAddr));
int timeoutLeft = timeoutMS;
int64 result = 0;
CeAsyncOperation* asyncOperation = NULL;
BfpThread* asyncThread = NULL;
while (true)
{
if (*cancelingPtr)
break;
int useTimeout = timeoutLeft;
if (useTimeout < 0)
{
useTimeout = 20;
}
else if (useTimeout > 20)
{
useTimeout = 20;
timeoutLeft -= useTimeout;
}
else
timeoutLeft = 0;
if (asyncOperation != NULL)
{
if (BfpThread_WaitFor(asyncThread, useTimeout))
{
if (asyncOperation->mReadSize > 0)
memcpy(memStart + bufferPtr, asyncOperation->mData, asyncOperation->mReadSize);
result = asyncOperation->mReadSize;
fileResult = asyncOperation->mResult;
break;
}
continue;
}
result = BfpFile_Read(internalData->mFile, memStart + bufferPtr, bufferSize, useTimeout, &fileResult);
if (fileResult == BfpFileResult_Timeout)
{
if (timeoutLeft > 0)
continue;
}
if (fileResult != BfpFileResult_InvalidParameter)
break;
BF_ASSERT(asyncOperation == NULL);
asyncOperation = new CeAsyncOperation();
asyncOperation->mInternalData = internalData;
asyncOperation->mInternalData->AddRef();
asyncOperation->mData = new uint8[bufferSize];
asyncOperation->mDataSize = bufferSize;
asyncOperation->AddRef();
asyncThread = BfpThread_Create(CeAsyncOperation::RunProc, asyncOperation);
}
if (asyncOperation != NULL)
asyncOperation->Release();
if (asyncThread != NULL)
BfpThread_Release(asyncThread);
if (outResultAddr != 0)
*(BfpFileResult*)(memStart + outResultAddr) = fileResult;
CeSetAddrVal(resultPtr, result, ptrSize);
}
else if (checkFunction->mFunctionKind == CeFunctionKind_BfpFile_Release)
@ -5321,7 +5438,7 @@ bool CeContext::Execute(CeFunction* startFunction, uint8* startStackPtr, uint8*
CeInternalData* internalData = NULL;
CE_REMOVE_INTERNAL(internalData, (int)fileId, CeInternalData::Kind_File);
delete internalData;
internalData->Release();
}
else if (checkFunction->mFunctionKind == CeFunctionKind_BfpFile_Seek)
{
@ -8169,7 +8286,7 @@ void CeMachine::ReleaseContext(CeContext* ceContext)
ceContext->mCurEmitContext = NULL;
mContextList.Add(ceContext);
for (auto kv : ceContext->mInternalDataMap)
delete kv.mValue;
kv.mValue->Release();
ceContext->mInternalDataMap.Clear();
}

13
IDEHelper/Compiler/CeMachine.h
View file

@ -278,6 +278,7 @@ public:
public:
Kind mKind;
bool mReleased;
int mRefCount;
union
{
@ -290,6 +291,18 @@ public:
{
mKind = Kind_None;
mReleased = false;
mRefCount = 1;
}
void AddRef()
{
BfpSystem_InterlockedExchangeAdd32((uint32*)&mRefCount, 1);
}
void Release()
{
if (BfpSystem_InterlockedExchangeAdd32((uint32*)&mRefCount, (uint32)-1) == 1)
delete this;
}
~CeInternalData();