History

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.

Tzvetomir Stoyanov (VMware) committed 8 years ago

Commit bb39ccb1 parent 2c92f9811 files · +87 −87Browse files

Unified · Split

11 files
  1. tools/lib/traceevent/event-parse.c +24 −24
  2. tools/lib/traceevent/event-parse.h +9 −9
  3. tools/lib/traceevent/parse-filter.c +4 −4
  4. tools/perf/builtin-trace.c +1 −1
  5. tools/perf/tests/evsel-tp-sched.c +1 −1
  6. tools/perf/util/data-convert-bt.c +17 −17
  7. tools/perf/util/evsel.c +1 −1
  8. tools/perf/util/python.c +6 −6
  9. tools/perf/util/scripting-engines/trace-event-perl.c +9 −9
  10. tools/perf/util/scripting-engines/trace-event-python.c +13 −13
  11. tools/perf/util/sort.c +2 −2
tools/lib/traceevent/event-parse.c+24−24
@@ -1301,7 +1301,7 @@ static int event_read_id(void) · 1300 unmodified lines
1301 1301
1302static int field_is_string(struct tep_format_field *field)1302static int field_is_string(struct tep_format_field *field)
1303{1303{
1304 if ((field->flags & FIELD_IS_ARRAY) &&1304 if ((field->flags & TEP_FIELD_IS_ARRAY) &&
1305 (strstr(field->type, "char") || strstr(field->type, "u8") ||1305 (strstr(field->type, "char") || strstr(field->type, "u8") ||
1306 strstr(field->type, "s8")))1306 strstr(field->type, "s8")))
1307 return 1;1307 return 1;
@@ -1328,7 +1328,7 @@ static int field_is_long(struct tep_format_field *field) · 20 unmodified lines
1328 1328
1329static unsigned int type_size(const char *name)1329static unsigned int type_size(const char *name)
1330{1330{
1331 /* This covers all FIELD_IS_STRING types. */1331 /* This covers all TEP_FIELD_IS_STRING types. */
1332 static struct {1332 static struct {
1333 const char *type;1333 const char *type;
1334 unsigned int size;1334 unsigned int size;
@@ -1416,7 +1416,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f · 81 unmodified lines
1416 type == EVENT_OP && strcmp(token, ".") == 0)) {1416 type == EVENT_OP && strcmp(token, ".") == 0)) {
1417 1417
1418 if (strcmp(token, "*") == 0)1418 if (strcmp(token, "*") == 0)
1419 field->flags |= FIELD_IS_POINTER;1419 field->flags |= TEP_FIELD_IS_POINTER;
1420 1420
1421 if (field->type) {1421 if (field->type) {
1422 char *new_type;1422 char *new_type;
@@ -1455,7 +1455,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f · 32 unmodified lines
1455 char *new_brackets;1455 char *new_brackets;
1456 int len;1456 int len;
1457 1457
1458 field->flags |= FIELD_IS_ARRAY;1458 field->flags |= TEP_FIELD_IS_ARRAY;
1459 1459
1460 type = read_token(&token);1460 type = read_token(&token);
1461 1461
@@ -1544,11 +1544,11 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f · 82 unmodified lines
1544 }1544 }
1545 1545
1546 if (field_is_string(field))1546 if (field_is_string(field))
1547 field->flags |= FIELD_IS_STRING;1547 field->flags |= TEP_FIELD_IS_STRING;
1548 if (field_is_dynamic(field))1548 if (field_is_dynamic(field))
1549 field->flags |= FIELD_IS_DYNAMIC;1549 field->flags |= TEP_FIELD_IS_DYNAMIC;
1550 if (field_is_long(field))1550 if (field_is_long(field))
1551 field->flags |= FIELD_IS_LONG;1551 field->flags |= TEP_FIELD_IS_LONG;
1552 1552
1553 if (test_type_token(type, token, EVENT_OP, ";"))1553 if (test_type_token(type, token, EVENT_OP, ";"))
1554 goto fail;1554 goto fail;
@@ -1597,7 +1597,7 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f · 42 unmodified lines
1597 goto fail;1597 goto fail;
1598 1598
1599 if (strtoul(token, NULL, 0))1599 if (strtoul(token, NULL, 0))
1600 field->flags |= FIELD_IS_SIGNED;1600 field->flags |= TEP_FIELD_IS_SIGNED;
1601 1601
1602 free_token(token);1602 free_token(token);
1603 if (read_expected(EVENT_OP, ";") < 0)1603 if (read_expected(EVENT_OP, ";") < 0)
@@ -1609,14 +1609,14 @@ static int event_read_fields(struct tep_event_format *event, struct tep_format_f · 5 unmodified lines
1609 1609
1610 free_token(token);1610 free_token(token);
1611 1611
1612 if (field->flags & FIELD_IS_ARRAY) {1612 if (field->flags & TEP_FIELD_IS_ARRAY) {
1613 if (field->arraylen)1613 if (field->arraylen)
1614 field->elementsize = field->size / field->arraylen;1614 field->elementsize = field->size / field->arraylen;
1615 else if (field->flags & FIELD_IS_DYNAMIC)1615 else if (field->flags & TEP_FIELD_IS_DYNAMIC)
1616 field->elementsize = size_dynamic;1616 field->elementsize = size_dynamic;
1617 else if (field->flags & FIELD_IS_STRING)1617 else if (field->flags & TEP_FIELD_IS_STRING)
1618 field->elementsize = 1;1618 field->elementsize = 1;
1619 else if (field->flags & FIELD_IS_LONG)1619 else if (field->flags & TEP_FIELD_IS_LONG)
1620 field->elementsize = event->pevent ?1620 field->elementsize = event->pevent ?
1621 event->pevent->long_size :1621 event->pevent->long_size :
1622 sizeof(long);1622 sizeof(long);
@@ -2089,11 +2089,11 @@ process_entry(struct tep_event_format *event __maybe_unused, struct print_arg *a · 466 unmodified lines
2089 2089
2090 if (is_flag_field) {2090 if (is_flag_field) {
2091 arg->field.field = tep_find_any_field(event, arg->field.name);2091 arg->field.field = tep_find_any_field(event, arg->field.name);
2092 arg->field.field->flags |= FIELD_IS_FLAG;2092 arg->field.field->flags |= TEP_FIELD_IS_FLAG;
2093 is_flag_field = 0;2093 is_flag_field = 0;
2094 } else if (is_symbolic_field) {2094 } else if (is_symbolic_field) {
2095 arg->field.field = tep_find_any_field(event, arg->field.name);2095 arg->field.field = tep_find_any_field(event, arg->field.name);
2096 arg->field.field->flags |= FIELD_IS_SYMBOLIC;2096 arg->field.field->flags |= TEP_FIELD_IS_SYMBOLIC;
2097 is_symbolic_field = 0;2097 is_symbolic_field = 0;
2098 }2098 }
2099 2099
@@ -3901,7 +3901,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size, · 1801 unmodified lines
3901 * and the size is the same as long_size, assume that it3901 * and the size is the same as long_size, assume that it
3902 * is a pointer.3902 * is a pointer.
3903 */3903 */
3904 if (!(field->flags & FIELD_IS_ARRAY) &&3904 if (!(field->flags & TEP_FIELD_IS_ARRAY) &&
3905 field->size == pevent->long_size) {3905 field->size == pevent->long_size) {
3906 3906
3907 /* Handle heterogeneous recording and processing3907 /* Handle heterogeneous recording and processing
@@ -4794,16 +4794,16 @@ void tep_print_field(struct trace_seq *s, void *data, · 886 unmodified lines
4794 unsigned int offset, len, i;4794 unsigned int offset, len, i;
4795 struct tep_handle *pevent = field->event->pevent;4795 struct tep_handle *pevent = field->event->pevent;
4796 4796
4797 if (field->flags & FIELD_IS_ARRAY) {4797 if (field->flags & TEP_FIELD_IS_ARRAY) {
4798 offset = field->offset;4798 offset = field->offset;
4799 len = field->size;4799 len = field->size;
4800 if (field->flags & FIELD_IS_DYNAMIC) {4800 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
4801 val = tep_read_number(pevent, data + offset, len);4801 val = tep_read_number(pevent, data + offset, len);
4802 offset = val;4802 offset = val;
4803 len = offset >> 16;4803 len = offset >> 16;
4804 offset &= 0xffff;4804 offset &= 0xffff;
4805 }4805 }
4806 if (field->flags & FIELD_IS_STRING &&4806 if (field->flags & TEP_FIELD_IS_STRING &&
4807 is_printable_array(data + offset, len)) {4807 is_printable_array(data + offset, len)) {
4808 trace_seq_printf(s, "%s", (char *)data + offset);4808 trace_seq_printf(s, "%s", (char *)data + offset);
4809 } else {4809 } else {
@@ -4815,21 +4815,21 @@ void tep_print_field(struct trace_seq *s, void *data, · 5 unmodified lines
4815 *((unsigned char *)data + offset + i));4815 *((unsigned char *)data + offset + i));
4816 }4816 }
4817 trace_seq_putc(s, ']');4817 trace_seq_putc(s, ']');
4818 field->flags &= ~FIELD_IS_STRING;4818 field->flags &= ~TEP_FIELD_IS_STRING;
4819 }4819 }
4820 } else {4820 } else {
4821 val = tep_read_number(pevent, data + field->offset,4821 val = tep_read_number(pevent, data + field->offset,
4822 field->size);4822 field->size);
4823 if (field->flags & FIELD_IS_POINTER) {4823 if (field->flags & TEP_FIELD_IS_POINTER) {
4824 trace_seq_printf(s, "0x%llx", val);4824 trace_seq_printf(s, "0x%llx", val);
4825 } else if (field->flags & FIELD_IS_SIGNED) {4825 } else if (field->flags & TEP_FIELD_IS_SIGNED) {
4826 switch (field->size) {4826 switch (field->size) {
4827 case 4:4827 case 4:
4828 /*4828 /*
4829 * If field is long then print it in hex.4829 * If field is long then print it in hex.
4830 * A long usually stores pointers.4830 * A long usually stores pointers.
4831 */4831 */
4832 if (field->flags & FIELD_IS_LONG)4832 if (field->flags & TEP_FIELD_IS_LONG)
4833 trace_seq_printf(s, "0x%x", (int)val);4833 trace_seq_printf(s, "0x%x", (int)val);
4834 else4834 else
4835 trace_seq_printf(s, "%d", (int)val);4835 trace_seq_printf(s, "%d", (int)val);
@@ -4844,7 +4844,7 @@ void tep_print_field(struct trace_seq *s, void *data, · 8 unmodified lines
4844 trace_seq_printf(s, "%lld", val);4844 trace_seq_printf(s, "%lld", val);
4845 }4845 }
4846 } else {4846 } else {
4847 if (field->flags & FIELD_IS_LONG)4847 if (field->flags & TEP_FIELD_IS_LONG)
4848 trace_seq_printf(s, "0x%llx", val);4848 trace_seq_printf(s, "0x%llx", val);
4849 else4849 else
4850 trace_seq_printf(s, "%llu", val);4850 trace_seq_printf(s, "%llu", val);
@@ -6288,7 +6288,7 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event_format *event, · 1437 unmodified lines
6288 len = &dummy;6288 len = &dummy;
6289 6289
6290 offset = field->offset;6290 offset = field->offset;
6291 if (field->flags & FIELD_IS_DYNAMIC) {6291 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
6292 offset = tep_read_number(event->pevent,6292 offset = tep_read_number(event->pevent,
6293 data + offset, field->size);6293 data + offset, field->size);
6294 *len = offset >> 16;6294 *len = offset >> 16;
tools/lib/traceevent/event-parse.h+9−9
@@ -130,15 +130,15 @@ struct tep_plugin_option { · 129 unmodified lines
130#define TEP_PLUGIN_OPTIONS_NAME MAKE_STR(TEP_PLUGIN_OPTIONS)130#define TEP_PLUGIN_OPTIONS_NAME MAKE_STR(TEP_PLUGIN_OPTIONS)
131#define TEP_PLUGIN_ALIAS_NAME MAKE_STR(TEP_PLUGIN_ALIAS)131#define TEP_PLUGIN_ALIAS_NAME MAKE_STR(TEP_PLUGIN_ALIAS)
132 132
133enum format_flags {133enum tep_format_flags {
134 FIELD_IS_ARRAY = 1,134 TEP_FIELD_IS_ARRAY = 1,
135 FIELD_IS_POINTER = 2,135 TEP_FIELD_IS_POINTER = 2,
136 FIELD_IS_SIGNED = 4,136 TEP_FIELD_IS_SIGNED = 4,
137 FIELD_IS_STRING = 8,137 TEP_FIELD_IS_STRING = 8,
138 FIELD_IS_DYNAMIC = 16,138 TEP_FIELD_IS_DYNAMIC = 16,
139 FIELD_IS_LONG = 32,139 TEP_FIELD_IS_LONG = 32,
140 FIELD_IS_FLAG = 64,140 TEP_FIELD_IS_FLAG = 64,
141 FIELD_IS_SYMBOLIC = 128,141 TEP_FIELD_IS_SYMBOLIC = 128,
142};142};
143 143
144struct tep_format_field {144struct tep_format_field {
tools/lib/traceevent/parse-filter.c+4−4
@@ -1716,7 +1716,7 @@ get_value(struct tep_event_format *event, · 1715 unmodified lines
1716 1716
1717 tep_read_number_field(field, record->data, &val);1717 tep_read_number_field(field, record->data, &val);
1718 1718
1719 if (!(field->flags & FIELD_IS_SIGNED))1719 if (!(field->flags & TEP_FIELD_IS_SIGNED))
1720 return val;1720 return val;
1721 1721
1722 switch (field->size) {1722 switch (field->size) {
@@ -1867,11 +1867,11 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco · 144 unmodified lines
1867 char hex[64];1867 char hex[64];
1868 1868
1869 /* If the field is not a string convert it */1869 /* If the field is not a string convert it */
1870 if (arg->str.field->flags & FIELD_IS_STRING) {1870 if (arg->str.field->flags & TEP_FIELD_IS_STRING) {
1871 val = record->data + arg->str.field->offset;1871 val = record->data + arg->str.field->offset;
1872 size = arg->str.field->size;1872 size = arg->str.field->size;
1873 1873
1874 if (arg->str.field->flags & FIELD_IS_DYNAMIC) {1874 if (arg->str.field->flags & TEP_FIELD_IS_DYNAMIC) {
1875 addr = *(unsigned int *)val;1875 addr = *(unsigned int *)val;
1876 val = record->data + (addr & 0xffff);1876 val = record->data + (addr & 0xffff);
1877 size = addr >> 16;1877 size = addr >> 16;
@@ -1893,7 +1893,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco · 15 unmodified lines
1893 pevent = event->pevent;1893 pevent = event->pevent;
1894 addr = get_value(event, arg->str.field, record);1894 addr = get_value(event, arg->str.field, record);
1895 1895
1896 if (arg->str.field->flags & (FIELD_IS_POINTER | FIELD_IS_LONG))1896 if (arg->str.field->flags & (TEP_FIELD_IS_POINTER | TEP_FIELD_IS_LONG))
1897 /* convert to a kernel symbol */1897 /* convert to a kernel symbol */
1898 val = tep_find_function(pevent, addr);1898 val = tep_find_function(pevent, addr);
1899 1899
tools/perf/builtin-trace.c+1−1
@@ -1293,7 +1293,7 @@ static int syscall__set_arg_fmts(struct syscall *sc) · 1292 unmodified lines
1293 strcmp(field->name, "path") == 0 ||1293 strcmp(field->name, "path") == 0 ||
1294 strcmp(field->name, "pathname") == 0))1294 strcmp(field->name, "pathname") == 0))
1295 sc->arg_fmt[idx].scnprintf = SCA_FILENAME;1295 sc->arg_fmt[idx].scnprintf = SCA_FILENAME;
1296 else if (field->flags & FIELD_IS_POINTER)1296 else if (field->flags & TEP_FIELD_IS_POINTER)
1297 sc->arg_fmt[idx].scnprintf = syscall_arg__scnprintf_hex;1297 sc->arg_fmt[idx].scnprintf = syscall_arg__scnprintf_hex;
1298 else if (strcmp(field->type, "pid_t") == 0)1298 else if (strcmp(field->type, "pid_t") == 0)
1299 sc->arg_fmt[idx].scnprintf = SCA_PID;1299 sc->arg_fmt[idx].scnprintf = SCA_PID;
tools/perf/tests/evsel-tp-sched.c+1−1
@@ -17,7 +17,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name, · 16 unmodified lines
17 return -1;17 return -1;
18 }18 }
19 19
20 is_signed = !!(field->flags | FIELD_IS_SIGNED);20 is_signed = !!(field->flags | TEP_FIELD_IS_SIGNED);
21 if (should_be_signed && !is_signed) {21 if (should_be_signed && !is_signed) {
22 pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n",22 pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n",
23 evsel->name, name, is_signed, should_be_signed);23 evsel->name, name, is_signed, should_be_signed);
tools/perf/util/data-convert-bt.c+17−17
@@ -186,16 +186,16 @@ get_tracepoint_field_type(struct ctf_writer *cw, struct tep_format_field *field) · 185 unmodified lines
186{186{
187 unsigned long flags = field->flags;187 unsigned long flags = field->flags;
188 188
189 if (flags & FIELD_IS_STRING)189 if (flags & TEP_FIELD_IS_STRING)
190 return cw->data.string;190 return cw->data.string;
191 191
192 if (!(flags & FIELD_IS_SIGNED)) {192 if (!(flags & TEP_FIELD_IS_SIGNED)) {
193 /* unsigned long are mostly pointers */193 /* unsigned long are mostly pointers */
194 if (flags & FIELD_IS_LONG || flags & FIELD_IS_POINTER)194 if (flags & TEP_FIELD_IS_LONG || flags & TEP_FIELD_IS_POINTER)
195 return cw->data.u64_hex;195 return cw->data.u64_hex;
196 }196 }
197 197
198 if (flags & FIELD_IS_SIGNED) {198 if (flags & TEP_FIELD_IS_SIGNED) {
199 if (field->size == 8)199 if (field->size == 8)
200 return cw->data.s64;200 return cw->data.s64;
201 else201 else
@@ -304,10 +304,10 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, · 102 unmodified lines
304 name = fmtf->alias;304 name = fmtf->alias;
305 offset = fmtf->offset;305 offset = fmtf->offset;
306 len = fmtf->size;306 len = fmtf->size;
307 if (flags & FIELD_IS_STRING)307 if (flags & TEP_FIELD_IS_STRING)
308 flags &= ~FIELD_IS_ARRAY;308 flags &= ~TEP_FIELD_IS_ARRAY;
309 309
310 if (flags & FIELD_IS_DYNAMIC) {310 if (flags & TEP_FIELD_IS_DYNAMIC) {
311 unsigned long long tmp_val;311 unsigned long long tmp_val;
312 312
313 tmp_val = tep_read_number(fmtf->event->pevent,313 tmp_val = tep_read_number(fmtf->event->pevent,
@@ -317,7 +317,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, · 3 unmodified lines
317 offset &= 0xffff;317 offset &= 0xffff;
318 }318 }
319 319
320 if (flags & FIELD_IS_ARRAY) {320 if (flags & TEP_FIELD_IS_ARRAY) {
321 321
322 type = bt_ctf_event_class_get_field_by_name(322 type = bt_ctf_event_class_get_field_by_name(
323 event_class, name);323 event_class, name);
@@ -338,7 +338,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, · 14 unmodified lines
338 type = get_tracepoint_field_type(cw, fmtf);338 type = get_tracepoint_field_type(cw, fmtf);
339 339
340 for (i = 0; i < n_items; i++) {340 for (i = 0; i < n_items; i++) {
341 if (flags & FIELD_IS_ARRAY)341 if (flags & TEP_FIELD_IS_ARRAY)
342 field = bt_ctf_field_array_get_field(array_field, i);342 field = bt_ctf_field_array_get_field(array_field, i);
343 else343 else
344 field = bt_ctf_field_create(type);344 field = bt_ctf_field_create(type);
@@ -348,7 +348,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, · 3 unmodified lines
348 return -1;348 return -1;
349 }349 }
350 350
351 if (flags & FIELD_IS_STRING)351 if (flags & TEP_FIELD_IS_STRING)
352 ret = string_set_value(field, data + offset + i * len);352 ret = string_set_value(field, data + offset + i * len);
353 else {353 else {
354 unsigned long long value_int;354 unsigned long long value_int;
@@ -357,7 +357,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, · 2 unmodified lines
357 fmtf->event->pevent,357 fmtf->event->pevent,
358 data + offset + i * len, len);358 data + offset + i * len, len);
359 359
360 if (!(flags & FIELD_IS_SIGNED))360 if (!(flags & TEP_FIELD_IS_SIGNED))
361 ret = bt_ctf_field_unsigned_integer_set_value(361 ret = bt_ctf_field_unsigned_integer_set_value(
362 field, value_int);362 field, value_int);
363 else363 else
@@ -369,7 +369,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, · 5 unmodified lines
369 pr_err("failed to set file value %s\n", name);369 pr_err("failed to set file value %s\n", name);
370 goto err_put_field;370 goto err_put_field;
371 }371 }
372 if (!(flags & FIELD_IS_ARRAY)) {372 if (!(flags & TEP_FIELD_IS_ARRAY)) {
373 ret = bt_ctf_event_set_payload(event, name, field);373 ret = bt_ctf_event_set_payload(event, name, field);
374 if (ret) {374 if (ret) {
375 pr_err("failed to set payload %s\n", name);375 pr_err("failed to set payload %s\n", name);
@@ -378,7 +378,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw, · 2 unmodified lines
378 }378 }
379 bt_ctf_field_put(field);379 bt_ctf_field_put(field);
380 }380 }
381 if (flags & FIELD_IS_ARRAY) {381 if (flags & TEP_FIELD_IS_ARRAY) {
382 ret = bt_ctf_event_set_payload(event, name, array_field);382 ret = bt_ctf_event_set_payload(event, name, array_field);
383 if (ret) {383 if (ret) {
384 pr_err("Failed add payload array %s\n", name);384 pr_err("Failed add payload array %s\n", name);
@@ -1030,15 +1030,15 @@ static int add_tracepoint_fields_types(struct ctf_writer *cw, · 645 unmodified lines
1030 * type and don't care that it is an array. What we don't1030 * type and don't care that it is an array. What we don't
1031 * support is an array of strings.1031 * support is an array of strings.
1032 */1032 */
1033 if (flags & FIELD_IS_STRING)1033 if (flags & TEP_FIELD_IS_STRING)
1034 flags &= ~FIELD_IS_ARRAY;1034 flags &= ~TEP_FIELD_IS_ARRAY;
1035 1035
1036 if (flags & FIELD_IS_ARRAY)1036 if (flags & TEP_FIELD_IS_ARRAY)
1037 type = bt_ctf_field_type_array_create(type, field->arraylen);1037 type = bt_ctf_field_type_array_create(type, field->arraylen);
1038 1038
1039 ret = event_class_add_field(event_class, type, field);1039 ret = event_class_add_field(event_class, type, field);
1040 1040
1041 if (flags & FIELD_IS_ARRAY)1041 if (flags & TEP_FIELD_IS_ARRAY)
1042 bt_ctf_field_type_put(type);1042 bt_ctf_field_type_put(type);
1043 1043
1044 if (ret) {1044 if (ret) {
tools/perf/util/evsel.c+1−1
@@ -2698,7 +2698,7 @@ void *perf_evsel__rawptr(struct perf_evsel *evsel, struct perf_sample *sample, · 2697 unmodified lines
2698 2698
2699 offset = field->offset;2699 offset = field->offset;
2700 2700
2701 if (field->flags & FIELD_IS_DYNAMIC) {2701 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
2702 offset = *(int *)(sample->raw_data + field->offset);2702 offset = *(int *)(sample->raw_data + field->offset);
2703 offset &= 0xffff;2703 offset &= 0xffff;
2704 }2704 }
tools/perf/util/python.c+6−6
@@ -348,28 +348,28 @@ tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field) · 347 unmodified lines
348 unsigned long long val;348 unsigned long long val;
349 unsigned int offset, len;349 unsigned int offset, len;
350 350
351 if (field->flags & FIELD_IS_ARRAY) {351 if (field->flags & TEP_FIELD_IS_ARRAY) {
352 offset = field->offset;352 offset = field->offset;
353 len = field->size;353 len = field->size;
354 if (field->flags & FIELD_IS_DYNAMIC) {354 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
355 val = tep_read_number(pevent, data + offset, len);355 val = tep_read_number(pevent, data + offset, len);
356 offset = val;356 offset = val;
357 len = offset >> 16;357 len = offset >> 16;
358 offset &= 0xffff;358 offset &= 0xffff;
359 }359 }
360 if (field->flags & FIELD_IS_STRING &&360 if (field->flags & TEP_FIELD_IS_STRING &&
361 is_printable_array(data + offset, len)) {361 is_printable_array(data + offset, len)) {
362 ret = _PyUnicode_FromString((char *)data + offset);362 ret = _PyUnicode_FromString((char *)data + offset);
363 } else {363 } else {
364 ret = PyByteArray_FromStringAndSize((const char *) data + offset, len);364 ret = PyByteArray_FromStringAndSize((const char *) data + offset, len);
365 field->flags &= ~FIELD_IS_STRING;365 field->flags &= ~TEP_FIELD_IS_STRING;
366 }366 }
367 } else {367 } else {
368 val = tep_read_number(pevent, data + field->offset,368 val = tep_read_number(pevent, data + field->offset,
369 field->size);369 field->size);
370 if (field->flags & FIELD_IS_POINTER)370 if (field->flags & TEP_FIELD_IS_POINTER)
371 ret = PyLong_FromUnsignedLong((unsigned long) val);371 ret = PyLong_FromUnsignedLong((unsigned long) val);
372 else if (field->flags & FIELD_IS_SIGNED)372 else if (field->flags & TEP_FIELD_IS_SIGNED)
373 ret = PyLong_FromLong((long) val);373 ret = PyLong_FromLong((long) val);
374 else374 else
375 ret = PyLong_FromUnsignedLong((unsigned long) val);375 ret = PyLong_FromUnsignedLong((unsigned long) val);
tools/perf/util/scripting-engines/trace-event-perl.c+9−9
@@ -388,9 +388,9 @@ static void perl_process_tracepoint(struct perf_sample *sample, · 387 unmodified lines
388 /* common fields other than pid can be accessed via xsub fns */388 /* common fields other than pid can be accessed via xsub fns */
389 389
390 for (field = event->format.fields; field; field = field->next) {390 for (field = event->format.fields; field; field = field->next) {
391 if (field->flags & FIELD_IS_STRING) {391 if (field->flags & TEP_FIELD_IS_STRING) {
392 int offset;392 int offset;
393 if (field->flags & FIELD_IS_DYNAMIC) {393 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
394 offset = *(int *)(data + field->offset);394 offset = *(int *)(data + field->offset);
395 offset &= 0xffff;395 offset &= 0xffff;
396 } else396 } else
@@ -399,7 +399,7 @@ static void perl_process_tracepoint(struct perf_sample *sample, · 2 unmodified lines
399 } else { /* FIELD_IS_NUMERIC */399 } else { /* FIELD_IS_NUMERIC */
400 val = read_size(event, data + field->offset,400 val = read_size(event, data + field->offset,
401 field->size);401 field->size);
402 if (field->flags & FIELD_IS_SIGNED) {402 if (field->flags & TEP_FIELD_IS_SIGNED) {
403 XPUSHs(sv_2mortal(newSViv(val)));403 XPUSHs(sv_2mortal(newSViv(val)));
404 } else {404 } else {
405 XPUSHs(sv_2mortal(newSVuv(val)));405 XPUSHs(sv_2mortal(newSVuv(val)));
@@ -646,11 +646,11 @@ sub print_backtrace\n\ · 240 unmodified lines
646 count++;646 count++;
647 647
648 fprintf(ofp, "%s=", f->name);648 fprintf(ofp, "%s=", f->name);
649 if (f->flags & FIELD_IS_STRING ||649 if (f->flags & TEP_FIELD_IS_STRING ||
650 f->flags & FIELD_IS_FLAG ||650 f->flags & TEP_FIELD_IS_FLAG ||
651 f->flags & FIELD_IS_SYMBOLIC)651 f->flags & TEP_FIELD_IS_SYMBOLIC)
652 fprintf(ofp, "%%s");652 fprintf(ofp, "%%s");
653 else if (f->flags & FIELD_IS_SIGNED)653 else if (f->flags & TEP_FIELD_IS_SIGNED)
654 fprintf(ofp, "%%d");654 fprintf(ofp, "%%d");
655 else655 else
656 fprintf(ofp, "%%u");656 fprintf(ofp, "%%u");
@@ -668,7 +668,7 @@ sub print_backtrace\n\ · 11 unmodified lines
668 if (++count % 5 == 0)668 if (++count % 5 == 0)
669 fprintf(ofp, "\n\t ");669 fprintf(ofp, "\n\t ");
670 670
671 if (f->flags & FIELD_IS_FLAG) {671 if (f->flags & TEP_FIELD_IS_FLAG) {
672 if ((count - 1) % 5 != 0) {672 if ((count - 1) % 5 != 0) {
673 fprintf(ofp, "\n\t ");673 fprintf(ofp, "\n\t ");
674 count = 4;674 count = 4;
@@ -678,7 +678,7 @@ sub print_backtrace\n\ · 3 unmodified lines
678 event->name);678 event->name);
679 fprintf(ofp, "\"%s\", $%s)", f->name,679 fprintf(ofp, "\"%s\", $%s)", f->name,
680 f->name);680 f->name);
681 } else if (f->flags & FIELD_IS_SYMBOLIC) {681 } else if (f->flags & TEP_FIELD_IS_SYMBOLIC) {
682 if ((count - 1) % 5 != 0) {682 if ((count - 1) % 5 != 0) {
683 fprintf(ofp, "\n\t ");683 fprintf(ofp, "\n\t ");
684 count = 4;684 count = 4;
tools/perf/util/scripting-engines/trace-event-python.c+13−13
@@ -335,7 +335,7 @@ static void define_event_symbols(struct tep_event_format *event, · 334 unmodified lines
335static PyObject *get_field_numeric_entry(struct tep_event_format *event,335static PyObject *get_field_numeric_entry(struct tep_event_format *event,
336 struct tep_format_field *field, void *data)336 struct tep_format_field *field, void *data)
337{337{
338 bool is_array = field->flags & FIELD_IS_ARRAY;338 bool is_array = field->flags & TEP_FIELD_IS_ARRAY;
339 PyObject *obj = NULL, *list = NULL;339 PyObject *obj = NULL, *list = NULL;
340 unsigned long long val;340 unsigned long long val;
341 unsigned int item_size, n_items, i;341 unsigned int item_size, n_items, i;
@@ -353,7 +353,7 @@ static PyObject *get_field_numeric_entry(struct tep_event_format *event, · 11 unmodified lines
353 353
354 val = read_size(event, data + field->offset + i * item_size,354 val = read_size(event, data + field->offset + i * item_size,
355 item_size);355 item_size);
356 if (field->flags & FIELD_IS_SIGNED) {356 if (field->flags & TEP_FIELD_IS_SIGNED) {
357 if ((long long)val >= LONG_MIN &&357 if ((long long)val >= LONG_MIN &&
358 (long long)val <= LONG_MAX)358 (long long)val <= LONG_MAX)
359 obj = _PyLong_FromLong(val);359 obj = _PyLong_FromLong(val);
@@ -867,22 +867,22 @@ static void python_process_tracepoint(struct perf_sample *sample, · 507 unmodified lines
867 unsigned int offset, len;867 unsigned int offset, len;
868 unsigned long long val;868 unsigned long long val;
869 869
870 if (field->flags & FIELD_IS_ARRAY) {870 if (field->flags & TEP_FIELD_IS_ARRAY) {
871 offset = field->offset;871 offset = field->offset;
872 len = field->size;872 len = field->size;
873 if (field->flags & FIELD_IS_DYNAMIC) {873 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
874 val = tep_read_number(scripting_context->pevent,874 val = tep_read_number(scripting_context->pevent,
875 data + offset, len);875 data + offset, len);
876 offset = val;876 offset = val;
877 len = offset >> 16;877 len = offset >> 16;
878 offset &= 0xffff;878 offset &= 0xffff;
879 }879 }
880 if (field->flags & FIELD_IS_STRING &&880 if (field->flags & TEP_FIELD_IS_STRING &&
881 is_printable_array(data + offset, len)) {881 is_printable_array(data + offset, len)) {
882 obj = _PyUnicode_FromString((char *) data + offset);882 obj = _PyUnicode_FromString((char *) data + offset);
883 } else {883 } else {
884 obj = PyByteArray_FromStringAndSize((const char *) data + offset, len);884 obj = PyByteArray_FromStringAndSize((const char *) data + offset, len);
885 field->flags &= ~FIELD_IS_STRING;885 field->flags &= ~TEP_FIELD_IS_STRING;
886 }886 }
887 } else { /* FIELD_IS_NUMERIC */887 } else { /* FIELD_IS_NUMERIC */
888 obj = get_field_numeric_entry(event, field, data);888 obj = get_field_numeric_entry(event, field, data);
@@ -1686,12 +1686,12 @@ static int python_generate_script(struct tep_handle *pevent, const char *outfile · 797 unmodified lines
1686 count++;1686 count++;
1687 1687
1688 fprintf(ofp, "%s=", f->name);1688 fprintf(ofp, "%s=", f->name);
1689 if (f->flags & FIELD_IS_STRING ||1689 if (f->flags & TEP_FIELD_IS_STRING ||
1690 f->flags & FIELD_IS_FLAG ||1690 f->flags & TEP_FIELD_IS_FLAG ||
1691 f->flags & FIELD_IS_ARRAY ||1691 f->flags & TEP_FIELD_IS_ARRAY ||
1692 f->flags & FIELD_IS_SYMBOLIC)1692 f->flags & TEP_FIELD_IS_SYMBOLIC)
1693 fprintf(ofp, "%%s");1693 fprintf(ofp, "%%s");
1694 else if (f->flags & FIELD_IS_SIGNED)1694 else if (f->flags & TEP_FIELD_IS_SIGNED)
1695 fprintf(ofp, "%%d");1695 fprintf(ofp, "%%d");
1696 else1696 else
1697 fprintf(ofp, "%%u");1697 fprintf(ofp, "%%u");
@@ -1709,7 +1709,7 @@ static int python_generate_script(struct tep_handle *pevent, const char *outfile · 11 unmodified lines
1709 if (++count % 5 == 0)1709 if (++count % 5 == 0)
1710 fprintf(ofp, "\n\t\t");1710 fprintf(ofp, "\n\t\t");
1711 1711
1712 if (f->flags & FIELD_IS_FLAG) {1712 if (f->flags & TEP_FIELD_IS_FLAG) {
1713 if ((count - 1) % 5 != 0) {1713 if ((count - 1) % 5 != 0) {
1714 fprintf(ofp, "\n\t\t");1714 fprintf(ofp, "\n\t\t");
1715 count = 4;1715 count = 4;
@@ -1719,7 +1719,7 @@ static int python_generate_script(struct tep_handle *pevent, const char *outfile · 3 unmodified lines
1719 event->name);1719 event->name);
1720 fprintf(ofp, "\"%s\", %s)", f->name,1720 fprintf(ofp, "\"%s\", %s)", f->name,
1721 f->name);1721 f->name);
1722 } else if (f->flags & FIELD_IS_SYMBOLIC) {1722 } else if (f->flags & TEP_FIELD_IS_SYMBOLIC) {
1723 if ((count - 1) % 5 != 0) {1723 if ((count - 1) % 5 != 0) {
1724 fprintf(ofp, "\n\t\t");1724 fprintf(ofp, "\n\t\t");
1725 count = 4;1725 count = 4;
tools/perf/util/sort.c+2−2
@@ -1899,7 +1899,7 @@ static int hde_width(struct hpp_dynamic_entry *hde) · 1898 unmodified lines
1899 if (namelen > len)1899 if (namelen > len)
1900 len = namelen;1900 len = namelen;
1901 1901
1902 if (!(hde->field->flags & FIELD_IS_STRING)) {1902 if (!(hde->field->flags & TEP_FIELD_IS_STRING)) {
1903 /* length for print hex numbers */1903 /* length for print hex numbers */
1904 fieldlen = hde->field->size * 2 + 2;1904 fieldlen = hde->field->size * 2 + 2;
1905 }1905 }
@@ -2071,7 +2071,7 @@ static int64_t __sort__hde_cmp(struct perf_hpp_fmt *fmt, · 165 unmodified lines
2071 }2071 }
2072 2072
2073 field = hde->field;2073 field = hde->field;
2074 if (field->flags & FIELD_IS_DYNAMIC) {2074 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
2075 unsigned long long dyn;2075 unsigned long long dyn;
2076 2076
2077 tep_read_number_field(field, a->raw_data, &dyn);2077 tep_read_number_field(field, a->raw_data, &dyn);