unify memory printing functions #311
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #include "util.h" | ||
|
|
||
| c3_w | ||
| _c3_printcap_mem_w(FILE *fil_u, c3_w wor_w, const c3_c *cap_c) | ||
| { | ||
| return _c3_printcap_mem_z(fil_u, (c3_z)wor_w << 2, cap_c) >> 2; | ||
| } | ||
|
|
||
| c3_z | ||
| _c3_printcap_mem_z(FILE *fil_u, c3_z byt_z, const c3_c *cap_c) | ||
| { | ||
| c3_assert( 0 != fil_u ); /* ;;: I assume this is important from commit | ||
| f975ca908b143fb76c104ecc32cb59317ea5b198: | ||
| threads output file pointer through memory | ||
| marking and printing. | ||
|
|
||
| If not necessary, we can get rid of | ||
| c3_maid_w */ | ||
|
|
||
| c3_z gib_z = (byt_z / (1 << 30)); | ||
| c3_z mib_z = (byt_z % (1 << 30)) / (1 << 20); | ||
| c3_z kib_z = (byt_z % (1 << 20)) / (1 << 10); | ||
| c3_z bib_z = (byt_z % (1 << 10)); | ||
|
|
||
| if ( gib_z ) { | ||
| fprintf(fil_u, "%s" "GiB/%" PRIc3_z ".%03" PRIc3_z ".%03" PRIc3_z ".%03" PRIc3_z "\r\n", | ||
| cap_c, gib_z, mib_z, kib_z, bib_z); | ||
| } | ||
| else if ( mib_z ) { | ||
| fprintf(fil_u, "%s" "MiB/%" PRIc3_z ".%03" PRIc3_z ".%03" PRIc3_z "\r\n", | ||
| cap_c, mib_z, kib_z, bib_z); | ||
| } | ||
| else if ( kib_z ) { | ||
| fprintf(fil_u, "%s" "KiB/%" PRIc3_z ".%03" PRIc3_z "\r\n", | ||
| cap_c, kib_z, bib_z); | ||
| } | ||
| else { | ||
| fprintf(fil_u, "%s" "B/%" PRIc3_z "\r\n", | ||
| cap_c, bib_z); | ||
| } | ||
| return byt_z; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| #ifndef C3_UTIL_H | ||
| #define C3_UTIL_H | ||
|
|
||
| #include <stdio.h> | ||
|
|
||
| #include "types.h" | ||
| #include "defs.h" | ||
|
|
||
| c3_w _c3_printcap_mem_w (FILE *fil_u, c3_w wor_w, const c3_c *cap_c); | ||
| c3_z _c3_printcap_mem_z(FILE *fil_u, c3_z byt_z, const c3_c *cap_c); | ||
|
|
||
|
|
||
|
There was a problem hiding this comment. There are some Form Feed (U+000C) characters interspersed here and in other places. We should get rid of them. There was a problem hiding this comment. Form feed characters are good and make code easier to navigate There was a problem hiding this comment. Oh ok, I just haven't seen them elsewhere in our codebase. Feel free to disregard. There was a problem hiding this comment. They certainly might not be anywhere else, but I don't think they hurt. There was a problem hiding this comment. and fyi, I mainly put them here to bracket the pairs of macros which function more as single logical units. I also don't mind their usage to page code into logical sections with header comments |
||
| /* | ||
| c3_print_mem_w( | ||
| FILE * FILE - file. must not be NULL, | ||
| c3_w WOR - size in words, | ||
| ? c3_c * q_CAP - caption, | ||
| ) | ||
|
|
||
| Print word-sized quantity, WOR, in typical format: | ||
| [Caption: ][GiB|MiB|KiB|B]/QUANTITY | ||
| */ | ||
| #define c3_print_mem_w( ... ) \ | ||
| c3_print_mem_w_0( __VA_ARGS__, "" ) | ||
| #define c3_print_mem_w_0( FILE, WOR, q_CAP, ... ) \ | ||
| ((q_CAP[0]) \ | ||
| ? _c3_printcap_mem_w((FILE), (WOR), q_CAP ": ") \ | ||
| : _c3_printcap_mem_w((FILE), (WOR), "")) | ||
|
|
||
|
|
||
| /* | ||
| c3_print_mem_z( | ||
| FILE * FILE - file. must not be NULL, | ||
| c3_w BYT - size in bytes, | ||
| ? c3_c * q_CAP - caption, | ||
| ) | ||
|
|
||
| Print byte-sized quantity, BYT like c3_print_mem_w | ||
| */ | ||
| #define c3_print_mem_z( ... ) \ | ||
| c3_print_mem_z_0( __VA_ARGS__, "" ) | ||
| #define c3_print_mem_z_0( FILE, BYT, q_CAP, ... ) \ | ||
| ((q_CAP[0]) \ | ||
| ? _c3_printcap_mem_z((FILE), (BYT), q_CAP ": ") \ | ||
| : _c3_printcap_mem_z((FILE), (BYT), "")) | ||
|
|
||
|
|
||
| /* | ||
| c3_print_mem_w( | ||
| FILE * FILE - file may be NULL, | ||
| c3_w WOR - size in words, | ||
| ? c3_c * q_CAP - caption, | ||
| ) | ||
|
|
||
| Just like c3_print_mem_w with the exception that FILE may be null. In which | ||
| case, this is a NOP. | ||
| */ | ||
| #define c3_maid_w( ... ) \ | ||
| c3_maid_w_0( __VA_ARGS__, "" ) | ||
| #define c3_maid_w_0( FILE, WOR, ... ) \ | ||
| ((0 == (FILE)) \ | ||
| ? (WOR) \ | ||
| : c3_print_mem_w( FILE, WOR, __VA_ARGS__ )) | ||
|
|
||
|
|
||
| /* | ||
| c3_print_memdiff_w( | ||
| FILE * FILE - file, | ||
| c3_w WOR0 - size in words, | ||
| c3_w WOR1 - size in words, | ||
| ? c3_c * q_CAP - caption, | ||
| ) | ||
|
|
||
| Prints absolute value of WOR0 - WOR1 using c3_print_mem_w | ||
| */ | ||
| #define c3_print_memdiff_w( ... ) \ | ||
| c3_print_memdiff_w_0( __VA_ARGS__, "" ) | ||
|
|
||
| #define c3_print_memdiff_w_0( FILE, WOR0, WOR1, ... ) \ | ||
| c3_print_mem_w(FILE, ((0+WOR0) > (0+WOR1) ? WOR0 - WOR1 : WOR1 - WOR0), __VA_ARGS__ ) | ||
|
|
||
| #endif /* ifndef C3_UTIL_H */ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The interface is even simpler if we can get rid of the null file assert in
_c3_printcap_mem_z. I think we might be able to, but not sure. See inline comment.If we can get rid of this, all calls to
c3_maid_wcan just callc3_print_mem_w.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So the question is... when do we want a call to
c3_print_mem_wto crash the process when the output file is null (rather than ignore the print). I would guess never