luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 06:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib: Namespace global tapset variables by soname

Browse Source 
global variables in SystemTap are shared between all SystemTap scripts;
so if scripts are loaded for two versions of GLib (for example, a stable
and a development version), those global variables will conflict.

Avoid that by including the soname’s version in the global variable
names.

https://bugzilla.gnome.org/show_bug.cgi?id=770646
This commit is contained in:
Philip Withnall 2016-08-31 14:20:59 +01:00
parent a24f57b071
commit 3e7b5cbef8
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/glib.stp.in
View File

@ -1,9 +1,9 @@
global gquarks global glib_quarks_2_0_@LT_CURRENT@_@LT_REVISION@
/* This is needed to keep track of gquark for use in other probes.*/ /* This is needed to keep track of gquark for use in other probes.*/
probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("quark__new") probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("quark__new")
{ {
gquarks[pid(), $arg2] = user_string($arg1) glib_quarks_2_0_@LT_CURRENT@_@LT_REVISION@[pid(), $arg2] = user_string($arg1)
} }
/** /**

36
gobject/gobject.stp.in
View File

@ -1,18 +1,18 @@
global gtypes global gobject_types_2_0_@LT_CURRENT@_@LT_REVISION@
global gtypenames global gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@
global gsignalnames global gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@
/* These are needed to keep track of gtype and signal names for the below /* These are needed to keep track of gtype and signal names for the below
* probes. * probes.
*/ */
probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("type__new") probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("type__new")
{ {
gtypes[pid(),user_string($arg1)] = $arg3; gobject_types_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),user_string($arg1)] = $arg3;
gtypenames[pid(),$arg3] = user_string($arg1); gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg3] = user_string($arg1);
} }
probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("signal__new") probe process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.0.@LT_CURRENT@.@LT_REVISION@").mark("signal__new")
{ {
gsignalnames[pid(),$arg1] = user_string($arg2); gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg1] = user_string($arg2);
} }
/** /**
@ -39,7 +39,7 @@ probe gobject.object_new = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.
{ {
object = $arg1; object = $arg1;
gtype = $arg2; gtype = $arg2;
type = gtypenames[pid(),$arg2]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2];
probestr = sprintf("gobject.object_new(%s) -> %p", type, object); probestr = sprintf("gobject.object_new(%s) -> %p", type, object);
} }
@ -55,7 +55,7 @@ probe gobject.object_ref = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.
{ {
object = $arg1; object = $arg1;
gtype = $arg2; gtype = $arg2;
type = gtypenames[pid(),gtype]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),gtype];
old_refcount = $arg3; old_refcount = $arg3;
refcount = old_refcount+1; refcount = old_refcount+1;
probestr = sprintf("gobject.object_ref(%p[%s]) -> %d", object, type, refcount); probestr = sprintf("gobject.object_ref(%p[%s]) -> %d", object, type, refcount);
@ -72,7 +72,7 @@ probe gobject.object_unref = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.s
{ {
object = $arg1; object = $arg1;
gtype = $arg2; gtype = $arg2;
type = gtypenames[pid(),gtype]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),gtype];
old_refcount = $arg3; old_refcount = $arg3;
refcount = old_refcount-1; refcount = old_refcount-1;
probestr = sprintf("gobject.object_unref(%p [%s]) -> %d", object, type, refcount); probestr = sprintf("gobject.object_unref(%p [%s]) -> %d", object, type, refcount);
@ -89,7 +89,7 @@ probe gobject.object_dispose = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0
{ {
object = $arg1; object = $arg1;
gtype = $arg2; gtype = $arg2;
type = gtypenames[pid(),$arg2]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2];
last_unref = $arg3; last_unref = $arg3;
probestr = sprintf("gobject.object_dispose(%p[%s])", object, type); probestr = sprintf("gobject.object_dispose(%p[%s])", object, type);
} }
@ -105,7 +105,7 @@ probe gobject.object_dispose_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject
{ {
object = $arg1; object = $arg1;
gtype = $arg2; gtype = $arg2;
type = gtypenames[pid(),$arg2]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2];
last_unref = $arg3; last_unref = $arg3;
probestr = sprintf("gobject.object_dispose_end(%p[%s])", object, type); probestr = sprintf("gobject.object_dispose_end(%p[%s])", object, type);
} }
@ -120,7 +120,7 @@ probe gobject.object_finalize = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.
{ {
object = $arg1; object = $arg1;
gtype = $arg2; gtype = $arg2;
type = gtypenames[pid(),$arg2]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2];
probestr = sprintf("gobject.object_finalize(%p[%s])", object, type); probestr = sprintf("gobject.object_finalize(%p[%s])", object, type);
} }
@ -134,7 +134,7 @@ probe gobject.object_finalize_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobjec
{ {
object = $arg1; object = $arg1;
gtype = $arg2; gtype = $arg2;
type = gtypenames[pid(),$arg2]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg2];
probestr = sprintf("gobject.object_finalize_end(%p[%s])", object, type); probestr = sprintf("gobject.object_finalize_end(%p[%s])", object, type);
} }
@ -150,7 +150,7 @@ probe gobject.signal_new = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so.
gsignal = $arg1; gsignal = $arg1;
name = user_string($arg2); name = user_string($arg2);
gtype = $arg3; gtype = $arg3;
type = gtypenames[pid(),$arg3]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg3];
probestr = sprintf("gobject.signal_new(%s, %s) -> %d", name, type, gsignal); probestr = sprintf("gobject.signal_new(%s, %s) -> %d", name, type, gsignal);
} }
@ -167,12 +167,12 @@ probe gobject.signal_emit = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.0.so
{ {
gsignal = $arg1; gsignal = $arg1;
detail = $arg2; detail = $arg2;
signal = gsignalnames[pid(),$arg1]; signal = gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg1];
if (detail != 0) if (detail != 0)
signal = signal . "::" . gquarks[pid(), detail] signal = signal . "::" . gquarks[pid(), detail]
object = $arg3; object = $arg3;
gtype = $arg4; gtype = $arg4;
type = gtypenames[pid(),$arg4]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg4];
probestr = sprintf("gobject.signal_emit(%p[%s], %s)", object, type, signal); probestr = sprintf("gobject.signal_emit(%p[%s], %s)", object, type, signal);
} }
@ -189,11 +189,11 @@ probe gobject.signal_emit_end = process("@ABS_GLIB_RUNTIME_LIBDIR@/libgobject-2.
{ {
gsignal = $arg1; gsignal = $arg1;
detail = $arg2; detail = $arg2;
signal = gsignalnames[pid(),$arg1]; signal = gobject_signal_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg1];
if (detail != 0) if (detail != 0)
signal = signal . "::" . gquarks[pid(), detail] signal = signal . "::" . gquarks[pid(), detail]
object = $arg3; object = $arg3;
gtype = $arg4; gtype = $arg4;
type = gtypenames[pid(),$arg4]; type = gobject_type_names_2_0_@LT_CURRENT@_@LT_REVISION@[pid(),$arg4];
probestr = sprintf("gobject.signal_emit_end(%p[%s], %s)", object, type, signal); probestr = sprintf("gobject.signal_emit_end(%p[%s], %s)", object, type, signal);
} }