X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fpython-plugin-provider%2Fpython-plugin-provider.c;h=c1cd399e92da075676939a19e65170786ea99bd4;hb=118ae153da2f634b562674b14263a471b4c58de1;hp=a1324cff97ff7bbc8c4d259df24c97645687f39f;hpb=a0cdfce8f136c825d057433ee6cf5b42b3421d3a;p=babeltrace.git diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c index a1324cff..c1cd399e 100644 --- a/src/python-plugin-provider/python-plugin-provider.c +++ b/src/python-plugin-provider/python-plugin-provider.c @@ -25,16 +25,19 @@ */ #define BT_LOG_TAG "LIB/PLUGIN-PY" - #include "lib/logging.h" + +#include "python-plugin-provider.h" + #include "common/macros.h" #include "compat/compiler.h" -#include +#include #include "lib/plugin/plugin.h" #include -#include +#include #include "lib/graph/component-class.h" #include "py-common/py-common.h" +#include #include #include #include @@ -46,7 +49,7 @@ #define PYTHON_PLUGIN_FILE_EXT ".py" #define PYTHON_PLUGIN_FILE_EXT_LEN (sizeof(PYTHON_PLUGIN_FILE_EXT) - 1) -enum python_state { +static enum python_state { /* init_python() not called yet */ PYTHON_STATE_NOT_INITED, @@ -72,14 +75,14 @@ void append_python_traceback_error_cause(void) GString *exc = NULL; if (Py_IsInitialized() && PyErr_Occurred()) { - exc = bt_py_common_format_exception(BT_LOG_OUTPUT_LEVEL); + exc = bt_py_common_format_current_exception(BT_LOG_OUTPUT_LEVEL); if (!exc) { BT_LOGE_STR("Failed to format Python exception."); goto end; } (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN( - "Babeltrace library", "%s", exc->str); + BT_LIB_LOG_LIBBABELTRACE2_NAME, "%s", exc->str); } end: @@ -94,14 +97,14 @@ void log_python_traceback(int log_level) GString *exc = NULL; if (Py_IsInitialized() && PyErr_Occurred()) { - exc = bt_py_common_format_exception(BT_LOG_OUTPUT_LEVEL); + exc = bt_py_common_format_current_exception(BT_LOG_OUTPUT_LEVEL); if (!exc) { BT_LOGE_STR("Failed to format Python exception."); goto end; } BT_LOG_WRITE(log_level, BT_LOG_TAG, - "Exception occured: Python traceback:\n%s", exc->str); + "Exception occurred: Python traceback:\n%s", exc->str); } end: @@ -140,17 +143,19 @@ int init_python(void) ret = BT_FUNC_STATUS_ERROR; goto end; default: - abort(); + bt_common_abort(); } /* * User can disable Python plugin support with the - * BABELTRACE_DISABLE_PYTHON_PLUGINS environment variable set to - * 1. + * `LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS` environment variable + * set to 1. */ - dis_python_env = getenv("BABELTRACE_DISABLE_PYTHON_PLUGINS"); + dis_python_env = getenv("LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS"); if (dis_python_env && strcmp(dis_python_env, "1") == 0) { - BT_LOGI_STR("Python plugin support is disabled because `BABELTRACE_DISABLE_PYTHON_PLUGINS=1`."); + BT_LOGI_STR("Python plugin support is disabled because the " + "`LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS` environment " + "variable is set to `1`."); python_state = PYTHON_STATE_WONT_INITIALIZE; ret = BT_FUNC_STATUS_NOT_FOUND; goto end; @@ -250,7 +255,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot find `name` attribute in Python plugin info object: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot find `name` attribute in Python plugin info object: " @@ -268,7 +273,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot find `author` attribute in Python plugin info object: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot find `author` attribute in Python plugin info object: " @@ -286,7 +291,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot find `description` attribute in Python plugin info object: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot find `description` attribute in Python plugin info object: " @@ -304,7 +309,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot find `license` attribute in Python plugin info object: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot find `license` attribute in Python plugin info object: " @@ -322,7 +327,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot find `version` attribute in Python plugin info object: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot find `version` attribute in Python plugin info object: " @@ -341,7 +346,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot find `comp_class_addrs` attribute in Python plugin info object: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot find `comp_class_addrs` attribute in Python plugin info object: " @@ -360,7 +365,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot decode Python plugin name string: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot decode Python plugin name string: " @@ -377,7 +382,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Plugin name is not a string: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Plugin name is not a string: " @@ -396,7 +401,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot decode Python plugin author string: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot decode Python plugin author string: " @@ -416,7 +421,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot decode Python plugin description string: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot decode Python plugin description string: " @@ -436,7 +441,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot decode Python plugin license string: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot decode Python plugin license string: " @@ -477,7 +482,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Invalid Python plugin version format: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Invalid Python plugin version format: " @@ -502,7 +507,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, BT_LIB_LOGW_APPEND_CAUSE( "Cannot decode Python plugin version's extra string: " "py-plugin-info-addr=%p", plugin_info); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot decode Python plugin version's extra string: " @@ -558,7 +563,7 @@ int bt_plugin_from_python_plugin_info(PyObject *plugin_info, "Component class address is not an integer in Python plugin info object: " "py-plugin-info-addr=%p, index=%zu", plugin_info, i); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Component class address is not an integer in Python plugin info object: " @@ -637,7 +642,9 @@ int bt_plugin_python_create_all_from_file(const char *path, * Python plugins are disabled, so it's simply not * found. */ - BT_LOGI_STR("Python plugin support was disabled previously because `BABELTRACE_DISABLE_PYTHON_PLUGINS=1`."); + BT_LOGI_STR("Python plugin support was disabled previously " + "because the `LIBBABELTRACE2_DISABLE_PYTHON_PLUGINS` " + "environment variable is set to `1`."); status = BT_FUNC_STATUS_NOT_FOUND; goto error; } @@ -700,7 +707,7 @@ int bt_plugin_python_create_all_from_file(const char *path, append_python_traceback_error_cause(); BT_LIB_LOGW_APPEND_CAUSE( "Cannot load Python plugin: path=\"%s\"", path); - status = BT_FUNC_STATUS_LOADING_ERROR; + status = BT_FUNC_STATUS_ERROR; } else { BT_LIB_LOGW( "Cannot load Python plugin: path=\"%s\"", path);