Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-01 11:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced PushCacheFilter

Browse Source 
Can learn associations from if-modified-since requests
has __renewPushCache__ special URI to renew associations HACK!
This commit is contained in:
Greg Wilkins 2014-09-21 15:02:40 +10:00
parent 51631c2a46
commit 580c87bcc6
1 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
View File

@ -65,7 +65,8 @@ public class PushCacheFilter implements Filter
private static final Logger LOG = Log.getLogger(PushCacheFilter.class); private static final Logger LOG = Log.getLogger(PushCacheFilter.class);
private final ConcurrentMap<String, PrimaryResource> _cache = new ConcurrentHashMap<>(); private final ConcurrentMap<String, PrimaryResource> _cache = new ConcurrentHashMap<>();
private long _associatePeriod = 2000L; private long _associatePeriod = 4000L;
private volatile long _renew = System.nanoTime();
@Override @Override
public void init(FilterConfig config) throws ServletException public void init(FilterConfig config) throws ServletException
@ -78,6 +79,7 @@ public class PushCacheFilter implements Filter
@Override @Override
public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException
{ {
long now=System.nanoTime();
HttpServletRequest request = (HttpServletRequest)req; HttpServletRequest request = (HttpServletRequest)req;
if (Boolean.TRUE==req.getAttribute("org.eclipse.jetty.pushed")) if (Boolean.TRUE==req.getAttribute("org.eclipse.jetty.pushed"))
@ -86,7 +88,6 @@ public class PushCacheFilter implements Filter
chain.doFilter(req,resp); chain.doFilter(req,resp);
return; return;
} }
// Iterating over fields is more efficient than multiple gets // Iterating over fields is more efficient than multiple gets
HttpFields fields = Request.getBaseRequest(req).getHttpFields(); HttpFields fields = Request.getBaseRequest(req).getHttpFields();
@ -120,66 +121,80 @@ public class PushCacheFilter implements Filter
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("{} {} referrer={} conditional={}", request.getMethod(), request.getRequestURI(), referrer, conditional); LOG.debug("{} {} referrer={} conditional={}", request.getMethod(), request.getRequestURI(), referrer, conditional);
if (!conditional) String path = URIUtil.addPaths(request.getServletPath(), request.getPathInfo());
if (path.endsWith("__renewPushCache__"))
{ {
String path = URIUtil.addPaths(request.getServletPath(), request.getPathInfo()); if (LOG.isDebugEnabled())
LOG.debug("Renew {}", now);
_renew=now;
}
if (referrer != null) if (referrer != null)
{
HttpURI referrerURI = new HttpURI(referrer);
if (request.getServerName().equals(referrerURI.getHost()) &&
request.getServerPort() == referrerURI.getPort())
{ {
HttpURI referrerURI = new HttpURI(referrer); String referrerPath = referrerURI.getPath();
if (request.getServerName().equals(referrerURI.getHost()) && if (referrerPath.startsWith(request.getContextPath()))
request.getServerPort() == referrerURI.getPort())
{ {
String referrerPath = referrerURI.getPath(); String referrerPathNoContext = referrerPath.substring(request.getContextPath().length());
if (referrerPath.startsWith(request.getContextPath())) PrimaryResource primaryResource = _cache.get(referrerPathNoContext);
if (primaryResource != null)
{ {
String referrerPathNoContext = referrerPath.substring(request.getContextPath().length()); long primaryTimestamp = primaryResource._timestamp.get();
PrimaryResource primaryResource = _cache.get(referrerPathNoContext); if (primaryTimestamp != 0)
if (primaryResource != null)
{ {
long primaryTimestamp = primaryResource._timestamp.get(); RequestDispatcher dispatcher = request.getServletContext().getRequestDispatcher(path);
if (primaryTimestamp != 0) if (now - primaryTimestamp < TimeUnit.MILLISECONDS.toNanos(_associatePeriod))
{ {
RequestDispatcher dispatcher = request.getServletContext().getRequestDispatcher(path); if (primaryResource._associated.putIfAbsent(path, dispatcher) == null)
if (System.nanoTime() - primaryTimestamp < TimeUnit.MILLISECONDS.toNanos(_associatePeriod))
{
if (primaryResource._associated.putIfAbsent(path, dispatcher) == null)
{
if (LOG.isDebugEnabled())
LOG.debug("Associated {} -> {}", referrerPathNoContext, dispatcher);
}
}
else
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Not associated {} -> {}, outside associate period of {}ms", referrerPathNoContext, dispatcher, _associatePeriod); LOG.debug("Associated {} -> {}", referrerPathNoContext, dispatcher);
} }
} }
else
{
if (LOG.isDebugEnabled())
LOG.debug("Not associated {} -> {}, outside associate period of {}ms", referrerPathNoContext, dispatcher, _associatePeriod);
}
} }
} }
} }
} }
}
// Push some resources? // Push some resources?
PrimaryResource primaryResource = _cache.get(path); PrimaryResource primaryResource = _cache.get(path);
if (primaryResource == null) if (primaryResource == null)
{
PrimaryResource t = new PrimaryResource();
primaryResource = _cache.putIfAbsent(path, t);
primaryResource = primaryResource == null ? t : primaryResource;
primaryResource._timestamp.compareAndSet(0, now);
if (LOG.isDebugEnabled())
LOG.debug("Cached {}", path);
}
else
{
long last=primaryResource._timestamp.get();
if (last<_renew && primaryResource._timestamp.compareAndSet(last, now))
{ {
PrimaryResource t = new PrimaryResource(); primaryResource._associated.clear();
primaryResource = _cache.putIfAbsent(path, t);
primaryResource = primaryResource == null ? t : primaryResource;
primaryResource._timestamp.compareAndSet(0, System.nanoTime());
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Cached {}", path); LOG.debug("Clear associated {}", path);
} }
}
if (!primaryResource._associated.isEmpty()) // Push associated for non conditional
if (!conditional && !primaryResource._associated.isEmpty())
{
for (RequestDispatcher dispatcher : primaryResource._associated.values())
{ {
for (RequestDispatcher dispatcher : primaryResource._associated.values()) if (LOG.isDebugEnabled())
{ LOG.debug("Pushing {} <- {}", dispatcher, path);
if (LOG.isDebugEnabled()) ((Dispatcher)dispatcher).push(request);
LOG.debug("Pushing {} <- {}", dispatcher, path);
((Dispatcher)dispatcher).push(request);
}
} }
} }