diff --git a/build.gradle.kts b/build.gradle.kts index b1de69f..2c77388 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ repositories { } kotlin { - jvmToolchain(17) + jvmToolchain(8) jvm { compilations.all { kotlinOptions.jvmTarget = "1.8" @@ -75,7 +75,28 @@ kotlin { baseName = "mp_bintools" } } - + + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64() + ).forEach { + it.binaries.framework { + baseName = "mp_bintools" + isStatic = true + } + } + + listOf( + macosX64(), + macosArm64() + ).forEach { + it.binaries.framework { + baseName = "mp_bintools" + isStatic = true + } + } + sourceSets { all { languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi") @@ -94,14 +115,14 @@ kotlin { val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation("net.sergeych:mp_stools:1.4.4-SNAPSHOT") + implementation("net.sergeych:mp_stools:1.4.7") } } val jvmMain by getting val jvmTest by getting val jsMain by getting { dependencies { - implementation("net.sergeych:mp_stools:1.4.4-SNAPSHOT") + implementation("net.sergeych:mp_stools:1.4.7") } } val jsTest by getting @@ -109,7 +130,7 @@ kotlin { val nativeTest by getting val wasmJsMain by getting { dependencies { - implementation("net.sergeych:mp_stools:1.4.4-SNAPSHOT") + implementation("net.sergeych:mp_stools:1.4.7") } } val wasmJsTest by getting diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + 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 @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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" \ @@ -205,6 +214,12 @@ set -- \ 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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/src/iosArm64Main/kotlin/net.sergeych.bintools/KVStorage.iosArm64.kt b/src/iosArm64Main/kotlin/net.sergeych.bintools/KVStorage.iosArm64.kt new file mode 100644 index 0000000..8f28db7 --- /dev/null +++ b/src/iosArm64Main/kotlin/net.sergeych.bintools/KVStorage.iosArm64.kt @@ -0,0 +1,25 @@ +package net.sergeych.bintools + +/** + * Create per-platform default named storage. + * + * - In the browser, it uses the `Window.localStorage` prefixing items + * by a string containing the [name] + * + * - In the JVM environment it uses folder-based storage on the file system. The name + * is considered to be a folder name (the whole path which will be automatically created) + * using the following rules: + * - when the name starts with slash (`/`) it is treated as an absolute path to a folder + * - when the name contains slash, it is considered to be a relative folder to the + * `User.home` directory, like "`~/`" on unix systems. + * - otherwise, the folder will be created in "`~/.local_storage`" parent directory + * (which also will be created if needed). + * + * - For the native platorms it is not yet implemented (but will be soon). + * + * See [DataKVStorage] and [DataProvider] to implement a KVStorage on filesystems and like, + * and `FileDataProvider` class on JVM target. + */ +actual fun defaultNamedStorage(name: String): KVStorage { + TODO("Not yet implemented") +} \ No newline at end of file diff --git a/src/iosArm64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosArm64.kt b/src/iosArm64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosArm64.kt new file mode 100644 index 0000000..05d0194 --- /dev/null +++ b/src/iosArm64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosArm64.kt @@ -0,0 +1,27 @@ +package net.sergeych.synctools + +import kotlinx.atomicfu.locks.ReentrantLock + +/** + * Get the platform-depended implementation of a mutex. It does nothing in the + * browser and use appropriate mechanics on JVM and native targets. See + * [ProtectedOpImplementation.invoke], [ProtectedOpImplementation.withLock] + * ```kotlin + * val op = ProtectedOp() + * //... + * op { + * // mutually exclusive execution + * println("sequential execution here") + * } + * ~~~ + */ +actual fun ProtectedOp(): ProtectedOpImplementation = object : ProtectedOpImplementation { + private val access = ReentrantLock() + override fun lock() { + access.lock() + } + + override fun unlock() { + access.unlock() + } +} \ No newline at end of file diff --git a/src/iosArm64Main/kotlin/net/sergeych/synctools/WaitHandle.iosArm64.kt b/src/iosArm64Main/kotlin/net/sergeych/synctools/WaitHandle.iosArm64.kt new file mode 100644 index 0000000..82b6acd --- /dev/null +++ b/src/iosArm64Main/kotlin/net/sergeych/synctools/WaitHandle.iosArm64.kt @@ -0,0 +1,38 @@ +package net.sergeych.synctools + +import kotlinx.coroutines.TimeoutCancellationException +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withTimeout + +/** + * Platform-independent interface to thread wait/notify. Does nothing in JS/browser, + * and uses appropriate mechanics on other platforms. + */ +@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING") +actual class WaitHandle { + private val channel = Channel() + actual fun await(milliseconds: Long): Boolean { + return runBlocking { + try { + if( milliseconds > 0) { + withTimeout(milliseconds) { + channel.receive() + true + } + } + else { + channel.receive() + true + } + } + catch(_: TimeoutCancellationException) { + false + } + } + } + + actual fun wakeUp() { + runBlocking { channel.send(Unit) } + } +} \ No newline at end of file diff --git a/src/iosSimulatorArm64Main/kotlin/net.sergeych.bintools/KVStorage.iosSimulatorArm64.kt b/src/iosSimulatorArm64Main/kotlin/net.sergeych.bintools/KVStorage.iosSimulatorArm64.kt new file mode 100644 index 0000000..8f28db7 --- /dev/null +++ b/src/iosSimulatorArm64Main/kotlin/net.sergeych.bintools/KVStorage.iosSimulatorArm64.kt @@ -0,0 +1,25 @@ +package net.sergeych.bintools + +/** + * Create per-platform default named storage. + * + * - In the browser, it uses the `Window.localStorage` prefixing items + * by a string containing the [name] + * + * - In the JVM environment it uses folder-based storage on the file system. The name + * is considered to be a folder name (the whole path which will be automatically created) + * using the following rules: + * - when the name starts with slash (`/`) it is treated as an absolute path to a folder + * - when the name contains slash, it is considered to be a relative folder to the + * `User.home` directory, like "`~/`" on unix systems. + * - otherwise, the folder will be created in "`~/.local_storage`" parent directory + * (which also will be created if needed). + * + * - For the native platorms it is not yet implemented (but will be soon). + * + * See [DataKVStorage] and [DataProvider] to implement a KVStorage on filesystems and like, + * and `FileDataProvider` class on JVM target. + */ +actual fun defaultNamedStorage(name: String): KVStorage { + TODO("Not yet implemented") +} \ No newline at end of file diff --git a/src/iosSimulatorArm64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosSimulatorArm64.kt b/src/iosSimulatorArm64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosSimulatorArm64.kt new file mode 100644 index 0000000..6ce1e55 --- /dev/null +++ b/src/iosSimulatorArm64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosSimulatorArm64.kt @@ -0,0 +1,17 @@ +package net.sergeych.synctools + +import kotlinx.atomicfu.locks.ReentrantLock + +/** + * Native implementation uses `ReentrantLock`] + */ +actual fun ProtectedOp(): ProtectedOpImplementation = object : ProtectedOpImplementation { + private val access = ReentrantLock() + override fun lock() { + access.lock() + } + + override fun unlock() { + access.unlock() + } +} \ No newline at end of file diff --git a/src/iosSimulatorArm64Main/kotlin/net/sergeych/synctools/WaitHandle.iosSimulatorArm64.kt b/src/iosSimulatorArm64Main/kotlin/net/sergeych/synctools/WaitHandle.iosSimulatorArm64.kt new file mode 100644 index 0000000..efb35d6 --- /dev/null +++ b/src/iosSimulatorArm64Main/kotlin/net/sergeych/synctools/WaitHandle.iosSimulatorArm64.kt @@ -0,0 +1,34 @@ +package net.sergeych.synctools + +import kotlinx.coroutines.TimeoutCancellationException +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withTimeout + +@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING") +actual class WaitHandle { + private val channel = Channel() + actual fun await(milliseconds: Long): Boolean { + return runBlocking { + try { + if( milliseconds > 0) { + withTimeout(milliseconds) { + channel.receive() + true + } + } + else { + channel.receive() + true + } + } + catch(_: TimeoutCancellationException) { + false + } + } + } + + actual fun wakeUp() { + runBlocking { channel.send(Unit) } + } +} \ No newline at end of file diff --git a/src/iosX64Main/kotlin/net.sergeych.bintools/KVStorage.iosX64.kt b/src/iosX64Main/kotlin/net.sergeych.bintools/KVStorage.iosX64.kt new file mode 100644 index 0000000..8f28db7 --- /dev/null +++ b/src/iosX64Main/kotlin/net.sergeych.bintools/KVStorage.iosX64.kt @@ -0,0 +1,25 @@ +package net.sergeych.bintools + +/** + * Create per-platform default named storage. + * + * - In the browser, it uses the `Window.localStorage` prefixing items + * by a string containing the [name] + * + * - In the JVM environment it uses folder-based storage on the file system. The name + * is considered to be a folder name (the whole path which will be automatically created) + * using the following rules: + * - when the name starts with slash (`/`) it is treated as an absolute path to a folder + * - when the name contains slash, it is considered to be a relative folder to the + * `User.home` directory, like "`~/`" on unix systems. + * - otherwise, the folder will be created in "`~/.local_storage`" parent directory + * (which also will be created if needed). + * + * - For the native platorms it is not yet implemented (but will be soon). + * + * See [DataKVStorage] and [DataProvider] to implement a KVStorage on filesystems and like, + * and `FileDataProvider` class on JVM target. + */ +actual fun defaultNamedStorage(name: String): KVStorage { + TODO("Not yet implemented") +} \ No newline at end of file diff --git a/src/iosX64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosX64.kt b/src/iosX64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosX64.kt new file mode 100644 index 0000000..6ce1e55 --- /dev/null +++ b/src/iosX64Main/kotlin/net/sergeych/synctools/ProtectedOp.iosX64.kt @@ -0,0 +1,17 @@ +package net.sergeych.synctools + +import kotlinx.atomicfu.locks.ReentrantLock + +/** + * Native implementation uses `ReentrantLock`] + */ +actual fun ProtectedOp(): ProtectedOpImplementation = object : ProtectedOpImplementation { + private val access = ReentrantLock() + override fun lock() { + access.lock() + } + + override fun unlock() { + access.unlock() + } +} \ No newline at end of file diff --git a/src/iosX64Main/kotlin/net/sergeych/synctools/WaitHandle.iosX64.kt b/src/iosX64Main/kotlin/net/sergeych/synctools/WaitHandle.iosX64.kt new file mode 100644 index 0000000..efb35d6 --- /dev/null +++ b/src/iosX64Main/kotlin/net/sergeych/synctools/WaitHandle.iosX64.kt @@ -0,0 +1,34 @@ +package net.sergeych.synctools + +import kotlinx.coroutines.TimeoutCancellationException +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withTimeout + +@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING") +actual class WaitHandle { + private val channel = Channel() + actual fun await(milliseconds: Long): Boolean { + return runBlocking { + try { + if( milliseconds > 0) { + withTimeout(milliseconds) { + channel.receive() + true + } + } + else { + channel.receive() + true + } + } + catch(_: TimeoutCancellationException) { + false + } + } + } + + actual fun wakeUp() { + runBlocking { channel.send(Unit) } + } +} \ No newline at end of file diff --git a/src/jvmMain/kotlin/net.sergeych.bintools/FileDataProvider.kt b/src/jvmMain/kotlin/net.sergeych.bintools/FileDataProvider.kt index bf16ef5..1f27eca 100644 --- a/src/jvmMain/kotlin/net.sergeych.bintools/FileDataProvider.kt +++ b/src/jvmMain/kotlin/net.sergeych.bintools/FileDataProvider.kt @@ -5,23 +5,23 @@ import java.io.OutputStream import java.nio.file.Path import kotlin.io.path.* -class FileDataProvider(val folder: Path): DataProvider { +class FileDataProvider(val folder: Path) : DataProvider { - class Source(private val input: InputStream): DataSource { + class Source(private val input: InputStream) : DataSource { override fun readByte(): Byte { val b = input.read() - if( b < 0) throw DataSource.EndOfData() + if (b < 0) throw DataSource.EndOfData() return b.toByte() } override fun readBytes(size: Int): ByteArray { - return input.readNBytes(size).also { - if( it.size < size ) throw DataSource.EndOfData() + return input.readNBytes2(size).also { + if (it.size < size) throw DataSource.EndOfData() } } } - class Sink(private val out: OutputStream): DataSink { + class Sink(private val out: OutputStream) : DataSink { override fun writeByte(data: Byte) { out.write(data.toInt()) } @@ -44,4 +44,16 @@ class FileDataProvider(val folder: Path): DataProvider { .listDirectoryEntries() .filter { it.isRegularFile() && it.isReadable() } .map { it.name } +} + +/** + * Compatibility with Java8 and android. Read up to N bytes + */ +fun InputStream.readNBytes2(size: Int): ByteArray { + val result = ByteArray(size) + val len = read(result) + return if (len < size) + result.sliceArray(0..() + actual fun await(milliseconds: Long): Boolean { + return runBlocking { + try { + if( milliseconds > 0) { + withTimeout(milliseconds) { + channel.receive() + true + } + } + else { + channel.receive() + true + } + } + catch(_: TimeoutCancellationException) { + false + } + } + } + + actual fun wakeUp() { + runBlocking { channel.send(Unit) } + } +} \ No newline at end of file diff --git a/src/macosX64Main/kotlin/net.sergeych.bintools/KVStorage.macosX64.kt b/src/macosX64Main/kotlin/net.sergeych.bintools/KVStorage.macosX64.kt new file mode 100644 index 0000000..8f28db7 --- /dev/null +++ b/src/macosX64Main/kotlin/net.sergeych.bintools/KVStorage.macosX64.kt @@ -0,0 +1,25 @@ +package net.sergeych.bintools + +/** + * Create per-platform default named storage. + * + * - In the browser, it uses the `Window.localStorage` prefixing items + * by a string containing the [name] + * + * - In the JVM environment it uses folder-based storage on the file system. The name + * is considered to be a folder name (the whole path which will be automatically created) + * using the following rules: + * - when the name starts with slash (`/`) it is treated as an absolute path to a folder + * - when the name contains slash, it is considered to be a relative folder to the + * `User.home` directory, like "`~/`" on unix systems. + * - otherwise, the folder will be created in "`~/.local_storage`" parent directory + * (which also will be created if needed). + * + * - For the native platorms it is not yet implemented (but will be soon). + * + * See [DataKVStorage] and [DataProvider] to implement a KVStorage on filesystems and like, + * and `FileDataProvider` class on JVM target. + */ +actual fun defaultNamedStorage(name: String): KVStorage { + TODO("Not yet implemented") +} \ No newline at end of file diff --git a/src/macosX64Main/kotlin/net/sergeych/synctools/ProtectedOp.macosX64.kt b/src/macosX64Main/kotlin/net/sergeych/synctools/ProtectedOp.macosX64.kt new file mode 100644 index 0000000..6ce1e55 --- /dev/null +++ b/src/macosX64Main/kotlin/net/sergeych/synctools/ProtectedOp.macosX64.kt @@ -0,0 +1,17 @@ +package net.sergeych.synctools + +import kotlinx.atomicfu.locks.ReentrantLock + +/** + * Native implementation uses `ReentrantLock`] + */ +actual fun ProtectedOp(): ProtectedOpImplementation = object : ProtectedOpImplementation { + private val access = ReentrantLock() + override fun lock() { + access.lock() + } + + override fun unlock() { + access.unlock() + } +} \ No newline at end of file diff --git a/src/macosX64Main/kotlin/net/sergeych/synctools/WaitHandle.macosX64.kt b/src/macosX64Main/kotlin/net/sergeych/synctools/WaitHandle.macosX64.kt new file mode 100644 index 0000000..efb35d6 --- /dev/null +++ b/src/macosX64Main/kotlin/net/sergeych/synctools/WaitHandle.macosX64.kt @@ -0,0 +1,34 @@ +package net.sergeych.synctools + +import kotlinx.coroutines.TimeoutCancellationException +import kotlinx.coroutines.channels.Channel +import kotlinx.coroutines.runBlocking +import kotlinx.coroutines.withTimeout + +@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING") +actual class WaitHandle { + private val channel = Channel() + actual fun await(milliseconds: Long): Boolean { + return runBlocking { + try { + if( milliseconds > 0) { + withTimeout(milliseconds) { + channel.receive() + true + } + } + else { + channel.receive() + true + } + } + catch(_: TimeoutCancellationException) { + false + } + } + } + + actual fun wakeUp() { + runBlocking { channel.send(Unit) } + } +} \ No newline at end of file