mirror of
https://github.com/Dr-Noob/cpufetch.git
synced 2026-03-24 23:40:39 +01:00
[v1.04] Improve error reporting in the case of unkown microarchitectures. As pointed out in #224 this was already solved, but this commit tries to be an improvement over the previous implementation
This commit is contained in:
@@ -200,8 +200,7 @@ static char* isas_string[] = {
|
|||||||
#define UARCH_START if (false) {}
|
#define UARCH_START if (false) {}
|
||||||
#define CHECK_UARCH(arch, cpu, im_, p_, v_, r_, str, uarch, vendor) \
|
#define CHECK_UARCH(arch, cpu, im_, p_, v_, r_, str, uarch, vendor) \
|
||||||
else if (im_ == im && p_ == p && (v_ == NA || v_ == v) && (r_ == NA || r_ == r)) fill_uarch(arch, cpu, str, uarch, vendor);
|
else if (im_ == im && p_ == p && (v_ == NA || v_ == v) && (r_ == NA || r_ == r)) fill_uarch(arch, cpu, str, uarch, vendor);
|
||||||
#define UARCH_END else { printErr("Unknown microarchitecture detected: IM=0x%X P=0x%X V=0x%X R=0x%X", im, p, v, r); \
|
#define UARCH_END else { printUnknownUarch("Unknown microarchitecture detected: M=0x%X EM=0x%X F=0x%X EF=0x%X S=0x%X", m, em, f, ef, s); \
|
||||||
fprintf(stderr, "Please see https://github.com/Dr-Noob/cpufetch#61-unknown-microarchitecture-error to know how to report this error\n"); \
|
|
||||||
fill_uarch(arch, cpu, "Unknown", UARCH_UNKNOWN, CPU_VENDOR_UNKNOWN); }
|
fill_uarch(arch, cpu, "Unknown", UARCH_UNKNOWN, CPU_VENDOR_UNKNOWN); }
|
||||||
|
|
||||||
void fill_uarch(struct uarch* arch, struct cpuInfo* cpu, char* str, MICROARCH u, VENDOR vendor) {
|
void fill_uarch(struct uarch* arch, struct cpuInfo* cpu, char* str, MICROARCH u, VENDOR vendor) {
|
||||||
|
|||||||
@@ -61,6 +61,14 @@ enum {
|
|||||||
|
|
||||||
int LOG_LEVEL;
|
int LOG_LEVEL;
|
||||||
|
|
||||||
|
void printBugMessage(FILE *restrict stream) {
|
||||||
|
#if defined(ARCH_X86) || defined(ARCH_PPC)
|
||||||
|
fprintf(stream, "Please, create a new issue with this error message, the output of 'cpufetch' and 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
||||||
|
#elif ARCH_ARM
|
||||||
|
fprintf(stream, "Please, create a new issue with this error message, your smartphone/computer model, the output of 'cpufetch --verbose' and 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void printWarn(const char *fmt, ...) {
|
void printWarn(const char *fmt, ...) {
|
||||||
if(LOG_LEVEL == LOG_LEVEL_VERBOSE) {
|
if(LOG_LEVEL == LOG_LEVEL_VERBOSE) {
|
||||||
int buffer_size = 4096;
|
int buffer_size = 4096;
|
||||||
@@ -95,10 +103,40 @@ void printBug(const char *fmt, ...) {
|
|||||||
fprintf(stderr,RED "[ERROR]: "RESET "%s\n",buffer);
|
fprintf(stderr,RED "[ERROR]: "RESET "%s\n",buffer);
|
||||||
fprintf(stderr,"[VERSION]: ");
|
fprintf(stderr,"[VERSION]: ");
|
||||||
print_version(stderr);
|
print_version(stderr);
|
||||||
#if defined(ARCH_X86) || defined(ARCH_PPC)
|
printBugMessage(stderr);
|
||||||
fprintf(stderr, "Please, create a new issue with this error message, the output of 'cpufetch' and 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
}
|
||||||
#elif ARCH_ARM
|
|
||||||
fprintf(stderr, "Please, create a new issue with this error message, your smartphone/computer model, the output of 'cpufetch --verbose' and 'cpufetch --debug' on https://github.com/Dr-Noob/cpufetch/issues\n");
|
bool isReleaseVersion(char *git_full_version) {
|
||||||
|
return strstr(git_full_version, "-") == NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The unknown uarch errors are by far the most common error a user will encounter.
|
||||||
|
/// Rather than using the generic printBug function, which asks the user to report
|
||||||
|
/// the problem on the issues webpage, this function will check if the program is
|
||||||
|
/// the release version. In such case, support for this feature is most likely already
|
||||||
|
/// in the last version, so just tell the user to compile that one and not report this
|
||||||
|
/// in github.
|
||||||
|
void printUnknownUarch(const char *fmt, ...) {
|
||||||
|
int buffer_size = 4096;
|
||||||
|
char buffer[buffer_size];
|
||||||
|
va_list args;
|
||||||
|
va_start(args, fmt);
|
||||||
|
vsnprintf(buffer,buffer_size, fmt, args);
|
||||||
|
va_end(args);
|
||||||
|
|
||||||
|
fprintf(stderr, RED "[ERROR]: "RESET "%s\n", buffer);
|
||||||
|
fprintf(stderr, "[VERSION]: ");
|
||||||
|
print_version(stderr);
|
||||||
|
|
||||||
|
#ifdef GIT_FULL_VERSION
|
||||||
|
if (isReleaseVersion(GIT_FULL_VERSION)) {
|
||||||
|
fprintf(stderr, RED "[ERROR]: "RESET "You are using an outdated version of cpufetch. Please compile cpufetch from source (see https://github.com/Dr-Noob/cpufetch?tab=readme-ov-file#22-building-from-source)");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printBugMessage(stderr);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
printBugMessage(stderr);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ void set_log_level(bool verbose);
|
|||||||
void printWarn(const char *fmt, ...);
|
void printWarn(const char *fmt, ...);
|
||||||
void printErr(const char *fmt, ...);
|
void printErr(const char *fmt, ...);
|
||||||
void printBug(const char *fmt, ...);
|
void printBug(const char *fmt, ...);
|
||||||
|
void printUnknownUarch(const char *fmt, ...);
|
||||||
int min(int a, int b);
|
int min(int a, int b);
|
||||||
int max(int a, int b);
|
int max(int a, int b);
|
||||||
char *strremove(char *str, const char *sub);
|
char *strremove(char *str, const char *sub);
|
||||||
|
|||||||
@@ -125,8 +125,7 @@ struct uarch {
|
|||||||
#define UARCH_START if (false) {}
|
#define UARCH_START if (false) {}
|
||||||
#define CHECK_UARCH(arch, ef_, f_, em_, m_, s_, str, uarch, process) \
|
#define CHECK_UARCH(arch, ef_, f_, em_, m_, s_, str, uarch, process) \
|
||||||
else if (ef_ == ef && f_ == f && (em_ == NA || em_ == em) && (m_ == NA || m_ == m) && (s_ == NA || s_ == s)) fill_uarch(arch, str, uarch, process);
|
else if (ef_ == ef && f_ == f && (em_ == NA || em_ == em) && (m_ == NA || m_ == m) && (s_ == NA || s_ == s)) fill_uarch(arch, str, uarch, process);
|
||||||
#define UARCH_END else { printErr("Unknown microarchitecture detected: M=0x%X EM=0x%X F=0x%X EF=0x%X S=0x%X", m, em, f, ef, s); \
|
#define UARCH_END else { printUnknownUarch("Unknown microarchitecture detected: M=0x%X EM=0x%X F=0x%X EF=0x%X S=0x%X", m, em, f, ef, s); \
|
||||||
fprintf(stderr, "Please see https://github.com/Dr-Noob/cpufetch#61-unknown-microarchitecture-error to know how to report this error\n"); \
|
|
||||||
fill_uarch(arch, STRING_UNKNOWN, UARCH_UNKNOWN, UNK); }
|
fill_uarch(arch, STRING_UNKNOWN, UARCH_UNKNOWN, UNK); }
|
||||||
|
|
||||||
void fill_uarch(struct uarch* arch, char* str, MICROARCH u, uint32_t process) {
|
void fill_uarch(struct uarch* arch, char* str, MICROARCH u, uint32_t process) {
|
||||||
|
|||||||
Reference in New Issue
Block a user