Skip to content

Correctly display the GCSettings specified in the runtimeconfig json via the GC Configuration API Call #84201

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
mrsharm merged 7 commits into from
Apr 6, 2023
Merged

Correctly display the GCSettings specified in the runtimeconfig json via the GC Configuration API Call #84201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ead0eeb
Added setting the GCHighMemPercent so that it's reported by the Confi…
mrsharm Apr 1, 2023
07676e4
Added all but the string based properties
mrsharm Apr 3, 2023
d90e1ec
Fix for the correct variable set for the Configuration API
mrsharm Apr 3, 2023
fcbfdd8
Removed redunant changes
mrsharm Apr 3, 2023
864211f
Added the SetGCRegionRange for the regions range
mrsharm Apr 4, 2023
0febcd1
Fixed issue with correctly setting the name
mrsharm Apr 4, 2023
4726f10
Added consistency to the INT_CONFIG class
mrsharm Apr 5, 2023
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
3 changes: 2 additions & 1 deletion src/coreclr/gc/gc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45356,7 +45356,8 @@ HRESULT GCHeap::Initialize()
}
gc_heap::regions_range = align_on_page(gc_heap::regions_range);
}
// TODO: Set config after config API is merged.

GCConfig::SetGCRegionRange(gc_heap::regions_range);
#endif //USE_REGIONS

#endif //HOST_64BIT
Expand Down
17 changes: 12 additions & 5 deletions src/coreclr/gc/gcconfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@

#define INT_CONFIG(name, unused_private_key, unused_public_key, default, unused_doc) \
int64_t GCConfig::Get##name() { return s_##name; } \
int64_t GCConfig::Get##name(int64_t defaultValue) \
{ \
return s_##name##Provided ? s_##name : defaultValue; \
} \
void GCConfig::Set##name(int64_t value) { s_Updated##name = value; } \
int64_t GCConfig::s_##name = default; \
bool GCConfig::s_##name##Provided = false; \
int64_t GCConfig::s_Updated##name = default;

// String configs are not cached because 1) they are rare and
Expand Down Expand Up @@ -64,11 +69,13 @@ GC_CONFIGURATION_KEYS

void GCConfig::Initialize()
{
#define BOOL_CONFIG(name, private_key, public_key, unused_default, unused_doc) \
s_##name##Provided = GCToEEInterface::GetBooleanConfigValue(private_key, public_key, &s_##name);

#define INT_CONFIG(name, private_key, public_key, unused_default, unused_doc) \
GCToEEInterface::GetIntConfigValue(private_key, public_key, &s_##name);
#define BOOL_CONFIG(name, private_key, public_key, unused_default, unused_doc) \
s_##name##Provided = GCToEEInterface::GetBooleanConfigValue(private_key, public_key, &s_##name); \
s_Updated##name = s_##name;

#define INT_CONFIG(name, private_key, public_key, unused_default, unused_doc) \
s_##name##Provided = GCToEEInterface::GetIntConfigValue(private_key, public_key, &s_##name); \
s_Updated##name = s_##name; \

#define STRING_CONFIG(unused_name, unused_private_key, unused_public_key, unused_doc)

Expand Down
4 changes: 3 additions & 1 deletion src/coreclr/gc/gcconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,11 @@ class GCConfig

#define INT_CONFIG(name, unused_private_key, unused_public_key, unused_default, unused_doc) \
public: static int64_t Get##name(); \
public: static int64_t Get##name(int64_t defaultValue); \
public: static void Set##name(int64_t value); \
private: static int64_t s_##name; \
private: static int64_t s_Updated##name;
private: static bool s_##name##Provided; \
private: static int64_t s_Updated##name; \

#define STRING_CONFIG(name, unused_private_key, unused_public_key, unused_doc) \
public: static GCConfigStringHolder Get##name();
Expand Down