i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pulled base class AbstractModelLoader out of ModelLoader.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30427 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-04-26 13:59:38 +00:00
parent 5bfd73fb71
commit 64d5660eab
6 changed files with 233 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debuganalyzer/model_loader/ModelLoader.cpp
+21 -86
View File
@@ -70,80 +70,20 @@ ModelLoader::_UpdateLastEventTime(bigtime_t time)
ModelLoader::ModelLoader(DataSource* dataSource,
const BMessenger& target, void* targetCookie)
:
fLock("main model loader"),
AbstractModelLoader(target, targetCookie),
fModel(NULL),
fDataSource(dataSource),
fTarget(target),
fTargetCookie(targetCookie),
fLoaderThread(-1),
fLoading(false),
fAborted(false)
fDataSource(dataSource)
{
}
ModelLoader::~ModelLoader()
{
Abort(true);
delete fDataSource;
delete fModel;
}
status_t
ModelLoader::StartLoading()
{
// check initialization
status_t error = fLock.InitCheck();
if (error != B_OK)
return error;
AutoLocker<BLocker> locker(fLock);
if (fModel != NULL || fLoading || fDataSource == NULL)
return B_BAD_VALUE;
// init the hash tables
error = fThreads.Init();
if (error != B_OK)
return error;
// spawn the loader thread
fLoaderThread = spawn_thread(&_LoaderEntry, "main model loader",
B_NORMAL_PRIORITY, this);
if (fLoaderThread < 0)
return fLoaderThread;
fLoading = true;
fAborted = false;
resume_thread(fLoaderThread);
return B_OK;
}
void
ModelLoader::Abort(bool wait)
{
AutoLocker<BLocker> locker(fLock);
if (fLoaderThread < 0)
return;
thread_id thread = fLoaderThread;
if (fLoading)
fAborted = true;
locker.Unlock();
if (wait)
wait_for_thread(thread, NULL);
}
Model*
ModelLoader::DetachModel()
{
@@ -159,26 +99,35 @@ ModelLoader::DetachModel()
}
/*static*/ status_t
ModelLoader::_LoaderEntry(void* data)
status_t
ModelLoader::PrepareForLoading()
{
return ((ModelLoader*)data)->_Loader();
if (fModel != NULL || fDataSource == NULL)
return B_BAD_VALUE;
// init the hash tables
status_t error = fThreads.Init();
if (error != B_OK)
return error;
return B_OK;
}
status_t
ModelLoader::_Loader()
ModelLoader::Load()
{
status_t error;
try {
error = _Load();
return _Load();
} catch(...) {
error = B_ERROR;
return B_ERROR;
}
}
// clean up and notify the target
AutoLocker<BLocker> locker(fLock);
void
ModelLoader::FinishLoading(bool success)
{
ThreadInfo* threadInfo = fThreads.Clear(true);
while (threadInfo != NULL) {
ThreadInfo* nextInfo = threadInfo->fNext;
@@ -186,24 +135,10 @@ ModelLoader::_Loader()
threadInfo = nextInfo;
}
BMessage message;
if (error == B_OK) {
message.what = MSG_MODEL_LOADED_SUCCESSFULLY;
} else {
if (!success) {
delete fModel;
fModel = NULL;
message.what = fAborted
? MSG_MODEL_LOADED_ABORTED : MSG_MODEL_LOADED_FAILED;
}
message.AddPointer("loader", this);
message.AddPointer("targetCookie", fTargetCookie);
fTarget.SendMessage(&message);
fLoading = false;
return B_OK;
}