Commit 5069b561 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

tracetool: prefix parse errors with line numbers 



Include the file line number in the message that is printed when
trace-events parse errors are raised.

[Use enumerate(fobj, 1) to avoid having to increment a 0-based index
later, as suggested by Eric Blake.
--Stefan]

Suggested-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 20180110202553.31889-2-stefanha@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 6233b4a8

scripts/tracetool/__init__.py

+7 −2
Original line number Diff line number Diff line
@@ -300,13 +300,18 @@ def read_events(fobj): 
    """



    events = []

    for line in fobj:

    for lineno, line in enumerate(fobj, 1):

        if not line.strip():

            continue

        if line.lstrip().startswith('#'):

            continue



        try:

            event = Event.build(line)

        except ValueError as e:

            arg0 = 'Error on line %d: %s' % (lineno, e.args[0])

            e.args = (arg0,) + e.args[1:]

            raise



        # transform TCG-enabled events

        if "tcg" not in event.properties: