Namespace the struct trace_descriptor

[babeltrace.git] / include / babeltrace / ctf-ir / metadata.h

diff --git a/include/babeltrace/ctf-ir/metadata.h b/include/babeltrace/ctf-ir/metadata.h
index 8e0eb0542fc49ac2a76e5965a259396e58a137a1..04e894512702fb110b7f900573c9524255d6f3a9 100644 (file)
--- 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>
@@ -121,12 +129,14 @@ struct ctf_callsite {
        char *func;
        char *file;
        uint64_t line;
+       uint64_t ip;
        struct bt_list_head node;
        enum {                                  /* Fields populated mask */
                CTF_CALLSITE_name       =       (1U << 0),
                CTF_CALLSITE_func       =       (1U << 1),
                CTF_CALLSITE_file       =       (1U << 2),
                CTF_CALLSITE_line       =       (1U << 3),
+               CTF_CALLSITE_ip         =       (1U << 4),
        } field_mask;
 };
 
@@ -164,7 +174,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;
 
@@ -224,7 +234,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;
@@ -261,7 +271,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;