projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: use underlying types for array and sequence assertion
[lttng-ust.git]
/
libringbuffer
/
shm.c
diff --git
a/libringbuffer/shm.c
b/libringbuffer/shm.c
index 10b3bcef110a979ce2169ccf10417e470e122ba9..461befb99db5ed45cde5dcdcfecb860df06003b3 100644
(file)
--- a/
libringbuffer/shm.c
+++ b/
libringbuffer/shm.c
@@
-34,12
+34,14
@@
#include <lttng/align.h>
#include <limits.h>
#include <stdbool.h>
#include <lttng/align.h>
#include <limits.h>
#include <stdbool.h>
+#include <stdint.h>
#ifdef HAVE_LIBNUMA
#include <numa.h>
#include <numaif.h>
#endif
#include <helper.h>
#include <ust-fd.h>
#ifdef HAVE_LIBNUMA
#include <numa.h>
#include <numaif.h>
#endif
#include <helper.h>
#include <ust-fd.h>
+#include "mmap.h"
/*
* Ensure we have the required amount of space available by writing 0
/*
* Ensure we have the required amount of space available by writing 0
@@
-154,7
+156,7
@@
struct shm_object *_shm_object_table_alloc_shm(struct shm_object_table *table,
/* memory_map: mmap */
memory_map = mmap(NULL, memory_map_size, PROT_READ | PROT_WRITE,
/* memory_map: mmap */
memory_map = mmap(NULL, memory_map_size, PROT_READ | PROT_WRITE,
- MAP_SHARED, shmfd, 0);
+ MAP_SHARED
| LTTNG_MAP_POPULATE
, shmfd, 0);
if (memory_map == MAP_FAILED) {
PERROR("mmap");
goto error_mmap;
if (memory_map == MAP_FAILED) {
PERROR("mmap");
goto error_mmap;
@@
-327,11
+329,6
@@
struct shm_object *shm_object_table_append_shm(struct shm_object_table *table,
obj->shm_fd = shm_fd;
obj->shm_fd_ownership = 1;
obj->shm_fd = shm_fd;
obj->shm_fd_ownership = 1;
- ret = fcntl(obj->wait_fd[1], F_SETFD, FD_CLOEXEC);
- if (ret < 0) {
- PERROR("fcntl");
- goto error_fcntl;
- }
/* The write end of the pipe needs to be non-blocking */
ret = fcntl(obj->wait_fd[1], F_SETFL, O_NONBLOCK);
if (ret < 0) {
/* The write end of the pipe needs to be non-blocking */
ret = fcntl(obj->wait_fd[1], F_SETFL, O_NONBLOCK);
if (ret < 0) {
@@
-341,7
+338,7
@@
struct shm_object *shm_object_table_append_shm(struct shm_object_table *table,
/* memory_map: mmap */
memory_map = mmap(NULL, memory_map_size, PROT_READ | PROT_WRITE,
/* memory_map: mmap */
memory_map = mmap(NULL, memory_map_size, PROT_READ | PROT_WRITE,
- MAP_SHARED, shm_fd, 0);
+ MAP_SHARED
| LTTNG_MAP_POPULATE
, shm_fd, 0);
if (memory_map == MAP_FAILED) {
PERROR("mmap");
goto error_mmap;
if (memory_map == MAP_FAILED) {
PERROR("mmap");
goto error_mmap;
This page took
0.023542 seconds
and
4
git commands to generate.