Skip to content

Commit bd6ecd9

Browse files
committed
Try another thing
1 parent ebca966 commit bd6ecd9

File tree

4 files changed

+6
-30
lines changed

4 files changed

+6
-30
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: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,9 @@ public int Send()
126126
}
127127
return returnvalue;
128128
}
129-
public int SendPing()
130-
{
131-
var func = (delegate* unmanaged[Stdcall]<IntPtr, out int, int>)*(VTable + 10);
132-
var result = func(_implementation, out var returnvalue);
133-
if (result != 0)
134-
{
135-
throw new System.ComponentModel.Win32Exception(result);
136-
}
137-
return returnvalue;
138-
}
139129
public int WriteToFile(nint a0)
140130
{
141-
var func = (delegate* unmanaged[Stdcall]<IntPtr, nint, out int, int>)*(VTable + 11);
142-
var result = func(_implementation, a0, out var returnvalue);
143-
if (result != 0)
144-
{
145-
throw new System.ComponentModel.Win32Exception(result);
146-
}
147-
return returnvalue;
148-
}
149-
public int WritePingToFile(nint a0)
150-
{
151-
var func = (delegate* unmanaged[Stdcall]<IntPtr, nint, out int, int>)*(VTable + 12);
131+
var func = (delegate* unmanaged[Stdcall]<IntPtr, nint, out int, int>)*(VTable + 10);
152132
var result = func(_implementation, a0, out var returnvalue);
153133
if (result != 0)
154134
{
@@ -158,7 +138,7 @@ public int WritePingToFile(nint a0)
158138
}
159139
public int CrashProcess()
160140
{
161-
var func = (delegate* unmanaged[Stdcall]<IntPtr, out int, int>)*(VTable + 13);
141+
var func = (delegate* unmanaged[Stdcall]<IntPtr, out int, int>)*(VTable + 11);
162142
var result = func(_implementation, out var returnvalue);
163143
if (result != 0)
164144
{

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,8 @@ 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

0 commit comments

Comments
 (0)