X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=3db9b89b440d12796ce7565423cac04d2f7db2ad;hp=469fffa980f33b6c527d94ac47e6fb51a3ce6f42;hb=d88744a44aa5f2ca90ab87946692b9eed3120641;hpb=9f449915b9d44ce3c9c9255f5d491a62545fee25

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 469fffa98..3db9b89b4 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -2047,14 +2047,14 @@ int lttng_calibrate(struct lttng_handle *handle,
 void lttng_channel_set_default_attr(struct lttng_domain *domain,
 		struct lttng_channel_attr *attr)
 {
-	struct lttng_channel_extended *extended =
-			(struct lttng_channel_extended *) attr->extended.ptr;
+	struct lttng_channel_extended *extended;
 
 	/* Safety check */
 	if (attr == NULL || domain == NULL) {
 		return;
 	}
 
+	extended = (struct lttng_channel_extended *) attr->extended.ptr;
 	memset(attr, 0, sizeof(struct lttng_channel_attr));
 
 	/* Same for all domains. */
@@ -2073,6 +2073,8 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 		if (extended) {
 			extended->monitor_timer_interval =
 					DEFAULT_KERNEL_CHANNEL_MONITOR_TIMER;
+			extended->blocking_timeout =
+					DEFAULT_KERNEL_CHANNEL_BLOCKING_TIMEOUT;
 		}
 		break;
 	case LTTNG_DOMAIN_UST:
@@ -2088,6 +2090,8 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 			if (extended) {
 				extended->monitor_timer_interval =
 						DEFAULT_UST_UID_CHANNEL_MONITOR_TIMER;
+				extended->blocking_timeout =
+						DEFAULT_UST_UID_CHANNEL_BLOCKING_TIMEOUT;
 			}
 			break;
 		case LTTNG_BUFFER_PER_PID:
@@ -2102,6 +2106,8 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
 			if (extended) {
 				extended->monitor_timer_interval =
 						DEFAULT_UST_PID_CHANNEL_MONITOR_TIMER;
+				extended->blocking_timeout =
+						DEFAULT_UST_PID_CHANNEL_BLOCKING_TIMEOUT;
 			}
 			break;
 		}
@@ -2203,6 +2209,61 @@ end:
 	return ret;
 }
 
+int lttng_channel_get_blocking_timeout(struct lttng_channel *chan,
+		int64_t *blocking_timeout)
+{
+	int ret = 0;
+
+	if (!chan || !blocking_timeout) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	if (!chan->attr.extended.ptr) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	*blocking_timeout = ((struct lttng_channel_extended *)
+			chan->attr.extended.ptr)->blocking_timeout;
+end:
+	return ret;
+}
+
+int lttng_channel_set_blocking_timeout(struct lttng_channel *chan,
+		int64_t blocking_timeout)
+{
+	int ret = 0;
+	int64_t msec_timeout;
+
+	if (!chan || !chan->attr.extended.ptr) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	if (blocking_timeout < 0 && blocking_timeout != -1) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	/*
+	 * LTTng-ust's use of poll() to implement this timeout mechanism forces
+	 * us to accept a narrower range of values (msecs expressed as a signed
+	 * 32-bit integer).
+	 */
+	msec_timeout = blocking_timeout / 1000;
+	if (msec_timeout != (int32_t) msec_timeout) {
+		ret = -LTTNG_ERR_INVALID;
+		goto end;
+	}
+
+	((struct lttng_channel_extended *)
+			chan->attr.extended.ptr)->blocking_timeout =
+			blocking_timeout;
+end:
+	return ret;
+}
+
 /*
  * Check if session daemon is alive.
  *
@@ -2424,9 +2485,22 @@ int lttng_create_session_snapshot(const char *name, const char *snapshot_url)
 
 	lsm.u.uri.size = size;
 
+	/*
+	 * If the user does not specify a custom subdir, use the session name.
+	 */
+	if (size > 0 && uris[0].dtype != LTTNG_DST_PATH && strlen(uris[0].subdir) == 0) {
+		ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s", name);
+		if (ret < 0) {
+			PERROR("snprintf uri subdir");
+			ret = -LTTNG_ERR_FATAL;
+			goto error;
+		}
+	}
+
 	ret = lttng_ctl_ask_sessiond_varlen_no_cmd_header(&lsm, uris,
 			sizeof(struct lttng_uri) * size, NULL);
 
+error:
 	free(uris);
 	return ret;
 }
@@ -2607,7 +2681,7 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 	}
 
 	if (!lttng_trigger_validate(trigger)) {
-		ret = -LTTNG_ERR_INVALID;
+		ret = -LTTNG_ERR_INVALID_TRIGGER;
 		goto end;
 	}