Skip to content

Commit 2c03f4e

Browse files
mikem8361mikem8361
authored
Merge pull request #1058 from mikem8361/release/stable
Port dotnet-dump modules perf fix to release/stable
2 parents 4de63e6 + 505284c commit 2c03f4e

File tree

10 files changed

+369
-346
lines changed

10 files changed

+369
-346
lines changed

‎eng/Versions.props

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
3434
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
3535
<!-- Other libs -->
36-
<MicrosoftDiagnosticsRuntimeVersion>1.1.116301</MicrosoftDiagnosticsRuntimeVersion>
36+
<MicrosoftAspNetCoreVersion>2.1.7</MicrosoftAspNetCoreVersion>
37+
<MicrosoftAspNetCoreHttpsPolicyVersion>2.1.1</MicrosoftAspNetCoreHttpsPolicyVersion>
38+
<MicrosoftAspNetCoreMvcVersion>2.1.3</MicrosoftAspNetCoreMvcVersion>
39+
<MicrosoftAspNetCoreResponseCompressionVersion>2.1.1</MicrosoftAspNetCoreResponseCompressionVersion>
40+
<MicrosoftDiagnosticsRuntimeVersion>1.1.122004</MicrosoftDiagnosticsRuntimeVersion>
3741
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
3842
<MicrosoftDiagnosticsTracingTraceEventVersion>2.0.51</MicrosoftDiagnosticsTracingTraceEventVersion>
3943
<MicrosoftExtensionsConfigurationJsonVersion>3.1.2</MicrosoftExtensionsConfigurationJsonVersion>

‎src/SOS/SOS.Hosting/dbgeng/DebugAdvanced.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ internal DebugAdvanced(DebugClient client, SOSHost soshost)
2121

2222
#region IDebugAdvanced Delegates
2323

24-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
24+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
2525
private delegate int GetThreadContextDelegate(
2626
[In] IntPtr self,
2727
[In] IntPtr context,
2828
[In] uint contextSize);
2929

30-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
30+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
3131
private delegate int SetThreadContextDelegate(
3232
[In] IntPtr self,
3333
[In] IntPtr context,

‎src/SOS/SOS.Hosting/dbgeng/DebugClient.cs

+45-45
Original file line numberDiff line numberDiff line change
@@ -106,59 +106,59 @@ internal static int NotImplemented
106106

107107
#region IDebugClient Delegates
108108

109-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
109+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
110110
private delegate int AttachKernelDelegate(
111111
IntPtr self,
112112
[In] DEBUG_ATTACH flags,
113113
[In][MarshalAs(UnmanagedType.LPStr)] string connectOptions);
114114

115-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
115+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
116116
private delegate int GetKernelConnectionOptionsDelegate(
117117
IntPtr self,
118118
[Out][MarshalAs(UnmanagedType.LPStr)] StringBuilder Buffer,
119119
[In] int BufferSize,
120120
[Out] uint* OptionsSize);
121121

122-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
122+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
123123
private delegate int SetKernelConnectionOptionsDelegate(
124124
IntPtr self,
125125
[In][MarshalAs(UnmanagedType.LPStr)] string Options);
126126

127-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
127+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
128128
private delegate int StartProcessServerDelegate(
129129
IntPtr self,
130130
[In] DEBUG_CLASS Flags,
131131
[In][MarshalAs(UnmanagedType.LPStr)] string Options,
132132
[In] IntPtr Reserved);
133133

134-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
134+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
135135
private delegate int ConnectProcessServerDelegate(
136136
IntPtr self,
137137
[In][MarshalAs(UnmanagedType.LPStr)] string RemoteOptions,
138138
[Out] ulong* Server);
139139

140-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
140+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
141141
private delegate int DisconnectProcessServerDelegate(
142142
IntPtr self,
143143
[In] ulong Server);
144144

145-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
145+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
146146
private delegate int GetRunningProcessSystemIdsDelegate(
147147
IntPtr self,
148148
[In] ulong Server,
149149
[Out] uint* Ids,
150150
[In] uint Count,
151151
[Out] uint* ActualCount);
152152

153-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
153+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
154154
private delegate int GetRunningProcessSystemIdByExecutableNameDelegate(
155155
IntPtr self,
156156
[In] ulong Server,
157157
[In][MarshalAs(UnmanagedType.LPStr)] string ExeName,
158158
[In] DEBUG_GET_PROC Flags,
159159
[Out] uint* Id);
160160

161-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
161+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
162162
private delegate int GetRunningProcessDescriptionDelegate(
163163
IntPtr self,
164164
[In] ulong Server,
@@ -171,21 +171,21 @@ private delegate int GetRunningProcessDescriptionDelegate(
171171
[In] int DescriptionSize,
172172
[Out] uint* ActualDescriptionSize);
173173

174-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
174+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
175175
private delegate int AttachProcessDelegate(
176176
IntPtr self,
177177
[In] ulong Server,
178178
[In] uint ProcessID,
179179
[In] DEBUG_ATTACH AttachFlags);
180180

181-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
181+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
182182
private delegate int CreateProcessDelegate(
183183
IntPtr self,
184184
[In] ulong Server,
185185
[In][MarshalAs(UnmanagedType.LPStr)] string CommandLine,
186186
[In] DEBUG_CREATE_PROCESS Flags);
187187

188-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
188+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
189189
private delegate int CreateProcessAndAttachDelegate(
190190
IntPtr self,
191191
[In] ulong Server,
@@ -194,164 +194,164 @@ private delegate int CreateProcessAndAttachDelegate(
194194
[In] uint ProcessId,
195195
[In] DEBUG_ATTACH AttachFlags);
196196

197-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
197+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
198198
private delegate int GetProcessOptionsDelegate(
199199
IntPtr self,
200200
[Out] DEBUG_PROCESS* Options);
201201

202-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
202+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
203203
private delegate int AddProcessOptionsDelegate(
204204
IntPtr self,
205205
[In] DEBUG_PROCESS Options);
206206

207-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
207+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
208208
private delegate int RemoveProcessOptionsDelegate(
209209
IntPtr self,
210210
[In] DEBUG_PROCESS Options);
211211

212-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
212+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
213213
private delegate int SetProcessOptionsDelegate(
214214
IntPtr self,
215215
[In] DEBUG_PROCESS Options);
216216

217-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
217+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
218218
private delegate int OpenDumpFileDelegate(
219219
IntPtr self,
220220
[In][MarshalAs(UnmanagedType.LPStr)] string DumpFile);
221221

222-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
222+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
223223
private delegate int WriteDumpFileDelegate(
224224
IntPtr self,
225225
[In][MarshalAs(UnmanagedType.LPStr)] string DumpFile,
226226
[In] DEBUG_DUMP Qualifier);
227227

228-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
228+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
229229
private delegate int ConnectSessionDelegate(
230230
IntPtr self,
231231
[In] DEBUG_CONNECT_SESSION Flags,
232232
[In] uint HistoryLimit);
233233

234-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
234+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
235235
private delegate int StartServerDelegate(
236236
IntPtr self,
237237
[In][MarshalAs(UnmanagedType.LPStr)] string Options);
238238

239-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
239+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
240240
private delegate int OutputServerDelegate(
241241
IntPtr self,
242242
[In] DEBUG_OUTCTL OutputControl,
243243
[In][MarshalAs(UnmanagedType.LPStr)] string Machine,
244244
[In] DEBUG_SERVERS Flags);
245245

246-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
246+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
247247
private delegate int TerminateProcessesDelegate(
248248
IntPtr self);
249249

250-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
250+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
251251
private delegate int DetachProcessesDelegate(
252252
IntPtr self);
253253

254-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
254+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
255255
private delegate int EndSessionDelegate(
256256
IntPtr self,
257257
[In] DEBUG_END Flags);
258258

259-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
259+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
260260
private delegate int GetExitCodeDelegate(
261261
IntPtr self,
262262
[Out] uint* Code);
263263

264-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
264+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
265265
private delegate int DispatchCallbacksDelegate(
266266
IntPtr self,
267267
[In] uint Timeout);
268268

269-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
269+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
270270
private delegate int ExitDispatchDelegate(
271271
IntPtr self,
272272
[In][MarshalAs(UnmanagedType.Interface)] IDebugClient Client);
273273

274-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
274+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
275275
private delegate int CreateClientDelegate(
276276
IntPtr self,
277277
[Out][MarshalAs(UnmanagedType.Interface)] IntPtr Client); // out IDebugClient
278278

279-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
279+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
280280
private delegate int GetInputCallbacksDelegate(
281281
IntPtr self,
282282
[Out][MarshalAs(UnmanagedType.Interface)] IntPtr Callbacks); // out IDebugInputCallbacks
283283

284-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
284+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
285285
private delegate int SetInputCallbacksDelegate(
286286
IntPtr self,
287287
[In][MarshalAs(UnmanagedType.Interface)] IDebugInputCallbacks Callbacks);
288288

289289
/* GetOutputCallbacks could a conversion thunk from the debugger engine so we can't specify a specific interface */
290290

291-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
291+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
292292
private delegate int GetOutputCallbacksDelegate(
293293
IntPtr self,
294294
[Out] IntPtr Callbacks); // out IDebugOutputCallbacks
295295

296296
/* We may have to pass a debugger engine conversion thunk back in so we can't specify a specific interface */
297297

298-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
298+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
299299
private delegate int SetOutputCallbacksDelegate(
300300
IntPtr self,
301301
[In] IDebugOutputCallbacks Callbacks);
302302

303-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
303+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
304304
private delegate int GetOutputMaskDelegate(
305305
IntPtr self,
306306
[Out] DEBUG_OUTPUT* Mask);
307307

308-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
308+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
309309
private delegate int SetOutputMaskDelegate(
310310
IntPtr self,
311311
[In] DEBUG_OUTPUT Mask);
312312

313-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
313+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
314314
private delegate int GetOtherOutputMaskDelegate(
315315
IntPtr self,
316316
[In][MarshalAs(UnmanagedType.Interface)] IDebugClient Client,
317317
[Out] DEBUG_OUTPUT* Mask);
318318

319-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
319+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
320320
private delegate int SetOtherOutputMaskDelegate(
321321
IntPtr self,
322322
[In][MarshalAs(UnmanagedType.Interface)] IDebugClient Client,
323323
[In] DEBUG_OUTPUT Mask);
324324

325-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
325+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
326326
private delegate int GetOutputWidthDelegate(
327327
IntPtr self,
328328
[Out] uint* Columns);
329329

330-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
330+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
331331
private delegate int SetOutputWidthDelegate(
332332
IntPtr self,
333333
[In] uint Columns);
334334

335-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
335+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
336336
private delegate int GetOutputLinePrefixDelegate(
337337
IntPtr self,
338338
[Out][MarshalAs(UnmanagedType.LPStr)] StringBuilder Buffer,
339339
[In] int BufferSize,
340340
[Out] uint* PrefixSize);
341341

342-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
342+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
343343
private delegate int SetOutputLinePrefixDelegate(
344344
IntPtr self,
345345
[In][MarshalAs(UnmanagedType.LPStr)] string Prefix);
346346

347-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
347+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
348348
private delegate int GetIdentityDelegate(
349349
IntPtr self,
350350
[Out][MarshalAs(UnmanagedType.LPStr)] StringBuilder Buffer,
351351
[In] int BufferSize,
352352
[Out] uint* IdentitySize);
353353

354-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
354+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
355355
private delegate int OutputIdentityDelegate(
356356
IntPtr self,
357357
[In] DEBUG_OUTCTL OutputControl,
@@ -360,19 +360,19 @@ private delegate int OutputIdentityDelegate(
360360

361361
/* GetEventCallbacks could a conversion thunk from the debugger engine so we can't specify a specific interface */
362362

363-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
363+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
364364
private delegate int GetEventCallbacksDelegate(
365365
IntPtr self,
366366
[Out] IntPtr Callbacks); // out IDebugEventCallbacks
367367

368368
/* We may have to pass a debugger engine conversion thunk back in so we can't specify a specific interface */
369369

370-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
370+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
371371
private delegate int SetEventCallbacksDelegate(
372372
IntPtr self,
373373
[In] IDebugEventCallbacks Callbacks);
374374

375-
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
375+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
376376
private delegate int FlushCallbacksDelegate(
377377
IntPtr self);
378378

0 commit comments

Comments
 (0)