Re: [PATCH 08/38] perf record: Add --index option for building index table

[Jiri Olsa <jolsa@redhat.com>]

On Tue, Mar 03, 2015 at 12:07:20PM +0900, Namhyung Kim wrote:

SNIP

> +static int record__merge_index_files(struct record *rec, int nr_index)
> +{
> +	int i;
> +	int ret = -1;
> +	u64 offset;
> +	char path[PATH_MAX];
> +	struct perf_file_section *idx;
> +	struct perf_data_file *file = &rec->file;
> +	struct perf_session *session = rec->session;
> +	int output_fd = perf_data_file__fd(file);
> +
> +	/* +1 for header file itself */
> +	nr_index++;
> +
> +	idx = calloc(nr_index, sizeof(*idx));
> +	if (idx == NULL)
> +		goto out_close;
> +
> +	offset = lseek(output_fd, 0, SEEK_END);
> +
> +	idx[0].offset = session->header.data_offset;
> +	idx[0].size   = offset - idx[0].offset;
> +
> +	for (i = 1; i < nr_index; i++) {
> +		struct stat stbuf;
> +		int fd = rec->fds[i];
> +
> +		if (fstat(fd, &stbuf) < 0)
> +			goto out_close;
> +
> +		idx[i].offset = offset;
> +		idx[i].size   = stbuf.st_size;
> +
> +		offset += stbuf.st_size;
> +	}
> +
> +	/* copy sample events */
> +	for (i = 1; i < nr_index; i++) {
> +		int fd = rec->fds[i];
> +
> +		if (idx[i].size == 0)
> +			continue;
> +
> +		if (copyfile_offset(fd, 0, output_fd, idx[i].offset,
> +				    idx[i].size) < 0)
> +			goto out_close;
> +	}

why not do the copy in previous loop as well?

jirka