gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mcklogd: change the timing of start/stop.

Browse Source
This commit is contained in:
Ken Sato
2017-05-09 16:06:07 +09:00
parent 0fef80cb19
commit 3f870b69a6
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/x86/tools/mcreboot-smp-x86.sh.in
View File

@ -260,16 +260,6 @@ if [ "${irqbalance_used}" == "yes" ]; then
fi; fi;
fi fi
# Start mcklogd. Note that McKernel blocks when kmsg buffer is full
# with '-k 1' until mcklogd unblocks it so starting mcklogd must preceed
# booting McKernel
if [ ${LOGMODE} -ne 0 ]; then
# Stop mcklogd which has survived McKernel shutdown because
# mcstop+release.sh is not used
pkill mcklogd
SBINDIR=${SBINDIR} ${SBINDIR}/mcklogd -i ${INTERVAL} -f ${facility}
fi
# Load IHK if not loaded # Load IHK if not loaded
if ! grep -E 'ihk\s' /proc/modules &>/dev/null; then if ! grep -E 'ihk\s' /proc/modules &>/dev/null; then
if ! insmod ${KMODDIR}/ihk.ko 2>/dev/null; then if ! insmod ${KMODDIR}/ihk.ko 2>/dev/null; then
@ -521,3 +511,13 @@ if [ "${irqbalance_used}" == "yes" ]; then
# echo cpus=$cpus mask=$smp_affinity_mask banirq=$banirq # echo cpus=$cpus mask=$smp_affinity_mask banirq=$banirq
fi fi
# Start mcklogd. Note that McKernel blocks when kmsg buffer is full
# with '-k 1' until mcklogd unblocks it so starting mcklogd must preceed
# booting McKernel
if [ ${LOGMODE} -ne 0 ]; then
# Stop mcklogd which has survived McKernel shutdown because
# mcstop+release.sh is not used
pkill mcklogd
SBINDIR=${SBINDIR} ${SBINDIR}/mcklogd -i ${INTERVAL} -f ${facility}
fi

6
arch/x86/tools/mcstop+release-smp-x86.sh.in
View File

@ -20,6 +20,9 @@ cpus=""
# No SMP module? Exit. # No SMP module? Exit.
if ! grep ihk_smp_x86 /proc/modules &>/dev/null; then exit 0; fi if ! grep ihk_smp_x86 /proc/modules &>/dev/null; then exit 0; fi
# Stop mcklogd
pkill mcklogd
# Destroy all LWK instances # Destroy all LWK instances
if ls /dev/mcos* 1>/dev/null 2>&1; then if ls /dev/mcos* 1>/dev/null 2>&1; then
for i in /dev/mcos*; do for i in /dev/mcos*; do
@ -94,9 +97,6 @@ if grep -E 'ihk\s' /proc/modules &>/dev/null; then
fi fi
fi fi
# Stop mcklogd
pkill mcklogd
# Start irqbalance with the original settings # Start irqbalance with the original settings
if [ "`systemctl status irqbalance_mck.service 2> /dev/null |grep -E 'Active: active'`" != "" ]; then if [ "`systemctl status irqbalance_mck.service 2> /dev/null |grep -E 'Active: active'`" != "" ]; then
if ! systemctl stop irqbalance_mck.service 2>/dev/null; then if ! systemctl stop irqbalance_mck.service 2>/dev/null; then