Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1835 reentrant lock in AbstractConnector.

This commit is contained in:
Greg Wilkins 2017-09-22 12:45:14 +10:00
parent 7768a781be
commit 0fa8c565bd
1 changed files with 78 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -363,7 +363,6 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
_setAccepting.signalAll(); _setAccepting.signalAll();
} }
} }
@Override @Override
public ConnectionFactory getConnectionFactory(String protocol) public ConnectionFactory getConnectionFactory(String protocol)
@ -388,108 +387,105 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
public void addConnectionFactory(ConnectionFactory factory) public void addConnectionFactory(ConnectionFactory factory)
{ {
try (Locker.Lock lock = _locker.lock()) if (isRunning())
throw new IllegalStateException(getState());
Set<ConnectionFactory> to_remove = new HashSet<>();
for (String key:factory.getProtocols())
{ {
Set<ConnectionFactory> to_remove = new HashSet<>(); key=StringUtil.asciiToLowerCase(key);
for (String key:factory.getProtocols()) ConnectionFactory old=_factories.remove(key);
if (old!=null)
{ {
key=StringUtil.asciiToLowerCase(key); if (old.getProtocol().equals(_defaultProtocol))
ConnectionFactory old=_factories.remove(key); _defaultProtocol=null;
if (old!=null) to_remove.add(old);
{
if (old.getProtocol().equals(_defaultProtocol))
_defaultProtocol=null;
to_remove.add(old);
}
_factories.put(key, factory);
} }
_factories.put(key, factory);
// keep factories still referenced
for (ConnectionFactory f : _factories.values())
to_remove.remove(f);
// remove old factories
for (ConnectionFactory old: to_remove)
{
removeBean(old);
if (LOG.isDebugEnabled())
LOG.debug("{} removed {}", this, old);
}
// add new Bean
addBean(factory);
if (_defaultProtocol==null)
_defaultProtocol=factory.getProtocol();
if (LOG.isDebugEnabled())
LOG.debug("{} added {}", this, factory);
} }
// keep factories still referenced
for (ConnectionFactory f : _factories.values())
to_remove.remove(f);
// remove old factories
for (ConnectionFactory old: to_remove)
{
removeBean(old);
if (LOG.isDebugEnabled())
LOG.debug("{} removed {}", this, old);
}
// add new Bean
addBean(factory);
if (_defaultProtocol==null)
_defaultProtocol=factory.getProtocol();
if (LOG.isDebugEnabled())
LOG.debug("{} added {}", this, factory);
} }
public void addFirstConnectionFactory(ConnectionFactory factory) public void addFirstConnectionFactory(ConnectionFactory factory)
{ {
try (Locker.Lock lock = _locker.lock()) if (isRunning())
{ throw new IllegalStateException(getState());
List<ConnectionFactory> existings = new ArrayList<>(_factories.values());
_factories.clear(); List<ConnectionFactory> existings = new ArrayList<>(_factories.values());
addConnectionFactory(factory); _factories.clear();
for (ConnectionFactory existing : existings) addConnectionFactory(factory);
addConnectionFactory(existing); for (ConnectionFactory existing : existings)
_defaultProtocol = factory.getProtocol(); addConnectionFactory(existing);
} _defaultProtocol = factory.getProtocol();
} }
public void addIfAbsentConnectionFactory(ConnectionFactory factory) public void addIfAbsentConnectionFactory(ConnectionFactory factory)
{ {
try (Locker.Lock lock = _locker.lock()) if (isRunning())
throw new IllegalStateException(getState());
String key=StringUtil.asciiToLowerCase(factory.getProtocol());
if (_factories.containsKey(key))
{ {
String key=StringUtil.asciiToLowerCase(factory.getProtocol()); if (LOG.isDebugEnabled())
if (_factories.containsKey(key)) LOG.debug("{} addIfAbsent ignored {}", this, factory);
{ }
if (LOG.isDebugEnabled()) else
LOG.debug("{} addIfAbsent ignored {}", this, factory); {
} _factories.put(key, factory);
else addBean(factory);
{ if (_defaultProtocol==null)
_factories.put(key, factory); _defaultProtocol=factory.getProtocol();
addBean(factory); if (LOG.isDebugEnabled())
if (_defaultProtocol==null) LOG.debug("{} addIfAbsent added {}", this, factory);
_defaultProtocol=factory.getProtocol();
if (LOG.isDebugEnabled())
LOG.debug("{} addIfAbsent added {}", this, factory);
}
} }
} }
public ConnectionFactory removeConnectionFactory(String protocol) public ConnectionFactory removeConnectionFactory(String protocol)
{ {
try (Locker.Lock lock = _locker.lock()) if (isRunning())
{ throw new IllegalStateException(getState());
ConnectionFactory factory= _factories.remove(StringUtil.asciiToLowerCase(protocol));
removeBean(factory); ConnectionFactory factory= _factories.remove(StringUtil.asciiToLowerCase(protocol));
return factory; removeBean(factory);
} return factory;
} }
@Override @Override
public Collection<ConnectionFactory> getConnectionFactories() public Collection<ConnectionFactory> getConnectionFactories()
{ {
try (Locker.Lock lock = _locker.lock()) return _factories.values();
{
return _factories.values();
}
} }
public void setConnectionFactories(Collection<ConnectionFactory> factories) public void setConnectionFactories(Collection<ConnectionFactory> factories)
{ {
try (Locker.Lock lock = _locker.lock()) if (isRunning())
{ throw new IllegalStateException(getState());
List<ConnectionFactory> existing = new ArrayList<>(_factories.values());
for (ConnectionFactory factory: existing) List<ConnectionFactory> existing = new ArrayList<>(_factories.values());
removeConnectionFactory(factory.getProtocol()); for (ConnectionFactory factory: existing)
for (ConnectionFactory factory: factories) removeConnectionFactory(factory.getProtocol());
if (factory!=null) for (ConnectionFactory factory: factories)
addConnectionFactory(factory); if (factory!=null)
} addConnectionFactory(factory);
} }
@ManagedAttribute("The priority delta to apply to acceptor threads") @ManagedAttribute("The priority delta to apply to acceptor threads")
@ -521,18 +517,15 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
@ManagedAttribute("Protocols supported by this connector") @ManagedAttribute("Protocols supported by this connector")
public List<String> getProtocols() public List<String> getProtocols()
{ {
synchronized (_factories) return new ArrayList<>(_factories.keySet());
{
return new ArrayList<>(_factories.keySet());
}
} }
public void clearConnectionFactories() public void clearConnectionFactories()
{ {
synchronized (_factories) if (isRunning())
{ throw new IllegalStateException(getState());
_factories.clear();
} _factories.clear();
} }
@ManagedAttribute("This connector's default protocol") @ManagedAttribute("This connector's default protocol")
@ -616,10 +609,7 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
if (_acceptorPriorityDelta!=0) if (_acceptorPriorityDelta!=0)
thread.setPriority(Math.max(Thread.MIN_PRIORITY,Math.min(Thread.MAX_PRIORITY,priority+_acceptorPriorityDelta))); thread.setPriority(Math.max(Thread.MIN_PRIORITY,Math.min(Thread.MAX_PRIORITY,priority+_acceptorPriorityDelta)));
synchronized (AbstractConnector.this) _acceptors[_id] = thread;
{
_acceptors[_id] = thread;
}
try try
{ {
@ -676,26 +666,6 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
} }
// protected void connectionOpened(Connection connection)
// {
// _stats.connectionOpened();
// connection.onOpen();
// }
//
// protected void connectionClosed(Connection connection)
// {
// connection.onClose();
// long duration = System.currentTimeMillis() - connection.getEndPoint().getCreatedTimeStamp();
// _stats.connectionClosed(duration, connection.getMessagesIn(), connection.getMessagesOut());
// }
//
// public void connectionUpgraded(Connection oldConnection, Connection newConnection)
// {
// oldConnection.onClose();
// _stats.connectionUpgraded(oldConnection.getMessagesIn(), oldConnection.getMessagesOut());
// newConnection.onOpen();
// }
@Override @Override
public Collection<EndPoint> getConnectedEndPoints() public Collection<EndPoint> getConnectedEndPoints()
{ {