projects
/
deliverable
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move to kernel style SPDX license identifiers
[deliverable/lttng-ust.git]
/
libringbuffer
/
shm_types.h
diff --git
a/libringbuffer/shm_types.h
b/libringbuffer/shm_types.h
index 52348443f4b99549d49ba1ee3dc06007239d94f7..896474fcad2c2fa56851450c23688b6b160facc2 100644
(file)
--- a/
libringbuffer/shm_types.h
+++ b/
libringbuffer/shm_types.h
@@
-1,27
+1,33
@@
-#ifndef _LIBRINGBUFFER_SHM_TYPES_H
-#define _LIBRINGBUFFER_SHM_TYPES_H
-
/*
/*
- *
libringbuffer/shm_types.h
+ *
SPDX-License-Identifier: LGPL-2.1-only
*
*
- * Copyright 2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
*/
+#ifndef _LIBRINGBUFFER_SHM_TYPES_H
+#define _LIBRINGBUFFER_SHM_TYPES_H
+
#include <stdint.h>
#include <stdint.h>
+#include <stddef.h>
+#include <limits.h>
#include "shm_internal.h"
struct channel;
#include "shm_internal.h"
struct channel;
+enum shm_object_type {
+ SHM_OBJECT_SHM,
+ SHM_OBJECT_MEM,
+};
+
struct shm_object {
struct shm_object {
+ enum shm_object_type type;
size_t index; /* within the object table */
int shm_fd; /* shm fd */
int wait_fd[2]; /* fd for wait/wakeup */
char *memory_map;
size_t index; /* within the object table */
int shm_fd; /* shm fd */
int wait_fd[2]; /* fd for wait/wakeup */
char *memory_map;
-
int is_shadow
;
- uint64_t
memory_map_size
;
-
size_t allocated_len
;
+
size_t memory_map_size
;
+ uint64_t
allocated_len
;
+
int shm_fd_ownership
;
};
struct shm_object_table {
};
struct shm_object_table {
@@
-33,12
+39,6
@@
struct shm_object_table {
struct lttng_ust_shm_handle {
struct shm_object_table *table;
DECLARE_SHMP(struct channel, chan);
struct lttng_ust_shm_handle {
struct shm_object_table *table;
DECLARE_SHMP(struct channel, chan);
- /*
- * In the consumer, chan points to a shadow copy, validated upon
- * reception. The chan object is overridden in the consumer to
- * point to this shadow copy.
- */
- struct channel *shadow_chan;
};
#endif /* _LIBRINGBUFFER_SHM_TYPES_H */
};
#endif /* _LIBRINGBUFFER_SHM_TYPES_H */
This page took
0.025764 seconds
and
5
git commands to generate.