Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
dynamic-graph-python
Commits
c55d8352
Commit
c55d8352
authored
Feb 27, 2014
by
Francois Keith
Browse files
Free python objects in the interpreter when possible.
The goal is to reduce the memory consumption.
parent
9b39ddf9
Changes
1
Show whitespace changes
Inline
Side-by-side
src/interpreter.cc
View file @
c55d8352
...
@@ -61,6 +61,8 @@ bool HandleErr(std::string & err,
...
@@ -61,6 +61,8 @@ bool HandleErr(std::string & err,
PyErr_Fetch
(
&
ptype
,
&
pvalue
,
&
ptraceback
);
PyErr_Fetch
(
&
ptype
,
&
pvalue
,
&
ptraceback
);
if
(
ptraceback
==
NULL
)
{
if
(
ptraceback
==
NULL
)
{
ptraceback
=
Py_None
;
ptraceback
=
Py_None
;
// increase the Py_None count, to avoid a crash at the tuple destruction
Py_INCREF
(
ptraceback
);
}
}
PyObject
*
args
=
PyTuple_New
(
3
);
PyObject
*
args
=
PyTuple_New
(
3
);
PyTuple_SET_ITEM
(
args
,
0
,
ptype
);
PyTuple_SET_ITEM
(
args
,
0
,
ptype
);
...
@@ -73,10 +75,13 @@ bool HandleErr(std::string & err,
...
@@ -73,10 +75,13 @@ bool HandleErr(std::string & err,
for
(
Py_ssize_t
i
=
0
;
i
<
size
;
++
i
)
for
(
Py_ssize_t
i
=
0
;
i
<
size
;
++
i
)
stringRes
+=
std
::
string
stringRes
+=
std
::
string
(
PyString_AsString
(
PyList_GET_ITEM
(
pyerr
,
i
)));
(
PyString_AsString
(
PyList_GET_ITEM
(
pyerr
,
i
)));
Py_DecRef
(
pyerr
);
pyerr
=
PyString_FromString
(
stringRes
.
c_str
());
pyerr
=
PyString_FromString
(
stringRes
.
c_str
());
err
=
PyString_AsString
(
pyerr
);
err
=
PyString_AsString
(
pyerr
);
dgDEBUG
(
15
)
<<
"err: "
<<
err
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"err: "
<<
err
<<
std
::
endl
;
Py_DecRef
(
pyerr
);
// Here if there is a syntax error and
// Here if there is a syntax error and
// and the interpreter input is set to Py_eval_input,
// and the interpreter input is set to Py_eval_input,
...
@@ -91,6 +96,8 @@ bool HandleErr(std::string & err,
...
@@ -91,6 +96,8 @@ bool HandleErr(std::string & err,
else
else
lres
=
true
;
lres
=
true
;
Py_CLEAR
(
args
);
PyErr_Clear
();
PyErr_Clear
();
}
else
{
}
else
{
dgDEBUG
(
15
)
<<
"no object generated but no error occured."
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"no object generated but no error occured."
<<
std
::
endl
;
...
@@ -106,6 +113,7 @@ bool HandleErr(std::string & err,
...
@@ -106,6 +113,7 @@ bool HandleErr(std::string & err,
{
dgDEBUG
(
15
)
<<
std
::
endl
;
}
{
dgDEBUG
(
15
)
<<
std
::
endl
;
}
else
{
dgDEBUG
(
15
)
<<
"No exception."
<<
std
::
endl
;
}
else
{
dgDEBUG
(
15
)
<<
"No exception."
<<
std
::
endl
;
}
dgDEBUGOUT
(
15
);
dgDEBUGOUT
(
15
);
Py_DecRef
(
stdout_obj
);
return
lres
;
return
lres
;
}
}
...
@@ -195,19 +203,22 @@ void Interpreter::python( const std::string& command, std::string& res,
...
@@ -195,19 +203,22 @@ void Interpreter::python( const std::string& command, std::string& res,
std
::
cout
<<
"Output:"
<<
out
<<
std
::
endl
;
std
::
cout
<<
"Output:"
<<
out
<<
std
::
endl
;
if
(
err
.
size
()
!=
0
)
if
(
err
.
size
()
!=
0
)
std
::
cout
<<
"Error:"
<<
err
<<
std
::
endl
;
std
::
cout
<<
"Error:"
<<
err
<<
std
::
endl
;
result
=
PyObject_Repr
(
result
);
PyObject
*
result
2
=
PyObject_Repr
(
result
);
// If python cannot build a string representation of result
// If python cannot build a string representation of result
// then results is equal to NULL. This will trigger a SEGV
// then results is equal to NULL. This will trigger a SEGV
if
(
result
!=
NULL
)
if
(
result
2
!=
NULL
)
{
{
dgDEBUG
(
15
)
<<
"For command :"
<<
command
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"For command :"
<<
command
<<
std
::
endl
;
res
=
PyString_AsString
(
result
);
res
=
PyString_AsString
(
result
2
);
dgDEBUG
(
15
)
<<
"Result is: "
<<
res
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"Result is: "
<<
res
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"Out is: "
<<
out
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"Out is: "
<<
out
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"Err is :"
<<
err
<<
std
::
endl
;
dgDEBUG
(
15
)
<<
"Err is :"
<<
err
<<
std
::
endl
;
}
}
else
else
{
dgDEBUG
(
15
)
<<
"Result is empty"
<<
std
::
endl
;
}
{
dgDEBUG
(
15
)
<<
"Result is empty"
<<
std
::
endl
;
}
Py_DecRef
(
stdout_obj
);
Py_DecRef
(
result2
);
Py_DecRef
(
result
);
return
;
return
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment