summaryrefslogtreecommitdiff
path: root/qpid/cpp/include
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2016-04-05 16:13:24 +0000
committerAlan Conway <aconway@apache.org>2016-04-05 16:13:24 +0000
commitc9f1b7641fa089eca017a543991485be5de35775 (patch)
tree93604b752bdaf1f4415bc6d66ed1a6a9245a9e4a /qpid/cpp/include
parent77a319a41c90efeabbfe42b7b85d6c7ac30a68e6 (diff)
downloadqpid-python-c9f1b7641fa089eca017a543991485be5de35775.tar.gz
QPID-7149: Active HA broker memory leak
The leak was caused by the sys::Poller. When two pollers run in the same process and one is idles, PollerHandles accumulate on the idle poller threads and are never released. The HA broker uses the qpid::messaging API to get initial status from other brokers. The messaging API creates a separate Poller from the broker. The fix is to shut down the qpid::messaging poller as soon as initial status checks are complete so it does not interfere with the broker's Poller. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1737852 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/include')
-rw-r--r--qpid/cpp/include/qpid/messaging/shutdown.h38
1 files changed, 38 insertions, 0 deletions
diff --git a/qpid/cpp/include/qpid/messaging/shutdown.h b/qpid/cpp/include/qpid/messaging/shutdown.h
new file mode 100644
index 0000000000..7744630f13
--- /dev/null
+++ b/qpid/cpp/include/qpid/messaging/shutdown.h
@@ -0,0 +1,38 @@
+#ifndef QPID_MESSAGING_SHUTDOWN_H
+#define QPID_MESSAGING_SHUTDOWN_H
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include "qpid/messaging/ImportExport.h"
+
+namespace qpid {
+namespace messaging {
+
+/** Shut down the qpid::messaging library, clean up resources and stop background threads.
+ * Note you cannot use any of the qpid::messaging classes or functions after calling this.
+ *
+ * It is is not normally necessary to call this, the library cleans up automatically on process exit.
+ * You can use it to clean up resources early in unusual situations.
+ */
+QPID_MESSAGING_EXTERN void shutdown();
+
+}}
+
+#endif // QPID_MESSAGING_SHUTDOWN_H