Skip to content
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

Jump to bottom

Fix double printing in StressLog and simplify stresslog macros #105420

Merged
merged 10 commits into from
Jul 25, 2024
Merged

Fix double printing in StressLog and simplify stresslog macros #105420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4209da3
Remove unused and single-use specialized stresslog macros.
jkoritzinsky Jul 24, 2024
beda37c
Clean up StressLogMsg with variadic templates and add better support …
jkoritzinsky Jul 24, 2024
5a09c87
Do the same cleanup on the NativeAOT stresslog implementation.
jkoritzinsky Jul 24, 2024
bf34784
Make formatting consistent
jkoritzinsky Jul 24, 2024
5ea22bd
Clean up LogMsgOL in CoreCLR like in NativeAOT
jkoritzinsky Jul 24, 2024
180dde1
Refactor stresslog macros to collapse them into simpler definitions t…
jkoritzinsky Jul 24, 2024
2b99900
Fix unix failures in CI
jkoritzinsky Jul 24, 2024
153251d
Move specializations out of StressLog and StressLogMsg
jkoritzinsky Jul 24, 2024
faa8218
Add an affordance for 64-bit integer parameters on 32-bit platforms u…
jkoritzinsky Jul 24, 2024
36654de
Make specializations inline
jkoritzinsky Jul 24, 2024
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
Prev Previous commit
Next Next commit
Move specializations out of StressLog and StressLogMsg
  • Loading branch information
@jkoritzinsky
jkoritzinsky committed Jul 24, 2024
commit 153251dd9a6c20cb003fcefdc7185da889dca370
28 changes: 14 additions & 14 deletions src/coreclr/gc/env/gcenv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,20 +178,6 @@ struct StressLogMsg
return (void*)(size_t)arg;
}

template<>
void* ConvertArgument(float arg) = delete;

#if TARGET_64BIT
template<>
void* ConvertArgument(double arg)
{
return (void*)(size_t)(*((uint64_t*)&arg));
}
#else
template<>
void* ConvertArgument(double arg) = delete;
#endif

StressLogMsg(const char* format) : m_cArgs(0), m_format(format)
{
}
Expand All @@ -206,6 +192,20 @@ struct StressLogMsg
}
};

template<>
void* StressLogMsg::ConvertArgument(float arg) = delete;

#if TARGET_64BIT
template<>
void* StressLogMsg::ConvertArgument(double arg)
{
return (void*)(size_t)(*((uint64_t*)&arg));
}
#else
template<>
void* StressLogMsg::ConvertArgument(double arg) = delete;
#endif

class StressLog
{
public:
Expand Down
29 changes: 15 additions & 14 deletions src/coreclr/inc/stresslog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,20 +325,6 @@ class StressLog {
return (void*)(size_t)arg;
}

template<>
void* ConvertArgument(float arg) = delete;

#if TARGET_64BIT
template<>
void* ConvertArgument(double arg)
{
return (void*)(size_t)(*((uint64_t*)&arg));
}
#else
template<>
void* ConvertArgument(double arg) = delete;
#endif

// Support functions for STRESS_LOG_VA
// We disable the warning "conversion from 'type' to 'type' of greater size" since everything will
// end up on the stack, and LogMsg will know the size of the variable based on the format string.
Expand Down Expand Up @@ -384,6 +370,21 @@ typedef USHORT
static StressLog theLog; // We only have one log, and this is it
};


template<>
void* StressLog::ConvertArgument(float arg) = delete;

#if TARGET_64BIT
template<>
void* StressLog::ConvertArgument(double arg)
{
return (void*)(size_t)(*((uint64_t*)&arg));
}
#else
template<>
void* StressLog::ConvertArgument(double arg) = delete;
#endif

#ifndef STRESS_LOG_ANALYZER
typedef Holder<CRITSEC_COOKIE, StressLog::Enter, StressLog::Leave, 0, CompareDefault<CRITSEC_COOKIE>> StressLogLockHolder;
#endif //!STRESS_LOG_ANALYZER
Expand Down
28 changes: 14 additions & 14 deletions src/coreclr/nativeaot/Runtime/inc/stressLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,20 +316,6 @@ class StressLog {
return (void*)(size_t)arg;
}

template<>
void* ConvertArgument(float arg) = delete;

#if TARGET_64BIT
template<>
void* ConvertArgument(double arg)
{
return (void*)(size_t)(*((uint64_t*)&arg));
}
#else
template<>
void* ConvertArgument(double arg) = delete;
#endif

template<typename... Ts>
static void LogMsgOL(const char* format, Ts... args)
{
Expand Down Expand Up @@ -358,6 +344,20 @@ class StressLog {
};


template<>
void* StressLog::ConvertArgument(float arg) = delete;

#if TARGET_64BIT
template<>
void* StressLog::ConvertArgument(double arg)
{
return (void*)(size_t)(*((uint64_t*)&arg));
}
#else
template<>
void* StressLog::ConvertArgument(double arg) = delete;
#endif

//==========================================================================================
// Private classes
//
Expand Down