projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into benchmark
[lttng-tools.git]
/
ltt-sessiond
/
shm.c
diff --git
a/ltt-sessiond/shm.c
b/ltt-sessiond/shm.c
index 7dac1659fb0508129d44f2c08f645bc470e5d435..1ccaec5d8002a7720c770c9d54fb871d752fe068 100644
(file)
--- a/
ltt-sessiond/shm.c
+++ b/
ltt-sessiond/shm.c
@@
-28,6
+28,8
@@
#include <lttngerr.h>
#include <lttngerr.h>
+#include "benchmark.h"
+#include "measures.h"
#include "shm.h"
/*
#include "shm.h"
/*
@@
-43,6
+45,8
@@
static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
int wait_shm_fd, ret;
mode_t mode;
int wait_shm_fd, ret;
mode_t mode;
+ tracepoint(ust_notify_perms_start);
+
/* Default permissions */
mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
/* Default permissions */
mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
@@
-88,6
+92,9
@@
static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
*/
umask(~mode);
*/
umask(~mode);
+ tracepoint(ust_notify_perms_stop);
+
+ tracepoint(ust_notify_shm_start);
/*
* Try creating shm (or get rw access). We don't do an exclusive open,
* because we allow other processes to create+ftruncate it concurrently.
/*
* Try creating shm (or get rw access). We don't do an exclusive open,
* because we allow other processes to create+ftruncate it concurrently.
@@
-110,6
+117,8
@@
static int get_wait_shm(char *shm_path, size_t mmap_size, int global)
exit(EXIT_FAILURE);
}
exit(EXIT_FAILURE);
}
+ tracepoint(ust_notify_shm_stop);
+
DBG("Got the wait shm fd %d", wait_shm_fd);
return wait_shm_fd;
DBG("Got the wait shm fd %d", wait_shm_fd);
return wait_shm_fd;
@@
-139,9
+148,12
@@
char *shm_ust_get_mmap(char *shm_path, int global)
goto error;
}
goto error;
}
+ tracepoint(ust_notify_mmap_start);
+
wait_shm_mmap = mmap(NULL, mmap_size, PROT_WRITE | PROT_READ,
MAP_SHARED, wait_shm_fd, 0);
wait_shm_mmap = mmap(NULL, mmap_size, PROT_WRITE | PROT_READ,
MAP_SHARED, wait_shm_fd, 0);
+ tracepoint(ust_notify_mmap_stop);
/* close shm fd immediately after taking the mmap reference */
ret = close(wait_shm_fd);
if (ret) {
/* close shm fd immediately after taking the mmap reference */
ret = close(wait_shm_fd);
if (ret) {
This page took
0.024075 seconds
and
4
git commands to generate.