From 563448a7a3ca87cc07528c18f8047913e0468e7a Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Tue, 10 Apr 2018 21:21:59 -0500 Subject: icecc.bbclass: Improve error reporting Improve reporting when the icecream environment cannot be created by assigning the flock call a specific error number when the lock fails so it can be distinguished from environment creation errors. Signed-off-by: Joshua Watt Signed-off-by: Ross Burton --- meta/classes/icecc.bbclass | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index aea1095f5f..1b58d1f5e5 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -366,14 +366,20 @@ set_icecc_env() { # the ICECC_VERSION generation step must be locked by a mutex # in order to prevent race conditions - if flock -n "${ICECC_VERSION}.lock" \ - ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" - then + exit_code=0 + flock -n -E 10 "${ICECC_VERSION}.lock" \ + ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" || exit_code=$? + if [ "$exit_code" -eq 0 ]; then + touch "${ICECC_VERSION}.done" + elif [ "$exit_code" -eq "10" ]; then + if [ ! wait_for_file "${ICECC_VERSION}.done" 30 ]; then + # locking failed so wait for ${ICECC_VERSION}.done to appear + bbwarn "Timeout waiting for ${ICECC_VERSION}.done" + return + fi + else + bbwarn "Could not create icecc environment: $exit_code" touch "${ICECC_VERSION}.done" - elif [ ! wait_for_file "${ICECC_VERSION}.done" 30 ] - then - # locking failed so wait for ${ICECC_VERSION}.done to appear - bbwarn "Timeout waiting for ${ICECC_VERSION}.done" return fi fi -- cgit 1.2.3-korg