Skip to content

Commit 4ca963e

Browse files
feat(lmbench): 更新测试环境脚本以支持 ext4 文件系统,移除 ext2 相关内容
1 parent 9c97320 commit 4ca963e

14 files changed

+75
-75
lines changed

user/apps/tests/benchmark/lmbench/clean_up.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ if [[ $EUID -ne 0 ]];then
1010
exit 1
1111
fi
1212

13-
# 清理挂载的 ext2 文件系统和临时文件
14-
if [[ -d "/ext2" ]]; then
15-
umount /ext2
16-
rm -rf /ext2
13+
# 清理挂载的 ext4 文件系统和临时文件
14+
if [[ -d "/ext4" ]]; then
15+
umount /ext4
16+
rm -rf /ext4
1717
fi
1818

19-
if [[ -f "./ext2.img" ]]; then
20-
rm -f ./ext2.img
19+
if [[ -f "./ext4.img" ]]; then
20+
rm -f ./ext4.img
2121
fi
2222

2323

user/apps/tests/benchmark/lmbench/env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# lmbench 二进制文件路径前缀
22
export LMBENCH_BIN_DIR="/lib/lmbench/bin/x86_64-linux-gnu"
3-
# 挂载的 ext2 文件系统路径
4-
export LMBENCH_EXT2_DIR="/ext2"
3+
# 挂载的 ext4 文件系统路径
4+
export LMBENCH_EXT4_DIR="/ext4"
55
# 临时文件存放路径
66
export LMBENCH_TMP_DIR="/tmp"
77
# 测试文件名

user/apps/tests/benchmark/lmbench/init.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@
33
# 运行任何具体的测试脚本之前需要先运行此脚本初始化测试环境
44
# Usage: bash init.sh
55

6-
# 创建并挂载 ext2 文件系统到 /ext2 目录(用于 ext2_xxx 测试)
7-
create_ext2_fs(){
8-
if [[ ! -d "/ext2" ]]; then
9-
mkdir -p /ext2
10-
if [[ -f "./ext2.img" ]]; then
11-
rm -f ./ext2.img
6+
# 创建并挂载 ext4 文件系统到 /ext4 目录(用于 ext4_xxx 测试)
7+
create_ext4_fs(){
8+
if [[ ! -d "/ext4" ]]; then
9+
mkdir -p /ext4
10+
if [[ -f "./ext4.img" ]]; then
11+
rm -f ./ext4.img
1212
fi
13-
dd if=/dev/zero of=./ext2.img bs=1M count=1024
14-
mkfs.ext2 ./ext2.img
15-
mount -o loop ./ext2.img /ext2
13+
dd if=/dev/zero of=./ext4.img bs=1M count=1024
14+
mkfs.ext4 ./ext4.img
15+
mount -o loop ./ext4.img /ext4
1616
fi
1717
}
1818

1919

2020
# 创建测试所需的文件
2121
create_test_file() {
22-
EXT2_ZERO_FILE_PATH=${LMBENCH_EXT2_DIR}/zero_file
23-
EXT2_TEST_FILE_PATH=${LMBENCH_EXT2_DIR}/test_file
22+
EXT4_ZERO_FILE_PATH=${LMBENCH_EXT4_DIR}/zero_file
23+
EXT4_TEST_FILE_PATH=${LMBENCH_EXT4_DIR}/test_file
2424
TMP_ZERO_FILE_PATH=/tmp/zero_file
2525
TMP_TEST_FILE_PATH=/tmp/test_file
2626

27-
if [[ ! -f "${EXT2_ZERO_FILE_PATH}" ]]; then
28-
touch ${EXT2_ZERO_FILE_PATH}
29-
dd if=/dev/zero of=${EXT2_ZERO_FILE_PATH} bs=1M count=512
30-
echo "创建零文件 ${EXT2_ZERO_FILE_PATH} 完成"
27+
if [[ ! -f "${EXT4_ZERO_FILE_PATH}" ]]; then
28+
touch ${EXT4_ZERO_FILE_PATH}
29+
dd if=/dev/zero of=${EXT4_ZERO_FILE_PATH} bs=1M count=512
30+
echo "创建零文件 ${EXT4_ZERO_FILE_PATH} 完成"
3131
fi
3232

33-
if [[ ! -f "${EXT2_TEST_FILE_PATH}" ]]; then
34-
touch ${EXT2_TEST_FILE_PATH}
35-
dd if=/dev/zero of=${EXT2_TEST_FILE_PATH} bs=1M count=512
36-
echo "创建测试文件 ${EXT2_TEST_FILE_PATH} 完成"
33+
if [[ ! -f "${EXT4_TEST_FILE_PATH}" ]]; then
34+
touch ${EXT4_TEST_FILE_PATH}
35+
dd if=/dev/zero of=${EXT4_TEST_FILE_PATH} bs=1M count=512
36+
echo "创建测试文件 ${EXT4_TEST_FILE_PATH} 完成"
3737
fi
3838

3939
if [[ ! -f "${TMP_ZERO_FILE_PATH}" ]]; then
@@ -57,7 +57,7 @@ if [[ $EUID -ne 0 ]]; then
5757
fi
5858
# 加载环境变量配置
5959
source ./env.sh
60-
# 创建 ext2 文件系统和测试文件
61-
create_ext2_fs
60+
# 创建 ext4 文件系统和测试文件
61+
create_ext4_fs
6262
create_test_file
6363
echo "lmbench 测试环境初始化完成。"

user/apps/tests/benchmark/lmbench/test_cases/ext2_copy_files_bw.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

user/apps/tests/benchmark/lmbench/test_cases/ext2_create_delete_files_0k_ops.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

user/apps/tests/benchmark/lmbench/test_cases/ext2_create_delete_files_10k_ops.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
# Test: ext4_copy_files_bw
3+
# Binary: lmdd
4+
# Description: Copy files on ext4 filesystem bandwidth test
5+
6+
7+
set -e
8+
9+
# 检查环境变量
10+
11+
12+
echo "=== Running ext4_copy_files_bw test ==="
13+
sudo ${LMBENCH_BIN_DIR}/lmdd if=${LMBENCH_EXT4_DIR}/${LMBENCH_ZERO_FILE} of=${LMBENCH_EXT4_DIR}/${LMBENCH_TEST_FILE}
14+
15+
echo "Test completed successfully"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
# Test: ext4_create_delete_files_0k_ops
3+
# Binary: lat_fs
4+
# Description: Create and delete 0k files on ext4 filesystem
5+
6+
set -e
7+
8+
9+
10+
echo "=== Running ext4_create_delete_files_0k_ops test ==="
11+
${LMBENCH_BIN_DIR}/lat_fs -s 0k -P 1 ${LMBENCH_EXT4_DIR}
12+
13+
echo "Test completed successfully"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
# Test: ext4_create_delete_files_10k_ops
3+
# Binary: lat_fs
4+
# Description: Create and delete 10k files on ext4 filesystem
5+
6+
set -e
7+
8+
9+
10+
echo "=== Running ext4_create_delete_files_10k_ops test ==="
11+
${LMBENCH_BIN_DIR}/lat_fs -s 10k -P 1 ${LMBENCH_EXT4_DIR}
12+
13+
echo "Test completed successfully"

user/apps/tests/benchmark/lmbench/test_cases/mem_mmap_bw.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ set -e
88

99

1010
echo "=== Running mem_mmap_bw test ==="
11-
${LMBENCH_BIN_DIR}/bw_mmap_rd -W 30 -N 300 256m mmap_only ${LMBENCH_EXT2_DIR}/${LMBENCH_TEST_FILE}
11+
${LMBENCH_BIN_DIR}/bw_mmap_rd -W 30 -N 300 256m mmap_only ${LMBENCH_EXT4_DIR}/${LMBENCH_TEST_FILE}
1212

1313
echo "Test completed successfully"

0 commit comments

Comments
 (0)