Skip to content

Commit fe33837

Browse files
milyinmilyin
committed
sesstion migrated
1 parent 6cb3fec commit fe33837

32 files changed

Lines changed: 1086 additions & 1907 deletions

‎zenoh-flat-jni/build.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ fn main() {
223223
.class_fun(pq!(z_querier_get))
224224
.class_fun(pq!(querier_get))
225225
.enum_class(pq!(ReplyKeyExpr))
226+
.enum_class(pq!(QueryTarget))
227+
.enum_class(pq!(ConsolidationMode))
226228
.ptr_class(pq!(ZQuery))
227229
.class_fun(pq!(z_query_reply_success))
228230
.class_fun(pq!(z_query_reply_error))
@@ -242,6 +244,22 @@ fn main() {
242244
.ptr_class(pq!(ZLivelinessToken))
243245
.package("session")
244246
.ptr_class(pq!(ZSession))
247+
.class_object_fun(pq!(z_open))
248+
.class_fun(pq!(z_session_declare_publisher))
249+
.class_fun(pq!(z_session_put))
250+
.class_fun(pq!(z_session_delete))
251+
.class_fun(pq!(z_session_declare_subscriber))
252+
.class_fun(pq!(session_declare_subscriber))
253+
.class_fun(pq!(z_session_declare_querier))
254+
.class_fun(pq!(z_session_declare_queryable))
255+
.class_fun(pq!(session_declare_queryable))
256+
.class_fun(pq!(z_session_declare_keyexpr))
257+
.class_fun(pq!(z_session_undeclare_keyexpr))
258+
.class_fun(pq!(z_session_get))
259+
.class_fun(pq!(session_get))
260+
.class_fun(pq!(z_session_zid))
261+
.class_fun(pq!(z_session_peers_zid))
262+
.class_fun(pq!(z_session_routers_zid))
245263
.class_fun(pq!(z_liveliness_declare_token))
246264
.class_fun(pq!(z_liveliness_get))
247265
.class_fun(pq!(liveliness_get))

‎zenoh-flat-jni/generated-kotlin/io/zenoh/jni/JNINative.kt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import io.zenoh.jni.bytes.ZEncoding
66
import io.zenoh.jni.bytes.ZZBytes
77
import io.zenoh.jni.callbacks.Callback
88
import io.zenoh.jni.callbacks.HelloCallback
9+
import io.zenoh.jni.callbacks.QueryCallback
910
import io.zenoh.jni.callbacks.ReplyCallback
1011
import io.zenoh.jni.callbacks.SampleCallback
1112
import io.zenoh.jni.callbacks.ZHelloCallback
13+
import io.zenoh.jni.callbacks.ZQueryCallback
1214
import io.zenoh.jni.callbacks.ZReplyCallback
1315
import io.zenoh.jni.callbacks.ZSampleCallback
1416
import io.zenoh.jni.config.WhatAmI
@@ -18,15 +20,19 @@ import io.zenoh.jni.keyexpr.KeyExpr
1820
import io.zenoh.jni.keyexpr.SetIntersectionLevel
1921
import io.zenoh.jni.keyexpr.ZKeyExpr
2022
import io.zenoh.jni.liveliness.ZLivelinessToken
23+
import io.zenoh.jni.pubsub.ZPublisher
2124
import io.zenoh.jni.pubsub.ZSubscriber
2225
import io.zenoh.jni.qos.CongestionControl
2326
import io.zenoh.jni.qos.Priority
2427
import io.zenoh.jni.query.Query
2528
import io.zenoh.jni.query.Reply
29+
import io.zenoh.jni.query.ZQuerier
30+
import io.zenoh.jni.query.ZQueryable
2631
import io.zenoh.jni.sample.Sample
2732
import io.zenoh.jni.sample.SampleKind
2833
import io.zenoh.jni.sample.ZSample
2934
import io.zenoh.jni.scouting.ZScout
35+
import io.zenoh.jni.session.ZSession
3036
import io.zenoh.jni.time.Timestamp
3137
import io.zenoh.jni.time.ZTimestamp
3238

@@ -99,6 +105,9 @@ internal object JNINative {
99105
external fun livelinessGet(session: Long, keyExpr: Any, timeoutMs: Long, callback: ReplyCallback, onClose: Callback)
100106
external fun querierGet(querier: Long, parameters: String?, payload: Any?, encoding: Any, attachment: Any?, callback: ReplyCallback, onClose: Callback)
101107
external fun scout(whatami: Int, config: Long, callback: HelloCallback, onClose: Callback): Long
108+
external fun sessionDeclareQueryable(session: Long, keyExpr: Any, complete: Boolean, callback: QueryCallback, onClose: Callback): Long
109+
external fun sessionDeclareSubscriber(session: Long, keyExpr: Any, callback: SampleCallback, onClose: Callback): Long
110+
external fun sessionGet(session: Long, keyExpr: Any, parameters: String?, timeoutMs: Long, target: Int, consolidation: Int, acceptReplies: Int, congestionControl: Int, priority: Int, express: Boolean, payload: Any?, encoding: Any, attachment: Any?, callback: ReplyCallback, onClose: Callback)
102111
external fun tryInitZenohLogsFromEnv()
103112
external fun zConfigDefault(): Long
104113
external fun zConfigFromFile(path: String): Long
@@ -177,6 +186,7 @@ internal object JNINative {
177186
external fun zLivelinessDeclareSubscriber(session: Long, keyExpr: Any, history: Boolean, callback: ZSampleCallback, onClose: Callback): Long
178187
external fun zLivelinessDeclareToken(session: Long, keyExpr: Any): Long
179188
external fun zLivelinessGet(session: Long, keyExpr: Any, timeoutMs: Long, callback: ZReplyCallback, onClose: Callback)
189+
external fun zOpen(config: Long): Long
180190
external fun zPublisherDelete(publisher: Long, attachment: Any?)
181191
external fun zPublisherPut(publisher: Long, payload: Any, encoding: Any, attachment: Any?)
182192
external fun zQuerierGet(querier: Long, parameters: String?, payload: Any?, encoding: Any, attachment: Any?, callback: ZReplyCallback, onClose: Callback)
@@ -202,6 +212,18 @@ internal object JNINative {
202212
external fun zSamplePriority(s: Long): Int
203213
external fun zSampleTimestamp(s: Long): Long
204214
external fun zScout(whatami: Int, config: Long, callback: ZHelloCallback, onClose: Callback): Long
215+
external fun zSessionDeclareKeyexpr(session: Long, keyExpr: String): Long
216+
external fun zSessionDeclarePublisher(session: Long, keyExpr: Any, congestionControl: Int, priority: Int, express: Boolean, reliability: Int): Long
217+
external fun zSessionDeclareQuerier(session: Long, keyExpr: Any, target: Int, consolidation: Int, congestionControl: Int, priority: Int, express: Boolean, timeoutMs: Long, acceptReplies: Int): Long
218+
external fun zSessionDeclareQueryable(session: Long, keyExpr: Any, complete: Boolean, callback: ZQueryCallback, onClose: Callback): Long
219+
external fun zSessionDeclareSubscriber(session: Long, keyExpr: Any, callback: ZSampleCallback, onClose: Callback): Long
220+
external fun zSessionDelete(session: Long, keyExpr: Any, congestionControl: Int, priority: Int, express: Boolean, attachment: Any?, reliability: Int)
221+
external fun zSessionGet(session: Long, keyExpr: Any, parameters: String?, timeoutMs: Long, target: Int, consolidation: Int, acceptReplies: Int, congestionControl: Int, priority: Int, express: Boolean, payload: Any?, encoding: Any, attachment: Any?, callback: ZReplyCallback, onClose: Callback)
222+
external fun zSessionPeersZid(session: Long): List<ByteArray>
223+
external fun zSessionPut(session: Long, keyExpr: Any, payload: Any, encoding: Any, congestionControl: Int, priority: Int, express: Boolean, attachment: Any?, reliability: Int)
224+
external fun zSessionRoutersZid(session: Long): List<ByteArray>
225+
external fun zSessionUndeclareKeyexpr(session: Long, keyExpr: Long)
226+
external fun zSessionZid(session: Long): ByteArray
205227
external fun zTimestampExpand(t: Long): Timestamp
206228
external fun zTimestampId(t: Long): ByteArray
207229
external fun zTimestampNtp64(t: Long): Long

‎zenoh-flat-jni/generated-kotlin/io/zenoh/jni/callbacks/QueryCallback.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Auto-generated by JniExt - do not edit by hand.
2+
package io.zenoh.jni.callbacks
3+
4+
import io.zenoh.jni.query.Query
5+
6+
public fun interface QueryCallback {
7+
fun run(
8+
p0: Query,
9+
)
10+
}

‎zenoh-flat-jni/generated-kotlin/io/zenoh/jni/callbacks/ZQueryCallback.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Auto-generated by JniExt - do not edit by hand.
2+
package io.zenoh.jni.callbacks
3+
4+
import io.zenoh.jni.query.ZQuery
5+
6+
public fun interface ZQueryCallback {
7+
fun run(
8+
p0: ZQuery,
9+
)
10+
}

‎zenoh-flat-jni/generated-kotlin/io/zenoh/jni/query/ConsolidationMode.kt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Auto-generated by JniExt — do not edit by hand.
2+
package io.zenoh.jni.query
3+
4+
/** JVM-side surface for the native Rust `ConsolidationMode` enum. */
5+
public enum class ConsolidationMode(public val value: Int) {
6+
AUTO(0),
7+
NONE(1),
8+
MONOTONIC(2),
9+
LATEST(3);
10+
11+
public companion object {
12+
@JvmStatic
13+
public fun fromInt(value: Int): ConsolidationMode = entries.first { it.value == value }
14+
}
15+
}

‎zenoh-flat-jni/generated-kotlin/io/zenoh/jni/query/QueryTarget.kt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Auto-generated by JniExt — do not edit by hand.
2+
package io.zenoh.jni.query
3+
4+
/** JVM-side surface for the native Rust `QueryTarget` enum. */
5+
public enum class QueryTarget(public val value: Int) {
6+
BEST_MATCHING(0),
7+
ALL(1),
8+
ALL_COMPLETE(2);
9+
10+
public companion object {
11+
@JvmStatic
12+
public fun fromInt(value: Int): QueryTarget = entries.first { it.value == value }
13+
}
14+
}

0 commit comments

Comments
 (0)