Skip to content

Commit 1239a8a

Browse files
committed
Try another thing
1 parent b33d47b commit 1239a8a

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

profiler/src/ProfilerEngine/Datadog.Profiler.Native/CrashReporting.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ ICrashReporting : public IUnknown
109109
virtual int32_t STDMETHODCALLTYPE ResolveStacks(int32_t crashingThreadId, ResolveManagedCallstack resolveCallback, void* context, bool* isSuspicious) = 0;
110110
virtual int32_t STDMETHODCALLTYPE SetMetadata(const char* libraryName, const char* libraryVersion, const char* family, Tag* tags, int32_t tagCount) = 0;
111111
virtual int32_t STDMETHODCALLTYPE Send() = 0;
112-
virtual int32_t STDMETHODCALLTYPE SendPing() = 0;
113112
virtual int32_t STDMETHODCALLTYPE WriteToFile(const char* url) = 0;
114-
virtual int32_t STDMETHODCALLTYPE WritePingToFile(const char* url) = 0;
115113
virtual int32_t STDMETHODCALLTYPE CrashProcess() = 0;
114+
virtual int32_t STDMETHODCALLTYPE SendPing() = 0;
115+
virtual int32_t STDMETHODCALLTYPE WritePingToFile(const char* url) = 0;
116116
};
117117

118118
class CrashReporting : public ICrashReporting

tracer/src/Datadog.Trace.Tools.dd_dotnet/CreatedumpCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ private unsafe bool SendPing(ICrashReport crashReport, ClrRuntime runtime)
846846

847847
DebugPrint($"Writing crash ping to {outputFile}...");
848848
path = Marshal.StringToHGlobalAnsi(outputFile);
849-
crashReport.WritePingToFile(path);
849+
// crashReport.WritePingToFile(path);
850850
}
851851
finally
852852
{
@@ -859,7 +859,7 @@ private unsafe bool SendPing(ICrashReport crashReport, ClrRuntime runtime)
859859
else
860860
{
861861
DebugPrint("Sending crash report");
862-
crashReport.SendPing();
862+
// crashReport.SendPing();
863863
}
864864
}
865865
catch (Win32Exception ex)

tracer/src/Datadog.Trace.Tools.dd_dotnet/Generated/Datadog.Trace.Tools.dd_dotnet.SourceGenerators/NativeObjectsGenerator/dd_dotnet.ICrashReport.g.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,40 +126,40 @@ public int Send()
126126
}
127127
return returnvalue;
128128
}
129-
public int SendPing()
129+
public int WriteToFile(nint a0)
130130
{
131-
var func = (delegate* unmanaged[Stdcall]<IntPtr, out int, int>)*(VTable + 10);
132-
var result = func(_implementation, out var returnvalue);
131+
var func = (delegate* unmanaged[Stdcall]<IntPtr, nint, out int, int>)*(VTable + 10);
132+
var result = func(_implementation, a0, out var returnvalue);
133133
if (result != 0)
134134
{
135135
throw new System.ComponentModel.Win32Exception(result);
136136
}
137137
return returnvalue;
138138
}
139-
public int WriteToFile(nint a0)
139+
public int CrashProcess()
140140
{
141-
var func = (delegate* unmanaged[Stdcall]<IntPtr, nint, out int, int>)*(VTable + 11);
142-
var result = func(_implementation, a0, out var returnvalue);
141+
var func = (delegate* unmanaged[Stdcall]<IntPtr, out int, int>)*(VTable + 11);
142+
var result = func(_implementation, out var returnvalue);
143143
if (result != 0)
144144
{
145145
throw new System.ComponentModel.Win32Exception(result);
146146
}
147147
return returnvalue;
148148
}
149-
public int WritePingToFile(nint a0)
149+
public int SendPing()
150150
{
151-
var func = (delegate* unmanaged[Stdcall]<IntPtr, nint, out int, int>)*(VTable + 12);
152-
var result = func(_implementation, a0, out var returnvalue);
151+
var func = (delegate* unmanaged[Stdcall]<IntPtr, out int, int>)*(VTable + 12);
152+
var result = func(_implementation, out var returnvalue);
153153
if (result != 0)
154154
{
155155
throw new System.ComponentModel.Win32Exception(result);
156156
}
157157
return returnvalue;
158158
}
159-
public int CrashProcess()
159+
public int WritePingToFile(nint a0)
160160
{
161-
var func = (delegate* unmanaged[Stdcall]<IntPtr, out int, int>)*(VTable + 13);
162-
var result = func(_implementation, out var returnvalue);
161+
var func = (delegate* unmanaged[Stdcall]<IntPtr, nint, out int, int>)*(VTable + 13);
162+
var result = func(_implementation, a0, out var returnvalue);
163163
if (result != 0)
164164
{
165165
throw new System.ComponentModel.Win32Exception(result);

tracer/src/Datadog.Trace.Tools.dd_dotnet/ICrashReport.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ internal unsafe interface ICrashReport : IUnknown
3131

3232
int Send();
3333

34-
int SendPing();
35-
3634
int WriteToFile(IntPtr url);
3735

38-
int WritePingToFile(IntPtr url);
39-
4036
[Obsolete("You're aware it's going to crash the process, right?")]
4137
int CrashProcess();
4238

39+
int SendPing();
40+
41+
int WritePingToFile(IntPtr url);
42+
4343
[StructLayout(LayoutKind.Sequential)]
4444
internal struct Tag
4545
{

0 commit comments

Comments
 (0)