LTTNG_HIDDEN const char * const config_event_context_preemptible = "PREEMPTIBLE";
LTTNG_HIDDEN const char * const config_event_context_need_reschedule = "NEED_RESCHEDULE";
LTTNG_HIDDEN const char * const config_event_context_migratable = "MIGRATABLE";
+LTTNG_HIDDEN const char * const config_event_context_callstack_user= "CALLSTACK_USER";
+LTTNG_HIDDEN const char * const config_event_context_callstack_kernel = "CALLSTACK_KERNEL";
/* Deprecated symbols */
const char * const config_element_perf;
} else if (!strcmp((char *) context_type,
config_event_context_migratable)) {
ret = LTTNG_EVENT_CONTEXT_MIGRATABLE;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_callstack_user)) {
+ ret = LTTNG_EVENT_CONTEXT_CALLSTACK_USER;
+ } else if (!strcmp((char *) context_type,
+ config_event_context_callstack_kernel)) {
+ ret = LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL;
} else {
goto error;
}
return ret;
}
+static
+int add_periodic_rotation(const char *name, uint64_t time_us)
+{
+ int ret;
+ enum lttng_rotation_status status;
+ struct lttng_rotation_schedule *periodic =
+ lttng_rotation_schedule_periodic_create();
+
+ if (!periodic) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ status = lttng_rotation_schedule_periodic_set_period(periodic,
+ time_us);
+ if (status != LTTNG_ROTATION_STATUS_OK) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ status = lttng_session_add_rotation_schedule(name, periodic);
+ switch (status) {
+ case LTTNG_ROTATION_STATUS_OK:
+ ret = LTTNG_OK;
+ break;
+ case LTTNG_ROTATION_STATUS_SCHEDULE_ALREADY_SET:
+ case LTTNG_ROTATION_STATUS_INVALID:
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ break;
+ default:
+ ret = -LTTNG_ERR_UNK;
+ break;
+ }
+error:
+ lttng_rotation_schedule_destroy(periodic);
+ return ret;
+}
+
+static
+int add_size_rotation(const char *name, uint64_t size_bytes)
+{
+ int ret;
+ enum lttng_rotation_status status;
+ struct lttng_rotation_schedule *size =
+ lttng_rotation_schedule_size_threshold_create();
+
+ if (!size) {
+ ret = -LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
+ status = lttng_rotation_schedule_size_threshold_set_threshold(size,
+ size_bytes);
+ if (status != LTTNG_ROTATION_STATUS_OK) {
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
+
+ status = lttng_session_add_rotation_schedule(name, size);
+ switch (status) {
+ case LTTNG_ROTATION_STATUS_OK:
+ ret = LTTNG_OK;
+ break;
+ case LTTNG_ROTATION_STATUS_SCHEDULE_ALREADY_SET:
+ case LTTNG_ROTATION_STATUS_INVALID:
+ ret = -LTTNG_ERR_LOAD_INVALID_CONFIG;
+ break;
+ default:
+ ret = -LTTNG_ERR_UNK;
+ break;
+ }
+error:
+ lttng_rotation_schedule_destroy(size);
+ return ret;
+}
+
static
int process_session_node(xmlNodePtr session_node, const char *session_name,
int overwrite,
}
}
- if (rotation_timer_interval || rotation_size) {
- struct lttng_rotation_schedule_attr *rotation_attr = lttng_rotation_schedule_attr_create();
-
- if (!rotation_attr) {
- goto error;
- }
- ret = lttng_rotation_schedule_attr_set_session_name(rotation_attr, (const char *) name);
- if (ret) {
- lttng_rotation_schedule_attr_destroy(rotation_attr);
+ if (rotation_timer_interval) {
+ ret = add_periodic_rotation((const char *) name,
+ rotation_timer_interval);
+ if (ret < 0) {
goto error;
}
- lttng_rotation_schedule_attr_set_timer_period(rotation_attr,
- rotation_timer_interval);
- lttng_rotation_schedule_attr_set_size(rotation_attr, rotation_size);
- ret = lttng_rotation_set_schedule(rotation_attr);
- lttng_rotation_schedule_attr_destroy(rotation_attr);
- if (ret) {
+ }
+ if (rotation_size) {
+ ret = add_size_rotation((const char *) name,
+ rotation_size);
+ if (ret < 0) {
goto error;
}
}
return ret;
}
-/* Allocate dirent as recommended by READDIR(3), NOTES on readdir_r */
-static
-struct dirent *alloc_dirent(const char *path)
-{
- size_t len;
- long name_max;
- struct dirent *entry;
-
- name_max = pathconf(path, _PC_NAME_MAX);
- if (name_max == -1) {
- name_max = PATH_MAX;
- }
- len = offsetof(struct dirent, d_name) + name_max + 1;
- entry = zmalloc(len);
- return entry;
-}
-
static
int load_session_from_path(const char *path, const char *session_name,
struct session_config_validation_ctx *validation_ctx, int overwrite,
}
}
if (directory) {
- struct dirent *entry;
- struct dirent *result;
size_t file_path_root_len;
ret = lttng_dynamic_buffer_set_capacity(&file_path,
goto end;
}
- entry = alloc_dirent(path);
- if (!entry) {
- ret = -LTTNG_ERR_NOMEM;
- goto end;
- }
-
ret = lttng_dynamic_buffer_append(&file_path, path, path_len);
if (ret) {
ret = -LTTNG_ERR_NOMEM;
- free(entry);
goto end;
}
file_path_root_len = file_path.size;
/* Search for *.lttng files */
- while (!readdir_r(directory, entry, &result) && result) {
- size_t file_name_len = strlen(result->d_name);
+ for (;;) {
+ size_t file_name_len;
+ struct dirent *result;
+
+ /*
+ * When the end of the directory stream is reached, NULL
+ * is returned and errno is kept unchanged. When an
+ * error occurs, NULL is returned and errno is set
+ * accordingly. To distinguish between the two, set
+ * errno to zero before calling readdir().
+ *
+ * On success, readdir() returns a pointer to a dirent
+ * structure. This structure may be statically
+ * allocated, do not attempt to free(3) it.
+ */
+ errno = 0;
+ result = readdir(directory);
+
+ /* Reached end of dir stream or error out. */
+ if (!result) {
+ if (errno) {
+ PERROR("Failed to enumerate the contents of path \"%s\" while loading session, readdir returned", path);
+ ret = -LTTNG_ERR_LOAD_IO_FAIL;
+ goto end;
+ }
+ break;
+ }
+
+ file_name_len = strlen(result->d_name);
if (file_name_len <=
sizeof(DEFAULT_SESSION_CONFIG_FILE_EXTENSION)) {
}
}
- free(entry);
} else {
ret = load_session_from_file(path, session_name,
validation_ctx, overwrite, overrides);
projects / lttng-tools.git / blobdiff