[glib: 6/6] Merge branch 'task-trace' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 6e9ed964c3e75f3ddb9b49c44466b716ca134ead
Merge: 6fdc4fafa e53e8b28d
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Wed Nov 18 13:53:41 2020 +0000

    Merge branch 'task-trace' into 'master'
    
    Add some tracing to GTask
    
    See merge request GNOME/glib!1629

 gio/gtask.c              | 25 ++++++++++++++-
 gio/meson.build          |  3 +-
 glib/gtrace-private.h    | 14 +++++++--
 glib/gtrace.c            | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
 glib/meson.build         |  2 +-
 subprojects/sysprof.wrap |  2 +-
 6 files changed, 119 insertions(+), 6 deletions(-)
---