Skip to content

Refactored to support array and string pointer #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
husker-dev merged 8 commits into from
Jun 9, 2026
Merged

Refactored to support array and string pointer #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a261503
Removed Arena in JNI
May 31, 2026
ed3415f
Refactored native calling in all platforms
Jun 8, 2026
f507587
Refactored native calling in all platforms
Jun 8, 2026
ed5f0f3
Removed returnStringLiteral test
Jun 8, 2026
2777b0c
Fixed native String creation
Jun 8, 2026
fe16c3f
Fixed Android lib initialization
Jun 8, 2026
c9d9b6f
Fixed JVMCI mappings for array 6th
Jun 9, 2026
5fa49dc
Renamed tests action
Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
test:
name: Kotlin/Native (${{ matrix.os }})
name: Tests (${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
Expand Down
7 changes: 3 additions & 4 deletions libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[versions]

kotlin = "2.3.21"
kotlin = "2.4.0"
kotlin_serialization = "1.11.0"
coroutines = "1.11.0"
benchmark = "0.4.17"

android_plugin = "9.2.0"
# old versions to allow testing on SDK < 21
android_test_runner = "1.2.0"
android_test_juint = "1.1.5"
android_test_runner = "1.2.0" #| old versions to allow testing on SDK < 21
android_test_juint = "1.1.5" #|

webidl = "1.0.3"

Expand Down
4 changes: 4 additions & 0 deletions modules/benchmarks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ group = "com.huskerdev"
version = projectDir.parentFile.parentFile.resolve("VERSION").readText()

kotlin {
jvmToolchain {
vendor = JvmVendorSpec.GRAAL_VM
languageVersion = JavaLanguageVersion.of(23)
}
jvm()

sourceSets.commonMain.dependencies {
Expand Down
137 changes: 65 additions & 72 deletions modules/benchmarks/natives/foreignBindings/include/api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,25 @@
#define KOTLIN_NATIVE_FOREIGNBINDINGS_H

#include <stdlib.h>
#include <stdarg.h>

#include <stdint.h>
#include <stdbool.h>

#ifdef __cplusplus
extern "C" {
#endif

#define ARG_LENGTH(...) ARG_LENGTH__(__VA_ARGS__)
#define ARG_LENGTH__(...) ARG_LENGTH_(,##__VA_ARGS__, \
63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45,\
44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26,\
25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,\
5, 4, 3, 2, 1, 0)
#define ARG_LENGTH_(_, _63, _62, _61, _60, _59, _58, _57, _56, _55, _54, _53, \
_52, _51, _50, _49, _48, _47, _46, _45, _44, _43, _42, _41, _40, _39, _38, \
_37, _36, _35, _34, _33, _32, _31, _30, _29, _28, _27, _26, _25, _24, _23, \
_22, _21, _20, _19, _18, _17, _16, _15, _14, _13, _12, _11, _10, _9, _8, \
_7, _6, _5, _4, _3, _2, _1, Count, ...) Count

// ╔════════════════╗
// ║ stdlib ║
// ╚════════════════╝
Expand All @@ -34,72 +44,35 @@ typedef uint16_t KChar;

typedef struct KString {
const char* data;
size_t size;
KInt length;
KBoolean releasable;
KBoolean released;
char __flags;
} KString;

static KString KString_new(const char* data, const KInt length) {
return (KString) { data, length, true, false };
}

static void KString_free(KString* str) {
if(str->releasable && !str->released) {
free((void*)str->data);
str->released = true;
}
}

#define ARG_LENGTH(...) ARG_LENGTH__(__VA_ARGS__)
#define ARG_LENGTH__(...) ARG_LENGTH_(,##__VA_ARGS__, \
63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45,\
44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26,\
25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6,\
5, 4, 3, 2, 1, 0)
#define ARG_LENGTH_(_, _63, _62, _61, _60, _59, _58, _57, _56, _55, _54, _53, \
_52, _51, _50, _49, _48, _47, _46, _45, _44, _43, _42, _41, _40, _39, _38, \
_37, _36, _35, _34, _33, _32, _31, _30, _29, _28, _27, _26, _25, _24, _23, \
_22, _21, _20, _19, _18, _17, _16, _15, _14, _13, _12, _11, _10, _9, _8, \
_7, _6, _5, _4, _3, _2, _1, Count, ...) Count

#define KArrayDef(Name, Type, VarargType) \
typedef struct Name { \
const Type* elements; \
KInt size; \
KBoolean releasable; \
KBoolean released; \
} Name; \
\
static Name Name##_new(const Type* elements, const KInt size) { \
return (Name){ elements, size, true, false }; \
} \
\
static Name _##Name##_of(const int n, ...) { \
va_list args; \
va_start(args, n); \
Type* elements = (Type*)malloc(n * sizeof(Type)); \
for (int i = 0; i < n; i++) \
elements[i] = (Type)va_arg(args, VarargType); \
va_end(args); \
return (Name){ (const Type*) elements, n, true, false }; \
} \
\
static void Name##_free(Name* arr) { \
if(arr->releasable && !arr->released) { \
free((void*)arr->elements); \
arr->released = true; \
} \
}

KArrayDef(KCharArray, KChar, int32_t)
KArrayDef(KBooleanArray, KBoolean, int32_t)
KArrayDef(KByteArray, KByte, int32_t)
KArrayDef(KShortArray, KShort, int32_t)
KArrayDef(KIntArray, KInt, int32_t)
KArrayDef(KLongArray, KLong, int64_t)
KArrayDef(KFloatArray, KFloat, double)
KArrayDef(KDoubleArray, KDouble, double)
KArrayDef(KArray, void*, void*)
KString* KString_new(const char* data, KInt length, KInt size);
KString* KString_clone(const KString* self);
void KString_free(KString* self);

#define KArrayDef(Name, Type) \
typedef struct Name { \
const Type* elements; \
size_t size; \
KInt length; \
char __flags; \
} Name; \
\
Name* Name##_new(const Type* elements, const KInt length); \
Name* _##Name##_of(const int n, ...);

KArrayDef(KCharArray, KChar )
KArrayDef(KBooleanArray, KBoolean)
KArrayDef(KByteArray, KByte )
KArrayDef(KShortArray, KShort )
KArrayDef(KIntArray, KInt )
KArrayDef(KLongArray, KLong )
KArrayDef(KFloatArray, KFloat )
KArrayDef(KDoubleArray, KDouble )
KArrayDef(KArray, void* )
#undef KArrayDef

#define KCharArray_of(...) _KCharArray_of(ARG_LENGTH(__VA_ARGS__), __VA_ARGS__)
Expand All @@ -111,11 +84,31 @@ KArrayDef(KArray, void*, void*)
#define KDoubleArray_of(...) _KDoubleArray_of(ARG_LENGTH(__VA_ARGS__), __VA_ARGS__)
#define KArray_of(...) _KArray_of(ARG_LENGTH(__VA_ARGS__), __VA_ARGS__)

#define KCallbackDef(Name, Type, ...) \
struct Name { \
void *m; \
Type (*invoke)(Name* _, ##__VA_ARGS__); \
void (*free)(Name* _); \
#define KArrayCloneFreeDef(Name, Type) \
Name* Name##_clone(const Name* self); \
void Name##_free(Name* self);

KArrayCloneFreeDef(KCharArray, KChar)
KArrayCloneFreeDef(KBooleanArray, KBoolean)
KArrayCloneFreeDef(KByteArray, KByte)
KArrayCloneFreeDef(KShortArray, KShort)
KArrayCloneFreeDef(KIntArray, KInt)
KArrayCloneFreeDef(KLongArray, KLong)
KArrayCloneFreeDef(KFloatArray, KFloat)
KArrayCloneFreeDef(KDoubleArray, KDouble)
#undef KArrayCloneFreeDef

KArray* KArray_clone(const KArray* self, void* (*cloneOp)(void*));
void KArray_free(const KArray* self, void (*freeOp)(void*));

#define KCallbackDef(Name, Type, ...) \
struct Name { \
char __flags; \
Type (*invoke)(Name* self, ##__VA_ARGS__); \
Name* (*clone)(Name* self); \
KBoolean (*equals)(Name* self, Name* obj); \
KInt (*hashCode)(Name* self); \
void (*free)(Name* self); \
};

// ╔═══════════════════╗
Expand All @@ -124,10 +117,10 @@ struct Name { \

KInt callForeign();
KInt callForeignAdd(KInt a, KInt b);
KInt callForeignString(KString arg);
KInt callForeignString(KString* arg);
KInt callCriticalForeign();
KInt callCriticalForeignAdd(KInt a, KInt b);
KInt callCriticalForeignString(KString arg);
KInt callCriticalForeignString(KString* arg);

#ifdef __cplusplus
}
Expand Down
4 changes: 2 additions & 2 deletions modules/benchmarks/natives/foreignBindings/src/bindings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ KInt callForeignAdd(KInt a, KInt b) {
return a + b;
}

KInt callForeignString(KString arg) {
KInt callForeignString(KString* arg) {
return 10;
}

Expand All @@ -21,6 +21,6 @@ KInt callCriticalForeignAdd(KInt a, KInt b) {
return a + b;
}

KInt callCriticalForeignString(KString arg) {
KInt callCriticalForeignString(KString* arg) {
return 10;
}
Loading
Loading