libcontext: clean up own's shit when coroutine call is over (MSVC only)

This commit is contained in:
Tomasz Wlostowski 2020-07-22 15:39:04 +02:00
parent 637571e0be
commit 151b4e4e5e
3 changed files with 45 additions and 0 deletions

View File

@ -92,6 +92,13 @@ private:
{ {
} }
~CALL_CONTEXT()
{
if ( m_mainStackContext )
libcontext::release_fcontext( *m_mainStackContext );
}
void SetMainStack( CONTEXT_T* aStack ) void SetMainStack( CONTEXT_T* aStack )
{ {
m_mainStackContext = aStack; m_mainStackContext = aStack;
@ -161,6 +168,10 @@ public:
#ifdef KICAD_USE_VALGRIND #ifdef KICAD_USE_VALGRIND
VALGRIND_STACK_DEREGISTER( valgrind_stack ); VALGRIND_STACK_DEREGISTER( valgrind_stack );
#endif #endif
if(m_caller)
libcontext::release_fcontext( m_caller );
if(m_callee)
libcontext::release_fcontext( m_callee );
} }
public: public:

View File

@ -1305,10 +1305,43 @@ intptr_t LIBCONTEXT_CALL_CONVENTION jump_fcontext(fcontext_t* ofc, fcontext_t nf
return fiberParams[*ofc].outValue; return fiberParams[*ofc].outValue;
} }
void LIBCONTEXT_CALL_CONVENTION release_fcontext( fcontext_t ctx )
{
if( fiberParams.find( ctx ) != fiberParams.end() )
{
fiberParams.erase( ctx );
}
}
}; // namespace libcontext }; // namespace libcontext
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif
#else // defined(LIBCONTEXT_PLATFORM_msvc_x86_64) || defined(LIBCONTEXT_PLATFORM_msvc_i386)
#warning nowindows
#ifdef __cplusplus
extern "C" {
#endif #endif
namespace libcontext
{
void LIBCONTEXT_CALL_CONVENTION release_fcontext( fcontext_t ctx )
{
// do nothing...
}
}; // namespace libcontext
#ifdef __cplusplus
};
#endif // defined(LIBCONTEXT_PLATFORM_msvc_x86_64) || defined(LIBCONTEXT_PLATFORM_msvc_i386)
#endif

View File

@ -102,6 +102,7 @@ typedef void* fcontext_t;
extern "C" { extern "C" {
#endif #endif
void LIBCONTEXT_CALL_CONVENTION release_fcontext( fcontext_t ctx );
intptr_t LIBCONTEXT_CALL_CONVENTION jump_fcontext( fcontext_t* ofc, fcontext_t nfc, intptr_t LIBCONTEXT_CALL_CONVENTION jump_fcontext( fcontext_t* ofc, fcontext_t nfc,
intptr_t vp, bool preserve_fpu = true ); intptr_t vp, bool preserve_fpu = true );