brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

profiler: track changes in GLib and Sysprof

Browse Source 
This tracks the changes to gdbus-codegen in terms of how GUnixFDList is
done to use the UnixFD annotation.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/908
This commit is contained in:
Christian Hergert 2019-10-30 15:23:24 -07:00
parent 6bfa61a3a7
commit 6051712919
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/meta-profiler.c
View File

@ -51,13 +51,12 @@ G_DEFINE_TYPE_WITH_CODE (MetaProfiler,
static gboolean static gboolean
handle_start (MetaDBusSysprof3Profiler *dbus_profiler, handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
GUnixFDList *fd_list,
GVariant *options, GVariant *options,
GVariant *fd_variant) GVariant *fd_variant)
{ {
MetaProfiler *profiler = META_PROFILER (dbus_profiler); MetaProfiler *profiler = META_PROFILER (dbus_profiler);
GMainContext *main_context = g_main_context_default (); GMainContext *main_context = g_main_context_default ();
GDBusMessage *message;
GUnixFDList *fd_list;
const char *group_name; const char *group_name;
int position; int position;
int fd = -1; int fd = -1;
@ -73,8 +72,6 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
g_variant_get (fd_variant, "h", &position); g_variant_get (fd_variant, "h", &position);
message = g_dbus_method_invocation_get_message (invocation);
fd_list = g_dbus_message_get_unix_fd_list (message);
if (fd_list) if (fd_list)
fd = g_unix_fd_list_get (fd_list, position, NULL); fd = g_unix_fd_list_get (fd_list, position, NULL);
@ -98,7 +95,7 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler,
g_debug ("Profiler running"); g_debug ("Profiler running");
meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation); meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation, NULL);
return TRUE; return TRUE;
} }