[gjs: 5/5] Merge branch 'wip/chergert/sysprof-3' into 'master'
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 5/5] Merge branch 'wip/chergert/sysprof-3' into 'master'
- Date: Fri, 7 Jun 2019 20:33:10 +0000 (UTC)
commit 9bdbf2f297ba899a1329cac9b6f7c0e4c79fbfff
Merge: 4eb8a82a 0218b123
Author: Philip Chimento <philip chimento gmail com>
Date: Fri Jun 7 20:32:56 2019 +0000
Merge branch 'wip/chergert/sysprof-3' into 'master'
Add support for GJS_TRACE_FD
See merge request GNOME/gjs!295
Makefile.am | 4 +-
configure.ac | 36 ++-
gjs-srcs.mk | 6 -
gjs/console.cpp | 20 ++
gjs/context-private.h | 5 +-
gjs/context.cpp | 20 ++
gjs/profiler-private.h | 4 +
gjs/profiler.cpp | 89 ++++--
gjs/profiler.h | 2 +
test/gjs-tests.cpp | 1 +
test/org.gnome.GjsDevel.json | 21 ++
util/sp-capture-types.h | 127 ---------
util/sp-capture-writer.c | 628 -------------------------------------------
util/sp-capture-writer.h | 81 ------
14 files changed, 174 insertions(+), 870 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]