eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 11:09:18 +02:00
Code Issues 121 Wiki Activity

refactoring: python task data creation moved to the task queue worker

Browse Source
This commit is contained in:
tmj-fstate
2019-01-23 19:38:59 +01:00
parent 0ad2a142c1
commit 753cf7ee5d
6 changed files with 144 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PyInt.cpp
View File

@@ -16,9 +16,18 @@ http://mozilla.org/MPL/2.0/.
#include "Logs.h"
void render_task::run() {
// convert provided input to a python dictionary
auto *input = PyDict_New();
if( input == nullptr ) { goto exit; }
for( auto const &datapair : m_input->floats ) { PyDict_SetItemString( input, datapair.first.c_str(), PyGetFloat( datapair.second ) ); }
for( auto const &datapair : m_input->integers ) { PyDict_SetItemString( input, datapair.first.c_str(), PyGetInt( datapair.second ) ); }
for( auto const &datapair : m_input->bools ) { PyDict_SetItemString( input, datapair.first.c_str(), PyGetBool( datapair.second ) ); }
for( auto const &datapair : m_input->strings ) { PyDict_SetItemString( input, datapair.first.c_str(), PyGetString( datapair.second.c_str() ) ); }
// call the renderer
auto *output { PyObject_CallMethod( m_renderer, "render", "O", m_input ) };
Py_DECREF( m_input );
auto *output { PyObject_CallMethod( m_renderer, "render", "O", input ) };
Py_DECREF( input );
if( output != nullptr ) {
auto *outputwidth { PyObject_CallMethod( m_renderer, "get_width", nullptr ) };
@@ -48,13 +57,16 @@ void render_task::run() {
if( outputwidth != nullptr ) { Py_DECREF( outputwidth ); }
Py_DECREF( output );
}
exit:
// clean up after yourself
delete m_input;
delete this;
}
void render_task::cancel() {
Py_DECREF( m_input );
delete m_input;
delete this;
}
@@ -158,11 +170,7 @@ auto python_taskqueue::insert( task_request const &Task ) -> bool {
for( auto &task : m_tasks.data ) {
if( task->target() == Task.target ) {
// replace pending task in the slot with the more recent one
acquire_lock();
{
task->cancel();
}
release_lock();
task->cancel();
task = newtask;
newtaskinserted = true;
break;