From patchwork Thu Dec 19 10:49:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 182088 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp316551iln; Thu, 19 Dec 2019 02:58:45 -0800 (PST) X-Google-Smtp-Source: APXvYqw7xxhK1XtXZ3k1EfMHGEOFXkobH/C1eGgyoyjw2JpP20/5z37xJsibpJoT4N756P0Ws6PR X-Received: by 2002:a37:e507:: with SMTP id e7mr7663298qkg.358.1576753125791; Thu, 19 Dec 2019 02:58:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576753125; cv=none; d=google.com; s=arc-20160816; b=oQuewhRe1k58mObY7IYb/NqPEE/Zm0Eco9Ik74G4a28JjilRm5yg6nXA/OgreLZOoi /egQ2MQc6w2tyK4n4xL9xdK3W6jBJFN4tMB1BXghssvjyUksJ6fhuiPcnbltTJXm0voT DmZwZbmY6zF5phse30Th/MsAr4OPSs5D8a6dbYHLl1ZU/Kv1R/oxoXbjFkhk9r7HNQPZ SbNYhG+kjGBc5xR9APpEe1nK4pwoDTRDLgn3TgWZug1V+BbqjDZNIIDc+VgDh4qJXNRK hkf4SYxqbSf0yX60UQsuLhx1Ihbx8t6vAfziyribYCQvgok3i7ToFAGuZFPhzH1BpFnA GsUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=mUysB+KCVNDJImTrn1g1Sf4sZ1iooDukb6kMQuinDJU=; b=gJtjz+tFRgiQeInOZ0uFP4qBLeztGLhdWfWFlFHi6dHuMgTG6RtgOclQX/4H5mOO50 gwM77kWYzm4b/EaTzHeQPtqqXbHmfw1NsjfKS4oi05bN1ldcXZ/cSntZUm1KGhTWBgv6 jeVQGLUHyWs1GeffqLvWRQh88vsAyzlBEXFgi1VETDVGFXI2g/wF086w8HfmJAz8FMHr Pvji38eYIeVUNFMvWG9uyJugXu6wnCimQMzygQarbBmY9G+Qla/VPmHeEUU5au2e/kPu FzGIheGNYS4KmgmNiNMMh6CzAR6qOSnWH8WioDStMR39Hxf3iPEKaAcQnKdFH97i351X u6Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L40IF6uZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c70si3508487qkg.64.2019.12.19.02.58.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Dec 2019 02:58:45 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=L40IF6uZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtW1-0002de-29 for patch@linaro.org; Thu, 19 Dec 2019 05:58:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40617) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtNU-0006vs-PR for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihtNT-0000zm-Bq for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:56 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:53495) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihtNT-0000uv-47 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:55 -0500 Received: by mail-wm1-x32a.google.com with SMTP id m24so4930791wmc.3 for ; Thu, 19 Dec 2019 02:49:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mUysB+KCVNDJImTrn1g1Sf4sZ1iooDukb6kMQuinDJU=; b=L40IF6uZCGZS14txqiYJXwjArg8XcaWe4PMZnAXkRUPHNUdj+todE42Soo70HZB/ck I0T6t/ILA0Bnj9yZZWQhen/ZzE8sQpN5D4psFQZb1Kz3RGkIr8BpRpLNhqh3nlPwjY+t 7aBEpJS1uLi4t4GZ0IkBYsiSHgpHtUIo9r26cVs7Pv5NSVYqzNWWgOsA22kp+8PY1DRi fjFPMvPNQWcRilcc/ge/P9qZi5ATlkhcq7bnABSw3KG8xX4jSbIQOjVeYCVH/Xx6G3Jg DsONUKiYjldLoLZpymZthsX0cifKl3rgkYsO5DbsrQc9jg8bDde7dUCu+gdsou6Toa7n e6Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mUysB+KCVNDJImTrn1g1Sf4sZ1iooDukb6kMQuinDJU=; b=EH6tFuH1KDyCheYruzJx8LCbz9nB1fZjeMyTi+d97YaxYxW0ofbZf7bkhkoGAUytML rEtRWYCs3m0G00LposkDyDpXiZUJ+m4tN+lMGL2MxgpdKXGUt9IMPYwaysKpWUtFLIYH 4Nn6qEFWbzLfI2NUF5UCV/1KhyoM+ztlWhonRndRaoFAwbr5qAzSsFBut8v67o5uLt33 jsQRVMl7BfaTYTa7zQryN+1082E149FWxagHnmfQdc5A+T/T37f4uDk8/yfyCO6V3nP9 FZY5NTtFT4VGMZW/0TZ/A6/If+tFfEpbd6OfQMzFBwuCpJKNRh65za+CbtLEfRbmleYL 8uOQ== X-Gm-Message-State: APjAAAXDHWcs7KcOCcnZXy6N1/ShVd7HLTnCsSxzhKxe8YAqb/V0VxIm IVjtxnrOkihDZllUsrmzThYhyhq1CVU= X-Received: by 2002:a1c:9acf:: with SMTP id c198mr8926967wme.175.1576752594098; Thu, 19 Dec 2019 02:49:54 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b67sm6052291wmc.38.2019.12.19.02.49.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 02:49:46 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A02001FF9D; Thu, 19 Dec 2019 10:49:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/25] Add a mutex to guarantee single writer to qemu_logfile handle. Date: Thu, 19 Dec 2019 10:49:22 +0000 Message-Id: <20191219104934.866-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219104934.866-1-alex.bennee@linaro.org> References: <20191219104934.866-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley Also added qemu_logfile_init() for initializing the logfile mutex. Note that inside qemu_set_log() we needed to add a pair of qemu_mutex_unlock() calls in order to avoid a double lock in qemu_log_close(). This unavoidable temporary ugliness will be cleaned up in a later patch in this series. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20191118211528.3221-4-robert.foley@linaro.org> -- 2.20.1 diff --git a/util/log.c b/util/log.c index 417d16ec66e..953a66b5a8d 100644 --- a/util/log.c +++ b/util/log.c @@ -24,8 +24,10 @@ #include "qapi/error.h" #include "qemu/cutils.h" #include "trace/control.h" +#include "qemu/thread.h" static char *logfilename; +static QemuMutex qemu_logfile_mutex; FILE *qemu_logfile; int qemu_loglevel; static int log_append = 0; @@ -49,6 +51,11 @@ int qemu_log(const char *fmt, ...) return ret; } +static void __attribute__((__constructor__)) qemu_logfile_init(void) +{ + qemu_mutex_init(&qemu_logfile_mutex); +} + static bool log_uses_own_buffers; /* enable or disable low levels log */ @@ -70,7 +77,9 @@ void qemu_set_log(int log_flags) if (qemu_loglevel && (!is_daemonized() || logfilename)) { need_to_open_file = true; } + qemu_mutex_lock(&qemu_logfile_mutex); if (qemu_logfile && !need_to_open_file) { + qemu_mutex_unlock(&qemu_logfile_mutex); qemu_log_close(); } else if (!qemu_logfile && need_to_open_file) { if (logfilename) { @@ -105,6 +114,7 @@ void qemu_set_log(int log_flags) #endif log_append = 1; } + qemu_mutex_unlock(&qemu_logfile_mutex); } } @@ -240,12 +250,14 @@ void qemu_log_flush(void) /* Close the log file */ void qemu_log_close(void) { + qemu_mutex_lock(&qemu_logfile_mutex); if (qemu_logfile) { if (qemu_logfile != stderr) { fclose(qemu_logfile); } qemu_logfile = NULL; } + qemu_mutex_unlock(&qemu_logfile_mutex); } const QEMULogItem qemu_log_items[] = {