repo/luan: src/org/eclipse/jetty/io/nio/SelectorManager.java comparison

comparison src/org/eclipse/jetty/io/nio/SelectorManager.java @ 914:54308d65265a

simplify SelectorManager

author	Franklin Schmidt <fschmidt@gmail.com>
date	Sun, 09 Oct 2016 01:22:55 -0600
parents	6b210bb66c63
children	b77d631b9e28

comparison

equal deleted inserted replaced

-:17f4fe8271de
+:54308d65265a
 	private static final int __MAX_SELECTS=Integer.getInteger("org.eclipse.jetty.io.nio.MAX_SELECTS",100000).intValue();
 	private static final int __BUSY_PAUSE=Integer.getInteger("org.eclipse.jetty.io.nio.BUSY_PAUSE",50).intValue();
 	private static final int __IDLE_TICK=Integer.getInteger("org.eclipse.jetty.io.nio.IDLE_TICK",400).intValue();
 	private int _maxIdleTime;
-	private int _lowResourcesMaxIdleTime;
 	private long _lowResourcesConnections;
 	private SelectSet[] _selectSet;
 	private int _selectSets=1;
 	private volatile int _set=0;
-	private boolean _deferringInterestedOps0=true;
-	private int _selectorPriorityDelta=0;
 	/* ------------------------------------------------------------ */
 	/**
 	 * @param maxIdleTime The maximum period in milli seconds that a connection may be idle before it is closed.
 	 * @see #setLowResourcesMaxIdleTime(long)
 		SelectSet set=_selectSet[s];
 		set.addChange(acceptChannel);
 		set.wakeup();
 	}
-	/* ------------------------------------------------------------ */
-	/**
-	 * @return delta The value to add to the selector thread priority.
-	 */
-	public int getSelectorPriorityDelta()
-	{
-		return _selectorPriorityDelta;
-	}
-	/* ------------------------------------------------------------ */
-	/** Set the selector thread priorty delta.
-	 * @param delta The value to add to the selector thread priority.
-	 */
-	public void setSelectorPriorityDelta(int delta)
-	{
-		_selectorPriorityDelta=delta;
-	}
 	/* ------------------------------------------------------------ */
 	/**
 	 * @return the lowResourcesConnections
 	 */
 	public void setLowResourcesConnections(long lowResourcesConnections)
 	{
 		_lowResourcesConnections=(lowResourcesConnections+_selectSets-1)/_selectSets;
 	}
-	/* ------------------------------------------------------------ */
-	/**
-	 * @return the lowResourcesMaxIdleTime
-	 */
-	public long getLowResourcesMaxIdleTime()
-	{
-		return _lowResourcesMaxIdleTime;
-	}
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param lowResourcesMaxIdleTime the period in ms that a connection is allowed to be idle when this SelectSet has more connections than {@link #getLowResourcesConnections()}
-	 * @see #setMaxIdleTime(long)
-	 */
-	public void setLowResourcesMaxIdleTime(long lowResourcesMaxIdleTime)
-	{
-		_lowResourcesMaxIdleTime=(int)lowResourcesMaxIdleTime;
-	}
-	/* ------------------------------------------------------------------------------- */
 	public abstract void execute(Runnable task);
 	/* ------------------------------------------------------------ */
 	/* (non-Javadoc)
 	 * @see org.eclipse.component.AbstractLifeCycle#doStart()
 			execute(new Runnable()
 			{
 				public void run()
 				{
 					String name=Thread.currentThread().getName();
-					int priority=Thread.currentThread().getPriority();
 					try
 					{
 						SelectSet[] sets=_selectSet;
 						if (sets==null)
 							return;
 						SelectSet set=sets[id];
 						Thread.currentThread().setName(name+" Selector"+id);
-						if (getSelectorPriorityDelta()!=0)
-							Thread.currentThread().setPriority(Thread.currentThread().getPriority()+getSelectorPriorityDelta());
 						LOG.debug("Starting {} on {}",Thread.currentThread(),this);
 						while (isRunning())
 						{
 							try
 							{
 					}
 					finally
 					{
 						LOG.debug("Stopped {} on {}",Thread.currentThread(),this);
 						Thread.currentThread().setName(name);
-						if (getSelectorPriorityDelta()!=0)
-							Thread.currentThread().setPriority(priority);
 					}
 				}
 			});
 		}
 	/* ------------------------------------------------------------ */
 	/**
 	 * @param endpoint
 	 */
 	protected abstract void endPointClosed(SelectChannelEndPoint endpoint);
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param endpoint
-	 */
-	protected abstract void endPointOpened(SelectChannelEndPoint endpoint);
-	/* ------------------------------------------------------------ */
-	protected abstract void endPointUpgraded(ConnectedEndPoint endpoint,Connection oldConnection);
 	/* ------------------------------------------------------------------------------- */
 	public abstract AsyncConnection newConnection(SocketChannel channel, AsyncEndPoint endpoint, Object attachment);
 	/* ------------------------------------------------------------ */
 				if (now-_idleTick>__IDLE_TICK)
 				{
 					_idleTick=now;
 					final long idle_now=((_lowResourcesConnections>0 && selector.keys().size()>_lowResourcesConnections))
-						?(now+_maxIdleTime-_lowResourcesMaxIdleTime)
+						?(now+_maxIdleTime)
 						:now;
 					execute(new Runnable()
 					{
 						public void run()
 				_selecting=null;
 			}
 		}
-		/* ------------------------------------------------------------ */
 		private void renewSelector()
 		{
 			try
 			{
 				synchronized (this)
 			{
 				throw new RuntimeException("recreating selector",e);
 			}
 		}
-		/* ------------------------------------------------------------ */
 		public SelectorManager getManager()
 		{
 			return SelectorManager.this;
 		}
-		/* ------------------------------------------------------------ */
 		public long getNow()
 		{
 			return _timeout.getNow();
 		}
 			if (!(task instanceof Runnable))
 				throw new IllegalArgumentException("!Runnable");
 			_timeout.schedule(task, timeoutMs);
 		}
-		/* ------------------------------------------------------------ */
 		public void cancelTimeout(Timeout.Task task)
 		{
 			task.cancel();
 		}
-		/* ------------------------------------------------------------ */
 		public void wakeup()
 		{
 			try
 			{
 				Selector selector = _selector;
 				renewSelector();
 			}
 		}
-		/* ------------------------------------------------------------ */
 		private SelectChannelEndPoint createEndPoint(SocketChannel channel, SelectionKey sKey) throws IOException
 		{
 			SelectChannelEndPoint endp = newEndPoint(channel,this,sKey);
 			LOG.debug("created {}",endp);
-			endPointOpened(endp);
 			_endPoints.put(endp,this);
 			return endp;
 		}
-		/* ------------------------------------------------------------ */
 		public void destroyEndPoint(SelectChannelEndPoint endp)
 		{
 			LOG.debug("destroyEndPoint {}",endp);
 			_endPoints.remove(endp);
 			endPointClosed(endp);
 		}
-		/* ------------------------------------------------------------ */
 		Selector getSelector()
 		{
 			return _selector;
 		}
-		/* ------------------------------------------------------------ */
 		void stop() throws Exception
 		{
 			// Spin for a while waiting for selector to complete
 			// to avoid unneccessary closed channel exceptions
 			try
 				}
 				_selector=null;
 			}
 		}
-		/* ------------------------------------------------------------ */
 		public String dump()
 		{
 			return AggregateLifeCycle.dump(this);
 		}
-		/* ------------------------------------------------------------ */
 		public void dump(Appendable out, String indent) throws IOException
 		{
 			out.append(String.valueOf(this)).append(" id=").append(String.valueOf(_setID)).append("\n");
 			Thread selecting = _selecting;
 				AggregateLifeCycle.dump(out,indent,dump);
 			}
 		}
-		/* ------------------------------------------------------------ */
 		public void dumpKeyState(List<Object> dumpto)
 		{
 			Selector selector=_selector;
 			Set<SelectionKey> keys = selector.keys();
 			dumpto.add(selector + " keys=" + keys.size());
 				else
 					dumpto.add(key.attachment()+" iOps=-1 rOps=-1");
 			}
 		}
-		/* ------------------------------------------------------------ */
 		public String toString()
 		{
 			Selector selector=_selector;
 			return String.format("%s keys=%d selected=%d",
 					super.toString(),
 					selector != null && selector.isOpen() ? selector.keys().size() : -1,
 					selector != null && selector.isOpen() ? selector.selectedKeys().size() : -1);
 		}
 	}
-	/* ------------------------------------------------------------ */
 	private static class ChannelAndAttachment
 	{
 		final SelectableChannel _channel;
 		final Object _attachment;
 			_channel = channel;
 			_attachment = attachment;
 		}
 	}
-	/* ------------------------------------------------------------ */
-	public boolean isDeferringInterestedOps0()
-	{
-		return _deferringInterestedOps0;
-	}
-	/* ------------------------------------------------------------ */
-	public void setDeferringInterestedOps0(boolean deferringInterestedOps0)
-	{
-		_deferringInterestedOps0 = deferringInterestedOps0;
-	}
-	/* ------------------------------------------------------------ */
-	/* ------------------------------------------------------------ */
-	/* ------------------------------------------------------------ */
 	private interface ChangeTask extends Runnable
 	{}
 }

Mercurial Hosting > luan

comparison src/org/eclipse/jetty/io/nio/SelectorManager.java @ 914:54308d65265a