blender
/
blender
126
393
Fork 565
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fluid: Cleaned up functions that deal with Python objects (C-API) 

This commit belongs to T72894. It's related to (my) previous commits on pointer exchanges (today + yesterday). It cleans up the functions by describing their usage in the comments, adds additional nullptr checks, and fixes the reference count responsibilities of newly created PyObjects.
This commit is contained in:
Sebastián Barschkis 2020-01-22 18:31:19 +01:00
parent be7571a5e4
commit ca7bd3f1c3
Notes: blender-bot 2023-02-13 23:47:42 +01:00 
Referenced by issue #72894, Mantaflow: several crashes due to null pointers.
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
intern/mantaflow/intern/MANTA_main.cpp
View File

@ -2008,8 +2008,13 @@ void MANTA::exportLiquidScript(FluidModifierData *mmd)
myfile.close();
}
/* Call Mantaflow python functions through this function. Use isAttribute for object attributes,
* e.g. s.cfl (here 's' is varname, 'cfl' functionName, and isAttribute true) */
/* Call Mantaflow Python functions through this function. Use isAttribute for object attributes,
* e.g. s.cfl (here 's' is varname, 'cfl' functionName, and isAttribute true) or
* grid.getDataPointer (here 's' is varname, 'getDataPointer' functionName, and isAttribute
* false)
*
* Important! Return value: New reference or nullptr
* Caller of this function needs to handle reference count of returned object. */
static PyObject *callPythonFunction(std::string varName,
std::string functionName,
bool isAttribute = false)
@ -2051,8 +2056,13 @@ static PyObject *callPythonFunction(std::string varName,
return (!isAttribute) ? returnedValue : func;
}
/* Argument of this function may be a nullptr.
* If it's not function will handle the reference count decrement of that argument. */
static void *pyObjectToPointer(PyObject *inputObject)
{
if (!inputObject)
return nullptr;
PyGILState_STATE gilstate = PyGILState_Ensure();
PyObject *encoded = PyUnicode_AsUTF8String(inputObject);
@ -2066,21 +2076,43 @@ static void *pyObjectToPointer(PyObject *inputObject)
in >> dataPointer;
Py_DECREF(encoded);
PyGILState_Release(gilstate);
PyGILState_Release(gilstate);
return dataPointer;
}
/* Argument of this function may be a nullptr.
* If it's not function will handle the reference count decrement of that argument. */
static double pyObjectToDouble(PyObject *inputObject)
{
// Cannot use PyFloat_AsDouble() since its error check crashes - likely because of Real (aka
// float) type in Mantaflow
return PyFloat_AS_DOUBLE(inputObject);
if (!inputObject)
return 0.0;
PyGILState_STATE gilstate = PyGILState_Ensure();
/* Cannot use PyFloat_AsDouble() since its error check crashes.
* Likely because of typedef 'Real' for 'float' types in Mantaflow. */
double result = PyFloat_AS_DOUBLE(inputObject);
Py_DECREF(inputObject);
PyGILState_Release(gilstate);
return result;
}
/* Argument of this function may be a nullptr.
* If it's not function will handle the reference count decrement of that argument. */
static long pyObjectToLong(PyObject *inputObject)
{
return PyLong_AsLong(inputObject);
if (!inputObject)
return 0;
PyGILState_STATE gilstate = PyGILState_Ensure();
long result = PyLong_AsLong(inputObject);
Py_DECREF(inputObject);
PyGILState_Release(gilstate);
return result;
}
int MANTA::getFrame()
@ -2104,7 +2136,7 @@ float MANTA::getTimestep()
std::string id = std::to_string(mCurrentID);
std::string solver = "s" + id;
return pyObjectToDouble(callPythonFunction(solver, func, true));
return (float)pyObjectToDouble(callPythonFunction(solver, func, true));
}
bool MANTA::needsRealloc(FluidModifierData *mmd)