Changeset 13082 in vbox for trunk/src/VBox/Main/include

Timestamp:

Oct 8, 2008 2:36:19 PM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: Backward compatibility broken. setup, enable, disable and query methods replaced with their Ex counterparts.

File:

• trunk/src/VBox/Main/include/PerformanceImpl.h (modified) (2 diffs)

trunk/src/VBox/Main/include/PerformanceImpl.h

@@ -148 +148 @@
     STDMETHOD(SetupMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
                              ComSafeArrayIn (IUnknown *, objects),
-                             ULONG aPeriod, ULONG aCount);
+                             ULONG aPeriod, ULONG aCount,
+                             ComSafeArrayOut (IPerformanceMetric *,
+                                              outMetrics));
     STDMETHOD(EnableMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
-                              ComSafeArrayIn (IUnknown *, objects));
+                              ComSafeArrayIn (IUnknown *, objects),
+                              ComSafeArrayOut (IPerformanceMetric *,
+                                               outMetrics));
     STDMETHOD(DisableMetrics) (ComSafeArrayIn (INPTR BSTR, metricNames),
-                               ComSafeArrayIn (IUnknown *, objects));
+                               ComSafeArrayIn (IUnknown *, objects),
+                               ComSafeArrayOut (IPerformanceMetric *,
+                                                outMetrics));
     STDMETHOD(QueryMetricsData) (ComSafeArrayIn (INPTR BSTR, metricNames),
                                  ComSafeArrayIn (IUnknown *, objects),
                                  ComSafeArrayOut (BSTR, outMetricNames),
                                  ComSafeArrayOut (IUnknown *, outObjects),
+                                 ComSafeArrayOut (BSTR, outUnits),
+                                 ComSafeArrayOut (ULONG, outScales),
+                                 ComSafeArrayOut (ULONG, outSequenceNumbers),
                                  ComSafeArrayOut (ULONG, outDataIndices),
                                  ComSafeArrayOut (ULONG, outDataLengths),
                                  ComSafeArrayOut (LONG, outData));
-
-    STDMETHOD(SetupMetricsEx) (ComSafeArrayIn (INPTR BSTR, metricNames),
-                               ComSafeArrayIn (IUnknown *, objects),
-                               ULONG aPeriod, ULONG aCount,
-                               ComSafeArrayOut (IPerformanceMetric *,
-                                                outMetrics));
-    STDMETHOD(EnableMetricsEx) (ComSafeArrayIn (INPTR BSTR, metricNames),
-                                ComSafeArrayIn (IUnknown *, objects),
-                                ComSafeArrayOut (IPerformanceMetric *,
-                                                 outMetrics));
-    STDMETHOD(DisableMetricsEx) (ComSafeArrayIn (INPTR BSTR, metricNames),
-                                 ComSafeArrayIn (IUnknown *, objects),
-                                 ComSafeArrayOut (IPerformanceMetric *,
-                                                  outMetrics));
-    STDMETHOD(QueryMetricsDataEx) (ComSafeArrayIn (INPTR BSTR, metricNames),
-                                   ComSafeArrayIn (IUnknown *, objects),
-                                   ComSafeArrayOut (BSTR, outMetricNames),
-                                   ComSafeArrayOut (IUnknown *, outObjects),
-                                   ComSafeArrayOut (BSTR, outUnits),
-                                   ComSafeArrayOut (ULONG, outScales),
-                                   ComSafeArrayOut (ULONG, outSequenceNumbers),
-                                   ComSafeArrayOut (ULONG, outDataIndices),
-                                   ComSafeArrayOut (ULONG, outDataLengths),
-                                   ComSafeArrayOut (LONG, outData));
 
     // public methods only for internal purposes
@@ -203 +188 @@
     HRESULT toIPerformanceMetric(pm::Metric *src, IPerformanceMetric **dst);
     HRESULT toIPerformanceMetric(pm::BaseMetric *src, IPerformanceMetric **dst);
-    HRESULT SetupMetricsInt(ComSafeArrayIn (INPTR BSTR, metricNames),
-                            ComSafeArrayIn (IUnknown *, objects),
-                            ULONG aPeriod, ULONG aCount, bool reportAffected,
-                            ComSafeArrayOut (IPerformanceMetric *, outMetrics));
-    HRESULT EnableMetricsInt (ComSafeArrayIn (INPTR BSTR, metricNames),
-                              ComSafeArrayIn (IUnknown *, objects),
-                              bool reportAffected,
-                              ComSafeArrayOut (IPerformanceMetric *,
-                                               outMetrics));
-    HRESULT DisableMetricsInt (ComSafeArrayIn (INPTR BSTR, metricNames),
-                               ComSafeArrayIn (IUnknown *, objects),
-                               bool reportAffected,
-                               ComSafeArrayOut (IPerformanceMetric *,
-                                                outMetrics));
                             
     static void staticSamplerCallback (RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick);