X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.api.uuid%2Fsrc%2Forg%2Fargeo%2Fapi%2Fuuid%2FConcurrentTimeUuidState.java;h=fd158fb8315db647b8d0b07e7790d1ec57aa2b3f;hb=55870eba50d8b28e72a3102fd18a17a6f23f7bad;hp=5bab35980370474e2a30663f8795a405be9e3c80;hpb=0f8bddc982e2ea4f260e1eb639777b74e7893ea3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentTimeUuidState.java b/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentTimeUuidState.java
index 5bab35980..fd158fb83 100644
--- a/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentTimeUuidState.java
+++ b/org.argeo.api.uuid/src/org/argeo/api/uuid/ConcurrentTimeUuidState.java
@@ -1,9 +1,5 @@
 package org.argeo.api.uuid;
 
-import static java.lang.System.Logger.Level.DEBUG;
-import static java.lang.System.Logger.Level.WARNING;
-
-import java.lang.System.Logger;
 import java.security.SecureRandom;
 import java.time.Clock;
 import java.time.Duration;
@@ -13,6 +9,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.WeakHashMap;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.argeo.api.uuid.UuidFactory.TimeUuidState;
@@ -25,11 +22,11 @@ import org.argeo.api.uuid.UuidFactory.TimeUuidState;
  * sequences. If that limit is reached, the clock sequence which has not be used
  * for the most time is reallocated to the new thread. It is assumed that the
  * context where time uUIDs will be generated will often be using thread pools
- * (e.g. {@link ForkJoinPool#commonPool(), http server, database access, etc.)
+ * (e.g. {@link ForkJoinPool#commonPool()}, http server, database access, etc.)
  * and that such reallocation won't have to happen too often.
  */
 public class ConcurrentTimeUuidState implements UuidFactory.TimeUuidState {
-	private final static Logger logger = System.getLogger(ConcurrentTimeUuidState.class.getName());
+//	private final static Logger logger = System.getLogger(ConcurrentTimeUuidState.class.getName());
 
 	/** The maximum possible value of the clocksequence. */
 	private final static int MAX_CLOCKSEQUENCE = 0x3F00;
@@ -146,9 +143,7 @@ public class ConcurrentTimeUuidState implements UuidFactory.TimeUuidState {
 	@Override
 	public long getMostSignificantBits() {
 		long timestamp = useTimestamp();
-		long mostSig = UuidFactory.MOST_SIG_VERSION1 | ((timestamp & 0xFFFFFFFFL) << 32) // time_low
-				| (((timestamp >> 32) & 0xFFFFL) << 16) // time_mid
-				| ((timestamp >> 48) & 0x0FFFL);// time_hi_and_version
+		long mostSig = TimeUuid.toMostSignificantBits(timestamp);
 		return mostSig;
 	}
 
@@ -275,11 +270,11 @@ public class ConcurrentTimeUuidState implements UuidFactory.TimeUuidState {
 
 				}
 				assert holderToRemove != null;
-				long oldClockSequence = holderToRemove.clockSequence;
+//				long oldClockSequence = holderToRemove.clockSequence;
 				holderToRemove.clockSequence = -1;
 				activeHolders.remove(holderToRemove);
-				if (logger.isLoggable(WARNING))
-					logger.log(WARNING, "Removed " + holderToRemove + ", oldClockSequence=" + oldClockSequence);
+//				if (logger.isLoggable(WARNING))
+//					logger.log(WARNING, "Removed " + holderToRemove + ", oldClockSequence=" + oldClockSequence);
 			}
 
 			long newClockSequence = -1;
@@ -300,13 +295,13 @@ public class ConcurrentTimeUuidState implements UuidFactory.TimeUuidState {
 			// TODO use an iterator to check the values
 			holder.setClockSequence(newClockSequence);
 			activeHolders.put(holder, newClockSequence);
-			if (logger.isLoggable(DEBUG)) {
-				String clockDesc = range >= 0 ? Long.toHexString(newClockSequence & 0x00FF)
-						: Long.toHexString(newClockSequence | 0x8000);
-				String rangeDesc = Long.toHexString(min | 0x8000) + "-" + Long.toHexString(max | 0x8000);
-				logger.log(DEBUG, "New clocksequence " + clockDesc + " for thread " + Thread.currentThread().getId()
-						+ " (in range " + rangeDesc + ")");
-			}
+//			if (logger.isLoggable(DEBUG)) {
+//				String clockDesc = range >= 0 ? Long.toHexString(newClockSequence & 0x00FF)
+//						: Long.toHexString(newClockSequence | 0x8000);
+//				String rangeDesc = Long.toHexString(min | 0x8000) + "-" + Long.toHexString(max | 0x8000);
+//				logger.log(DEBUG, "New clocksequence " + clockDesc + " for thread " + Thread.currentThread().getId()
+//						+ " (in range " + rangeDesc + ")");
+//			}
 		}
 
 		private synchronized int getRangeSize() {