X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Futils.py;h=4c0c2d9103137698f4a11b04ac225c4f20ff3991;hb=d24d56638469189904fb6ddbb3c725817b3e9417;hp=4329d93fa17565f31dcf4aaec06e33a5e1132c36;hpb=e874da19b9fd96ac87f70595e0463f8e03af29af;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py
index 4329d93f..4c0c2d91 100644
--- a/src/bindings/python/bt2/bt2/utils.py
+++ b/src/bindings/python/bt2/bt2/utils.py
@@ -22,6 +22,7 @@
 
 import bt2
 import bt2.logging
+from bt2 import native_bt
 
 
 def _check_bool(o):
@@ -118,11 +119,6 @@ def _raise_bt2_error(msg):
         raise bt2.Error(msg)
 
 
-def _handle_ret(ret, msg=None):
-    if int(ret) < 0:
-        _raise_bt2_error(msg)
-
-
 def _handle_ptr(ptr, msg=None):
     if ptr is None:
         _raise_bt2_error(msg)
@@ -132,7 +128,7 @@ def _check_log_level(log_level):
     _check_int(log_level)
 
     log_levels = (
-        bt2.logging.LoggingLevel.VERBOSE,
+        bt2.logging.LoggingLevel.TRACE,
         bt2.logging.LoggingLevel.DEBUG,
         bt2.logging.LoggingLevel.INFO,
         bt2.logging.LoggingLevel.WARN,
@@ -143,3 +139,57 @@ def _check_log_level(log_level):
 
     if log_level not in log_levels:
         raise ValueError("'{}' is not a valid logging level".format(log_level))
+
+
+def _handle_func_status(status, msg=None):
+    if status == native_bt.__BT_FUNC_STATUS_OK:
+        # no error
+        return
+
+    if status == native_bt.__BT_FUNC_STATUS_ERROR or status == native_bt.__BT_FUNC_STATUS_MEMORY_ERROR:
+        if msg is None:
+            raise bt2.Error
+        else:
+            raise bt2.Error(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_END:
+        if msg is None:
+            raise bt2.Stop
+        else:
+            raise bt2.Stop(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_AGAIN:
+        if msg is None:
+            raise bt2.TryAgain
+        else:
+            raise bt2.TryAgain(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_CANCELED:
+        if msg is None:
+            raise bt2.Canceled
+        else:
+            raise bt2.Canceled(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_LOADING_ERROR:
+        if msg is None:
+            raise bt2.LoadingError
+        else:
+            raise bt2.LoadingError(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW:
+        if msg is None:
+            raise bt2.OverflowError
+        else:
+            raise bt2.OverflowError(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_INVALID_OBJECT:
+        if msg is None:
+            raise bt2.InvalidObject
+        else:
+            raise bt2.InvalidObject(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_INVALID_PARAMS:
+        if msg is None:
+            raise bt2.InvalidParams
+        else:
+            raise bt2.InvalidParams(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_UNSUPPORTED:
+        if msg is None:
+            raise bt2.Unsupported
+        else:
+            raise bt2.Unsupported(msg)
+    else:
+        assert False