On Fri, 17 Aug 2018 12:32:13 +0300
"Yordan Karadzhov (VMware)" <y.karadz@xxxxxxxxx> wrote:
> Hi Steven
>
> On 16.08.2018 21:52, Steven Rostedt wrote:
> >> + jfile_name = json_object_new_string(file);
> >> + jtime = json_object_new_int64(st.st_mtime);
> > BTW, are you saving the timestamp to make sure the trace.dat file is
> > the same? (assuming that the 'file' in question is trace.dat)
> >
> > What if we want to use the same "session" for different trace.dat files?
> >
>
>
> If the timestamp is different then the import will fail (see below).
>
> If you really want to load the session with a different file you can
> hand-edit the Json file and make it match.
I don't think that's very user friendly.
When debugging a problem, I will create several trace files, and use
basically the same filter for all of them. I would like to easily be
able to create a complex filter, save it, then reuse it for the next
trace.dat file I open. Hand modifying a timestamp will not be an option.
>
>
> >> +static bool kshark_trace_file_from_json(const char **file,
> >> + struct json_object *jobj)
> >> +{
> >> + struct json_object *jfile_name, *jtime;
> >> + const char *file_str;
> >> + struct stat st;
> >> + int64_t time;
> >> +
> >> + if (!jobj)
> >> + return false;
> >> +
> >> + if (!kshark_json_type_check(jobj, "kshark.data.config") ||
> >> + !json_object_object_get_ex(jobj, "file", &jfile_name) ||
> >> + !json_object_object_get_ex(jobj, "time", &jtime)) {
> >> + fprintf(stderr,
> >> + "Failed to retrieve data file from json_object.\n");
> >> + return false;
> >> + }
> >> +
> >> + file_str = json_object_get_string(jfile_name);
> >> + time = json_object_get_int64(jtime);
> >> +
> >> + if (stat(file_str, &st) != 0) {
> >> + fprintf(stderr, "Unable to find file %s\n", file_str);
> >> + return false;
> >> + }
> >> +
> >> + if (st.st_mtime != time) {
>
>
> Here we check the timestamp.
Yeah, I saw this, which is why I asked.
-- Steve
>
>
> >> + fprintf(stderr,"Timestamp mismatch!\nFile %s", file_str);
> >> + return false;
> >> + }
> >> +
> >> + *file = file_str;
> >> +
> >> + return true;
> >> +}
> >> +
> >> +/**
> >> + * @brief Read the name of a trace data file and its timestamp from a
> >> + * Configuration document and check if such a file exists.
> >> + * If the file exists, open it.
> >> + *
> >> + * @param kshark_ctx: Input location for session context pointer.
> >> + * @param conf: Input location for the kshark_config_doc instance.
> Currently
> >> + * only Json format is supported.
> >> + *
> >> + * @returns The name of the file on success. Else NULL.
> > s/on success. Else/on success, otherwise/
> >
> > There also needs to be a statement stating that "file" is an internal
> > element of @conf and should not be modified, and is undefined if @conf
> > is destroyed (freed).
> >
> >> + */
> >> +const char* kshark_import_trace_file(struct kshark_context *kshark_ctx,
> >> + struct kshark_config_doc *conf)
> >> +{
> >> + const char *file = NULL;
> >> + switch (conf->format) {
> >> + case KS_CONFIG_JSON:
> >> + if (kshark_trace_file_from_json(&file, conf->conf_doc))
> >> + kshark_open(kshark_ctx, file);
> >> +
> >> + break;
|