X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmi-lttng.c;h=f0244d9fdd46d012dee437f335b495a6a8b188cf;hb=fc6d7a51ee49245f1c24cc33f05a4a8983028f8c;hp=197add2d470518bf0e18f4f2ecc16320d8a88265;hpb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;p=lttng-tools.git

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index 197add2d4..f0244d9fd 100644
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -375,6 +375,14 @@ const char *mi_lttng_event_contexttype_string(enum lttng_event_context_type val)
 		return config_event_context_hostname;
 	case LTTNG_EVENT_CONTEXT_IP:
 		return config_event_context_ip;
+	case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE:
+		return config_event_context_interruptible;
+	case LTTNG_EVENT_CONTEXT_PREEMPTIBLE:
+		return config_event_context_preemptible;
+	case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE:
+		return config_event_context_need_reschedule;
+	case LTTNG_EVENT_CONTEXT_MIGRATABLE:
+		return config_event_context_migratable;
 	default:
 		return NULL;
 	}
@@ -863,6 +871,7 @@ int mi_lttng_channel_attr(struct mi_writer *writer,
 	struct lttng_channel *chan = caa_container_of(attr,
 			struct lttng_channel, attr);
 	uint64_t discarded_events, lost_packets, monitor_timer_interval;
+	int64_t blocking_timeout;
 
 	assert(attr);
 
@@ -882,6 +891,12 @@ int mi_lttng_channel_attr(struct mi_writer *writer,
 		goto end;
 	}
 
+	ret = lttng_channel_get_blocking_timeout(chan,
+			&blocking_timeout);
+	if (ret) {
+		goto end;
+	}
+
 	/* Opening Attributes */
 	ret = mi_lttng_writer_open_element(writer, config_element_attributes);
 	if (ret) {
@@ -936,6 +951,14 @@ int mi_lttng_channel_attr(struct mi_writer *writer,
 		goto end;
 	}
 
+	/* Retry timeout in usec */
+	ret = mi_lttng_writer_write_element_signed_int(writer,
+		config_element_blocking_timeout,
+		blocking_timeout);
+	if (ret) {
+		goto end;
+	}
+
 	/* Event output */
 	ret = mi_lttng_writer_write_element_string(writer,
 		config_element_output_type,