DeepSeek/3FS
1
0
Fork 0
mirror of https://github.com/deepseek-ai/3FS synced 2025-06-26 18:16:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix mountinfo parsing

Browse Source 
Some segments like shared:nn may not present.

Use makedev for combining major and minor to support system with a lot of devices.
This commit is contained in:
胡玮文
2025-03-05 21:37:17 +08:00
parent c3a16b5cd8
commit 30f9162825
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/utils/SysResource.cc
View File

@@ -4,6 +4,7 @@
#include <filesystem> #include <filesystem>
#include <folly/logging/xlog.h> #include <folly/logging/xlog.h>
#include <fstream> #include <fstream>
#include <sys/sysmacros.h>
#include <unistd.h> #include <unistd.h>
#include "common/serde/Serde.h" #include "common/serde/Serde.h"
@@ -129,7 +130,10 @@ Result<std::vector<SysResource::DiskInfo>> SysResource::scanDiskInfo() {
std::string deviceIdStr; std::string deviceIdStr;
std::string mountPath; std::string mountPath;
std::string devicePath; std::string devicePath;
if (is >> dummy >> dummy >> deviceIdStr >> dummy >> mountPath >> dummy >> dummy >> dummy >> dummy >> devicePath) { is >> dummy >> dummy >> deviceIdStr >> dummy >> mountPath;
while((is >> dummy) && dummy != "-")
;
if (is >> dummy >> devicePath) {
unsigned long maj, min; unsigned long maj, min;
auto parseResult = scn::scan(deviceIdStr, "{}:{}", maj, min); auto parseResult = scn::scan(deviceIdStr, "{}:{}", maj, min);
if (!parseResult) { if (!parseResult) {
@@ -139,7 +143,7 @@ Result<std::vector<SysResource::DiskInfo>> SysResource::scanDiskInfo() {
if (deviceToUUID.count(devicePath)) { if (deviceToUUID.count(devicePath)) {
infos.emplace_back(); infos.emplace_back();
infos.back().deviceId = maj * 256 + min; infos.back().deviceId = makedev(maj, min);
infos.back().uuid = deviceToUUID[devicePath]; infos.back().uuid = deviceToUUID[devicePath];
infos.back().devicePath = devicePath; infos.back().devicePath = devicePath;
infos.back().mountPath = mountPath; infos.back().mountPath = mountPath;