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=-7.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no 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 CA5DCC433E7 for ; Tue, 20 Oct 2020 05:43:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 61D0A2225F for ; Tue, 20 Oct 2020 05:43:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603172611; bh=STaVyHVKVsKpcquNOR9Y0GITN9OMsJyFKQ1Q5McfJvQ=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=dFAoBGXOEJ/Mmg5YeVnE722WfMEUSizsFzfZ5vbuL3Y25Ozs+uSiERb1xcerpuShs qCdr8eOPyy5l/Rp0N8RrHWBJBxq84Dhu/j8IlP6Gt8TpSauofFMN3xPxdDNeDCt2Qm XMR6CU3W5/QsbnDTPNS6flsG8umZtglO7FjnlOX8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391713AbgJTFn3 (ORCPT ); Tue, 20 Oct 2020 01:43:29 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35730 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730259AbgJTFn3 (ORCPT ); Tue, 20 Oct 2020 01:43:29 -0400 Received: by mail-wr1-f66.google.com with SMTP id n15so544451wrq.2 for ; Mon, 19 Oct 2020 22:43:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=B5Xsn5fVg6yvPijDHWOwZOrIy+RcAOXElW04b9r54Fw=; b=skzboaG6P1pqZSeCwtGf0QkBBam9B6v8HaEJuaGTgraWw1b1ZjMQt3ekC1wc4z81b8 nm2rl1g9HHfx3nopGlqvwEGDDEoCosDz8H3kQyOf5DM07X02efIx90VNkMjqNV/oLYKo K78fm4iPAKgErq00rhLLyU5NkY69sV5c+ruGY8q277oMmxAbvTIV6RUEW5Ct5UUH/IiF USD/p6rLCDKi1nxjn7rQ8tsNIYh4pMqq8uzXBuwHOgwoFuaOpYR1zThYgLumHvOE/1ks lYbE5RtdnjJzLHSmJ4YbmJ6Nux0cHQc1GSld48Q5HLcqgV0KAYmoueiQPeZ/Eh+U/esp pKHQ== X-Gm-Message-State: AOAM533EVRDJk51MadLx/AMPpFSTPf7blnr1cymx8vEjl4WF3CdpNvF5 gdR2xv5sDoKqgI2PSwio+dEa+S04skmkTBTETy0= X-Google-Smtp-Source: ABdhPJyuCMsV35IC5ATvfNzP4dHOY+T1G7HN9oHfC5998q3bSWWuWrMS4Ge1eLQ712AJIoiNe8h3Jm/KtT3kX/rxKzI= X-Received: by 2002:adf:a345:: with SMTP id d5mr1438322wrb.55.1603172607668; Mon, 19 Oct 2020 22:43:27 -0700 (PDT) MIME-Version: 1.0 References: <1603121908-53543-1-git-send-email-john.garry@huawei.com> <1603121908-53543-2-git-send-email-john.garry@huawei.com> In-Reply-To: <1603121908-53543-2-git-send-email-john.garry@huawei.com> From: Namhyung Kim Date: Tue, 20 Oct 2020 14:43:16 +0900 Message-ID: Subject: Re: [PATCH 1/2] perf jevents: Tidy error handling To: John Garry Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Kajol Jain , Ian Rogers , Yao Jin , yeyunfeng@huawei.com, linux-kernel , Linuxarm Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello, On Tue, Oct 20, 2020 at 12:42 AM John Garry wrote: > > There is much duplication in the error handling for directory traversing > for processing JSONs. > > Factor out the common code to tidy a bit. > > Signed-off-by: John Garry > --- [SNIP] > -empty_map: > +err_processing_std_arch_event_dir: > + err_string_ext = " for std arch event"; > +err_processing_dir: > + if (verbose || rc > 0) { > + pr_info("%s: Error walking file tree %s%s\n", prog, ldirname, > + err_string_ext); This was printed only if verbose is set but now changed. Thanks Namhyung > + empty_map = 1; > + } else { > + ret = 1; > + } > +err_close_eventsfp: > fclose(eventsfp); > - create_empty_mapping(output_file); > + if (empty_map) > + create_empty_mapping(output_file); > +err_out: > free_arch_std_events(); > -out_free_mapfile: > free(mapfile); > return ret; > } > -- > 2.26.2 >