tools lib traceevent, perf tools: Rename enum format_flags to enum tep_format_flags
In order to make libtraceevent into a proper library, variables, data structures and functions require a unique prefix to prevent name space conflicts. That prefix will be "tep_". This renames enum format_flags to enum tep_format_flags and adds prefix TEP_ to all of its members. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> Cc: linux-trace-devel@vger.kernel.org Link: http://lkml.kernel.org/r/20180919185722.803127871@goodmis.org Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
2c92f9828b
commit
bb39ccb204
@@ -186,16 +186,16 @@ get_tracepoint_field_type(struct ctf_writer *cw, struct tep_format_field *field)
|
||||
{
|
||||
unsigned long flags = field->flags;
|
||||
|
||||
if (flags & FIELD_IS_STRING)
|
||||
if (flags & TEP_FIELD_IS_STRING)
|
||||
return cw->data.string;
|
||||
|
||||
if (!(flags & FIELD_IS_SIGNED)) {
|
||||
if (!(flags & TEP_FIELD_IS_SIGNED)) {
|
||||
/* unsigned long are mostly pointers */
|
||||
if (flags & FIELD_IS_LONG || flags & FIELD_IS_POINTER)
|
||||
if (flags & TEP_FIELD_IS_LONG || flags & TEP_FIELD_IS_POINTER)
|
||||
return cw->data.u64_hex;
|
||||
}
|
||||
|
||||
if (flags & FIELD_IS_SIGNED) {
|
||||
if (flags & TEP_FIELD_IS_SIGNED) {
|
||||
if (field->size == 8)
|
||||
return cw->data.s64;
|
||||
else
|
||||
@@ -304,10 +304,10 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
||||
name = fmtf->alias;
|
||||
offset = fmtf->offset;
|
||||
len = fmtf->size;
|
||||
if (flags & FIELD_IS_STRING)
|
||||
flags &= ~FIELD_IS_ARRAY;
|
||||
if (flags & TEP_FIELD_IS_STRING)
|
||||
flags &= ~TEP_FIELD_IS_ARRAY;
|
||||
|
||||
if (flags & FIELD_IS_DYNAMIC) {
|
||||
if (flags & TEP_FIELD_IS_DYNAMIC) {
|
||||
unsigned long long tmp_val;
|
||||
|
||||
tmp_val = tep_read_number(fmtf->event->pevent,
|
||||
@@ -317,7 +317,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
||||
offset &= 0xffff;
|
||||
}
|
||||
|
||||
if (flags & FIELD_IS_ARRAY) {
|
||||
if (flags & TEP_FIELD_IS_ARRAY) {
|
||||
|
||||
type = bt_ctf_event_class_get_field_by_name(
|
||||
event_class, name);
|
||||
@@ -338,7 +338,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
||||
type = get_tracepoint_field_type(cw, fmtf);
|
||||
|
||||
for (i = 0; i < n_items; i++) {
|
||||
if (flags & FIELD_IS_ARRAY)
|
||||
if (flags & TEP_FIELD_IS_ARRAY)
|
||||
field = bt_ctf_field_array_get_field(array_field, i);
|
||||
else
|
||||
field = bt_ctf_field_create(type);
|
||||
@@ -348,7 +348,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (flags & FIELD_IS_STRING)
|
||||
if (flags & TEP_FIELD_IS_STRING)
|
||||
ret = string_set_value(field, data + offset + i * len);
|
||||
else {
|
||||
unsigned long long value_int;
|
||||
@@ -357,7 +357,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
||||
fmtf->event->pevent,
|
||||
data + offset + i * len, len);
|
||||
|
||||
if (!(flags & FIELD_IS_SIGNED))
|
||||
if (!(flags & TEP_FIELD_IS_SIGNED))
|
||||
ret = bt_ctf_field_unsigned_integer_set_value(
|
||||
field, value_int);
|
||||
else
|
||||
@@ -369,7 +369,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
||||
pr_err("failed to set file value %s\n", name);
|
||||
goto err_put_field;
|
||||
}
|
||||
if (!(flags & FIELD_IS_ARRAY)) {
|
||||
if (!(flags & TEP_FIELD_IS_ARRAY)) {
|
||||
ret = bt_ctf_event_set_payload(event, name, field);
|
||||
if (ret) {
|
||||
pr_err("failed to set payload %s\n", name);
|
||||
@@ -378,7 +378,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
||||
}
|
||||
bt_ctf_field_put(field);
|
||||
}
|
||||
if (flags & FIELD_IS_ARRAY) {
|
||||
if (flags & TEP_FIELD_IS_ARRAY) {
|
||||
ret = bt_ctf_event_set_payload(event, name, array_field);
|
||||
if (ret) {
|
||||
pr_err("Failed add payload array %s\n", name);
|
||||
@@ -1030,15 +1030,15 @@ static int add_tracepoint_fields_types(struct ctf_writer *cw,
|
||||
* type and don't care that it is an array. What we don't
|
||||
* support is an array of strings.
|
||||
*/
|
||||
if (flags & FIELD_IS_STRING)
|
||||
flags &= ~FIELD_IS_ARRAY;
|
||||
if (flags & TEP_FIELD_IS_STRING)
|
||||
flags &= ~TEP_FIELD_IS_ARRAY;
|
||||
|
||||
if (flags & FIELD_IS_ARRAY)
|
||||
if (flags & TEP_FIELD_IS_ARRAY)
|
||||
type = bt_ctf_field_type_array_create(type, field->arraylen);
|
||||
|
||||
ret = event_class_add_field(event_class, type, field);
|
||||
|
||||
if (flags & FIELD_IS_ARRAY)
|
||||
if (flags & TEP_FIELD_IS_ARRAY)
|
||||
bt_ctf_field_type_put(type);
|
||||
|
||||
if (ret) {
|
||||
|
Reference in New Issue
Block a user