bt2: some more .h -> .hpp
authorSimon Marchi <simon.marchi@efficios.com>
Wed, 6 Nov 2024 05:19:51 +0000 (00:19 -0500)
committerSimon Marchi <simon.marchi@efficios.com>
Thu, 7 Nov 2024 21:03:40 +0000 (16:03 -0500)
These files were forgotten in df4b0828816d ("bt2: rename .i.h ->
.i.hpp").

Change-Id: I0a50fbfde8f5c0de66eb43240337f2fcf0f02fbe
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/13506
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
src/bindings/python/bt2/Makefile.am
src/bindings/python/bt2/bt2/native_bt.i
src/bindings/python/bt2/bt2/native_bt_bt2_objects.h [deleted file]
src/bindings/python/bt2/bt2/native_bt_bt2_objects.hpp [new file with mode: 0644]
src/bindings/python/bt2/bt2/native_bt_log_and_append_error.h [deleted file]
src/bindings/python/bt2/bt2/native_bt_log_and_append_error.hpp [new file with mode: 0644]

index e1a43da148916507296bbb50f1605107b00902c9..d0c7369d87f1939cbf683076d4741cf57fd8aeb0 100644 (file)
@@ -13,7 +13,7 @@ SWIG_INTERFACE_FILES =                                        \
        bt2/native_bt.i                                 \
        bt2/native_bt_autodisc.i                        \
        bt2/native_bt_autodisc.i.hpp                    \
-       bt2/native_bt_bt2_objects.h                     \
+       bt2/native_bt_bt2_objects.hpp                   \
        bt2/native_bt_clock_class.i                     \
        bt2/native_bt_clock_snapshot.i                  \
        bt2/native_bt_component.i                       \
@@ -31,7 +31,7 @@ SWIG_INTERFACE_FILES =                                        \
        bt2/native_bt_graph.i.hpp                       \
        bt2/native_bt_integer_range_set.i               \
        bt2/native_bt_interrupter.i                     \
-       bt2/native_bt_log_and_append_error.h            \
+       bt2/native_bt_log_and_append_error.hpp          \
        bt2/native_bt_logging.i                         \
        bt2/native_bt_message.i                         \
        bt2/native_bt_message_iterator.i                \
index f2b0bebb9660fcc3bff49059c022588c1cdf40a7..e55b9db8b6efe240f8f5a68b51fba51bdffec27f 100644 (file)
@@ -32,8 +32,8 @@
 #include "py-common/py-common.h"
 
 /* Used by some interface files */
-#include "native_bt_bt2_objects.h"
-#include "native_bt_log_and_append_error.h"
+#include "native_bt_bt2_objects.hpp"
+#include "native_bt_log_and_append_error.hpp"
 %}
 
 typedef int bt_bool;
diff --git a/src/bindings/python/bt2/bt2/native_bt_bt2_objects.h b/src/bindings/python/bt2/bt2/native_bt_bt2_objects.h
deleted file mode 100644 (file)
index 9a47849..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
- */
-
-#ifndef BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_BT2_OBJECTS_H
-#define BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_BT2_OBJECTS_H
-
-#include "logging/comp-logging.h"
-
-/*
- * Useful Python objects.
- */
-
-static PyObject *py_mod_bt2 = NULL;
-static PyObject *py_mod_bt2_exc_error_type = NULL;
-static PyObject *py_mod_bt2_exc_memory_error = NULL;
-static PyObject *py_mod_bt2_exc_try_again_type = NULL;
-static PyObject *py_mod_bt2_exc_stop_type = NULL;
-static PyObject *py_mod_bt2_exc_unknown_object_type = NULL;
-
-static
-void bt_bt2_init_from_bt2(void)
-{
-       /*
-        * This is called once the bt2 package is loaded.
-        *
-        * Those modules and functions are needed while the package is
-        * used. Loading them here is safe because we know the bt2
-        * package is imported, and we know that the user cannot use the
-        * code here without importing bt2 first.
-        */
-       py_mod_bt2 = PyImport_ImportModule("bt2");
-       BT_ASSERT(py_mod_bt2);
-       py_mod_bt2_exc_error_type =
-               PyObject_GetAttrString(py_mod_bt2, "_Error");
-       BT_ASSERT(py_mod_bt2_exc_error_type);
-       py_mod_bt2_exc_memory_error =
-               PyObject_GetAttrString(py_mod_bt2, "_MemoryError");
-       BT_ASSERT(py_mod_bt2_exc_memory_error);
-       py_mod_bt2_exc_try_again_type =
-               PyObject_GetAttrString(py_mod_bt2, "TryAgain");
-       BT_ASSERT(py_mod_bt2_exc_try_again_type);
-       py_mod_bt2_exc_stop_type =
-               PyObject_GetAttrString(py_mod_bt2, "Stop");
-       BT_ASSERT(py_mod_bt2_exc_stop_type);
-       py_mod_bt2_exc_unknown_object_type =
-               PyObject_GetAttrString(py_mod_bt2, "UnknownObject");
-       BT_ASSERT(py_mod_bt2_exc_unknown_object_type);
-}
-
-static
-void bt_bt2_exit_handler(void)
-{
-       /*
-        * This is an exit handler (set by the bt2 package).
-        *
-        * We only give back the references that we took in
-        * bt_bt2_init_from_bt2() here. The global variables continue
-        * to exist for the code of this file, but they are now borrowed
-        * references. If this code is executed, it means that somehow
-        * the modules are still loaded, so it should be safe to use
-        * them even without a strong reference.
-        *
-        * We cannot do this in the library's destructor because it
-        * gets executed once Python is already finalized.
-        */
-       Py_XDECREF(py_mod_bt2);
-       Py_XDECREF(py_mod_bt2_exc_error_type);
-       Py_XDECREF(py_mod_bt2_exc_try_again_type);
-       Py_XDECREF(py_mod_bt2_exc_stop_type);
-       Py_XDECREF(py_mod_bt2_exc_unknown_object_type);
-}
-
-#endif /* BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_BT2_OBJECTS_H */
diff --git a/src/bindings/python/bt2/bt2/native_bt_bt2_objects.hpp b/src/bindings/python/bt2/bt2/native_bt_bt2_objects.hpp
new file mode 100644 (file)
index 0000000..7c4ebe7
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
+ */
+
+#ifndef BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_BT2_OBJECTS_H
+#define BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_BT2_OBJECTS_H
+
+#include "logging/comp-logging.h"
+
+/*
+ * Useful Python objects.
+ */
+
+static PyObject *py_mod_bt2 = NULL;
+static PyObject *py_mod_bt2_exc_error_type = NULL;
+static PyObject *py_mod_bt2_exc_memory_error = NULL;
+static PyObject *py_mod_bt2_exc_try_again_type = NULL;
+static PyObject *py_mod_bt2_exc_stop_type = NULL;
+static PyObject *py_mod_bt2_exc_unknown_object_type = NULL;
+
+static void bt_bt2_init_from_bt2(void)
+{
+    /*
+     * This is called once the bt2 package is loaded.
+     *
+     * Those modules and functions are needed while the package is
+     * used. Loading them here is safe because we know the bt2
+     * package is imported, and we know that the user cannot use the
+     * code here without importing bt2 first.
+     */
+    py_mod_bt2 = PyImport_ImportModule("bt2");
+    BT_ASSERT(py_mod_bt2);
+    py_mod_bt2_exc_error_type = PyObject_GetAttrString(py_mod_bt2, "_Error");
+    BT_ASSERT(py_mod_bt2_exc_error_type);
+    py_mod_bt2_exc_memory_error = PyObject_GetAttrString(py_mod_bt2, "_MemoryError");
+    BT_ASSERT(py_mod_bt2_exc_memory_error);
+    py_mod_bt2_exc_try_again_type = PyObject_GetAttrString(py_mod_bt2, "TryAgain");
+    BT_ASSERT(py_mod_bt2_exc_try_again_type);
+    py_mod_bt2_exc_stop_type = PyObject_GetAttrString(py_mod_bt2, "Stop");
+    BT_ASSERT(py_mod_bt2_exc_stop_type);
+    py_mod_bt2_exc_unknown_object_type = PyObject_GetAttrString(py_mod_bt2, "UnknownObject");
+    BT_ASSERT(py_mod_bt2_exc_unknown_object_type);
+}
+
+static void bt_bt2_exit_handler(void)
+{
+    /*
+     * This is an exit handler (set by the bt2 package).
+     *
+     * We only give back the references that we took in
+     * bt_bt2_init_from_bt2() here. The global variables continue
+     * to exist for the code of this file, but they are now borrowed
+     * references. If this code is executed, it means that somehow
+     * the modules are still loaded, so it should be safe to use
+     * them even without a strong reference.
+     *
+     * We cannot do this in the library's destructor because it
+     * gets executed once Python is already finalized.
+     */
+    Py_XDECREF(py_mod_bt2);
+    Py_XDECREF(py_mod_bt2_exc_error_type);
+    Py_XDECREF(py_mod_bt2_exc_try_again_type);
+    Py_XDECREF(py_mod_bt2_exc_stop_type);
+    Py_XDECREF(py_mod_bt2_exc_unknown_object_type);
+}
+
+#endif /* BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_BT2_OBJECTS_H */
diff --git a/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.h b/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.h
deleted file mode 100644 (file)
index 2205772..0000000
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * SPDX-License-Identifier: MIT
- *
- * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
- */
-
-#ifndef BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_LOG_AND_APPEND_ERROR_H
-#define BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_LOG_AND_APPEND_ERROR_H
-
-#include <stdbool.h>
-
-#include "logging/comp-logging.h"
-
-static
-void restore_current_thread_error_and_append_exception_chain_recursive(
-               int active_log_level, PyObject *py_exc_value,
-               bt_self_component_class *self_component_class,
-               bt_self_component *self_component,
-               bt_self_message_iterator *self_message_iterator,
-               const char *module_name)
-{
-       PyObject *py_exc_cause_value;
-       PyObject *py_exc_type = NULL;
-       PyObject *py_exc_tb = NULL;
-       PyObject *py_bt_error_msg = NULL;
-       GString *gstr = NULL;
-
-       /* If this exception has a (Python) cause, handle that one first. */
-       py_exc_cause_value = PyException_GetCause(py_exc_value);
-       if (py_exc_cause_value) {
-               restore_current_thread_error_and_append_exception_chain_recursive(
-                       active_log_level, py_exc_cause_value,
-                       self_component_class, self_component,
-                       self_message_iterator, module_name);
-       }
-
-       py_exc_tb = PyException_GetTraceback(py_exc_value);
-
-       if (PyErr_GivenExceptionMatches(py_exc_value, py_mod_bt2_exc_error_type)) {
-               /*
-                * If the raised exception is a bt2._Error, restore the wrapped
-                * error.
-                */
-               PyObject *py_error_swig_ptr;
-               const bt_error *error;
-               int ret;
-
-               /*
-                * We never raise a bt2._Error with a (Python) cause: it should
-                * be the end of the chain.
-                */
-               BT_ASSERT(!py_exc_cause_value);
-
-               /*
-                * We steal the error object from the exception, to move
-                * it back as the current thread's error.
-                */
-               py_error_swig_ptr = PyObject_GetAttrString(py_exc_value, "_ptr");
-               BT_ASSERT(py_error_swig_ptr);
-
-               ret = PyObject_SetAttrString(py_exc_value, "_ptr", Py_None);
-               BT_ASSERT(ret == 0);
-
-               ret = SWIG_ConvertPtr(py_error_swig_ptr, (void **) &error,
-                       SWIGTYPE_p_bt_error, 0);
-               BT_ASSERT(ret == 0);
-
-               Py_DECREF(py_error_swig_ptr);
-
-               BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(error);
-
-               /*
-                * Append a cause with just the traceback and message, not the
-                * full str() of the bt2._Error.  We don't want the causes of
-                * this bt2._Error to be included in the cause we create.
-                */
-               gstr = bt_py_common_format_tb(py_exc_tb, active_log_level);
-               if (!gstr) {
-                       /* bt_py_common_format_tb has already warned. */
-                       goto end;
-               }
-
-               g_string_prepend(gstr, "Traceback (most recent call last):\n");
-
-               py_bt_error_msg = PyObject_GetAttrString(py_exc_value, "_msg");
-               BT_ASSERT(py_bt_error_msg);
-
-               g_string_append_printf(gstr, "\nbt2._Error: %s",
-                       PyUnicode_AsUTF8(py_bt_error_msg));
-       } else {
-               py_exc_type = PyObject_Type(py_exc_value);
-
-               gstr = bt_py_common_format_exception(py_exc_type, py_exc_value,
-                               py_exc_tb, active_log_level, false);
-               if (!gstr) {
-                       /* bt_py_common_format_exception has already warned. */
-                       goto end;
-               }
-       }
-
-       if (self_component_class) {
-               BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT_CLASS(
-                       self_component_class, "%s", gstr->str);
-       } else if (self_component) {
-               BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT(
-                       self_component, "%s", gstr->str);
-       } else if (self_message_iterator) {
-               BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_MESSAGE_ITERATOR(
-                       self_message_iterator, "%s", gstr->str);
-       } else {
-               BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(
-                       module_name, "%s", gstr->str);
-       }
-
-end:
-       if (gstr) {
-               g_string_free(gstr, TRUE);
-       }
-
-       Py_XDECREF(py_exc_cause_value);
-       Py_XDECREF(py_exc_type);
-       Py_XDECREF(py_exc_tb);
-       Py_XDECREF(py_bt_error_msg);
-}
-
-/*
- * If you have the following code:
- *
- * try:
- *     try:
- *         something_that_raises_bt2_error()
- *     except bt2._Error as e1:
- *         raise ValueError from e1
- * except ValueError as e2:
- *     raise TypeError from e2
- *
- * We will have the following exception chain:
- *
- *     TypeError -> ValueError -> bt2._Error
- *
- * Where the TypeError is the current exception (obtained from PyErr_Fetch).
- *
- * The bt2._Error contains a `struct bt_error *` that used to be the current
- * thread's error, at the moment the exception was raised.
- *
- * This function gets to the bt2._Error and restores the wrapped
- * `struct bt_error *` as the current thread's error.
- *
- * Then, for each exception in the chain, starting with the oldest one, it adds
- * an error cause to the current thread's error.
- */
-static
-void restore_bt_error_and_append_current_exception_chain(
-               int active_log_level,
-               bt_self_component_class *self_component_class,
-               bt_self_component *self_component,
-               bt_self_message_iterator *self_message_iterator,
-               const char *module_name)
-{
-       BT_ASSERT(PyErr_Occurred());
-
-       /* Used to access and restore the current exception. */
-       PyObject *py_exc_type;
-       PyObject *py_exc_value;
-       PyObject *py_exc_tb;
-
-       /* Fetch and normalize the Python exception. */
-       PyErr_Fetch(&py_exc_type, &py_exc_value, &py_exc_tb);
-       PyErr_NormalizeException(&py_exc_type, &py_exc_value, &py_exc_tb);
-       BT_ASSERT(py_exc_type);
-       BT_ASSERT(py_exc_value);
-       BT_ASSERT(py_exc_tb);
-
-       /*
-        * Set the exception's traceback so it's possible to get it using
-        * PyException_GetTraceback in
-        * restore_current_thread_error_and_append_exception_chain_recursive.
-        */
-       PyException_SetTraceback(py_exc_value, py_exc_tb);
-
-       restore_current_thread_error_and_append_exception_chain_recursive(
-               active_log_level, py_exc_value, self_component_class,
-               self_component, self_message_iterator, module_name);
-
-       PyErr_Restore(py_exc_type, py_exc_value, py_exc_tb);
-}
-
-static inline
-void log_exception_and_maybe_append_cause(
-               int func_log_level,
-               int active_log_level,
-               bool append_error,
-               bt_self_component_class *self_component_class,
-               bt_self_component *self_component,
-               bt_self_message_iterator *self_message_iterator,
-               const char *module_name)
-{
-       GString *gstr;
-
-       BT_ASSERT(PyErr_Occurred());
-       gstr = bt_py_common_format_current_exception(active_log_level);
-       if (!gstr) {
-               /* bt_py_common_format_current_exception() logs errors */
-               goto end;
-       }
-
-       BT_COMP_LOG_CUR_LVL(func_log_level, active_log_level, self_component,
-               "%s", gstr->str);
-
-       if (append_error) {
-               restore_bt_error_and_append_current_exception_chain(
-                       active_log_level, self_component_class, self_component,
-                       self_message_iterator, module_name);
-
-       }
-
-end:
-       if (gstr) {
-               g_string_free(gstr, TRUE);
-       }
-}
-
-static
-bt_logging_level get_self_component_log_level(bt_self_component *self_comp)
-{
-       return bt_component_get_logging_level(
-               bt_self_component_as_component(self_comp));
-}
-
-static
-bt_logging_level get_self_message_iterator_log_level(
-               bt_self_message_iterator *self_msg_iter)
-{
-       bt_self_component *self_comp =
-               bt_self_message_iterator_borrow_component(self_msg_iter);
-
-       return get_self_component_log_level(self_comp);
-}
-
-static inline
-void loge_exception_append_cause_clear(const char *module_name, int active_log_level)
-{
-       log_exception_and_maybe_append_cause(BT_LOG_ERROR, active_log_level,
-               true, NULL, NULL, NULL, module_name);
-       PyErr_Clear();
-}
-
-static inline
-void logw_exception_clear(int active_log_level)
-{
-       log_exception_and_maybe_append_cause(BT_LOG_WARNING, active_log_level,
-               false, NULL, NULL, NULL, NULL);
-       PyErr_Clear();
-}
-
-#endif /* BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_LOG_AND_APPEND_ERROR_H */
diff --git a/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.hpp b/src/bindings/python/bt2/bt2/native_bt_log_and_append_error.hpp
new file mode 100644 (file)
index 0000000..86f28db
--- /dev/null
@@ -0,0 +1,231 @@
+/*
+ * SPDX-License-Identifier: MIT
+ *
+ * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
+ */
+
+#ifndef BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_LOG_AND_APPEND_ERROR_H
+#define BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_LOG_AND_APPEND_ERROR_H
+
+#include <stdbool.h>
+
+#include "logging/comp-logging.h"
+
+static void restore_current_thread_error_and_append_exception_chain_recursive(
+    int active_log_level, PyObject *py_exc_value, bt_self_component_class *self_component_class,
+    bt_self_component *self_component, bt_self_message_iterator *self_message_iterator,
+    const char *module_name)
+{
+    PyObject *py_exc_cause_value;
+    PyObject *py_exc_type = NULL;
+    PyObject *py_exc_tb = NULL;
+    PyObject *py_bt_error_msg = NULL;
+    GString *gstr = NULL;
+
+    /* If this exception has a (Python) cause, handle that one first. */
+    py_exc_cause_value = PyException_GetCause(py_exc_value);
+    if (py_exc_cause_value) {
+        restore_current_thread_error_and_append_exception_chain_recursive(
+            active_log_level, py_exc_cause_value, self_component_class, self_component,
+            self_message_iterator, module_name);
+    }
+
+    py_exc_tb = PyException_GetTraceback(py_exc_value);
+
+    if (PyErr_GivenExceptionMatches(py_exc_value, py_mod_bt2_exc_error_type)) {
+        /*
+         * If the raised exception is a bt2._Error, restore the wrapped
+         * error.
+         */
+        PyObject *py_error_swig_ptr;
+        const bt_error *error;
+        int ret;
+
+        /*
+         * We never raise a bt2._Error with a (Python) cause: it should
+         * be the end of the chain.
+         */
+        BT_ASSERT(!py_exc_cause_value);
+
+        /*
+         * We steal the error object from the exception, to move
+         * it back as the current thread's error.
+         */
+        py_error_swig_ptr = PyObject_GetAttrString(py_exc_value, "_ptr");
+        BT_ASSERT(py_error_swig_ptr);
+
+        ret = PyObject_SetAttrString(py_exc_value, "_ptr", Py_None);
+        BT_ASSERT(ret == 0);
+
+        ret = SWIG_ConvertPtr(py_error_swig_ptr, (void **) &error, SWIGTYPE_p_bt_error, 0);
+        BT_ASSERT(ret == 0);
+
+        Py_DECREF(py_error_swig_ptr);
+
+        BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(error);
+
+        /*
+         * Append a cause with just the traceback and message, not the
+         * full str() of the bt2._Error.  We don't want the causes of
+         * this bt2._Error to be included in the cause we create.
+         */
+        gstr = bt_py_common_format_tb(py_exc_tb, active_log_level);
+        if (!gstr) {
+            /* bt_py_common_format_tb has already warned. */
+            goto end;
+        }
+
+        g_string_prepend(gstr, "Traceback (most recent call last):\n");
+
+        py_bt_error_msg = PyObject_GetAttrString(py_exc_value, "_msg");
+        BT_ASSERT(py_bt_error_msg);
+
+        g_string_append_printf(gstr, "\nbt2._Error: %s", PyUnicode_AsUTF8(py_bt_error_msg));
+    } else {
+        py_exc_type = PyObject_Type(py_exc_value);
+
+        gstr = bt_py_common_format_exception(py_exc_type, py_exc_value, py_exc_tb, active_log_level,
+                                             false);
+        if (!gstr) {
+            /* bt_py_common_format_exception has already warned. */
+            goto end;
+        }
+    }
+
+    if (self_component_class) {
+        BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT_CLASS(self_component_class, "%s",
+                                                                  gstr->str);
+    } else if (self_component) {
+        BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT(self_component, "%s", gstr->str);
+    } else if (self_message_iterator) {
+        BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_MESSAGE_ITERATOR(self_message_iterator, "%s",
+                                                                   gstr->str);
+    } else {
+        BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name, "%s", gstr->str);
+    }
+
+end:
+    if (gstr) {
+        g_string_free(gstr, TRUE);
+    }
+
+    Py_XDECREF(py_exc_cause_value);
+    Py_XDECREF(py_exc_type);
+    Py_XDECREF(py_exc_tb);
+    Py_XDECREF(py_bt_error_msg);
+}
+
+/*
+ * If you have the following code:
+ *
+ * try:
+ *     try:
+ *         something_that_raises_bt2_error()
+ *     except bt2._Error as e1:
+ *         raise ValueError from e1
+ * except ValueError as e2:
+ *     raise TypeError from e2
+ *
+ * We will have the following exception chain:
+ *
+ *     TypeError -> ValueError -> bt2._Error
+ *
+ * Where the TypeError is the current exception (obtained from PyErr_Fetch).
+ *
+ * The bt2._Error contains a `struct bt_error *` that used to be the current
+ * thread's error, at the moment the exception was raised.
+ *
+ * This function gets to the bt2._Error and restores the wrapped
+ * `struct bt_error *` as the current thread's error.
+ *
+ * Then, for each exception in the chain, starting with the oldest one, it adds
+ * an error cause to the current thread's error.
+ */
+static void restore_bt_error_and_append_current_exception_chain(
+    int active_log_level, bt_self_component_class *self_component_class,
+    bt_self_component *self_component, bt_self_message_iterator *self_message_iterator,
+    const char *module_name)
+{
+    BT_ASSERT(PyErr_Occurred());
+
+    /* Used to access and restore the current exception. */
+    PyObject *py_exc_type;
+    PyObject *py_exc_value;
+    PyObject *py_exc_tb;
+
+    /* Fetch and normalize the Python exception. */
+    PyErr_Fetch(&py_exc_type, &py_exc_value, &py_exc_tb);
+    PyErr_NormalizeException(&py_exc_type, &py_exc_value, &py_exc_tb);
+    BT_ASSERT(py_exc_type);
+    BT_ASSERT(py_exc_value);
+    BT_ASSERT(py_exc_tb);
+
+    /*
+     * Set the exception's traceback so it's possible to get it using
+     * PyException_GetTraceback in
+     * restore_current_thread_error_and_append_exception_chain_recursive.
+     */
+    PyException_SetTraceback(py_exc_value, py_exc_tb);
+
+    restore_current_thread_error_and_append_exception_chain_recursive(
+        active_log_level, py_exc_value, self_component_class, self_component, self_message_iterator,
+        module_name);
+
+    PyErr_Restore(py_exc_type, py_exc_value, py_exc_tb);
+}
+
+static inline void log_exception_and_maybe_append_cause(
+    int func_log_level, int active_log_level, bool append_error,
+    bt_self_component_class *self_component_class, bt_self_component *self_component,
+    bt_self_message_iterator *self_message_iterator, const char *module_name)
+{
+    GString *gstr;
+
+    BT_ASSERT(PyErr_Occurred());
+    gstr = bt_py_common_format_current_exception(active_log_level);
+    if (!gstr) {
+        /* bt_py_common_format_current_exception() logs errors */
+        goto end;
+    }
+
+    BT_COMP_LOG_CUR_LVL(func_log_level, active_log_level, self_component, "%s", gstr->str);
+
+    if (append_error) {
+        restore_bt_error_and_append_current_exception_chain(active_log_level, self_component_class,
+                                                            self_component, self_message_iterator,
+                                                            module_name);
+    }
+
+end:
+    if (gstr) {
+        g_string_free(gstr, TRUE);
+    }
+}
+
+static bt_logging_level get_self_component_log_level(bt_self_component *self_comp)
+{
+    return bt_component_get_logging_level(bt_self_component_as_component(self_comp));
+}
+
+static bt_logging_level get_self_message_iterator_log_level(bt_self_message_iterator *self_msg_iter)
+{
+    bt_self_component *self_comp = bt_self_message_iterator_borrow_component(self_msg_iter);
+
+    return get_self_component_log_level(self_comp);
+}
+
+static inline void loge_exception_append_cause_clear(const char *module_name, int active_log_level)
+{
+    log_exception_and_maybe_append_cause(BT_LOG_ERROR, active_log_level, true, NULL, NULL, NULL,
+                                         module_name);
+    PyErr_Clear();
+}
+
+static inline void logw_exception_clear(int active_log_level)
+{
+    log_exception_and_maybe_append_cause(BT_LOG_WARNING, active_log_level, false, NULL, NULL, NULL,
+                                         NULL);
+    PyErr_Clear();
+}
+
+#endif /* BABELTRACE_BINDINGS_PYTHON_BT2_BT2_NATIVE_BT_LOG_AND_APPEND_ERROR_H */
This page took 0.033729 seconds and 4 git commands to generate.