projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: uninitialized variable in lib_ring_buffer_reserve_committed
[lttng-ust.git]
/
liblttng-ust
/
lttng-context-vpid.c
diff --git
a/liblttng-ust/lttng-context-vpid.c
b/liblttng-ust/lttng-context-vpid.c
index fdf68fb1d17e0df10d1892e7e3bb4dfbc1d1cae2..11978e6e33d8e0f93ac4fb0bd34e12495790d7e4 100644
(file)
--- a/
liblttng-ust/lttng-context-vpid.c
+++ b/
liblttng-ust/lttng-context-vpid.c
@@
-20,23
+20,13
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#define _LGPL_SOURCE
#include <sys/types.h>
#include <unistd.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
#include <lttng/ringbuffer-config.h>
#include <sys/types.h>
#include <unistd.h>
#include <lttng/ust-events.h>
#include <lttng/ust-tracer.h>
#include <lttng/ringbuffer-config.h>
-#ifdef __linux__
-static inline
-pid_t wrapper_getpid(void)
-{
- return getpid();
-}
-
-void lttng_context_vpid_reset(void)
-{
-}
-#else
/*
* We cache the result to ensure we don't trigger a system call for
* each event.
/*
* We cache the result to ensure we don't trigger a system call for
* each event.
@@
-44,11
+34,16
@@
void lttng_context_vpid_reset(void)
static pid_t cached_vpid;
static inline
static pid_t cached_vpid;
static inline
-pid_t wrapper_getpid(void)
+pid_t wrapper_get
v
pid(void)
{
{
- if (caa_unlikely(!cached_vpid))
- cached_vpid = getpid();
- return cached_vpid;
+ pid_t vpid;
+
+ vpid = CMM_LOAD_SHARED(cached_vpid);
+ if (caa_unlikely(!vpid)) {
+ vpid = getpid();
+ CMM_STORE_SHARED(cached_vpid, vpid);
+ }
+ return vpid;
}
/*
}
/*
@@
-57,12
+52,11
@@
pid_t wrapper_getpid(void)
*/
void lttng_context_vpid_reset(void)
{
*/
void lttng_context_vpid_reset(void)
{
-
cached_vpid = 0
;
+
CMM_STORE_SHARED(cached_vpid, 0)
;
}
}
-#endif
static
static
-size_t vpid_get_size(size_t offset)
+size_t vpid_get_size(s
truct lttng_ctx_field *field, s
ize_t offset)
{
size_t size = 0;
{
size_t size = 0;
@@
-74,13
+68,19
@@
size_t vpid_get_size(size_t offset)
static
void vpid_record(struct lttng_ctx_field *field,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
static
void vpid_record(struct lttng_ctx_field *field,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
- struct ltt_channel *chan)
+ struct ltt
ng
_channel *chan)
{
{
- pid_t pid;
+ pid_t vpid = wrapper_getvpid();
+
+ lib_ring_buffer_align_ctx(ctx, lttng_alignof(vpid));
+ chan->ops->event_write(ctx, &vpid, sizeof(vpid));
+}
- pid = wrapper_getpid();
- lib_ring_buffer_align_ctx(ctx, lttng_alignof(pid));
- chan->ops->event_write(ctx, &pid, sizeof(pid));
+static
+void vpid_get_value(struct lttng_ctx_field *field,
+ struct lttng_ctx_value *value)
+{
+ value->u.s64 = wrapper_getvpid();
}
int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
}
int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
@@
-104,5
+104,7
@@
int lttng_add_vpid_to_ctx(struct lttng_ctx **ctx)
field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
field->get_size = vpid_get_size;
field->record = vpid_record;
field->event_field.type.u.basic.integer.encoding = lttng_encode_none;
field->get_size = vpid_get_size;
field->record = vpid_record;
+ field->get_value = vpid_get_value;
+ lttng_context_update(*ctx);
return 0;
}
return 0;
}
This page took
0.028441 seconds
and
4
git commands to generate.