Skip to content

Reduce use of carriage returns #97

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Reduce use of carriage returns #97

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25e231d
Switch from fprintf to printf.
pfee Apr 14, 2022
4c878f2
Make function file scoped.
pfee Apr 14, 2022
ab21a14
Move CR printing from print_page_residency_chart.
pfee Apr 14, 2022
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
26 changes: 13 additions & 13 deletions vmtouch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,15 +436,15 @@ double gettimeofday_as_double() {



void print_page_residency_chart(FILE *out, char *mincore_array, int64_t pages_in_file) {
static void print_page_residency_chart(char *mincore_array, int64_t pages_in_file) {
int64_t pages_in_core=0;
int64_t pages_per_char;
int64_t i,j=0,curr=0;

if (pages_in_file <= RESIDENCY_CHART_WIDTH) pages_per_char = 1;
else pages_per_char = (pages_in_file / RESIDENCY_CHART_WIDTH) + 1;

fprintf(out, "\r[");
printf("[");

for (i=0; i<pages_in_file; i++) {
if (is_mincore_page_resident(mincore_array[i])) {
Expand All @@ -453,23 +453,23 @@ void print_page_residency_chart(FILE *out, char *mincore_array, int64_t pages_in
}
j++;
if (j == pages_per_char) {
if (curr == pages_per_char) fprintf(out, "O");
else if (curr == 0) fprintf(out, " ");
else fprintf(out, "o");
if (curr == pages_per_char) printf("O");
else if (curr == 0) printf(" ");
else printf("o");

j = curr = 0;
}
}

if (j) {
if (curr == j) fprintf(out, "O");
else if (curr == 0) fprintf(out, " ");
else fprintf(out, "o");
if (curr == j) printf("O");
else if (curr == 0) printf(" ");
else printf("o");
}

fprintf(out, "] %" PRId64 "/%" PRId64, pages_in_core, pages_in_file);
printf("] %" PRId64 "/%" PRId64, pages_in_core, pages_in_file);

fflush(out);
fflush(stdout);
}


Expand Down Expand Up @@ -630,7 +630,7 @@ void vmtouch_file(char *path) {
}
#endif
last_chart_print_time = gettimeofday_as_double();
print_page_residency_chart(stdout, mincore_array, pages_in_range);
print_page_residency_chart(mincore_array, pages_in_range);
}

if (o_touch) {
Expand All @@ -643,14 +643,14 @@ void vmtouch_file(char *path) {

if (temp_time > (last_chart_print_time+CHART_UPDATE_INTERVAL)) {
last_chart_print_time = temp_time;
print_page_residency_chart(stdout, mincore_array, pages_in_range);
printf("\r");
print_page_residency_chart(mincore_array, pages_in_range);
}
}
}
}

if (o_verbose) {
print_page_residency_chart(stdout, mincore_array, pages_in_range);
printf("\n");
}

Expand Down