thelilfrog/cpufetch
1
0
Fork 0
mirror of https://github.com/Dr-Noob/cpufetch.git synced 2026-03-25 07:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring of printer

Browse Source
This commit is contained in:
Dr-Noob
2018-06-21 10:04:55 +02:00
parent 49d59d6708
commit 5bf6cbf2c7
3 changed files with 93 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
main.c
View File

@@ -31,7 +31,7 @@ int main() {
struct cache* cach = new_cache(); struct cache* cach = new_cache();
struct frequency* freq = new_frequency(); struct frequency* freq = new_frequency();
struct ascii* ascii = set_ascii(getCPUVendorInternal(cpu)); struct ascii* art = set_ascii(getCPUVendorInternal(cpu));
char* cpuName = getString_CPUName(); char* cpuName = getString_CPUName();
char* maxFrequency = getString_MaxFrequency(freq); char* maxFrequency = getString_MaxFrequency(freq);
@@ -46,65 +46,21 @@ int main() {
char* l3 = getString_L3(cach); char* l3 = getString_L3(cach);
char* pp = getPeakPerformance(cpu,getFrequency(freq)); char* pp = getPeakPerformance(cpu,getFrequency(freq));
print_ascii(ascii,__COUNTER__); setAttribute(art,ATTRIBUTE_NAME,cpuName);
printf("\n"); setAttribute(art,ATTRIBUTE_ARCH,"x86_64");
setAttribute(art,ATTRIBUTE_FREQUENCY,maxFrequency);
setAttribute(art,ATTRIBUTE_NCORES,nCores);
setAttribute(art,ATTRIBUTE_AVX,avx);
setAttribute(art,ATTRIBUTE_SSE,sse);
setAttribute(art,ATTRIBUTE_FMA,fma);
setAttribute(art,ATTRIBUTE_AES,aes);
setAttribute(art,ATTRIBUTE_SHA,sha);
setAttribute(art,ATTRIBUTE_L1,l1);
setAttribute(art,ATTRIBUTE_L2,l2);
setAttribute(art,ATTRIBUTE_L3,l3);
setAttribute(art,ATTRIBUTE_PEAK,pp);
print_ascii(ascii,__COUNTER__); print_ascii(art);
printf("\n");
print_ascii(ascii,__COUNTER__);
printf("\n");
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_NAME,cpuName);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_ARCH,"x86_64");
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_FREQUENCY,maxFrequency);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_NCORES,nCores);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_AVX,avx);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_SSE,sse);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_FMA,fma);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_AES,aes);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_SHA,sha);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_L1,l1);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_L2,l2);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_L3,l3);
print_ascii(ascii,__COUNTER__);
print_text(ascii,TITLE_PEAK,pp);
print_ascii(ascii,__COUNTER__);
printf("\n");
print_ascii(ascii,__COUNTER__);
printf("\n");
print_ascii(ascii,__COUNTER__);
printf("\n");
print_ascii(ascii,__COUNTER__);
printf("\n");
free(cpuName); free(cpuName);
free(maxFrequency); free(maxFrequency);
@@ -120,7 +76,7 @@ int main() {
free(pp); free(pp);
free(cpu); free(cpu);
free(ascii); free(art);
freeCache(cach); freeCache(cach);
freeFrequency(freq); freeFrequency(freq);

83
printer.c
View File

@@ -11,13 +11,50 @@
#define COL_AMD_2 "\x1b[32;1m" #define COL_AMD_2 "\x1b[32;1m"
#define RESET "\x1b[0m" #define RESET "\x1b[0m"
#define TITLE_NAME "Name: "
#define TITLE_ARCH "Arch: "
#define TITLE_FREQUENCY "Frequency: "
#define TITLE_NCORES "N.Cores: "
#define TITLE_AVX "AVX: "
#define TITLE_SSE "SSE: "
#define TITLE_FMA "FMA: "
#define TITLE_AES "AES: "
#define TITLE_SHA "SHA: "
#define TITLE_L1 "L1 Size: "
#define TITLE_L2 "L2 Size: "
#define TITLE_L3 "L3 Size: "
#define TITLE_PEAK "Peak FLOPS: "
static const char* ATTRIBUTE_FIELDS [ATTRIBUTE_COUNT] = { TITLE_NAME, TITLE_ARCH, TITLE_FREQUENCY,
TITLE_NCORES, TITLE_AVX, TITLE_SSE,
TITLE_FMA, TITLE_AES, TITLE_SHA,
TITLE_L1, TITLE_L2, TITLE_L3,
TITLE_PEAK };
static const int ATTRIBUTE_LIST[ATTRIBUTE_COUNT] = { ATTRIBUTE_NAME, ATTRIBUTE_ARCH, ATTRIBUTE_FREQUENCY,
ATTRIBUTE_NCORES, ATTRIBUTE_AVX, ATTRIBUTE_SSE,
ATTRIBUTE_FMA, ATTRIBUTE_AES, ATTRIBUTE_SHA,
ATTRIBUTE_L1, ATTRIBUTE_L2, ATTRIBUTE_L3,
ATTRIBUTE_PEAK };
struct ascii { struct ascii {
char art[NUMBER_OF_LINES][LINE_SIZE]; char art[NUMBER_OF_LINES][LINE_SIZE];
char color1[10]; char color1[10];
char color2[10]; char color2[10];
char* atributes[ATTRIBUTE_COUNT];
VENDOR vendor; VENDOR vendor;
}; };
int setAttribute(struct ascii* art, int type, char* value) {
int i = 0;
while(i < ATTRIBUTE_COUNT && type != ATTRIBUTE_LIST[i])
i++;
if(i == ATTRIBUTE_COUNT)
return BOOLEAN_FALSE;
art->atributes[i] = value;
return BOOLEAN_TRUE;
}
struct ascii* set_ascii(VENDOR cpuVendor) { struct ascii* set_ascii(VENDOR cpuVendor) {
struct ascii* art = malloc(sizeof(struct ascii)); struct ascii* art = malloc(sizeof(struct ascii));
art->vendor = cpuVendor; art->vendor = cpuVendor;
@@ -74,15 +111,12 @@ struct ascii* set_ascii(VENDOR cpuVendor) {
return art; return art;
} }
void print_text(struct ascii* art,char* title, char* text) { void print_ascii_intel(struct ascii* art) {
printf("%s%s%s%s"RESET"\n",art->color1,title,art->color2,text);
}
void print_ascii(struct ascii* art, int n) {
int flag = BOOLEAN_FALSE; int flag = BOOLEAN_FALSE;
if(art->vendor == VENDOR_INTEL) { for(int n=0;n<NUMBER_OF_LINES;n++) {
/*** PRINT ASCII WITH SHADOW ***/
/*** PRINT ASCII-ART ***/
for(int i=0;i<LINE_SIZE;i++) { for(int i=0;i<LINE_SIZE;i++) {
if(flag) { if(flag) {
if(art->art[n][i] == ' ') { if(art->art[n][i] == ' ') {
@@ -101,9 +135,18 @@ void print_ascii(struct ascii* art, int n) {
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
} }
} }
/*** PRINT ATTRIBUTE ***/
if(n>2 && n<NUMBER_OF_LINES-4)printf("%s%s%s%s"RESET"\n",art->color1,ATTRIBUTE_FIELDS[n-3],art->color2,art->atributes[n-3]);
else printf("\n");
} }
else { }
/*** PRINT TEXT AND LOGO IN DIFFERENT COLOR ***/
void print_ascii_amd(struct ascii* art) {
int flag = BOOLEAN_FALSE;
for(int n=0;n<NUMBER_OF_LINES;n++) {
/*** PRINT ASCII-ART ***/
for(int i=0;i<LINE_SIZE;i++) { for(int i=0;i<LINE_SIZE;i++) {
if(art->art[n][i] == '@') if(art->art[n][i] == '@')
printf("%s%c" RESET,art->color1,art->art[n][i]); printf("%s%c" RESET,art->color1,art->art[n][i]);
@@ -112,21 +155,17 @@ void print_ascii(struct ascii* art, int n) {
else else
printf("%c",art->art[n][i]); printf("%c",art->art[n][i]);
} }
/*** PRINT ATTRIBUTE ***/
if(n>2 && n<NUMBER_OF_LINES-4)printf("%s%s%s%s"RESET"\n",art->color1,ATTRIBUTE_FIELDS[n-3],art->color2,art->atributes[n-3]);
else printf("\n");
} }
} }
/*** PRINT ASCII SIMPLE ***/ void print_ascii(struct ascii* art) {
/* if(art->vendor == VENDOR_INTEL)
void print_ascii(struct ascii* art, int n) { print_ascii_intel(art);
int flag = BOOLEAN_FALSE; else
print_ascii_amd(art);
for(int i=0;i<LINE_SIZE;i++) {
if(art->art[n][i] != ' ')
printf(BLUE "%c" RESET,art->art[n][i]);
else
printf("%c",art->art[n][i]);
}
} }
*/

31
printer.h
View File

@@ -7,24 +7,25 @@
struct ascii; struct ascii;
struct ascii* set_ascii(VENDOR cpuVendor); struct ascii* set_ascii(VENDOR cpuVendor);
void print_ascii(struct ascii* art, int n); void print_ascii(struct ascii* art);
void print_text(struct ascii* art,char* title, char* text); int setAttribute(struct ascii* art, int type, char* value);
#define BOOLEAN_TRUE 1 #define BOOLEAN_TRUE 1
#define BOOLEAN_FALSE 0 #define BOOLEAN_FALSE 0
#define TITLE_NAME "Name: " #define ATTRIBUTE_COUNT 13
#define TITLE_ARCH "Arch: " #define ATTRIBUTE_NAME 0
#define TITLE_FREQUENCY "Frequency: " #define ATTRIBUTE_ARCH 1
#define TITLE_NCORES "N.Cores: " #define ATTRIBUTE_FREQUENCY 2
#define TITLE_AVX "AVX: " #define ATTRIBUTE_NCORES 3
#define TITLE_SSE "SSE: " #define ATTRIBUTE_AVX 4
#define TITLE_FMA "FMA: " #define ATTRIBUTE_SSE 5
#define TITLE_AES "AES: " #define ATTRIBUTE_FMA 6
#define TITLE_SHA "SHA: " #define ATTRIBUTE_AES 7
#define TITLE_L1 "L1 Size: " #define ATTRIBUTE_SHA 8
#define TITLE_L2 "L2 Size: " #define ATTRIBUTE_L1 9
#define TITLE_L3 "L3 Size: " #define ATTRIBUTE_L2 10
#define TITLE_PEAK "Peak FLOPS: " #define ATTRIBUTE_L3 11
#define ATTRIBUTE_PEAK 12
#endif #endif