Skip to content

Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
max-charlamb merged 1 commit into from
Jun 22, 2026
Merged

Use ISOSDacInterface17 for DumpLog when available #5873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 234 additions & 3 deletions src/SOS/Strike/stressLogDump.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
// Try to get ISOSDacInterface17
if (g_clrData == NULL)
{
return E_NOINTERFACE;
}
ReleaseHolder<ISOSDacInterface17> pSos17;
HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
if (FAILED(hr) || pSos17 == NULL)
{
return E_NOINTERFACE;
}

// Get stress log header data
SOSStressLogData logData;
hr = pSos17->GetStressLogData(&logData);
if (hr != S_OK)
{
return FAILED(hr) ? hr : S_FALSE;
}

FILE* file = NULL;

// Get thread enumerator
ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
if (FAILED(hr) || pThreadEnum == NULL)
{
return FAILED(hr) ? hr : E_FAIL;
}

// Collect all threads
struct ThreadInfo
{
SOSThreadStressLogData data;
uint64_t latestTimestamp;
};

std::vector<ThreadInfo> threads;
SOSThreadStressLogData threadData;
unsigned int fetched = 0;
for (;;)
{
fetched = 0;
hr = pThreadEnum->Next(1, &threadData, &fetched);
if (FAILED(hr) || fetched == 0)
break;
threads.push_back({ threadData, 0 });
}
pThreadEnum.Release();

if (threads.empty())
{
ExtOut("----- No thread logs in the image -----\n");
return S_FALSE;
}

// Create message enumerators for each thread and find the latest timestamp
struct ThreadMsgState
{
ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
SOSStressMsgData currentMsg;
bool hasMsg;
uint64_t threadId;
};

unsigned int threadCount = (unsigned int)threads.size();
ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
if (msgStates == NULL)
{
return E_OUTOFMEMORY;
}
unsigned int msgStateCount = 0;
uint64_t lastTimeStamp = 0;

for (auto& t : threads)
{
ISOSStressLogMsgEnum* pMsgEnum = NULL;
hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
if (FAILED(hr) || pMsgEnum == NULL)
continue;

ThreadMsgState& state = msgStates[msgStateCount];
state.pEnum = pMsgEnum;
state.threadId = t.data.ThreadId;
state.hasMsg = false;

// Prime the enumerator with the first message
fetched = 0;
hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
if (SUCCEEDED(hr) && fetched > 0)
{
state.hasMsg = true;
if (state.currentMsg.Timestamp > lastTimeStamp)
lastTimeStamp = state.currentMsg.Timestamp;
}

msgStateCount++;
}

// Open the output file
if ((file = fopen(fileName, "w")) == NULL)
{
return GetLastError();
}

// Print header -- match legacy format exactly
FILETIME startTime;
memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
double totalSecs = 0;
if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
{
totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
}
FILETIME endTime;
INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

WCHAR timeBuff[64];
fprintf(file, "STRESS LOG:\n"
" facilitiesToLog = 0x%x\n"
" levelToLog = %d\n"
" MaxLogSizePerThread = 0x%x (%d)\n"
" MaxTotalLogSize = 0x%x (%d)\n"
" CurrentTotalLogChunk = %d\n"
" ThreadsWithLogs = %d\n",
logData.LoggedFacilities, logData.Level,
logData.MaxSizePerThread, logData.MaxSizePerThread,
logData.MaxSizeTotal, logData.MaxSizeTotal,
logData.TotalChunks, (int)threads.size());

fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
fprintf(file, " ID (sec from start)\n");
fprintf(file, "--------------------------------------------------------------------------------------\n");

// Merge messages across all threads by timestamp (newest first)
char format[257];
format[256] = format[0] = 0;
unsigned msgCtr = 0;

for (;;)
{
// Find the thread with the newest message
int newestIdx = -1;
uint64_t newestTimestamp = 0;

for (unsigned int i = 0; i < msgStateCount; i++)
{
if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
{
newestTimestamp = msgStates[i].currentMsg.Timestamp;
newestIdx = i;
}
}

if (newestIdx < 0)
break;

if (IsInterrupt())
{
fprintf(file, "----- Interrupted by user -----\n");
break;
}

ThreadMsgState& state = msgStates[newestIdx];
SOSStressMsgData& msg = state.currentMsg;

if (msg.FormatString != 0)
{
// Read the format string from target memory
hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
if (hr != S_OK)
strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

// Read arguments
void* args[StressMsg::maxArgCnt] = {};
if (msg.ArgumentCount > 0)
{
CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
unsigned int argsFetched = 0;
unsigned int argsToFetch = msg.ArgumentCount;
if (argsToFetch > StressMsg::maxArgCnt)
argsToFetch = StressMsg::maxArgCnt;
state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
for (unsigned int i = 0; i < argsFetched; i++)
args[i] = (void*)(size_t)argAddrs[i];
}

// Handle TaskSwitch marker the same way as the legacy path
if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
{
fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
state.threadId = (unsigned)(size_t)args[0];
}
else
{
formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
}
msgCtr++;
}

// Advance to the next message for this thread
fetched = 0;
hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
if (fetched == 0 || FAILED(hr))
{
state.hasMsg = false;
fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
}
}

// Match legacy footer format
fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
fclose(file);

return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
hr = GetLastError();
goto FREE_MEM;
}
hr = S_FALSE; // return false if there are no message to print to the log

vDoOut(bDoGcHist, file, "STRESS LOG:\n"
" facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
{
TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
if (hr != S_OK)
if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
}
ExtOut("\n");

hr = (msgCtr > 0) ? S_OK : S_FALSE;

vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
if (!bDoGcHist)
{
Expand Down
35 changes: 28 additions & 7 deletions src/SOS/Strike/strike.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
return E_FAIL;
}

LoadRuntimeSymbols();

const char* fileName = "StressLog.txt";
CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
BOOL useLegacy = FALSE;

StringHolder sFileName, sLogAddr;
CMDOption option[] =
{ // name, vptr, type, hasValue
{"-addr", &sLogAddr.data, COSTRING, TRUE}
{"-addr", &sLogAddr.data, COSTRING, TRUE},
{"-legacy", &useLegacy, COBOOL, FALSE}
};
CMDValue arg[] =
{ // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
fileName = sFileName.data;
}

ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

// Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
if (!useLegacy)
{
HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
if (hrInterface17 != E_NOINTERFACE)
{
Status = hrInterface17;
if (Status == S_OK)
ExtOut("SUCCESS: Stress log dumped\n");
else if (Status == S_FALSE)
ExtOut("No Stress log in the image, no file written\n");
else
ExtOut("FAILURE: Stress log not dumped\n");
return Status;
}
}

// Fall back to the legacy raw-read path.
LoadRuntimeSymbols();

// allow users to specify -addr mscordbdi!StressLog::theLog, for example.
if (sLogAddr.data != NULL)
{
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
return E_FAIL;
}

ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

if (Status == S_OK)
Expand Down
4 changes: 4 additions & 0 deletions src/shared/inc/stresslog.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
// This function is defined in the tools\strike\stressLogDump.cpp file
static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

// Try to dump via ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

static BOOL StressLogOn(unsigned facility, unsigned level);
static BOOL ETWLogOn(unsigned facility, unsigned level);
static BOOL LogOn(unsigned facility, unsigned level);
Expand Down
9 changes: 9 additions & 0 deletions src/shared/pal/prebuilt/idl/sospriv_i.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Use ISOSDacInterface17 for DumpLog when available by max-charlamb · Pull Request #5873 · dotnet/diagnostics · GitHub
Skip to content
Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-charlamb
merged 1 commit into

from

Jun 22, 2026
 Merged


Use ISOSDacInterface17 for DumpLog when available
#5873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


237 changes: 234 additions & 3 deletions
src/SOS/Strike/stressLogDump.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
 return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
 // Try to get ISOSDacInterface17
 if (g_clrData == NULL)
 {
 return E_NOINTERFACE;
 }
 ReleaseHolder<ISOSDacInterface17> pSos17;
 HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
 if (FAILED(hr) || pSos17 == NULL)
 {
 return E_NOINTERFACE;
 }

 // Get stress log header data
 SOSStressLogData logData;
 hr = pSos17->GetStressLogData(&logData);
 if (hr != S_OK)
 {
 return FAILED(hr) ? hr : S_FALSE;
 }

 FILE* file = NULL;

 // Get thread enumerator
 ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
 hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
 if (FAILED(hr) || pThreadEnum == NULL)
 {
 return FAILED(hr) ? hr : E_FAIL;
 }

 // Collect all threads
 struct ThreadInfo
 {
 SOSThreadStressLogData data;
 uint64_t latestTimestamp;
 };

 std::vector<ThreadInfo> threads;
 SOSThreadStressLogData threadData;
 unsigned int fetched = 0;
 for (;;)
 {
 fetched = 0;
 hr = pThreadEnum->Next(1, &threadData, &fetched);
 if (FAILED(hr) || fetched == 0)
 break;
 threads.push_back({ threadData, 0 });
 }
 pThreadEnum.Release();

 if (threads.empty())
 {
 ExtOut("----- No thread logs in the image -----\n");
 return S_FALSE;
 }

 // Create message enumerators for each thread and find the latest timestamp
 struct ThreadMsgState
 {
 ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
 SOSStressMsgData currentMsg;
 bool hasMsg;
 uint64_t threadId;
 };

 unsigned int threadCount = (unsigned int)threads.size();
 ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
 if (msgStates == NULL)
 {
 return E_OUTOFMEMORY;
 }
 unsigned int msgStateCount = 0;
 uint64_t lastTimeStamp = 0;

 for (auto& t : threads)
 {
 ISOSStressLogMsgEnum* pMsgEnum = NULL;
 hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
 if (FAILED(hr) || pMsgEnum == NULL)
 continue;

 ThreadMsgState& state = msgStates[msgStateCount];
 state.pEnum = pMsgEnum;
 state.threadId = t.data.ThreadId;
 state.hasMsg = false;

 // Prime the enumerator with the first message
 fetched = 0;
 hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
 if (SUCCEEDED(hr) && fetched > 0)
 {
 state.hasMsg = true;
 if (state.currentMsg.Timestamp > lastTimeStamp)
 lastTimeStamp = state.currentMsg.Timestamp;
 }

 msgStateCount++;
 }

 // Open the output file
 if ((file = fopen(fileName, "w")) == NULL)
 {
 return GetLastError();
 }

 // Print header -- match legacy format exactly
 FILETIME startTime;
 memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
 double totalSecs = 0;
 if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
 {
 totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
 }
 FILETIME endTime;
 INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
 memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

 WCHAR timeBuff[64];
 fprintf(file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
 " levelToLog = %d\n"
 " MaxLogSizePerThread = 0x%x (%d)\n"
 " MaxTotalLogSize = 0x%x (%d)\n"
 " CurrentTotalLogChunk = %d\n"
 " ThreadsWithLogs = %d\n",
 logData.LoggedFacilities, logData.Level,
 logData.MaxSizePerThread, logData.MaxSizePerThread,
 logData.MaxSizeTotal, logData.MaxSizeTotal,
 logData.TotalChunks, (int)threads.size());

 fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
 fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
 fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
 fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

 fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
 fprintf(file, " ID (sec from start)\n");
 fprintf(file, "--------------------------------------------------------------------------------------\n");

 // Merge messages across all threads by timestamp (newest first)
 char format[257];
 format[256] = format[0] = 0;
 unsigned msgCtr = 0;

 for (;;)
 {
 // Find the thread with the newest message
 int newestIdx = -1;
 uint64_t newestTimestamp = 0;

 for (unsigned int i = 0; i < msgStateCount; i++)
 {
 if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
 {
 newestTimestamp = msgStates[i].currentMsg.Timestamp;
 newestIdx = i;
 }
 }

 if (newestIdx < 0)
 break;

 if (IsInterrupt())
 {
 fprintf(file, "----- Interrupted by user -----\n");
 break;
 }

 ThreadMsgState& state = msgStates[newestIdx];
 SOSStressMsgData& msg = state.currentMsg;

 if (msg.FormatString != 0)
 {
 // Read the format string from target memory
 hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
 if (hr != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

 // Read arguments
 void* args[StressMsg::maxArgCnt] = {};
 if (msg.ArgumentCount > 0)
 {
 CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
 unsigned int argsFetched = 0;
 unsigned int argsToFetch = msg.ArgumentCount;
 if (argsToFetch > StressMsg::maxArgCnt)
 argsToFetch = StressMsg::maxArgCnt;
 state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
 for (unsigned int i = 0; i < argsFetched; i++)
 args[i] = (void*)(size_t)argAddrs[i];
 }

 // Handle TaskSwitch marker the same way as the legacy path
 if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
 {
 fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
 state.threadId = (unsigned)(size_t)args[0];
 }
 else
 {
 formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
 }
 msgCtr++;
 }

 // Advance to the next message for this thread
 fetched = 0;
 hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
 if (fetched == 0 || FAILED(hr))
 {
 state.hasMsg = false;
 fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
 }
 }

 // Match legacy footer format
 fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 fclose(file);

 return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 hr = GetLastError();
 goto FREE_MEM;
 }
 hr = S_FALSE; // return false if there are no message to print to the log

 vDoOut(bDoGcHist, file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
 {
 TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
 hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
 if (hr != S_OK)
 if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 }
 ExtOut("\n");

 hr = (msgCtr > 0) ? S_OK : S_FALSE;

 vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 if (!bDoGcHist)
 {
Expand Down

35 changes: 28 additions & 7 deletions
src/SOS/Strike/strike.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 LoadRuntimeSymbols();

 const char* fileName = "StressLog.txt";
 CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
 BOOL useLegacy = FALSE;

 StringHolder sFileName, sLogAddr;
 CMDOption option[] =
 { // name, vptr, type, hasValue
 {"-addr", &sLogAddr.data, COSTRING, TRUE}
 {"-addr", &sLogAddr.data, COSTRING, TRUE},
 {"-legacy", &useLegacy, COBOOL, FALSE}
 };
 CMDValue arg[] =
 { // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
 fileName = sFileName.data;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

 // Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
 if (!useLegacy)
 {
 HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
 if (hrInterface17 != E_NOINTERFACE)
 {
 Status = hrInterface17;
 if (Status == S_OK)
 ExtOut("SUCCESS: Stress log dumped\n");
 else if (Status == S_FALSE)
 ExtOut("No Stress log in the image, no file written\n");
 else
 ExtOut("FAILURE: Stress log not dumped\n");
 return Status;
 }
 }

 // Fall back to the legacy raw-read path.
 LoadRuntimeSymbols();

 // allow users to specify -addr mscordbdi!StressLog::theLog, for example.
 if (sLogAddr.data != NULL)
 {
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



 Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

 if (Status == S_OK)
Expand Down

4 changes: 4 additions & 0 deletions
src/shared/inc/stresslog.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
 // This function is defined in the tools\strike\stressLogDump.cpp file
 static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

 // Try to dump via ISOSDacInterface17.
 // Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
 static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

 static BOOL StressLogOn(unsigned facility, unsigned level);
 static BOOL ETWLogOn(unsigned facility, unsigned level);
 static BOOL LogOn(unsigned facility, unsigned level);
Expand Down

9 changes: 9 additions & 0 deletions
src/shared/pal/prebuilt/idl/sospriv_i.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use ISOSDacInterface17 for DumpLog when available by max-charlamb · Pull Request #5873 · dotnet/diagnostics · GitHub
Skip to content
Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-charlamb
merged 1 commit into

from

Jun 22, 2026
 Merged


Use ISOSDacInterface17 for DumpLog when available
#5873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


237 changes: 234 additions & 3 deletions
src/SOS/Strike/stressLogDump.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
 return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
 // Try to get ISOSDacInterface17
 if (g_clrData == NULL)
 {
 return E_NOINTERFACE;
 }
 ReleaseHolder<ISOSDacInterface17> pSos17;
 HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
 if (FAILED(hr) || pSos17 == NULL)
 {
 return E_NOINTERFACE;
 }

 // Get stress log header data
 SOSStressLogData logData;
 hr = pSos17->GetStressLogData(&logData);
 if (hr != S_OK)
 {
 return FAILED(hr) ? hr : S_FALSE;
 }

 FILE* file = NULL;

 // Get thread enumerator
 ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
 hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
 if (FAILED(hr) || pThreadEnum == NULL)
 {
 return FAILED(hr) ? hr : E_FAIL;
 }

 // Collect all threads
 struct ThreadInfo
 {
 SOSThreadStressLogData data;
 uint64_t latestTimestamp;
 };

 std::vector<ThreadInfo> threads;
 SOSThreadStressLogData threadData;
 unsigned int fetched = 0;
 for (;;)
 {
 fetched = 0;
 hr = pThreadEnum->Next(1, &threadData, &fetched);
 if (FAILED(hr) || fetched == 0)
 break;
 threads.push_back({ threadData, 0 });
 }
 pThreadEnum.Release();

 if (threads.empty())
 {
 ExtOut("----- No thread logs in the image -----\n");
 return S_FALSE;
 }

 // Create message enumerators for each thread and find the latest timestamp
 struct ThreadMsgState
 {
 ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
 SOSStressMsgData currentMsg;
 bool hasMsg;
 uint64_t threadId;
 };

 unsigned int threadCount = (unsigned int)threads.size();
 ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
 if (msgStates == NULL)
 {
 return E_OUTOFMEMORY;
 }
 unsigned int msgStateCount = 0;
 uint64_t lastTimeStamp = 0;

 for (auto& t : threads)
 {
 ISOSStressLogMsgEnum* pMsgEnum = NULL;
 hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
 if (FAILED(hr) || pMsgEnum == NULL)
 continue;

 ThreadMsgState& state = msgStates[msgStateCount];
 state.pEnum = pMsgEnum;
 state.threadId = t.data.ThreadId;
 state.hasMsg = false;

 // Prime the enumerator with the first message
 fetched = 0;
 hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
 if (SUCCEEDED(hr) && fetched > 0)
 {
 state.hasMsg = true;
 if (state.currentMsg.Timestamp > lastTimeStamp)
 lastTimeStamp = state.currentMsg.Timestamp;
 }

 msgStateCount++;
 }

 // Open the output file
 if ((file = fopen(fileName, "w")) == NULL)
 {
 return GetLastError();
 }

 // Print header -- match legacy format exactly
 FILETIME startTime;
 memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
 double totalSecs = 0;
 if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
 {
 totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
 }
 FILETIME endTime;
 INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
 memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

 WCHAR timeBuff[64];
 fprintf(file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
 " levelToLog = %d\n"
 " MaxLogSizePerThread = 0x%x (%d)\n"
 " MaxTotalLogSize = 0x%x (%d)\n"
 " CurrentTotalLogChunk = %d\n"
 " ThreadsWithLogs = %d\n",
 logData.LoggedFacilities, logData.Level,
 logData.MaxSizePerThread, logData.MaxSizePerThread,
 logData.MaxSizeTotal, logData.MaxSizeTotal,
 logData.TotalChunks, (int)threads.size());

 fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
 fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
 fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
 fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

 fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
 fprintf(file, " ID (sec from start)\n");
 fprintf(file, "--------------------------------------------------------------------------------------\n");

 // Merge messages across all threads by timestamp (newest first)
 char format[257];
 format[256] = format[0] = 0;
 unsigned msgCtr = 0;

 for (;;)
 {
 // Find the thread with the newest message
 int newestIdx = -1;
 uint64_t newestTimestamp = 0;

 for (unsigned int i = 0; i < msgStateCount; i++)
 {
 if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
 {
 newestTimestamp = msgStates[i].currentMsg.Timestamp;
 newestIdx = i;
 }
 }

 if (newestIdx < 0)
 break;

 if (IsInterrupt())
 {
 fprintf(file, "----- Interrupted by user -----\n");
 break;
 }

 ThreadMsgState& state = msgStates[newestIdx];
 SOSStressMsgData& msg = state.currentMsg;

 if (msg.FormatString != 0)
 {
 // Read the format string from target memory
 hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
 if (hr != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

 // Read arguments
 void* args[StressMsg::maxArgCnt] = {};
 if (msg.ArgumentCount > 0)
 {
 CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
 unsigned int argsFetched = 0;
 unsigned int argsToFetch = msg.ArgumentCount;
 if (argsToFetch > StressMsg::maxArgCnt)
 argsToFetch = StressMsg::maxArgCnt;
 state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
 for (unsigned int i = 0; i < argsFetched; i++)
 args[i] = (void*)(size_t)argAddrs[i];
 }

 // Handle TaskSwitch marker the same way as the legacy path
 if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
 {
 fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
 state.threadId = (unsigned)(size_t)args[0];
 }
 else
 {
 formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
 }
 msgCtr++;
 }

 // Advance to the next message for this thread
 fetched = 0;
 hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
 if (fetched == 0 || FAILED(hr))
 {
 state.hasMsg = false;
 fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
 }
 }

 // Match legacy footer format
 fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 fclose(file);

 return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 hr = GetLastError();
 goto FREE_MEM;
 }
 hr = S_FALSE; // return false if there are no message to print to the log

 vDoOut(bDoGcHist, file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
 {
 TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
 hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
 if (hr != S_OK)
 if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 }
 ExtOut("\n");

 hr = (msgCtr > 0) ? S_OK : S_FALSE;

 vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 if (!bDoGcHist)
 {
Expand Down

35 changes: 28 additions & 7 deletions
src/SOS/Strike/strike.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 LoadRuntimeSymbols();

 const char* fileName = "StressLog.txt";
 CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
 BOOL useLegacy = FALSE;

 StringHolder sFileName, sLogAddr;
 CMDOption option[] =
 { // name, vptr, type, hasValue
 {"-addr", &sLogAddr.data, COSTRING, TRUE}
 {"-addr", &sLogAddr.data, COSTRING, TRUE},
 {"-legacy", &useLegacy, COBOOL, FALSE}
 };
 CMDValue arg[] =
 { // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
 fileName = sFileName.data;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

 // Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
 if (!useLegacy)
 {
 HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
 if (hrInterface17 != E_NOINTERFACE)
 {
 Status = hrInterface17;
 if (Status == S_OK)
 ExtOut("SUCCESS: Stress log dumped\n");
 else if (Status == S_FALSE)
 ExtOut("No Stress log in the image, no file written\n");
 else
 ExtOut("FAILURE: Stress log not dumped\n");
 return Status;
 }
 }

 // Fall back to the legacy raw-read path.
 LoadRuntimeSymbols();

 // allow users to specify -addr mscordbdi!StressLog::theLog, for example.
 if (sLogAddr.data != NULL)
 {
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



 Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

 if (Status == S_OK)
Expand Down

4 changes: 4 additions & 0 deletions
src/shared/inc/stresslog.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
 // This function is defined in the tools\strike\stressLogDump.cpp file
 static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

 // Try to dump via ISOSDacInterface17.
 // Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
 static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

 static BOOL StressLogOn(unsigned facility, unsigned level);
 static BOOL ETWLogOn(unsigned facility, unsigned level);
 static BOOL LogOn(unsigned facility, unsigned level);
Expand Down

9 changes: 9 additions & 0 deletions
src/shared/pal/prebuilt/idl/sospriv_i.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use ISOSDacInterface17 for DumpLog when available by max-charlamb · Pull Request #5873 · dotnet/diagnostics · GitHub
Skip to content
Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-charlamb
merged 1 commit into

from

Jun 22, 2026
 Merged


Use ISOSDacInterface17 for DumpLog when available
#5873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


237 changes: 234 additions & 3 deletions
src/SOS/Strike/stressLogDump.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
 return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
 // Try to get ISOSDacInterface17
 if (g_clrData == NULL)
 {
 return E_NOINTERFACE;
 }
 ReleaseHolder<ISOSDacInterface17> pSos17;
 HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
 if (FAILED(hr) || pSos17 == NULL)
 {
 return E_NOINTERFACE;
 }

 // Get stress log header data
 SOSStressLogData logData;
 hr = pSos17->GetStressLogData(&logData);
 if (hr != S_OK)
 {
 return FAILED(hr) ? hr : S_FALSE;
 }

 FILE* file = NULL;

 // Get thread enumerator
 ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
 hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
 if (FAILED(hr) || pThreadEnum == NULL)
 {
 return FAILED(hr) ? hr : E_FAIL;
 }

 // Collect all threads
 struct ThreadInfo
 {
 SOSThreadStressLogData data;
 uint64_t latestTimestamp;
 };

 std::vector<ThreadInfo> threads;
 SOSThreadStressLogData threadData;
 unsigned int fetched = 0;
 for (;;)
 {
 fetched = 0;
 hr = pThreadEnum->Next(1, &threadData, &fetched);
 if (FAILED(hr) || fetched == 0)
 break;
 threads.push_back({ threadData, 0 });
 }
 pThreadEnum.Release();

 if (threads.empty())
 {
 ExtOut("----- No thread logs in the image -----\n");
 return S_FALSE;
 }

 // Create message enumerators for each thread and find the latest timestamp
 struct ThreadMsgState
 {
 ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
 SOSStressMsgData currentMsg;
 bool hasMsg;
 uint64_t threadId;
 };

 unsigned int threadCount = (unsigned int)threads.size();
 ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
 if (msgStates == NULL)
 {
 return E_OUTOFMEMORY;
 }
 unsigned int msgStateCount = 0;
 uint64_t lastTimeStamp = 0;

 for (auto& t : threads)
 {
 ISOSStressLogMsgEnum* pMsgEnum = NULL;
 hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
 if (FAILED(hr) || pMsgEnum == NULL)
 continue;

 ThreadMsgState& state = msgStates[msgStateCount];
 state.pEnum = pMsgEnum;
 state.threadId = t.data.ThreadId;
 state.hasMsg = false;

 // Prime the enumerator with the first message
 fetched = 0;
 hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
 if (SUCCEEDED(hr) && fetched > 0)
 {
 state.hasMsg = true;
 if (state.currentMsg.Timestamp > lastTimeStamp)
 lastTimeStamp = state.currentMsg.Timestamp;
 }

 msgStateCount++;
 }

 // Open the output file
 if ((file = fopen(fileName, "w")) == NULL)
 {
 return GetLastError();
 }

 // Print header -- match legacy format exactly
 FILETIME startTime;
 memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
 double totalSecs = 0;
 if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
 {
 totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
 }
 FILETIME endTime;
 INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
 memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

 WCHAR timeBuff[64];
 fprintf(file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
 " levelToLog = %d\n"
 " MaxLogSizePerThread = 0x%x (%d)\n"
 " MaxTotalLogSize = 0x%x (%d)\n"
 " CurrentTotalLogChunk = %d\n"
 " ThreadsWithLogs = %d\n",
 logData.LoggedFacilities, logData.Level,
 logData.MaxSizePerThread, logData.MaxSizePerThread,
 logData.MaxSizeTotal, logData.MaxSizeTotal,
 logData.TotalChunks, (int)threads.size());

 fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
 fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
 fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
 fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

 fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
 fprintf(file, " ID (sec from start)\n");
 fprintf(file, "--------------------------------------------------------------------------------------\n");

 // Merge messages across all threads by timestamp (newest first)
 char format[257];
 format[256] = format[0] = 0;
 unsigned msgCtr = 0;

 for (;;)
 {
 // Find the thread with the newest message
 int newestIdx = -1;
 uint64_t newestTimestamp = 0;

 for (unsigned int i = 0; i < msgStateCount; i++)
 {
 if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
 {
 newestTimestamp = msgStates[i].currentMsg.Timestamp;
 newestIdx = i;
 }
 }

 if (newestIdx < 0)
 break;

 if (IsInterrupt())
 {
 fprintf(file, "----- Interrupted by user -----\n");
 break;
 }

 ThreadMsgState& state = msgStates[newestIdx];
 SOSStressMsgData& msg = state.currentMsg;

 if (msg.FormatString != 0)
 {
 // Read the format string from target memory
 hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
 if (hr != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

 // Read arguments
 void* args[StressMsg::maxArgCnt] = {};
 if (msg.ArgumentCount > 0)
 {
 CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
 unsigned int argsFetched = 0;
 unsigned int argsToFetch = msg.ArgumentCount;
 if (argsToFetch > StressMsg::maxArgCnt)
 argsToFetch = StressMsg::maxArgCnt;
 state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
 for (unsigned int i = 0; i < argsFetched; i++)
 args[i] = (void*)(size_t)argAddrs[i];
 }

 // Handle TaskSwitch marker the same way as the legacy path
 if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
 {
 fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
 state.threadId = (unsigned)(size_t)args[0];
 }
 else
 {
 formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
 }
 msgCtr++;
 }

 // Advance to the next message for this thread
 fetched = 0;
 hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
 if (fetched == 0 || FAILED(hr))
 {
 state.hasMsg = false;
 fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
 }
 }

 // Match legacy footer format
 fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 fclose(file);

 return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 hr = GetLastError();
 goto FREE_MEM;
 }
 hr = S_FALSE; // return false if there are no message to print to the log

 vDoOut(bDoGcHist, file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
 {
 TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
 hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
 if (hr != S_OK)
 if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 }
 ExtOut("\n");

 hr = (msgCtr > 0) ? S_OK : S_FALSE;

 vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 if (!bDoGcHist)
 {
Expand Down

35 changes: 28 additions & 7 deletions
src/SOS/Strike/strike.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 LoadRuntimeSymbols();

 const char* fileName = "StressLog.txt";
 CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
 BOOL useLegacy = FALSE;

 StringHolder sFileName, sLogAddr;
 CMDOption option[] =
 { // name, vptr, type, hasValue
 {"-addr", &sLogAddr.data, COSTRING, TRUE}
 {"-addr", &sLogAddr.data, COSTRING, TRUE},
 {"-legacy", &useLegacy, COBOOL, FALSE}
 };
 CMDValue arg[] =
 { // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
 fileName = sFileName.data;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

 // Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
 if (!useLegacy)
 {
 HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
 if (hrInterface17 != E_NOINTERFACE)
 {
 Status = hrInterface17;
 if (Status == S_OK)
 ExtOut("SUCCESS: Stress log dumped\n");
 else if (Status == S_FALSE)
 ExtOut("No Stress log in the image, no file written\n");
 else
 ExtOut("FAILURE: Stress log not dumped\n");
 return Status;
 }
 }

 // Fall back to the legacy raw-read path.
 LoadRuntimeSymbols();

 // allow users to specify -addr mscordbdi!StressLog::theLog, for example.
 if (sLogAddr.data != NULL)
 {
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



 Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

 if (Status == S_OK)
Expand Down

4 changes: 4 additions & 0 deletions
src/shared/inc/stresslog.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
 // This function is defined in the tools\strike\stressLogDump.cpp file
 static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

 // Try to dump via ISOSDacInterface17.
 // Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
 static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

 static BOOL StressLogOn(unsigned facility, unsigned level);
 static BOOL ETWLogOn(unsigned facility, unsigned level);
 static BOOL LogOn(unsigned facility, unsigned level);
Expand Down

9 changes: 9 additions & 0 deletions
src/shared/pal/prebuilt/idl/sospriv_i.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Use ISOSDacInterface17 for DumpLog when available by max-charlamb · Pull Request #5873 · dotnet/diagnostics · GitHub
Skip to content
Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-charlamb
merged 1 commit into

from

Jun 22, 2026
 Merged


Use ISOSDacInterface17 for DumpLog when available
#5873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


237 changes: 234 additions & 3 deletions
src/SOS/Strike/stressLogDump.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
 return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
 // Try to get ISOSDacInterface17
 if (g_clrData == NULL)
 {
 return E_NOINTERFACE;
 }
 ReleaseHolder<ISOSDacInterface17> pSos17;
 HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
 if (FAILED(hr) || pSos17 == NULL)
 {
 return E_NOINTERFACE;
 }

 // Get stress log header data
 SOSStressLogData logData;
 hr = pSos17->GetStressLogData(&logData);
 if (hr != S_OK)
 {
 return FAILED(hr) ? hr : S_FALSE;
 }

 FILE* file = NULL;

 // Get thread enumerator
 ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
 hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
 if (FAILED(hr) || pThreadEnum == NULL)
 {
 return FAILED(hr) ? hr : E_FAIL;
 }

 // Collect all threads
 struct ThreadInfo
 {
 SOSThreadStressLogData data;
 uint64_t latestTimestamp;
 };

 std::vector<ThreadInfo> threads;
 SOSThreadStressLogData threadData;
 unsigned int fetched = 0;
 for (;;)
 {
 fetched = 0;
 hr = pThreadEnum->Next(1, &threadData, &fetched);
 if (FAILED(hr) || fetched == 0)
 break;
 threads.push_back({ threadData, 0 });
 }
 pThreadEnum.Release();

 if (threads.empty())
 {
 ExtOut("----- No thread logs in the image -----\n");
 return S_FALSE;
 }

 // Create message enumerators for each thread and find the latest timestamp
 struct ThreadMsgState
 {
 ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
 SOSStressMsgData currentMsg;
 bool hasMsg;
 uint64_t threadId;
 };

 unsigned int threadCount = (unsigned int)threads.size();
 ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
 if (msgStates == NULL)
 {
 return E_OUTOFMEMORY;
 }
 unsigned int msgStateCount = 0;
 uint64_t lastTimeStamp = 0;

 for (auto& t : threads)
 {
 ISOSStressLogMsgEnum* pMsgEnum = NULL;
 hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
 if (FAILED(hr) || pMsgEnum == NULL)
 continue;

 ThreadMsgState& state = msgStates[msgStateCount];
 state.pEnum = pMsgEnum;
 state.threadId = t.data.ThreadId;
 state.hasMsg = false;

 // Prime the enumerator with the first message
 fetched = 0;
 hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
 if (SUCCEEDED(hr) && fetched > 0)
 {
 state.hasMsg = true;
 if (state.currentMsg.Timestamp > lastTimeStamp)
 lastTimeStamp = state.currentMsg.Timestamp;
 }

 msgStateCount++;
 }

 // Open the output file
 if ((file = fopen(fileName, "w")) == NULL)
 {
 return GetLastError();
 }

 // Print header -- match legacy format exactly
 FILETIME startTime;
 memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
 double totalSecs = 0;
 if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
 {
 totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
 }
 FILETIME endTime;
 INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
 memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

 WCHAR timeBuff[64];
 fprintf(file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
 " levelToLog = %d\n"
 " MaxLogSizePerThread = 0x%x (%d)\n"
 " MaxTotalLogSize = 0x%x (%d)\n"
 " CurrentTotalLogChunk = %d\n"
 " ThreadsWithLogs = %d\n",
 logData.LoggedFacilities, logData.Level,
 logData.MaxSizePerThread, logData.MaxSizePerThread,
 logData.MaxSizeTotal, logData.MaxSizeTotal,
 logData.TotalChunks, (int)threads.size());

 fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
 fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
 fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
 fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

 fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
 fprintf(file, " ID (sec from start)\n");
 fprintf(file, "--------------------------------------------------------------------------------------\n");

 // Merge messages across all threads by timestamp (newest first)
 char format[257];
 format[256] = format[0] = 0;
 unsigned msgCtr = 0;

 for (;;)
 {
 // Find the thread with the newest message
 int newestIdx = -1;
 uint64_t newestTimestamp = 0;

 for (unsigned int i = 0; i < msgStateCount; i++)
 {
 if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
 {
 newestTimestamp = msgStates[i].currentMsg.Timestamp;
 newestIdx = i;
 }
 }

 if (newestIdx < 0)
 break;

 if (IsInterrupt())
 {
 fprintf(file, "----- Interrupted by user -----\n");
 break;
 }

 ThreadMsgState& state = msgStates[newestIdx];
 SOSStressMsgData& msg = state.currentMsg;

 if (msg.FormatString != 0)
 {
 // Read the format string from target memory
 hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
 if (hr != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

 // Read arguments
 void* args[StressMsg::maxArgCnt] = {};
 if (msg.ArgumentCount > 0)
 {
 CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
 unsigned int argsFetched = 0;
 unsigned int argsToFetch = msg.ArgumentCount;
 if (argsToFetch > StressMsg::maxArgCnt)
 argsToFetch = StressMsg::maxArgCnt;
 state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
 for (unsigned int i = 0; i < argsFetched; i++)
 args[i] = (void*)(size_t)argAddrs[i];
 }

 // Handle TaskSwitch marker the same way as the legacy path
 if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
 {
 fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
 state.threadId = (unsigned)(size_t)args[0];
 }
 else
 {
 formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
 }
 msgCtr++;
 }

 // Advance to the next message for this thread
 fetched = 0;
 hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
 if (fetched == 0 || FAILED(hr))
 {
 state.hasMsg = false;
 fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
 }
 }

 // Match legacy footer format
 fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 fclose(file);

 return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 hr = GetLastError();
 goto FREE_MEM;
 }
 hr = S_FALSE; // return false if there are no message to print to the log

 vDoOut(bDoGcHist, file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
 {
 TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
 hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
 if (hr != S_OK)
 if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 }
 ExtOut("\n");

 hr = (msgCtr > 0) ? S_OK : S_FALSE;

 vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 if (!bDoGcHist)
 {
Expand Down

35 changes: 28 additions & 7 deletions
src/SOS/Strike/strike.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 LoadRuntimeSymbols();

 const char* fileName = "StressLog.txt";
 CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
 BOOL useLegacy = FALSE;

 StringHolder sFileName, sLogAddr;
 CMDOption option[] =
 { // name, vptr, type, hasValue
 {"-addr", &sLogAddr.data, COSTRING, TRUE}
 {"-addr", &sLogAddr.data, COSTRING, TRUE},
 {"-legacy", &useLegacy, COBOOL, FALSE}
 };
 CMDValue arg[] =
 { // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
 fileName = sFileName.data;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

 // Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
 if (!useLegacy)
 {
 HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
 if (hrInterface17 != E_NOINTERFACE)
 {
 Status = hrInterface17;
 if (Status == S_OK)
 ExtOut("SUCCESS: Stress log dumped\n");
 else if (Status == S_FALSE)
 ExtOut("No Stress log in the image, no file written\n");
 else
 ExtOut("FAILURE: Stress log not dumped\n");
 return Status;
 }
 }

 // Fall back to the legacy raw-read path.
 LoadRuntimeSymbols();

 // allow users to specify -addr mscordbdi!StressLog::theLog, for example.
 if (sLogAddr.data != NULL)
 {
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



 Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

 if (Status == S_OK)
Expand Down

4 changes: 4 additions & 0 deletions
src/shared/inc/stresslog.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
 // This function is defined in the tools\strike\stressLogDump.cpp file
 static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

 // Try to dump via ISOSDacInterface17.
 // Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
 static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

 static BOOL StressLogOn(unsigned facility, unsigned level);
 static BOOL ETWLogOn(unsigned facility, unsigned level);
 static BOOL LogOn(unsigned facility, unsigned level);
Expand Down

9 changes: 9 additions & 0 deletions
src/shared/pal/prebuilt/idl/sospriv_i.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use ISOSDacInterface17 for DumpLog when available by max-charlamb · Pull Request #5873 · dotnet/diagnostics · GitHub
Skip to content
Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-charlamb
merged 1 commit into

from

Jun 22, 2026
 Merged


Use ISOSDacInterface17 for DumpLog when available
#5873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


237 changes: 234 additions & 3 deletions
src/SOS/Strike/stressLogDump.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
 return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
 // Try to get ISOSDacInterface17
 if (g_clrData == NULL)
 {
 return E_NOINTERFACE;
 }
 ReleaseHolder<ISOSDacInterface17> pSos17;
 HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
 if (FAILED(hr) || pSos17 == NULL)
 {
 return E_NOINTERFACE;
 }

 // Get stress log header data
 SOSStressLogData logData;
 hr = pSos17->GetStressLogData(&logData);
 if (hr != S_OK)
 {
 return FAILED(hr) ? hr : S_FALSE;
 }

 FILE* file = NULL;

 // Get thread enumerator
 ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
 hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
 if (FAILED(hr) || pThreadEnum == NULL)
 {
 return FAILED(hr) ? hr : E_FAIL;
 }

 // Collect all threads
 struct ThreadInfo
 {
 SOSThreadStressLogData data;
 uint64_t latestTimestamp;
 };

 std::vector<ThreadInfo> threads;
 SOSThreadStressLogData threadData;
 unsigned int fetched = 0;
 for (;;)
 {
 fetched = 0;
 hr = pThreadEnum->Next(1, &threadData, &fetched);
 if (FAILED(hr) || fetched == 0)
 break;
 threads.push_back({ threadData, 0 });
 }
 pThreadEnum.Release();

 if (threads.empty())
 {
 ExtOut("----- No thread logs in the image -----\n");
 return S_FALSE;
 }

 // Create message enumerators for each thread and find the latest timestamp
 struct ThreadMsgState
 {
 ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
 SOSStressMsgData currentMsg;
 bool hasMsg;
 uint64_t threadId;
 };

 unsigned int threadCount = (unsigned int)threads.size();
 ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
 if (msgStates == NULL)
 {
 return E_OUTOFMEMORY;
 }
 unsigned int msgStateCount = 0;
 uint64_t lastTimeStamp = 0;

 for (auto& t : threads)
 {
 ISOSStressLogMsgEnum* pMsgEnum = NULL;
 hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
 if (FAILED(hr) || pMsgEnum == NULL)
 continue;

 ThreadMsgState& state = msgStates[msgStateCount];
 state.pEnum = pMsgEnum;
 state.threadId = t.data.ThreadId;
 state.hasMsg = false;

 // Prime the enumerator with the first message
 fetched = 0;
 hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
 if (SUCCEEDED(hr) && fetched > 0)
 {
 state.hasMsg = true;
 if (state.currentMsg.Timestamp > lastTimeStamp)
 lastTimeStamp = state.currentMsg.Timestamp;
 }

 msgStateCount++;
 }

 // Open the output file
 if ((file = fopen(fileName, "w")) == NULL)
 {
 return GetLastError();
 }

 // Print header -- match legacy format exactly
 FILETIME startTime;
 memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
 double totalSecs = 0;
 if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
 {
 totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
 }
 FILETIME endTime;
 INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
 memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

 WCHAR timeBuff[64];
 fprintf(file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
 " levelToLog = %d\n"
 " MaxLogSizePerThread = 0x%x (%d)\n"
 " MaxTotalLogSize = 0x%x (%d)\n"
 " CurrentTotalLogChunk = %d\n"
 " ThreadsWithLogs = %d\n",
 logData.LoggedFacilities, logData.Level,
 logData.MaxSizePerThread, logData.MaxSizePerThread,
 logData.MaxSizeTotal, logData.MaxSizeTotal,
 logData.TotalChunks, (int)threads.size());

 fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
 fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
 fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
 fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

 fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
 fprintf(file, " ID (sec from start)\n");
 fprintf(file, "--------------------------------------------------------------------------------------\n");

 // Merge messages across all threads by timestamp (newest first)
 char format[257];
 format[256] = format[0] = 0;
 unsigned msgCtr = 0;

 for (;;)
 {
 // Find the thread with the newest message
 int newestIdx = -1;
 uint64_t newestTimestamp = 0;

 for (unsigned int i = 0; i < msgStateCount; i++)
 {
 if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
 {
 newestTimestamp = msgStates[i].currentMsg.Timestamp;
 newestIdx = i;
 }
 }

 if (newestIdx < 0)
 break;

 if (IsInterrupt())
 {
 fprintf(file, "----- Interrupted by user -----\n");
 break;
 }

 ThreadMsgState& state = msgStates[newestIdx];
 SOSStressMsgData& msg = state.currentMsg;

 if (msg.FormatString != 0)
 {
 // Read the format string from target memory
 hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
 if (hr != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

 // Read arguments
 void* args[StressMsg::maxArgCnt] = {};
 if (msg.ArgumentCount > 0)
 {
 CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
 unsigned int argsFetched = 0;
 unsigned int argsToFetch = msg.ArgumentCount;
 if (argsToFetch > StressMsg::maxArgCnt)
 argsToFetch = StressMsg::maxArgCnt;
 state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
 for (unsigned int i = 0; i < argsFetched; i++)
 args[i] = (void*)(size_t)argAddrs[i];
 }

 // Handle TaskSwitch marker the same way as the legacy path
 if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
 {
 fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
 state.threadId = (unsigned)(size_t)args[0];
 }
 else
 {
 formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
 }
 msgCtr++;
 }

 // Advance to the next message for this thread
 fetched = 0;
 hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
 if (fetched == 0 || FAILED(hr))
 {
 state.hasMsg = false;
 fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
 }
 }

 // Match legacy footer format
 fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 fclose(file);

 return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 hr = GetLastError();
 goto FREE_MEM;
 }
 hr = S_FALSE; // return false if there are no message to print to the log

 vDoOut(bDoGcHist, file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
 {
 TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
 hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
 if (hr != S_OK)
 if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 }
 ExtOut("\n");

 hr = (msgCtr > 0) ? S_OK : S_FALSE;

 vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 if (!bDoGcHist)
 {
Expand Down

35 changes: 28 additions & 7 deletions
src/SOS/Strike/strike.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 LoadRuntimeSymbols();

 const char* fileName = "StressLog.txt";
 CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
 BOOL useLegacy = FALSE;

 StringHolder sFileName, sLogAddr;
 CMDOption option[] =
 { // name, vptr, type, hasValue
 {"-addr", &sLogAddr.data, COSTRING, TRUE}
 {"-addr", &sLogAddr.data, COSTRING, TRUE},
 {"-legacy", &useLegacy, COBOOL, FALSE}
 };
 CMDValue arg[] =
 { // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
 fileName = sFileName.data;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

 // Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
 if (!useLegacy)
 {
 HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
 if (hrInterface17 != E_NOINTERFACE)
 {
 Status = hrInterface17;
 if (Status == S_OK)
 ExtOut("SUCCESS: Stress log dumped\n");
 else if (Status == S_FALSE)
 ExtOut("No Stress log in the image, no file written\n");
 else
 ExtOut("FAILURE: Stress log not dumped\n");
 return Status;
 }
 }

 // Fall back to the legacy raw-read path.
 LoadRuntimeSymbols();

 // allow users to specify -addr mscordbdi!StressLog::theLog, for example.
 if (sLogAddr.data != NULL)
 {
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



 Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

 if (Status == S_OK)
Expand Down

4 changes: 4 additions & 0 deletions
src/shared/inc/stresslog.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
 // This function is defined in the tools\strike\stressLogDump.cpp file
 static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

 // Try to dump via ISOSDacInterface17.
 // Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
 static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

 static BOOL StressLogOn(unsigned facility, unsigned level);
 static BOOL ETWLogOn(unsigned facility, unsigned level);
 static BOOL LogOn(unsigned facility, unsigned level);
Expand Down

9 changes: 9 additions & 0 deletions
src/shared/pal/prebuilt/idl/sospriv_i.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Use ISOSDacInterface17 for DumpLog when available by max-charlamb · Pull Request #5873 · dotnet/diagnostics · GitHub
Skip to content
Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-charlamb
merged 1 commit into

from

Jun 22, 2026
 Merged


Use ISOSDacInterface17 for DumpLog when available
#5873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


237 changes: 234 additions & 3 deletions
src/SOS/Strike/stressLogDump.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
 return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
 // Try to get ISOSDacInterface17
 if (g_clrData == NULL)
 {
 return E_NOINTERFACE;
 }
 ReleaseHolder<ISOSDacInterface17> pSos17;
 HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
 if (FAILED(hr) || pSos17 == NULL)
 {
 return E_NOINTERFACE;
 }

 // Get stress log header data
 SOSStressLogData logData;
 hr = pSos17->GetStressLogData(&logData);
 if (hr != S_OK)
 {
 return FAILED(hr) ? hr : S_FALSE;
 }

 FILE* file = NULL;

 // Get thread enumerator
 ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
 hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
 if (FAILED(hr) || pThreadEnum == NULL)
 {
 return FAILED(hr) ? hr : E_FAIL;
 }

 // Collect all threads
 struct ThreadInfo
 {
 SOSThreadStressLogData data;
 uint64_t latestTimestamp;
 };

 std::vector<ThreadInfo> threads;
 SOSThreadStressLogData threadData;
 unsigned int fetched = 0;
 for (;;)
 {
 fetched = 0;
 hr = pThreadEnum->Next(1, &threadData, &fetched);
 if (FAILED(hr) || fetched == 0)
 break;
 threads.push_back({ threadData, 0 });
 }
 pThreadEnum.Release();

 if (threads.empty())
 {
 ExtOut("----- No thread logs in the image -----\n");
 return S_FALSE;
 }

 // Create message enumerators for each thread and find the latest timestamp
 struct ThreadMsgState
 {
 ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
 SOSStressMsgData currentMsg;
 bool hasMsg;
 uint64_t threadId;
 };

 unsigned int threadCount = (unsigned int)threads.size();
 ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
 if (msgStates == NULL)
 {
 return E_OUTOFMEMORY;
 }
 unsigned int msgStateCount = 0;
 uint64_t lastTimeStamp = 0;

 for (auto& t : threads)
 {
 ISOSStressLogMsgEnum* pMsgEnum = NULL;
 hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
 if (FAILED(hr) || pMsgEnum == NULL)
 continue;

 ThreadMsgState& state = msgStates[msgStateCount];
 state.pEnum = pMsgEnum;
 state.threadId = t.data.ThreadId;
 state.hasMsg = false;

 // Prime the enumerator with the first message
 fetched = 0;
 hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
 if (SUCCEEDED(hr) && fetched > 0)
 {
 state.hasMsg = true;
 if (state.currentMsg.Timestamp > lastTimeStamp)
 lastTimeStamp = state.currentMsg.Timestamp;
 }

 msgStateCount++;
 }

 // Open the output file
 if ((file = fopen(fileName, "w")) == NULL)
 {
 return GetLastError();
 }

 // Print header -- match legacy format exactly
 FILETIME startTime;
 memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
 double totalSecs = 0;
 if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
 {
 totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
 }
 FILETIME endTime;
 INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
 memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

 WCHAR timeBuff[64];
 fprintf(file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
 " levelToLog = %d\n"
 " MaxLogSizePerThread = 0x%x (%d)\n"
 " MaxTotalLogSize = 0x%x (%d)\n"
 " CurrentTotalLogChunk = %d\n"
 " ThreadsWithLogs = %d\n",
 logData.LoggedFacilities, logData.Level,
 logData.MaxSizePerThread, logData.MaxSizePerThread,
 logData.MaxSizeTotal, logData.MaxSizeTotal,
 logData.TotalChunks, (int)threads.size());

 fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
 fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
 fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
 fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

 fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
 fprintf(file, " ID (sec from start)\n");
 fprintf(file, "--------------------------------------------------------------------------------------\n");

 // Merge messages across all threads by timestamp (newest first)
 char format[257];
 format[256] = format[0] = 0;
 unsigned msgCtr = 0;

 for (;;)
 {
 // Find the thread with the newest message
 int newestIdx = -1;
 uint64_t newestTimestamp = 0;

 for (unsigned int i = 0; i < msgStateCount; i++)
 {
 if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
 {
 newestTimestamp = msgStates[i].currentMsg.Timestamp;
 newestIdx = i;
 }
 }

 if (newestIdx < 0)
 break;

 if (IsInterrupt())
 {
 fprintf(file, "----- Interrupted by user -----\n");
 break;
 }

 ThreadMsgState& state = msgStates[newestIdx];
 SOSStressMsgData& msg = state.currentMsg;

 if (msg.FormatString != 0)
 {
 // Read the format string from target memory
 hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
 if (hr != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

 // Read arguments
 void* args[StressMsg::maxArgCnt] = {};
 if (msg.ArgumentCount > 0)
 {
 CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
 unsigned int argsFetched = 0;
 unsigned int argsToFetch = msg.ArgumentCount;
 if (argsToFetch > StressMsg::maxArgCnt)
 argsToFetch = StressMsg::maxArgCnt;
 state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
 for (unsigned int i = 0; i < argsFetched; i++)
 args[i] = (void*)(size_t)argAddrs[i];
 }

 // Handle TaskSwitch marker the same way as the legacy path
 if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
 {
 fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
 state.threadId = (unsigned)(size_t)args[0];
 }
 else
 {
 formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
 }
 msgCtr++;
 }

 // Advance to the next message for this thread
 fetched = 0;
 hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
 if (fetched == 0 || FAILED(hr))
 {
 state.hasMsg = false;
 fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
 }
 }

 // Match legacy footer format
 fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 fclose(file);

 return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 hr = GetLastError();
 goto FREE_MEM;
 }
 hr = S_FALSE; // return false if there are no message to print to the log

 vDoOut(bDoGcHist, file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
 {
 TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
 hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
 if (hr != S_OK)
 if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 }
 ExtOut("\n");

 hr = (msgCtr > 0) ? S_OK : S_FALSE;

 vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 if (!bDoGcHist)
 {
Expand Down

35 changes: 28 additions & 7 deletions
src/SOS/Strike/strike.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 LoadRuntimeSymbols();

 const char* fileName = "StressLog.txt";
 CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
 BOOL useLegacy = FALSE;

 StringHolder sFileName, sLogAddr;
 CMDOption option[] =
 { // name, vptr, type, hasValue
 {"-addr", &sLogAddr.data, COSTRING, TRUE}
 {"-addr", &sLogAddr.data, COSTRING, TRUE},
 {"-legacy", &useLegacy, COBOOL, FALSE}
 };
 CMDValue arg[] =
 { // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
 fileName = sFileName.data;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

 // Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
 if (!useLegacy)
 {
 HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
 if (hrInterface17 != E_NOINTERFACE)
 {
 Status = hrInterface17;
 if (Status == S_OK)
 ExtOut("SUCCESS: Stress log dumped\n");
 else if (Status == S_FALSE)
 ExtOut("No Stress log in the image, no file written\n");
 else
 ExtOut("FAILURE: Stress log not dumped\n");
 return Status;
 }
 }

 // Fall back to the legacy raw-read path.
 LoadRuntimeSymbols();

 // allow users to specify -addr mscordbdi!StressLog::theLog, for example.
 if (sLogAddr.data != NULL)
 {
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



 Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

 if (Status == S_OK)
Expand Down

4 changes: 4 additions & 0 deletions
src/shared/inc/stresslog.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
 // This function is defined in the tools\strike\stressLogDump.cpp file
 static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

 // Try to dump via ISOSDacInterface17.
 // Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
 static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

 static BOOL StressLogOn(unsigned facility, unsigned level);
 static BOOL ETWLogOn(unsigned facility, unsigned level);
 static BOOL LogOn(unsigned facility, unsigned level);
Expand Down

9 changes: 9 additions & 0 deletions
src/shared/pal/prebuilt/idl/sospriv_i.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Use ISOSDacInterface17 for DumpLog when available by max-charlamb · Pull Request #5873 · dotnet/diagnostics · GitHub
Skip to content
Use ISOSDacInterface17 for DumpLog when available#5873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

max-charlamb
merged 1 commit into

from

Jun 22, 2026
 Merged


Use ISOSDacInterface17 for DumpLog when available
#5873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


237 changes: 234 additions & 3 deletions
src/SOS/Strike/stressLogDump.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
#include "util.h"
#include <stdio.h>
#include <ctype.h>
#include <vector>

#ifndef STRESS_LOG
#define STRESS_LOG
Expand DownExpand Up@@ -361,6 +362,236 @@ StressMsg* GetStressMsgInLatestVersion(StressMsg* rawMsg, int version)
 return rawMsg;
}

/*********************************************************************************/
// Try to dump the stress log using ISOSDacInterface17.
// Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if the
// interface is not available (caller should fall back to legacy path).
HRESULT StressLog::DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack)
{
 // Try to get ISOSDacInterface17
 if (g_clrData == NULL)
 {
 return E_NOINTERFACE;
 }
 ReleaseHolder<ISOSDacInterface17> pSos17;
 HRESULT hr = g_clrData->QueryInterface(__uuidof(ISOSDacInterface17), (void**)&pSos17);
 if (FAILED(hr) || pSos17 == NULL)
 {
 return E_NOINTERFACE;
 }

 // Get stress log header data
 SOSStressLogData logData;
 hr = pSos17->GetStressLogData(&logData);
 if (hr != S_OK)
 {
 return FAILED(hr) ? hr : S_FALSE;
 }

 FILE* file = NULL;

 // Get thread enumerator
 ReleaseHolder<ISOSStressLogThreadEnum> pThreadEnum;
 hr = pSos17->GetStressLogThreadEnumerator(pThreadEnum.GetAddr());
 if (FAILED(hr) || pThreadEnum == NULL)
 {
 return FAILED(hr) ? hr : E_FAIL;
 }

 // Collect all threads
 struct ThreadInfo
 {
 SOSThreadStressLogData data;
 uint64_t latestTimestamp;
 };

 std::vector<ThreadInfo> threads;
 SOSThreadStressLogData threadData;
 unsigned int fetched = 0;
 for (;;)
 {
 fetched = 0;
 hr = pThreadEnum->Next(1, &threadData, &fetched);
 if (FAILED(hr) || fetched == 0)
 break;
 threads.push_back({ threadData, 0 });
 }
 pThreadEnum.Release();

 if (threads.empty())
 {
 ExtOut("----- No thread logs in the image -----\n");
 return S_FALSE;
 }

 // Create message enumerators for each thread and find the latest timestamp
 struct ThreadMsgState
 {
 ReleaseHolder<ISOSStressLogMsgEnum> pEnum;
 SOSStressMsgData currentMsg;
 bool hasMsg;
 uint64_t threadId;
 };

 unsigned int threadCount = (unsigned int)threads.size();
 ArrayHolder<ThreadMsgState> msgStates = new (std::nothrow) ThreadMsgState[threadCount];
 if (msgStates == NULL)
 {
 return E_OUTOFMEMORY;
 }
 unsigned int msgStateCount = 0;
 uint64_t lastTimeStamp = 0;

 for (auto& t : threads)
 {
 ISOSStressLogMsgEnum* pMsgEnum = NULL;
 hr = pSos17->GetStressLogMessageEnumerator(t.data.ThreadLogAddress, &pMsgEnum);
 if (FAILED(hr) || pMsgEnum == NULL)
 continue;

 ThreadMsgState& state = msgStates[msgStateCount];
 state.pEnum = pMsgEnum;
 state.threadId = t.data.ThreadId;
 state.hasMsg = false;

 // Prime the enumerator with the first message
 fetched = 0;
 hr = pMsgEnum->Next(1, &state.currentMsg, &fetched);
 if (SUCCEEDED(hr) && fetched > 0)
 {
 state.hasMsg = true;
 if (state.currentMsg.Timestamp > lastTimeStamp)
 lastTimeStamp = state.currentMsg.Timestamp;
 }

 msgStateCount++;
 }

 // Open the output file
 if ((file = fopen(fileName, "w")) == NULL)
 {
 return GetLastError();
 }

 // Print header -- match legacy format exactly
 FILETIME startTime;
 memcpy(&startTime, &logData.StartTime, sizeof(FILETIME));
 double totalSecs = 0;
 if (lastTimeStamp > logData.StartTimestamp && logData.TickFrequency > 0)
 {
 totalSecs = ((double)(lastTimeStamp - logData.StartTimestamp)) / logData.TickFrequency;
 }
 FILETIME endTime;
 INT64 endTimeVal = *((INT64*)&startTime) + ((INT64)(totalSecs * 1.0E7));
 memcpy(&endTime, &endTimeVal, sizeof(FILETIME));

 WCHAR timeBuff[64];
 fprintf(file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
 " levelToLog = %d\n"
 " MaxLogSizePerThread = 0x%x (%d)\n"
 " MaxTotalLogSize = 0x%x (%d)\n"
 " CurrentTotalLogChunk = %d\n"
 " ThreadsWithLogs = %d\n",
 logData.LoggedFacilities, logData.Level,
 logData.MaxSizePerThread, logData.MaxSizePerThread,
 logData.MaxSizeTotal, logData.MaxSizeTotal,
 logData.TotalChunks, (int)threads.size());

 fprintf(file, " Clock frequency = %5.3f GHz\n", logData.TickFrequency / 1.0E9);
 fprintf(file, " Start time %S\n", getTime(&startTime, timeBuff, 64));
 fprintf(file, " Last message time %S\n", getTime(&endTime, timeBuff, 64));
 fprintf(file, " Total elapsed time %5.3f sec\n", totalSecs);

 fprintf(file, "\nTHREAD TIMESTAMP FACILITY MESSAGE\n");
 fprintf(file, " ID (sec from start)\n");
 fprintf(file, "--------------------------------------------------------------------------------------\n");

 // Merge messages across all threads by timestamp (newest first)
 char format[257];
 format[256] = format[0] = 0;
 unsigned msgCtr = 0;

 for (;;)
 {
 // Find the thread with the newest message
 int newestIdx = -1;
 uint64_t newestTimestamp = 0;

 for (unsigned int i = 0; i < msgStateCount; i++)
 {
 if (msgStates[i].hasMsg && msgStates[i].currentMsg.Timestamp > newestTimestamp)
 {
 newestTimestamp = msgStates[i].currentMsg.Timestamp;
 newestIdx = i;
 }
 }

 if (newestIdx < 0)
 break;

 if (IsInterrupt())
 {
 fprintf(file, "----- Interrupted by user -----\n");
 break;
 }

 ThreadMsgState& state = msgStates[newestIdx];
 SOSStressMsgData& msg = state.currentMsg;

 if (msg.FormatString != 0)
 {
 // Read the format string from target memory
 hr = memCallBack->ReadVirtual(msg.FormatString, format, 256, 0);
 if (hr != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double)(msg.Timestamp - logData.StartTimestamp)) / logData.TickFrequency;

 // Read arguments
 void* args[StressMsg::maxArgCnt] = {};
 if (msg.ArgumentCount > 0)
 {
 CLRDATA_ADDRESS argAddrs[StressMsg::maxArgCnt] = {};
 unsigned int argsFetched = 0;
 unsigned int argsToFetch = msg.ArgumentCount;
 if (argsToFetch > StressMsg::maxArgCnt)
 argsToFetch = StressMsg::maxArgCnt;
 state.pEnum->GetArguments(0, argsToFetch, argAddrs, &argsFetched);
 for (unsigned int i = 0; i < argsFetched; i++)
 args[i] = (void*)(size_t)argAddrs[i];
 }

 // Handle TaskSwitch marker the same way as the legacy path
 if (strcmp(format, ThreadStressLog::TaskSwitchMsg()) == 0)
 {
 fprintf(file, "Task was switched from %x\n", (unsigned)(size_t)args[0]);
 state.threadId = (unsigned)(size_t)args[0];
 }
 else
 {
 formatOutput(memCallBack, file, format, (unsigned)state.threadId, deltaTime, msg.Facility, args);
 }
 msgCtr++;
 }

 // Advance to the next message for this thread
 fetched = 0;
 hr = state.pEnum->Next(1, &state.currentMsg, &fetched);
 if (fetched == 0 || FAILED(hr))
 {
 state.hasMsg = false;
 fprintf(file, "------------ Last message from thread %x -----------\n", (unsigned)state.threadId);
 }
 }

 // Match legacy footer format
 fprintf(file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 fclose(file);

 return msgCtr > 0 ? S_OK : S_FALSE;
}

/*********************************************************************************/
HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugDataSpaces* memCallBack)
{
Expand DownExpand Up@@ -482,7 +713,6 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 hr = GetLastError();
 goto FREE_MEM;
 }
 hr = S_FALSE; // return false if there are no message to print to the log

 vDoOut(bDoGcHist, file, "STRESS LOG:\n"
 " facilitiesToLog = 0x%x\n"
Expand DownExpand Up@@ -540,8 +770,7 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 if (latestMsg->GetFormatOffset() != 0 && !latestLog->CompletedDump())
 {
 TADDR taFmt = GetFormatAddr(inProcLog, latestMsg->GetFormatOffset(), bHasModuleTable);
 hr = memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0);
 if (hr != S_OK)
 if (memCallBack->ReadVirtual(TO_CDADDR(taFmt), format, 256, 0) != S_OK)
 strcpy_s(format, ARRAY_SIZE(format), "Could not read address of format string");

 double deltaTime = ((double) (latestMsg->GetTimeStamp() - inProcLog.startTimeStamp)) / inProcLog.tickFrequency;
Expand DownExpand Up@@ -588,6 +817,8 @@ HRESULT StressLog::Dump(ULONG64 outProcLog, const char* fileName, struct IDebugD
 }
 ExtOut("\n");

 hr = (msgCtr > 0) ? S_OK : S_FALSE;

 vDoOut(bDoGcHist, file, "---------------------------- %d total entries ------------------------------------\n", msgCtr);
 if (!bDoGcHist)
 {
Expand Down

35 changes: 28 additions & 7 deletions
src/SOS/Strike/strike.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7573,6 +7573,9 @@ HRESULT GetIntermediateLangMap(BOOL bIL, const DacpCodeHeaderData& codeHeaderDat
* will dump the stress log associated with any DLL linked *
* against utilcode.lib, most commonly mscordbi.dll *
* (e.g. !DumpLog -addr mscordbi!StressLog::theLog) *
* !DumpLog -legacy [filename] *
* will force the legacy raw-read path instead of *
* ISOSDacInterface17 *
* *
\**********************************************************************/
DECLARE_API(DumpLog)
Expand All@@ -7593,15 +7596,15 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 LoadRuntimeSymbols();

 const char* fileName = "StressLog.txt";
 CLRDATA_ADDRESS StressLogAddress = (TADDR)0;
 BOOL useLegacy = FALSE;

 StringHolder sFileName, sLogAddr;
 CMDOption option[] =
 { // name, vptr, type, hasValue
 {"-addr", &sLogAddr.data, COSTRING, TRUE}
 {"-addr", &sLogAddr.data, COSTRING, TRUE},
 {"-legacy", &useLegacy, COBOOL, FALSE}
 };
 CMDValue arg[] =
 { // vptr, type
Expand All@@ -7617,6 +7620,28 @@ DECLARE_API(DumpLog)
 fileName = sFileName.data;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);

 // Try the cDAC-based path (ISOSDacInterface17) first unless -legacy is specified.
 if (!useLegacy)
 {
 HRESULT hrInterface17 = StressLog::DumpViaInterface17(fileName, g_ExtData);
 if (hrInterface17 != E_NOINTERFACE)
 {
 Status = hrInterface17;
 if (Status == S_OK)
 ExtOut("SUCCESS: Stress log dumped\n");
 else if (Status == S_FALSE)
 ExtOut("No Stress log in the image, no file written\n");
 else
 ExtOut("FAILURE: Stress log not dumped\n");
 return Status;
 }
 }

 // Fall back to the legacy raw-read path.
 LoadRuntimeSymbols();

 // allow users to specify -addr mscordbdi!StressLog::theLog, for example.
 if (sLogAddr.data != NULL)
 {
Expand DownExpand Up@@ -7654,10 +7679,6 @@ DECLARE_API(DumpLog)
 return E_FAIL;
 }

 ExtOut("Attempting to dump Stress log to file '%s'\n", fileName);



 Status = StressLog::Dump(StressLogAddress, fileName, g_ExtData);

 if (Status == S_OK)
Expand Down

4 changes: 4 additions & 0 deletions
src/shared/inc/stresslog.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -211,6 +211,10 @@ class StressLog {
 // This function is defined in the tools\strike\stressLogDump.cpp file
 static HRESULT Dump(ULONG64 logAddr, const char* fileName, struct IDebugDataSpaces* memCallBack);

 // Try to dump via ISOSDacInterface17.
 // Returns S_OK on success, S_FALSE if no messages, or E_NOINTERFACE if unavailable.
 static HRESULT DumpViaInterface17(const char* fileName, struct IDebugDataSpaces* memCallBack);

 static BOOL StressLogOn(unsigned facility, unsigned level);
 static BOOL ETWLogOn(unsigned facility, unsigned level);
 static BOOL LogOn(unsigned facility, unsigned level);
Expand Down

9 changes: 9 additions & 0 deletions
src/shared/pal/prebuilt/idl/sospriv_i.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,15 @@ MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface15,0x7ed81261,0x52a9,0x4a23,0xa3,0x58,

MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface16,0x4ba12ff8,0xdaac,0x4e43,0xac,0x56,0x98,0xcf,0x8d,0x5c,0x59,0x5d);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogThreadEnum,0x94a2bd3d,0xab3d,0x43bf,0x81,0xd8,0x3a,0xe9,0x6b,0x8e,0x33,0xcd);


MIDL_DEFINE_GUID(IID, IID_ISOSStressLogMsgEnum,0x437cb033,0xafe7,0x4c0f,0xa4,0xa7,0x82,0xc8,0x91,0xbc,0x04,0x9e);


MIDL_DEFINE_GUID(IID, IID_ISOSDacInterface17,0x2f4bb585,0xed50,0x479e,0xbb,0xe0,0x10,0xa9,0x5a,0x5d,0xa3,0xbb);

#undef MIDL_DEFINE_GUID

#ifdef __cplusplus
Expand Down
Loading
Loading