Skip to content

Make GC and config output optional #69

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
smarr merged 2 commits into from
Jun 18, 2025
Merged

Make GC and config output optional #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0cfbb7
Output GC time only when requested
smarr Jun 18, 2025
2e09be5
Make VM config output optional with new -cfg flag
smarr Jun 18, 2025
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
27 changes: 0 additions & 27 deletions src/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,33 +38,6 @@
int32_t main(int32_t argc, char** argv) {
cout << "This is SOM++" << endl;

if (GC_TYPE == GENERATIONAL) {
cout << "\tgarbage collector: generational" << endl;
} else if (GC_TYPE == COPYING) {
cout << "\tgarbage collector: copying" << endl;
} else if (GC_TYPE == MARK_SWEEP) {
cout << "\tgarbage collector: mark-sweep" << endl;
} else if (GC_TYPE == DEBUG_COPYING) {
cout << "\tgarbage collector: debug copying" << endl;
} else {
cout << "\tgarbage collector: unknown" << endl;
}

if (USE_TAGGING) {
cout << "\twith tagged integers" << endl;
} else {
cout << "\tnot tagging integers" << endl;
}

if (CACHE_INTEGER) {
cout << "\tcaching integers from " << INT_CACHE_MIN_VALUE << " to "
<< INT_CACHE_MAX_VALUE << endl;
} else {
cout << "\tnot caching integers" << endl;
}

cout << "--------------------------------------" << endl;

Universe::Start(argc, argv);

Quit(ERR_SUCCESS);
Expand Down
3 changes: 0 additions & 3 deletions src/vm/Print.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ __attribute__((noreturn)) __attribute__((noinline)) void ErrorExit(
}

__attribute__((noreturn)) __attribute__((noinline)) void Quit(int32_t err) {
ErrorPrint("Time spent in GC: [" +
to_string(Timer::GCTimer.GetTotalTime()) + "] msec\n");

Universe::Shutdown();

OutputAllocationLogFile();
Expand Down
56 changes: 46 additions & 10 deletions src/vm/Universe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,11 @@ void Universe::BasicInit() {
}

void Universe::Shutdown() {
ErrorPrint("Time spent in GC: [" +
to_string(Timer::GCTimer.GetTotalTime()) + "] msec\n");
if (gcVerbosity > 0) {
ErrorPrint("Time spent in GC: [" +
to_string(Timer::GCTimer.GetTotalTime()) + "] msec\n");
}

#ifdef GENERATE_INTEGER_HISTOGRAM
std::string file_name_hist = std::string(bm_name);
file_name_hist.append("_integer_histogram.csv");
Expand Down Expand Up @@ -138,6 +141,35 @@ void Universe::Shutdown() {
#endif
}

static void printVmConfig() {
if (GC_TYPE == GENERATIONAL) {
cout << "\tgarbage collector: generational\n";
} else if (GC_TYPE == COPYING) {
cout << "\tgarbage collector: copying\n";
} else if (GC_TYPE == MARK_SWEEP) {
cout << "\tgarbage collector: mark-sweep\n";
} else if (GC_TYPE == DEBUG_COPYING) {
cout << "\tgarbage collector: debug copying\n";
} else {
cout << "\tgarbage collector: unknown\n";
}

if (USE_TAGGING) {
cout << "\twith tagged integers\n";
} else {
cout << "\tnot tagging integers\n";
}

if (CACHE_INTEGER) {
cout << "\tcaching integers from " << INT_CACHE_MIN_VALUE << " to "
<< INT_CACHE_MAX_VALUE << "\n";
} else {
cout << "\tnot caching integers\n";
}

cout << "--------------------------------------\n";
}

vector<std::string> Universe::handleArguments(int32_t argc, char** argv) {
vector<std::string> vmArgs = vector<std::string>();
dumpBytecodes = 0;
Expand All @@ -151,6 +183,8 @@ vector<std::string> Universe::handleArguments(int32_t argc, char** argv) {
setupClassPath(std::string(argv[++i]));
} else if (strncmp(argv[i], "-d", 2) == 0) {
++dumpBytecodes;
} else if (strncmp(argv[i], "-cfg", 4) == 0) {
printVmConfig();
} else if (strncmp(argv[i], "-g", 2) == 0) {
++gcVerbosity;
} else if (strncmp(argv[i], "-H", 2) == 0) {
Expand Down Expand Up @@ -235,14 +269,16 @@ void Universe::addClassPath(const std::string& cp) {
void Universe::printUsageAndExit(char* executable) {
cout << "Usage: " << executable << " [-options] [args...]\n\n";
cout << "where options include:\n";
cout << " -cp <directories separated by " << pathSeparator << ">\n";
cout << " set search path for application classes\n";
cout << " -d enable disassembling (twice for tracing)\n";
cout << " -g enable garbage collection details:\n"
<< " 1x - print statistics when VM shuts down\n"
<< " 2x - print statistics upon each collection\n"
<< " 3x - print statistics and dump heap upon each \n"
<< "collection\n";
cout << " -cp <directories separated by " << pathSeparator << ">\n";
cout << " set search path for application classes\n";
cout << " -d enable disassembling (twice for tracing)\n";
cout << " -cfg print VM configuration\n";
cout
<< " -g enable garbage collection details:\n"
<< " 1x - print statistics when VM shuts down\n"
<< " 2x - print statistics upon each collection\n"
<< " 3x - print statistics and dump heap upon each collection\n"
<< "\n";
cout << " -HxMB set the heap size to x MB (default: 1 MB)\n";
cout << " -HxKB set the heap size to x KB (default: 1 MB)\n";
cout << " -h show this help\n";
Expand Down