projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add initial Python bindings documentation
[babeltrace.git]
/
src
/
lib
/
lib-logging.c
diff --git
a/src/lib/lib-logging.c
b/src/lib/lib-logging.c
index 51682ed86072712ddae7588204d271803457525c..2a10c68dc05306aaaa42c696860e74e5e63b6fa0 100644
(file)
--- a/
src/lib/lib-logging.c
+++ b/
src/lib/lib-logging.c
@@
-28,6
+28,7
@@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
+#include <stdbool.h>
#include <stdint.h>
#include <wchar.h>
#include <glib.h>
#include <stdint.h>
#include <wchar.h>
#include <glib.h>
@@
-110,7
+111,7
@@
static __thread char lib_logging_buf[LIB_LOGGING_BUF_SIZE];
prefix, (_prefix2)); \
\
if (snprintf_ret < 0 || snprintf_ret >= TMP_PREFIX_LEN - 1) { \
prefix, (_prefix2)); \
\
if (snprintf_ret < 0 || snprintf_ret >= TMP_PREFIX_LEN - 1) { \
-
abort();
\
+
bt_common_abort();
\
} \
\
tmp_prefix[TMP_PREFIX_LEN - 1] = '\0'; \
} \
\
tmp_prefix[TMP_PREFIX_LEN - 1] = '\0'; \
@@
-239,7
+240,8
@@
static inline void format_field_class(char **buf_ch, bool extended,
BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length));
break;
}
BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length));
break;
}
- case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
{
const struct bt_field_class_array_dynamic *array_fc =
(const void *) field_class;
{
const struct bt_field_class_array_dynamic *array_fc =
(const void *) field_class;
@@
-260,10
+262,10
@@
static inline void format_field_class(char **buf_ch, bool extended,
break;
}
break;
}
- case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR:
- case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR:
- case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR:
- case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR
_FIELD
:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR
_FIELD
:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR
_FIELD
:
+ case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR
_FIELD
:
{
const struct bt_field_class_option *opt_fc =
(const void *) field_class;
{
const struct bt_field_class_option *opt_fc =
(const void *) field_class;
@@
-273,8
+275,8
@@
static inline void format_field_class(char **buf_ch, bool extended,
PRFIELD(bt_common_field_class_type_string(opt_fc->content_fc->type)));
if (field_class->type !=
PRFIELD(bt_common_field_class_type_string(opt_fc->content_fc->type)));
if (field_class->type !=
- BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) {
- const struct bt_field_class_option_with_selector *opt_with_sel_fc =
+ BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR
_FIELD
) {
+ const struct bt_field_class_option_with_selector
_field
*opt_with_sel_fc =
(const void *) field_class;
if (opt_with_sel_fc->selector_fc) {
(const void *) field_class;
if (opt_with_sel_fc->selector_fc) {
@@
-292,9
+294,9
@@
static inline void format_field_class(char **buf_ch, bool extended,
break;
}
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
- case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
- case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR
_FIELD
:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR
_FIELD
:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR
_FIELD
:
{
const struct bt_field_class_variant *var_fc =
(const void *) field_class;
{
const struct bt_field_class_variant *var_fc =
(const void *) field_class;
@@
-304,9
+306,9
@@
static inline void format_field_class(char **buf_ch, bool extended,
PRFIELD(var_fc->common.named_fcs->len));
}
PRFIELD(var_fc->common.named_fcs->len));
}
- if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR ||
- field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR) {
- const struct bt_field_class_variant_with_selector *var_with_sel_fc =
+ if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR
_FIELD
||
+ field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR
_FIELD
) {
+ const struct bt_field_class_variant_with_selector
_field
*var_with_sel_fc =
(const void *) var_fc;
if (var_with_sel_fc->selector_fc) {
(const void *) var_fc;
if (var_with_sel_fc->selector_fc) {
@@
-428,7
+430,8
@@
static inline void format_field(char **buf_ch, bool extended,
break;
}
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
break;
}
case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
- case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+ case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
{
const struct bt_field_array *array_field = (const void *) field;
{
const struct bt_field_array *array_field = (const void *) field;
@@
-441,9
+444,9
@@
static inline void format_field(char **buf_ch, bool extended,
break;
}
break;
}
- case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
- case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
- case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR
_FIELD
:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR
_FIELD
:
+ case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR
_FIELD
:
{
const struct bt_field_variant *var_field = (const void *) field;
{
const struct bt_field_variant *var_field = (const void *) field;
@@
-487,7
+490,7
@@
static inline void format_field_path(char **buf_ch, bool extended,
BUF_APPEND("%s", ", <CUR>");
break;
default:
BUF_APPEND("%s", ", <CUR>");
break;
default:
- abort();
+
bt_common_
abort();
}
}
}
}
@@
-907,9
+910,8
@@
static inline void format_value(char **buf_ch, bool extended,
}
case BT_VALUE_TYPE_ARRAY:
{
}
case BT_VALUE_TYPE_ARRAY:
{
- int64_t count = bt_value_array_get_length(value);
+
u
int64_t count = bt_value_array_get_length(value);
- BT_ASSERT(count >= 0);
BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count));
break;
}
BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count));
break;
}
@@
-1196,12
+1198,19
@@
static inline void format_graph(char **buf_ch, bool extended,
&graph->packet_end_msg_pool);
}
&graph->packet_end_msg_pool);
}
+static inline void format_message_iterator_class(char **buf_ch,
+ bool extended, const char *prefix,
+ const struct bt_message_iterator_class *iterator_class)
+{
+ /* Empty, the address is automatically printed. */
+}
+
static inline void format_message_iterator(char **buf_ch,
bool extended, const char *prefix,
const struct bt_message_iterator *iterator)
{
char tmp_prefix[TMP_PREFIX_LEN];
static inline void format_message_iterator(char **buf_ch,
bool extended, const char *prefix,
const struct bt_message_iterator *iterator)
{
char tmp_prefix[TMP_PREFIX_LEN];
- const struct bt_
self_component_port_input_
message_iterator *
+ const struct bt_message_iterator *
port_in_iter = (const void *) iterator;
if (port_in_iter->upstream_component) {
port_in_iter = (const void *) iterator;
if (port_in_iter->upstream_component) {
@@
-1445,6
+1454,9
@@
static inline void handle_conversion_specifier_bt(void *priv_data,
case 'n':
format_message(buf_ch, extended, prefix, obj);
break;
case 'n':
format_message(buf_ch, extended, prefix, obj);
break;
+ case 'I':
+ format_message_iterator_class(buf_ch, extended, prefix, obj);
+ break;
case 'i':
format_message_iterator(buf_ch, extended, prefix, obj);
break;
case 'i':
format_message_iterator(buf_ch, extended, prefix, obj);
break;
@@
-1479,7
+1491,7
@@
static inline void handle_conversion_specifier_bt(void *priv_data,
format_error_cause(buf_ch, extended, prefix, obj);
break;
default:
format_error_cause(buf_ch, extended, prefix, obj);
break;
default:
- abort();
+
bt_common_
abort();
}
update_fmt:
}
update_fmt:
@@
-1520,7
+1532,8
@@
void bt_lib_maybe_log_and_append_cause(const char *func, const char *file,
}
status = bt_current_thread_error_append_cause_from_unknown(
}
status = bt_current_thread_error_append_cause_from_unknown(
- "Babeltrace library", file, line, "%s", lib_logging_buf);
+ BT_LIB_LOG_LIBBABELTRACE2_NAME, file, line, "%s",
+ lib_logging_buf);
if (status) {
/*
* Worst case: this error cause is not appended to the
if (status) {
/*
* Worst case: this error cause is not appended to the
This page took
0.026254 seconds
and
4
git commands to generate.