On Wed, Oct 07, 2015 at 05:21:46PM +0900, Namhyung Kim wrote: > Hi Jiri, > > On Mon, Oct 5, 2015 at 10:46 PM, Jiri Olsa <jo...@redhat.com> wrote: > > On Fri, Oct 02, 2015 at 02:18:50PM +0900, Namhyung Kim wrote: > > > > SNIP > > > >> +static int record__merge_index_files(struct record *rec, int nr_index) > >> +{ > >> + int i; > >> + int ret = -ENOMEM; > >> + 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 - 1]; > >> + > >> + ret = fstat(fd, &stbuf); > >> + if (ret < 0) > >> + goto out_close; > >> + > >> + idx[i].offset = offset; > >> + idx[i].size = stbuf.st_size; > >> + > >> + offset += stbuf.st_size; > >> + > >> + if (idx[i].size == 0) > >> + continue; > >> + > >> + ret = copyfile_offset(fd, 0, output_fd, idx[i].offset, > >> + idx[i].size); > >> + if (ret < 0) > >> + goto out_close; > >> + } > >> + > >> + session->header.index = idx; > >> + session->header.nr_index = nr_index; > >> + > >> + perf_has_index = true; > > > > I might have asked earlier, but why is this global? seems like > > perf_session member to me.. > > Yes you did. :-) > > https://lkml.org/lkml/2015/5/19/110
ah right ;-) ok thanks, jirka -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/