dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix https://github.com/RfidResearchGroup/proxmark3/issues/173

Browse Source 
this seems to work for OSX,  and improved linux version with fallback.
This commit is contained in:
iceman1001
2019-04-25 08:29:15 +02:00
parent 1b246cd380
commit ce8d5c66ab
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/util.c
View File

@@ -866,9 +866,18 @@ int num_CPUs(void) {
SYSTEM_INFO sysinfo; SYSTEM_INFO sysinfo;
GetSystemInfo(&sysinfo); GetSystemInfo(&sysinfo);
return sysinfo.dwNumberOfProcessors; return sysinfo.dwNumberOfProcessors;
#elif defined(__linux__) || defined(__APPLE__) #elif defined(__linux__) && defined(_SC_NPROCESSORS_ONLN)
#include <unistd.h> #include <unistd.h>
return sysconf(_SC_NPROCESSORS_ONLN); int count = sysconf(_SC_NPROCESSORS_ONLN);
if (count <= 0)
count = 1;
return count;
#elif defined(__APPLE__)
#include "sys/sysctl.h"
uint32 logicalcores = 0;
size_t size = sizeof( logicalcores );
sysctlbyname( "hw.logicalcpu", &logicalcores, &size, NULL, 0 );
return logicalcores;
#else #else
return 1; return 1;
#endif #endif