#include <common/uri.h>
#include <lttng/lttng.h>
-#include "filter-ast.h"
-#include "filter-parser.h"
-#include "filter-bytecode.h"
-#include "memstream.h"
+#include "filter/filter-ast.h"
+#include "filter/filter-parser.h"
+#include "filter/filter-bytecode.h"
+#include "filter/memstream.h"
#ifdef DEBUG
-const int print_xml = 1;
+static const int print_xml = 1;
#define dbg_printf(fmt, args...) \
printf("[debug liblttng-ctl] " fmt, ## args)
#else
-const int print_xml = 0;
+static const int print_xml = 0;
#define dbg_printf(fmt, args...) \
do { \
/* do nothing but check printf format */ \
}
/* Check error code if OK */
- if (llm.ret_code != LTTCOMM_OK) {
+ if (llm.ret_code != LTTNG_OK) {
ret = -llm.ret_code;
goto end;
}
strlen(filter_expression), "r");
if (!fmem) {
fprintf(stderr, "Error opening memory as stream\n");
- return -ENOMEM;
+ return -LTTNG_ERR_FILTER_NOMEM;
}
ctx = filter_parser_ctx_alloc(fmem);
if (!ctx) {
fprintf(stderr, "Error allocating parser\n");
- ret = -ENOMEM;
+ ret = -LTTNG_ERR_FILTER_NOMEM;
goto alloc_error;
}
ret = filter_parser_ctx_append_ast(ctx);
if (ret) {
fprintf(stderr, "Parse error\n");
- ret = -EINVAL;
+ ret = -LTTNG_ERR_FILTER_INVAL;
goto parse_error;
}
ret = filter_visitor_set_parent(ctx);
if (ret) {
fprintf(stderr, "Set parent error\n");
- ret = -EINVAL;
+ ret = -LTTNG_ERR_FILTER_INVAL;
goto parse_error;
}
if (print_xml) {
if (ret) {
fflush(stdout);
fprintf(stderr, "XML print error\n");
- ret = -EINVAL;
+ ret = -LTTNG_ERR_FILTER_INVAL;
goto parse_error;
}
}
ret = filter_visitor_ir_generate(ctx);
if (ret) {
fprintf(stderr, "Generate IR error\n");
- ret = -EINVAL;
+ ret = -LTTNG_ERR_FILTER_INVAL;
goto parse_error;
}
dbg_printf("done\n");
fflush(stdout);
ret = filter_visitor_ir_check_binary_op_nesting(ctx);
if (ret) {
- ret = -EINVAL;
+ ret = -LTTNG_ERR_FILTER_INVAL;
goto parse_error;
}
dbg_printf("done\n");
ret = filter_visitor_bytecode_generate(ctx);
if (ret) {
fprintf(stderr, "Generate bytecode error\n");
- ret = -EINVAL;
+ ret = -LTTNG_ERR_FILTER_INVAL;
goto parse_error;
}
dbg_printf("done\n");
*/
const char *lttng_strerror(int code)
{
- /* lttcomm error codes range from -LTTCOMM_OK down to -LTTCOMM_NR */
- if (code > -LTTCOMM_OK) {
- return "Ended with errors";
- }
-
- return lttcomm_get_readable_code(code);
+ return error_get_str(code);
}
/*
* Create a brand new session using name and url for destination.
*
- * Returns LTTCOMM_OK on success or a negative error code.
+ * Returns LTTNG_OK on success or a negative error code.
*/
int lttng_create_session(const char *name, const char *url)
{
/* There should never be a data URL */
size = parse_str_urls_to_uri(url, NULL, &uris);
if (size < 0) {
- return LTTCOMM_INVALID;
+ return LTTNG_ERR_INVALID;
}
lsm.u.uri.size = size;
size = parse_str_urls_to_uri(control_url, data_url, &uris);
if (size < 0) {
- return LTTCOMM_INVALID;
+ return LTTNG_ERR_INVALID;
}
lsm.u.uri.size = size;
/* There should never be a data URL */
size = parse_str_urls_to_uri(url, NULL, &uris);
if (size < 0) {
- return LTTCOMM_INVALID;
+ return LTTNG_ERR_INVALID;
}
lsm.u.uri.size = size;
if (uris[0].dtype != LTTNG_DST_PATH && strlen(uris[0].subdir) == 0) {
- ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "/%s-%s", name,
+ ret = snprintf(uris[0].subdir, sizeof(uris[0].subdir), "%s-%s", name,
datetime);
if (ret < 0) {
PERROR("snprintf uri subdir");