You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2016/02/12 03:50:50 UTC
trafficserver git commit: TS-4178: Memory leak in SplitDNSConfig when
shutting down
Repository: trafficserver
Updated Branches:
refs/heads/master 734940001 -> bf4c99005
TS-4178: Memory leak in SplitDNSConfig when shutting down
This closes #464
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bf4c9900
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bf4c9900
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bf4c9900
Branch: refs/heads/master
Commit: bf4c990052bcca88ae01e2906d219b0b570e3f5d
Parents: 7349400
Author: Bryan Call <bc...@apache.org>
Authored: Thu Feb 11 18:50:41 2016 -0800
Committer: Bryan Call <bc...@apache.org>
Committed: Thu Feb 11 18:50:41 2016 -0800
----------------------------------------------------------------------
iocore/dns/I_SplitDNSProcessor.h | 1 +
iocore/dns/SplitDNS.cc | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf4c9900/iocore/dns/I_SplitDNSProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/dns/I_SplitDNSProcessor.h b/iocore/dns/I_SplitDNSProcessor.h
index dd7f260..bbb7a48 100644
--- a/iocore/dns/I_SplitDNSProcessor.h
+++ b/iocore/dns/I_SplitDNSProcessor.h
@@ -50,6 +50,7 @@ struct SplitDNSConfig {
static int m_id;
static Ptr<ProxyMutex> dnsHandler_mutex;
+ static ConfigUpdateHandler<SplitDNSConfig> *splitDNSUpdate;
static int gsplit_dns_enabled;
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bf4c9900/iocore/dns/SplitDNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index 6ca614f..a3c92b4 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -47,7 +47,7 @@
-------------------------------------------------------------- */
static const char modulePrefix[] = "[SplitDNS]";
-static ConfigUpdateHandler<SplitDNSConfig> *splitDNSUpdate;
+ConfigUpdateHandler<SplitDNSConfig> *SplitDNSConfig::splitDNSUpdate = NULL;
static ClassAllocator<DNSRequestData> DNSReqAllocator("DNSRequestDataAllocator");
@@ -130,8 +130,8 @@ SplitDNSConfig::startup()
// startup just check gsplit_dns_enabled
REC_ReadConfigInt32(gsplit_dns_enabled, "proxy.config.dns.splitDNS.enabled");
- splitDNSUpdate = new ConfigUpdateHandler<SplitDNSConfig>();
- splitDNSUpdate->attach("proxy.config.cache.splitdns.filename");
+ SplitDNSConfig::splitDNSUpdate = new ConfigUpdateHandler<SplitDNSConfig>();
+ SplitDNSConfig::splitDNSUpdate->attach("proxy.config.cache.splitdns.filename");
}