16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 18:39:18 +02:00

python task queue task handling tweaks

This commit is contained in:
tmj-fstate
2018-10-13 14:53:17 +02:00
parent 68f82be451
commit f8f0907d8a
2 changed files with 33 additions and 6 deletions

View File

@@ -36,22 +36,28 @@ void render_task::run() {
// anisotropic filtering // anisotropic filtering
::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global.AnisotropicFiltering ); ::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global.AnisotropicFiltering );
} }
::glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 );
// build texture // build texture
::glTexImage2D( ::glTexImage2D(
GL_TEXTURE_2D, 0, GL_TEXTURE_2D, 0,
GL_RGBA8, GL_RGBA8,
PyInt_AsLong( outputwidth ), PyInt_AsLong( outputheight ), 0, PyInt_AsLong( outputwidth ), PyInt_AsLong( outputheight ), 0,
GL_RGB, GL_UNSIGNED_BYTE, reinterpret_cast<GLubyte const *>( PyString_AsString( output ) ) ); GL_RGB, GL_UNSIGNED_BYTE, reinterpret_cast<GLubyte const *>( PyString_AsString( output ) ) );
::glFlush();
} }
Py_DECREF( outputheight ); if( outputheight != nullptr ) { Py_DECREF( outputheight ); }
Py_DECREF( outputwidth ); if( outputwidth != nullptr ) { Py_DECREF( outputwidth ); }
Py_DECREF( output ); Py_DECREF( output );
} }
// clean up after yourself // clean up after yourself
delete this; delete this;
} }
void render_task::cancel() {
Py_DECREF( m_input );
delete this;
}
// initializes the module. returns true on success // initializes the module. returns true on success
auto python_taskqueue::init() -> bool { auto python_taskqueue::init() -> bool {
@@ -131,7 +137,7 @@ void python_taskqueue::exit() {
// get rid of the leftover tasks // get rid of the leftover tasks
// with the workers dead we don't have to worry about concurrent access anymore // with the workers dead we don't have to worry about concurrent access anymore
for( auto *task : m_tasks.data ) { for( auto *task : m_tasks.data ) {
delete task; task->cancel();
} }
// take a bow // take a bow
PyEval_AcquireLock(); PyEval_AcquireLock();
@@ -148,10 +154,29 @@ auto python_taskqueue::insert( task_request const &Task ) -> bool {
auto *renderer { fetch_renderer( Task.renderer ) }; auto *renderer { fetch_renderer( Task.renderer ) };
if( renderer == nullptr ) { return false; } if( renderer == nullptr ) { return false; }
// acquire a lock on the task queue and add a new task
auto *newtask { new render_task( renderer, Task.input, Task.target ) };
bool newtaskinserted { false };
// acquire a lock on the task queue and add the new task
{ {
std::lock_guard<std::mutex> lock( m_tasks.mutex ); std::lock_guard<std::mutex> lock( m_tasks.mutex );
m_tasks.data.emplace_back( new render_task( renderer, Task.input, Task.target ) ); // check the task list for a pending request with the same target
for( auto &task : m_tasks.data ) {
if( task->target() == Task.target ) {
// replace pending task in the slot with the more recent one
PyEval_AcquireLock();
{
task->cancel();
}
PyEval_ReleaseLock();
task = newtask;
newtaskinserted = true;
break;
}
}
if( false == newtaskinserted ) {
m_tasks.data.emplace_back( newtask );
}
} }
// potentially wake a worker to handle the new task // potentially wake a worker to handle the new task
m_condition.notify_one(); m_condition.notify_one();

View File

@@ -34,6 +34,8 @@ public:
{} {}
// methods // methods
void run(); void run();
void cancel();
auto target() const -> texture_handle { return m_target; }
private: private:
// members // members