Re: [PATCH 13/16] xml, btrace: define btrace xml document style

[Jan Kratochvil <jan.kratochvil@redhat.com>]

On Wed, 23 May 2012 13:22:28 +0200, markus.t.metzger@intel.com wrote:
> diff --git a/gdb/Makefile.in b/gdb/Makefile.in
> index b3fdd4f..5c31ecd 100644
> --- a/gdb/Makefile.in
> +++ b/gdb/Makefile.in
> @@ -489,7 +489,8 @@ RUNTESTFLAGS=
>  XMLFILES = $(srcdir)/features/gdb-target.dtd $(srcdir)/features/xinclude.dtd \
>  	$(srcdir)/features/library-list.dtd \
>  	$(srcdir)/features/library-list-svr4.dtd $(srcdir)/features/osdata.dtd \
> -	$(srcdir)/features/threads.dtd $(srcdir)/features/traceframe-info.dtd
> +	$(srcdir)/features/threads.dtd $(srcdir)/features/traceframe-info.dtd \
> +	$(srcdir)/features/btrace.dtd
>  
>  # This is ser-unix.o for any system which supports a v7/BSD/SYSV/POSIX
>  # interface to the serial port.  Hopefully if get ported to OS/2, VMS,
> diff --git a/gdb/btrace.c b/gdb/btrace.c
> index 2b57ca7..c2aef67 100644
> --- a/gdb/btrace.c
> +++ b/gdb/btrace.c
> @@ -29,6 +29,7 @@
>  #include "cli/cli-utils.h"
>  #include "arch-utils.h"
>  #include "disasm.h"
> +#include "xml-support.h"
>  
>  #include <errno.h>
>  #include <ctype.h>
> @@ -798,6 +799,86 @@ cmd_btrace (char *args, int from_tty)
>    do_btrace (trace, flags);
>  }
>  
> +#if defined(HAVE_LIBEXPAT)
> +
> +static void
> +check_xml_btrace_version (struct gdb_xml_parser *parser,
> +                          const struct gdb_xml_element *element,
> +                          void *user_data, VEC (gdb_xml_value_s) *attributes)
> +{
> +  const char *version = xml_find_attribute (attributes, "version")->value;

Empty line.

> +  if (strcmp (version, "1.0") != 0)
> +    gdb_xml_error (parser, _("Unsupported btrace version: \"%s\""), version);
> +}
> +
> +static void
> +parse_xml_btrace_block (struct gdb_xml_parser *parser,
> +                        const struct gdb_xml_element *element,
> +                        void *user_data, VEC (gdb_xml_value_s) *attributes)
> +{
> +  VEC (btrace_block_s) **btrace = user_data;
> +  struct btrace_block *block = VEC_safe_push (btrace_block_s, *btrace, NULL);
> +  ULONGEST *begin, *end;
> +
> +  begin = xml_find_attribute (attributes, "begin")->value;
> +  end = xml_find_attribute (attributes, "end")->value;
> +
> +  block->begin = *begin;
> +  block->end = *end;
> +}
> +
> +const struct gdb_xml_attribute block_attributes[] = {

It can be static.  The same in other cases.

> +  { "begin", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
> +  { "end", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL },
> +  { NULL, GDB_XML_AF_NONE, NULL, NULL }
> +};
> +
> +const struct gdb_xml_attribute btrace_attributes[] = {
> +  { "version", GDB_XML_AF_NONE, NULL, NULL },
> +  { NULL, GDB_XML_AF_NONE, NULL, NULL }
> +};
> +
> +const struct gdb_xml_element btrace_children[] = {
> +  { "block", block_attributes, NULL,
> +    GDB_XML_EF_REPEATABLE | GDB_XML_EF_OPTIONAL, parse_xml_btrace_block, NULL },
> +  { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
> +};
> +
> +const struct gdb_xml_element btrace_elements[] = {
> +  { "btrace", btrace_attributes, btrace_children, GDB_XML_EF_NONE,
> +    check_xml_btrace_version, NULL },
> +  { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
> +};
> +
> +#endif /* defined(HAVE_LIBEXPAT) */
> +
> +VEC (btrace_block_s) *
> +parse_xml_btrace (const char *buffer)
> +{
> +  VEC (btrace_block_s) *btrace = NULL;
> +  struct cleanup *cleanup;
> +  int errcode;
> +
> +#if defined(HAVE_LIBEXPAT)
> +  cleanup = make_cleanup (xfree, btrace);

Use VEC_cleanup, not xfree.


> +  errcode = gdb_xml_parse_quick (_("btrace"), "btrace.dtd", btrace_elements,
> +                                 buffer, &btrace);
> +  if (errcode)
> +    {
> +      do_cleanups (cleanup);
> +      errno = errcode;
> +      return NULL;
> +    }
> +
> +  /* Keep parse results.  */
> +  discard_cleanups (cleanup);
> +#else  /* defined(HAVE_LIBEXPAT) */
> +  errno = ENOSYS;

Again, use some error, not errno.

> +#endif  /* defined(HAVE_LIBEXPAT) */
> +
> +  return btrace;
> +}
> +
>  void _initialize_btrace (void);
>  
>  void
> diff --git a/gdb/btrace.h b/gdb/btrace.h
> index 97f0f52..12e70b9 100644
> --- a/gdb/btrace.h
> +++ b/gdb/btrace.h
> @@ -86,4 +86,7 @@ extern struct btrace_block *read_btrace (struct thread_info *, int);
>  extern struct btrace_block *prev_btrace (struct thread_info *);
>  extern struct btrace_block *next_btrace (struct thread_info *);
>  
> +/* Parse a branch trace xml document into a block vector.  */
> +extern VEC (btrace_block_s) *parse_xml_btrace (const char*);
> +
>  #endif /* BTRACE_H */
> diff --git a/gdb/features/btrace.dtd b/gdb/features/btrace.dtd
> new file mode 100644
> index 0000000..7e6bfd0
> --- /dev/null
> +++ b/gdb/features/btrace.dtd
> @@ -0,0 +1,12 @@
> +<!-- Copyright (C) 2012 Free Software Foundation, Inc.
> +
> +     Copying and distribution of this file, with or without modification,
> +     are permitted in any medium without royalty provided the copyright
> +     notice and this notice are preserved.  -->
> +
> +<!ELEMENT btrace  (block)* >
> +<!ATTLIST btrace  version CDATA   #REQUIRED>
> +
> +<!ELEMENT block        EMPTY>
> +<!ATTLIST block        begin  CDATA   #REQUIRED
> +                       end    CDATA   #REQUIRED>
> -- 
> 1.7.1