X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fbabeltrace%2Fctf-ir%2Fmetadata.h;h=eb37c2df3b4b0dc3a1ce5381e12e7579c7d40d5b;hb=7237592a76cceda97a1c79904fed583e215d3fa9;hp=e5c3240c5e039d1620cb240d6d38a034c3772b27;hpb=b448902b7c2d8fa734e0d5cb1e6acbb009db97e4;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index e5c3240c..eb37c2df 100644
--- a/include/babeltrace/ctf-ir/metadata.h
+++ b/include/babeltrace/ctf-ir/metadata.h
@@ -17,6 +17,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/types.h>
@@ -58,6 +66,7 @@ struct ctf_stream_definition {
 	uint64_t prev_real_timestamp_end;	/* End-of-last-packet timestamp in ns */
 	uint64_t prev_cycles_timestamp;		/* Start-of-last-packet timestamp in cycles */
 	uint64_t prev_cycles_timestamp_end;	/* End-of-last-packet timestamp in cycles */
+	char path[PATH_MAX];			/* Path to stream. '\0' for mmap traces */
 };
 
 struct ctf_event_definition {
@@ -166,7 +175,7 @@ struct ctf_tracer_env {
 };
 
 struct ctf_trace {
-	struct trace_descriptor parent;
+	struct bt_trace_descriptor parent;
 	/* root scope */
 	struct declaration_scope *root_declaration_scope;
 
@@ -175,6 +184,8 @@ struct ctf_trace {
 	struct definition_scope *definition_scope;
 	GPtrArray *streams;			/* Array of struct ctf_stream_declaration pointers */
 	struct ctf_stream_definition *metadata;
+	char *metadata_string;
+	int metadata_packetized;
 	GHashTable *clocks;
 	GHashTable *callsites;
 	struct ctf_clock *single_clock;		/* currently supports only one clock */
@@ -202,7 +213,7 @@ struct ctf_trace {
 	int dirfd;
 	int flags;		/* open flags */
 
-	/* Heap of streams, ordered to always get the lowest timestam */
+	/* Heap of streams, ordered to always get the lowest timestamp */
 	struct ptr_heap *stream_heap;
 	char path[PATH_MAX];
 
@@ -226,7 +237,7 @@ struct ctf_trace {
 
 struct ctf_stream_declaration {
 	struct ctf_trace *trace;
-	/* parent is lexical scope conaining the stream scope */
+	/* parent is lexical scope containing the stream scope */
 	struct declaration_scope *declaration_scope;
 	/* innermost definition scope. to be used as parent of event. */
 	struct definition_scope *definition_scope;
@@ -263,7 +274,7 @@ struct ctf_stream_declaration {
 struct ctf_event_declaration {
 	/* stream mapped by stream_id */
 	struct ctf_stream_declaration *stream;
-	/* parent is lexical scope conaining the event scope */
+	/* parent is lexical scope containing the event scope */
 	struct declaration_scope *declaration_scope;
 
 	struct declaration_struct *context_decl;