Skip to content

Commit 71f37d0

Browse files
fzhinkinfzhinkin
committed
Introduce unsafe API for bulk read/write ops.
The API aimed to facilitate integration with other frameworks and libraries. Implemented API was initially described in the "Bulk API" subsection of #135 (comment)
1 parent e3f76f7 commit 71f37d0

28 files changed

+1504
-81
lines changed

‎core/api/kotlinx-io-core.api

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
public final class kotlinx/io/Buffer : kotlinx/io/Sink, kotlinx/io/Source {
2+
public final fun #int#getHead ()Lkotlinx/io/Segment;
3+
public final fun #int#getSize ()J
4+
public final fun #int#getTail ()Lkotlinx/io/Segment;
5+
public final fun #int#recycleTail ()V
6+
public final fun #int#setHead (Lkotlinx/io/Segment;)V
7+
public final fun #int#setSize (J)V
8+
public final fun #int#setTail (Lkotlinx/io/Segment;)V
9+
public final fun #int#writableSegment (I)Lkotlinx/io/Segment;
210
public fun <init> ()V
311
public final fun clear ()V
412
public fun close ()V
@@ -92,6 +100,24 @@ public abstract interface class kotlinx/io/RawSource : java/lang/AutoCloseable {
92100
public abstract fun readAtMostTo (Lkotlinx/io/Buffer;J)J
93101
}
94102

103+
public final class kotlinx/io/Segment {
104+
public final fun #int#dataAsByteArray (Z)[B
105+
public final fun #int#dataWriteBack ([BI)V
106+
public final fun #int#getLimit ()I
107+
public final fun #int#getNext ()Lkotlinx/io/Segment;
108+
public final fun #int#getPos ()I
109+
public final fun #int#remainingCapacity ()I
110+
public final fun #int#setLimit (I)V
111+
public final fun #int#setNext (Lkotlinx/io/Segment;)V
112+
public final fun #int#setPos (I)V
113+
public final fun #int#size ()I
114+
public synthetic fun <init> ([BIIZZLkotlin/jvm/internal/DefaultConstructorMarker;)V
115+
}
116+
117+
public final class kotlinx/io/SegmentKt {
118+
public static final fun isEmpty (Lkotlinx/io/Segment;)Z
119+
}
120+
95121
public abstract interface class kotlinx/io/Sink : kotlinx/io/RawSink {
96122
public abstract fun emit ()V
97123
public abstract fun flush ()V
@@ -186,6 +212,9 @@ public final class kotlinx/io/SourcesKt {
186212
public static final fun startsWith (Lkotlinx/io/Source;B)Z
187213
}
188214

215+
public abstract interface annotation class kotlinx/io/UnsafeIoApi : java/lang/annotation/Annotation {
216+
}
217+
189218
public final class kotlinx/io/Utf8Kt {
190219
public static final fun readCodePointValue (Lkotlinx/io/Source;)I
191220
public static final fun readLine (Lkotlinx/io/Source;)Ljava/lang/String;
@@ -253,3 +282,18 @@ public final class kotlinx/io/files/PathsKt {
253282
public static final fun sourceDeprecated (Lkotlinx/io/files/Path;)Lkotlinx/io/Source;
254283
}
255284

285+
public final class kotlinx/io/unsafe/UnsafeBufferOperations {
286+
public static final field INSTANCE Lkotlinx/io/unsafe/UnsafeBufferOperations;
287+
public static final field maxSafeWriteCapacity I
288+
public final fun moveToTail (Lkotlinx/io/Buffer;[BII)V
289+
public static synthetic fun moveToTail$default (Lkotlinx/io/unsafe/UnsafeBufferOperations;Lkotlinx/io/Buffer;[BIIILjava/lang/Object;)V
290+
public final fun readFromHead (Lkotlinx/io/Buffer;Lkotlin/jvm/functions/Function3;)V
291+
public final fun writeToTail (Lkotlinx/io/Buffer;ILkotlin/jvm/functions/Function3;)V
292+
}
293+
294+
public final class kotlinx/io/unsafe/UnsafeBufferOperationsJvmKt {
295+
public static final fun readBulk (Lkotlinx/io/unsafe/UnsafeBufferOperations;Lkotlinx/io/Buffer;[Ljava/nio/ByteBuffer;Lkotlin/jvm/functions/Function2;)V
296+
public static final fun readFromHead (Lkotlinx/io/unsafe/UnsafeBufferOperations;Lkotlinx/io/Buffer;Lkotlin/jvm/functions/Function1;)V
297+
public static final fun writeToTail (Lkotlinx/io/unsafe/UnsafeBufferOperations;Lkotlinx/io/Buffer;ILkotlin/jvm/functions/Function1;)V
298+
}
299+

‎core/api/kotlinx-io-core.klib.api

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@ final class kotlinx.io/Buffer : kotlinx.io/Sink, kotlinx.io/Source { // kotlinx.
5555
final fun readLong(): kotlin/Long // kotlinx.io/Buffer.readLong|readLong(){}[0]
5656
final fun readShort(): kotlin/Short // kotlinx.io/Buffer.readShort|readShort(){}[0]
5757
final fun readTo(kotlinx.io/RawSink, kotlin/Long) // kotlinx.io/Buffer.readTo|readTo(kotlinx.io.RawSink;kotlin.Long){}[0]
58+
final fun recycleTail() // kotlinx.io/Buffer.recycleTail|recycleTail(){}[0]
5859
final fun request(kotlin/Long): kotlin/Boolean // kotlinx.io/Buffer.request|request(kotlin.Long){}[0]
5960
final fun require(kotlin/Long) // kotlinx.io/Buffer.require|require(kotlin.Long){}[0]
6061
final fun skip(kotlin/Long) // kotlinx.io/Buffer.skip|skip(kotlin.Long){}[0]
6162
final fun toString(): kotlin/String // kotlinx.io/Buffer.toString|toString(){}[0]
6263
final fun transferFrom(kotlinx.io/RawSource): kotlin/Long // kotlinx.io/Buffer.transferFrom|transferFrom(kotlinx.io.RawSource){}[0]
6364
final fun transferTo(kotlinx.io/RawSink): kotlin/Long // kotlinx.io/Buffer.transferTo|transferTo(kotlinx.io.RawSink){}[0]
65+
final fun writableSegment(kotlin/Int): kotlinx.io/Segment // kotlinx.io/Buffer.writableSegment|writableSegment(kotlin.Int){}[0]
6466
final fun write(kotlin/ByteArray, kotlin/Int, kotlin/Int) // kotlinx.io/Buffer.write|write(kotlin.ByteArray;kotlin.Int;kotlin.Int){}[0]
6567
final fun write(kotlinx.io/Buffer, kotlin/Long) // kotlinx.io/Buffer.write|write(kotlinx.io.Buffer;kotlin.Long){}[0]
6668
final fun write(kotlinx.io/RawSource, kotlin/Long) // kotlinx.io/Buffer.write|write(kotlinx.io.RawSource;kotlin.Long){}[0]
@@ -70,8 +72,34 @@ final class kotlinx.io/Buffer : kotlinx.io/Sink, kotlinx.io/Source { // kotlinx.
7072
final fun writeShort(kotlin/Short) // kotlinx.io/Buffer.writeShort|writeShort(kotlin.Short){}[0]
7173
final val buffer // kotlinx.io/Buffer.buffer|{}buffer[0]
7274
final fun <get-buffer>(): kotlinx.io/Buffer // kotlinx.io/Buffer.buffer.<get-buffer>|<get-buffer>(){}[0]
73-
final var size // kotlinx.io/Buffer.size|{}size[0]
75+
final val size // kotlinx.io/Buffer.size|{}size[0]
7476
final fun <get-size>(): kotlin/Long // kotlinx.io/Buffer.size.<get-size>|<get-size>(){}[0]
77+
final var head // kotlinx.io/Buffer.head|{}head[0]
78+
final fun <get-head>(): kotlinx.io/Segment? // kotlinx.io/Buffer.head.<get-head>|<get-head>(){}[0]
79+
final fun <set-head>(kotlinx.io/Segment?) // kotlinx.io/Buffer.head.<set-head>|<set-head>(kotlinx.io.Segment?){}[0]
80+
final var sizeMut // kotlinx.io/Buffer.sizeMut|<get-sizeMut>(){}[0]
81+
final fun <get-sizeMut>(): kotlin/Long // kotlinx.io/Buffer.sizeMut.<get-sizeMut>|<get-sizeMut>(){}[0]
82+
final fun <set-sizeMut>(kotlin/Long) // kotlinx.io/Buffer.sizeMut.<set-sizeMut>|<set-sizeMut>(kotlin.Long){}[0]
83+
final var tail // kotlinx.io/Buffer.tail|{}tail[0]
84+
final fun <get-tail>(): kotlinx.io/Segment? // kotlinx.io/Buffer.tail.<get-tail>|<get-tail>(){}[0]
85+
final fun <set-tail>(kotlinx.io/Segment?) // kotlinx.io/Buffer.tail.<set-tail>|<set-tail>(kotlinx.io.Segment?){}[0]
86+
}
87+
final class kotlinx.io/Segment { // kotlinx.io/Segment|null[0]
88+
final fun dataAsByteArray(kotlin/Boolean): kotlin/ByteArray // kotlinx.io/Segment.dataAsByteArray|dataAsByteArray(kotlin.Boolean){}[0]
89+
final fun writeBackData(kotlin/ByteArray, kotlin/Int) // kotlinx.io/Segment.writeBackData|writeBackData(kotlin.ByteArray;kotlin.Int){}[0]
90+
final val remainingCapacity // kotlinx.io/Segment.remainingCapacity|{}remainingCapacity[0]
91+
final fun <get-remainingCapacity>(): kotlin/Int // kotlinx.io/Segment.remainingCapacity.<get-remainingCapacity>|<get-remainingCapacity>(){}[0]
92+
final val size // kotlinx.io/Segment.size|{}size[0]
93+
final fun <get-size>(): kotlin/Int // kotlinx.io/Segment.size.<get-size>|<get-size>(){}[0]
94+
final var limit // kotlinx.io/Segment.limit|{}limit[0]
95+
final fun <get-limit>(): kotlin/Int // kotlinx.io/Segment.limit.<get-limit>|<get-limit>(){}[0]
96+
final fun <set-limit>(kotlin/Int) // kotlinx.io/Segment.limit.<set-limit>|<set-limit>(kotlin.Int){}[0]
97+
final var next // kotlinx.io/Segment.next|{}next[0]
98+
final fun <get-next>(): kotlinx.io/Segment? // kotlinx.io/Segment.next.<get-next>|<get-next>(){}[0]
99+
final fun <set-next>(kotlinx.io/Segment?) // kotlinx.io/Segment.next.<set-next>|<set-next>(kotlinx.io.Segment?){}[0]
100+
final var pos // kotlinx.io/Segment.pos|{}pos[0]
101+
final fun <get-pos>(): kotlin/Int // kotlinx.io/Segment.pos.<get-pos>|<get-pos>(){}[0]
102+
final fun <set-pos>(kotlin/Int) // kotlinx.io/Segment.pos.<set-pos>|<set-pos>(kotlin.Int){}[0]
75103
}
76104
final fun (kotlinx.io.files/Path).kotlinx.io.files/sink(): kotlinx.io/Sink // kotlinx.io.files/sink|[email protected](){}[0]
77105
final fun (kotlinx.io.files/Path).kotlinx.io.files/source(): kotlinx.io/Source // kotlinx.io.files/source|[email protected](){}[0]
@@ -81,6 +109,7 @@ final fun (kotlinx.io/Buffer).kotlinx.io/readString(): kotlin/String // kotlinx.
81109
final fun (kotlinx.io/Buffer).kotlinx.io/snapshot(): kotlinx.io.bytestring/ByteString // kotlinx.io/snapshot|[email protected](){}[0]
82110
final fun (kotlinx.io/RawSink).kotlinx.io/buffered(): kotlinx.io/Sink // kotlinx.io/buffered|[email protected](){}[0]
83111
final fun (kotlinx.io/RawSource).kotlinx.io/buffered(): kotlinx.io/Source // kotlinx.io/buffered|[email protected](){}[0]
112+
final fun (kotlinx.io/Segment).kotlinx.io/isEmpty(): kotlin/Boolean // kotlinx.io/isEmpty|[email protected](){}[0]
84113
final fun (kotlinx.io/Sink).kotlinx.io/write(kotlinx.io.bytestring/ByteString, kotlin/Int =..., kotlin/Int =...) // kotlinx.io/write|[email protected](kotlinx.io.bytestring.ByteString;kotlin.Int;kotlin.Int){}[0]
85114
final fun (kotlinx.io/Sink).kotlinx.io/writeCodePointValue(kotlin/Int) // kotlinx.io/writeCodePointValue|[email protected](kotlin.Int){}[0]
86115
final fun (kotlinx.io/Sink).kotlinx.io/writeDecimalLong(kotlin/Long) // kotlinx.io/writeDecimalLong|[email protected](kotlin.Long){}[0]
@@ -135,6 +164,13 @@ final fun kotlinx.io.files/Path(kotlin/String, kotlin/Array<out kotlin/String>..
135164
final fun kotlinx.io.files/Path(kotlinx.io.files/Path, kotlin/Array<out kotlin/String>...): kotlinx.io.files/Path // kotlinx.io.files/Path|Path(kotlinx.io.files.Path;kotlin.Array<out|kotlin.String>...){}[0]
136165
final fun kotlinx.io/discardingSink(): kotlinx.io/RawSink // kotlinx.io/discardingSink|discardingSink(){}[0]
137166
final inline fun (kotlinx.io/Sink).kotlinx.io/writeToInternalBuffer(kotlin/Function1<kotlinx.io/Buffer, kotlin/Unit>) // kotlinx.io/writeToInternalBuffer|[email protected](kotlin.Function1<kotlinx.io.Buffer,kotlin.Unit>){}[0]
167+
final object kotlinx.io.unsafe/UnsafeBufferOperations { // kotlinx.io.unsafe/UnsafeBufferOperations|null[0]
168+
final const val maxSafeWriteCapacity // kotlinx.io.unsafe/UnsafeBufferOperations.maxSafeWriteCapacity|{}maxSafeWriteCapacity[0]
169+
final fun <get-maxSafeWriteCapacity>(): kotlin/Int // kotlinx.io.unsafe/UnsafeBufferOperations.maxSafeWriteCapacity.<get-maxSafeWriteCapacity>|<get-maxSafeWriteCapacity>(){}[0]
170+
final fun moveToTail(kotlinx.io/Buffer, kotlin/ByteArray, kotlin/Int =..., kotlin/Int =...) // kotlinx.io.unsafe/UnsafeBufferOperations.moveToTail|moveToTail(kotlinx.io.Buffer;kotlin.ByteArray;kotlin.Int;kotlin.Int){}[0]
171+
final inline fun readFromHead(kotlinx.io/Buffer, kotlin/Function3<kotlin/ByteArray, kotlin/Int, kotlin/Int, kotlin/Int>) // kotlinx.io.unsafe/UnsafeBufferOperations.readFromHead|readFromHead(kotlinx.io.Buffer;kotlin.Function3<kotlin.ByteArray,kotlin.Int,kotlin.Int,kotlin.Int>){}[0]
172+
final inline fun writeToTail(kotlinx.io/Buffer, kotlin/Int, kotlin/Function3<kotlin/ByteArray, kotlin/Int, kotlin/Int, kotlin/Int>) // kotlinx.io.unsafe/UnsafeBufferOperations.writeToTail|writeToTail(kotlinx.io.Buffer;kotlin.Int;kotlin.Function3<kotlin.ByteArray,kotlin.Int,kotlin.Int,kotlin.Int>){}[0]
173+
}
138174
final val kotlinx.io.files/SystemFileSystem // kotlinx.io.files/SystemFileSystem|{}SystemFileSystem[0]
139175
final fun <get-SystemFileSystem>(): kotlinx.io.files/FileSystem // kotlinx.io.files/SystemFileSystem.<get-SystemFileSystem>|<get-SystemFileSystem>(){}[0]
140176
final val kotlinx.io.files/SystemPathSeparator // kotlinx.io.files/SystemPathSeparator|<get-SystemPathSeparator>(){}[0]
@@ -147,6 +183,9 @@ open annotation class kotlinx.io/DelicateIoApi : kotlin/Annotation { // kotlinx.
147183
open annotation class kotlinx.io/InternalIoApi : kotlin/Annotation { // kotlinx.io/InternalIoApi|null[0]
148184
constructor <init>() // kotlinx.io/InternalIoApi.<init>|<init>(){}[0]
149185
}
186+
open annotation class kotlinx.io/UnsafeIoApi : kotlin/Annotation { // kotlinx.io/UnsafeIoApi|null[0]
187+
constructor <init>() // kotlinx.io/UnsafeIoApi.<init>|<init>(){}[0]
188+
}
150189
open class kotlinx.io.files/FileNotFoundException : kotlinx.io/IOException { // kotlinx.io.files/FileNotFoundException|null[0]
151190
constructor <init>(kotlin/String?) // kotlinx.io.files/FileNotFoundException.<init>|<init>(kotlin.String?){}[0]
152191
}

‎core/apple/src/AppleCore.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ private open class OutputStreamSink(
4949

5050
head.pos += bytesWritten.toInt()
5151
remaining -= bytesWritten
52-
source.size -= bytesWritten
52+
source.sizeMut -= bytesWritten
5353

5454
if (head.pos == head.limit) {
5555
source.recycleHead()
@@ -105,7 +105,7 @@ private open class NSInputStreamSource(
105105
return -1
106106
}
107107
tail.limit += bytesRead.toInt()
108-
sink.size += bytesRead
108+
sink.sizeMut += bytesRead
109109
return bytesRead
110110
}
111111

‎core/apple/src/BuffersApple.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal fun Buffer.write(source: CPointer<uint8_tVar>, maxLength: Int) {
3030
currentOffset += toCopy
3131
tail.limit += toCopy
3232
}
33-
size += maxLength
33+
this.sizeMut += maxLength
3434
}
3535

3636
internal fun Buffer.readAtMostTo(sink: CPointer<uint8_tVar>, maxLength: Int): Int {
@@ -43,7 +43,7 @@ internal fun Buffer.readAtMostTo(sink: CPointer<uint8_tVar>, maxLength: Int): In
4343
}
4444

4545
s.pos += toCopy
46-
size -= toCopy.toLong()
46+
this.sizeMut -= toCopy.toLong()
4747

4848
if (s.pos == s.limit) {
4949
recycleHead()

‎core/common/src/Annotations.kt

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
44
*/
55

@@ -38,4 +38,18 @@ public annotation class DelicateIoApi
3838
"Make sure you fully read and understand documentation of the declaration that " +
3939
"is marked as an internal API."
4040
)
41-
public annotation class InternalIoApi
41+
public annotation class InternalIoApi
42+
43+
/**
44+
* Marks API that may cause data corruption or loss or behave unpredictable when used with invalid argument values.
45+
*
46+
* Consider using other APIs instead when possible.
47+
* Otherwise, make sure to read documentation describing an unsafe API.
48+
*/
49+
@Retention(AnnotationRetention.BINARY)
50+
@RequiresOptIn(
51+
level = RequiresOptIn.Level.WARNING,
52+
message = "This is an unsafe API and its use requires care. " +
53+
"Make sure you fully understand documentation of the declaration marked as UnsafeIoApi"
54+
)
55+
public annotation class UnsafeIoApi

0 commit comments

Comments
 (0)