projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename bt_object to bt_value
[babeltrace.git]
/
formats
/
ctf
/
ir
/
trace.c
diff --git
a/formats/ctf/ir/trace.c
b/formats/ctf/ir/trace.c
index d5786d337251dff7c0e2f660ee5a5e7edad89ad2..8ff6371b516b20babfa25731e7c67ab80bde3b00 100644
(file)
--- a/
formats/ctf/ir/trace.c
+++ b/
formats/ctf/ir/trace.c
@@
-38,7
+38,7
@@
#include <babeltrace/ctf-ir/ref.h>
#include <babeltrace/ctf-ir/common-internal.h>
#include <babeltrace/compiler.h>
#include <babeltrace/ctf-ir/ref.h>
#include <babeltrace/ctf-ir/common-internal.h>
#include <babeltrace/compiler.h>
-#include <babeltrace/
object
s.h>
+#include <babeltrace/
value
s.h>
#define DEFAULT_IDENTIFIER_SIZE 128
#define DEFAULT_METADATA_STRING_SIZE 4096
#define DEFAULT_IDENTIFIER_SIZE 128
#define DEFAULT_METADATA_STRING_SIZE 4096
@@
-188,13
+188,13
@@
error:
}
int bt_ctf_trace_set_environment_field(struct bt_ctf_trace *trace,
}
int bt_ctf_trace_set_environment_field(struct bt_ctf_trace *trace,
- const char *name, struct bt_
object
*value)
+ const char *name, struct bt_
value
*value)
{
int ret = 0;
if (!trace || !name || !value ||
bt_ctf_validate_identifier(name) ||
{
int ret = 0;
if (!trace || !name || !value ||
bt_ctf_validate_identifier(name) ||
- !(bt_
object_is_integer(value) || bt_object
_is_string(value))) {
+ !(bt_
value_is_integer(value) || bt_value
_is_string(value))) {
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-211,17
+211,17
@@
int bt_ctf_trace_set_environment_field(struct bt_ctf_trace *trace,
*
* The object passed is frozen like all other attributes.
*/
*
* The object passed is frozen like all other attributes.
*/
- struct bt_
object
*attribute =
+ struct bt_
value
*attribute =
bt_ctf_attributes_get_field_value_by_name(
trace->environment, name);
if (attribute) {
bt_ctf_attributes_get_field_value_by_name(
trace->environment, name);
if (attribute) {
- BT_
OBJECT
_PUT(attribute);
+ BT_
VALUE
_PUT(attribute);
ret = -1;
goto end;
}
ret = -1;
goto end;
}
- bt_
object
_freeze(value);
+ bt_
value
_freeze(value);
}
ret = bt_ctf_attributes_set_field_value(trace->environment, name,
}
ret = bt_ctf_attributes_set_field_value(trace->environment, name,
@@
-235,7
+235,7
@@
int bt_ctf_trace_set_environment_field_string(struct bt_ctf_trace *trace,
const char *name, const char *value)
{
int ret = 0;
const char *name, const char *value)
{
int ret = 0;
- struct bt_
object
*env_value_string_obj = NULL;
+ struct bt_
value
*env_value_string_obj = NULL;
if (!trace || !name || !value) {
ret = -1;
if (!trace || !name || !value) {
ret = -1;
@@
-247,18
+247,18
@@
int bt_ctf_trace_set_environment_field_string(struct bt_ctf_trace *trace,
* New environment fields may be added to a frozen trace,
* but existing fields may not be changed.
*/
* New environment fields may be added to a frozen trace,
* but existing fields may not be changed.
*/
- struct bt_
object
*attribute =
+ struct bt_
value
*attribute =
bt_ctf_attributes_get_field_value_by_name(
trace->environment, name);
if (attribute) {
bt_ctf_attributes_get_field_value_by_name(
trace->environment, name);
if (attribute) {
- BT_
OBJECT
_PUT(attribute);
+ BT_
VALUE
_PUT(attribute);
ret = -1;
goto end;
}
}
ret = -1;
goto end;
}
}
- env_value_string_obj = bt_
object
_string_create_init(value);
+ env_value_string_obj = bt_
value
_string_create_init(value);
if (!env_value_string_obj) {
ret = -1;
if (!env_value_string_obj) {
ret = -1;
@@
-266,13
+266,13
@@
int bt_ctf_trace_set_environment_field_string(struct bt_ctf_trace *trace,
}
if (trace->frozen) {
}
if (trace->frozen) {
- bt_
object
_freeze(env_value_string_obj);
+ bt_
value
_freeze(env_value_string_obj);
}
ret = bt_ctf_trace_set_environment_field(trace, name,
env_value_string_obj);
end:
}
ret = bt_ctf_trace_set_environment_field(trace, name,
env_value_string_obj);
end:
- BT_
OBJECT
_PUT(env_value_string_obj);
+ BT_
VALUE
_PUT(env_value_string_obj);
return ret;
}
return ret;
}
@@
-281,7
+281,7
@@
int bt_ctf_trace_set_environment_field_integer(struct bt_ctf_trace *trace,
const char *name, int64_t value)
{
int ret = 0;
const char *name, int64_t value)
{
int ret = 0;
- struct bt_
object
*env_value_integer_obj = NULL;
+ struct bt_
value
*env_value_integer_obj = NULL;
if (!trace || !name) {
ret = -1;
if (!trace || !name) {
ret = -1;
@@
-293,18
+293,18
@@
int bt_ctf_trace_set_environment_field_integer(struct bt_ctf_trace *trace,
* New environment fields may be added to a frozen trace,
* but existing fields may not be changed.
*/
* New environment fields may be added to a frozen trace,
* but existing fields may not be changed.
*/
- struct bt_
object
*attribute =
+ struct bt_
value
*attribute =
bt_ctf_attributes_get_field_value_by_name(
trace->environment, name);
if (attribute) {
bt_ctf_attributes_get_field_value_by_name(
trace->environment, name);
if (attribute) {
- BT_
OBJECT
_PUT(attribute);
+ BT_
VALUE
_PUT(attribute);
ret = -1;
goto end;
}
}
ret = -1;
goto end;
}
}
- env_value_integer_obj = bt_
object
_integer_create_init(value);
+ env_value_integer_obj = bt_
value
_integer_create_init(value);
if (!env_value_integer_obj) {
ret = -1;
goto end;
if (!env_value_integer_obj) {
ret = -1;
goto end;
@@
-313,10
+313,10
@@
int bt_ctf_trace_set_environment_field_integer(struct bt_ctf_trace *trace,
ret = bt_ctf_trace_set_environment_field(trace, name,
env_value_integer_obj);
if (trace->frozen) {
ret = bt_ctf_trace_set_environment_field(trace, name,
env_value_integer_obj);
if (trace->frozen) {
- bt_
object
_freeze(env_value_integer_obj);
+ bt_
value
_freeze(env_value_integer_obj);
}
end:
}
end:
- BT_
OBJECT
_PUT(env_value_integer_obj);
+ BT_
VALUE
_PUT(env_value_integer_obj);
return ret;
}
return ret;
}
@@
-352,10
+352,10
@@
end:
return ret;
}
return ret;
}
-struct bt_
object
*bt_ctf_trace_get_environment_field_value(
+struct bt_
value
*bt_ctf_trace_get_environment_field_value(
struct bt_ctf_trace *trace, int index)
{
struct bt_ctf_trace *trace, int index)
{
- struct bt_
object
*ret = NULL;
+ struct bt_
value
*ret = NULL;
if (!trace) {
goto end;
if (!trace) {
goto end;
@@
-367,10
+367,10
@@
end:
return ret;
}
return ret;
}
-struct bt_
object
*bt_ctf_trace_get_environment_field_value_by_name(
+struct bt_
value
*bt_ctf_trace_get_environment_field_value_by_name(
struct bt_ctf_trace *trace, const char *name)
{
struct bt_ctf_trace *trace, const char *name)
{
- struct bt_
object
*ret = NULL;
+ struct bt_
value
*ret = NULL;
if (!trace || !name) {
goto end;
if (!trace || !name) {
goto end;
@@
-649,7
+649,7
@@
void append_env_metadata(struct bt_ctf_trace *trace,
g_string_append(context->string, "env {\n");
for (i = 0; i < env_size; ++i) {
g_string_append(context->string, "env {\n");
for (i = 0; i < env_size; ++i) {
- struct bt_
object
*env_field_value_obj = NULL;
+ struct bt_
value
*env_field_value_obj = NULL;
const char *entry_name;
entry_name = bt_ctf_attributes_get_field_name(
const char *entry_name;
entry_name = bt_ctf_attributes_get_field_name(
@@
-661,13
+661,13
@@
void append_env_metadata(struct bt_ctf_trace *trace,
goto loop_next;
}
goto loop_next;
}
- switch (bt_
object
_get_type(env_field_value_obj)) {
- case BT_
OBJECT
_TYPE_INTEGER:
+ switch (bt_
value
_get_type(env_field_value_obj)) {
+ case BT_
VALUE
_TYPE_INTEGER:
{
int ret;
int64_t int_value;
{
int ret;
int64_t int_value;
- ret = bt_
object
_integer_get(env_field_value_obj,
+ ret = bt_
value
_integer_get(env_field_value_obj,
&int_value);
if (ret) {
&int_value);
if (ret) {
@@
-679,13
+679,13
@@
void append_env_metadata(struct bt_ctf_trace *trace,
int_value);
break;
}
int_value);
break;
}
- case BT_
OBJECT
_TYPE_STRING:
+ case BT_
VALUE
_TYPE_STRING:
{
int ret;
const char *str_value;
char *escaped_str = NULL;
{
int ret;
const char *str_value;
char *escaped_str = NULL;
- ret = bt_
object
_string_get(env_field_value_obj,
+ ret = bt_
value
_string_get(env_field_value_obj,
&str_value);
if (ret) {
&str_value);
if (ret) {
@@
-709,7
+709,7
@@
void append_env_metadata(struct bt_ctf_trace *trace,
}
loop_next:
}
loop_next:
- BT_
OBJECT
_PUT(env_field_value_obj);
+ BT_
VALUE
_PUT(env_field_value_obj);
}
g_string_append(context->string, "};\n\n");
}
g_string_append(context->string, "};\n\n");
This page took
0.028459 seconds
and
4
git commands to generate.