diff --git a/checker/checker.sh b/checker/checker.sh index dfab0ce3109adb276198adc2428b66e9a4311aa5..e461e54e6efef9aa1b426a88513fe0dcec5588da 100755 --- a/checker/checker.sh +++ b/checker/checker.sh @@ -84,18 +84,24 @@ recover_grade_from_timeout() fi } -timeout_exceeded() +dmesg_log_dump() { - local output=$1 - pkill -SIGKILL qemu - echo "" - echo "TIMEOUT EXCEEDED !!! killing the process" if [[ $DMESG_LOG != "" ]]; then echo "dumping DMESG_LOG=${DMESG_LOG} output" echo ">>>>---------------DMESG_LOG_STARTS_HERE------------------<<<<<" cat $DMESG_LOG echo ">>>>----------------DMESG_LOG_ENDS_HERE-------------------<<<<<" fi +} + +timeout_exceeded() +{ + local output=$1 + pkill -SIGKILL qemu + echo "" + echo "TIMEOUT EXCEEDED !!! killing the process" + + dmesg_log_dump if [[ $RECOVER_GRADE_TIMEOUT == 0 ]]; then if [ -f $output ]; then diff --git a/checker/checker_daemons/so2_vm_checker_logger.sh b/checker/checker_daemons/so2_vm_checker_logger.sh index 5d701258c9cd90e25b30a2b24b676154d308723b..fe61fb61e4ac9e42e3f99ef9ced25f0f8312a3b8 100644 --- a/checker/checker_daemons/so2_vm_checker_logger.sh +++ b/checker/checker_daemons/so2_vm_checker_logger.sh @@ -11,9 +11,7 @@ start() while true do sleep 1 - echo ------------------START_HERE------------------ >> $LOG_FILE - dmesg >> $LOG_FILE - echo -------------------END_HERE------------------- >> $LOG_FILE + dmesg -c >> $LOG_FILE done }