Changeset 12752 in vbox for trunk/src

Timestamp:

Sep 25, 2008 3:47:20 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37076

Message:

implemented much better error reporting for Python bindings

Location:

trunk/src/libs/xpcom18a4/python

Files:

• __init__.py (modified) (2 diffs)
• nsError.py (modified) (1 diff)
• sample/shellcommon.py (modified) (6 diffs)
• src/ErrorUtils.cpp (modified) (3 diffs)

trunk/src/libs/xpcom18a4/python/__init__.py

@@ -54 +54 @@
         self.message = message
         exceptions.Exception.__init__(self, errno)
+        # we do this, as parent's constructor can override message
+        self.message = message
     def __str__(self):
         if not hr_map:
@@ -65 +67 @@
             if message is None:
                 message = ""
-        return "%d (%s)" % (self.errno, message)
+        return "0x%x (%s)" % (self.errno & 0xFFFFFFFF, message)
 
 # An alias for Exception - allows code to say "from xpcom import COMException"

trunk/src/libs/xpcom18a4/python/nsError.py

@@ -58 +58 @@
 NS_ERROR_MODULE_XPCONNECT = 18
 NS_ERROR_MODULE_PROFILE = 19
+NS_ERROR_MODULE_LDAP = 20
+NS_ERROR_MODULE_SECURITY = 21
+NS_ERROR_MODULE_DOM_XPATH = 22
+NS_ERROR_MODULE_DOM_RANGE = 23
+NS_ERROR_MODULE_URILOADER = 24
+NS_ERROR_MODULE_CONTENT = 25
+NS_ERROR_MODULE_PYXPCOM = 26
+NS_ERROR_MODULE_XSLT = 27
+NS_ERROR_MODULE_IPC = 28
+NS_ERROR_MODULE_SVG = 29
+NS_ERROR_MODULE_GENERAL = 51
+
 def NS_FAILED(_nsresult): return ((_nsresult) & -2147483648)
 

trunk/src/libs/xpcom18a4/python/sample/shellcommon.py

@@ -86 +86 @@
     rc = progress.resultCode
     print "Completed:", completed, "rc:",rc
-    if int(rc) == 0:
-        vb.performanceCollector.setupMetrics(['*'], [mach], 10, 15)
+    if rc == 0:
+        try:
+            vb.performanceCollector.setupMetrics(['*'], [mach], 10, 15)
+        except:
+            pass
     session.close()
 
@@ -105 +108 @@
         valsStr = '[ '
         for j in range(0, lens[i]):
-            valsStr += str(vals[int(idxs[i])+j])+' '
+            valsStr += str(vals[idxs[i]])+' '
         valsStr += ']'
         print names[i],valsStr
@@ -294 +297 @@
        valsStr = '[ '
        for j in range(0, lens[i]):
-           valsStr += str(vals[int(idxs[i])+j])+' '
+           valsStr += str(vals[idxs[i]])+' '
        valsStr += ']'
        print names[i],valsStr
@@ -337 +340 @@
     if len(cmd) == 0: return 0 
     args = split_no_quotes(cmd)
+    if len(args) == 0: return 0 
     c = args[0]
     if aliases.get(c, None) != None:
@@ -355 +359 @@
     # to allow to print actual host information, we collect info for
     # last 150 secs maximum, (sample every 10 secs and keep up to 15 samples)
-    vbox.performanceCollector.setupMetrics(['*'], [vbox.host], 10, 15)
-   
+    try:
+        vbox.performanceCollector.setupMetrics(['*'], [vbox.host], 10, 15)
+    except:
+        pass
+
     while True:
         try:
@@ -372 +379 @@
                 traceback.print_exc()
 
-    vbox.performanceCollector.disableMetrics(['*'], [vbox.host])
+    try:
+        vbox.performanceCollector.disableMetrics(['*'], [vbox.host])
+    except:
+        pass

trunk/src/libs/xpcom18a4/python/src/ErrorUtils.cpp

@@ -49 +49 @@
 #include "nsReadableUtils.h"
 #include <nsIConsoleService.h>
+#ifdef VBOX
+#include <nsIExceptionService.h>
+#endif
 #include "nspr.h" // PR_fprintf
 
@@ -243 +246 @@
 PyObject *PyXPCOM_BuildPyException(nsresult r)
 {
+#ifndef VBOX 
         // Need the message etc.
         PyObject *evalue = Py_BuildValue("i", r);
@@ -248 +252 @@
         Py_XDECREF(evalue);
         return NULL;
+#else
+        char msg[256];
+        
+        nsresult rc;
+        nsCOMPtr <nsIExceptionService> es;
+        es = do_GetService (NS_EXCEPTIONSERVICE_CONTRACTID, &rc);
+        bool gotMsg = false;
+        if (NS_SUCCEEDED (rc))
+        {
+            nsCOMPtr <nsIExceptionManager> em;
+            rc = es->GetCurrentExceptionManager (getter_AddRefs (em));
+            if (NS_SUCCEEDED (rc))
+            {
+                nsCOMPtr <nsIException> ex;
+                rc = em->GetExceptionFromProvider(r, NULL, getter_AddRefs (ex));
+                if  (NS_SUCCEEDED (rc) && ex)
+                {       
+                    nsXPIDLCString emsg;
+                    ex->GetMessage(getter_Copies(emsg));
+                    PR_snprintf(msg, sizeof(msg), "%s",
+                                emsg.get());
+                    gotMsg = true;
+                }
+            }
+        }
+
+        if (!gotMsg)
+        {
+            PR_snprintf(msg, sizeof(msg), "Error %d in module %d", 
+                        NS_ERROR_GET_CODE(r), NS_ERROR_GET_MODULE(r));
+        }
+        PyObject *evalue = Py_BuildValue("is", r, msg);
+        PyErr_SetObject(PyXPCOM_Error, evalue);
+        Py_XDECREF(evalue);
+        return NULL;
+#endif
 }