Changeset 12942 in vbox for trunk/src/VBox/Main/Performance.cpp

Timestamp:

Oct 2, 2008 2:53:11 PM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: Fixed the problem with passing null/empty arrays to PerfAPI methods.
Enabled attributes of type IUnknown in SOAP, JAX-WS, WSDL, CPP and Python style sheets.
Added PerfCollector python class to shellcommon.py to provide more 'pythonic' way to access metric data.
Added the reference to shellcommon.py to IDL docs as an example of PerfAPI usage in python.

File:

• trunk/src/VBox/Main/Performance.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Performance.cpp

@@ -417 +417 @@
                ComSafeArrayIn(IUnknown *, objects))
 {
+    /*
+     * Let's work around null/empty safe array mess. I am not sure there is
+     * a way to pass null arrays via webservice, I haven't found one. So I
+     * guess the users will be forced to use empty arrays instead. Constructing
+     * an empty SafeArray is a bit awkward, so what we do in this method is
+     * actually convert null arrays to empty arrays and pass them down to
+     * init() method. If someone knows how to do it better, please be my guest,
+     * fix it.
+     */
+    if (ComSafeArrayInIsNull(metricNames))
+    {
+        com::SafeArray <BSTR> nameArray;
+        if (ComSafeArrayInIsNull(objects))
+        {
+            com::SafeIfaceArray <IUnknown> objectArray;
+            objectArray.reset(0);
+            init(ComSafeArrayAsInParam(nameArray),
+                 ComSafeArrayAsInParam(objectArray));
+        }
+        else
+        {
+            com::SafeIfaceArray <IUnknown> objectArray(ComSafeArrayInArg(objects));
+            init(ComSafeArrayAsInParam(nameArray),
+                 ComSafeArrayAsInParam(objectArray));
+        }
+    }
+    else
+    {
+        com::SafeArray <INPTR BSTR> nameArray(ComSafeArrayInArg(metricNames));
+        if (ComSafeArrayInIsNull(objects))
+        {
+            com::SafeIfaceArray <IUnknown> objectArray;
+            objectArray.reset(0);
+            init(ComSafeArrayAsInParam(nameArray),
+                 ComSafeArrayAsInParam(objectArray));
+        }
+        else
+        {
+            com::SafeIfaceArray <IUnknown> objectArray(ComSafeArrayInArg(objects));
+            init(ComSafeArrayAsInParam(nameArray),
+                 ComSafeArrayAsInParam(objectArray));
+        }
+    }
+}
+
+void Filter::init(ComSafeArrayIn(INPTR BSTR, metricNames),
+                  ComSafeArrayIn(IUnknown *, objects))
+{
     com::SafeArray <INPTR BSTR> nameArray(ComSafeArrayInArg(metricNames));
-
-    if (ComSafeArrayInIsNull(objects))
+    com::SafeIfaceArray <IUnknown> objectArray(ComSafeArrayInArg(objects));
+
+    if (!objectArray.size())
     {
         if (nameArray.size())
@@ -431 +480 @@
     else
     {
-        com::SafeIfaceArray <IUnknown> objectArray(ComSafeArrayInArg(objects));
-
+ 
         for (size_t i = 0; i < objectArray.size(); ++i)
             switch (nameArray.size())