/* Check for data availability */
do {
- data_ret = lttng_data_available(session_name);
+ data_ret = lttng_data_pending(session_name);
if (data_ret < 0) {
/* Return the data available call error. */
ret = data_ret;
* Data sleep time before retrying (in usec). Don't sleep if the call
* returned value indicates availability.
*/
- if (!data_ret) {
+ if (data_ret) {
usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
_MSG(".");
}
- } while (data_ret != 1);
+ } while (data_ret != 0);
MSG("");
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->subbuf_size = default_get_kernel_channel_subbuf_size();
attr->num_subbuf = DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM;
attr->output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
break;
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->subbuf_size = default_get_ust_channel_subbuf_size();
attr->num_subbuf = DEFAULT_UST_CHANNEL_SUBBUF_NUM;
attr->output = DEFAULT_UST_CHANNEL_OUTPUT;
break;
memset(&lsm, 0, sizeof(lsm));
lsm.cmd_type = LTTNG_CREATE_SESSION;
- if (!strncmp(name, DEFAULT_SESSION_NAME, strlen(DEFAULT_SESSION_NAME))) {
- ret = snprintf(lsm.session.name, sizeof(lsm.session.name), "%s-%s",
- name, datetime);
- if (ret < 0) {
- PERROR("snprintf session name datetime");
- return -LTTNG_ERR_FATAL;
- }
- } else {
- copy_string(lsm.session.name, name, sizeof(lsm.session.name));
- }
+ copy_string(lsm.session.name, name, sizeof(lsm.session.name));
/* There should never be a data URL */
size = parse_str_urls_to_uri(url, NULL, &uris);
* or is still being extracted by the consumer(s) hence not ready to be used by
* any readers.
*/
-int lttng_data_available(const char *session_name)
+int lttng_data_pending(const char *session_name)
{
int ret;
struct lttcomm_session_msg lsm;
return -LTTNG_ERR_INVALID;
}
- lsm.cmd_type = LTTNG_DATA_AVAILABLE;
+ lsm.cmd_type = LTTNG_DATA_PENDING;
copy_string(lsm.session.name, session_name, sizeof(lsm.session.name));
/* Set socket for health check */
(void) set_health_socket_path();
}
+
+/*
+ * lib destructor
+ */
+static void __attribute__((destructor)) lttng_ctl_exit()
+{
+ free(tracing_group);
+}