From a2fd65a1e9a711fae0734bdb539aae617115bd30 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周三, 14 10月 2020 22:31:25 +0800
Subject: [PATCH] add debug
---
src/library/os/linux/os_linux.cpp | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/library/os/linux/os_linux.cpp b/src/library/os/linux/os_linux.cpp
index d934623..3c0dde2 100644
--- a/src/library/os/linux/os_linux.cpp
+++ b/src/library/os/linux/os_linux.cpp
@@ -1,13 +1,16 @@
#include <paths.h>
#include <sys/stat.h>
#include <stdio.h>
+#include <cerrno>
+#include <cstring>
+#include <string>
#include "../os.h"
#include "../../base/logger.h"
#include <mntent.h>
#include <dirent.h>
#include <sys/utsname.h>
-#ifdef _DEBUG
+#ifndef NDEBUG
#include <valgrind/memcheck.h>
#endif
@@ -52,7 +55,7 @@
free(hexuuid);
}
-#define MAX_UNITS 20
+#define MAX_UNITS 40
FUNCTION_RETURN getDiskInfos(DiskInfo *diskInfos, size_t *disk_info_size) {
struct stat mount_stat, sym_stat;
/*static char discard[1024];
@@ -89,9 +92,10 @@
}
currentDrive = 0;
- while (NULL != (ent = getmntent(aFile))) {
+ while (NULL != (ent = getmntent(aFile)) && currentDrive < maxDrives) {
if ((strncmp(ent->mnt_type, "ext", 3) == 0 || strncmp(ent->mnt_type, "xfs", 3) == 0 ||
- strncmp(ent->mnt_type, "vfat", 4) == 0 || strncmp(ent->mnt_type, "ntfs", 4) == 0) &&
+ strncmp(ent->mnt_type, "vfat", 4) == 0 || strncmp(ent->mnt_type, "ntfs", 4) == 0 ||
+ strncmp(ent->mnt_type, "btr", 3) == 0) &&
ent->mnt_fsname != NULL && strncmp(ent->mnt_fsname, "/dev/", 5) == 0) {
if (stat(ent->mnt_fsname, &mount_stat) == 0) {
drive_found = -1;
@@ -101,7 +105,7 @@
}
}
if (drive_found == -1) {
- LOG_DEBUG("mntent: %s %s %d\n", ent->mnt_fsname, ent->mnt_dir,
+ LOG_DEBUG("mntent fs:[%s],dir:[%s],inode:[%d]\n", ent->mnt_fsname, ent->mnt_dir,
(unsigned long int)mount_stat.st_ino);
strncpy(tmpDrives[currentDrive].device, ent->mnt_fsname, 255 - 1);
statDrives[currentDrive] = mount_stat.st_ino;
@@ -115,6 +119,8 @@
} else {
tmpDrives[drive_found].preferred = 0;
}
+ } else {
+ LOG_DEBUG("Error %s during stat of %s \n", std::strerror(errno), ent->mnt_fsname);
}
}
}
@@ -126,28 +132,36 @@
result = (currentDrive > 0) ? FUNC_RET_OK : FUNC_RET_NOT_AVAIL;
} else if (*disk_info_size >= currentDrive) {
disk_by_uuid_dir = opendir("/dev/disk/by-uuid");
- if (disk_by_uuid_dir == NULL) {
+ if (disk_by_uuid_dir == nullptr) {
LOG_WARN("Open /dev/disk/by-uuid fail");
free(statDrives);
return FUNC_RET_ERROR;
}
result = FUNC_RET_OK;
*disk_info_size = currentDrive;
- while ((dir = readdir(disk_by_uuid_dir)) != NULL) {
- strcpy(cur_dir, "/dev/disk/by-uuid/");
- strncat(cur_dir, dir->d_name, 200);
- if (stat(cur_dir, &sym_stat) == 0) {
+
+ while ((dir = readdir(disk_by_uuid_dir)) != nullptr) {
+ std::string cur_dir("/dev/disk/by-uuid/");
+ cur_dir += dir->d_name;
+ bool found = false;
+ if (stat(cur_dir.c_str(), &sym_stat) == 0) {
for (i = 0; i < currentDrive; i++) {
if (sym_stat.st_ino == statDrives[i]) {
+ found = true;
parseUUID(dir->d_name, tmpDrives[i].disk_sn, sizeof(tmpDrives[i].disk_sn));
-#ifdef _DEBUG
+#ifndef NDEBUG
VALGRIND_CHECK_VALUE_IS_DEFINED(tmpDrives[i].device);
-
LOG_DEBUG("uuid %d %s %02x%02x%02x%02x\n", i, tmpDrives[i].device, tmpDrives[i].disk_sn[0],
tmpDrives[i].disk_sn[1], tmpDrives[i].disk_sn[2], tmpDrives[i].disk_sn[3]);
#endif
}
}
+ if (!found) {
+ LOG_DEBUG("Drive [%s] inode [%d] did not match any existing drive\n", cur_dir,
+ (unsigned long int)sym_stat.st_ino);
+ }
+ } else {
+ LOG_DEBUG("Error %s during stat of %s \n", std::strerror(errno), cur_dir);
}
}
closedir(disk_by_uuid_dir);
@@ -161,7 +175,7 @@
for (i = 0; i < currentDrive; i++) {
if (sym_stat.st_ino == statDrives[i]) {
strncpy(tmpDrives[i].label, dir->d_name, 255 - 1);
- printf("label %d %s %s\n", i, tmpDrives[i].label, tmpDrives[i].device);
+ LOG_DEBUG("label %d %s %s\n", i, tmpDrives[i].label, tmpDrives[i].device);
}
}
}
@@ -174,7 +188,6 @@
free(statDrives);
return result;
}
-
FUNCTION_RETURN getMachineName(unsigned char identifier[6]) {
static struct utsname u;
--
Gitblit v1.9.1