Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-01-16 14:00:32 -08:00
parent 403f34a64e fc48083154
commit 76a26e184f
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/zpios-profile/zpios-profile-disk.sh
View File

@ -1,5 +1,4 @@
#!/bin/bash #!/bin/bash
# profile-zpios-disk.sh
# #
# /proc/diskinfo <after skipping major/minor> # /proc/diskinfo <after skipping major/minor>
# Field 1 -- device name # Field 1 -- device name
@ -15,6 +14,8 @@
# Field 11 -- # of milliseconds spent doing I/Os # Field 11 -- # of milliseconds spent doing I/Os
# Field 12 -- weighted # of milliseconds spent doing I/Os # Field 12 -- weighted # of milliseconds spent doing I/Os
PROG=zpios-profile-disk.sh
RUN_PIDS=${0} RUN_PIDS=${0}
RUN_LOG_DIR=${1} RUN_LOG_DIR=${1}
RUN_ID=${2} RUN_ID=${2}

3
scripts/zpios-profile/zpios-profile-pids.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
# profile-zpios-pids.sh
PROG=zpios-profile-pids.sh
RUN_PIDS=${0} RUN_PIDS=${0}
RUN_LOG_DIR=${1} RUN_LOG_DIR=${1}

6
scripts/zpios-profile/zpios-profile-post.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
prog=profile-zpios-post.sh
. ../.script-config . ../.script-config
PROG=zpios-profile-post.sh
RUN_POST=${0} RUN_POST=${0}
RUN_PHASE=${1} RUN_PHASE=${1}
@ -19,10 +19,10 @@ RUN_THREAD_DELAY=${12}
RUN_FLAGS=${13} RUN_FLAGS=${13}
RUN_RESULT=${14} RUN_RESULT=${14}
PROFILE_ZPIOS_PIDS_BIN=${TOPDIR}/scripts/profile-zpios-pids.sh PROFILE_ZPIOS_PIDS_BIN=${TOPDIR}/scripts/zpios-profile/zpios-profile-pids.sh
PROFILE_ZPIOS_PIDS_LOG=${RUN_LOG_DIR}/${RUN_ID}/pids-summary.csv PROFILE_ZPIOS_PIDS_LOG=${RUN_LOG_DIR}/${RUN_ID}/pids-summary.csv
PROFILE_ZPIOS_DISK_BIN=${TOPDIR}/scripts/profile-zpios-disk.sh PROFILE_ZPIOS_DISK_BIN=${TOPDIR}/scripts/zpios-/profile/zpios-profile-disk.sh
PROFILE_ZPIOS_DISK_LOG=${RUN_LOG_DIR}/${RUN_ID}/disk-summary.csv PROFILE_ZPIOS_DISK_LOG=${RUN_LOG_DIR}/${RUN_ID}/disk-summary.csv
PROFILE_ZPIOS_ARC_LOG=${RUN_LOG_DIR}/${RUN_ID}/arcstats PROFILE_ZPIOS_ARC_LOG=${RUN_LOG_DIR}/${RUN_ID}/arcstats

6
scripts/zpios-profile/zpios-profile-pre.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
prog=profile-zpios-pre.sh . ../common.sh
. ../.script-config PROG=zpios-profile-pre.sh
trap "PROFILE_ZPIOS_READY=1" SIGHUP trap "PROFILE_ZPIOS_READY=1" SIGHUP
@ -21,7 +21,7 @@ RUN_THREAD_DELAY=${12}
RUN_FLAGS=${13} RUN_FLAGS=${13}
RUN_RESULT=${14} RUN_RESULT=${14}
PROFILE_ZPIOS_BIN=${IOPDIR}/scripts/profile-zpios.sh PROFILE_ZPIOS_BIN=${IOPDIR}/scripts/zpios-profile/zpios-profile.sh
PROFILE_ZPIOS_READY=0 PROFILE_ZPIOS_READY=0
OPROFILE_LOG=${RUN_LOG_DIR}/${RUN_ID}/oprofile.txt OPROFILE_LOG=${RUN_LOG_DIR}/${RUN_ID}/oprofile.txt

4
scripts/zpios-profile/zpios-profile.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
# profile-zpios.sh
PROG=zpios-profile.sh
trap "RUN_DONE=1" SIGHUP trap "RUN_DONE=1" SIGHUP

2
scripts/zpios-test/small.cfg
View File

@ -47,4 +47,4 @@ ZPIOS_CMD="${CMDDIR}/zpios/zpios \
--cleanup \ --cleanup \
--verbose \ --verbose \
--human-readable \ --human-readable \
${ZPIOS_OPTIONS} ${ZPIOS_OPTIONS}"

10
scripts/zpios.sh
View File

@ -6,8 +6,9 @@
. ./common.sh . ./common.sh
PROG=zpios.sh PROG=zpios.sh
PROFILE_ZPIOS_PRE=${TOPDIR}/scripts/profile-zpios-pre.sh PROFILE_ZPIOS_PRE=${TOPDIR}/scripts/zpios-profile/zpios-profile-pre.sh
PROFILE_ZPIOS_POST=${TOPDIR}/scripts/profile-zpios-post.sh PROFILE_ZPIOS_POST=${TOPDIR}/scripts/zpios-profile/zpios-profile-post.sh
PROFILE_ZPIOS_LOG=/tmp/
MODULES=( \ MODULES=( \
${MODDIR}/zpios/zpios.ko \ ${MODDIR}/zpios/zpios.ko \
@ -25,7 +26,7 @@ OPTIONS:
-h Show this message -h Show this message
-v Verbose -v Verbose
-p Enable profiling -p Enable profiling
-c Specify disk configuration -c Zpool configuration
EOF EOF
} }
@ -153,7 +154,6 @@ if check_modules; then
fi fi
fi fi
msg "Waiting for /dev/zpios to come up..."
while [ ! -c /dev/zpios ]; do while [ ! -c /dev/zpios ]; do
sleep 1 sleep 1
done done
@ -176,7 +176,7 @@ fi
. ${ZPIOS_TEST} . ${ZPIOS_TEST}
if [ $PROFILE ]; then if [ $PROFILE ]; then
ZPIOS_CMD="${ZPIOS_CMD} --log=${PROFILE_ZPIOS_LOGS}" ZPIOS_CMD="${ZPIOS_CMD} --log=${PROFILE_ZPIOS_LOG}"
ZPIOS_CMD="${ZPIOS_CMD} --prerun=${PROFILE_ZPIOS_PRE}" ZPIOS_CMD="${ZPIOS_CMD} --prerun=${PROFILE_ZPIOS_PRE}"
ZPIOS_CMD="${ZPIOS_CMD} --postrun=${PROFILE_ZPIOS_POST}" ZPIOS_CMD="${ZPIOS_CMD} --postrun=${PROFILE_ZPIOS_POST}"
fi fi