Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix segfault in GetCpuCores #1242

Merged
merged 2 commits into from Nov 8, 2023
Merged

Fix segfault in GetCpuCores #1242

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27c45d1
Fix segfault in GetCpuCores
jheeks Nov 6, 2023
9ca436b
Use get_nprocs() to read the number of cores
jheeks Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 2 additions & 32 deletions contrib/mma/src/linux/mma_linux.cpp
View file
Open in desktop
Expand Up @@ -28,6 +28,7 @@
#include <string>
#include <unordered_map>
#include <vector>
#include <sys/sysinfo.h>

#include "../include/linux/mma_linux.h"

Expand Down Expand Up @@ -485,38 +486,7 @@ bool MMALinux::MergeBootWithRootARM(ResourceLinux::DiskStatsList& /*disk_stats_i

int MMALinux::GetCpuCores(void)
{
std::list <std::string> cpuinfo_list = TokenizeIntoLines(FileToString("/proc/cpuinfo"));
std::vector <std::string> cpucore_vect;
auto idx = 0;
if(!is_vrm)
{
for (auto iter : cpuinfo_list)
{
if (idx == 12)
{
cpucore_vect = SplitLine(iter);
break;
}
idx++;
}
return std::stoi(cpucore_vect[3]);
}
else
{
auto cpu_cores=0;
for (auto iter : cpuinfo_list)
{
cpucore_vect = SplitLine(iter);
for(auto iter1:cpucore_vect)
{
if(iter1.find("processor")!= std::string::npos)
{
cpu_cores++;
}
}
}
return cpu_cores;
}
return get_nprocs();
}

bool MMALinux::CheckIfIsALinuxVRM()
Expand Down