debian-packages/vibe-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Always compute TCPConnection.xxxAddress on demand.

Browse source 
Storing the network addresses becomes too expensive with UNIX socket support.
This commit is contained in:
Sönke Ludwig 2017-03-10 21:06:18 +01:00
parent ed8b33786b
commit 5fd9fc4007
No known key found for this signature in database
GPG key ID: D95E8DB493EE314C
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/vibe/core/net.d
View file

@ -448,8 +448,6 @@ struct TCPConnection {
bool tcpNoDelay = false; bool tcpNoDelay = false;
bool keepAlive = false; bool keepAlive = false;
Duration readTimeout = Duration.max; Duration readTimeout = Duration.max;
NetworkAddress remoteAddress;
NetworkAddress localAddress;
string remoteAddressString; string remoteAddressString;
} }
@ -465,13 +463,6 @@ struct TCPConnection {
m_socket = socket; m_socket = socket;
m_context = () @trusted { return &eventDriver.core.userData!Context(socket); } (); m_context = () @trusted { return &eventDriver.core.userData!Context(socket); } ();
m_context.readBuffer.capacity = 4096; m_context.readBuffer.capacity = 4096;
try m_context.remoteAddress = NetworkAddress(remote_address);
catch (Exception e) { logWarn("Failed to get remote address for TCP connection: %s", e.msg); }
scope laddr = new RefAddress(m_context.localAddress.sockAddr, m_context.localAddress.sockAddrMaxLen);
try {
enforce(eventDriver.sockets.getLocalAddress(socket, laddr), "Failed to query socket address.");
m_context.localAddress = NetworkAddress(laddr);
} catch (Exception e) { logWarn("Failed to get local address for TCP connection: %s", e.msg); }
} }
this(this) this(this)
@ -494,9 +485,23 @@ struct TCPConnection {
@property bool keepAlive() const nothrow { return m_context.keepAlive; } @property bool keepAlive() const nothrow { return m_context.keepAlive; }
@property void readTimeout(Duration duration) { m_context.readTimeout = duration; } @property void readTimeout(Duration duration) { m_context.readTimeout = duration; }
@property Duration readTimeout() const nothrow { return m_context.readTimeout; } @property Duration readTimeout() const nothrow { return m_context.readTimeout; }
@property string peerAddress() const nothrow { return m_context.remoteAddress.toString(); } @property string peerAddress() const nothrow { return this.remoteAddress.toString(); }
@property NetworkAddress localAddress() const nothrow { return m_context.localAddress; } @property NetworkAddress localAddress() const nothrow {
@property NetworkAddress remoteAddress() const nothrow { return m_context.remoteAddress; } NetworkAddress naddr;
scope addr = new RefAddress(naddr.sockAddr, naddr.sockAddrMaxLen);
try {
enforce(eventDriver.sockets.getLocalAddress(m_socket, addr), "Failed to query socket address.");
} catch (Exception e) { logWarn("Failed to get local address for TCP connection: %s", e.msg); }
return naddr;
}
@property NetworkAddress remoteAddress() const nothrow {
NetworkAddress naddr;
scope addr = new RefAddress(naddr.sockAddr, naddr.sockAddrMaxLen);
try {
enforce(eventDriver.sockets.getRemoteAddress(m_socket, addr), "Failed to query socket address.");
} catch (Exception e) { logWarn("Failed to get remote address for TCP connection: %s", e.msg); }
return naddr;
}
@property bool connected() @property bool connected()
const nothrow { const nothrow {
if (m_socket == StreamSocketFD.invalid) return false; if (m_socket == StreamSocketFD.invalid) return false;