Mon Oct 13 14:39:52 CEST 2008 Paolo Molaro <lupus@ximian.com>

	* Process.cs: added icall and implementation of many memory-related
	query methods (bug #434473).

svn path=/trunk/mcs/; revision=115653

diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
index 896b5d98c8998620d8842ef1e5ef00663a2afcd6..82c243680152058cb712d11c831ad3cab699c6c0 100644 (file)
--- a/mcs/class/System/System.Diagnostics/ChangeLog
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon Oct 13 14:39:52 CEST 2008 Paolo Molaro <lupus@ximian.com>
+
+       * Process.cs: added icall and implementation of many memory-related
+       query methods (bug #434473).
+
 2008-09-20  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * PerformanceCounter.cs:

diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
index dd1fbcbc8abdf3ab0bdb676e63f0d305eb82ca6f..7254f836adf21043ad2253077971a8408bf64c7b 100644 (file)
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -334,6 +334,10 @@ namespace System.Diagnostics {
                        }
                }
 
+               /* data type is from the MonoProcessData enum in mono-proclib.h in the runtime */
+               [MethodImplAttribute(MethodImplOptions.InternalCall)]
+               private extern static long GetProcessData (int pid, int data_type, out int error);
+
                [MonoTODO]
 #if NET_2_0
                [Obsolete ("Use NonpagedSystemMemorySize64")]
@@ -382,7 +386,6 @@ namespace System.Diagnostics {
                        }
                }
 
-               [MonoTODO]
 #if NET_2_0
                [Obsolete ("Use PeakVirtualMemorySize64")]
 #endif
@@ -390,11 +393,11 @@ namespace System.Diagnostics {
                [MonitoringDescription ("The maximum amount of virtual memory used by this process.")]
                public int PeakVirtualMemorySize {
                        get {
-                               return(0);
+                               int error;
+                               return (int)GetProcessData (pid, 8, out error);
                        }
                }
 
-               [MonoTODO]
 #if NET_2_0
                [Obsolete ("Use PeakWorkingSet64")]
 #endif
@@ -402,7 +405,8 @@ namespace System.Diagnostics {
                [MonitoringDescription ("The maximum amount of system memory used by this process.")]
                public int PeakWorkingSet {
                        get {
-                               return(0);
+                               int error;
+                               return (int)GetProcessData (pid, 5, out error);
                        }
                }
 
@@ -447,23 +451,23 @@ namespace System.Diagnostics {
                        }
                }
 
-               [MonoTODO]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The maximum amount of virtual memory used by this process.")]
                [ComVisible (false)]
                public long PeakVirtualMemorySize64 {
                        get {
-                               return(0);
+                               int error;
+                               return GetProcessData (pid, 8, out error);
                        }
                }
 
-               [MonoTODO]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The maximum amount of system memory used by this process.")]
                [ComVisible (false)]
                public long PeakWorkingSet64 {
                        get {
-                               return(0);
+                               int error;
+                               return GetProcessData (pid, 5, out error);
                        }
                }
 #endif
@@ -514,7 +518,6 @@ namespace System.Diagnostics {
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                static extern bool SetPriorityClass (IntPtr handle, int priority, out int error);
 
-               [MonoTODO]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The amount of memory exclusively used by this process.")]
 #if NET_2_0
@@ -522,7 +525,8 @@ namespace System.Diagnostics {
 #endif
                public int PrivateMemorySize {
                        get {
-                               return(0);
+                               int error;
+                               return (int)GetProcessData (pid, 6, out error);
                        }
                }
 
@@ -718,7 +722,6 @@ namespace System.Diagnostics {
                        }
                }
 
-               [MonoTODO]
 #if NET_2_0
                [Obsolete ("Use VirtualMemorySize64")]
 #endif
@@ -726,11 +729,11 @@ namespace System.Diagnostics {
                [MonitoringDescription ("The amount of virtual memory currently used for this process.")]
                public int VirtualMemorySize {
                        get {
-                               return(0);
+                               int error;
+                               return (int)GetProcessData (pid, 7, out error);
                        }
                }
 
-               [MonoTODO]
 #if NET_2_0
                [Obsolete ("Use WorkingSet64")]
 #endif
@@ -738,38 +741,39 @@ namespace System.Diagnostics {
                [MonitoringDescription ("The amount of physical memory currently used for this process.")]
                public int WorkingSet {
                        get {
-                               return(0);
+                               int error;
+                               return (int)GetProcessData (pid, 4, out error);
                        }
                }
 
 #if NET_2_0
-               [MonoTODO]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The amount of memory exclusively used by this process.")]
                [ComVisible (false)]
                public long PrivateMemorySize64 {
                        get {
-                               return(0);
+                               int error;
+                               return GetProcessData (pid, 6, out error);
                        }
                }
 
-               [MonoTODO]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The amount of virtual memory currently used for this process.")]
                [ComVisible (false)]
                public long VirtualMemorySize64 {
                        get {
-                               return(0);
+                               int error;
+                               return GetProcessData (pid, 7, out error);
                        }
                }
 
-               [MonoTODO]
                [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
                [MonitoringDescription ("The amount of physical memory currently used for this process.")]
                [ComVisible (false)]
                public long WorkingSet64 {
                        get {
-                               return(0);
+                               int error;
+                               return GetProcessData (pid, 4, out error);
                        }
                }
 #endif