From patchwork Tue Nov 12 15:01:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 179211 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp8241421ilf; Tue, 12 Nov 2019 07:07:14 -0800 (PST) X-Google-Smtp-Source: APXvYqyRCPX0Epc2dTql4QQgrnZGrWUVmNPCTZAWIfPUqf3SspucQ2zGCqtLlGEHk7tAT3WllXIN X-Received: by 2002:aed:3ae8:: with SMTP id o95mr31870784qte.277.1573571233727; Tue, 12 Nov 2019 07:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573571233; cv=none; d=google.com; s=arc-20160816; b=ydT3PKMV18OXqg8pDsc87CojK60NuQF+1gPmiWCUtbsnQsuowmt+GRwLo2Yc/1A1l5 Hn255S3dJ3PWM199InARbOSTU75oaKaqt0KH450e6rnrRseGp53tesxqgiexigAveGo4 DXnpXXdDB6wdAgxnMLhHG4axR3iNlcX+jqT2TzuXSrc0Fbz+YWUHLscIFnsSNLD6SEQo dYgtzlP+cR79zGo1SH1msdsJHpr3Uc5X+33NxEjF8/xHORhtjZKOBrV+FuOJNf1BNySy fJW8URyD+PcQZiiLdKxL5mgS0DnJzX6MRxTKq4Q/3CaZfNd6uhDyYWAC9aSl4q5HcTca Pvsg== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=UZ1i/qk2uiqDPVsu76k+F9DPkKMPM0uCow51hxWGol0=; b=gRU+x4QWE9V60sg4pYwxDL8NyILdA/8u4TePXrMoOTv8CQ0KwY46Lom3IL6y9ofagK m3yvN/RBeLY6nnAyfI6cxLdqZkTp50wRmpSWl51YhbMLhHs55GQDYlDH5BLBJMeWNoa6 VOSZEVOfqFcTz6HBkhck14nvjrOd9SjYdiOdL/ry84XhYtnOLu9g/wCFAEEm04tIQwhV pqhwArTalfUrW9wpAiGu/YrcT14/XTOl7rgi5OUHZn/Sl10zUXzKjIVvX3KNg3wjFbEE q9uHSBHqgorMMxEcP59BrAS4piUdg/b5nkxZZQ7ULw08bA12Sc2YKkubHNqFKjhie1vU KMbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=blgiVHdU; 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 q18si6097067qkn.109.2019.11.12.07.07.13 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Nov 2019 07:07:13 -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=blgiVHdU; 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]:36208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXlA-0002oO-LZ for patch@linaro.org; Tue, 12 Nov 2019 10:07:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37926) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUXgZ-0005vS-6H for qemu-devel@nongnu.org; Tue, 12 Nov 2019 10:02:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUXgY-0002F3-2m for qemu-devel@nongnu.org; Tue, 12 Nov 2019 10:02:27 -0500 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:38051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUXgX-0002E9-Tl for qemu-devel@nongnu.org; Tue, 12 Nov 2019 10:02:26 -0500 Received: by mail-pg1-x542.google.com with SMTP id 15so12023136pgh.5 for ; Tue, 12 Nov 2019 07:02:25 -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; bh=UZ1i/qk2uiqDPVsu76k+F9DPkKMPM0uCow51hxWGol0=; b=blgiVHdUZkbRYrRhl3aD2DIHIc+2XDmBTBSvyCP2Hwwhc+kDWTgo9/HyLyKAlI1NkA FmsaDV+dakK0vmdo2V3r7LPFwXg6EviIey2jmjCdzg0egVWFEbcSsxJczFM/obzOX8YR GCWeyoJQr9OsPIo3NjI0bG70tllZGZY7wG8LyUAXMJwbXQAFuJ4V1xyhyGWGJrlZw6nG 7nnYxuhwEsJf6oQyDrXqgLuQV9YU45eAglpeeYL3ep5LPBYmZdssdbOibjuF0xUi83d/ AcP8nLteLiKebLHfZAa6PR7brO3VYbhpFnPBi9bQL9Jl0fOhEv4YmQvCCSwdrE5iuu08 Bfvw== 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; bh=UZ1i/qk2uiqDPVsu76k+F9DPkKMPM0uCow51hxWGol0=; b=e97KYr6PSW707LASXnOkWve1KtdT4rwsr0slMG60IgwZ/lXXamAQkpqTqfvAONkDO7 OLpCNjFCL59KQtHsV4LAFlje3ETq/eOBDbbs6KGWwYTaFTfjBlPgCA8pprPrBW1a4GqS e0k6+rPv16JM+UkeqH9NwV5NARdLByKgSAy9kbD/mIwLV8jKgOUP7a5W8vGJ1kqSRG1y m/egivc9i8GLWfkueSASre7v6to+NS9FDvPFbxEXAqi1AD+W90XCZvpdUMI9ce2udnaZ 4i1wtRIMBwh7uFilpDDiZWXFqsQXIPzwkBkC0iPwg0J7DG5Yz+xXwTKWDnRq/Stp92xb qBLQ== X-Gm-Message-State: APjAAAXHo3T2UFGXMcxpEiaB1fhoMbAAyKiWTws+/xxBg53i+BSr1GyX WOzzpX46yscw+dh/HdmOfBElFOy+Q+U= X-Received: by 2002:a17:90a:1b69:: with SMTP id q96mr7090424pjq.89.1573570944161; Tue, 12 Nov 2019 07:02:24 -0800 (PST) Received: from Rfoley-MA01.usrd.futurewei.com ([12.111.81.71]) by smtp.gmail.com with ESMTPSA id a3sm8235511pfo.71.2019.11.12.07.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2019 07:02:23 -0800 (PST) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v1 1/5] Add a mutex to guarantee single writer to qemu_logfile handle. Date: Tue, 12 Nov 2019 10:01:01 -0500 Message-Id: <20191112150105.2498-2-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191112150105.2498-1-robert.foley@linaro.org> References: <20191112150105.2498-1-robert.foley@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 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: peter.puhov@linaro.org, alex.bennee@linaro.org, robert.foley@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Also added qemu_logfile_init() for initializing the logfile mutex. Signed-off-by: Robert Foley --- v1 - changed qemu_logfile_init() to use __constructor__. --- util/log.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/util/log.c b/util/log.c index 1ca13059ee..c25643dc99 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 */ @@ -58,6 +65,9 @@ void qemu_set_log(int log_flags) #ifdef CONFIG_TRACE_LOG qemu_loglevel |= LOG_TRACE; #endif + + g_assert(qemu_logfile_mutex.initialized); + qemu_mutex_lock(&qemu_logfile_mutex); if (!qemu_logfile && (is_daemonized() ? logfilename != NULL : qemu_loglevel)) { if (logfilename) { @@ -93,6 +103,7 @@ void qemu_set_log(int log_flags) log_append = 1; } } + qemu_mutex_unlock(&qemu_logfile_mutex); if (qemu_logfile && (is_daemonized() ? logfilename == NULL : !qemu_loglevel)) { qemu_log_close(); @@ -230,12 +241,15 @@ void qemu_log_flush(void) /* Close the log file */ void qemu_log_close(void) { + g_assert(qemu_logfile_mutex.initialized); + 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[] = {