projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set the default ust constructor timeout in the headers
[lttng-ust.git]
/
libcounter
/
shm.c
diff --git
a/libcounter/shm.c
b/libcounter/shm.c
index efebbd0ebdc2ccd1e6e84520b078db66d1982b38..70651e6a44ee38876d642da34fa6dba72967f556 100644
(file)
--- a/
libcounter/shm.c
+++ b/
libcounter/shm.c
@@
-5,7
+5,6
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <config.h>
#include "shm.h"
#include <unistd.h>
#include <fcntl.h>
#include "shm.h"
#include <unistd.h>
#include <fcntl.h>
@@
-17,15
+16,18
@@
#include <stdio.h>
#include <signal.h>
#include <dirent.h>
#include <stdio.h>
#include <signal.h>
#include <dirent.h>
-#include <lttng/align.h>
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
+
#ifdef HAVE_LIBNUMA
#include <numa.h>
#include <numaif.h>
#endif
#ifdef HAVE_LIBNUMA
#include <numa.h>
#include <numaif.h>
#endif
-#include <helper.h>
+
+#include <lttng/ust-align.h>
+
+#include <ust-helper.h>
#include <ust-fd.h>
#include "../libringbuffer/mmap.h"
#include <ust-fd.h>
#include "../libringbuffer/mmap.h"
@@
-368,6
+370,6
@@
struct lttng_counter_shm_ref lttng_counter_zalloc_shm(struct lttng_counter_shm_o
void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align)
{
void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align)
{
- size_t offset_len = offset_align(obj->allocated_len, align);
+ size_t offset_len =
lttng_ust_
offset_align(obj->allocated_len, align);
obj->allocated_len += offset_len;
}
obj->allocated_len += offset_len;
}
This page took
0.023962 seconds
and
4
git commands to generate.