varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix org.gtk.GDBus.C.UnixFD annotations

Browse Source 
The annotation applies to the method as a whole, not to individual
arguments, so the existing annotations don't have any effect.

This was hidden by gdbus-codegen's automatic handling of arguments
of type 'h', but that change was reverted, resulting in a broken
build.
This commit is contained in:
Florian Müllner
2019-10-31 16:57:59 +01:00
parent b624ec8809
commit 6584fcd286
3 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/org.gnome.Sysprof2.xml
View File

@ -14,13 +14,12 @@
the resulting fd back to the calling process.
-->
<method name="PerfEventOpen">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
<arg name="options" type="a{sv}" direction="in"/>
<arg name="pid" type="i" direction="in"/>
<arg name="cpu" type="i" direction="in"/>
<arg name="flags" type="t" direction="in"/>
<arg name="perf_stream_fd" type="h" direction="out">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
</arg>
<arg name="perf_stream_fd" type="h" direction="out"/>
</method>
<!--

5
src/org.gnome.Sysprof3.Profiler.xml
View File

@ -29,10 +29,9 @@
The contents of @options are implementation specific.
-->
<method name="Start">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
<arg type="a{sv}" name="options" direction="in"/>
<arg type="h" name="fd" direction="in">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
</arg>
<arg type="h" name="fd" direction="in"/>
</method>
<!--
Stop:

14
src/org.gnome.Sysprof3.Service.xml
View File

@ -15,16 +15,13 @@
the resulting fd back to the calling process.
-->
<method name="PerfEventOpen">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
<arg name="options" type="a{sv}" direction="in"/>
<arg name="pid" type="i" direction="in"/>
<arg name="cpu" type="i" direction="in"/>
<arg name="group_fd" type="h" direction="in">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
</arg>
<arg name="group_fd" type="h" direction="in"/>
<arg name="flags" type="t" direction="in"/>
<arg name="perf_stream_fd" type="h" direction="out">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
</arg>
<arg name="perf_stream_fd" type="h" direction="out"/>
</method>
<!--
@ -58,10 +55,9 @@
Since: 3.34
-->
<method name="GetProcFd">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
<arg name="path" type="ay" direction="in"/>
<arg name="fd" type="h" direction="out">
<annotation name="org.gtk.GDBus.C.UnixFD" value="true"/>
</arg>
<arg name="fd" type="h" direction="out"/>
</method>
<!--