} else {
close(fd);
close(dirfd);
- td_read = fmt_read->open_trace(opt_input_path,
- fpath, O_RDONLY, ctf_move_pos_slow,
- NULL);
+ td_read = fmt_read->open_trace(fpath, O_RDONLY,
+ ctf_move_pos_slow, NULL);
if (!td_read) {
fprintf(stderr, "Error opening trace \"%s\" "
"for reading.\n\n", fpath);
fprintf(stderr, "Error allocating a new context\n");
goto error_td_read;
}
- td_write = fmt_write->open_trace(NULL, opt_output_path, O_RDWR, NULL, NULL);
+ td_write = fmt_write->open_trace(opt_output_path, O_RDWR, NULL, NULL);
if (!td_write) {
fprintf(stderr, "Error opening trace \"%s\" for writing.\n\n",
opt_output_path ? : "<none>");
ITEM_PAYLOAD,
};
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
- const char *path, int flags,
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp);
void ctf_text_close_trace(struct trace_descriptor *descriptor);
}
-struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
- const char *path, int flags,
+struct trace_descriptor *ctf_text_open_trace(const char *path, int flags,
void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
{
extern int yydebug;
static
-struct trace_descriptor *ctf_open_trace(const char *collection_path, const char *path, int flags,
+struct trace_descriptor *ctf_open_trace(const char *path, int flags,
void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp);
static
return ret;
}
-static void
-init_domain_name(struct ctf_trace *td)
-{
- char *start, *end;
-
- start = td->path + strlen(td->collection_path);
- while (start[0] == '/')
- start++; /* skip / */
- end = strchr(start, '/');
- if (!end)
- end = start + strlen(start);
- memcpy(td->domain, start, end - start);
- td->domain[end - start] = '\0';
-}
-
-static void
-init_proc_name(struct ctf_trace *td)
-{
- char buf[PATH_MAX];
- char *start, *end;
-
- if (td->domain[0] == '\0')
- return;
- memcpy(buf, td->path, PATH_MAX);
- start = buf + strlen(td->collection_path);
- while (start[0] == '/')
- start++; /* skip / */
- start = strchr(start, '/'); /* get begin of domain content */
- if (!start)
- return;
- while (start[0] == '/')
- start++; /* skip / */
- /* find last -, skips time */
- end = strrchr(start, '-');
- if (!end)
- return;
- *end = '\0';
- /* find previous -, skips date */
- end = strrchr(start, '-');
- if (!end)
- return;
- *end = '\0';
- /* find previous -, skips pid */
- end = strrchr(start, '-');
- if (!end)
- return;
- *end = '\0';
-
- memcpy(td->procname, start, end - start);
- td->procname[end - start] = '\0';
-}
-
-static void
-init_vpid(struct ctf_trace *td)
-{
- char buf[PATH_MAX];
- char *start, *end;
-
- if (td->domain[0] == '\0')
- return;
- memcpy(buf, td->path, PATH_MAX);
- start = buf + strlen(td->collection_path);
- while (start[0] == '/')
- start++; /* skip / */
- start = strchr(start, '/'); /* get begin of domain content */
- if (!start)
- return;
- while (start[0] == '/')
- start++; /* skip / */
- /* find last -, skips time */
- end = strrchr(start, '-');
- if (!end)
- return;
- *end = '\0';
- /* find previous -, skips date */
- end = strrchr(start, '-');
- if (!end)
- return;
- *end = '\0';
- /* find previous -, skips pid */
- start = strrchr(start, '-');
- if (!start)
- return;
- start++; /* skip - */
-
- memcpy(td->vpid, start, end - start);
- td->vpid[end - start] = '\0';
-}
-
static
-int ctf_open_trace_read(struct ctf_trace *td, const char *collection_path,
+int ctf_open_trace_read(struct ctf_trace *td,
const char *path, int flags,
void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
struct dirent *dirent;
struct dirent *diriter;
size_t dirent_len;
- char *respath, *rescolpath;
td->flags = flags;
ret = -errno;
goto error_dirfd;
}
- rescolpath = realpath(collection_path, td->collection_path);
- if (!rescolpath) {
- fprintf(stderr, "[error] collection path resolution failure\n");
- return -EINVAL;
- }
- respath = realpath(path, td->path);
- if (!respath) {
- fprintf(stderr, "[error] path resolution failure\n");
- return -EINVAL;
- }
- init_domain_name(td);
- init_proc_name(td);
- init_vpid(td);
+ strncpy(td->path, path, sizeof(td->path));
+ td->path[sizeof(td->path) - 1] = '\0';
/*
* Keep the metadata file separate.
}
static
-struct trace_descriptor *ctf_open_trace(const char *collection_path, const char *path, int flags,
+struct trace_descriptor *ctf_open_trace(const char *path, int flags,
void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
int whence), FILE *metadata_fp)
{
fprintf(stderr, "[error] Path missing for input CTF trace.\n");
goto error;
}
- ret = ctf_open_trace_read(td, collection_path, path, flags, move_pos_slow, metadata_fp);
+ ret = ctf_open_trace_read(td, path, flags, move_pos_slow, metadata_fp);
if (ret)
goto error;
break;