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

comparison src/org/eclipse/jetty/io/nio/SelectorManager.java @ 950:a778413aefc0

add SaneSelector

author	Franklin Schmidt <fschmidt@gmail.com>
date	Wed, 12 Oct 2016 14:37:56 -0600
parents	e9088af3787f
children	e542a9cc75ef

comparison

equal deleted inserted replaced

-:e9088af3787f
+:a778413aefc0
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.Channel;
 import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Collections;
 		SelectSet[] sets = _selectSet;
 		if (sets!=null)
 		{
 			SelectSet set=sets[s];
 			set.addChange(channel);
-			set.wakeup();
 		}
 	}
 	/* ------------------------------------------------------------ */
 	/**
 	public class SelectSet implements Dumpable
 	{
 		private final int _setID;
 		private volatile long _now = System.currentTimeMillis();
-		private volatile Selector _selector;
+		private volatile SaneSelector _selector;
 		private volatile Thread _selecting;
 		private int _busySelects;
 		private long _monitorNext;
 		private boolean _pausing;
 			_setID=acceptorID;
 			_idleTick = System.currentTimeMillis();
 			// create a selector;
-			_selector = Selector.open();
+			_selector = new SaneSelector();
 			_monitorNext=System.currentTimeMillis()+__MONITOR_PERIOD;
 		}
 		private void addChange(SocketChannel channel)
 		{
 			try {
-				SelectionKey key = channel.register(_selector,SelectionKey.OP_READ,null);
+				SelectionKey key = _selector.register(channel,SelectionKey.OP_READ,null);
 				SelectChannelEndPoint endpoint = createEndPoint(channel,key);
 				key.attach(endpoint);
 				endpoint.schedule();
 			} catch(IOException e) {
 				LOG.warn("",e);
 		public void doSelect() throws IOException
 		{
 			try
 			{
 				_selecting=Thread.currentThread();
-				final Selector selector=_selector;
+				final SaneSelector selector = _selector;
 				// Stopped concurrently ?
 				if (selector == null)
 					return;
 				// Do and instant select to see if any connections can be handled.
-				int selected=selector.selectNow();
+//				int selected = selector.selectNow();
+				int selected = selector.select();
 				_now = System.currentTimeMillis();
+/*
 				// if no immediate things to do
 				if (selected==0 && selector.selectedKeys().isEmpty())
 				{
 					// If we are in pausing mode
 					if (_pausing)
 					{
 						try
 						{
 					// If we should wait with a select
 					if (wait>0)
 					{
 						long before = _now;
 						selector.select(wait);
+//						selector.select(10000L);
 						_now = System.currentTimeMillis();
 						// If we are monitoring for busy selector
 						// and this select did not wait more than 1ms
 						if (__MONITOR_PERIOD>0 && _now-before <=1)
 								}
 							}
 						}
 					}
 				}
+*/
 				// have we been destroyed while sleeping
 				if (_selector==null || !selector.isOpen())
 					return;
 				// Look for things to do
 				// Everything always handled
 				selector.selectedKeys().clear();
 				_now = System.currentTimeMillis();
+/*
 				// Idle tick
 				if (_now-_idleTick>__IDLE_TICK)
 				{
 					_idleTick = _now;
 						}
 						public String toString() {return "Idle-"+super.toString();}
 					});
 				}
+*/
 				// Reset busy select monitor counts
 				if (__MONITOR_PERIOD>0 && _now>_monitorNext)
 				{
 					_busySelects=0;
 					_pausing=false;
 		public long getNow()
 		{
 			return _now;
 		}
+/*
 		public void wakeup()
 		{
-			Selector selector = _selector;
+			SaneSelector selector = _selector;
 			if (selector!=null)
 				selector.wakeup();
 		}
+*/
 		private SelectChannelEndPoint createEndPoint(SocketChannel channel, SelectionKey sKey) throws IOException
 		{
 			SelectChannelEndPoint endp = new SelectChannelEndPoint(channel,this,sKey, _maxIdleTime);
 			endp.setConnection(getManager().newConnection(channel,endp, sKey.attachment()));
 			LOG.debug("created {}",endp);
 			LOG.debug("destroyEndPoint {}",endp);
 			_endPoints.remove(endp);
 			endp.getConnection().onClose();
 		}
-		Selector getSelector()
+		SaneSelector getSelector()
 		{
 			return _selector;
 		}
 		void stop() throws Exception
 		{
 			// Spin for a while waiting for selector to complete
 			// to avoid unneccessary closed channel exceptions
+/*
 			try
 			{
 				for (int i=0;i<100 && _selecting!=null;i++)
 				{
-					wakeup();
+					_selector.wakeup();
 					Thread.sleep(10);
 				}
 			}
 			catch(Exception e)
 			{
 				LOG.warn("",e);
 			}
+*/
 			// close endpoints and selector
 			synchronized (this)
 			{
-				Selector selector=_selector;
+				SaneSelector selector=_selector;
 				for (SelectionKey key:selector.keys())
 				{
 					if (key==null)
 						continue;
 					Object att=key.attachment();
 			AggregateLifeCycle.dump(out,indent,Collections.emptyList());
 		}
 		public String toString()
 		{
-			Selector selector=_selector;
+			SaneSelector 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);
 		}

Mercurial Hosting > luan

comparison src/org/eclipse/jetty/io/nio/SelectorManager.java @ 950:a778413aefc0