cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwThreadMach.h/cpp : Many changes to support use in cwIo.

Browse Source
This commit is contained in:
kevin 2021-01-20 13:11:44 -05:00
parent c929804d4c
commit f4e99e3771
2 changed files with 64 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
cwThreadMach.cpp
View File

@ -12,32 +12,60 @@ namespace cw
typedef struct thread_str typedef struct thread_str
{ {
thread::handle_t thH; thread::handle_t thH;
threadFunc_t func;
void* arg; void* arg;
struct thread_str* link;
} thread_t; } thread_t;
typedef struct thread_mach_str typedef struct thread_mach_str
{ {
thread_t* threadA; thread_t* threadL;
unsigned threadN;
} thread_mach_t; } thread_mach_t;
thread_mach_t* _handleToPtr( handle_t h ) thread_mach_t* _handleToPtr( handle_t h )
{ return handleToPtr<handle_t,thread_mach_t>(h); } { return handleToPtr<handle_t,thread_mach_t>(h); }
rc_t _destroy( thread_mach_t* p ) rc_t _add( thread_mach_t* p, threadFunc_t func, void* arg )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
for(unsigned i=0; i<p->threadN; ++i) thread_t* t = mem::allocZ<thread_t>();
if((rc = thread::create(t->thH, func, arg )) != kOkRC )
{ {
if((rc = destroy(p->threadA[i].thH)) != kOkRC ) rc = cwLogError(rc,"Thread create failed.");
{ goto errLabel;
rc = cwLogError(rc,"Thread at index %i destroy failed.",i); }
break;
} t->func = func;
t->arg = arg;
t->link = p->threadL;
p->threadL = t;
errLabel:
if( rc != kOkRC )
mem::release(t);
return rc;
}
rc_t _destroy( thread_mach_t* p )
{
rc_t rc = kOkRC;
thread_t* t=p->threadL;
while( t != nullptr )
{
thread_t* t0 = t->link;
if((rc = destroy(t->thH)) != kOkRC )
{
rc = cwLogError(rc,"Thread destroy failed.");
break;
}
mem::release(t);
t = t0;
} }
mem::release(p->threadA);
mem::release(p); mem::release(p);
return rc; return rc;
@ -55,21 +83,16 @@ cw::rc_t cw::thread_mach::create( handle_t& hRef, threadFunc_t threadFunc, void*
return rc; return rc;
thread_mach_t* p = mem::allocZ<thread_mach_t>(); thread_mach_t* p = mem::allocZ<thread_mach_t>();
p->threadA = mem::allocZ<thread_t>(threadN);
p->threadN = threadN;
uint8_t* ctxA = static_cast<uint8_t*>(contextArray); uint8_t* ctxA = reinterpret_cast<uint8_t*>(contextArray);
for(unsigned i=0; i<threadN; ++i) for(unsigned i=0; i<threadN; ++i)
{ {
p->threadA[i].arg = ctxA + (i*contexRecdByteN); void* arg = ctxA + (i*contexRecdByteN);
if((rc = thread::create(p->threadA[i].thH, threadFunc, p->threadA[i].arg )) != kOkRC ) if((rc = _add(p, threadFunc, arg)) != kOkRC )
{
rc = cwLogError(rc,"Thread at index %i create failed.",i);
goto errLabel; goto errLabel;
} }
}
hRef.set(p); hRef.set(p);
@ -80,6 +103,12 @@ cw::rc_t cw::thread_mach::create( handle_t& hRef, threadFunc_t threadFunc, void*
return rc; return rc;
} }
cw::rc_t cw::thread_mach::add( handle_t h, threadFunc_t threadFunc, void* arg )
{
thread_mach_t* p = _handleToPtr(h);
return _add(p,threadFunc,arg);
}
cw::rc_t cw::thread_mach::destroy( handle_t& hRef ) cw::rc_t cw::thread_mach::destroy( handle_t& hRef )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
@ -101,9 +130,9 @@ cw::rc_t cw::thread_mach::start( handle_t h )
rc_t rc0; rc_t rc0;
thread_mach_t* p = _handleToPtr(h); thread_mach_t* p = _handleToPtr(h);
for(unsigned i=0; i<p->threadN; ++i) for(thread_t* t=p->threadL; t!=nullptr; t=t->link)
if((rc0 = thread::unpause( p->threadA[i].thH )) != kOkRC ) if((rc0 = thread::unpause( t->thH )) != kOkRC )
rc = cwLogError(rc0,"Thread at index %i start failed.", i ); rc = cwLogError(rc0,"Thread start failed.");
return rc; return rc;
} }
@ -114,9 +143,19 @@ cw::rc_t cw::thread_mach::stop( handle_t h )
rc_t rc0; rc_t rc0;
thread_mach_t* p = _handleToPtr(h); thread_mach_t* p = _handleToPtr(h);
for(unsigned i=0; i<p->threadN; ++i) for(thread_t* t=p->threadL; t!=nullptr; t=t->link)
if((rc0 = thread::pause( p->threadA[i].thH, thread::kPauseFl | thread::kWaitFl )) != kOkRC ) if((rc0 = thread::pause( t->thH, thread::kPauseFl | thread::kWaitFl )) != kOkRC )
rc = cwLogError(rc0,"Thread at index %i stop failed.", i ); rc = cwLogError(rc0,"Thread stop failed.");
return rc; return rc;
} }
bool cw::thread_mach::is_shutdown( handle_t h )
{
thread_mach_t* p = _handleToPtr(h);
for(thread_t* t=p->threadL; t!=nullptr; t=t->link)
if( thread::state(t->thH) != thread::kExitedThId )
return false;
return true;
}

5
cwThreadMach.h
View File

@ -8,11 +8,12 @@ namespace cw
typedef handle<struct thread_mach_str> handle_t; typedef handle<struct thread_mach_str> handle_t;
typedef thread::cbFunc_t threadFunc_t; typedef thread::cbFunc_t threadFunc_t;
rc_t create( handle_t& hRef, threadFunc_t threadFunc, void* contextArray, unsigned contexRecdByteN, unsigned threadN ); rc_t create( handle_t& hRef, threadFunc_t threadFunc=nullptr, void* contextArray=nullptr, unsigned contexRecdByteN=0, unsigned threadN=0 );
rc_t destroy( handle_t& hRef ); rc_t destroy( handle_t& hRef );
rc_t add( handle_t h, threadFunc_t threadFunc, void* arg );
rc_t start( handle_t h ); rc_t start( handle_t h );
rc_t stop( handle_t h ); rc_t stop( handle_t h );
bool is_shutdown( handle_t h );
} }
} }