projects / platform / core / dotnet / diagnostics.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8cc2e8f)
Some return value types changed from HResult to int to avoid accepted/tizen/unified/20220816.130740 submit/tizen/20220811.140501 submit/tizen/20220812.105204
authorolekarev <o.lekarev@samsung.com>
Tue, 14 Jun 2022 12:35:24 +0000 (15:35 +0300)
committerAlexander Soldatov/Platform Lab /SRR/Staff Engineer/Samsung Electronics <soldatov.a@samsung.com>
Mon, 1 Aug 2022 13:26:07 +0000 (16:26 +0300)
crashes on x86 architecture. Clrmd binaries have been changed
for the same reason.

15 files changed:
.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.Utilities.dll [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.Utilities.xml [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.Utilities.dll [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.Utilities.xml [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.Utilities.dll [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.Utilities.xml [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.dll [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.xml [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.dll [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.xml [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.dll [changed mode: 0755->0644] patch | blob | history
.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.xml [changed mode: 0755->0644] patch | blob | history
src/SOS/SOS.Hosting/DataTargetWrapper.cs patch | blob | history
src/SOS/SOS.Hosting/HostWrapper.cs patch | blob | history
src/SOS/SOS.Hosting/TargetWrapper.cs patch | blob | history

diff --git a/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.Utilities.dll b/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.Utilities.dll
old mode 100755 (executable)
new mode 100644 (file)
index e531f9e..00962d1
Binary files a/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.Utilities.dll and b/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.Utilities.dll differ
diff --git a/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.Utilities.dll b/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.Utilities.dll
old mode 100755 (executable)
new mode 100644 (file)
index 90cb3cb..57207b4
Binary files a/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.Utilities.dll and b/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.Utilities.dll differ
diff --git a/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.Utilities.dll b/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.Utilities.dll
old mode 100755 (executable)
new mode 100644 (file)
index f5bb20c..41d047c
Binary files a/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.Utilities.dll and b/.packages/microsoft.diagnostics.runtime.utilities/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.Utilities.dll differ
diff --git a/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.dll b/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.dll
old mode 100755 (executable)
new mode 100644 (file)
index bfec62b..ca8abca
Binary files a/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.dll and b/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/net461/Microsoft.Diagnostics.Runtime.dll differ
diff --git a/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.dll b/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.dll
old mode 100755 (executable)
new mode 100644 (file)
index 6205b5b..d0a3be2
Binary files a/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.dll and b/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netcoreapp3.1/Microsoft.Diagnostics.Runtime.dll differ
diff --git a/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.dll b/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.dll
old mode 100755 (executable)
new mode 100644 (file)
index b136640..2d920a4
Binary files a/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.dll and b/.packages/microsoft.diagnostics.runtime/2.0.256601/lib/netstandard2.0/Microsoft.Diagnostics.Runtime.dll differ
diff --git a/src/SOS/SOS.Hosting/DataTargetWrapper.cs b/src/SOS/SOS.Hosting/DataTargetWrapper.cs
index e8106b67e8378533f7a68642811b7ac3cf458c12..93d42b0656d1a9979dbc7187370251cbab4ee85b 100644 (file)
--- a/src/SOS/SOS.Hosting/DataTargetWrapper.cs
+++ b/src/SOS/SOS.Hosting/DataTargetWrapper.cs
@@ -101,7 +101,7 @@ namespace SOS.Hosting
 
         #region ICLRDataTarget
 
-        private HResult GetMachineType(
+        private int GetMachineType(
             IntPtr self,
             out IMAGE_FILE_MACHINE machineType)
         {
@@ -121,7 +121,7 @@ namespace SOS.Hosting
             return HResult.S_OK;
         }
 
-        private HResult GetPointerSize(
+        private int GetPointerSize(
             IntPtr self,
             out int pointerSize)
         {
@@ -129,7 +129,7 @@ namespace SOS.Hosting
             return HResult.S_OK;
         }
 
-        private HResult GetImageBase(
+        private int GetImageBase(
             IntPtr self,
             string imagePath,
             out ulong baseAddress)
@@ -144,7 +144,7 @@ namespace SOS.Hosting
             return HResult.E_FAIL;
         }
 
-        private HResult ReadVirtual(
+        private int ReadVirtual(
             IntPtr self,
             ulong address,
             IntPtr buffer,
@@ -163,7 +163,7 @@ namespace SOS.Hosting
             return HResult.S_OK;
         }
 
-        private HResult WriteVirtual(
+        private int WriteVirtual(
             IntPtr self,
             ulong address,
             IntPtr buffer,
@@ -180,7 +180,7 @@ namespace SOS.Hosting
             return HResult.S_OK;
         }
 
-        private HResult GetTLSValue(
+        private int GetTLSValue(
             IntPtr self,
             uint threadId,
             uint index,
@@ -189,7 +189,7 @@ namespace SOS.Hosting
             return HResult.E_NOTIMPL;
         }
 
-        private HResult SetTLSValue(
+        private int SetTLSValue(
             IntPtr self,
             uint threadId,
             uint index,
@@ -198,7 +198,7 @@ namespace SOS.Hosting
             return HResult.E_NOTIMPL;
         }
 
-        private HResult GetCurrentThreadID(
+        private int GetCurrentThreadID(
             IntPtr self,
             out uint threadId)
         {
@@ -212,7 +212,7 @@ namespace SOS.Hosting
             return HResult.E_FAIL;
         }
 
-        private HResult GetThreadContext(
+        private int GetThreadContext(
             IntPtr self,
             uint threadId,
             uint contextFlags,
@@ -241,7 +241,7 @@ namespace SOS.Hosting
             return HResult.S_OK;
         }
 
-        private HResult SetThreadContext(
+        private int SetThreadContext(
             IntPtr self,
             uint threadId,
             int contextSize,
@@ -250,7 +250,7 @@ namespace SOS.Hosting
             return HResult.E_NOTIMPL;
         }
 
-        private HResult Request(
+        private int Request(
             IntPtr self,
             uint reqCode,
             uint inBufferSize,
@@ -265,7 +265,7 @@ namespace SOS.Hosting
 
         #region ICLRDataTarget2
 
-        private HResult AllocVirtual(
+        private int AllocVirtual(
             IntPtr self,
             ulong address,
             uint size,
@@ -283,7 +283,7 @@ namespace SOS.Hosting
             return HResult.S_OK;
         }
 
-        private HResult FreeVirtual(
+        private int FreeVirtual(
             IntPtr self,
             ulong address,
             uint size,
@@ -325,7 +325,7 @@ namespace SOS.Hosting
 
         #region ICLRMetadataLocator
 
-        private HResult GetMetadata(
+        private int GetMetadata(
             IntPtr self,
             string fileName,
             uint imageTimestamp,
@@ -344,7 +344,7 @@ namespace SOS.Hosting
 
         #region ICLRRuntimeLocator
 
-        private HResult GetRuntimeBase(
+        private int GetRuntimeBase(
             IntPtr self,
             out ulong address)
         {
@@ -357,23 +357,23 @@ namespace SOS.Hosting
         #region ICLRDataTarget delegates
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetMachineTypeDelegate(
+        private delegate int GetMachineTypeDelegate(
             [In] IntPtr self,
             [Out] out IMAGE_FILE_MACHINE machineType);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetPointerSizeDelegate(
+        private delegate int GetPointerSizeDelegate(
             [In] IntPtr self,
             [Out] out int pointerSize);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetImageBaseDelegate(
+        private delegate int GetImageBaseDelegate(
             [In] IntPtr self,
             [In][MarshalAs(UnmanagedType.LPWStr)] string imagePath,
             [Out] out ulong baseAddress);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult ReadVirtualDelegate(
+        private delegate int ReadVirtualDelegate(
             [In] IntPtr self,
             [In] ulong address,
             [In] IntPtr buffer,
@@ -381,7 +381,7 @@ namespace SOS.Hosting
             [Out] uint* bytesRead);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult WriteVirtualDelegate(
+        private delegate int WriteVirtualDelegate(
             [In] IntPtr self,
             [In] ulong address,
             [In] IntPtr buffer,
@@ -389,26 +389,26 @@ namespace SOS.Hosting
             [Out] uint* bytesWritten);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetTLSValueDelegate(
+        private delegate int GetTLSValueDelegate(
             [In] IntPtr self,
             [In] uint threadId,
             [In] uint index,
             [Out] ulong* value);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult SetTLSValueDelegate(
+        private delegate int SetTLSValueDelegate(
             [In] IntPtr self,
             [In] uint threadId,
             [In] uint index,
             [In] ulong value);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetCurrentThreadIDDelegate(
+        private delegate int GetCurrentThreadIDDelegate(
             [In] IntPtr self,
             [Out] out uint threadId);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetThreadContextDelegate(
+        private delegate int GetThreadContextDelegate(
             [In] IntPtr self,
             [In] uint threadId,
             [In] uint contextFlags,
@@ -416,14 +416,14 @@ namespace SOS.Hosting
             [Out] IntPtr context);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult SetThreadContextDelegate(
+        private delegate int SetThreadContextDelegate(
             [In] IntPtr self,
             [In] uint threadId,
             [In] int contextSize,
             [In] IntPtr context);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult RequestDelegate(
+        private delegate int RequestDelegate(
             [In] IntPtr self,
             [In] uint reqCode,
             [In] uint inBufferSize,
@@ -436,7 +436,7 @@ namespace SOS.Hosting
         #region ICLRDataTarget2 delegates
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult AllocVirtualDelegate(
+        private delegate int AllocVirtualDelegate(
             [In] IntPtr self,
             [In] ulong address,
             [In] uint size,
@@ -445,7 +445,7 @@ namespace SOS.Hosting
             [Out] ulong* buffer);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult FreeVirtualDelegate(
+        private delegate int FreeVirtualDelegate(
             [In] IntPtr self,
             [In] ulong address,
             [In] uint size,
@@ -467,7 +467,7 @@ namespace SOS.Hosting
         #region ICLRMetadataLocator delegate
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetMetadataDelegate(
+        private delegate int GetMetadataDelegate(
             [In] IntPtr self,
             [In][MarshalAs(UnmanagedType.LPWStr)] string fileName,
             [In] uint imageTimestamp,
@@ -484,7 +484,7 @@ namespace SOS.Hosting
         #region ICLRRuntimeLocator delegate
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetRuntimeBaseDelegate(
+        private delegate int GetRuntimeBaseDelegate(
             [In] IntPtr self,
             [Out] out ulong address);
 
diff --git a/src/SOS/SOS.Hosting/HostWrapper.cs b/src/SOS/SOS.Hosting/HostWrapper.cs
index 042bb40ca518471af36b8ec0d35c1b1b053db706..f185c01d326a91b119bef5745dd95574bdd98bd5 100644 (file)
--- a/src/SOS/SOS.Hosting/HostWrapper.cs
+++ b/src/SOS/SOS.Hosting/HostWrapper.cs
@@ -112,7 +112,7 @@ namespace SOS.Hosting
         /// <param name="serviceId">guid of the service</param>
         /// <param name="service">pointer to return service instance</param>
         /// <returns>S_OK or E_NOINTERFACE</returns>
-        private HResult GetService(IntPtr self, in Guid guid, out IntPtr ptr)
+        private int GetService(IntPtr self, in Guid guid, out IntPtr ptr)
         {
             ptr = IntPtr.Zero;
 
@@ -129,7 +129,7 @@ namespace SOS.Hosting
         /// </summary>
         /// <param name="targetWrapper">target wrapper address returned</param>
         /// <returns>S_OK</returns>
-        private HResult GetCurrentTarget(IntPtr self, out IntPtr targetWrapper)
+        private int GetCurrentTarget(IntPtr self, out IntPtr targetWrapper)
         {
             TargetWrapper wrapper = _getTarget();
             if (wrapper == null)
@@ -151,13 +151,13 @@ namespace SOS.Hosting
             [In] IntPtr self);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetServiceDelegate(
+        private delegate int GetServiceDelegate(
             [In] IntPtr self,
             [In] in Guid guid,
             [Out] out IntPtr ptr);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetCurrentTargetDelegate(
+        private delegate int GetCurrentTargetDelegate(
             [In] IntPtr self,
             [Out] out IntPtr target);
 
diff --git a/src/SOS/SOS.Hosting/TargetWrapper.cs b/src/SOS/SOS.Hosting/TargetWrapper.cs
index 1ff3de96aa1db4781a402abf8130363f0a302d6a..da7998ac1e64a1fd4c61c01b6319bd759af03628 100644 (file)
--- a/src/SOS/SOS.Hosting/TargetWrapper.cs
+++ b/src/SOS/SOS.Hosting/TargetWrapper.cs
@@ -78,7 +78,7 @@ namespace SOS.Hosting
             return _target.GetTempDirectory();
         }
 
-        private HResult GetRuntime(
+        private int GetRuntime(
             IntPtr self,
             IntPtr* ppRuntime)
         {
@@ -116,7 +116,7 @@ namespace SOS.Hosting
             [In] IntPtr self);
 
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
-        private delegate HResult GetRuntimeDelegate(
+        private delegate int GetRuntimeDelegate(
             [In] IntPtr self,
             [Out] IntPtr* ppRuntime);
 
Domain: Dotnet / Core;