diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2009-07-02 17:04:23 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2009-07-02 17:04:23 +0000 |
| commit | d452c4bcefbbe7b2305a5ce26469e06d940a690c (patch) | |
| tree | 467cff4f090cda97377cf4c6dacbe93000870661 /gdb/python/python-objfile.c | |
| parent | e17c207e88cbd63e9dc9dce1f3458a8ced4ff566 (diff) | |
| download | gdb-d452c4bcefbbe7b2305a5ce26469e06d940a690c.zip gdb-d452c4bcefbbe7b2305a5ce26469e06d940a690c.tar.gz gdb-d452c4bcefbbe7b2305a5ce26469e06d940a690c.tar.bz2 | |
* python/python-internal.h (struct language_defn): Declare.
(python_gdbarch, python_language): Likewise.
(ensure_python_env): Add prototype.
(make_cleanup_py_restore_gil): Remove prototype.
* python/python.c: Include "arch-utils.h", "value.h" and "language.h".
(python_gdbarch, python_language): New global variables.
(struct python_env): New data type.
(ensure_python_env, restore_python_env): New functions.
(eval_python_from_control_command): Call ensure_python_env to
install current architecture and language.
(python_command, gdbpy_new_objfile): Likewise.
* python/python-cmd.c: Include "arch-utils.h" and "language.h".
(cmdpy_destroyer, cmdpy_function, cmdpy_completer): Call
ensure_python_env.
* python/python-type.c (clean_up_objfile_types): Likewise.
* python/python-objfile.c: Include "language.h".
(clean_up_objfile): Call ensure_python_env.
* python/python-prettyprint.c (apply_val_pretty_printer): Likewise.
(apply_varobj_pretty_printer): Do not call PyGILState_Ensure.
* varobj.c (varobj_ensure_python_env): New helper function.
(varobj_get_display_hint, update_dynamic_varobj_children,
install_default_visualizer, varobj_set_visualizer, free_variable,
value_get_print_value): Call it.
(value_get_print_value): Add varobj argument instead of pretty
printer argument. Update all callers.
* python/python-utils.c (py_gil_restore, make_cleanup_py_restore_gil):
Remove.
* value.h (internal_function_fn): Add GDBARCH and LANGUAGE argument.
(call_internal_function): Likewise.
* value.c (call_internal_function): Likewise. Pass to handler.
* eval.c (evaluate_subexp_standard): Update call.
* python/python-function.c: Include "language.h".
(fnpy_call): Add GDBARCH and LANGAUAGE arguments and call
make_cleanup_python_env.
* python/python-value.c (builtin_type_pyint, builtin_type_pyfloat,
builtin_type_pylong, builtin_type_pybool, builtin_type_pychar,
valpy_str): Use python_gdbarch and python_language instead of
current_gdbarch and current_language.
* python/python-type.c (typy_lookup_typename): Likewise.
Diffstat (limited to 'gdb/python/python-objfile.c')
| -rw-r--r-- | gdb/python/python-objfile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdb/python/python-objfile.c b/gdb/python/python-objfile.c index b70a006..a483d33 100644 --- a/gdb/python/python-objfile.c +++ b/gdb/python/python-objfile.c @@ -21,6 +21,7 @@ #include "python-internal.h" #include "charset.h" #include "objfiles.h" +#include "language.h" typedef struct { @@ -119,13 +120,13 @@ objfpy_set_printers (PyObject *o, PyObject *value, void *ignore) static void clean_up_objfile (struct objfile *objfile, void *datum) { - PyGILState_STATE state; + struct cleanup *cleanup; objfile_object *object = datum; - state = PyGILState_Ensure (); + cleanup = ensure_python_env (get_objfile_arch (objfile), current_language); object->objfile = NULL; Py_DECREF ((PyObject *) object); - PyGILState_Release (state); + do_cleanups (cleanup); } /* Return a borrowed reference to the Python object of type Objfile |