Merge pull request #11 from DavidingPlus/feature-liuzx-cross-space

Fix Problem When Running Unit Test With Util

Author: DavidingPlus

snippet/CalcInodeBlocksTest/main.cpp

@@ -0,0 +1,17 @@
+#include <iostream>
+
+#include "defs.h"
+#include "util.h"
+
+
+int main()
+{
+    std::cout << nvmixCalcInodeBlocks(0) << std::endl;                    // 0
+    std::cout << nvmixCalcInodeBlocks(1) << std::endl;                    // 8
+    std::cout << nvmixCalcInodeBlocks(NVMIX_BLOCK_SIZE - 1) << std::endl; // 8
+    std::cout << nvmixCalcInodeBlocks(NVMIX_BLOCK_SIZE) << std::endl;     // 8
+    std::cout << nvmixCalcInodeBlocks(NVMIX_BLOCK_SIZE + 1) << std::endl; // 16
+
+
+    return 0;
+}

snippet/CalcInodeBlocksTest/xmake.lua

@@ -0,0 +1,4 @@
+target ("CalcInodeBlocksTest")
+    set_kind ("binary")
+    add_files ("main.cpp")
+    add_deps ("nvmix-cross-space")

src/defs.h src/cross-space/defs.hsrc/defs.h renamed to src/cross-space/defs.h

@@ -11,6 +11,11 @@
 #ifndef _NVMIX_DEFS_H_
 #define _NVMIX_DEFS_H_
 
+#include "globalmacros.h"
+
+
+NVMIX_EXTERN_C_BEGIN
+
 
 /**
  * @brief 超级块的逻辑块号。
@@ -116,4 +121,7 @@ struct NvmixInode
 };
 
 
+NVMIX_EXTERN_C_END
+
+
 #endif

src/cross-space/globalmacros.h

@@ -0,0 +1,31 @@
+/**
+ * @file globalmacros.h
+ * @author DavidingPlus (davidingplus@qq.com)
+ * @brief 全局宏定义头文件。
+ *
+ * Copyright (c) 2025 电子科技大学 刘治学
+ *
+ */
+
+#ifndef _NVMIX_GLOBALMACROS_H_
+#define _NVMIX_GLOBALMACROS_H_
+
+
+#ifdef __cplusplus
+
+#define NVMIX_EXTERN_C_BEGIN \
+    extern "C"               \
+    {
+
+#define NVMIX_EXTERN_C_END }
+
+#else
+
+#define NVMIX_EXTERN_C_BEGIN
+
+#define NVMIX_EXTERN_C_END
+
+#endif
+
+
+#endif

src/util.c src/cross-space/util.csrc/util.c renamed to src/cross-space/util.c

@@ -11,9 +11,13 @@
 #ifndef _NVMIX_UTIL_H_
 #define _NVMIX_UTIL_H_
 
+#include "globalmacros.h"
 #include "defs.h"
 
 
+NVMIX_EXTERN_C_BEGIN
+
+
 #define NVMIX_DIV_ROUND_UP(n, d) (((n) + (d)-1) / (d))
 
 // 通过 inode 对应目录项的大小转化为 inode->i_blocks 的值，注意 inode->i_blocks 以 512 B 为单位。
@@ -24,4 +28,7 @@
 unsigned long long nvmixCalcInodeBlocks(long long size);
 
 
+NVMIX_EXTERN_C_END
+
+
 #endif