From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13241 invoked by alias); 5 Sep 2019 13:42:05 -0000 Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org Received: (qmail 13184 invoked by uid 89); 5 Sep 2019 13:42:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: mail-wm1-f51.google.com Received: from mail-wm1-f51.google.com (HELO mail-wm1-f51.google.com) (209.85.128.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 05 Sep 2019 13:42:04 +0000 Received: by mail-wm1-f51.google.com with SMTP id n10so3128403wmj.0 for ; Thu, 05 Sep 2019 06:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=43pb2WFmYSmA2Rsi8oBXKBDs+ip1Kbzeyn13NBxFAjI=; b=RnGAWCx4zbE48gRh2bVMzdh6AC7bCWx6wsUFiWwU1ISmGgyiV+JRt8wmuQpezupvUp 9qosgqxNdxgXeZ2cDiPYVqHQOj+yXG3s6p/WSy1nTWgJNXRCl3VXoYrVfx16zHjlHG93 l4QWJ1t6Hnm9TgtOG6ucNKm8fvbzc97bNKKoM= Return-Path: Received: from hex.int.rpsys.net (5751f4a1.skybroadband.com. [87.81.244.161]) by smtp.gmail.com with ESMTPSA id j22sm4174798wre.45.2019.09.05.06.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Sep 2019 06:41:59 -0700 (PDT) From: Richard Purdie To: systemtap@sourceware.org Cc: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Subject: [PATCH 4/4] cache.cxx: Fix errors on x32 builds Date: Thu, 05 Sep 2019 13:42:00 -0000 Message-Id: <20190905134154.5478-4-richard.purdie@linuxfoundation.org> In-Reply-To: <20190905134154.5478-1-richard.purdie@linuxfoundation.org> References: <20190905134154.5478-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2019-q3/txt/msg00066.txt.bz2 Fix time_t print because in x32 ABI is long long int instead of long int. Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- cache.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cache.cxx b/cache.cxx index 3546b3037..19c77ca0c 100644 --- a/cache.cxx +++ b/cache.cxx @@ -294,7 +294,11 @@ clean_cache(systemtap_session& s) { //interval not passed, don't continue if (s.verbose > 1) +#if defined(__x86_64__) && defined (__ILP32__) + clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.", +#else clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.", +#endif (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; return; } @@ -302,7 +306,11 @@ clean_cache(systemtap_session& s) { //interval reached, continue if (s.verbose > 1) +#if defined(__x86_64__) && defined (__ILP32__) + clog << _F("Cleaning cache, interval reached %lld s > %lu s.", +#else clog << _F("Cleaning cache, interval reached %lu s > %lu s.", +#endif (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl; } -- 2.17.1