review IDManager classes + few improvements

lecousin · lecousin · commit 6b7100d25cd4 · 2018-11-18T10:18:43.000+01:00
diff --git a/core.javaee/src/main/java/net/lecousin/core/javaee/BootstrapServlet.java b/core.javaee/src/main/java/net/lecousin/core/javaee/BootstrapServlet.java
@@ -90,7 +90,8 @@ public void init() throws ServletException {
 			properties,
 			debugMode,
 			threadFactory,
-			new DefaultLibrariesManager()
+			new DefaultLibrariesManager(),
+			null
 		);
 	}
 	
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/application/Application.java b/net.lecousin.core/src/main/java/net/lecousin/framework/application/Application.java
@@ -34,6 +34,7 @@
 import net.lecousin.framework.locale.LocalizedProperties;
 import net.lecousin.framework.log.Logger;
 import net.lecousin.framework.log.LoggerFactory;
+import net.lecousin.framework.log.appenders.Appender;
 import net.lecousin.framework.util.AsyncCloseable;
 import net.lecousin.framework.util.ObjectUtil;
 import net.lecousin.framework.util.Pair;
@@ -274,7 +275,8 @@ public static ISynchronizationPoint<Exception> start(
 		Map<String,String> properties,
 		boolean debugMode,
 		ThreadFactory threadFactory,
-		LibrariesManager librariesManager
+		LibrariesManager librariesManager,
+		Appender defaultLogAppender
 	) {
 		Application app = new Application(artifact, commandLineArguments, properties, debugMode, threadFactory, librariesManager);
 		
@@ -307,8 +309,10 @@ public static ISynchronizationPoint<Exception> start(
 			c.out("-----------------------------------------");
 		}
 		
+		LCCore.initEnvironment();
+		
 		// init logging
-		app.loggerFactory = new LoggerFactory(app);
+		app.loggerFactory = new LoggerFactory(app, defaultLogAppender);
 		
 		// init LCCore with this application
 		LCCore.start(app);
@@ -355,7 +359,7 @@ public static ISynchronizationPoint<Exception> start(Artifact artifact, boolean
 	
 	/** Method to call at the beginning of the application, typically in the main method. */
 	public static ISynchronizationPoint<Exception> start(Artifact artifact, String[] args, boolean debugMode) {
-		return start(artifact, args, null, debugMode, Executors.defaultThreadFactory(), new DefaultLibrariesManager());
+		return start(artifact, args, null, debugMode, Executors.defaultThreadFactory(), new DefaultLibrariesManager(), null);
 	}
 
 	/** Stop this application and release resources. */
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/application/LCCore.java b/net.lecousin.core/src/main/java/net/lecousin/framework/application/LCCore.java
@@ -77,16 +77,7 @@ public static void set(Environment env) throws IllegalStateException {
 		instance = env;
 	}
 	
-	/** Return true if the environment is already started. */
-	public static boolean isStarted() {
-		return started;
-	}
-	
-	/** Initialization. */
-	public static synchronized void start() {
-		if (started) throw new IllegalStateException("LCCore environment already started");
-		started = true;
-		
+	public static void initEnvironment() {
 		// init logging system if not specified
 		if (System.getProperty("org.apache.commons.logging.Log") == null)
 			System.setProperty("org.apache.commons.logging.Log", "net.lecousin.framework.log.bridges.ApacheCommonsLogging");
@@ -99,6 +90,19 @@ public static synchronized void start() {
 			protocols += "net.lecousin.framework.protocols";
 			System.setProperty("java.protocol.handler.pkgs", protocols);
 		}
+	}
+	
+	/** Return true if the environment is already started. */
+	public static boolean isStarted() {
+		return started;
+	}
+	
+	/** Initialization. */
+	public static synchronized void start() {
+		if (started) throw new IllegalStateException("LCCore environment already started");
+		started = true;
+		
+		initEnvironment();
 		
 		instance.start();
 		new Task.Cpu<Void,Exception>("Initializing framework tools", Task.PRIORITY_NORMAL) {
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/AppLauncher.java b/net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/AppLauncher.java
@@ -163,7 +163,8 @@ else if (args[i].startsWith("-maven-repository=")) {
 					cfg.properties,
 					false,
 					Executors.defaultThreadFactory(),
-					librariesManager
+					librariesManager,
+					null
 				);
 				start.block(0);
 				if (start.hasError()) {
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/DevLauncher.java b/net.lecousin.core/src/main/java/net/lecousin/framework/application/launcher/DevLauncher.java
@@ -190,7 +190,8 @@ else if (args[i].startsWith("-maven-repository=")) {
 					cfg.properties,
 					true,
 					Executors.defaultThreadFactory(),
-					librariesManager
+					librariesManager,
+					null
 				);
 				start.block(0);
 				if (start.hasError()) {
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/application/libraries/classpath/LoadLibraryPluginsFile.java b/net.lecousin.core/src/main/java/net/lecousin/framework/application/libraries/classpath/LoadLibraryPluginsFile.java
@@ -48,7 +48,7 @@ protected void processLine(UnprotectedStringBuffer line) throws IOException {
 				throw new Exception("Invalid plugin class: " + line.asString() + " must extend Plugin");
 			Plugin pi = (Plugin)cl.newInstance();
 			ExtensionPoints.add(epName, pi);
-		} catch (Exception e) {
+		} catch (Throwable e) {
 			throw new IOException("Error loading plugins of library: " + getSourceDescription(), e);
 		}
 	}
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/StandaloneTaskPriorityManager.java b/net.lecousin.core/src/main/java/net/lecousin/framework/concurrent/StandaloneTaskPriorityManager.java
@@ -66,7 +66,7 @@ public final synchronized boolean remove(Task<?, ?> task) {
 				long wait = lastIdle + 1000 - System.currentTimeMillis();
 				if (wait > 50) {
 					if (!taskManager.isStopping() && taskManager.getTransferTarget() == null) {
-						try { this.wait(); }
+						try { this.wait(wait); }
 						catch (InterruptedException e) { /* ignore */ }
 						return null;
 					}
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/text/Decoder.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/text/Decoder.java
@@ -13,6 +13,7 @@
 import net.lecousin.framework.concurrent.CancelException;
 import net.lecousin.framework.concurrent.synch.AsyncWork;
 import net.lecousin.framework.concurrent.synch.ISynchronizationPoint;
+import net.lecousin.framework.concurrent.synch.SynchronizationPoint;
 import net.lecousin.framework.io.IO;
 import net.lecousin.framework.mutable.MutableBoolean;
 import net.lecousin.framework.util.AsyncCloseable;
@@ -70,14 +71,20 @@ public void transferTo(Decoder newDecoder) {
 	protected AsyncWork<ByteBuffer, IOException> nextBuffer;
 	protected ByteBuffer currentBuffer = null;
 	
+	/** When the decode method returns -2, this method can be used to know when new data is available to be decoded. */
+	public ISynchronizationPoint<IOException> canDecode() {
+		if (currentBuffer != null) return new SynchronizationPoint<>(true);
+		return nextBuffer;
+	}
+	
 	/**
 	 * Decode characters from the IO.
 	 * @param chars array to fill
 	 * @param pos offset in the array to fill
 	 * @param len maximum number of characters to fill
 	 * @param interrupt when true, the decoding will stop as soon as possible
 	 * @param min minimum number of characters to fill, regardless of the interrupt value
-	 * @return number of decoded characters, -1 if no more characters can be decoded
+	 * @return number of decoded characters, -1 if no more characters can be decoded, -2 if we need to wait for next buffer from the IO
 	 * @throws IOException error reading from IO
 	 * @throws CancelException IO has been cancelled
 	 */
@@ -86,7 +93,10 @@ public int decode(char[] chars, int pos, int len, MutableBoolean interrupt, int
 		int nb = 0;
 		do {
 			if (currentBuffer == null) {
-				currentBuffer = nextBuffer.blockResult(0);
+				if (nextBuffer.isUnblocked())
+					currentBuffer = nextBuffer.blockResult(0);
+				else
+					return nb > 0 ? nb : -2;
 				if (currentBuffer != null)
 					nextBuffer = io.readNextBufferAsync();
 			}
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/io/text/ProgressiveBufferedReadableCharStream.java b/net.lecousin.core/src/main/java/net/lecousin/framework/io/text/ProgressiveBufferedReadableCharStream.java
@@ -516,6 +516,22 @@ public Void run() throws CancelException {
 					}
 					return null;
 				}
+				if (nb == -2) {
+					synchronized (buffers) {
+						if (buffer.length > 0) {
+							lastBufferReady = myBuffer;
+							if (firstBufferReady == -1) firstBufferReady = myBuffer;
+							myBuffer = -1;
+							buffer = null;
+							interruptFillBuffer.set(false);
+							if (iNeedABuffer != null)
+								iNeedABuffer.unblock();
+						}
+					}
+					taskFillBuffer = new TaskFillBuffer();
+					decoder.canDecode().listenAsync(taskFillBuffer, true);
+					return null;
+				}
 				if (nb == -1) {
 					synchronized (buffers) {
 						if (buffer.length > 0) {
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/log/LoggerFactory.java b/net.lecousin.core/src/main/java/net/lecousin/framework/log/LoggerFactory.java
@@ -33,11 +33,13 @@ public class LoggerFactory {
 	private Map<String,Appender> appenders = new HashMap<String,Appender>();
 	
 	/** Constructor. */
-	public LoggerFactory(Application app) {
+	public LoggerFactory(Application app, Appender defaultAppender) {
 		application = app;
 		thread = new LoggerThread(app);
-		defaultAppender = new ConsoleAppender(this, app.isReleaseMode() ? Level.INFO : Level.DEBUG,
-			new LogPattern("%d{HH:mm:ss.SSS} [%level] <%logger{20}> %m"));
+		if (defaultAppender == null)
+			defaultAppender = new ConsoleAppender(app.getConsole(), app.isReleaseMode() ? Level.INFO : Level.DEBUG,
+				new LogPattern("%d{HH:mm:ss.SSS} [%level] <%logger{20}> %m"));
+		this.defaultAppender = defaultAppender;
 		defaultLogger = new Logger(this, "default", defaultAppender, null);
 		loggers.put("default", defaultLogger);
 		
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/log/appenders/ConsoleAppender.java b/net.lecousin.core/src/main/java/net/lecousin/framework/log/appenders/ConsoleAppender.java
@@ -6,6 +6,7 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamReader;
 
+import net.lecousin.framework.concurrent.Console;
 import net.lecousin.framework.concurrent.synch.ISynchronizationPoint;
 import net.lecousin.framework.concurrent.synch.SynchronizationPoint;
 import net.lecousin.framework.log.LogPattern;
@@ -17,8 +18,8 @@
 public class ConsoleAppender implements Appender {
 
 	/** Constructor. */
-	public ConsoleAppender(LoggerFactory factory, Level level, LogPattern pattern) {
-		this.factory = factory;
+	public ConsoleAppender(Console console, Level level, LogPattern pattern) {
+		this.console = console;
 		this.level = level;
 		this.pattern = pattern;
 	}
@@ -27,7 +28,7 @@ public ConsoleAppender(LoggerFactory factory, Level level, LogPattern pattern) {
 	public ConsoleAppender(
 		LoggerFactory factory, XMLStreamReader reader, @SuppressWarnings("unused") Map<String,Appender> appenders
 	) throws Exception, IOException {
-		this.factory = factory;
+		this.console = factory.getApplication().getConsole();
 		String level = null;
 		String pattern = null;
 		for (int i = 0; i < reader.getAttributeCount(); ++i) {
@@ -59,17 +60,17 @@ else if (!"name".equals(attrName) && !"class".equals(attrName))
 		} while (reader.hasNext());
 	}
 	
-	private LoggerFactory factory;
+	private Console console;
 	private Level level;
 	private LogPattern pattern;
 	
 	@Override
 	public void append(Log log) {
 		String s = pattern.generate(log).toString();
 		if (log.level.ordinal() >= Level.ERROR.ordinal())
-			factory.getApplication().getConsole().err(s);
+			console.err(s);
 		else
-			factory.getApplication().getConsole().out(s);
+			console.out(s);
 	}
 
 	@Override
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/protocols/classpath/Handler.java b/net.lecousin.core/src/main/java/net/lecousin/framework/protocols/classpath/Handler.java
@@ -21,7 +21,7 @@ public class Handler extends URLStreamHandler {
 	@SuppressWarnings("resource")
 	@Override
 	protected URLConnection openConnection(URL u) throws IOException {
-		IO.Readable io = LCCore.getApplication().getResource(u.getPath(), Task.PRIORITY_NORMAL);
+		IO.Readable io = LCCore.isStarted() ? LCCore.getApplication().getResource(u.getPath(), Task.PRIORITY_NORMAL) : null;
 		if (io != null) return new ReadableAsURLConnection(io, u, true);
 		URL url = Handler.class.getClassLoader().getResource(u.getPath());
 		if (url == null) throw new IOException("Resource not found in classpath: " + u.getPath());
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerLong.java b/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerLong.java
@@ -1,44 +1,18 @@
 package net.lecousin.framework.util;
 
-import net.lecousin.framework.math.FragmentedRangeLong;
-import net.lecousin.framework.math.RangeLong;
-
 /**
- * ID Manager allocating long integer identifiers.
+ * An ID manager can allocate new identifiers, and free identifiers which are not used anymore.
+ * An identifier which has been freed may be returned again when allocating a new identifier.
  */
-public class IDManagerLong implements IDManager {
-
-	/** Constructor.
-	 * @param encoder to encode a long value into a string
-	 */
-	public IDManagerLong(StringEncoding<Long> encoder) {
-		this.encoder = encoder;
-	}
+public interface IDManagerLong {
 
-	/** Constructor using a default StringEncoding$SimpleLong encoder. */
-	public IDManagerLong() {
-		this(new StringEncoding.SimpleLong());
-	}
-
-	private StringEncoding<Long> encoder;
-	private FragmentedRangeLong free = new FragmentedRangeLong(new RangeLong(1,Long.MAX_VALUE));
-	
-	@Override
-	public String allocate() {
-		Long id = free.removeFirstValue();
-		return encoder.encode(id);
-	}
+	/** Allocate a new unique identifier. */
+	public long allocate();
 	
-	@Override
-	public void free(String id) {
-		long l = encoder.decode(id).longValue();
-		free.addValue(l);
-	}
+	/** Free the given identifier. */
+	public void free(long id);
 	
-	@Override
-	public void used(String id) {
-		long l = encoder.decode(id).longValue();
-		free.removeValue(l);
-	}
+	/** Declare an identifier as used so it cannot be allocated. */
+	public void used(long id);
 	
 }
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerRandomLong.java b/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerRandomLong.java
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerString.java b/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerString.java
@@ -4,7 +4,7 @@
  * An ID manager can allocate new identifiers, and free identifiers which are not used anymore.
  * An identifier which has been freed may be returned again when allocating a new identifier.
  */
-public interface IDManager {
+public interface IDManagerString {
 
 	/** Allocate a new unique identifier. */
 	public String allocate();
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerStringFromLong.java b/net.lecousin.core/src/main/java/net/lecousin/framework/util/IDManagerStringFromLong.java
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/util/RandomIDManagerLong.java b/net.lecousin.core/src/main/java/net/lecousin/framework/util/RandomIDManagerLong.java
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/util/SimpleIDManagerLong.java b/net.lecousin.core/src/main/java/net/lecousin/framework/util/SimpleIDManagerLong.java
diff --git a/net.lecousin.core/src/main/java/net/lecousin/framework/xml/serialization/XMLDeserializer.java b/net.lecousin.core/src/main/java/net/lecousin/framework/xml/serialization/XMLDeserializer.java
diff --git a/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestIDManagerLong.java b/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestIDManagerLong.java
diff --git a/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestSimpleIDManagerLong.java b/net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/util/TestSimpleIDManagerLong.java

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ public void init() throws ServletException {`
`90`	`90`	`properties,`
`91`	`91`	`debugMode,`
`92`	`92`	`threadFactory,`
`93`		`- new DefaultLibrariesManager()`
	`93`	`+ new DefaultLibrariesManager(),`
	`94`	`+ null`
`94`	`95`	`);`
`95`	`96`	`}`
`96`	`97`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected void processLine(UnprotectedStringBuffer line) throws IOException {`
`48`	`48`	`throw new Exception("Invalid plugin class: " + line.asString() + " must extend Plugin");`
`49`	`49`	`Plugin pi = (Plugin)cl.newInstance();`
`50`	`50`	`ExtensionPoints.add(epName, pi);`
`51`		`- } catch (Exception e) {`
	`51`	`+ } catch (Throwable e) {`
`52`	`52`	`throw new IOException("Error loading plugins of library: " + getSourceDescription(), e);`
`53`	`53`	`}`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public final synchronized boolean remove(Task<?, ?> task) {`
`66`	`66`	`long wait = lastIdle + 1000 - System.currentTimeMillis();`
`67`	`67`	`if (wait > 50) {`
`68`	`68`	`if (!taskManager.isStopping() && taskManager.getTransferTarget() == null) {`
`69`		`- try { this.wait(); }`
	`69`	`+ try { this.wait(wait); }`
`70`	`70`	`catch (InterruptedException e) { /* ignore */ }`
`71`	`71`	`return null;`
`72`	`72`	`}`