X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Flttngctl.c;h=fc6ff3cc1ac92b41e28184dd04dc03944ba054ce;hp=bec1dbb8503c60da423e2f2f7f44161382b69e27;hb=5edd7e09e892604b00ca937c0f1bc887bb5a842c;hpb=9cb52090dfe4c871f2ca6d98261bd5e1de6d103e

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index bec1dbb85..fc6ff3cc1 100644
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -334,6 +334,10 @@ static int ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 
 	size = llm.data_size;
 	if (size == 0) {
+		/* If client free with size 0 */
+		if (buf != NULL) {
+			*buf = NULL;
+		}
 		ret = 0;
 		goto end;
 	}
@@ -492,7 +496,7 @@ int lttng_enable_event(struct lttng_handle *handle,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (!handle || ev == NULL) {
 		return -1;
 	}
 
@@ -506,12 +510,12 @@ int lttng_enable_event(struct lttng_handle *handle,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (ev && ev->name[0] != '\0') {
+	if (ev->name[0] != '\0') {
 		lsm.cmd_type = LTTNG_ENABLE_EVENT;
-		memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 	} else {
 		lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
 	}
+	memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 
 	copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
@@ -541,7 +545,7 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (name == NULL) {
+	if (name != NULL) {
 		copy_string(lsm.u.disable.name, name, sizeof(lsm.u.disable.name));
 		lsm.cmd_type = LTTNG_DISABLE_EVENT;
 	} else {
@@ -636,7 +640,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 /*
  *  Return a human readable string of code
  */
-const char *lttng_get_readable_code(int code)
+const char *lttng_strerror(int code)
 {
 	if (code > -LTTCOMM_OK) {
 		return "Ended with errors";
@@ -780,10 +784,8 @@ int lttng_list_events(struct lttng_handle *handle,
 }
 
 /*
- *  lttng_set_tracing_group
- *
- *  Set tracing group variable with name. This function
- *  allocate memory pointed by tracing_group.
+ * Set tracing group variable with name. This function allocate memory pointed
+ * by tracing_group.
  */
 int lttng_set_tracing_group(const char *name)
 {
@@ -814,6 +816,46 @@ int lttng_calibrate(struct lttng_handle *handle,
 	return ask_sessiond(&lsm, NULL);
 }
 
+/*
+ * Set default channel attributes.
+ */
+void lttng_channel_set_default_attr(struct lttng_domain *domain,
+		struct lttng_channel_attr *attr)
+{
+	/* Safety check */
+	if (attr == NULL || domain == NULL) {
+		return;
+	}
+
+	switch (domain->type) {
+	case LTTNG_DOMAIN_KERNEL:
+		attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
+		attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+		attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+
+		attr->subbuf_size = DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE;
+		attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
+		attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+		break;
+	case LTTNG_DOMAIN_UST:
+	case LTTNG_DOMAIN_UST_EXEC_NAME:
+	case LTTNG_DOMAIN_UST_PID:
+	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+		attr->overwrite = DEFAULT_CHANNEL_OVERWRITE;
+		attr->switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+		attr->read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+
+		attr->subbuf_size = DEFAULT_UST_CHANNEL_SUBBUF_SIZE;
+		attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
+		attr->output = DEFAULT_UST_CHANNEL_OUTPUT;
+		break;
+	default:
+		/* Default behavior */
+		memset(attr, 0, sizeof(struct lttng_channel_attr));
+		break;
+	}
+}
+
 /*
  * Check if session daemon is alive.
  *