903|Ja1;OIcl+Nk
yny5f0R7&6$0|N0sel7hCSc>%t#0OF_ViNyDT>cHXNc8W^^JK(>ilqM6p8o-6c(R}X
diff --git a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java
index d36d99e..9f138ec 100644
--- a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java
+++ b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java
@@ -13,14 +13,14 @@ import lombok.Getter;
*
* 使用并发管理：
* {@snippet lang = java:
+ * public final SyLock lock = new ObjLock();
* public static void main(String[] args) {
- * var lock = new ObjLock();
* lock.read(() -> System.out.println("asd"));
* }}
* 不使用：
* {@snippet lang = java:
+ * public final Object lock = new Object();
* public static void main(String[] args) {
- * Object lock = new Object();
* synchronized ( lock ){
* System.out.println("asd");
* }
@@ -34,125 +34,123 @@ import lombok.Getter;
@Getter
public
class ObjLock implements SyLock {
- /** 作为锁的对象 */
- private final Object LOCK;
+ /** 作为锁的对象 */
+ private final Object LOCK;
- /**
- * 构建并发管理
- *
- * 使用一个新的{@link Object}
- */
- public
- ObjLock() { this(new Object()); }
+ /**
+ * 构建并发管理
+ *
+ * 使用一个新的{@link Object}
+ */
+ public
+ ObjLock() { this(new Object()); }
- /**
- * 构建并发管理
- *
- * @param lock 用作锁的对象
- *
- * @since 0.1.0
- */
- public
- ObjLock(@NotNull Object lock) { LOCK = lock; }
+ /**
+ * 构建并发管理
+ *
+ * @param lock 用作锁的对象
+ *
+ * @since 0.1.0
+ */
+ public
+ ObjLock(@NotNull Object lock) { LOCK = lock; }
- //----------------------------------------------------------------------------------------------
+ /**
+ * {@inheritDoc}
+ *
+ * @param lockType {@inheritDoc}
+ * @param run {@inheritDoc}
+ * @param catchby {@inheritDoc}
+ * @param finaby {@inheritDoc}
+ * @param {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ *
+ * @implNote 使用 {@code synchronized( Object )} 实现的隐式并发域
+ * @see SyLock#lock(LockType, trySupplier, Function, Function)
+ * @since 0.1.0
+ */
+ @Override
+ public
+ R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby,
+ @Nullable Function finaby)
+ {
+ R o = null;
+ // 不上锁
+ if ( lockType == LockType.NOLOCK ) {
+ try {
+ // 主要内容
+ o = run.get();
+ } catch ( Exception e ) {
+ // 异常处理
+ if ( catchby != null )
+ o = catchby.apply(e);
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ } else {
+ // 上锁
+ synchronized ( LOCK ){
+ try {
+ // 主要内容
+ o = run.get();
+ } catch ( Exception e ) {
+ // 异常处理
+ if ( catchby != null )
+ o = catchby.apply(e);
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ }
+ }
+ return o;
+ }
- /**
- * {@inheritDoc}
- *
- * @param lockType {@inheritDoc}
- * @param run {@inheritDoc}
- * @param catchby {@inheritDoc}
- * @param finaby {@inheritDoc}
- * @param {@inheritDoc}
- *
- * @return {@inheritDoc}
- *
- * @implNote 使用 {@code synchronized( Object )} 实现的隐式并发域
- * @see SyLock#lock(LockType, trySupplier, Function, Function)
- * @since 0.1.0
- */
- @Override
- public
- R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby,
- @Nullable Function finaby)
- {
- R o = null;
- // 不上锁
- if ( lockType == LockType.NOLOCK ) {
- try {
- // 主要内容
- o = run.get();
- } catch ( Exception e ) {
- // 异常处理
- if ( catchby != null )
- o = catchby.apply(e);
- } finally {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- }
- } else {
- // 上锁
- synchronized ( LOCK ){
- try {
- // 主要内容
- o = run.get();
- } catch ( Exception e ) {
- // 异常处理
- if ( catchby != null )
- o = catchby.apply(e);
- } finally {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- }
- }
- }
- return o;
- }
-
- /**
- * {@inheritDoc}
- *
- * @param lockType {@inheritDoc}
- * @param run {@inheritDoc}
- * @param finaby {@inheritDoc}
- * @param {@inheritDoc}
- *
- * @return {@inheritDoc}
- *
- * @implNote 使用 {@code synchronized( Object )} 实现的隐式并发域
- * @see SyLock#trylock(LockType, trySupplier, Function)
- * @since 0.1.0
- */
- @Override
- public
- R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception {
- R o = null;
- // 不上锁
- if ( lockType == LockType.NOLOCK ) {
- try {
- // 主要内容
- o = run.get();
- } finally {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- }
- } else {
- // 上锁
- synchronized ( LOCK ){
- try {
- // 主要内容
- o = run.get();
- } finally {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- }
- }
- }
- return o;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @param lockType {@inheritDoc}
+ * @param run {@inheritDoc}
+ * @param finaby {@inheritDoc}
+ * @param {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ *
+ * @implNote 使用 {@code synchronized( Object )} 实现的隐式并发域
+ * @see SyLock#trylock(LockType, trySupplier, Function)
+ * @since 0.1.0
+ */
+ @Override
+ public
+ R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception {
+ R o = null;
+ // 不上锁
+ if ( lockType == LockType.NOLOCK ) {
+ try {
+ // 主要内容
+ o = run.get();
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ } else {
+ // 上锁
+ synchronized ( LOCK ){
+ try {
+ // 主要内容
+ o = run.get();
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ }
+ }
+ return o;
+ }
}
diff --git a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java
index 6cc7255..e5ef8d5 100644
--- a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java
+++ b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java
@@ -17,8 +17,8 @@ import lombok.Getter;
*
* 使用并发管理：
* {@snippet lang = java:
+ * public final SyLock lock = new RWLock();
* public static void main(String[] args) {
- * var lock = new RWLock();
* // 使用读锁
* lock.read(() -> System.out.println("adsa"));
* // 使用写锁
@@ -27,14 +27,14 @@ import lombok.Getter;
* 不使用：
* {@snippet lang = java:
* import java.util.concurrent.locks.ReentrantReadWriteLock;
+ * public final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
* public static void main(String[] args) {
- * var lock = new ReentrantReadWriteLock();
* // 使用读锁
* try {
* lock.readLock().lock();
* System.out.println("adsa");
* } finally {
- * lock.readLock().unlock();
+ * lock.readLock().unlock();
* }
* // 使用写锁
* try {
@@ -57,264 +57,261 @@ import lombok.Getter;
@Getter
public
class RWLock implements SyLock {
- /** 锁 */
- private final ReentrantReadWriteLock LOCK;
- /** 读锁 */
- private final ReentrantReadWriteLock.ReadLock Read_LOCK;
- /** 写锁 */
- private final ReentrantReadWriteLock.WriteLock Write_LOCK;
- /**
- * 每个线程的锁状态记录
- *
- * 读锁为{@code 1}
- * 写锁为{@code 2}
- */
- private final ThreadLocal LOCK_STATE = new ThreadLocal<>();
+ /** 锁 */
+ private final ReentrantReadWriteLock LOCK;
+ /** 读锁 */
+ private final ReentrantReadWriteLock.ReadLock Read_LOCK;
+ /** 写锁 */
+ private final ReentrantReadWriteLock.WriteLock Write_LOCK;
+ /**
+ * 每个线程的锁状态记录
+ *
+ * 不上锁为{@code null}
+ * 读锁为{@code 1}
+ * 写锁为{@code 2}
+ */
+ private final ThreadLocal LOCK_STATE = new ThreadLocal<>();
- /**
- * 构建并发管理
- *
- * 使用非公平锁
- */
- public
- RWLock() { this(false); }
+ /**
+ * 构建并发管理
+ *
+ * 使用非公平锁
+ */
+ public
+ RWLock() { this(false); }
- /**
- * 构造并发处理
- *
- * @param fair 是否使用公平锁
- */
- public
- RWLock(boolean fair) { this(new ReentrantReadWriteLock(fair)); }
+ /**
+ * 构造并发处理
+ *
+ * @param fair 是否使用公平锁
+ */
+ public
+ RWLock(boolean fair) { this(new ReentrantReadWriteLock(fair)); }
- /**
- * 构造并发处理
- *
- * @param lock 使用的锁
- *
- * @since 0.1.0
- */
- public
- RWLock(@NotNull ReentrantReadWriteLock lock) {
- LOCK = lock;
- Read_LOCK = LOCK.readLock();
- Write_LOCK = LOCK.writeLock();
- }
+ /**
+ * 构造并发处理
+ *
+ * @param lock 使用的锁
+ *
+ * @since 0.1.0
+ */
+ public
+ RWLock(@NotNull ReentrantReadWriteLock lock) {
+ LOCK = lock;
+ Read_LOCK = LOCK.readLock();
+ Write_LOCK = LOCK.writeLock();
+ }
- //----------------------------------------------------------------------------------------------
+ /**
+ * {@inheritDoc}
+ *
+ * @param lockType {@inheritDoc}
+ * @param run {@inheritDoc}
+ * @param catchby {@inheritDoc}
+ * @param finaby {@inheritDoc}
+ * @param {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ *
+ * @implNote 使用 {@link ReentrantReadWriteLock} 实现的并发域，上锁通过{@link #tolock(LockType)}进行
+ * @see SyLock#lock(LockType, trySupplier, Function, Function)
+ * @see #tolock(LockType)
+ * @see #tounlock()
+ * @since 0.1.0
+ */
+ @Override
+ public
+ R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby,
+ @Nullable Function finaby)
+ {
+ R o = null;
+ // 清空当前线程的状态
+ LOCK_STATE.remove();
+ // 防止finally内的回调抛异常
+ try {
+ try {
+ // 上锁
+ tolock(lockType);
+ // 主要内容
+ o = run.get();
+ } catch ( Exception e ) {
+ // 异常处理
+ if ( catchby != null )
+ o = catchby.apply(e);
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ } finally {
+ // 解锁
+ tounlock();
+ }
+ return o;
+ }
- /**
- * {@inheritDoc}
- *
- * @param lockType {@inheritDoc}
- * @param run {@inheritDoc}
- * @param catchby {@inheritDoc}
- * @param finaby {@inheritDoc}
- * @param {@inheritDoc}
- *
- * @return {@inheritDoc}
- *
- * @implNote 使用 {@link ReentrantReadWriteLock} 实现的并发域，上锁通过{@link #tolock(LockType)}进行
- * @see SyLock#lock(LockType, trySupplier, Function, Function)
- * @see #tolock(LockType)
- * @see #tounlock()
- * @since 0.1.0
- */
- @Override
- public
- R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby,
- @Nullable Function finaby)
- {
- R o = null;
- // 清空当前线程的状态
- LOCK_STATE.remove();
- try {
- // 上锁
- tolock(lockType);
- // 主要内容
- o = run.get();
- } catch ( Exception e ) {
- // 异常处理
- if ( catchby != null )
- o = catchby.apply(e);
- } finally {
- // 防止错误
- try {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- } finally {
- // 解锁
- tounlock();
- }
- }
- return o;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @param lockType {@inheritDoc}
+ * @param run {@inheritDoc}
+ * @param finaby {@inheritDoc}
+ * @param {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ *
+ * @implNote 使用 {@link ReentrantReadWriteLock} 实现的并发域，上锁通过{@link #tolock(LockType)}进行
+ * @see SyLock#trylock(LockType, trySupplier, Function)
+ * @see #tolock(LockType)
+ * @see #tounlock()
+ * @since 0.1.0
+ */
+ @Override
+ public
+ R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception {
+ R o = null;
+ // 清空当前线程的状态
+ LOCK_STATE.remove();
+ // 防止finally内的回调抛异常
+ try {
+ try {
+ // 上锁
+ tolock(lockType);
+ // 主要内容
+ o = run.get();
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ } finally {
+ // 解锁
+ tounlock();
+ }
+ return o;
+ }
- /**
- * {@inheritDoc}
- *
- * @param lockType {@inheritDoc}
- * @param run {@inheritDoc}
- * @param finaby {@inheritDoc}
- * @param {@inheritDoc}
- *
- * @return {@inheritDoc}
- *
- * @implNote 使用 {@link ReentrantReadWriteLock} 实现的并发域，上锁通过{@link #tolock(LockType)}进行
- * @see SyLock#trylock(LockType, trySupplier, Function)
- * @see #tolock(LockType)
- * @see #tounlock()
- * @since 0.1.0
- */
- @Override
- public
- R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception {
- R o = null;
- // 清空当前线程的状态
- LOCK_STATE.remove();
- try {
- // 上锁
- tolock(lockType);
- // 主要内容
- o = run.get();
- } finally {
- // 防止错误
- try {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- } finally {
- // 解锁
- tounlock();
- }
- }
- return o;
- }
+ /**
+ * 根据指定类型上锁
+ *
+ * 使用了可中断的上锁操作{@link ReentrantReadWriteLock.ReadLock#lockInterruptibly()}和{@link ReentrantReadWriteLock.WriteLock#lockInterruptibly()}
+ * 同时更新{@link #LOCK_STATE}记录
+ *
+ * @param lockType 锁类型
+ *
+ * @throws InterruptedException 上锁过程中被中断
+ * @see #LOCK_STATE
+ * @see LockType
+ * @since 0.1.0
+ */
+ private
+ void tolock(@NotNull LockType lockType) throws InterruptedException {
+ if ( lockType != LockType.NOLOCK ) {
+ if ( lockType == LockType.READ ) {
+ // 读锁
+ Read_LOCK.lockInterruptibly();
+ LOCK_STATE.set((short) 1);
+ } else if ( lockType == LockType.WRITE ) {
+ // 写锁
+ Write_LOCK.lockInterruptibly();
+ LOCK_STATE.set((short) 2);
+ }
+ }
+ }
- /**
- * 根据指定类型上锁
- *
- * 使用了可中断的上锁操作{@link ReentrantReadWriteLock.ReadLock#lockInterruptibly()}和{@link ReentrantReadWriteLock.WriteLock#lockInterruptibly()}
- * 同时更新{@link #LOCK_STATE}记录
- *
- * @param lockType 锁类型
- *
- * @throws InterruptedException 上锁过程中被中断
- * @see #LOCK_STATE
- * @see LockType
- * @since 0.1.0
- */
- private
- void tolock(@NotNull LockType lockType) throws InterruptedException {
- if ( lockType != LockType.NOLOCK ) {
- if ( lockType == LockType.READ ) {
- // 读锁
- Read_LOCK.lockInterruptibly();
- LOCK_STATE.set((short) 1);
- } else {
- // 写锁
- Write_LOCK.lockInterruptibly();
- LOCK_STATE.set((short) 2);
- }
- }
- }
+ /**
+ * 根据状态解锁
+ *
+ * 根据{@link #LOCK_STATE}的状态调用对应的解锁动作
+ * 成功后清空{@link #LOCK_STATE}内容
+ *
+ * @see #LOCK_STATE
+ * @since 0.1.0
+ */
+ private
+ void tounlock() {
+ // 根据实际状态解锁
+ if ( LOCK_STATE.get() == 1 )
+ Read_LOCK.unlock();
+ else if ( LOCK_STATE.get() == 2 )
+ Write_LOCK.unlock();
+ // 清除记录数据
+ LOCK_STATE.remove();
+ }
- /**
- * 根据状态解锁
- *
- * 根据{@link #LOCK_STATE}的状态调用对应的解锁动作
- * 成功后清空{@link #LOCK_STATE}内容
- *
- * @see #LOCK_STATE
- * @since 0.1.0
- */
- private
- void tounlock() {
- // 根据实际状态解锁
- if ( LOCK_STATE.get() == 1 )
- Read_LOCK.unlock();
- else if ( LOCK_STATE.get() == 2 )
- Write_LOCK.unlock();
- // 清除记录数据
- LOCK_STATE.remove();
- }
+ /**
+ * 转为读锁
+ *
+ * 如果当前状态为写锁则会降级为读锁，否则不进行操作
+ *
+ * @return 是否成功降级
+ *
+ * @see #LOCK_STATE
+ * @since 0.1.0
+ */
+ public
+ boolean toread() {
+ // 转为读锁
+ if ( LOCK_STATE.get() == 2 ) {
+ Read_LOCK.lock();
+ Write_LOCK.unlock();
+ LOCK_STATE.set((short) 1);
+ return true;
+ }
+ return false;
+ }
- /**
- * 转为读锁
- *
- * 如果当前状态为写锁则会降级为读锁，否则不进行操作
- *
- * @return 是否成功降级
- *
- * @see #LOCK_STATE
- * @since 0.1.0
- */
- public
- boolean toread() {
- // 转为读锁
- if ( LOCK_STATE.get() == 2 ) {
- Read_LOCK.lock();
- Write_LOCK.unlock();
- LOCK_STATE.set((short) 1);
- return true;
- }
- return false;
- }
+ /**
+ * 检查锁是否被占用
+ *
+ * @return 是否被占用
+ *
+ * @since 0.1.0
+ */
+ public
+ boolean isLocked() { return isReadLocked() || isWriteLocked(); }
- //----------------------------------------------------------------------------------------------
+ /**
+ * 检查读锁是否被占用
+ *
+ * @return 是否被占用
+ *
+ * @since 0.1.0
+ */
+ public
+ boolean isReadLocked() { return LOCK_STATE.get() == 1; }
- /**
- * 检查锁是否被占用
- *
- * @return 是否被占用
- *
- * @since 0.1.0
- */
- public
- boolean isLocked() { return LOCK_STATE.get() != null && (LOCK_STATE.get() == 1 || LOCK_STATE.get() == 2); }
+ /**
+ * 检查写锁是否被占用
+ *
+ * @return 是否被占用
+ *
+ * @since 0.1.0
+ */
+ public
+ boolean isWriteLocked() { return LOCK_STATE.get() == 2; }
- /**
- * 检查读锁是否被占用
- *
- * @return 是否被占用
- *
- * @since 0.1.0
- */
- public
- boolean isReadLocked() { return LOCK_STATE.get() == 1; }
+ /**
+ * 获取读锁{@link Condition}
+ *
+ * @return {@link ReentrantReadWriteLock.ReadLock}的{@link Condition}
+ *
+ * @see ReentrantReadWriteLock.ReadLock#newCondition()
+ * @since 0.1.0
+ */
+ @NotNull
+ public
+ Condition newReadCondition() { return Read_LOCK.newCondition(); }
- /**
- * 检查写锁是否被占用
- *
- * @return 是否被占用
- *
- * @since 0.1.0
- */
- public
- boolean isWriteLocked() { return LOCK_STATE.get() == 2; }
-
- /**
- * 获取读锁{@link Condition}
- *
- * @return {@link ReentrantReadWriteLock.ReadLock}的{@link Condition}
- *
- * @see ReentrantReadWriteLock.ReadLock#newCondition()
- * @since 0.1.0
- */
- @NotNull
- public
- Condition newReadCondition() { return Read_LOCK.newCondition(); }
-
- /**
- * 获取写锁{@link Condition}
- *
- * @return {@link ReentrantReadWriteLock.WriteLock}的{@link Condition}
- *
- * @see ReentrantReadWriteLock.WriteLock#newCondition()
- * @since 0.1.0
- */
- @NotNull
- public
- Condition newWriteCondition() { return Write_LOCK.newCondition(); }
+ /**
+ * 获取写锁{@link Condition}
+ *
+ * @return {@link ReentrantReadWriteLock.WriteLock}的{@link Condition}
+ *
+ * @see ReentrantReadWriteLock.WriteLock#newCondition()
+ * @since 0.1.0
+ */
+ @NotNull
+ public
+ Condition newWriteCondition() { return Write_LOCK.newCondition(); }
}
\ No newline at end of file
diff --git a/src/main/java/fybug/nulll/pdconcurrent/ReLock.java b/src/main/java/fybug/nulll/pdconcurrent/ReLock.java
index fbf385b..8defe87 100644
--- a/src/main/java/fybug/nulll/pdconcurrent/ReLock.java
+++ b/src/main/java/fybug/nulll/pdconcurrent/ReLock.java
@@ -17,17 +17,18 @@ import lombok.Getter;
*
* 使用并发管理：
* {@snippet lang = java:
+ * public final SyLock lock = new ReLock();
* public static void main(String[] args) {
- * var lock = new ReLock();
* lock.read(() -> System.out.println("asdas"));
* }}
* 不使用：
* {@snippet lang = java:
* import java.util.concurrent.locks.ReentrantLock;
+ *
+ * public final ReentrantLock lock = new ReentrantLock();
* public static void main(String[] args) {
- * var lock = new ReentrantLock();
- * lock.lock();
* try {
+ * lock.lock();
* System.out.println("asdas");
* } finally {
* lock.unlock();
@@ -43,140 +44,136 @@ import lombok.Getter;
@Getter
public
class ReLock implements SyLock {
- /** 锁 */
- private final ReentrantLock LOCK;
-
- /**
- * 构建并发管理
- *
- * 使用非公平锁
- */
- public
- ReLock() { this(false); }
-
- /**
- * 构造并发处理
- *
- * @param fair 是否使用公平锁
- */
- public
- ReLock(boolean fair) { this(new ReentrantLock(fair)); }
+ /** 锁 */
+ private final ReentrantLock LOCK;
- /**
- * 构造并发处理
- *
- * @param LOCK 使用的锁
- *
- * @since 0.1.0
- */
- public
- ReLock(@NotNull ReentrantLock LOCK) { this.LOCK = LOCK; }
+ /**
+ * 构建并发管理
+ *
+ * 使用非公平锁
+ */
+ public
+ ReLock() { this(false); }
- //----------------------------------------------------------------------------------------------
+ /**
+ * 构造并发处理
+ *
+ * @param fair 是否使用公平锁
+ */
+ public
+ ReLock(boolean fair) { this(new ReentrantLock(fair)); }
- /**
- * {@inheritDoc}
- *
- * @param lockType {@inheritDoc}
- * @param run {@inheritDoc}
- * @param catchby {@inheritDoc}
- * @param finaby {@inheritDoc}
- * @param {@inheritDoc}
- *
- * @return {@inheritDoc}
- *
- * @implNote 使用 {@link ReentrantLock} 实现的并发域，使用了{@link ReentrantLock#lockInterruptibly()}进行可中断的上锁操作
- * @see SyLock#lock(LockType, trySupplier, Function, Function)
- * @since 0.1.0
- */
- @Override
- public
- R lock(@NotNull LockType lockType, trySupplier run, @Nullable Function catchby,
- @Nullable Function finaby)
- {
- R o = null;
- try {
- // 上锁
- if ( lockType != LockType.NOLOCK )
- LOCK.lockInterruptibly();
- // 主要内容
- o = run.get();
- } catch ( Exception e ) {
- // 异常处理
- if ( catchby != null )
- o = catchby.apply(e);
- } finally {
- // 防止错误
- try {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- } finally {
- // 解锁
- if ( lockType != LockType.NOLOCK && LOCK.isLocked() )
- LOCK.unlock();
- }
- }
- return o;
- }
+ /**
+ * 构造并发处理
+ *
+ * @param LOCK 使用的锁
+ *
+ * @since 0.1.0
+ */
+ public
+ ReLock(@NotNull ReentrantLock LOCK) { this.LOCK = LOCK; }
- /**
- * {@inheritDoc}
- *
- * @param lockType {@inheritDoc}
- * @param run {@inheritDoc}
- * @param finaby {@inheritDoc}
- * @param {@inheritDoc}
- *
- * @return {@inheritDoc}
- *
- * @implNote 使用 {@link ReentrantLock} 实现的并发域，使用了{@link ReentrantLock#lockInterruptibly()
- * @see SyLock#trylock(LockType, trySupplier, Function)
- * @since 0.1.0
- */
- @Override
- public
- R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception {
- R o = null;
- try {
- // 上锁
- if ( lockType != LockType.NOLOCK )
- LOCK.lockInterruptibly();
- // 主要内容
- o = run.get();
- } finally {
- // 防止错误
- try {
- // 收尾
- if ( finaby != null )
- o = finaby.apply(o);
- } finally {
- // 解锁
- if ( lockType != LockType.NOLOCK && LOCK.isLocked() )
- LOCK.unlock();
- }
- }
- return o;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @param lockType {@inheritDoc}
+ * @param run {@inheritDoc}
+ * @param catchby {@inheritDoc}
+ * @param finaby {@inheritDoc}
+ * @param {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ *
+ * @implNote 使用 {@link ReentrantLock} 实现的并发域，使用了{@link ReentrantLock#lockInterruptibly()}进行可中断的上锁操作
+ * @see SyLock#lock(LockType, trySupplier, Function, Function)
+ * @since 0.1.0
+ */
+ @Override
+ public
+ R lock(@NotNull LockType lockType, trySupplier run, @Nullable Function catchby,
+ @Nullable Function finaby)
+ {
+ R o = null;
+ // 防止finally内的回调抛异常
+ try {
+ try {
+ // 上锁
+ if ( lockType != LockType.NOLOCK )
+ LOCK.lockInterruptibly();
+ // 主要内容
+ o = run.get();
+ } catch ( Exception e ) {
+ // 异常处理
+ if ( catchby != null )
+ o = catchby.apply(e);
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ } finally {
+ // 解锁
+ if ( lockType != LockType.NOLOCK && LOCK.isLocked() )
+ LOCK.unlock();
+ }
+ return o;
+ }
- //----------------------------------------------------------------------------------------------
+ /**
+ * {@inheritDoc}
+ *
+ * @param lockType {@inheritDoc}
+ * @param run {@inheritDoc}
+ * @param finaby {@inheritDoc}
+ * @param {@inheritDoc}
+ *
+ * @return {@inheritDoc}
+ *
+ * @implNote 使用 {@link ReentrantLock} 实现的并发域，使用了{@link ReentrantLock#lockInterruptibly()
+ * @see SyLock#trylock(LockType, trySupplier, Function)
+ * @since 0.1.0
+ */
+ @Override
+ public
+ R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception {
+ R o = null;
+ // 防止finally内的回调抛异常
+ try {
+ try {
+ // 上锁
+ if ( lockType != LockType.NOLOCK )
+ LOCK.lockInterruptibly();
+ // 主要内容
+ o = run.get();
+ } finally {
+ // 收尾
+ if ( finaby != null )
+ o = finaby.apply(o);
+ }
+ } finally {
+ // 解锁
+ if ( lockType != LockType.NOLOCK && LOCK.isLocked() )
+ LOCK.unlock();
+ }
+ return o;
+ }
- /**
- * 获取{@link Condition}
- *
- * @return {@link ReentrantLock}的{@link Condition}
- *
- * @see ReentrantLock#newCondition()
- */
- @NotNull
- public
- Condition newCondition() { return LOCK.newCondition(); }
+ /**
+ * 获取{@link Condition}
+ *
+ * @return {@link ReentrantLock}的{@link Condition}
+ *
+ * @see ReentrantLock#newCondition()
+ */
+ @NotNull
+ public
+ Condition newCondition() { return LOCK.newCondition(); }
- /**
- * 检查锁是否被占用
- *
- * @return 是否被占用
- */
- public
- boolean isLocked() { return LOCK.isLocked(); }
+ /**
+ * 检查锁是否被占用
+ *
+ * @return 是否被占用
+ */
+ public
+ boolean isLocked() { return LOCK.isLocked(); }
}
diff --git a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java
index 4526b1a..1134550 100644
--- a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java
+++ b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java
@@ -18,513 +18,541 @@ import jakarta.validation.constraints.NotNull;
* 使用 {@code new**Lock()} 的方法获取不同并发管理的实例
*
* @author fybug
- * @version 0.1.0
- * @apiNote 并发控制通用接口，规定并实现大部分通用控制功能
+ * @version 0.1.1
* @since PDConcurrent 0.0.1
*/
public
interface SyLock {
- /**
- * 使用锁执行指定回调
- *
- * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
- * 所有回调均在并发域内执行
- *
- * @param lockType 锁类型
- * @param run 带返回的回调
- * @param catchby 进入catch块后的回调，传入当前异常
- * @param finaby 进入finally块后的回调，传入前两个回调的返回值
- * @param 要返回的数据类型
- *
- * @return 回调返回的内容
- *
- * @implSpec 如果有传入 {@code finaby} 回调则返回值由{@code finaby}主导，传入{@code finaby}的值根据是否发生异常传入{@code run}的返回值或{@code catchby}的返回值
- * 任意一个回调为空时直接穿透，使用上一个正确执行的值进行传递或者返回，返回应有默认值{@code null}用于应对{@code catchby}和{@code finaby}都为空但是发生了异常的情况
- * @see trySupplier
- * @see Function
- * @see LockType
- * @since 0.1.0
- */
- R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby,
- @Nullable Function finaby);
+ /**
+ * 使用锁执行指定回调
+ *
+ * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
+ * 所有回调均在并发域内执行
+ *
+ * @param lockType 锁类型
+ * @param run 带返回的回调
+ * @param catchby 进入catch块后的回调，传入当前异常
+ * @param finaby 进入finally块后的回调，传入前两个回调的返回值
+ * @param 要返回的数据类型
+ *
+ * @return 回调返回的内容
+ *
+ * @implSpec 如果有传入 {@code finaby} 回调则返回值由{@code finaby}主导，传入{@code finaby}的值根据是否发生异常传入{@code run}的返回值或{@code catchby}的返回值
+ * 任意一个回调为空时直接穿透，使用上一个正确执行的值进行传递或者返回，传递值应默认为{@code null}用于应对{@code catchby}和{@code finaby}都为空但是发生了异常的情况
+ * @see trySupplier
+ * @see Function
+ * @see LockType
+ * @since 0.1.0
+ */
+ R lock(@NotNull LockType lockType, @NotNull trySupplier