lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-06 15:05:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update source to v6.14.19098.19271

Browse Source
This commit is contained in:
Will Pearson
2019-04-09 10:17:14 -07:00
parent 98797aac6e
commit f2dc7fba67
97 changed files with 10406 additions and 7766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opennurbs_textrun.cpp
View File

@@ -22,15 +22,19 @@
#error ON_COMPILING_OPENNURBS must be defined when compiling opennurbs
#endif
class ON_CLASS ON_TextRunPool : public ON_FixedSizePool
class ON_TextRunPool : public ON_FixedSizePool
{
public:
static ON_TextRunPool thePool;
private:
ON_TextRunPool()
{
ON_FixedSizePool::Create(sizeof(ON_TextRun), 0, 0);
}
~ON_TextRunPool() = default;
ON_TextRunPool(const ON_TextRunPool&) = delete;
ON_TextRunPool& operator=(const ON_TextRunPool&) = delete;
};
ON_TextRunPool ON_TextRunPool::thePool;
@@ -41,8 +45,14 @@ ON_TextRun::ON_TextRun(bool bManagedTextRun)
ON_TextRun* ON_TextRun::GetManagedTextRun()
{
void* p = ON_TextRunPool::thePool.AllocateDirtyElement();
ON_TextRun* run = new(p)ON_TextRun(true);
// .NET wrappers manage objects with test runs and .NET GC runs in its own thread,
// so text run allocation/return using the global ON_TextRunPool::thePool resource
// must be thread safe.
void* p = ON_TextRunPool::thePool.ThreadSafeAllocateDirtyElement();
ON_TextRun* run
= (nullptr != p)
? new(p)ON_TextRun(true) // always happens in practice
: new ON_TextRun(false); // could occur if a crashing working thread leaves the pool locked.
return run;
}
@@ -66,14 +76,16 @@ bool ON_TextRun::ReturnManagedTextRun(
if ( nullptr == run )
return true;
if (1 == run->m_managed_status)
{
if (0 == run->m_active_status)
{
run->Internal_Destroy();
run->m_active_status = 1;
ON_TextRunPool::thePool.ReturnElement(run);
// .NET wrappers manage objects with test runs and .NET GC runs in its own thread,
// so text run allocation/return using the global ON_TextRunPool::thePool resource
// must be thread safe.
ON_TextRunPool::thePool.ThreadSafeReturnElement(run);
return true;
}
ON_ERROR("Attempt to return a managed run that is not active.");