Tamito Kajiyama
85ae4b87af
The reported crash case seems to be caused by freeing compiled Python objects in a thread. Now this issue is avoided by allocating a buffer to store a Python script and using BPY_string_exec() to run the script. This makes it unnecessary to repeatedly create and destroy Text data blocks. Many thanks to Campbell Barton for his help on the bug fix.
162 lines
3.6 KiB
C++
162 lines
3.6 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef __FREESTYLE_PYTHON_INTERPRETER_H__
|
|
#define __FREESTYLE_PYTHON_INTERPRETER_H__
|
|
|
|
/** \file blender/freestyle/intern/system/PythonInterpreter.h
|
|
* \ingroup freestyle
|
|
* \brief Python Interpreter
|
|
* \author Emmanuel Turquin
|
|
* \date 17/04/2003
|
|
*/
|
|
|
|
#include <iostream>
|
|
|
|
extern "C" {
|
|
#include <Python.h>
|
|
}
|
|
|
|
#include "StringUtils.h"
|
|
#include "Interpreter.h"
|
|
|
|
//soc
|
|
extern "C" {
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DNA_text_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_global.h"
|
|
#include "BKE_library.h"
|
|
#include "BKE_main.h"
|
|
#include "BKE_report.h"
|
|
#include "BKE_text.h"
|
|
|
|
#include "BPY_extern.h"
|
|
|
|
#include "bpy_util.h"
|
|
}
|
|
|
|
namespace Freestyle {
|
|
|
|
class PythonInterpreter : public Interpreter
|
|
{
|
|
public:
|
|
PythonInterpreter()
|
|
{
|
|
_language = "Python";
|
|
_context = 0;
|
|
memset(&_freestyle_bmain, 0, sizeof(Main));
|
|
}
|
|
|
|
void setContext(bContext *C)
|
|
{
|
|
_context = C;
|
|
}
|
|
|
|
int interpretFile(const string& filename)
|
|
{
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
BKE_reports_clear(reports);
|
|
char *fn = const_cast<char*>(filename.c_str());
|
|
#if 0
|
|
int status = BPY_filepath_exec(_context, fn, reports);
|
|
#else
|
|
int status;
|
|
Text *text = BKE_text_load(&_freestyle_bmain, fn, G.main->name);
|
|
if (text) {
|
|
status = BPY_text_exec(_context, text, reports, false);
|
|
BKE_text_unlink(&_freestyle_bmain, text);
|
|
BKE_libblock_free(&_freestyle_bmain, text);
|
|
}
|
|
else {
|
|
BKE_reportf(reports, RPT_ERROR, "Cannot open file: %s", fn);
|
|
status = 0;
|
|
}
|
|
#endif
|
|
|
|
if (status != 1) {
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretFile" << endl;
|
|
cerr << "File: " << fn << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
// cleaning up
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int interpretString(const string& str, const string& name)
|
|
{
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
if (BPY_string_exec(_context, str.c_str()) != 0) {
|
|
BPy_errors_to_report(reports);
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretString" << endl;
|
|
cerr << "Name: " << name << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int interpretText(struct Text *text, const string& name)
|
|
{
|
|
ReportList *reports = CTX_wm_reports(_context);
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
if (!BPY_text_exec(_context, text, reports, false)) {
|
|
cerr << "\nError executing Python script from PythonInterpreter::interpretText" << endl;
|
|
cerr << "Name: " << name << endl;
|
|
cerr << "Errors: " << endl;
|
|
BKE_reports_print(reports, RPT_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
BKE_reports_clear(reports);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void reset()
|
|
{
|
|
// nothing to do
|
|
}
|
|
|
|
private:
|
|
bContext *_context;
|
|
Main _freestyle_bmain;
|
|
};
|
|
|
|
} /* namespace Freestyle */
|
|
|
|
#endif // __FREESTYLE_PYTHON_INTERPRETER_H__
|