X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-comm.c;h=2738959f1e29198d2d2f62bc13d68fb71e5fead6;hb=2fbda51c64f28b33b8febffc998af235e6fa9ea9;hp=2c902dc2737e922204628293e806306fa08e174a;hpb=c117e9884c3acc65408d8f65b2cd86a8511df1cc;p=lttng-ust.git diff --git a/src/lib/lttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c index 2c902dc2..2738959f 100644 --- a/src/lib/lttng-ust/lttng-ust-comm.c +++ b/src/lib/lttng-ust/lttng-ust-comm.c @@ -2125,6 +2125,10 @@ void lttng_ust_check_soname_0(void) * Expose a canary symbol of the previous ABI to ensure we catch uses of a * liblttng-ust.so.0 dlopen'd after .so.1 has been loaded. Use a different * symbol than the detection code to ensure we don't detect ourself. + * + * This scheme will only work on systems where the global symbol table has + * priority when resolving the symbols of a dlopened shared object, which is + * the case on Linux but not on FreeBSD. */ void init_usterr(void); void init_usterr(void) @@ -2179,7 +2183,7 @@ void lttng_ust_ctor(void) * this library so it never becomes zero, thus never gets unloaded from the * address space of the process. Since we are already running in the * constructor of the LTTNG_UST_LIB_SONAME library, calling dlopen will - * simply increment the refcount and no additionnal work is needed by the + * simply increment the refcount and no additional work is needed by the * dynamic loader as the shared library is already loaded in the address * space. As a safe guard, we use the RTLD_NODELETE flag to prevent * unloading of the UST library if its refcount becomes zero (which should @@ -2516,7 +2520,7 @@ void lttng_ust_after_fork_parent(sigset_t *restore_sigset) return; DBG("process %d", getpid()); lttng_ust_urcu_after_fork_parent(); - /* Release mutexes and reenable signals */ + /* Release mutexes and re-enable signals */ ust_after_fork_common(restore_sigset); } @@ -2543,7 +2547,7 @@ void lttng_ust_after_fork_child(sigset_t *restore_sigset) /* Release urcu mutexes */ lttng_ust_urcu_after_fork_child(); lttng_ust_cleanup(0); - /* Release mutexes and reenable signals */ + /* Release mutexes and re-enable signals */ ust_after_fork_common(restore_sigset); lttng_ust_ctor(); }