On-disk multiple tracefiles circular buffer

[lttng-tools.git] / src / lib / lttng-ctl / lttng-ctl.c

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 3e532ad60067c6db4a454eb2d4d6b3ab890a6d7e..f2a61072b7971a44a2254bd600a1a7a85eb4a973 100644 (file)
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -636,9 +636,7 @@ end:
  */
 void lttng_destroy_handle(struct lttng_handle *handle)
 {
-       if (handle) {
-               free(handle);
-       }
+       free(handle);
 }
 
 /*
@@ -1362,6 +1360,8 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
                attr->subbuf_size = default_get_kernel_channel_subbuf_size();
                attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
                attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+               attr->tracefile_size = DEFAULT_KERNEL_CHANNEL_TRACEFILE_SIZE;
+               attr->tracefile_count = DEFAULT_KERNEL_CHANNEL_TRACEFILE_COUNT;
                break;
        case LTTNG_DOMAIN_UST:
 #if 0
@@ -1376,6 +1376,8 @@ void lttng_channel_set_default_attr(struct lttng_domain *domain,
                attr->subbuf_size = default_get_ust_channel_subbuf_size();
                attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
                attr->output = DEFAULT_UST_CHANNEL_OUTPUT;
+               attr->tracefile_size = DEFAULT_UST_CHANNEL_TRACEFILE_SIZE;
+               attr->tracefile_count = DEFAULT_UST_CHANNEL_TRACEFILE_COUNT;
                break;
        default:
                /* Default behavior: leave set to 0. */
@@ -1457,47 +1459,19 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 }
 
 /*
- * Enable consumer for a session and domain.
- *
- * Return 0 on success, else a negative value.
+ * [OBSELETE]
  */
 int lttng_enable_consumer(struct lttng_handle *handle)
 {
-       struct lttcomm_session_msg lsm;
-
-       if (handle == NULL) {
-               return -LTTNG_ERR_INVALID;
-       }
-
-       lsm.cmd_type = LTTNG_ENABLE_CONSUMER;
-
-       copy_string(lsm.session.name, handle->session_name,
-                       sizeof(lsm.session.name));
-       copy_lttng_domain(&lsm.domain, &handle->domain);
-
-       return ask_sessiond(&lsm, NULL);
+       return -ENOSYS;
 }
 
 /*
- * Disable consumer for a session and domain.
- *
- * Return 0 on success, else a negative value.
+ * [OBSELETE]
  */
 int lttng_disable_consumer(struct lttng_handle *handle)
 {
-       struct lttcomm_session_msg lsm;
-
-       if (handle == NULL) {
-               return -LTTNG_ERR_INVALID;
-       }
-
-       lsm.cmd_type = LTTNG_DISABLE_CONSUMER;
-
-       copy_string(lsm.session.name, handle->session_name,
-                       sizeof(lsm.session.name));
-       copy_lttng_domain(&lsm.domain, &handle->domain);
-
-       return ask_sessiond(&lsm, NULL);
+       return -ENOSYS;
 }
 
 /*
@@ -1619,7 +1593,7 @@ int _lttng_create_session_ext(const char *name, const char *url,
        struct lttcomm_session_msg lsm;
        struct lttng_uri *uris = NULL;
 
-       if (name == NULL || datetime == NULL) {
+       if (name == NULL || datetime == NULL || url == NULL) {
                return -LTTNG_ERR_INVALID;
        }