From 063479e1783556bce02bc0c27b778869041e0e96 Mon Sep 17 00:00:00 2001 From: fybug <1006291762@qq.com> Date: Wed, 15 May 2024 17:01:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BA=20gradle=207.6.?= =?UTF-8?q?4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 30 ++++++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- jar/PDConcurrent.jar | Bin 9040 -> 9040 bytes jar/PDConcurrent_all.jar | Bin 15852 -> 15852 bytes jar/PDConcurrent_sources.jar | Bin 7583 -> 7583 bytes 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index c0a688b..716434a 100644 --- a/build.gradle +++ b/build.gradle @@ -17,36 +17,44 @@ configurations { runtimeClasspath { extendsFrom developmentOnly } - compileOnly { - extendsFrom annotationProcessor - } } repositories { mavenLocal() mavenCentral() + google() maven { url 'https://repo.spring.io/milestone' } maven { url 'https://repo.spring.io/snapshot' } + maven { url "https://repo.spring.io/milestone" } + maven { url 'https://maven.aliyun.com/repository/releases' } + maven { url "https://maven.aliyun.com/repository/jcenter" } + maven { url "https://maven.aliyun.com/repository/mapr-public" } + maven { url "https://maven.aliyun.com/repository/staging-alpha" } maven { url "https://maven.aliyun.com/repository/central" } - maven { url "https://maven.aliyun.com/repository/public" } + maven { url "https://maven.aliyun.com/repository/public/" } maven { url "https://maven.aliyun.com/repository/google" } maven { url "https://maven.aliyun.com/repository/gradle-plugin" } maven { url "https://maven.aliyun.com/repository/spring" } maven { url "https://maven.aliyun.com/repository/spring-plugin" } maven { url "https://maven.aliyun.com/repository/grails-core" } + maven { url "https://maven.aliyun.com/repository/snapshots" } maven { url "https://maven.aliyun.com/repository/apache-snapshots" } - maven { url "http://repo.spring.io/milestone" } + maven { url "https://maven.aliyun.com/repository/staging-alpha-group" } } dependencies { implementation fileTree(dir: 'lib', includes: ['*.jar']) - compileOnly "org.jetbrains:annotations:17.0.0" - compileOnly "org.projectlombok:lombok:1.18.10" - annotationProcessor "org.projectlombok:lombok:1.18.10" - testCompile "junit:junit:4.12" - testCompileOnly "org.jetbrains:annotations:17.0.0" - testCompileOnly "org.projectlombok:lombok:1.18.10" + compileOnly "org.jetbrains:annotations:+" + annotationProcessor "org.jetbrains:annotations:+" + compileOnly "org.projectlombok:lombok:+" + annotationProcessor "org.projectlombok:lombok:+" + + testImplementation "junit:junit:4.12" + testCompileOnly "org.jetbrains:annotations:+" + testAnnotationProcessor "org.jetbrains:annotations:+" + testCompileOnly "org.projectlombok:lombok:+" + testAnnotationProcessor "org.projectlombok:lombok:+" } task PDConcurrent(type: Jar) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 622ab64..3994438 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jar/PDConcurrent.jar b/jar/PDConcurrent.jar index 8ec6fad1d7a5d6088a2f411adaa0c4f4b28a6827..f718edf4548289fdc7abff8086f376972c40135e 100644 GIT binary patch delta 259 zcmccMcEOD|z?+$ci-CcIgF&QY{X||hW)Nl80H$^-gQ@$PAZju I{-zWK0Q^r@)Bpeg delta 259 zcmccMcEOD|z?+$ci-CcIgW>gpqKUj}%pl6F0Zi>w22=MnLDXb!Ml&$&!e|AeH#agy zFoGF(n0z1%ZI(a?qn_0s!Z^t01!3@UsIY()oAOM8Fir{hvw}rr#HMk87?ZcknSkjx za`s?aPu>trC&`W8cg>nM1tuTP})Ti!e0QT|0o86Gg;3o~;tU1a70rgxfoK;+G%!E};&B$(a@rKKz&{4ywg$s!OeuVxtlrYj-z J<};QGEC8v2Rxkhn delta 260 zcmaD;{id2Xz?+$ci-CcIgW>gpqKUj}%pl6F0Zi>w22=MnLDXb!Ml&$&!e|AeH#agy zFoGF(n0z1%ZI(a?qn_0s!Z^t01!3@UsIY()oAOM8Fir{hvw}rr#B$_8jLF@mCSdxI zsXdrxF*5|y7G~yPy2#80Oz$-FfXJIigXtvmNHDz*N=sQl_+?P~l0_g`Ud=K9Ojkna J&1WnXSO5+bYYYGY diff --git a/jar/PDConcurrent_sources.jar b/jar/PDConcurrent_sources.jar index bd9b5d8344b9bb4cf57a91fae0a48d0e4344be80..0ae78b3aa6ab4a30425b710be3da2821e319cb27 100644 GIT binary patch delta 46 wcmbPlJ>Qx)z?+$ci-CcIgF&QY{X||hW+1iEOhE!fPmYu@0nwW$Nbs`)01J~0Jpcdz delta 46 wcmbPlJ>Qx)z?+$ci-CcIgW>gpqKUj}%s^_RnSum}o*XG*0-`rhkl<$p07MB71poj5 -- Gitee From 312f8936a96e0342721b695081e166c174fb2d48 Mon Sep 17 00:00:00 2001 From: fybug <1006291762@qq.com> Date: Mon, 6 Jan 2025 15:25:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 48 +- README.md | 4 +- build.gradle | 169 +++--- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 252 +++++++++ gradlew.bat | 94 ++++ .../nulll/pdconcurrent/LockController.java | 16 + .../fybug/nulll/pdconcurrent/ObjLock.java | 79 ++- .../java/fybug/nulll/pdconcurrent/RWLock.java | 135 +++-- .../java/fybug/nulll/pdconcurrent/ReLock.java | 125 ++--- .../java/fybug/nulll/pdconcurrent/SyLock.java | 519 +++++++++--------- 13 files changed, 912 insertions(+), 536 deletions(-) create mode 100644 .gitattributes create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 src/main/java/fybug/nulll/pdconcurrent/LockController.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore index 3ee9f36..c2065bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,37 @@ -pdfunctionlibrary.properties -pdfunctionlibrary.xml -# Ignore Gradle GUI config -gradle-app.setting +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ -# Cache of project -.gradletasknamecache +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ -.gradle/ -.idea/ -build/ -gradlew.bat -gradlew +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ -# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -# gradle/wrapper/gradle-wrapper.properties +### VS Code ### +.vscode/ diff --git a/README.md b/README.md index 8660d33..c4979e4 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ # PDConcurrent ![java library](https://img.shields.io/badge/type-Libary-gr.svg "type") -![JDK 14](https://img.shields.io/badge/JDK-14-green.svg "SDK") -![Gradle 6.5](https://img.shields.io/badge/Gradle-6.5-04303b.svg "tool") +![JDK 23](https://img.shields.io/badge/JDK-23-green.svg "SDK") +![Gradle 8.10.2](https://img.shields.io/badge/Gradle-8.10.2-04303b.svg "tool") ![Apache 2](https://img.shields.io/badge/license-Apache%202-blue.svg "License") -- [Java Doc](https://apidoc.gitee.com/fybug/PDConcurrent) -- diff --git a/build.gradle b/build.gradle index 716434a..dc7fb37 100644 --- a/build.gradle +++ b/build.gradle @@ -1,113 +1,114 @@ plugins { - id 'java' - id 'idea' + id 'java' + id 'idea' } -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" } group 'fybug.nulll' version = '0.0.2' -sourceCompatibility = '14' -targetCompatibility = '14' -configurations { - developmentOnly - runtimeClasspath { - extendsFrom developmentOnly - } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(23) + } } repositories { - mavenLocal() - mavenCentral() - google() - maven { url 'https://repo.spring.io/milestone' } - maven { url 'https://repo.spring.io/snapshot' } - maven { url "https://repo.spring.io/milestone" } - maven { url 'https://maven.aliyun.com/repository/releases' } - maven { url "https://maven.aliyun.com/repository/jcenter" } - maven { url "https://maven.aliyun.com/repository/mapr-public" } - maven { url "https://maven.aliyun.com/repository/staging-alpha" } - maven { url "https://maven.aliyun.com/repository/central" } - maven { url "https://maven.aliyun.com/repository/public/" } - maven { url "https://maven.aliyun.com/repository/google" } - maven { url "https://maven.aliyun.com/repository/gradle-plugin" } - maven { url "https://maven.aliyun.com/repository/spring" } - maven { url "https://maven.aliyun.com/repository/spring-plugin" } - maven { url "https://maven.aliyun.com/repository/grails-core" } - maven { url "https://maven.aliyun.com/repository/snapshots" } - maven { url "https://maven.aliyun.com/repository/apache-snapshots" } - maven { url "https://maven.aliyun.com/repository/staging-alpha-group" } + mavenLocal() + mavenCentral() + google() + maven { url 'https://maven.aliyun.com/repository/releases' } + maven { url "https://maven.aliyun.com/repository/jcenter" } + maven { url "https://maven.aliyun.com/repository/mapr-public" } + maven { url "https://maven.aliyun.com/repository/staging-alpha" } + maven { url "https://maven.aliyun.com/repository/central" } + maven { url "https://maven.aliyun.com/repository/public/" } + maven { url "https://maven.aliyun.com/repository/google" } + maven { url "https://maven.aliyun.com/repository/gradle-plugin" } + maven { url "https://maven.aliyun.com/repository/spring" } + maven { url "https://maven.aliyun.com/repository/spring-plugin" } + maven { url "https://maven.aliyun.com/repository/grails-core" } + maven { url "https://maven.aliyun.com/repository/snapshots" } + maven { url "https://maven.aliyun.com/repository/apache-snapshots" } + maven { url "https://maven.aliyun.com/repository/staging-alpha-group" } } dependencies { - implementation fileTree(dir: 'lib', includes: ['*.jar']) + implementation fileTree(dir: 'lib', includes: ['*.jar']) - compileOnly "org.jetbrains:annotations:+" - annotationProcessor "org.jetbrains:annotations:+" - compileOnly "org.projectlombok:lombok:+" - annotationProcessor "org.projectlombok:lombok:+" + // compileOnly "org.jetbrains:annotations:+" + // annotationProcessor "org.jetbrains:annotations:+" + compileOnly "jakarta.validation:jakarta.validation-api:+" + annotationProcessor "jakarta.validation:jakarta.validation-api:+" + compileOnly 'org.projectlombok:lombok:+' + annotationProcessor 'org.projectlombok:lombok:+' - testImplementation "junit:junit:4.12" - testCompileOnly "org.jetbrains:annotations:+" - testAnnotationProcessor "org.jetbrains:annotations:+" - testCompileOnly "org.projectlombok:lombok:+" - testAnnotationProcessor "org.projectlombok:lombok:+" + // testImplementation "junit:junit" + // testCompileOnly "org.jetbrains:annotations:+" + // testAnnotationProcessor "org.jetbrains:annotations:+" + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testCompileOnly "jakarta.validation:jakarta.validation-api:+" + testAnnotationProcessor "jakarta.validation:jakarta.validation-api:+" + testCompileOnly "org.projectlombok:lombok:+" + testAnnotationProcessor "org.projectlombok:lombok:+" } +test { + dependencies { + testImplementation "org.junit.platform:junit-platform-launcher" + } + useJUnitPlatform() +} + +// todo 打包重整 task PDConcurrent(type: Jar) { - destinationDirectory = file('jar') - manifest { - attributes( - 'Manifest-Version': '1.0', - 'Built-By': 'fybug/风雨bu改', - 'Created-By': 'IntelliJ IDEA' - ) - } - archiveFileName = 'PDConcurrent.jar' - // 打包编译输出 - from sourceSets.main.output + destinationDirectory = file('jar') + manifest { + attributes('Manifest-Version': '1.0', + 'Built-By': 'fybug/风雨bu改', + 'Created-By': 'IntelliJ IDEA') + } + archiveFileName = 'PDConcurrent.jar' + // 打包编译输出 + from sourceSets.main.output } task PDConcurrent_all(type: Jar) { - destinationDirectory = file('jar') - manifest { - attributes( - 'Manifest-Version': '1.0', - 'Built-By': 'fybug/风雨bu改', - 'Created-By': 'IntelliJ IDEA' - ) - } - archiveFileName = 'PDConcurrent_all.jar' - // 打包编译输出 - from sourceSets.main.output - // 打包源码 - from sourceSets.main.allSource - from { - // implementation 相关的引入解压并打包入新的jar中 - configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } - } + destinationDirectory = file('jar') + manifest { + attributes('Manifest-Version': '1.0', + 'Built-By': 'fybug/风雨bu改', + 'Created-By': 'IntelliJ IDEA') + } + archiveFileName = 'PDConcurrent_all.jar' + // 打包编译输出 + from sourceSets.main.output + // 打包源码 + from sourceSets.main.allSource + from { + // implementation 相关的引入解压并打包入新的jar中 + configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } + } } task PDConcurrent_sources(type: Jar) { - destinationDirectory = file('jar') - manifest { - attributes( - 'Manifest-Version': '1.0', - 'Built-By': 'fybug/风雨bu改', - 'Created-By': 'IntelliJ IDEA' - ) - } - archiveFileName = 'PDConcurrent_sources.jar' - // 打包源码 - from sourceSets.main.allSource + destinationDirectory = file('jar') + manifest { + attributes('Manifest-Version': '1.0', + 'Built-By': 'fybug/风雨bu改', + 'Created-By': 'IntelliJ IDEA') + } + archiveFileName = 'PDConcurrent_sources.jar' + // 打包源码 + from sourceSets.main.allSource } task release { - dependsOn clean - dependsOn PDConcurrent_all - dependsOn PDConcurrent - dependsOn PDConcurrent_sources + dependsOn clean + dependsOn PDConcurrent_all + dependsOn PDConcurrent + dependsOn PDConcurrent_sources } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3994438..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..27bf976 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain DocumentType copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/fybug/nulll/pdconcurrent/LockController.java b/src/main/java/fybug/nulll/pdconcurrent/LockController.java new file mode 100644 index 0000000..4eb795e --- /dev/null +++ b/src/main/java/fybug/nulll/pdconcurrent/LockController.java @@ -0,0 +1,16 @@ +package fybug.nulll.pdconcurrent; + +public +interface LockController { + // todo 降级为读锁 + boolean toreadlock(); + + // todo 写锁次数 + long writelocknum(); + + // todo 读锁次数 + long readlocknum(); + + // todo 是否上过锁 + boolean islock(); +} diff --git a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java index 4d5070d..38d65e1 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java @@ -1,9 +1,8 @@ package fybug.nulll.pdconcurrent; -import org.jetbrains.annotations.NotNull; - import java.util.function.Supplier; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.validation.constraints.NotNull; import lombok.Getter; /** @@ -29,53 +28,51 @@ import lombok.Getter; public class ObjLock implements SyLock { - /** 锁定的对象 */ - @Getter final private Object LOCK; + /** 锁定的对象 */ + @Getter final private Object LOCK; - public - ObjLock() {this(new Object());} + public + ObjLock() { this(new Object()); } - /** 生成并发管理，并指定使用的并发对象锁 */ - public - ObjLock(@NotNull Object lock) {LOCK = lock;} + /** 生成并发管理，并指定使用的并发对象锁 */ + public + ObjLock(@NotNull Object lock) { LOCK = lock; } - //---------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------- - @Override - public - T read(@NotNull Supplier run) { return run(run); } + @Override + public + T read(@NotNull Supplier run) { return run(run); } - @Override - public - T write(@NotNull Supplier run) { return run(run); } + @Override + public + T write(@NotNull Supplier run) { return run(run); } - // 读写一致 - private - T run(Supplier run) { - synchronized ( LOCK ){ - return run.get(); - } - } + // 读写一致 + private + T run(Supplier run) { + synchronized ( LOCK ){ + return run.get(); + } + } - //---------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------- - @Override - public - T tryread(@NotNull Class ecla, @NotNull trySupplier run) - throws E - { return tryrun(ecla, run); } + @Override + public + T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E + { return tryrun(ecla, run); } - @Override - public - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) - throws E - { return tryrun(ecla, run); } + @Override + public + T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E + { return tryrun(ecla, run); } - // 读写一致 - private - T tryrun(Class ecla, trySupplier run) throws E { - synchronized ( LOCK ){ - return run.get(); - } - } + // 读写一致 + private + T tryrun(Class ecla, trySupplier run) throws E { + synchronized ( LOCK ){ + return run.get(); + } + } } diff --git a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java index bff3d77..1eebb4c 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java @@ -1,11 +1,10 @@ package fybug.nulll.pdconcurrent; -import org.jetbrains.annotations.NotNull; - import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Supplier; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.validation.constraints.NotNull; import lombok.Getter; /** @@ -42,82 +41,80 @@ import lombok.Getter; public class RWLock implements SyLock { - @Getter final private ReentrantReadWriteLock LOCK; - @Getter final private ReentrantReadWriteLock.ReadLock Read_LOCK; - @Getter final private ReentrantReadWriteLock.WriteLock Write_LOCK; + @Getter final private ReentrantReadWriteLock LOCK; + @Getter final private ReentrantReadWriteLock.ReadLock Read_LOCK; + @Getter final private ReentrantReadWriteLock.WriteLock Write_LOCK; - public - RWLock() {this(false);} + public + RWLock() { this(false); } - /** 生成并发管理，并指定是否使用公平锁 */ - public - RWLock(boolean fair) { - LOCK = new ReentrantReadWriteLock(false); - Read_LOCK = LOCK.readLock(); - Write_LOCK = LOCK.writeLock(); - } + /** 生成并发管理，并指定是否使用公平锁 */ + public + RWLock(boolean fair) { + LOCK = new ReentrantReadWriteLock(false); + Read_LOCK = LOCK.readLock(); + Write_LOCK = LOCK.writeLock(); + } - //---------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------- - @Override - public - T read(@NotNull Supplier run) { - try { - Read_LOCK.lock(); - return run.get(); - } finally { - Read_LOCK.unlock(); - } - } + @Override + public + T read(@NotNull Supplier run) { + try { + Read_LOCK.lock(); + return run.get(); + } finally { + Read_LOCK.unlock(); + } + } - @Override - public - T write(@NotNull Supplier run) { - try { - Write_LOCK.lock(); - return run.get(); - } finally { - Write_LOCK.unlock(); - } - } + @Override + public + T write(@NotNull Supplier run) { + try { + Write_LOCK.lock(); + return run.get(); + } finally { + Write_LOCK.unlock(); + } + } - //---------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------- - @Override - public - T tryread(@NotNull Class ecla, @NotNull trySupplier run) - throws E - { - try { - Read_LOCK.lock(); - return run.get(); - } finally { - Read_LOCK.unlock(); - } - } + @Override + public + T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E + { + try { + Read_LOCK.lock(); + return run.get(); + } finally { + Read_LOCK.unlock(); + } + } - @Override - public - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) - throws E - { - try { - Write_LOCK.lock(); - return run.get(); - } finally { - Write_LOCK.unlock(); - } - } + @Override + public + T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E + { + try { + Write_LOCK.lock(); + return run.get(); + } finally { + Write_LOCK.unlock(); + } + } - //---------------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------------- - /** 获取 {@link Condition} */ - @NotNull - public - Condition newReadCondition() {return Read_LOCK.newCondition();} + /** 获取 {@link Condition} */ + @NotNull + public + Condition newReadCondition() { return Read_LOCK.newCondition(); } - /** 获取 {@link Condition} */ - @NotNull - public - Condition newWriteCondition() {return Write_LOCK.newCondition();} + /** 获取 {@link Condition} */ + @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 b5208f0..e40dd10 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ReLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ReLock.java @@ -1,11 +1,10 @@ package fybug.nulll.pdconcurrent; -import org.jetbrains.annotations.NotNull; - import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.validation.constraints.NotNull; import lombok.Getter; /** @@ -35,66 +34,64 @@ import lombok.Getter; public class ReLock implements SyLock { - // 锁 - @Getter private final ReentrantLock LOCK; - - public - ReLock() {this(false);} - - /** 构造并发处理，并决定使用公平锁还是非公平锁 */ - public - ReLock(boolean fair) { LOCK = new ReentrantLock(fair); } - - //---------------------------------------------------------------------------------------------- - - @Override - public - T read(@NotNull Supplier run) { return run(run); } - - @Override - public - T write(@NotNull Supplier run) { return run(run); } - - // 读写无区别 - private - T run(Supplier run) { - try { - LOCK.lock(); - return run.get(); - } finally { - LOCK.unlock(); - } - } - - //------------------------------------------ - - @Override - public - T tryread(@NotNull Class ecla, @NotNull trySupplier run) - throws E - { return tryrun(ecla, run); } - - @Override - public - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) - throws E - { return tryrun(ecla, run); } - - // 读写无区别 - private - T tryrun(Class ecla, trySupplier run) throws E { - try { - LOCK.lock(); - return run.get(); - } finally { - LOCK.unlock(); - } - } - - //------------------------------------------- - - /** 获取 {@link Condition} */ - @NotNull - public - Condition newCondition() {return LOCK.newCondition();} + // 锁 + @Getter private final ReentrantLock LOCK; + + public + ReLock() { this(false); } + + /** 构造并发处理，并决定使用公平锁还是非公平锁 */ + public + ReLock(boolean fair) { LOCK = new ReentrantLock(fair); } + + //---------------------------------------------------------------------------------------------- + + @Override + public + T read(@NotNull Supplier run) { return run(run); } + + @Override + public + T write(@NotNull Supplier run) { return run(run); } + + // 读写无区别 + private + T run(Supplier run) { + try { + LOCK.lock(); + return run.get(); + } finally { + LOCK.unlock(); + } + } + + //------------------------------------------ + + @Override + public + T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E + { return tryrun(ecla, run); } + + @Override + public + T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E + { return tryrun(ecla, run); } + + // 读写无区别 + private + T tryrun(Class ecla, trySupplier run) throws E { + try { + LOCK.lock(); + return run.get(); + } finally { + LOCK.unlock(); + } + } + + //------------------------------------------- + + /** 获取 {@link Condition} */ + @NotNull + public + Condition newCondition() { return LOCK.newCondition(); } } diff --git a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java index 620ccc0..2613fe0 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java @@ -1,11 +1,10 @@ package fybug.nulll.pdconcurrent; -import org.jetbrains.annotations.NotNull; - import java.util.function.Consumer; import java.util.function.Supplier; import fybug.nulll.pdconcurrent.fun.tryRunnable; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.validation.constraints.NotNull; /** *

并发管理.

@@ -23,289 +22,289 @@ import fybug.nulll.pdconcurrent.fun.trySupplier; */ public interface SyLock { + // todo 检查需要全局锁的工具的锁顺序 + // todo 锁工具更新：可传入锁状态指定读锁写锁不上锁 + // todo 锁工具更新：利用锁工具中的try减少代码中的try的数量 + + /** + * 申请并运行于读锁 + * + * @param run 运行代码 + */ + default + void read(@NotNull Runnable run) { + read(() -> { + run.run(); + return null; + }); + } + + /** + * 申请并运行于写锁 + * + * @param run 运行代码 + */ + default + void write(@NotNull Runnable run) { + write(() -> { + run.run(); + return null; + }); + } - /** - * 申请并运行于读锁 - * - * @param run 运行代码 - */ - default - void read(@NotNull Runnable run) { - read(() -> { - run.run(); - return null; - }); - } + //------------------------------------ - /** - * 申请并运行于写锁 - * - * @param run 运行代码 - */ - default - void write(@NotNull Runnable run) { - write(() -> { - run.run(); - return null; - }); - } + /** + * 申请并运行于读锁 + * + * @param run 带返回的运行代码 + * + * @return 接口生成的数据 + */ + T read(@NotNull Supplier run); - //------------------------------------ + /** + * 申请并运行于写锁 + * + * @param run 带返回的运行代码 + * + * @return 接口生成的数据 + */ + T write(@NotNull Supplier run); - /** - * 申请并运行于读锁 - * - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T read(@NotNull Supplier run); + //---------------------------------------------------------------------------------------------- - /** - * 申请并运行于写锁 - * - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T write(@NotNull Supplier run); + /** + * 尝试运行于读锁 + * + * @param ecla 异常的类 + * @param run 运行代码 + */ + default + void tryread(@NotNull Class ecla, @NotNull tryRunnable run) throws E + { + tryread(ecla, () -> { + run.run(); + return null; + }); + } - //---------------------------------------------------------------------------------------------- + /** + * 尝试运行于写锁 + * + * @param ecla 异常的类 + * @param run 运行代码 + */ + default + void trywrite(@NotNull Class ecla, @NotNull tryRunnable run) throws E + { + trywrite(ecla, () -> { + run.run(); + return null; + }); + } - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - */ - default - void tryread(@NotNull Class ecla, @NotNull tryRunnable run) throws E - { - tryread(ecla, () -> { - run.run(); - return null; - }); - } + //------------------------------------ - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - */ - default - void trywrite(@NotNull Class ecla, @NotNull tryRunnable run) - throws E - { - trywrite(ecla, () -> { - run.run(); - return null; - }); - } + /** + * 尝试运行于读锁 + * + * @param ecla 异常的类 + * @param run 带返回的运行代码 + * + * @return 接口生成的数据 + */ + T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E; - //------------------------------------ + /** + * 尝试运行于写锁 + * + * @param ecla 异常的类 + * @param run 带返回的运行代码 + * + * @return 接口生成的数据 + */ + T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E; - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T tryread(@NotNull Class ecla, @NotNull trySupplier run) - throws E; + //---------------------------------------------------------------------------------------------- - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) - throws E; + /** + * 尝试运行于读锁 + * + * @param ecla 异常的类 + * @param run 运行代码 + * @param cate 异常处理代码 + * + * @since SyLock 0.0.2 + */ + default + void tryread(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate) + { + tryread(ecla, () -> { + run.run(); + return null; + }, cate, () -> {}); + } - //---------------------------------------------------------------------------------------------- + /** + * 尝试运行于写锁 + * + * @param ecla 异常的类 + * @param run 运行代码 + * @param cate 异常处理代码 + * + * @since SyLock 0.0.2 + */ + default + void trywrite(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate) + { + trywrite(ecla, () -> { + run.run(); + return null; + }, cate, () -> {}); + } - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 - * - * @since SyLock 0.0.2 - */ - default - void tryread(@NotNull Class ecla, @NotNull tryRunnable run, - @NotNull Consumer cate) - { - tryread(ecla, () -> { - run.run(); - return null; - }, cate, () -> {}); - } + //------------------------------------ - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 - * - * @since SyLock 0.0.2 - */ - default - void trywrite(@NotNull Class ecla, @NotNull tryRunnable run, - @NotNull Consumer cate) - { - trywrite(ecla, () -> { - run.run(); - return null; - }, cate, () -> {}); - } + /** + * 尝试运行于读锁 + * + * @param ecla 异常的类 + * @param run 带返回的运行代码 + * @param cate 异常处理代码 + * + * @return 接口生成的数据 + * + * @since SyLock 0.0.2 + */ + default + T tryread(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate) + { return tryread(ecla, run, cate, () -> {}); } - //------------------------------------ + /** + * 尝试运行于写锁 + * + * @param ecla 异常的类 + * @param run 带返回的运行代码 + * @param cate 异常处理代码 + * + * @return 接口生成的数据 + * + * @since SyLock 0.0.2 + */ + default + T trywrite(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate) + { return trywrite(ecla, run, cate, () -> {}); } - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 - * - * @return 接口生成的数据 - * - * @since SyLock 0.0.2 - */ - default - T tryread(@NotNull Class ecla, @NotNull trySupplier run, - @NotNull Consumer cate) - { return tryread(ecla, run, cate, () -> {}); } + //---------------------------------------------------------------------------------------------- - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 - * - * @return 接口生成的数据 - * - * @since SyLock 0.0.2 - */ - default - T trywrite(@NotNull Class ecla, @NotNull trySupplier run, - @NotNull Consumer cate) - { return trywrite(ecla, run, cate, () -> {}); } + /** + * 尝试运行于读锁 + * + * @param ecla 异常的类 + * @param run 运行代码 + * @param cate 异常处理代码 + * + * @since SyLock 0.0.2 + */ + default + void tryread(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate, + @NotNull Runnable finall) + { + tryread(ecla, () -> { + run.run(); + return null; + }, cate, finall); + } - //---------------------------------------------------------------------------------------------- + /** + * 尝试运行于写锁 + * + * @param ecla 异常的类 + * @param run 运行代码 + * @param cate 异常处理代码 + * + * @since SyLock 0.0.2 + */ + default + void trywrite(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate, + @NotNull Runnable finall) + { + trywrite(ecla, () -> { + run.run(); + return null; + }, cate, finall); + } - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 - * - * @since SyLock 0.0.2 - */ - default - void tryread(@NotNull Class ecla, @NotNull tryRunnable run, - @NotNull Consumer cate, @NotNull Runnable finall) - { - tryread(ecla, () -> { - run.run(); - return null; - }, cate, finall); - } + //------------------------------------ - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 - * - * @since SyLock 0.0.2 - */ - default - void trywrite(@NotNull Class ecla, @NotNull tryRunnable run, - @NotNull Consumer cate, @NotNull Runnable finall) - { - trywrite(ecla, () -> { - run.run(); - return null; - }, cate, finall); - } + /** + * 尝试运行于读锁 + * + * @param ecla 异常的类 + * @param run 带返回的运行代码 + * @param cate 异常处理代码 + * @param finall finally 块处理代码 + * + * @return 接口生成的数据 + * + * @since SyLock 0.0.2 + */ + default + T tryread(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate, + @NotNull Runnable finall) + { + try { + return tryread(ecla, run); + } catch ( Exception e ) { + cate.accept((E) e); + return null; + } finally { + finall.run(); + } + } - //------------------------------------ + /** + * 尝试运行于写锁 + * + * @param ecla 异常的类 + * @param run 带返回的运行代码 + * @param cate 异常处理代码 + * @param finall finally 块处理代码 + * + * @return 接口生成的数据 + * + * @since SyLock 0.0.2 + */ + default + T trywrite(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate, + @NotNull Runnable finall) + { + try { + return trywrite(ecla, run); + } catch ( Exception e ) { + cate.accept((E) e); + return null; + } finally { + finall.run(); + } + } - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 - * @param finall finally 块处理代码 - * - * @return 接口生成的数据 - * - * @since SyLock 0.0.2 - */ - default - T tryread(@NotNull Class ecla, @NotNull trySupplier run, - @NotNull Consumer cate, @NotNull Runnable finall) - { - try { - return tryread(ecla, run); - } catch ( Exception e ) { - cate.accept((E) e); - return null; - } finally { - finall.run(); - } - } + /*--------------------------------------------------------------------------------------------*/ - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 - * @param finall finally 块处理代码 - * - * @return 接口生成的数据 - * - * @since SyLock 0.0.2 - */ - default - T trywrite(@NotNull Class ecla, @NotNull trySupplier run, - @NotNull Consumer cate, @NotNull Runnable finall) - { - try { - return trywrite(ecla, run); - } catch ( Exception e ) { - cate.accept((E) e); - return null; - } finally { - finall.run(); - } - } + LockController getLockController(); - /*--------------------------------------------------------------------------------------------*/ + /*--------------------------------------------------------------------------------------------*/ - /** 获取传统并发实现 */ - static @NotNull - ObjLock newObjLock() {return new ObjLock();} + /** 获取传统并发实现 */ + static @NotNull + ObjLock newObjLock() { return new ObjLock(); } - /** 获取 Lock 实现 */ - static @NotNull - ReLock newReLock() {return new ReLock();} + /** 获取 Lock 实现 */ + static @NotNull + ReLock newReLock() { return new ReLock(); } - /** 获取读写锁实现 */ - static @NotNull - RWLock newRWLock() {return new RWLock();} + /** 获取读写锁实现 */ + static @NotNull + RWLock newRWLock() { return new RWLock(); } } -- Gitee From 8ccc8f49d59a44e0534a2621b1606d47406490d9 Mon Sep 17 00:00:00 2001 From: fybug <1006291762@qq.com> Date: Tue, 7 Jan 2025 00:24:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 + .../nulll/pdconcurrent/LockController.java | 16 - .../fybug/nulll/pdconcurrent/ObjLock.java | 68 ++-- .../java/fybug/nulll/pdconcurrent/RWLock.java | 109 ++++--- .../java/fybug/nulll/pdconcurrent/ReLock.java | 64 ++-- .../java/fybug/nulll/pdconcurrent/SyLock.java | 295 +++++------------- .../fybug/nulll/pdconcurrent/e/LockType.java | 8 + .../nulll/pdconcurrent/fun/package-info.java | 2 +- .../nulll/pdconcurrent/fun/tryBiConsumer.java | 14 - .../nulll/pdconcurrent/fun/tryConsumer.java | 41 ++- .../nulll/pdconcurrent/fun/tryFunction.java | 30 +- .../nulll/pdconcurrent/fun/tryRunnable.java | 69 +++- .../nulll/pdconcurrent/fun/trySupplier.java | 29 +- 13 files changed, 356 insertions(+), 393 deletions(-) delete mode 100644 src/main/java/fybug/nulll/pdconcurrent/LockController.java create mode 100644 src/main/java/fybug/nulll/pdconcurrent/e/LockType.java delete mode 100644 src/main/java/fybug/nulll/pdconcurrent/fun/tryBiConsumer.java diff --git a/build.gradle b/build.gradle index dc7fb37..96f1541 100644 --- a/build.gradle +++ b/build.gradle @@ -43,6 +43,8 @@ dependencies { // annotationProcessor "org.jetbrains:annotations:+" compileOnly "jakarta.validation:jakarta.validation-api:+" annotationProcessor "jakarta.validation:jakarta.validation-api:+" + compileOnly "jakarta.annotation:jakarta.annotation-api:+" + annotationProcessor "jakarta.annotation:jakarta.annotation-api:+" compileOnly 'org.projectlombok:lombok:+' annotationProcessor 'org.projectlombok:lombok:+' @@ -52,6 +54,8 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testCompileOnly "jakarta.validation:jakarta.validation-api:+" testAnnotationProcessor "jakarta.validation:jakarta.validation-api:+" + testCompileOnly "jakarta.annotation:jakarta.annotation-api:+" + testAnnotationProcessor "jakarta.annotation:jakarta.annotation-api:+" testCompileOnly "org.projectlombok:lombok:+" testAnnotationProcessor "org.projectlombok:lombok:+" } diff --git a/src/main/java/fybug/nulll/pdconcurrent/LockController.java b/src/main/java/fybug/nulll/pdconcurrent/LockController.java deleted file mode 100644 index 4eb795e..0000000 --- a/src/main/java/fybug/nulll/pdconcurrent/LockController.java +++ /dev/null @@ -1,16 +0,0 @@ -package fybug.nulll.pdconcurrent; - -public -interface LockController { - // todo 降级为读锁 - boolean toreadlock(); - - // todo 写锁次数 - long writelocknum(); - - // todo 读锁次数 - long readlocknum(); - - // todo 是否上过锁 - boolean islock(); -} diff --git a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java index 38d65e1..69e0fad 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java @@ -1,7 +1,9 @@ package fybug.nulll.pdconcurrent; -import java.util.function.Supplier; +import java.util.function.Function; +import fybug.nulll.pdconcurrent.e.LockType; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import lombok.Getter; @@ -25,11 +27,11 @@ import lombok.Getter; * @version 0.0.1 * @since PDConcurrent 0.0.1 */ +@Getter public class ObjLock implements SyLock { - /** 锁定的对象 */ - @Getter final private Object LOCK; + private final Object LOCK; public ObjLock() { this(new Object()); } @@ -40,39 +42,35 @@ class ObjLock implements SyLock { //---------------------------------------------------------------------------------------------- - @Override - public - T read(@NotNull Supplier run) { return run(run); } - - @Override public - T write(@NotNull Supplier run) { return run(run); } - - // 读写一致 - private - T run(Supplier run) { - synchronized ( LOCK ){ - return run.get(); - } - } - - //---------------------------------------------------------------------------------------------- - - @Override - public - T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E - { return tryrun(ecla, run); } - - @Override - public - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E - { return tryrun(ecla, run); } - - // 读写一致 - private - T tryrun(Class ecla, trySupplier run) throws E { - synchronized ( LOCK ){ - return run.get(); + 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 ( Throwable e ) { + if ( catchby != null ) + o = catchby.apply(e); + } finally { + if ( finaby != null ) + o = finaby.apply(o); + } + } else { + synchronized ( LOCK ){ + try { + o = run.get(); + } catch ( Throwable e ) { + if ( catchby != null ) + o = catchby.apply(e); + } 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 1eebb4c..f64d614 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java @@ -1,9 +1,11 @@ package fybug.nulll.pdconcurrent; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.function.Supplier; +import java.util.function.Function; +import fybug.nulll.pdconcurrent.e.LockType; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import lombok.Getter; @@ -38,72 +40,64 @@ import lombok.Getter; * @version 0.0.1 * @since PDConcurrent 0.0.1 */ +@Getter public class RWLock implements SyLock { - - @Getter final private ReentrantReadWriteLock LOCK; - @Getter final private ReentrantReadWriteLock.ReadLock Read_LOCK; - @Getter final private ReentrantReadWriteLock.WriteLock Write_LOCK; + private final ReentrantReadWriteLock LOCK; + private final ReentrantReadWriteLock.ReadLock Read_LOCK; + private final ReentrantReadWriteLock.WriteLock Write_LOCK; + private final ThreadLocal IS_LOCK = new ThreadLocal<>(); public RWLock() { this(false); } /** 生成并发管理，并指定是否使用公平锁 */ public - RWLock(boolean fair) { - LOCK = new ReentrantReadWriteLock(false); - Read_LOCK = LOCK.readLock(); - Write_LOCK = LOCK.writeLock(); - } - - //---------------------------------------------------------------------------------------------- - - @Override - public - T read(@NotNull Supplier run) { - try { - Read_LOCK.lock(); - return run.get(); - } finally { - Read_LOCK.unlock(); - } - } + RWLock(boolean fair) { this(new ReentrantReadWriteLock(fair)); } - @Override public - T write(@NotNull Supplier run) { - try { - Write_LOCK.lock(); - return run.get(); - } finally { - Write_LOCK.unlock(); - } + RWLock(@NotNull ReentrantReadWriteLock lock) { + LOCK = lock; + Read_LOCK = LOCK.readLock(); + Write_LOCK = LOCK.writeLock(); } //---------------------------------------------------------------------------------------------- @Override public - T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E + R lock(@NotNull LockType lockType, trySupplier run, @Nullable Function catchby, + @Nullable Function finaby) { + R o = null; + // set null + IS_LOCK.remove(); try { - Read_LOCK.lock(); - return run.get(); + if ( lockType != LockType.NOLOCK ) { + if ( lockType == LockType.READ ) { + Read_LOCK.lockInterruptibly(); + IS_LOCK.set((short) 1); + } else { + Write_LOCK.lockInterruptibly(); + IS_LOCK.set((short) 2); + } + } + o = run.get(); + } catch ( Throwable e ) { + if ( catchby != null ) + o = catchby.apply(e); } finally { - Read_LOCK.unlock(); - } - } - - @Override - public - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E - { - try { - Write_LOCK.lock(); - return run.get(); - } finally { - Write_LOCK.unlock(); + if ( finaby != null ) + o = finaby.apply(o); + // 根据实际状态解锁 + if ( IS_LOCK.get() == 1 ) { + Read_LOCK.unlock(); + } else if ( IS_LOCK.get() == 2 ) { + Write_LOCK.unlock(); + } + IS_LOCK.remove(); } + return o; } //---------------------------------------------------------------------------------------------- @@ -117,4 +111,25 @@ class RWLock implements SyLock { @NotNull public Condition newWriteCondition() { return Write_LOCK.newCondition(); } + + public + boolean isLocked() { return IS_LOCK.get() != null && IS_LOCK.get() > 0; } + + public + boolean isReadLocked() { return IS_LOCK.get() == 1; } + + public + boolean isWriteLocked() { return IS_LOCK.get() == 2; } + + public + boolean toread() throws InterruptedException { + // 转为读锁 + if ( IS_LOCK.get() == 2 ) { + Read_LOCK.lockInterruptibly(); + Write_LOCK.unlock(); + IS_LOCK.set((short) 1); + return true; + } + return false; + } } \ 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 e40dd10..cc066fb 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ReLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ReLock.java @@ -1,9 +1,11 @@ package fybug.nulll.pdconcurrent; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import java.util.function.Supplier; +import java.util.function.Function; +import fybug.nulll.pdconcurrent.e.LockType; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; import lombok.Getter; @@ -31,64 +33,48 @@ import lombok.Getter; * @version 0.0.1 * @since PDConcurrent 0.0.1 */ +@Getter public class ReLock implements SyLock { - // 锁 - @Getter private final ReentrantLock LOCK; + private final ReentrantLock LOCK; public ReLock() { this(false); } /** 构造并发处理，并决定使用公平锁还是非公平锁 */ public - ReLock(boolean fair) { LOCK = new ReentrantLock(fair); } - - //---------------------------------------------------------------------------------------------- + ReLock(boolean fair) { this(new ReentrantLock(fair)); } - @Override public - T read(@NotNull Supplier run) { return run(run); } - - @Override - public - T write(@NotNull Supplier run) { return run(run); } - - // 读写无区别 - private - T run(Supplier run) { - try { - LOCK.lock(); - return run.get(); - } finally { - LOCK.unlock(); - } - } + ReLock(@NotNull ReentrantLock LOCK) { this.LOCK = LOCK; } - //------------------------------------------ - - @Override - public - T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E - { return tryrun(ecla, run); } + //---------------------------------------------------------------------------------------------- @Override public - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E - { return tryrun(ecla, run); } - - // 读写无区别 - private - T tryrun(Class ecla, trySupplier run) throws E { + R lock(@NotNull LockType lockType, trySupplier run, @Nullable Function catchby, + @Nullable Function finaby) + { + R o = null; try { - LOCK.lock(); - return run.get(); + if ( lockType != LockType.NOLOCK ) + LOCK.lockInterruptibly(); + o = run.get(); + } catch ( Throwable e ) { + if ( catchby != null ) + o = catchby.apply(e); } finally { - LOCK.unlock(); + if ( finaby != null ) + o = finaby.apply(o); + if ( lockType != LockType.NOLOCK && LOCK.isLocked() ) + LOCK.unlock(); } + return o; } - //------------------------------------------- + public + boolean isLocked() { return LOCK.isLocked(); } /** 获取 {@link Condition} */ @NotNull diff --git a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java index 2613fe0..45fb5f9 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java @@ -1,9 +1,11 @@ package fybug.nulll.pdconcurrent; import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.function.Function; +import fybug.nulll.pdconcurrent.e.LockType; import fybug.nulll.pdconcurrent.fun.tryRunnable; import fybug.nulll.pdconcurrent.fun.trySupplier; +import jakarta.annotation.Nullable; import jakarta.validation.constraints.NotNull; /** @@ -22,277 +24,90 @@ import jakarta.validation.constraints.NotNull; */ public interface SyLock { - // todo 检查需要全局锁的工具的锁顺序 - // todo 锁工具更新：可传入锁状态指定读锁写锁不上锁 - // todo 锁工具更新：利用锁工具中的try减少代码中的try的数量 - /** - * 申请并运行于读锁 - * - * @param run 运行代码 - */ default - void read(@NotNull Runnable run) { - read(() -> { - run.run(); - return null; - }); - } + c lock(@NotNull LockType lockType) { return new c(this, lockType); } - /** - * 申请并运行于写锁 - * - * @param run 运行代码 - */ default - void write(@NotNull Runnable run) { - write(() -> { - run.run(); - return null; - }); - } - - //------------------------------------ - - /** - * 申请并运行于读锁 - * - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T read(@NotNull Supplier run); - - /** - * 申请并运行于写锁 - * - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T write(@NotNull Supplier run); - - //---------------------------------------------------------------------------------------------- + void lock(@NotNull LockType lockType, @NotNull tryRunnable run) { lock(lockType, run, null, null); } - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - */ default - void tryread(@NotNull Class ecla, @NotNull tryRunnable run) throws E + void lock(@NotNull LockType lockType, @NotNull tryRunnable run, @Nullable Consumer catchby, + @Nullable Runnable finaby) { - tryread(ecla, () -> { + lock(lockType, () -> { run.run(); return null; - }); - } - - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - */ - default - void trywrite(@NotNull Class ecla, @NotNull tryRunnable run) throws E - { - trywrite(ecla, () -> { - run.run(); + }, catchby == null ? null : e -> { + catchby.accept(e); + return null; + }, finaby == null ? null : _ -> { + finaby.run(); return null; }); } - //------------------------------------ - - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T tryread(@NotNull Class ecla, @NotNull trySupplier run) throws E; + default + R lock(@NotNull LockType lockType, @NotNull trySupplier run) { return lock(lockType, run, null, null); } - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * - * @return 接口生成的数据 - */ - T trywrite(@NotNull Class ecla, @NotNull trySupplier run) throws E; + R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby, + @Nullable Function finaby); //---------------------------------------------------------------------------------------------- /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 + * 申请并运行于读锁 * - * @since SyLock 0.0.2 + * @param run 运行代码 */ default - void tryread(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate) - { - tryread(ecla, () -> { - run.run(); - return null; - }, cate, () -> {}); - } + void read(@NotNull tryRunnable run) { lock(LockType.READ, run); } /** - * 尝试运行于写锁 + * 申请并运行于读锁 * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 + * @param run 带返回的运行代码 * - * @since SyLock 0.0.2 + * @return 接口生成的数据 */ default - void trywrite(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate) - { - trywrite(ecla, () -> { - run.run(); - return null; - }, cate, () -> {}); - } - - //------------------------------------ + R read(@NotNull trySupplier run) { return lock(LockType.READ, run); } /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 - * - * @return 接口生成的数据 + * 申请并运行于写锁 * - * @since SyLock 0.0.2 + * @param run 运行代码 */ default - T tryread(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate) - { return tryread(ecla, run, cate, () -> {}); } + void write(@NotNull tryRunnable run) { lock(LockType.WRITE, run); } /** - * 尝试运行于写锁 + * 申请并运行于写锁 * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 + * @param run 带返回的运行代码 * * @return 接口生成的数据 - * - * @since SyLock 0.0.2 */ default - T trywrite(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate) - { return trywrite(ecla, run, cate, () -> {}); } + R write(@NotNull trySupplier run) { return lock(LockType.WRITE, run); } //---------------------------------------------------------------------------------------------- - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 - * - * @since SyLock 0.0.2 - */ default - void tryread(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate, - @NotNull Runnable finall) - { - tryread(ecla, () -> { - run.run(); - return null; - }, cate, finall); - } + void read(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby) + { lock(LockType.READ, run, catchby, finaby); } - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 运行代码 - * @param cate 异常处理代码 - * - * @since SyLock 0.0.2 - */ default - void trywrite(@NotNull Class ecla, @NotNull tryRunnable run, @NotNull Consumer cate, - @NotNull Runnable finall) - { - trywrite(ecla, () -> { - run.run(); - return null; - }, cate, finall); - } - - //------------------------------------ + R read(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) + { return lock(LockType.READ, run, catchby, finaby); } - /** - * 尝试运行于读锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 - * @param finall finally 块处理代码 - * - * @return 接口生成的数据 - * - * @since SyLock 0.0.2 - */ default - T tryread(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate, - @NotNull Runnable finall) - { - try { - return tryread(ecla, run); - } catch ( Exception e ) { - cate.accept((E) e); - return null; - } finally { - finall.run(); - } - } + void write(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby) + { lock(LockType.WRITE, run, catchby, finaby); } - /** - * 尝试运行于写锁 - * - * @param ecla 异常的类 - * @param run 带返回的运行代码 - * @param cate 异常处理代码 - * @param finall finally 块处理代码 - * - * @return 接口生成的数据 - * - * @since SyLock 0.0.2 - */ default - T trywrite(@NotNull Class ecla, @NotNull trySupplier run, @NotNull Consumer cate, - @NotNull Runnable finall) - { - try { - return trywrite(ecla, run); - } catch ( Exception e ) { - cate.accept((E) e); - return null; - } finally { - finall.run(); - } - } - - /*--------------------------------------------------------------------------------------------*/ - - LockController getLockController(); + R write(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) + { return lock(LockType.WRITE, run, catchby, finaby); } /*--------------------------------------------------------------------------------------------*/ @@ -307,4 +122,38 @@ interface SyLock { /** 获取读写锁实现 */ static @NotNull RWLock newRWLock() { return new RWLock(); } + + class c { + @NotNull SyLock self; + @NotNull LockType lockType; + @NotNull trySupplier run = null; + @Nullable Function catchby = null; + @Nullable Function finaby = null; + + c(@NotNull SyLock self, @NotNull LockType lockType) { + this.self = self; + this.lockType = lockType; + } + + public + c run(@NotNull trySupplier run) { + this.run = run; + return this; + } + + public + c catchby(@Nullable Function catchby) { + this.catchby = catchby; + return this; + } + + public + c finaby(@Nullable Function finaby) { + this.finaby = finaby; + return this; + } + + public + R start() { return self.lock(lockType, run, catchby, finaby); } + } } diff --git a/src/main/java/fybug/nulll/pdconcurrent/e/LockType.java b/src/main/java/fybug/nulll/pdconcurrent/e/LockType.java new file mode 100644 index 0000000..9d45853 --- /dev/null +++ b/src/main/java/fybug/nulll/pdconcurrent/e/LockType.java @@ -0,0 +1,8 @@ +package fybug.nulll.pdconcurrent.e; + +public +enum LockType { + READ, + WRITE, + NOLOCK +} diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java b/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java index 3034641..3a258d5 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java @@ -2,7 +2,7 @@ * 功能接口包 * * @author fybug - * @version 0.0.2 + * @version 0.0.3 * @since PDConcurrent 0.0.1 */ package fybug.nulll.pdconcurrent.fun; \ No newline at end of file diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/tryBiConsumer.java b/src/main/java/fybug/nulll/pdconcurrent/fun/tryBiConsumer.java deleted file mode 100644 index 291bc82..0000000 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/tryBiConsumer.java +++ /dev/null @@ -1,14 +0,0 @@ -package fybug.nulll.pdconcurrent.fun; -import java.util.function.BiConsumer; - -/** - * @author fybug - * @version 0.0.1 - * @see BiConsumer - * @since fun 0.0.1 - */ -@FunctionalInterface -public -interface tryBiConsumer { - void accept(T t, U u) throws E; -} diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java b/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java index 9749371..efe92ca 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java @@ -1,14 +1,45 @@ package fybug.nulll.pdconcurrent.fun; import java.util.function.Consumer; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; + /** * @author fybug - * @version 0.0.1 + * @version 0.0.2 * @see Consumer - * @since fun 0.0.1 + * @since fun 0.0.3 */ -@FunctionalInterface public -interface tryConsumer { - void accept(T t) throws E; +interface tryConsumer { + void accept(T t) throws Throwable; + + /** @since 0.0.2 */ + @NotNull + default + tryConsumer andThen(@Nullable tryRunnable after) { + if ( after != null ) { + return t -> { + accept(t); + after.run(); + }; + } + return this; + } + + /** @since 0.0.2 */ + @NotNull + default + tryFunction andThen(@Nullable trySupplier after) { + if ( after != null ) { + return t -> { + accept(t); + return after.get(); + }; + } + return t -> { + accept(t); + return null; + }; + } } diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java b/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java index 2c515ad..b3aeab8 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java @@ -1,14 +1,34 @@ package fybug.nulll.pdconcurrent.fun; import java.util.function.Function; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; + /** * @author fybug - * @version 0.0.1 + * @version 0.0.2 * @see Function - * @since fun 0.0.1 + * @since fun 0.0.3 */ -@FunctionalInterface public -interface tryFunction { - R apply(T t) throws E; +interface tryFunction { + R apply(T t) throws Throwable; + + /** @since 0.0.2 */ + @NotNull + default + tryConsumer andThen(@Nullable tryConsumer after) { + if ( after != null ) + return t -> after.accept(apply(t)); + return this::apply; + } + + /** @since 0.0.2 */ + @NotNull + default + tryFunction andThen(@Nullable tryFunction after) { + if ( after != null ) + return t -> after.apply(apply(t)); + return (tryFunction) this; + } } diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java b/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java index c5ae5ea..e87bd40 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java @@ -1,13 +1,74 @@ package fybug.nulll.pdconcurrent.fun; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; /** * @author fybug - * @version 0.0.1 + * @version 0.0.2 * @see Runnable - * @since fun 0.0.2 + * @since fun 0.0.3 */ @FunctionalInterface public -interface tryRunnable { - void run() throws E; +interface tryRunnable { + + void run() throws Throwable; + + /** @since 0.0.2 */ + @NotNull + default + tryRunnable andThen(@Nullable tryRunnable after) { + if ( after != null ) { + return () -> { + run(); + after.run(); + }; + } + return this; + } + + /** @since 0.0.2 */ + @NotNull + default + trySupplier andThen(@Nullable trySupplier after) { + if ( after != null ) { + return () -> { + run(); + return after.get(); + }; + } + return () -> { + run(); + return null; + }; + } + + /** @since 0.0.2 */ + @NotNull + default + tryRunnable andThen(@Nullable tryConsumer after) { + if ( after != null ) { + return () -> { + run(); + after.accept(null); + }; + } + return this; + } + + /** @since 0.0.2 */ + @NotNull + default + trySupplier andThen(@Nullable tryFunction after) { + if ( after != null ) { + return () -> { + run(); + return after.apply(null); + }; + } + return () -> { + run(); + return null; + }; + } } diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java b/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java index 81a193b..3a38d83 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java @@ -1,14 +1,35 @@ package fybug.nulll.pdconcurrent.fun; import java.util.function.Supplier; +import jakarta.annotation.Nullable; +import jakarta.validation.constraints.NotNull; + /** * @author fybug - * @version 0.0.1 + * @version 0.0.2 * @see Supplier - * @since fun 0.0.1 + * @since fun 0.0.3 */ @FunctionalInterface public -interface trySupplier { - V get() throws E; +interface trySupplier { + R get() throws Throwable; + + /** @since 0.0.2 */ + @NotNull + default + tryRunnable andThen(@Nullable tryConsumer after) { + if ( after != null ) + return () -> after.accept(get()); + return this::get; + } + + /** @since 0.0.2 */ + @NotNull + default + trySupplier andThen(@Nullable tryFunction after) { + if ( after != null ) + return () -> after.apply(get()); + return (trySupplier) this; + } } -- Gitee From eaf25d1fff3117edcb8de333f82463dd976869d4 Mon Sep 17 00:00:00 2001 From: fybug <1006291762@qq.com> Date: Tue, 7 Jan 2025 17:45:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 41 +- .../fybug/nulll/pdconcurrent/ObjLock.java | 32 +- .../java/fybug/nulll/pdconcurrent/RWLock.java | 99 ++-- .../java/fybug/nulll/pdconcurrent/ReLock.java | 25 +- .../java/fybug/nulll/pdconcurrent/SyLock.java | 502 +++++++++++++++--- .../fybug/nulll/pdconcurrent/e/LockType.java | 10 + .../nulll/pdconcurrent/fun/package-info.java | 2 +- .../nulll/pdconcurrent/fun/tryConsumer.java | 5 +- .../nulll/pdconcurrent/fun/tryFunction.java | 5 +- .../nulll/pdconcurrent/fun/tryRunnable.java | 6 +- .../nulll/pdconcurrent/fun/trySupplier.java | 5 +- .../nulll/pdconcurrent/package-info.java | 4 +- 12 files changed, 592 insertions(+), 144 deletions(-) diff --git a/build.gradle b/build.gradle index 96f1541..f27bb73 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ tasks.withType(JavaCompile).configureEach { } group 'fybug.nulll' -version = '0.0.2' +version = '0.1.0' java { toolchain { @@ -51,7 +51,6 @@ dependencies { // testImplementation "junit:junit" // testCompileOnly "org.jetbrains:annotations:+" // testAnnotationProcessor "org.jetbrains:annotations:+" - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' testCompileOnly "jakarta.validation:jakarta.validation-api:+" testAnnotationProcessor "jakarta.validation:jakarta.validation-api:+" testCompileOnly "jakarta.annotation:jakarta.annotation-api:+" @@ -61,21 +60,24 @@ dependencies { } test { - dependencies { - testImplementation "org.junit.platform:junit-platform-launcher" - } useJUnitPlatform() } -// todo 打包重整 -task PDConcurrent(type: Jar) { +task PDConcurrent_bin(type: Jar) { destinationDirectory = file('jar') manifest { attributes('Manifest-Version': '1.0', 'Built-By': 'fybug/风雨bu改', - 'Created-By': 'IntelliJ IDEA') + 'Build-Jdk-Spec': 23, + 'Bundle-Description': 'java并发控制工具', + 'Bundle-Name': 'PDConcurrent', + 'Bundle-DocURL': '文档地址', + 'Bundle-Vendor': 'IntelliJ IDEA', + 'Bundle-Version': version, + 'Bundle-License': 'https://www.apache.org/licenses/LICENSE-2.0', + 'Created-By': 'Gradle 8.10.2') } - archiveFileName = 'PDConcurrent.jar' + archiveFileName = 'PDConcurrent_bin.jar' // 打包编译输出 from sourceSets.main.output } @@ -85,7 +87,14 @@ task PDConcurrent_all(type: Jar) { manifest { attributes('Manifest-Version': '1.0', 'Built-By': 'fybug/风雨bu改', - 'Created-By': 'IntelliJ IDEA') + 'Build-Jdk-Spec': 23, + 'Bundle-Description': 'java并发控制工具', + 'Bundle-Name': 'PDConcurrent', + 'Bundle-DocURL': '文档地址', + 'Bundle-Vendor': 'IntelliJ IDEA', + 'Bundle-Version': version, + 'Bundle-License': 'https://www.apache.org/licenses/LICENSE-2.0', + 'Created-By': 'Gradle 8.10.2') } archiveFileName = 'PDConcurrent_all.jar' // 打包编译输出 @@ -103,7 +112,14 @@ task PDConcurrent_sources(type: Jar) { manifest { attributes('Manifest-Version': '1.0', 'Built-By': 'fybug/风雨bu改', - 'Created-By': 'IntelliJ IDEA') + 'Build-Jdk-Spec': 23, + 'Bundle-Description': 'java并发控制工具', + 'Bundle-Name': 'PDConcurrent', + 'Bundle-DocURL': '文档地址', + 'Bundle-Vendor': 'IntelliJ IDEA', + 'Bundle-Version': version, + 'Bundle-License': 'https://www.apache.org/licenses/LICENSE-2.0', + 'Created-By': 'Gradle 8.10.2') } archiveFileName = 'PDConcurrent_sources.jar' // 打包源码 @@ -112,7 +128,6 @@ task PDConcurrent_sources(type: Jar) { task release { dependsOn clean - dependsOn PDConcurrent_all - dependsOn PDConcurrent + dependsOn PDConcurrent_bin dependsOn PDConcurrent_sources } diff --git a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java index 69e0fad..8080627 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java @@ -42,8 +42,9 @@ class ObjLock implements SyLock { //---------------------------------------------------------------------------------------------- + @Override public - R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby, + R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) { R o = null; @@ -51,7 +52,7 @@ class ObjLock implements SyLock { if ( lockType == LockType.NOLOCK ) { try { o = run.get(); - } catch ( Throwable e ) { + } catch ( Exception e ) { if ( catchby != null ) o = catchby.apply(e); } finally { @@ -62,7 +63,7 @@ class ObjLock implements SyLock { synchronized ( LOCK ){ try { o = run.get(); - } catch ( Throwable e ) { + } catch ( Exception e ) { if ( catchby != null ) o = catchby.apply(e); } finally { @@ -73,4 +74,29 @@ class ObjLock implements SyLock { } return o; } + + @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 f64d614..b0cc25c 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java @@ -66,51 +66,80 @@ class RWLock implements SyLock { @Override public - R lock(@NotNull LockType lockType, trySupplier run, @Nullable Function catchby, + R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) { R o = null; // set null IS_LOCK.remove(); try { - if ( lockType != LockType.NOLOCK ) { - if ( lockType == LockType.READ ) { - Read_LOCK.lockInterruptibly(); - IS_LOCK.set((short) 1); - } else { - Write_LOCK.lockInterruptibly(); - IS_LOCK.set((short) 2); - } - } + tolock(lockType); o = run.get(); - } catch ( Throwable e ) { + } catch ( Exception e ) { if ( catchby != null ) o = catchby.apply(e); } finally { if ( finaby != null ) o = finaby.apply(o); - // 根据实际状态解锁 - if ( IS_LOCK.get() == 1 ) { - Read_LOCK.unlock(); - } else if ( IS_LOCK.get() == 2 ) { - Write_LOCK.unlock(); - } - IS_LOCK.remove(); + tounlock(); } return o; } - //---------------------------------------------------------------------------------------------- - - /** 获取 {@link Condition} */ - @NotNull + @Override public - Condition newReadCondition() { return Read_LOCK.newCondition(); } + R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception { + R o = null; + // set null + IS_LOCK.remove(); + try { + tolock(lockType); + o = run.get(); + } finally { + if ( finaby != null ) + o = finaby.apply(o); + tounlock(); + } + return o; + } - /** 获取 {@link Condition} */ - @NotNull public - Condition newWriteCondition() { return Write_LOCK.newCondition(); } + boolean toread() { + // 转为读锁 + if ( IS_LOCK.get() == 2 ) { + Read_LOCK.lock(); + Write_LOCK.unlock(); + IS_LOCK.set((short) 1); + return true; + } + return false; + } + + private + void tolock(@NotNull LockType lockType) throws InterruptedException { + if ( lockType != LockType.NOLOCK ) { + if ( lockType == LockType.READ ) { + Read_LOCK.lockInterruptibly(); + IS_LOCK.set((short) 1); + } else { + Write_LOCK.lockInterruptibly(); + IS_LOCK.set((short) 2); + } + } + } + + private + void tounlock() { + // 根据实际状态解锁 + if ( IS_LOCK.get() == 1 ) + Read_LOCK.unlock(); + else if ( IS_LOCK.get() == 2 ) + Write_LOCK.unlock(); + // 清除记录数据 + IS_LOCK.remove(); + } + + //---------------------------------------------------------------------------------------------- public boolean isLocked() { return IS_LOCK.get() != null && IS_LOCK.get() > 0; } @@ -121,15 +150,13 @@ class RWLock implements SyLock { public boolean isWriteLocked() { return IS_LOCK.get() == 2; } + /** 获取 {@link Condition} */ + @NotNull + public + Condition newReadCondition() { return Read_LOCK.newCondition(); } + + /** 获取 {@link Condition} */ + @NotNull public - boolean toread() throws InterruptedException { - // 转为读锁 - if ( IS_LOCK.get() == 2 ) { - Read_LOCK.lockInterruptibly(); - Write_LOCK.unlock(); - IS_LOCK.set((short) 1); - return true; - } - return false; - } + 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 cc066fb..5053dd5 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ReLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ReLock.java @@ -53,7 +53,7 @@ class ReLock implements SyLock { @Override public - R lock(@NotNull LockType lockType, trySupplier run, @Nullable Function catchby, + R lock(@NotNull LockType lockType, trySupplier run, @Nullable Function catchby, @Nullable Function finaby) { R o = null; @@ -61,7 +61,7 @@ class ReLock implements SyLock { if ( lockType != LockType.NOLOCK ) LOCK.lockInterruptibly(); o = run.get(); - } catch ( Throwable e ) { + } catch ( Exception e ) { if ( catchby != null ) o = catchby.apply(e); } finally { @@ -73,11 +73,30 @@ class ReLock implements SyLock { return o; } + @Override public - boolean isLocked() { return LOCK.isLocked(); } + 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 { + if ( finaby != null ) + o = finaby.apply(o); + if ( lockType != LockType.NOLOCK && LOCK.isLocked() ) + LOCK.unlock(); + } + return o; + } + + //---------------------------------------------------------------------------------------------- /** 获取 {@link Condition} */ @NotNull public Condition newCondition() { return LOCK.newCondition(); } + + 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 45fb5f9..57f00ae 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java @@ -10,29 +10,62 @@ import jakarta.validation.constraints.NotNull; /** *

并发管理.

- * 通过使用接口运行的方式隐藏内部的并发管理方法
- * 让开发人员无需管理并发的具体方式
- * {@code **read()} 方法用于申请读取方法，{@code **write()} 用于申请写入方法，只有在使用读写锁实现 {@link RWLock} 才有区别。其余实现两个之间无区别
- * {@code try**()} 类型的方法为可抛出异常的方法，可在传入的接口中抛出异常，但是需要指定异常的类型
- * 也可在该类方法中传入 catch 块和 finally 块的代码，随后将不会抛出异常。发生异常后返回将会变为 {@code null} + * 通过传入回调的方式隐藏内部的并发管理方法，并支持复用内部的try块，通过传入的回调插入到catch，finally块中执行
+ * {@code **lock()} 方法用于根据传入的{@link LockType}申请不同的锁类型进行执行
+ * {@code **read()} 方法用于申请使用读锁，{@code **write()} 用于申请使用写锁，只有在使用读写锁实现 {@link RWLock} 才有区别。其余实现两个之间无区别
+ * {@code try**()} 类型的方法为可抛出异常的方法，可在传入的接口中抛出异常 *

* 使用 {@code new**Lock()} 的方法获取不同并发管理的实例
* * @author fybug - * @version 0.0.2 + * @version 0.1.0 + * @apiNote 并发控制通用接口，规定并实现大部分通用控制功能 * @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块后的回调 + * + * @see tryRunnable + * @see Consumer + * @see Runnable + * @see LockType + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ default - c lock(@NotNull LockType lockType) { return new c(this, lockType); } - - default - void lock(@NotNull LockType lockType, @NotNull tryRunnable run) { lock(lockType, run, null, null); } - - default - void lock(@NotNull LockType lockType, @NotNull tryRunnable run, @Nullable Consumer catchby, + void lock(@NotNull LockType lockType, @NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby) { lock(lockType, () -> { @@ -47,113 +80,428 @@ interface SyLock { }); } + //----------------------------------------------- + + /** + * 使用锁执行指定回调 + *

+ * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，遇到异常不处理返回{@code null} + * + * @param lockType 锁类型 + * @param run 带返回的回调 + * @param 要返回的数据类型 + * + * @return 回调返回的内容，遇到异常返回{@code null} + * + * @see trySupplier + * @see LockType + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ default R lock(@NotNull LockType lockType, @NotNull trySupplier run) { return lock(lockType, run, null, null); } - R lock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function catchby, - @Nullable Function finaby); + /** + * 使用锁执行指定回调 + *

+ * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，遇到异常不处理 + * + * @param lockType 锁类型 + * @param run 执行的回调 + * + * @see tryRunnable + * @see LockType + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ + default + void lock(@NotNull LockType lockType, @NotNull tryRunnable run) { + lock(lockType, () -> { + run.run(); + return null; + }, null, null); + } + + //----------------------------------------------- + + /** + * 尝试使用锁执行指定回调 + *

+ * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，通过两个回调参数插入不同的块中执行，遇到异常会抛出 + * + * @param lockType 锁类型 + * @param run 带返回的回调 + * @param finaby 进入finally块后的回调，传入前一个回调的返回值，遇到异常传入{@code null} + * @param 要返回的数据类型 + * + * @return 回调返回的内容，遇到异常不返回 + * + * @implSpec 如果有传入 {@code finaby} 回调则返回值由{@code finaby}主导，传入{@code finaby}的值根据是否发生异常传入{@code run}的返回值或{@code null}
+ * 任意一个回调为空时直接穿透，使用上一个正确执行的值进行传递或者返回，发生异常会执行{@code finaby}但是不会返回内容 + * @see trySupplier + * @see Function + * @see LockType + * @since 0.1.0 + */ + R trylock(@NotNull LockType lockType, @NotNull trySupplier run, @Nullable Function finaby) throws Exception; + + /** + * 尝试使用锁执行指定回调 + *

+ * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，通过两个回调参数插入不同的块中执行，遇到异常会抛出 + * + * @param lockType 锁类型 + * @param run 执行的回调 + * @param finaby 进入finally块后的回调 + * + * @see tryRunnable + * @see Runnable + * @see LockType + * @see #trylock(LockType, trySupplier, Function) + * @since 0.1.0 + */ + default + void trylock(@NotNull LockType lockType, @NotNull tryRunnable run, @Nullable Runnable finaby) throws Exception { + trylock(lockType, () -> { + run.run(); + return null; + }, finaby == null ? null : _ -> { + finaby.run(); + return null; + }); + } - //---------------------------------------------------------------------------------------------- + //----------------------------------------------- /** - * 申请并运行于读锁 + * 尝试使用锁执行指定回调 + *

+ * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，遇到异常会抛出 * - * @param run 运行代码 + * @param lockType 锁类型 + * @param run 带返回的回调 + * @param 要返回的数据类型 + * + * @return 回调返回的内容，遇到异常不返回 + * + * @see trySupplier + * @see LockType + * @see #trylock(LockType, trySupplier, Function) + * @since 0.1.0 */ default - void read(@NotNull tryRunnable run) { lock(LockType.READ, run); } + R trylock(@NotNull LockType lockType, @NotNull trySupplier run) throws Exception + { return trylock(lockType, run, null); } /** - * 申请并运行于读锁 + * 尝试使用锁执行指定回调 + *

+ * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，遇到异常会抛出 * - * @param run 带返回的运行代码 + * @param lockType 锁类型 + * @param run 执行的回调 * - * @return 接口生成的数据 + * @see tryRunnable + * @see LockType + * @see #trylock(LockType, trySupplier, Function) + * @since 0.1.0 */ default - R read(@NotNull trySupplier run) { return lock(LockType.READ, run); } + void trylock(@NotNull LockType lockType, @NotNull tryRunnable run) throws Exception { + trylock(lockType, () -> { + run.run(); + return null; + }, null); + } + + /*--------------------------------------------------------------------------------------------*/ /** - * 申请并运行于写锁 + * 使用读锁执行指定回调 + *

+ * 调用读锁执行，运行时自带try-catch-finally块，遇到异常不处理 + * + * @param run 带返回的回调 + * @param 要返回的数据类型 * - * @param run 运行代码 + * @return 回调返回的内容 + * + * @see trySupplier + * @see LockType#READ + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 */ default - void write(@NotNull tryRunnable run) { lock(LockType.WRITE, run); } + R read(@NotNull trySupplier run) { return lock(LockType.READ, run, null, null); } /** - * 申请并运行于写锁 + * 使用读锁执行指定回调 + *

+ * 调用读锁执行，运行时自带try-catch-finally块，遇到异常不处理 * - * @param run 带返回的运行代码 + * @param run 执行的回调 * - * @return 接口生成的数据 + * @see tryRunnable + * @see LockType#READ + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 */ default - R write(@NotNull trySupplier run) { return lock(LockType.WRITE, run); } + void read(@NotNull tryRunnable run) { + lock(LockType.READ, () -> { + run.run(); + return null; + }, null, null); + } - //---------------------------------------------------------------------------------------------- + /** + * 使用写锁执行指定回调 + *

+ * 调用写锁执行，运行时自带try-catch-finally块，遇到异常不处理 + * + * @param run 带返回的回调 + * @param 要返回的数据类型 + * + * @return 回调返回的内容 + * + * @see trySupplier + * @see LockType#WRITE + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ + default + R write(@NotNull trySupplier run) { return lock(LockType.WRITE, run, null, null); } + /** + * 使用写锁执行指定回调 + *

+ * 调用写锁执行，运行时自带try-catch-finally块，遇到异常不处理 + * + * @param run 执行的回调 + * + * @see tryRunnable + * @see LockType#WRITE + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ default - void read(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby) - { lock(LockType.READ, run, catchby, finaby); } + void write(@NotNull tryRunnable run) { + lock(LockType.WRITE, () -> { + run.run(); + return null; + }, null, null); + } + //----------------------------------------------- + + /** + * 使用读锁执行指定回调 + *

+ * 调用读锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * + * @param run 带返回的回调 + * @param catchby 进入catch块后的回调，传入当前异常 + * @param finaby 进入finally块后的回调，传入前两个回调的返回值 + * @param 要返回的数据类型 + * + * @return 回调返回的内容 + * + * @see trySupplier + * @see Function + * @see LockType#READ + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ default - R read(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) + R read(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) { return lock(LockType.READ, run, catchby, finaby); } + /** + * 使用读锁执行指定回调 + *

+ * 调用读锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * + * @param run 执行的回调 + * @param catchby 进入catch块后的回调，传入当前异常 + * @param finaby 进入finally块后的回调 + * + * @see tryRunnable + * @see Consumer + * @see Runnable + * @see LockType#READ + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ default - void write(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby) - { lock(LockType.WRITE, run, catchby, finaby); } + void read(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby) { + lock(LockType.READ, () -> { + run.run(); + return null; + }, catchby == null ? null : e -> { + catchby.accept(e); + return null; + }, finaby == null ? null : _ -> { + finaby.run(); + return null; + }); + } + /** + * 使用写锁执行指定回调 + *

+ * 调用写锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * + * @param run 带返回的回调 + * @param catchby 进入catch块后的回调，传入当前异常 + * @param finaby 进入finally块后的回调，传入前两个回调的返回值 + * @param 要返回的数据类型 + * + * @return 回调返回的内容 + * + * @see trySupplier + * @see Function + * @see LockType#WRITE + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ default - R write(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) + R write(@NotNull trySupplier run, @Nullable Function catchby, @Nullable Function finaby) { return lock(LockType.WRITE, run, catchby, finaby); } + /** + * 使用写锁执行指定回调 + *

+ * 调用写锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * + * @param run 执行的回调 + * @param catchby 进入catch块后的回调，传入当前异常 + * @param finaby 进入finally块后的回调 + * + * @see tryRunnable + * @see Consumer + * @see Runnable + * @see LockType#WRITE + * @see #lock(LockType, trySupplier, Function, Function) + * @since 0.1.0 + */ + default + void write(@NotNull tryRunnable run, @Nullable Consumer catchby, @Nullable Runnable finaby) { + lock(LockType.WRITE, () -> { + run.run(); + return null; + }, catchby == null ? null : e -> { + catchby.accept(e); + return null; + }, finaby == null ? null : _ -> { + finaby.run(); + return null; + }); + } + + //----------------------------------------------- + + /** + * 尝试使用读锁执行指定回调 + *

+ * 调用读锁执行，运行时自带try-finally块，遇到异常会抛出 + * + * @param run 带返回的回调 + * @param 要返回的数据类型 + * + * @return 回调返回的内容，遇到异常不返回 + * + * @see trySupplier + * @see LockType#READ + * @see #trylock(LockType, trySupplier, Function) + * @since 0.1.0 + */ + default + R tryread(@NotNull trySupplier run) throws Exception { return trylock(LockType.READ, run, null); } + + /** + * 尝试使用读锁执行指定回调 + *

+ * 调用读锁执行，运行时自带try-finally块，遇到异常会抛出 + * + * @param run 执行的回调 + * + * @see tryRunnable + * @see LockType#READ + * @see #trylock(LockType, trySupplier, Function) + * @since 0.1.0 + */ + default + void tryread(@NotNull tryRunnable run) throws Exception { + trylock(LockType.READ, () -> { + run.run(); + return null; + }, null); + } + + /** + * 尝试使用写锁执行指定回调 + *

+ * 调用写锁执行，运行时自带try-finally块，遇到异常会抛出 + * + * @param run 带返回的回调 + * @param 要返回的数据类型 + * + * @return 回调返回的内容，遇到异常不返回 + * + * @see trySupplier + * @see LockType#WRITE + * @see #trylock(LockType, trySupplier, Function) + * @since 0.1.0 + */ + default + R trywrite(@NotNull trySupplier run) throws Exception { return trylock(LockType.WRITE, run, null); } + + /** + * 尝试使用写锁执行指定回调 + *

+ * 调用写锁执行，运行时自带try-finally块，遇到异常会抛出 + * + * @param run 执行的回调 + * + * @see tryRunnable + * @see LockType#WRITE + * @see #trylock(LockType, trySupplier, Function) + * @since 0.1.0 + */ + default + void trywrite(@NotNull tryRunnable run) throws Exception { + trylock(LockType.WRITE, () -> { + run.run(); + return null; + }, null); + } + /*--------------------------------------------------------------------------------------------*/ - /** 获取传统并发实现 */ - static @NotNull + /** + * 获取传统并发实现 + * + * @see ObjLock + */ + @NotNull + static ObjLock newObjLock() { return new ObjLock(); } - /** 获取 Lock 实现 */ - static @NotNull + /** + * 获取可重入锁实现 + * + * @see ReLock + */ + @NotNull + static ReLock newReLock() { return new ReLock(); } - /** 获取读写锁实现 */ - static @NotNull + /** + * 获取读写锁实现 + * + * @see RWLock + */ + @NotNull + static RWLock newRWLock() { return new RWLock(); } - - class c { - @NotNull SyLock self; - @NotNull LockType lockType; - @NotNull trySupplier run = null; - @Nullable Function catchby = null; - @Nullable Function finaby = null; - - c(@NotNull SyLock self, @NotNull LockType lockType) { - this.self = self; - this.lockType = lockType; - } - - public - c run(@NotNull trySupplier run) { - this.run = run; - return this; - } - - public - c catchby(@Nullable Function catchby) { - this.catchby = catchby; - return this; - } - - public - c finaby(@Nullable Function finaby) { - this.finaby = finaby; - return this; - } - - public - R start() { return self.lock(lockType, run, catchby, finaby); } - } } diff --git a/src/main/java/fybug/nulll/pdconcurrent/e/LockType.java b/src/main/java/fybug/nulll/pdconcurrent/e/LockType.java index 9d45853..0d722ea 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/e/LockType.java +++ b/src/main/java/fybug/nulll/pdconcurrent/e/LockType.java @@ -1,8 +1,18 @@ package fybug.nulll.pdconcurrent.e; +/** + *

锁类型.

+ * + * @author fybug + * @version 0.0.1 + * @since PDConcurrent 0.1.0 + */ public enum LockType { + /** 读锁 */ READ, + /** 写锁 */ WRITE, + /** 不上锁 */ NOLOCK } diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java b/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java index 3a258d5..67680b7 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/package-info.java @@ -2,7 +2,7 @@ * 功能接口包 * * @author fybug - * @version 0.0.3 + * @version 0.0.4 * @since PDConcurrent 0.0.1 */ package fybug.nulll.pdconcurrent.fun; \ No newline at end of file diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java b/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java index efe92ca..b3ba660 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/tryConsumer.java @@ -8,11 +8,12 @@ import jakarta.validation.constraints.NotNull; * @author fybug * @version 0.0.2 * @see Consumer - * @since fun 0.0.3 + * @since fun 0.0.4 */ public interface tryConsumer { - void accept(T t) throws Throwable; + /** @see Consumer#accept(Object) */ + void accept(T t) throws Exception; /** @since 0.0.2 */ @NotNull diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java b/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java index b3aeab8..060841c 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/tryFunction.java @@ -8,11 +8,12 @@ import jakarta.validation.constraints.NotNull; * @author fybug * @version 0.0.2 * @see Function - * @since fun 0.0.3 + * @since fun 0.0.4 */ public interface tryFunction { - R apply(T t) throws Throwable; + /** @see Function#apply(Object) */ + R apply(T t) throws Exception; /** @since 0.0.2 */ @NotNull diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java b/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java index e87bd40..970eeac 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/tryRunnable.java @@ -6,13 +6,13 @@ import jakarta.validation.constraints.NotNull; * @author fybug * @version 0.0.2 * @see Runnable - * @since fun 0.0.3 + * @since fun 0.0.4 */ @FunctionalInterface public interface tryRunnable { - - void run() throws Throwable; + /** @see Runnable#run() */ + void run() throws Exception; /** @since 0.0.2 */ @NotNull diff --git a/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java b/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java index 3a38d83..1733f24 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java +++ b/src/main/java/fybug/nulll/pdconcurrent/fun/trySupplier.java @@ -8,12 +8,13 @@ import jakarta.validation.constraints.NotNull; * @author fybug * @version 0.0.2 * @see Supplier - * @since fun 0.0.3 + * @since fun 0.0.4 */ @FunctionalInterface public interface trySupplier { - R get() throws Throwable; + /** @see Supplier#get() */ + R get() throws Exception; /** @since 0.0.2 */ @NotNull diff --git a/src/main/java/fybug/nulll/pdconcurrent/package-info.java b/src/main/java/fybug/nulll/pdconcurrent/package-info.java index dbe9cc7..c810f65 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/package-info.java +++ b/src/main/java/fybug/nulll/pdconcurrent/package-info.java @@ -5,7 +5,7 @@ * 附带 {@code try***} 的功能接口包，在 java 原有的功能接口的基础上允许抛出异常 * * @author fybug - * @version 0.0.1 - * @since JDK 13+ + * @version 0.1.0 + * @since JDK 23+ */ package fybug.nulll.pdconcurrent; \ No newline at end of file -- Gitee From ff7970a7a124163bc80803c1f2a2901f8e798709 Mon Sep 17 00:00:00 2001 From: fybug <1006291762@qq.com> Date: Tue, 7 Jan 2025 23:10:19 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 63 ++-- build.gradle | 14 +- jar/PDConcurrent.jar | Bin 9040 -> 0 bytes jar/PDConcurrent_all.jar | Bin 15852 -> 0 bytes jar/PDConcurrent_bin.jar | Bin 0 -> 15502 bytes jar/PDConcurrent_sources.jar | Bin 7583 -> 11394 bytes .../fybug/nulll/pdconcurrent/ObjLock.java | 88 +++++- .../java/fybug/nulll/pdconcurrent/RWLock.java | 274 ++++++++++++++---- .../java/fybug/nulll/pdconcurrent/ReLock.java | 138 +++++++-- .../java/fybug/nulll/pdconcurrent/SyLock.java | 24 +- .../nulll/pdconcurrent/package-info.java | 6 +- 11 files changed, 450 insertions(+), 157 deletions(-) delete mode 100644 jar/PDConcurrent.jar delete mode 100644 jar/PDConcurrent_all.jar create mode 100644 jar/PDConcurrent_bin.jar diff --git a/README.md b/README.md index c4979e4..d71eb39 100644 --- a/README.md +++ b/README.md @@ -28,16 +28,13 @@ ### \> > 基础使用示例 ```java -// 尝试申请读锁 -SyLock.newObjLock().read(() -> { +public static void main(String[] args) { + var lock = SyLock.newObjLock(); + lock.read(() -> { // 并发域代码内容 [return null;]? // 可选择是否返回 -}); - -// 尝试申请写锁 -SyLock.newObjLock().write(() -> { - [return null;]? -}); + }); +} ``` 以上即为核心用法，将需要并发处理的代码通过一个 `Runnable` 接口包起来。启用并发管理以及停止并发管理部分的的代码由本工具封装，直接通过上述代码的方式传入需要运行的内容即可 @@ -50,48 +47,58 @@ SyLock.newObjLock().write(() -> { ### \> > synchronized 锁 ```java -// 使用 -SyLock.newObjLock().read(() -> { +public static void main(String[] args) { + // 使用 + var lock = SyLock.newObjLock(); + lock.read(() -> { // 并发域代码内容 -}); + }); -// 不使用 -synchronized ( new Object() ){ + // 不使用 + synchronized ( new Object() ){ // 并发域代码内容 + } } + ``` ### \> > ReentrantLock 锁 ```java -// 使用 -SyLock.newReLock().read(() -> { +public static void main(String[] args) { + // 使用 + var lock = SyLock.newReLock(); + lock.read(() -> { // 并发域代码内容 -}); + }); -// 不使用 -ReentrantLock lock = new ReentrantLock(); -try { + // 不使用 + ReentrantLock lock = new ReentrantLock(); + try { lock.lock(); // 并发域代码内容 -} finally { + } finally { lock.unlock(); + } } ``` ### \> > ReadWriteLock 锁 ```java -// 使用 -SyLock.newRWLock().read(() -> { +public static void main(String[] args) { + // 使用 + var lock = SyLock.newRWLock(); + lock.read(() -> { // 并发域代码内容 -}); + }); -// 不使用 -ReadWriteLock lock = new ReentrantReadWriteLock(); -try { + // 不使用 + ReadWriteLock lock = new ReentrantReadWriteLock(); + try { lock.readLock().lock(); // 并发域代码内容 -} finally { + } finally { lock.readLock().unlock(); + } } ``` @@ -100,8 +107,6 @@ try { > PDConcurrent.jar 为不包含源码的包 > -> PDConcurrent_all.jar 为包含了源码的包 -> > PDConcurrent_sources.jar 为仅包含源码的包 **发行版中可以看到全部版本
项目下的 jar 文件夹是当前最新的每夜版** diff --git a/build.gradle b/build.gradle index f27bb73..7fad4d0 100644 --- a/build.gradle +++ b/build.gradle @@ -39,22 +39,14 @@ repositories { dependencies { implementation fileTree(dir: 'lib', includes: ['*.jar']) - // compileOnly "org.jetbrains:annotations:+" - // annotationProcessor "org.jetbrains:annotations:+" compileOnly "jakarta.validation:jakarta.validation-api:+" - annotationProcessor "jakarta.validation:jakarta.validation-api:+" compileOnly "jakarta.annotation:jakarta.annotation-api:+" - annotationProcessor "jakarta.annotation:jakarta.annotation-api:+" compileOnly 'org.projectlombok:lombok:+' annotationProcessor 'org.projectlombok:lombok:+' // testImplementation "junit:junit" - // testCompileOnly "org.jetbrains:annotations:+" - // testAnnotationProcessor "org.jetbrains:annotations:+" testCompileOnly "jakarta.validation:jakarta.validation-api:+" - testAnnotationProcessor "jakarta.validation:jakarta.validation-api:+" testCompileOnly "jakarta.annotation:jakarta.annotation-api:+" - testAnnotationProcessor "jakarta.annotation:jakarta.annotation-api:+" testCompileOnly "org.projectlombok:lombok:+" testAnnotationProcessor "org.projectlombok:lombok:+" } @@ -71,7 +63,7 @@ task PDConcurrent_bin(type: Jar) { 'Build-Jdk-Spec': 23, 'Bundle-Description': 'java并发控制工具', 'Bundle-Name': 'PDConcurrent', - 'Bundle-DocURL': '文档地址', + 'Bundle-DocURL': 'https://apidoc.gitee.com/fybug/PDConcurrent/', 'Bundle-Vendor': 'IntelliJ IDEA', 'Bundle-Version': version, 'Bundle-License': 'https://www.apache.org/licenses/LICENSE-2.0', @@ -90,7 +82,7 @@ task PDConcurrent_all(type: Jar) { 'Build-Jdk-Spec': 23, 'Bundle-Description': 'java并发控制工具', 'Bundle-Name': 'PDConcurrent', - 'Bundle-DocURL': '文档地址', + 'Bundle-DocURL': 'https://apidoc.gitee.com/fybug/PDConcurrent/', 'Bundle-Vendor': 'IntelliJ IDEA', 'Bundle-Version': version, 'Bundle-License': 'https://www.apache.org/licenses/LICENSE-2.0', @@ -115,7 +107,7 @@ task PDConcurrent_sources(type: Jar) { 'Build-Jdk-Spec': 23, 'Bundle-Description': 'java并发控制工具', 'Bundle-Name': 'PDConcurrent', - 'Bundle-DocURL': '文档地址', + 'Bundle-DocURL': 'https://apidoc.gitee.com/fybug/PDConcurrent/', 'Bundle-Vendor': 'IntelliJ IDEA', 'Bundle-Version': version, 'Bundle-License': 'https://www.apache.org/licenses/LICENSE-2.0', diff --git a/jar/PDConcurrent.jar b/jar/PDConcurrent.jar deleted file mode 100644 index f718edf4548289fdc7abff8086f376972c40135e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9040 zcma)>1yEeuviI@e76?9s06~Jg1}C_?28Y4jLm;>e5G(WVR-({rf8HUiL>1q3W2g;S0Mp+lv z9BBJ`X@;D^6-pBMGPJT2K9HLIwH;i^tby#E)innODOoy6S!ij`^|;LSRbvktx7r$> zBZor==toC*xa+^qitw;EbvJZ2`#%T$yBF%ey=m;h!NkVt zkAWnA3N&@L`9HxIgWw7@Xeg+rhsE?y!A=hD!WJU7Hjd8LCJqcnRtAoa)(S0hFwB_V zA8KAvhk6{XDxSREFJM+Ir+E4DWtkltO=TSojjoc`i>CD!jDw7DT^Y;{NN*CStsd|3 z;pG{6T38!Cd#hL@{-qy5ai!@9o+9B=VO(eFEYbSTvf5mn={nVLXYSK!qt_cUj>;un zLmJ3$f@?4x2%9xGmTWnvjQfN9O|P^fauG7vZ7I{oddet>{I@pf zWD#%k3+lG`FM^~eAaR}!4SA^dKN9AVr<8g4+)pg8ze~w+xgT}rg%E>36I!?%$!uLX zV6|=~nhX#r4(TiqQCar~$h?3tKv7lTTH|;ziWvk3T#&HAf(-HpJ}FpcoB(;?m(o*PQJoqGUYp)V^3ZM^IH3}e z1mTyafw64L!=gL+kOOEh>O;8zo=K}c$i}<#sMYQ3m8Z>!RLmZz7L~Ljeb!8!2OarV z1*rWr+wQn@=Qhp@lO~^D;bja&^|mK1iccmA#IaKHi%?{$pkSMAt=wCCUiIZvqA$-<7u}mMF(>8yw=IXv6UFT?PT-_vK-T{OzNs zJqvA7Dj3(IH(*%eqHQcto_IS&Gsf@f+$UWHBR-_E=D$p*xU-FslZCC#|I}$zi&UE+ zX5f9EwV~x$FqQl~MZ+gga=)O5bV~TWF(|hY{#J{$RrE>yc<{+Vdb?}~q18D{`Tfmx zU+=qj-UZOT_Und%2ge+&Vrk*AEV=q_Sv3}f=}u8ZxSQF!_#MugG1H2%!IAsqN-g=UR}-f`%8SG!4?TJ>2e>sR@o4Udwl*RX2Ir@kJ@lG>IND zfq!wI_2qutGui$cL=u=Ks5!FhFmf*Z=E~~yF%0I?DX2H&hcUAD^&wPTl|!Wfj0=R{ za~cU#fqC|`H2=$-DmmNO7#Lca{7+6JzyB=J!259LPEa+LdeN*JT)C~79W#9TbB!&f z?)Kg&?15M|tZN{H*ZbG8ZrOg%n8O?|kH5@Z9pAz>V^R@d`wBIH4asSEHddE4t1~ms z1N{ofdluC(q9s)OjW>~S98bZS%A?)aKpQ8_$;0SLbOuux_si_Q7nAYv1XnOQO&0@^ zf<8bZB{C24DEqk)BW~=PdWN7FpNpZs)qRERV+*1N4x{ZF$vqW$| z$l{`+q9o$TKN=->$4!YAMQj$^FT!3>`zvQYoY2ke!5Z!^ygZ*UwMhEEC(Bchvs7}> z+OF`#rbjXhr$`zHDOsuoZ1WUmhA_Pi#=8l~NmP!RS4W|tYm+0t^^OnUe>cGrsCY+f zY^Eyx9Z@83gtRZam5EM8WR{1VU#|0*#WQ)M@p>JceB<0#4T+F;x!u3{>MY*V*{^@9*tzI8S!mpC!4!oG5OBoow|6;ft&* zcxLCto4SrRoTaCG(lAk5P(&F^sL9Tp08tNx?F9mmWE?X6twRmA4((_5bE|AM8*V()1{X5uG;c*pf(McI9?=6@C0@-sk@N%!&md*3#Rjw5KT2!d|rSpl5Z|?F`H~odHW41{(E)b?(H(AIf%#@lg}Dv#r@~ zGOCuUDymF^%Xn)|cP)!(=G$aDJPptA)fnVn@+}}=YJGfrm~QL29(`DO+q?4_=0}a? zY^8PAh-fs@uE(4`?~nAQO5MH+Pq2%r3K3}HIkulRN&BU^V#XD3P)qYCs3_z! zzGSYic|YQq*09i)OaoPcIQ&y=yjAO$4DeoR*4AjG8rH@F2wY->1lR+*Bjm|j**RPC zu9ZbNt%uBQI|NqSA=`WyI1WR`ERr3A^bt$n6pEQ+J8d}?!=c{;E#Is|xH&?*sZphN zy>f_jAAVt_qo(My!2JcSsxNm9-MrxSv{oNR`OzC~EoPZ0&G?iR!0A2I>$uOaFBf5? z*hv<~BCfM@-|<)-pkci?xw;^@jo-4;>8&eL<5iV!sNBZXqP?Lw zt|6i@sUJ@{cIUUAevS||4H7jKi6;HV?kSRP4?+Ub;qA5`DrTlCKA~4&M2sMeM&i+< zEpBM${XkhuHI)F95d0;kc4oLgal|B1K;~gtQar4XzbPL zV-MXPWt~i468+vLLQ;j+l;9p7{ZXKxDF4(ZluZ8CCDe44XT)*%Em2UyFHn77vQdIY z+Bwjr%%@*Ya%C}Gnukl424y;BvzB3jf}{A$aK1_33;Rf#ZOWj;xMaKUNB%h3lcFvo z;oB3*!O$u^+v7h^_AFMr+TLHdhb!>|5@U&)NFWDd8fi@Of+1*Q4zeRE+I6Sds;<`B z)x^%yjO^RR_=fInEXgn*Vy7i-yO_hV2<-P>e`A6aH;k(&mlOUlwbn1@MIBP{(C)++ zk($)$Vj9CNkW90N$$=DVqDNu{`E4Q|CaN$6ScIxf)4ew7jztjbwpV3EW-yFLoGj|F zqryF!cPy+mVxzBIuF}d*pMf~#CAot}E(BXBi=>x@#F-;8Omq|vu%6+sUoR?-2Ffj) zDQ!Se;pnV1Gf%JttRfb@y1?f&??)&=@33diwDDec>hmHZ_8Y-MuMslj?ZdM0-k3$~+ZDcEM__ z7AA>1iIBo61fMfJ%8jfcQ;FnM%wm1V3TJuN+~-z7*;PfmEIL~=$f)ICup+h06pK$C zd)4zHFz%5m;elD)MY8Dmmp`Oz$&kH0huS1ZBrIke=)1TEQ#Fbss+M9j%L}qI>`A`~ zmW@^r{b<}9wdyOG2A}ok#wW>r#unk4sIyP8sB%f;t(}ABa55)C9|GiaY2A(mj$_xF z;1Dp>D=T_iaAGw0ch{?n$x$}g08y3s>Ax?`_}0a5G@?A$*Tu8Y1>grz4Z4OF-z!XL z3x5e$3JPs*Jy`L~uK?(wxIF3DHoe&2I>h#oXALx9xz0=7FH(8qYs{ls-^Mg^f4a?w zPJoogit)4du~H#??bVY7K$sV!pzkCBMGKoC-UEHtt3OxEBn2!&$}K zz}Er>DUWO5$u`5FGZwBfzP`B#3Ks|5Qfb9(rgYzghCJ=1Z)`CMMBCp2p4IFO*fii8 zbTYrmpg`2iP9xTRd17CHwFz5RWB{!nC_x1?90C|dNGJE^B-?~R)%lj4#y#iK!tV4 zDnWYpJlZHaEqq=B5WB^B&p3j3PoB1zyfv^~2=npXQn{^NOl)%8wVT*cPC{n2Ux@k@ z_m%IKjqgVLF8q{h@DfVdUR3M8uvCoiuyGpOR0bOXwd|EtoApqB;^6|Kes7suhOa@S z<9f|DU2YJ1oIz?|w(VMoChoQs!n?8*#jN@j@zdxaE(gw?KFl2jJ2mSN-8i2|0|Bph zl`J5(wSDEM>Nxz2aPj_PSXf{ctWv_SC3m^1NQU$sYG}~H$YbCd ze|WqEwDKL`R?r>Ftu&93Stw{%=5}5HJaRnGkc3GdDra^@c0J!%cRuU5=e^%}b2~ul z1C8IJMTo>^A@RdpJWO!mXx*^Hu*P?VtMf_;vK$XPP_DB;-M{f_jS7Z7qssEy2&SjE zp#{RG6+Ijkzh@0YlE1DzVkhI;@kvXk@>`>zvZ~mpAEiPnB#!c z?N<|qKF=!Kp0^g8=2FpbgFvvG#@#og7bL!6m;54Y6lw_|k6G;U);@=q_dW zmm3ric_-pdEZLb<2e1EmyTh+JNeb&<@%0 z$}fqDg*m|lJpGbt^uF7tGpomx(SXu7AhnCF{Y{+#V>Q=W!!q2WpHO3))TaFmSOSgEO;bEPQx}l zj@f44&&`>)1gbdUu8#N3p(#>zIIP$8W>-{FC;@vi?-E$n2vvfzj$vp8YV$J$&*h4e zwr9NLchDS7OurUaPhX?k|B-!`w@Oq*M*%C;KS zNuk1`AN730ft{$HDA3+h_G|-bEZEJ3+DehWbbqdYs1~mJUH?R8W{#;BJVdQ>1LG*4 z9COMwl5JL`*|@d~WvRw5EV!bElFuBMmoBjPiHHbNtzKyp!%?Ii0ZD|QK-1*Eml_=ivs|)=dPmu$ETf<0<=MtG& zy{$P2IND;wSSQstv|m_!1X>29eE{;Y0|-6!CLxU8-Eq(BFtC6{`7Vv)dWc(7Qj2kg zNmYCV)=Q@j05-OI-uP;C@z}bKS7e+j8*5nw{-fZtrSuJo~vqT zz941d(gg(YGm@^_qHMQKraZ{OV_`NTkHVUL5sXwx+$+SX4~v9L=U5k*T>y}` ze{tY`WZU_Q_UwyqyIfBl*3iu^ndFZNUovN9${Gb4A%9I0iEh%oW0P#iWl;xGr|rY{ ztHU4c9xJ?0ZcuHefXAtMEej2=l|%D(T>$TZWL<-sW>LKo>%DI-jG6w@N5SOt4e}my z53WlsEM&?PJI--wh&&C3xqe#glM04KE&vTp7bKG4MLf%Ucdud!RE1XE<#`ai^i0F# z8SDgbZBCsT{!kx|QGfn6+j zB(>4Ra72h^RjS8iI^pDcO)))djxEpmC@%)5lU_?HLcjNEzc}m$93VfZ&-?kclb?^e z^VvAgNQR?+=G~*W!SuCHdn$-fP*tS=&{37$e|6M3jZ0S|b=i& z2c%Fz_fT9n(8PP5tN`l_N=ZlT1MbA?x$C)W@BIdMTdy^NZ67$MP>fcUitdA!fkkZv z`asyj9_4Qql+mgu0qs40MX$;=+1brqpV84LePY}skY+t;S0PLI4g`M&zQO$HuSQ^v z$h`AO{|h}G#fdOSlI-d_OJEAkr);oxNZyzvd3pOHr>Y6afI<(?rGz5pX?f0QcpUPF z^njr4sG%Mscr}?mr8aXR&YYn(CX&c8aI>$}99b`Z`dyW2nuH1qd=52iC|Bs zu`qT9ixS_$;-_rO@fv^6AJ)Dx;9br@MI_REOKv0W`LH1u89S5L{g}2c*3w+9gSwL8 z2Ic2>DcQ2z2EEa(x-p4G07kk2u<7(TpNu>8ltss=+sxL9c9>R5defOw8K-Ax`oyaj z%sI7L^!aa2N3`@-y7ReDU+Z$x1<2$2?x(Qz2DHnn4p7A|zg?~|Aj$dU|1`hd zU4c2yWK5}#rKF0+T1dUXPqJr$H6Boya&lN(oKfn;!=6HzN!512Zk6XyI3}ZJu$kv) zfDZ(ORQX(vM!oMp5q%ZiH5^3a9Vj|-Km;Ij^@$GsF}b9)Hk+da`y`>>)eo(RyqVxYuJ4mwdT;D$7!Q;o92eS&2=)@CnE`kJ@T^*3l%L06o%B zBY2Qm2V;;!iW|V%=hn*wSSl#vo}cT=^IoQU2{E|>~1W3%{x5j z#0f5```$*kHRPH*ecJz{=mQ|-3Apc!)rm(J1n1O|e-5wKU)gqutI^KNW`ffj?jgFe zT{GACes}F1&gHwdlB4*%RZ!meSLTF$;UULQb7hKRBP)^vFxlD_hQ zZ}lHbQ61ynCP-`hFvyPEm%;L-Z8~bQlP0l+X9*WM9m;8DXESC3xsSAaE77LOwy)9E zBIO3PtwY=8omY~av?DwvWDOgd1@!b{?XmQ;$G_K~hK4hSjOW*%k`UmP2p3McZ`ZM; z;1up3j-Q((cS&)cDRp7EcSRZ}KP{|w+qNcUM zrtuCGy?~Tve{A z?Qv!p+PK9XX>xR^IK|H9)x}fG6>WAL6DjM(wWB;@jhf zb0Hs18(r{S4%CFc(V-^?#aE5t&1QiSpCv85GQ+Z_`8c(j|Gd1ExSnPgJJ!WfiWx)7 z7Ax!AMp3HalQZ=fN9sddIV*%@BrV4tI5FgHN>O0pUU)h9RY+{{G4}*mLbL${$rD<2 zG1HS?F3 zw&=Ig?XaNKS<>rtS}8Kkpf^#K=N3zp4D3tV88y~hp!2Xba109suQ%OSo1cAM$nN1m ztc|<+D5^~Co&nwO7@Ub%5P@)Z0?%ONulF^hC1P)JI=4bG;f~@NFc|9TSK@4{CmU-_ zXTiga6@*_EnUKg{W(0lH8<(1@HsD1`PrX`JL05K`6vvb&Ky8m(NsjRYF zQvJMz;F8Wt8e`1VW%h?g2|Y%3#4F93|L6K1EY=cX-fcF}UqUcM6) zsN3(dS>TmhNV*8ozJ^$yzrtIaIJy4P9k+CT0jtY+eTSkT4Gn_>`=52{hY{3+VM6T+ z{rvp5YW+Cuv1qd)WRx@;7<``tR!PWAn+a diff --git a/jar/PDConcurrent_all.jar b/jar/PDConcurrent_all.jar deleted file mode 100644 index fd60fe0c384fd6dc37792d747bb71bdca571a238..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15852 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 diff --git a/jar/PDConcurrent_bin.jar b/jar/PDConcurrent_bin.jar new file mode 100644 index 0000000000000000000000000000000000000000..27dd86ee8081117386b9cd6d9a9f3c06e787a8ca GIT binary patch literal 15502 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 literal 7583 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 WD`WnsVxkZuKa$9WqeS`R*Z%=4IX_YW diff --git a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java index 8080627..d36d99e 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ObjLock.java @@ -9,39 +9,69 @@ import lombok.Getter; /** *

使用传统并发管理的实现.

- * 
使用并发管理：
- *     public static
- *     void main(String[] args) {
- *         var lock = new ObjLock();
- *         lock.read(() -> System.out.println("asd"));
- *     }
- * 
不使用：
- *     public static
- *     void main(String[] args) {
- *         synchronized ( new Object() ){
- *             System.out.println("asd");
- *         }
- *     }
+ * 使用{@code synchronized( Object )}实现并发域，读写锁均为同一个实现 + *

+ * 使用并发管理： + * {@snippet lang = java: + * public static void main(String[] args) { + * var lock = new ObjLock(); + * lock.read(() -> System.out.println("asd")); + * }} + * 不使用： + * {@snippet lang = java: + * public static void main(String[] args) { + * Object lock = new Object(); + * synchronized ( lock ){ + * System.out.println("asd"); + * } + * }} * * @author fybug - * @version 0.0.1 + * @version 0.1.0 + * @see SyLock * @since PDConcurrent 0.0.1 */ @Getter public class ObjLock implements SyLock { - /** 锁定的对象 */ + /** 作为锁的对象 */ private final Object LOCK; + /** + * 构建并发管理 + *

+ * 使用一个新的{@link Object} + */ public ObjLock() { this(new Object()); } - /** 生成并发管理，并指定使用的并发对象锁 */ + /** + * 构建并发管理 + * + * @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, @@ -51,22 +81,29 @@ class ObjLock implements SyLock { // 不上锁 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); } @@ -75,6 +112,20 @@ class ObjLock implements SyLock { 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 { @@ -82,16 +133,21 @@ class ObjLock implements SyLock { // 不上锁 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); } diff --git a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java index b0cc25c..bbd33e3 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/RWLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/RWLock.java @@ -10,51 +10,90 @@ import jakarta.validation.constraints.NotNull; import lombok.Getter; /** - * 使用读写锁 {@link ReentrantReadWriteLock} 实现的并发管理 - * 

使用并发管理：
- *     public static
- *     void main(String[] args) {
- *         var lock = new RWLock();
- *         lock.read(() -> System.out.println("adsa"));
- *         lock.write(() -> System.out.println("adsa"));
- *     }
- * 
不使用：
- *     public static
- *     void main(String[] args) {
- *         var lock = new ReentrantReadWriteLock();
- *         lock.readLock().lock();
- *         try {
- *             System.out.println("adsa");
- *         } finally {
- *             lock.readLock().unlock();
- *         }
- *         lock.writeLock().lock();
- *         try {
- *             System.out.println("adsa");
- *         } finally {
- *             lock.writeLock().unlock();
- *         }
- *     }
+ *

使用{@link ReentrantReadWriteLock}实现的并发管理.

+ * 使用{@link ReentrantReadWriteLock}实现并发域，读写锁均为标准实现，支持通过{@link #toread()}进行锁降级
+ * 使用了可中断的上锁操作{@link ReentrantReadWriteLock.ReadLock#lockInterruptibly()}和{@link ReentrantReadWriteLock.WriteLock#lockInterruptibly()}
+ * 支持使用{@link #newReadCondition()}{@link #newWriteCondition()}获取{@link Condition}，通过{@link #isLocked()}{@link #isWriteLocked()}{@link #isReadLocked()}检查是否被占用
+ *

+ * 使用并发管理： + * {@snippet lang = java: + * public static void main(String[] args) { + * var lock = new RWLock(); + * // 使用读锁 + * lock.read(() -> System.out.println("adsa")); + * // 使用写锁 + * lock.write(() -> System.out.println("adsa")); + * }} + * 不使用： + * {@snippet lang = java: + * import java.util.concurrent.locks.ReentrantReadWriteLock; + * public static void main(String[] args) { + * var lock = new ReentrantReadWriteLock(); + * // 使用读锁 + * try { + * lock.readLock().lock(); + * System.out.println("adsa"); + * } finally { + * lock.readLock().unlock(); + * } + * // 使用写锁 + * try { + * lock.writeLock().lock(); + * System.out.println("adsa"); + * } finally { + * lock.writeLock().unlock(); + * } + * }} * * @author fybug - * @version 0.0.1 + * @version 0.1.0 + * @see SyLock + * @see LockType + * @see ReentrantReadWriteLock + * @see ReentrantReadWriteLock.ReadLock + * @see ReentrantReadWriteLock.WriteLock * @since PDConcurrent 0.0.1 */ @Getter public class RWLock implements SyLock { + /** 锁 */ private final ReentrantReadWriteLock LOCK; + /** 读锁 */ private final ReentrantReadWriteLock.ReadLock Read_LOCK; + /** 写锁 */ private final ReentrantReadWriteLock.WriteLock Write_LOCK; - private final ThreadLocal IS_LOCK = new ThreadLocal<>(); + /** + * 每个线程的锁状态记录 + *

+ * 读锁为{@code 1}
+ * 写锁为{@code 2} + */ + private final ThreadLocal LOCK_STATE = new ThreadLocal<>(); + /** + * 构建并发管理 + *

+ * 使用非公平锁 + */ public RWLock() { this(false); } - /** 生成并发管理，并指定是否使用公平锁 */ + /** + * 构造并发处理 + * + * @param fair 是否使用公平锁 + */ public RWLock(boolean fair) { this(new ReentrantReadWriteLock(fair)); } + /** + * 构造并发处理 + * + * @param lock 使用的锁 + * + * @since 0.1.0 + */ public RWLock(@NotNull ReentrantReadWriteLock lock) { LOCK = lock; @@ -64,98 +103,213 @@ class RWLock implements SyLock { //---------------------------------------------------------------------------------------------- + /** + * {@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; - // set null - IS_LOCK.remove(); + // 清空当前线程的状态 + LOCK_STATE.remove(); try { + // 上锁 tolock(lockType); + // 主要内容 o = run.get(); } catch ( Exception e ) { + // 异常处理 if ( catchby != null ) o = catchby.apply(e); } finally { - if ( finaby != null ) - o = finaby.apply(o); - tounlock(); + // 防止错误 + 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; - // set null - IS_LOCK.remove(); + // 清空当前线程的状态 + LOCK_STATE.remove(); try { + // 上锁 tolock(lockType); + // 主要内容 o = run.get(); } finally { - if ( finaby != null ) - o = finaby.apply(o); - tounlock(); + // 防止错误 + try { + // 收尾 + if ( finaby != null ) + o = finaby.apply(o); + } finally { + // 解锁 + tounlock(); + } } return o; } - public - boolean toread() { - // 转为读锁 - if ( IS_LOCK.get() == 2 ) { - Read_LOCK.lock(); - Write_LOCK.unlock(); - IS_LOCK.set((short) 1); - return true; - } - return false; - } - + /** + * 根据指定类型上锁 + *

+ * 使用了可中断的上锁操作{@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(); - IS_LOCK.set((short) 1); + LOCK_STATE.set((short) 1); } else { + // 写锁 Write_LOCK.lockInterruptibly(); - IS_LOCK.set((short) 2); + LOCK_STATE.set((short) 2); } } } + /** + * 根据状态解锁 + *

+ * 根据{@link #LOCK_STATE}的状态调用对应的解锁动作
+ * 成功后清空{@link #LOCK_STATE}内容 + * + * @see #LOCK_STATE + * @since 0.1.0 + */ private void tounlock() { // 根据实际状态解锁 - if ( IS_LOCK.get() == 1 ) + if ( LOCK_STATE.get() == 1 ) Read_LOCK.unlock(); - else if ( IS_LOCK.get() == 2 ) + else if ( LOCK_STATE.get() == 2 ) Write_LOCK.unlock(); // 清除记录数据 - IS_LOCK.remove(); + 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 是否被占用 + * + * @since 0.1.0 + */ public - boolean isLocked() { return IS_LOCK.get() != null && IS_LOCK.get() > 0; } + boolean isLocked() { return LOCK_STATE.get() != null && (LOCK_STATE.get() == 1 || LOCK_STATE.get() == 2); } + /** + * 检查读锁是否被占用 + * + * @return 是否被占用 + * + * @since 0.1.0 + */ public - boolean isReadLocked() { return IS_LOCK.get() == 1; } + boolean isReadLocked() { return LOCK_STATE.get() == 1; } + /** + * 检查写锁是否被占用 + * + * @return 是否被占用 + * + * @since 0.1.0 + */ public - boolean isWriteLocked() { return IS_LOCK.get() == 2; } + boolean isWriteLocked() { return LOCK_STATE.get() == 2; } - /** 获取 {@link Condition} */ + /** + * 获取读锁{@link Condition} + * + * @see ReentrantReadWriteLock.ReadLock#newCondition() + * @since 0.1.0 + */ @NotNull public Condition newReadCondition() { return Read_LOCK.newCondition(); } - /** 获取 {@link Condition} */ + /** + * 获取写锁{@link Condition} + * + * @see ReentrantReadWriteLock.WriteLock#newCondition() + * @since 0.1.0 + */ @NotNull public Condition newWriteCondition() { return Write_LOCK.newCondition(); } diff --git a/src/main/java/fybug/nulll/pdconcurrent/ReLock.java b/src/main/java/fybug/nulll/pdconcurrent/ReLock.java index 5053dd5..02deb44 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/ReLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/ReLock.java @@ -10,47 +10,85 @@ import jakarta.validation.constraints.NotNull; import lombok.Getter; /** - * 使用 {@link ReentrantLock} 实现的并发管理 - * 

使用并发管理：
- *     public static
- *     void main(String[] args) {
- *         var lock = new ReLock();
- *         lock.read(() -> System.out.println("asdas"));
- *     }
- * 
不使用：
- *     public static
- *     void main(String[] args) {
- *         var lock = new ReentrantLock();
- *         lock.lock();
- *         try {
- *             System.out.println("asdas");
- *         } finally {
- *             lock.unlock();
- *         }
- *     }
+ *

使用{@link ReentrantLock}实现的并发管理.

+ * 使用{@link ReentrantLock}实现并发域，读写锁均为同一个实现
+ * 使用了可中断的上锁操作{@link ReentrantLock#lockInterruptibly()}
+ * 支持使用{@link #newCondition()}获取{@link Condition}，通过{@link #isLocked()}检查是否被占用 + *

+ * 使用并发管理： + * {@snippet lang = java: + * 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 static void main(String[] args) { + * var lock = new ReentrantLock(); + * lock.lock(); + * try { + * System.out.println("asdas"); + * } finally { + * lock.unlock(); + * } + * }} * * @author fybug - * @version 0.0.1 + * @version 0.1.0 + * @see SyLock + * @see ReentrantLock * @since PDConcurrent 0.0.1 */ @Getter public class ReLock implements SyLock { - // 锁 + /** 锁 */ private final ReentrantLock LOCK; + /** + * 构建并发管理 + *

+ * 使用非公平锁 + */ public ReLock() { this(false); } - /** 构造并发处理，并决定使用公平锁还是非公平锁 */ + /** + * 构造并发处理 + * + * @param fair 是否使用公平锁 + */ public ReLock(boolean fair) { this(new ReentrantLock(fair)); } + /** + * 构造并发处理 + * + * @param LOCK 使用的锁 + * + * @since 0.1.0 + */ public ReLock(@NotNull ReentrantLock LOCK) { this.LOCK = LOCK; } //---------------------------------------------------------------------------------------------- + /** + * {@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, @@ -58,45 +96,85 @@ class ReLock implements SyLock { { R o = null; 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); - if ( lockType != LockType.NOLOCK && LOCK.isLocked() ) - LOCK.unlock(); + // 防止错误 + 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 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 { - if ( finaby != null ) - o = finaby.apply(o); - if ( lockType != LockType.NOLOCK && LOCK.isLocked() ) - LOCK.unlock(); + // 防止错误 + try { + // 收尾 + if ( finaby != null ) + o = finaby.apply(o); + } finally { + // 解锁 + if ( lockType != LockType.NOLOCK && LOCK.isLocked() ) + LOCK.unlock(); + } } return o; } //---------------------------------------------------------------------------------------------- - /** 获取 {@link Condition} */ + /** + * 获取{@link Condition} + * + * @see ReentrantLock#newCondition() + */ @NotNull public Condition newCondition() { return LOCK.newCondition(); } + /** + * 检查锁是否被占用 + * + * @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 57f00ae..1d7929a 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/SyLock.java +++ b/src/main/java/fybug/nulll/pdconcurrent/SyLock.java @@ -27,7 +27,8 @@ interface SyLock { /** * 使用锁执行指定回调 *

- * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
+ * 所有回调均在并发域内执行 * * @param lockType 锁类型 * @param run 带返回的回调 @@ -50,7 +51,8 @@ interface SyLock { /** * 使用锁执行指定回调 *

- * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * 可通过传入{@link LockType}指定锁的类型，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
+ * 所有回调均在并发域内执行 * * @param lockType 锁类型 * @param run 执行的回调 @@ -127,7 +129,8 @@ interface SyLock { /** * 尝试使用锁执行指定回调 *

- * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，通过两个回调参数插入不同的块中执行，遇到异常会抛出 + * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，通过两个回调参数插入不同的块中执行，遇到异常会抛出
+ * 所有回调均在并发域内执行 * * @param lockType 锁类型 * @param run 带返回的回调 @@ -148,7 +151,8 @@ interface SyLock { /** * 尝试使用锁执行指定回调 *

- * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，通过两个回调参数插入不同的块中执行，遇到异常会抛出 + * 可通过传入{@link LockType}指定锁的类型，运行时自带try-finally块，通过两个回调参数插入不同的块中执行，遇到异常会抛出
+ * 所有回调均在并发域内执行 * * @param lockType 锁类型 * @param run 执行的回调 @@ -297,7 +301,8 @@ interface SyLock { /** * 使用读锁执行指定回调 *

- * 调用读锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * 调用读锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
+ * 所有回调均在并发域内执行 * * @param run 带返回的回调 * @param catchby 进入catch块后的回调，传入当前异常 @@ -319,7 +324,8 @@ interface SyLock { /** * 使用读锁执行指定回调 *

- * 调用读锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * 调用读锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
+ * 所有回调均在并发域内执行 * * @param run 执行的回调 * @param catchby 进入catch块后的回调，传入当前异常 @@ -349,7 +355,8 @@ interface SyLock { /** * 使用写锁执行指定回调 *

- * 调用写锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * 调用写锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
+ * 所有回调均在并发域内执行 * * @param run 带返回的回调 * @param catchby 进入catch块后的回调，传入当前异常 @@ -371,7 +378,8 @@ interface SyLock { /** * 使用写锁执行指定回调 *

- * 调用写锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行 + * 调用写锁执行，运行时自带try-catch-finally块，通过三个回调参数插入不同的块中执行
+ * 所有回调均在并发域内执行 * * @param run 执行的回调 * @param catchby 进入catch块后的回调，传入当前异常 diff --git a/src/main/java/fybug/nulll/pdconcurrent/package-info.java b/src/main/java/fybug/nulll/pdconcurrent/package-info.java index c810f65..640060a 100644 --- a/src/main/java/fybug/nulll/pdconcurrent/package-info.java +++ b/src/main/java/fybug/nulll/pdconcurrent/package-info.java @@ -1,8 +1,8 @@ /** *

并发管理工具.

- * 用于并发管理的工具，使用接口在并发域中执行代码。
- * 根据实现的不同并发管理也不同，但都实现 {@link fybug.nulll.pdconcurrent.SyLock} 接口
- * 附带 {@code try***} 的功能接口包，在 java 原有的功能接口的基础上允许抛出异常 + * 用于并发管理的工具，使用回调在并发域中执行代码。
+ * 根据实现的不同并发管理也不同，但都实现{@link fybug.nulll.pdconcurrent.SyLock}接口
+ * 附带{@code try***}的功能接口包{@link fybug.nulll.pdconcurrent.fun}，在java原有的功能接口的基础上允许抛出异常 * * @author fybug * @version 0.1.0 -- Gitee