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

[v1.00][X86] Show unknown string when the number of cores cannot be retrieved (like #119)

Browse Source
This commit is contained in:
Dr-Noob
2021-11-01 13:07:48 +01:00
parent bb12a2c276
commit 6981d61eaf
7 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/cpu.c
View File

@@ -150,7 +150,7 @@ char* get_str_freq(struct frequency* freq) {
char* string = emalloc(sizeof(char)*size);
memset(string, 0, sizeof(char)*size);
if(freq->max == UNKNOWN_FREQ || freq->max < 0)
if(freq->max == UNKNOWN_DATA || freq->max < 0)
snprintf(string,strlen(STRING_UNKNOWN)+1,STRING_UNKNOWN);
else if(freq->max >= 1000)
snprintf(string,size,"%.3f "STRING_GIGAHERZ,(float)(freq->max)/1000);

6
src/common/cpu.h
View File

@@ -34,7 +34,7 @@ enum {
HV_VENDOR_INVALID
};
#define UNKNOWN_FREQ -1
#define UNKNOWN_DATA -1
#define CPU_NAME_MAX_LENGTH 64
typedef int32_t VENDOR;
@@ -71,8 +71,8 @@ struct topology {
int32_t total_cores;
struct cache* cach;
#if defined(ARCH_X86) || defined(ARCH_PPC)
uint32_t physical_cores;
uint32_t logical_cores;
int32_t physical_cores;
int32_t logical_cores;
uint32_t sockets;
uint32_t smt_supported; // Number of SMT that CPU supports (equal to smt_available if SMT is enabled)
#ifdef ARCH_X86

6
src/common/udev.c
View File

@@ -33,7 +33,7 @@ long get_freq_from_file(char* path) {
char* buf;
if((buf = read_file(path, &filelen)) == NULL) {
printWarn("Could not open '%s'", path);
return UNKNOWN_FREQ;
return UNKNOWN_DATA;
}
char* end;
@@ -42,7 +42,7 @@ long get_freq_from_file(char* path) {
if(errno != 0) {
printBug("strtol: %s", strerror(errno));
free(buf);
return UNKNOWN_FREQ;
return UNKNOWN_DATA;
}
// We will be getting the frequency in KHz
@@ -50,7 +50,7 @@ long get_freq_from_file(char* path) {
// greater than 10 GHz or less than 100 MHz
if(ret > 10000 * 1000 || ret < 100 * 1000) {
printBug("Invalid data was read from file '%s': %ld\n", path, ret);
return UNKNOWN_FREQ;
return UNKNOWN_DATA;
}
free(buf);