From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 757EAC4321D for ; Mon, 20 Aug 2018 16:17:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 333922172D for ; Mon, 20 Aug 2018 16:17:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="wqNeJlJa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 333922172D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727856AbeHTTdT (ORCPT ); Mon, 20 Aug 2018 15:33:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726024AbeHTTdS (ORCPT ); Mon, 20 Aug 2018 15:33:18 -0400 Received: from jouet.infradead.org (unknown [179.97.41.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0FF592172C; Mon, 20 Aug 2018 16:16:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1534781822; bh=ttOWeaueiJ03x0eyNPcghswaFm2Mec4sCzP7mghIoo8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wqNeJlJaIwLPPhQ8MbumwnfNChXvuw8tfWIgFIUONi6gmH1oRsAggHJ1V18YXOI32 ZEetUQGujfNlbpW9ZFbIzToYm/4r+XlJExNEl2WPIp6h536bY+QDnOQtZ62B91aDCL G8RMs3Iu2zqjaR1E+pebJ87k3xeN1IVmrVm17DZA= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Jiri Olsa , Alexander Shishkin , David Ahern , Michael Petlan , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 15/21] perf tools: Add lzma_is_compressed function Date: Mon, 20 Aug 2018 13:15:56 -0300 Message-Id: <20180820161602.6830-16-acme@kernel.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180820161602.6830-1-acme@kernel.org> References: <20180820161602.6830-1-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Olsa Add implementation of the is_compressed callback for lzma. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: David Ahern Cc: Michael Petlan Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20180817094813.15086-12-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/lzma.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/lzma.c b/tools/perf/util/lzma.c index 7032caaf75eb..b1dd29a9d915 100644 --- a/tools/perf/util/lzma.c +++ b/tools/perf/util/lzma.c @@ -3,9 +3,13 @@ #include #include #include +#include +#include +#include #include "compress.h" #include "util.h" #include "debug.h" +#include #define BUFSIZE 8192 @@ -100,7 +104,18 @@ int lzma_decompress_to_file(const char *input, int output_fd) return err; } -bool lzma_is_compressed(const char *input __maybe_unused) +bool lzma_is_compressed(const char *input) { - return true; + int fd = open(input, O_RDONLY); + const uint8_t magic[6] = { 0xFD, '7', 'z', 'X', 'Z', 0x00 }; + char buf[6] = { 0 }; + ssize_t rc; + + if (fd < 0) + return -1; + + rc = read(fd, buf, sizeof(buf)); + close(fd); + return rc == sizeof(buf) ? + memcmp(buf, magic, sizeof(buf)) == 0 : false; } -- 2.14.4