summaryrefslogtreecommitdiffstats
path: root/src/pulsecore
diff options
context:
space:
mode:
Diffstat (limited to 'src/pulsecore')
-rw-r--r--src/pulsecore/memtrap.c38
-rw-r--r--src/pulsecore/memtrap.h2
2 files changed, 17 insertions, 23 deletions
diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index 49042537..a6ae510f 100644
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -154,21 +154,6 @@ pa_memtrap* pa_memtrap_add(const void *start, size_t size) {
lock = pa_static_mutex_get(&write_lock, FALSE, FALSE);
pa_mutex_lock(lock);
- if (!memtraps[0]) {
- struct sigaction sa;
-
- /* Before we install the signal handler, make sure the
- * semaphore is valid so that the initialization of the
- * semaphore doesn't have to happen from the signal handler */
- pa_static_semaphore_get(&semaphore, 0);
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_sigaction = signal_handler;
- sa.sa_flags = SA_RESTART|SA_SIGINFO;
-
- pa_assert_se(sigaction(SIGBUS, &sa, NULL) == 0);
- }
-
n = (unsigned) pa_atomic_load(&read_lock);
j = WHICH(n);
@@ -204,14 +189,6 @@ void pa_memtrap_remove(pa_memtrap *m) {
pa_xfree(m);
- if (!memtraps[0]) {
- struct sigaction sa;
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = SIG_DFL;
- pa_assert_se(sigaction(SIGBUS, &sa, NULL) == 0);
- }
-
pa_mutex_unlock(lock);
}
@@ -255,3 +232,18 @@ unlock:
return m;
}
+
+void pa_memtrap_install(void) {
+ struct sigaction sa;
+
+ /* Before we install the signal handler, make sure the semaphore
+ * is valid so that the initialization of the semaphore
+ * doesn't have to happen from the signal handler */
+ pa_static_semaphore_get(&semaphore, 0);
+
+ memset(&sa, 0, sizeof(sa));
+ sa.sa_sigaction = signal_handler;
+ sa.sa_flags = SA_RESTART|SA_SIGINFO;
+
+ pa_assert_se(sigaction(SIGBUS, &sa, NULL) == 0);
+}
diff --git a/src/pulsecore/memtrap.h b/src/pulsecore/memtrap.h
index d93d6720..6cad296c 100644
--- a/src/pulsecore/memtrap.h
+++ b/src/pulsecore/memtrap.h
@@ -35,4 +35,6 @@ void pa_memtrap_remove(pa_memtrap *m);
pa_bool_t pa_memtrap_is_good(pa_memtrap *m);
+void pa_memtrap_install(void);
+
#endif