Re: [PATCH 4/5] perf tools: Support single perf.data file directory

From: Adrian Hunter
Date: Mon Oct 21 2019 - 08:43:46 EST


On 7/10/19 3:06 PM, Adrian Hunter wrote:
> On 7/10/19 2:20 PM, Jiri Olsa wrote:
>> On Fri, Oct 04, 2019 at 11:31:20AM +0300, Adrian Hunter wrote:
>>
>> SNIP
>>
>>> u8 pad[8] = {0};
>>>
>>> - if (!perf_data__is_pipe(data) && !perf_data__is_dir(data)) {
>>> + if (!perf_data__is_pipe(data) && perf_data__is_single_file(data)) {
>>> off_t file_offset;
>>> int fd = perf_data__fd(data);
>>> int err;
>>> diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c
>>> index df173f0bf654..964ea101dba6 100644
>>> --- a/tools/perf/util/data.c
>>> +++ b/tools/perf/util/data.c
>>> @@ -76,6 +76,13 @@ int perf_data__open_dir(struct perf_data *data)
>>> DIR *dir;
>>> int nr = 0;
>>>
>>> + /*
>>> + * Directory containing a single regular perf data file which is already
>>> + * open, means there is nothing more to do here.
>>> + */
>>> + if (perf_data__is_single_file(data))
>>> + return 0;
>>> +
>>
>> cool, I like this approach much more than the previous flag
>
> Yes it is much nicer. Thanks for your direction on that.
>
>>
>> any change you (if there's repost) or Arnaldo
>> could squeeze in indent change below?
>
> Sent a patch, to be applied before these.
>

That is:

"[PATCH] perf session: Fix indent in perf_session__new()"

Any comments on this patch set Arnaldo?