Fix teardown deadlock

[lttng-modules.git] / ltt-events.c

diff --git a/ltt-events.c b/ltt-events.c
index 29ea9baaa022830789255ff96de65d7d7f4a4801..b0191596d4519529be5a15fcfd3744aaf16ce7cf 100644 (file)
--- a/ltt-events.c
+++ b/ltt-events.c
@@ -363,9 +363,52 @@ int _ltt_fields_metadata_statedump(struct ltt_session *session,
                                field->name);
                        break;
                case atype_array:
+               {
+                       const struct lttng_basic_type *elem_type;
+
+                       elem_type = &field->type.u.array.elem_type;
+                       ret = lttng_metadata_printf(session,
+                               "               integer { size = %u; align = %u; signed = %u;%s } %s[%u];\n",
+                               elem_type->u.basic.integer.size,
+                               elem_type->u.basic.integer.alignment,
+                               elem_type->u.basic.integer.signedness,
+#ifdef __BIG_ENDIAN
+                               elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
+#else
+                               elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
+#endif
+                               field->name, field->type.u.array.length);
                        break;
+               }
                case atype_sequence:
+               {
+                       const struct lttng_basic_type *elem_type;
+                       const struct lttng_basic_type *length_type;
+
+                       elem_type = &field->type.u.sequence.elem_type;
+                       length_type = &field->type.u.sequence.length_type;
+                       ret = lttng_metadata_printf(session,
+                               "               integer { size = %u; align = %u; signed = %u;%s } %s[ integer { size = %u; align = %u; signed = %u;%s } ];\n",
+                               elem_type->u.basic.integer.size,
+                               elem_type->u.basic.integer.alignment,
+                               elem_type->u.basic.integer.signedness,
+#ifdef __BIG_ENDIAN
+                               elem_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
+#else
+                               elem_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : "",
+#endif
+                               field->name,
+                                       length_type->u.basic.integer.size,
+                                       length_type->u.basic.integer.alignment,
+                                       length_type->u.basic.integer.signedness,
+#ifdef __BIG_ENDIAN
+                                       length_type->u.basic.integer.reverse_byte_order ? " byte_order = le;" : "",
+#else
+                                       length_type->u.basic.integer.reverse_byte_order ? " byte_order = be;" : ""
+#endif
+                               );
                        break;
+               }
 
                case atype_string:
                        ret = lttng_metadata_printf(session,
@@ -471,9 +514,10 @@ int _ltt_session_metadata_statedump(struct ltt_session *session)
                return 0;
        if (session->metadata_dumped)
                goto skip_session;
-
-
-
+       if (!session->metadata) {
+               printk(KERN_WARNING "LTTng: tracing is starting, but metadata channel is not found\n");
+               return -EPERM;
+       }
 
 skip_session:
        list_for_each_entry(chan, &session->chan, list) {