[glib: 7/7] Merge branch 'wip/hadess/add-memory-monitor' into 'master'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 7/7] Merge branch 'wip/hadess/add-memory-monitor' into 'master'
- Date: Wed, 11 Dec 2019 12:32:18 +0000 (UTC)
commit cedeccec855ac0e25a07ac277cf85dfdf073bb40
Merge: 8f5d2c370 fa4cbfdd9
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed Dec 11 12:31:53 2019 +0000
Merge branch 'wip/hadess/add-memory-monitor' into 'master'
gio: Add GMemoryMonitor to monitor for low-memory
See merge request GNOME/glib!1005
.gitlab-ci.yml | 32 ++++++
docs/reference/gio/gio-docs.xml | 1 +
docs/reference/gio/gio-sections-common.txt | 17 +++
docs/reference/gio/meson.build | 2 +
gio/gio.h | 49 +++++----
gio/gioenums.h | 32 ++++++
gio/giomodule.c | 11 ++
gio/giotypes.h | 1 +
gio/gmemorymonitor.c | 127 +++++++++++++++++++++
gio/gmemorymonitor.h | 62 +++++++++++
gio/gmemorymonitordbus.c | 171 +++++++++++++++++++++++++++++
gio/gmemorymonitordbus.h | 31 ++++++
gio/gmemorymonitorportal.c | 152 +++++++++++++++++++++++++
gio/gmemorymonitorportal.h | 31 ++++++
gio/meson.build | 4 +
gio/tests/memory-monitor-dbus.py.in | 92 ++++++++++++++++
gio/tests/memory-monitor-portal.py.in | 104 ++++++++++++++++++
gio/tests/memory-monitor.c | 88 +++++++++++++++
gio/tests/meson.build | 26 +++++
glib/glib-object.h | 5 +-
glib/glib.h | 5 +-
glib/tests/mainloop.c | 6 +
22 files changed, 1020 insertions(+), 29 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]