josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rearranged the failure handling code

Browse Source 
git-svn-id: svn://anubis/fart/trunk@241 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-04-15 00:58:35 +00:00
parent f267a8fd86
commit d98c26da66
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/distrib.cc
View File

@ -374,7 +374,9 @@ int distrib::getTask()
m_next_task++; m_next_task++;
} }
pthread_mutex_unlock(&m_task_mutex); pthread_mutex_unlock(&m_task_mutex);
if (task == -1) if (task > -1)
startTask(task);
else
{ {
pthread_mutex_lock(&m_tasks_in_progress_mutex); pthread_mutex_lock(&m_tasks_in_progress_mutex);
std::map<int, int>::const_iterator it = m_tasks_in_progress.begin(); std::map<int, int>::const_iterator it = m_tasks_in_progress.begin();
@ -384,8 +386,6 @@ int distrib::getTask()
} }
pthread_mutex_unlock(&m_tasks_in_progress_mutex); pthread_mutex_unlock(&m_tasks_in_progress_mutex);
} }
if (task > -1)
startTask(task);
} }
else else
{ {

5
main/fart.cc
View File

@ -195,13 +195,12 @@ int main(int argc, char * argv[])
else else
{ {
/* "sequential" version */ /* "sequential" version */
unsigned char * pixel = &data[0];
for (int i = 0; i < height; i++) for (int i = 0; i < height; i++)
{ {
for (int j = 0; j < width; j++) for (int j = 0; j < width; j++)
{ {
scene.renderPixel(j, i, pixel); int pixel = i * width + j;
pixel += 3; scene.renderPixel(j, i, &data[3 * pixel]);
} }
} }
} }