projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Fix: don't perform extra flush on metadata channel"
[lttng-modules.git]
/
lib
/
ringbuffer
/
frontend_types.h
diff --git
a/lib/ringbuffer/frontend_types.h
b/lib/ringbuffer/frontend_types.h
index 46bf8d27efda7741fc407e79c0553bdff6ab9702..50b33ac11c85f70856b8dc4f38810df02d346fe9 100644
(file)
--- a/
lib/ringbuffer/frontend_types.h
+++ b/
lib/ringbuffer/frontend_types.h
@@
-33,6
+33,7
@@
#include <wrapper/ringbuffer/backend_types.h>
#include <wrapper/spinlock.h>
#include <lib/prio_heap/lttng_prio_heap.h> /* For per-CPU read-side iterator */
#include <wrapper/ringbuffer/backend_types.h>
#include <wrapper/spinlock.h>
#include <lib/prio_heap/lttng_prio_heap.h> /* For per-CPU read-side iterator */
+#include <lttng-cpuhotplug.h>
/*
* A switch is done during tracing or as a final flush after tracing (so it
/*
* A switch is done during tracing or as a final flush after tracing (so it
@@
-69,11
+70,17
@@
struct channel {
unsigned long switch_timer_interval; /* Buffer flush (jiffies) */
unsigned long read_timer_interval; /* Reader wakeup (jiffies) */
unsigned long switch_timer_interval; /* Buffer flush (jiffies) */
unsigned long read_timer_interval; /* Reader wakeup (jiffies) */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0))
+ struct lttng_cpuhp_node cpuhp_prepare;
+ struct lttng_cpuhp_node cpuhp_online;
+ struct lttng_cpuhp_node cpuhp_iter_online;
+#else
struct notifier_block cpu_hp_notifier; /* CPU hotplug notifier */
struct notifier_block cpu_hp_notifier; /* CPU hotplug notifier */
- struct notifier_block tick_nohz_notifier; /* CPU nohz notifier */
struct notifier_block hp_iter_notifier; /* hotplug iterator notifier */
unsigned int cpu_hp_enable:1; /* Enable CPU hotplug notif. */
unsigned int hp_iter_enable:1; /* Enable hp iter notif. */
struct notifier_block hp_iter_notifier; /* hotplug iterator notifier */
unsigned int cpu_hp_enable:1; /* Enable CPU hotplug notif. */
unsigned int hp_iter_enable:1; /* Enable hp iter notif. */
+#endif
+ struct notifier_block tick_nohz_notifier; /* CPU nohz notifier */
wait_queue_head_t read_wait; /* reader wait queue */
wait_queue_head_t hp_wait; /* CPU hotplug wait queue */
int finalized; /* Has channel been finalized */
wait_queue_head_t read_wait; /* reader wait queue */
wait_queue_head_t hp_wait; /* CPU hotplug wait queue */
int finalized; /* Has channel been finalized */
@@
-152,7
+159,8
@@
struct lib_ring_buffer {
unsigned long cons_snapshot; /* Consumer count snapshot */
unsigned int get_subbuf:1, /* Sub-buffer being held by reader */
switch_timer_enabled:1, /* Protected by ring_buffer_nohz_lock */
unsigned long cons_snapshot; /* Consumer count snapshot */
unsigned int get_subbuf:1, /* Sub-buffer being held by reader */
switch_timer_enabled:1, /* Protected by ring_buffer_nohz_lock */
- read_timer_enabled:1; /* Protected by ring_buffer_nohz_lock */
+ read_timer_enabled:1, /* Protected by ring_buffer_nohz_lock */
+ quiescent:1;
};
static inline
};
static inline
@@
-161,6
+169,8
@@
void *channel_get_private(struct channel *chan)
return chan->backend.priv;
}
return chan->backend.priv;
}
+void lib_ring_buffer_lost_event_too_big(struct channel *chan);
+
/*
* Issue warnings and disable channels upon internal error.
* Can receive struct lib_ring_buffer or struct lib_ring_buffer_backend
/*
* Issue warnings and disable channels upon internal error.
* Can receive struct lib_ring_buffer or struct lib_ring_buffer_backend
This page took
0.029711 seconds
and
4
git commands to generate.