From mboxrd@z Thu Jan 1 00:00:00 1970 From: nils@as68123.uab.ericsson.se (Nils Carlson) Date: Tue, 21 Sep 2010 14:14:04 +0200 (CEST) Subject: [ltt-dev] [UST PATCH 2/3] Syntax cleanup In-Reply-To: <1284752472-350-2-git-send-email-david.goulet@polymtl.ca> References: <1284752472-350-1-git-send-email-david.goulet@polymtl.ca> <1284752472-350-2-git-send-email-david.goulet@polymtl.ca> Message-ID: Acked, pulled, thanks. /Nils On Fri, 17 Sep 2010, David Goulet wrote: > Replace spaces by tabs and remove trailing white spaces > > Signed-off-by: David Goulet > --- > include/ust/marker.h | 91 ++++++++++++++++++++++++------------------------- > 1 files changed, 45 insertions(+), 46 deletions(-) > > diff --git a/include/ust/marker.h b/include/ust/marker.h > index 287f20f..7670648 100644 > --- a/include/ust/marker.h > +++ b/include/ust/marker.h > @@ -64,7 +64,7 @@ struct marker { > const char *format; /* Marker format string, describing the > * variable argument list. > */ > - DEFINE_IMV(char, state);/* Immediate value state. */ > + DEFINE_IMV(char, state);/* Immediate value state. */ > char ptype; /* probe type : 0 : single, 1 : multi */ > /* Probe wrapper */ > u16 channel_id; /* Numeric channel identifier, dynamic */ > @@ -89,47 +89,47 @@ struct marker { > * because it must not require %-sign escaping, as we most certainly \ > * have some %-signs in the format string. \ > */ \ > - asm volatile ( \ > - /* We only define these symbols if they have not yet been defined. Indeed, \ > - * if two markers with the same channel/name are on the same line, they \ > - * will try to create the same symbols, resulting in a conflict. This \ > - * is not unusual as it can be the result of function inlining. \ > - */ \ > - ".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t" \ > - /*".section __markers_strings\n\t"*/ \ > - ".section __markers_strings,\"aw\", at progbits\n\t" \ > - "__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ":\n\t" \ > - ".string \"" __stringify(channel) "\"\n\t" \ > - "__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ":\n\t" \ > - ".string \"" __stringify(name) "\"\n\t" \ > - "__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ":\n\t" \ > - ".string " "\"" format "\"" "\n\t" \ > - ".previous\n\t" \ > - ".endif\n\t" \ > + asm volatile ( \ > + /* We only define these symbols if they have not yet been defined. Indeed, \ > + * if two markers with the same channel/name are on the same line, they \ > + * will try to create the same symbols, resulting in a conflict. This \ > + * is not unusual as it can be the result of function inlining. \ > + */ \ > + ".ifndef __mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) "\n\t" \ > + /*".section __markers_strings\n\t"*/ \ > + ".section __markers_strings,\"aw\", at progbits\n\t" \ > + "__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ":\n\t" \ > + ".string \"" __stringify(channel) "\"\n\t" \ > + "__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ":\n\t" \ > + ".string \"" __stringify(name) "\"\n\t" \ > + "__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ":\n\t" \ > + ".string " "\"" format "\"" "\n\t" \ > + ".previous\n\t" \ > + ".endif\n\t" \ > ); \ > asm volatile ( \ > - /*".section __markers\n\t"*/ \ > - ".section __markers,\"aw\", at progbits\n\t" \ > - ".balign 8\n\t" \ > - "2:\n\t" \ > - _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ")\n\t" /* channel string */ \ > - _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ")\n\t" /* name string */ \ > - _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ")\n\t" /* format string */ \ > - ".byte 0\n\t" /* state imv */ \ > - ".byte 0\n\t" /* ptype */ \ > - ".word 0\n\t" /* channel_id */ \ > - ".word 0\n\t" /* event_id */ \ > - ".balign " __stringify(__WORDSIZE) " / 8\n\t" /* alignment */ \ > - _ASM_PTR "(marker_probe_cb)\n\t" /* call */ \ > - _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \ > - _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */ \ > - _ASM_PTR "0\n\t" /* marker_probe_closure *multi */ \ > - _ASM_PTR "0\n\t" /* tp_name */ \ > - _ASM_PTR "0\n\t" /* tp_cb */ \ > - _ASM_PTR "(1f)\n\t" /* location */ \ > - ".previous\n\t" \ > - "1:\n\t" \ > - ARCH_COPY_ADDR("%[outptr]") \ > + /*".section __markers\n\t"*/ \ > + ".section __markers,\"aw\", at progbits\n\t" \ > + ".balign 8\n\t" \ > + "2:\n\t" \ > + _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_channel_" __stringify(unique) ")\n\t" /* channel string */ \ > + _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_name_" __stringify(unique) ")\n\t" /* name string */ \ > + _ASM_PTR "(__mstrtab_" __stringify(channel) "_" __stringify(name) "_format_" __stringify(unique) ")\n\t" /* format string */ \ > + ".byte 0\n\t" /* state imv */ \ > + ".byte 0\n\t" /* ptype */ \ > + ".word 0\n\t" /* channel_id */ \ > + ".word 0\n\t" /* event_id */ \ > + ".balign " __stringify(__WORDSIZE) " / 8\n\t" /* alignment */ \ > + _ASM_PTR "(marker_probe_cb)\n\t" /* call */ \ > + _ASM_PTR "(__mark_empty_function)\n\t" /* marker_probe_closure single.field1 */ \ > + _ASM_PTR "0\n\t" /* marker_probe_closure single.field2 */ \ > + _ASM_PTR "0\n\t" /* marker_probe_closure *multi */ \ > + _ASM_PTR "0\n\t" /* tp_name */ \ > + _ASM_PTR "0\n\t" /* tp_cb */ \ > + _ASM_PTR "(1f)\n\t" /* location */ \ > + ".previous\n\t" \ > + "1:\n\t" \ > + ARCH_COPY_ADDR("%[outptr]") \ > : [outptr] "=r" (m) ); \ > \ > save_registers(®s) > @@ -148,12 +148,11 @@ struct marker { > static struct marker GET_MARKER(channel, name) \ > __attribute__((section("__markers"), aligned(8))) = \ > { __mstrtab_##channel##_##name, \ > - &__mstrtab_##channel##_##name[sizeof(#channel)], \ > - &__mstrtab_##channel##_##name[sizeof(#channel) + \ > - sizeof(#name)], \ > - 0, 0, 0, 0, marker_probe_cb, \ > - { __mark_empty_function, NULL}, \ > - NULL, tp_name_str, tp_cb } > + &__mstrtab_##channel##_##name[sizeof(#channel)], \ > + &__mstrtab_##channel##_##name[sizeof(#channel) + sizeof(#name)], \ > + 0, 0, 0, 0, marker_probe_cb, \ > + { __mark_empty_function, NULL}, \ > + NULL, tp_name_str, tp_cb } > > /* > * Make sure the alignment of the structure in the __markers section will > -- > 1.7.2.3 > > > _______________________________________________ > ltt-dev mailing list > ltt-dev at lists.casi.polymtl.ca > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev >