amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

debuged some horrible race conditions & deadlocks

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@160 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-12-24 00:12:06 +00:00
parent 5bed5892f3
commit 40606d975e
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/thumbnail_thread.cpp
+9 -12
View File
@@ -58,7 +58,6 @@ wxThread::ExitCode ThumbnailThreadWorker::Entry() {
while (true) {
do {
Sleep(1);
if (TestDestroy()) return 0;
} while (stop);
// get a request
{
@@ -71,9 +70,7 @@ wxThread::ExitCode ThumbnailThreadWorker::Entry() {
parent->open_requests.pop_front();
}
// perform request
if (TestDestroy()) return 0;
Image img = current->generate();
if (TestDestroy()) return 0;
// store in cache
if (img.Ok()) {
String filename = image_cache_dir() + safe_filename(current->cache_name) + _(".png");
@@ -107,10 +104,6 @@ ThumbnailThread::ThumbnailThread()
, worker(nullptr)
{}
ThumbnailThread::~ThumbnailThread() {
abortAll();
}
void ThumbnailThread::request(const ThumbnailRequestP& request) {
assert(wxThread::IsMain());
// Is the request in progress?
@@ -172,7 +165,7 @@ bool ThumbnailThread::done(void* owner) {
void ThumbnailThread::abort(void* owner) {
assert(wxThread::IsMain());
mutex.Lock();
if (worker && worker->current->owner == owner) {
if (worker && worker->current && worker->current->owner == owner) {
// a request for this owner is in progress, wait until it is done
worker->stop = true;
completed.Wait();
@@ -183,8 +176,8 @@ void ThumbnailThread::abort(void* owner) {
for (size_t i = 0 ; i < open_requests.size() ; ) {
if (open_requests[i]->owner == owner) {
// remove
open_requests.erase(open_requests.begin() + i, open_requests.begin() + i + 1);
request_names.erase(open_requests[i]);
open_requests.erase(open_requests.begin() + i, open_requests.begin() + i + 1);
} else {
++i;
}
@@ -193,8 +186,8 @@ void ThumbnailThread::abort(void* owner) {
for (size_t i = 0 ; i < closed_requests.size() ; ) {
if (closed_requests[i].first->owner == owner) {
// remove
closed_requests.erase(closed_requests.begin() + i, closed_requests.begin() + i + 1);
request_names.erase(closed_requests[i].first);
closed_requests.erase(closed_requests.begin() + i, closed_requests.begin() + i + 1);
} else {
++i;
}
@@ -208,10 +201,14 @@ void ThumbnailThread::abortAll() {
open_requests.clear();
closed_requests.clear();
request_names.clear();
if (worker) {
// a request is in progress, wait until it is done, killing the worker
// end worker
if (worker && worker->current) {
completed.Wait();
} else {
mutex.Unlock();
}
// There may still be a worker, but if there is, it has no current object, so it is
// in, before or after the stop loop. It can do nothing but end.
// An unfortunate side effect is that we might leak some memory (of the worker object),
// when the thread gets Kill()ed by wx.
}