[glib: 6/6] Merge branch 'sysprof' into 'master'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 6/6] Merge branch 'sysprof' into 'master'
- Date: Tue, 7 Jul 2020 10:58:16 +0000 (UTC)
commit 4486ac1448bf18be72c6a8bdb110db6a0555bfaa
Merge: 1ee22d0ae b08bd04ab
Author: Philip Withnall <philip tecnocode co uk>
Date: Tue Jul 7 10:57:34 2020 +0000
Merge branch 'sysprof' into 'master'
Add initial sysprof support
See merge request GNOME/glib!1551
docs/reference/glib/meson.build | 1 +
gio/gasyncinitable.c | 1 +
gio/gdbusinterfaceskeleton.c | 1 +
gio/gdbusprivate.c | 2 +
gio/gdbusproxy.c | 3 ++
gio/gresolver.c | 3 ++
gio/gtask.c | 11 +++--
gio/gtask.h | 8 ++++
gio/gthreadedresolver.c | 7 +++
gio/gtlsdatabase.c | 4 ++
gio/gunixmount.c | 8 ++--
gio/gunixvolume.c | 8 ++--
glib/gmain.c | 43 ++++++++++++++++++
glib/gspawn.c | 20 ++++++---
glib/gtrace-private.h | 70 +++++++++++++++++++++++++++++
glib/gtrace.c | 98 +++++++++++++++++++++++++++++++++++++++++
glib/meson.build | 20 ++++++++-
meson_options.txt | 5 +++
subprojects/sysprof.wrap | 4 ++
19 files changed, 300 insertions(+), 17 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]