From 01b52fecf720251f75c6db38d87d6cad19cf3cb0 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Wed, 18 Oct 2023 10:31:57 -0700 Subject: [PATCH 1/7] Iteration 1. Signed-off-by: Yury-Fridlyand --- java/Cargo.toml | 10 +- java/build.rs | 17 + java/cbindgen.toml | 672 +++++++++++++++++++++++ java/javababushka.hpp | 39 ++ java/jna-stuff/build.gradle | 24 + java/jna-stuff/src/main/java/Loader.java | 111 ++++ java/settings.gradle | 1 + java/src/lib.rs | 391 +++++++++++++ 8 files changed, 1262 insertions(+), 3 deletions(-) create mode 100644 java/build.rs create mode 100644 java/cbindgen.toml create mode 100755 java/javababushka.hpp create mode 100755 java/jna-stuff/build.gradle create mode 100755 java/jna-stuff/src/main/java/Loader.java diff --git a/java/Cargo.toml b/java/Cargo.toml index 01ecb23e4c..a2b9d7b0bc 100644 --- a/java/Cargo.toml +++ b/java/Cargo.toml @@ -10,12 +10,16 @@ name = "javababushka" crate-type = ["cdylib"] [dependencies] -redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] } -babushka = { path = "../babushka-core" } -tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } +# redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] } +# babushka = { path = "../babushka-core" } +# tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } logger_core = {path = "../logger_core"} tracing-subscriber = "0.3.16" +thiserror = "1.0.49" [profile.release] lto = true debug = true + +[build-dependencies] +cbindgen = "0.26.0" diff --git a/java/build.rs b/java/build.rs new file mode 100644 index 0000000000..6613129e4b --- /dev/null +++ b/java/build.rs @@ -0,0 +1,17 @@ +extern crate cbindgen; + +use std::env; +use cbindgen::Language; + +fn main() { + let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); + + cbindgen::Builder::new() + .with_crate(crate_dir) + .with_language(Language::Cxx) + //.with_cpp_compat(true) + .generate() + .expect("Unable to generate bindings") + //.write_to_file("bindings.h"); + .write_to_file(format!("{}.hpp", env::var("CARGO_PKG_NAME").unwrap())); +} diff --git a/java/cbindgen.toml b/java/cbindgen.toml new file mode 100644 index 0000000000..078ed63e04 --- /dev/null +++ b/java/cbindgen.toml @@ -0,0 +1,672 @@ +# The language to output bindings in +# +# possible values: "C", "C++", "Cython" +# +# default: "C++" +language = "C++" + + + + +# Options for wrapping the contents of the header: + +# An optional string of text to output at the beginning of the generated file +# default: doesn't emit anything +header = "/* Text to put at the beginning of the generated file. Probably a license. */" + +# An optional string of text to output at the end of the generated file +# default: doesn't emit anything +trailer = "/* Text to put at the end of the generated file */" + +# An optional name to use as an include guard +# default: doesn't emit an include guard +include_guard = "BABUSHKA" + +# Whether to add a `#pragma once` guard +# default: doesn't emit a `#pragma once` +pragma_once = true + +# An optional string of text to output between major sections of the generated +# file as a warning against manual editing +# +# default: doesn't emit anything +autogen_warning = "/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */" + +# Whether to include a comment with the version of cbindgen used to generate the file +# default: false +include_version = true + +# An optional namespace to output around the generated bindings +# default: doesn't emit a namespace +namespace = "babushka" + +# An optional list of namespaces to output around the generated bindings +# default: [] +namespaces = [] + +# An optional list of namespaces to declare as using with "using namespace" +# default: [] +using_namespaces = [] + +# A list of sys headers to #include (with angle brackets) +# default: [] +sys_includes = ["string"] + +# A list of headers to #include (with quotes) +# default: [] +includes = [] + +# Whether cbindgen's default C/C++ standard imports should be suppressed. These +# imports are included by default because our generated headers tend to require +# them (e.g. for uint32_t). Currently, the generated imports are: +# +# * for C: , , , , +# +# * for C++: , , , , (depending on config) +# +# default: false +no_includes = false + +# Whether to make a C header C++ compatible. +# These will wrap generated functions into a `extern "C"` block, e.g. +# +# #ifdef __cplusplus +# extern "C" { +# #endif // __cplusplus +# +# // Generated functions. +# +# #ifdef __cplusplus +# } // extern "C" +# #endif // __cplusplus +# +# If the language is not C this option won't have any effect. +# +# default: false +cpp_compat = true + +# A list of lines to add verbatim after the includes block +after_includes = "#define VERSION 1" + + + +# Code Style Options + +# The style to use for curly braces +# +# possible values: "SameLine", "NextLine" +# +# default: "SameLine" +braces = "SameLine" + +# The desired length of a line to use when formatting lines +# default: 100 +line_length = 80 + +# The amount of spaces to indent by +# default: 2 +tab_width = 4 + +# Include doc comments from Rust as documentation +documentation = true + +# How the generated documentation should be commented. +# +# possible values: +# * "c": /* like this */ +# * "c99": // like this +# * "c++": /// like this +# * "doxy": like C, but with leading *'s on each line +# * "auto": "c++" if that's the language, "doxy" otherwise +# +# default: "auto" +documentation_style = "doxy" + +# How much of the documentation for each item is output. +# +# possible values: +# * "short": Only the first line. +# * "full": The full documentation. +# +# default: "full" +documentation_length = "short" + + + + +# Codegen Options + +# When generating a C header, the kind of declaration style to use for structs +# or enums. +# +# possible values: +# * "type": typedef struct { ... } MyType; +# * "tag": struct MyType { ... }; +# * "both": typedef struct MyType { ... } MyType; +# +# default: "both" +style = "both" + +# If this option is true `usize` and `isize` will be converted into `size_t` and `ptrdiff_t` +# instead of `uintptr_t` and `intptr_t` respectively. +usize_is_size_t = true + +# A list of substitutions for converting cfg's to ifdefs. cfgs which aren't +# defined here will just be discarded. +# +# e.g. +# `#[cfg(target = "freebsd")] ...` +# becomes +# `#if defined(DEFINE_FREEBSD) ... #endif` +[defines] + + + + +[export] +# A list of additional items to always include in the generated bindings if they're +# found but otherwise don't appear to be used by the public API. +# +# default: [] +include = [] + +# A list of items to not include in the generated bindings +# default: [] +exclude = [] + +# A prefix to add before the name of every item +# default: no prefix is added +prefix = "" + +# Types of items that we'll generate. If empty, then all types of item are emitted. +# +# possible items: (TODO: explain these in detail) +# * "constants": +# * "globals": +# * "enums": +# * "structs": +# * "unions": +# * "typedefs": +# * "opaque": +# * "functions": +# +# default: [] +item_types = ["enums", "structs", "opaque", "functions"] + +# Whether applying rules in export.rename prevents export.prefix from applying. +# +# e.g. given this toml: +# +# [export] +# prefix = "capi_" +# [export.rename] +# "MyType" = "my_cool_type" +# +# You get the following results: +# +# renaming_overrides_prefixing = true: +# "MyType" => "my_cool_type" +# +# renaming_overrides_prefixing = false: +# "MyType => capi_my_cool_type" +# +# default: false +renaming_overrides_prefixing = true + +# Table of name conversions to apply to item names (lhs becomes rhs) +[export.rename] + + +# Table of things to prepend to the body of any struct, union, or enum that has the +# given name. This can be used to add things like methods which don't change ABI, +# mark fields private, etc +[export.pre_body] + +# Table of things to append to the body of any struct, union, or enum that has the +# given name. This can be used to add things like methods which don't change ABI. +[export.body] + +# Configuration for name mangling +[export.mangle] +# Whether the types should be renamed during mangling, for example +# c_char -> CChar, etc. +rename_types = "PascalCase" +# Whether the underscores from the mangled name should be omitted. +remove_underscores = false + +[layout] +# A string that should come before the name of any type which has been marked +# as `#[repr(packed)]`. For instance, "__attribute__((packed))" would be a +# reasonable value if targeting gcc/clang. A more portable solution would +# involve emitting the name of a macro which you define in a platform-specific +# way. e.g. "PACKED" +# +# default: `#[repr(packed)]` types will be treated as opaque, since it would +# be unsafe for C callers to use a incorrectly laid-out union. +packed = "PACKED" + +# A string that should come before the name of any type which has been marked +# as `#[repr(align(n))]`. This string must be a function-like macro which takes +# a single argument (the requested alignment, `n`). For instance, a macro +# `#define`d as `ALIGNED(n)` in `header` which translates to +# `__attribute__((aligned(n)))` would be a reasonable value if targeting +# gcc/clang. +# +# default: `#[repr(align(n))]` types will be treated as opaque, since it +# could be unsafe for C callers to use a incorrectly-aligned union. +aligned_n = "ALIGNED" + + +[fn] +# An optional prefix to put before every function declaration +# default: no prefix added +prefix = "" + +# An optional postfix to put after any function declaration +# default: no postix added +postfix = "" + +# How to format function arguments +# +# possible values: +# * "horizontal": place all arguments on the same line +# * "vertical": place each argument on its own line +# * "auto": only use vertical if horizontal would exceed line_length +# +# default: "auto" +args = "horizontal" + +# An optional string that should prefix function declarations which have been +# marked as `#[must_use]`. For instance, "__attribute__((warn_unused_result))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "MUST_USE_FUNC" +# default: nothing is emitted for must_use functions +must_use = "" + +# An optional string that should prefix function declarations which have been +# marked as `#[deprecated]` without note. For instance, "__attribute__((deprecated))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "DEPRECATED_FUNC" +# default: nothing is emitted for deprecated functions +deprecated = "DEPRECATED_FUNC" + +# An optional string that should prefix function declarations which have been +# marked as `#[deprecated(note = "reason")]`. `{}` will be replaced with the +# double-quoted string. For instance, "__attribute__((deprecated({})))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "DEPRECATED_FUNC_WITH_NOTE(note)" +# default: nothing is emitted for deprecated functions +deprecated_with_note = "DEPRECATED_FUNC_WITH_NOTE" + +# An optional string that will be used in the attribute position for functions +# that don't return (that return `!` in Rust). +# +# For instance, `__attribute__((noreturn))` would be a reasonable value if +# targeting gcc/clang. +no_return = "NO_RETURN" + +# An optional string that, if present, will be used to generate Swift function +# and method signatures for generated functions, for example "CF_SWIFT_NAME". +# If no such macro is available in your toolchain, you can define one using the +# `header` option in cbindgen.toml +# default: no swift_name function attributes are generated +swift_name_macro = "" + +# A rule to use to rename function argument names. The renaming assumes the input +# is the Rust standard snake_case, however it accepts all the different rename_args +# inputs. This means many options here are no-ops or redundant. +# +# possible values (that actually do something): +# * "CamelCase": my_arg => myArg +# * "PascalCase": my_arg => MyArg +# * "GeckoCase": my_arg => aMyArg +# * "ScreamingSnakeCase": my_arg => MY_ARG +# * "None": apply no renaming +# +# technically possible values (that shouldn't have a purpose here): +# * "SnakeCase": apply no renaming +# * "LowerCase": apply no renaming (actually applies to_lowercase, is this bug?) +# * "UpperCase": same as ScreamingSnakeCase in this context +# * "QualifiedScreamingSnakeCase" => same as ScreamingSnakeCase in this context +# +# default: "None" +rename_args = "PascalCase" + +# This rule specifies the order in which functions will be sorted. +# +# "Name": sort by the name of the function +# "None": keep order in which the functions have been parsed +# +# default: "None" +sort_by = "Name" + +[struct] +# A rule to use to rename struct field names. The renaming assumes the input is +# the Rust standard snake_case, however it acccepts all the different rename_args +# inputs. This means many options here are no-ops or redundant. +# +# possible values (that actually do something): +# * "CamelCase": my_arg => myArg +# * "PascalCase": my_arg => MyArg +# * "GeckoCase": my_arg => mMyArg +# * "ScreamingSnakeCase": my_arg => MY_ARG +# * "None": apply no renaming +# +# technically possible values (that shouldn't have a purpose here): +# * "SnakeCase": apply no renaming +# * "LowerCase": apply no renaming (actually applies to_lowercase, is this bug?) +# * "UpperCase": same as ScreamingSnakeCase in this context +# * "QualifiedScreamingSnakeCase" => same as ScreamingSnakeCase in this context +# +# default: "None" +rename_fields = "PascalCase" + +# An optional string that should come before the name of any struct which has been +# marked as `#[must_use]`. For instance, "__attribute__((warn_unused))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "MUST_USE_STRUCT" +# +# default: nothing is emitted for must_use structs +must_use = "" + +# An optional string that should come before the name of any struct which has been +# marked as `#[deprecated]` without note. For instance, "__attribute__((deprecated))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "DEPRECATED_STRUCT" +# default: nothing is emitted for deprecated structs +deprecated = "DEPRECATED_STRUCT" + +# An optional string that should come before the name of any struct which has been +# marked as `#[deprecated(note = "reason")]`. `{}` will be replaced with the +# double-quoted string. For instance, "__attribute__((deprecated({})))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "DEPRECATED_STRUCT_WITH_NOTE(note)" +# default: nothing is emitted for deprecated structs +deprecated_with_note = "DEPRECATED_STRUCT_WITH_NOTE" + +# Whether a Rust type with associated consts should emit those consts inside the +# type's body. Otherwise they will be emitted trailing and with the type's name +# prefixed. This does nothing if the target is C, or if +# [const]allow_static_const = false +# +# default: false +# associated_constants_in_body: false + +# Whether to derive a simple constructor that takes a value for every field. +# default: false +derive_constructor = true + +# Whether to derive an operator== for all structs +# default: false +derive_eq = false + +# Whether to derive an operator!= for all structs +# default: false +derive_neq = false + +# Whether to derive an operator< for all structs +# default: false +derive_lt = false + +# Whether to derive an operator<= for all structs +# default: false +derive_lte = false + +# Whether to derive an operator> for all structs +# default: false +derive_gt = false + +# Whether to derive an operator>= for all structs +# default: false +derive_gte = false + + + + + +[enum] +# A rule to use to rename enum variants, and the names of any fields those +# variants have. This should probably be split up into two separate options, but +# for now, they're the same! See the documentation for `[struct]rename_fields` +# for how this applies to fields. Renaming of the variant assumes that the input +# is the Rust standard PascalCase. In the case of QualifiedScreamingSnakeCase, +# it also assumed that the enum's name is PascalCase. +# +# possible values (that actually do something): +# * "CamelCase": MyVariant => myVariant +# * "SnakeCase": MyVariant => my_variant +# * "ScreamingSnakeCase": MyVariant => MY_VARIANT +# * "QualifiedScreamingSnakeCase": MyVariant => ENUM_NAME_MY_VARIANT +# * "LowerCase": MyVariant => myvariant +# * "UpperCase": MyVariant => MYVARIANT +# * "None": apply no renaming +# +# technically possible values (that shouldn't have a purpose for the variants): +# * "PascalCase": apply no renaming +# * "GeckoCase": apply no renaming +# +# default: "None" +rename_variants = "None" + +# Whether an extra "sentinel" enum variant should be added to all generated enums. +# Firefox uses this for their IPC serialization library. +# +# WARNING: if the sentinel is ever passed into Rust, behaviour will be Undefined. +# Rust does not know about this value, and will assume it cannot happen. +# +# default: false +add_sentinel = false + +# Whether enum variant names should be prefixed with the name of the enum. +# default: false +prefix_with_name = false + +# Whether to emit enums using "enum class" when targeting C++. +# default: true +enum_class = true + +# Whether to generate static `::MyVariant(..)` constructors and `bool IsMyVariant()` +# methods for enums with fields. +# +# default: false +derive_helper_methods = false + +# Whether to generate `const MyVariant& AsMyVariant() const` methods for enums with fields. +# default: false +derive_const_casts = false + +# Whether to generate `MyVariant& AsMyVariant()` methods for enums with fields +# default: false +derive_mut_casts = false + +# The name of the macro/function to use for asserting `IsMyVariant()` in the body of +# derived `AsMyVariant()` cast methods. +# +# default: "assert" (but also causes `` to be included by default) +cast_assert_name = "" + +# An optional string that should come before the name of any enum which has been +# marked as `#[must_use]`. For instance, "__attribute__((warn_unused))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "MUST_USE_ENUM" +# +# Note that this refers to the *output* type. That means this will not apply to an enum +# with fields, as it will be emitted as a struct. `[struct]must_use` will apply there. +# +# default: nothing is emitted for must_use enums +must_use = "" + +# An optional string that should come before the name of any enum which has been +# marked as `#[deprecated]` without note. For instance, "__attribute__((deprecated))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "DEPRECATED_ENUM" +# default: nothing is emitted for deprecated enums +deprecated = "DEPRECATED_ENUM" + +# An optional string that should come before the name of any enum which has been +# marked as `#[deprecated(note = "reason")]`. `{}` will be replaced with the +# double-quoted string. For instance, "__attribute__((deprecated({})))" +# would be a reasonable value if targeting gcc/clang. A more portable solution +# would involve emitting the name of a macro which you define in a +# platform-specific way. e.g. "DEPRECATED_ENUM_WITH_NOTE(note)" +# default: nothing is emitted for deprecated enums +deprecated_with_note = "DEPRECATED_ENUM_WITH_NOTE" + +# Whether enums with fields should generate destructors. This exists so that generic +# enums can be properly instantiated with payloads that are C++ types with +# destructors. This isn't necessary for structs because C++ has rules to +# automatically derive the correct constructors and destructors for those types. +# +# Care should be taken with this option, as Rust and C++ cannot +# properly interoperate with eachother's notions of destructors. Also, this may +# change the ABI for the type. Either your destructor-full enums must live +# exclusively within C++, or they must only be passed by-reference between +# C++ and Rust. +# +# default: false +derive_tagged_enum_destructor = false + +# Whether enums with fields should generate copy-constructor. See the discussion on +# derive_tagged_enum_destructor for why this is both useful and very dangerous. +# +# default: false +derive_tagged_enum_copy_constructor = false +# Whether enums with fields should generate copy-assignment operators. +# +# This depends on also deriving copy-constructors, and it is highly encouraged +# for this to be set to true. +# +# default: false +derive_tagged_enum_copy_assignment = false + +# Whether enums with fields should generate an empty, private destructor. +# This allows the auto-generated constructor functions to compile, if there are +# non-trivially constructible members. This falls in the same family of +# dangerousness as `derive_tagged_enum_copy_constructor` and co. +# +# default: false +private_default_tagged_enum_constructor = false + + + + + +[const] +# Whether a generated constant can be a static const in C++ mode. I have no +# idea why you would turn this off. +# +# default: true +allow_static_const = true + +# Whether a generated constant can be constexpr in C++ mode. +# +# default: true +allow_constexpr = false + +# This rule specifies the order in which constants will be sorted. +# +# "Name": sort by the name of the constant +# "None": keep order in which the constants have been parsed +# +# default: "None" +sort_by = "Name" + + + + +[macro_expansion] +# Whether bindings should be generated for instances of the bitflags! macro. +# default: false +bitflags = true + + + + + + +# Options for how your Rust library should be parsed + +[parse] +# Whether to parse dependent crates and include their types in the output +# default: false +parse_deps = true + +# A white list of crate names that are allowed to be parsed. If this is defined, +# only crates found in this list will ever be parsed. +# +# default: there is no whitelist (NOTE: this is the opposite of []) +include = ["redis"] + +# A black list of crate names that are not allowed to be parsed. +# default: [] +exclude = [] + +# Whether to use a new temporary target directory when running `rustc -Zunpretty=expanded`. +# This may be required for some build processes. +# +# default: false +clean = false + +# Which crates other than the top-level binding crate we should generate +# bindings for. +# +# default: [] +extra_bindings = [] + +[parse.expand] +# A list of crate names that should be run through `cargo expand` before +# parsing to expand any macros. Note that if a crate is named here, it +# will always be parsed, even if the blacklist/whitelist says it shouldn't be. +# +# default: [] +crates = [] + +# If enabled, use the `--all-features` option when expanding. Ignored when +# `features` is set. For backwards-compatibility, this is forced on if +# `expand = ["euclid"]` shorthand is used. +# +# default: false +all_features = false + +# When `all_features` is disabled and this is also disabled, use the +# `--no-default-features` option when expanding. +# +# default: true +default_features = true + +# A list of feature names that should be used when running `cargo expand`. This +# combines with `default_features` like in your `Cargo.toml`. Note that the features +# listed here are features for the current crate being built, *not* the crates +# being expanded. The crate's `Cargo.toml` must take care of enabling the +# appropriate features in its dependencies +# +# default: [] +features = ["cbindgen", "aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp", "rt", "macros", "rt-multi-thread", "time"] + +[ptr] +# An optional string to decorate all pointers that are +# required to be non null. Nullability is inferred from the Rust type: `&T`, +# `&mut T` and `NonNull` all require a valid pointer value. +non_null_attribute = "" + +# Options specific to Cython bindings. + +[cython] + +# Header specified in the top level `cdef extern from header:` declaration. +# +# default: * +header = '*' + +# `from module cimport name1, name2` declarations added in the same place +# where you'd get includes in C. +[cython.cimports] +module = [] diff --git a/java/javababushka.hpp b/java/javababushka.hpp new file mode 100755 index 0000000000..1331438fef --- /dev/null +++ b/java/javababushka.hpp @@ -0,0 +1,39 @@ +#include +#include +#include +#include +#include + +struct BabushkaResultStr { + const char *error; + const char *result; +}; + +struct BabushkaValue { + const char *str; + int64_t num; +}; + +struct BabushkaResult { + const char *error; + uint8_t value_type; + BabushkaValue value; +}; + +extern "C" { + +BabushkaResultStr static_function_which_throws(); + +BabushkaResultStr static_function4(); + +BabushkaResult static_function2_0(); + +BabushkaResult static_function2_1(); + +BabushkaResult static_function2_2(); + +BabushkaResult static_function2_3(); + +BabushkaResult static_function2_4(); + +} // extern "C" diff --git a/java/jna-stuff/build.gradle b/java/jna-stuff/build.gradle new file mode 100755 index 0000000000..eddb64fa79 --- /dev/null +++ b/java/jna-stuff/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'java' + id 'application' +} + +group = 'org.example' +version = '1.13.0' + +repositories { + mavenCentral() +} + +dependencies { + // Required for interop + implementation "net.java.dev.jna:jna:5.8.0" +} + +test { + useJUnitPlatform() +} + +application { + mainClass = 'Loader' +} \ No newline at end of file diff --git a/java/jna-stuff/src/main/java/Loader.java b/java/jna-stuff/src/main/java/Loader.java new file mode 100755 index 0000000000..1c7665c761 --- /dev/null +++ b/java/jna-stuff/src/main/java/Loader.java @@ -0,0 +1,111 @@ +import com.sun.jna.Library; +import com.sun.jna.Native; +import com.sun.jna.Structure; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; +import java.util.List; + +public class Loader { + // = enum + public static class ResultType { + public static final int Str = 0; + public static final int Int = 1; + public static final int Nil = 2; + public static final int Data = 3; + public static final int Bulk = 4; + public static final int Ok = 5; + public static final int Err = 6; + public static final int Undef = -1; + }; + + public interface RustLib extends Library { + + public BabushkaResultStr.ByValue static_function_which_throws(); + public BabushkaResultStr.ByValue static_function4(); + + //public BabushkaResult.ByValue static_function2_0(); + public BabushkaResult.ByValue static_function2_0(); + public BabushkaResult.ByValue static_function2_1(); + public BabushkaResult.ByValue static_function2_2(); + public BabushkaResult.ByValue static_function2_3(); + public BabushkaResult.ByValue static_function2_4(); + + + @Structure.FieldOrder({"error", "result"}) + public static class BabushkaResultStr extends Structure { + public static class ByValue extends BabushkaResultStr implements Structure.ByValue { } + public String error; + public String result; + } + + @Structure.FieldOrder({"str", "num"/*, "data", "bulk"*/}) + public static class BabushkaValue extends Structure { + public BabushkaValue() { + str = null; + num = 0; + } + //public static class ByReference extends BabushkaValue implements Structure.ByReference { + //public ByReference() { } + //} + public static class ByValue extends BabushkaValue implements Structure.ByValue { + //public ByValue() { } + } + public String str; + public long num; +// List data; +// List bulk; + }; + + @Structure.FieldOrder({"error", "value_type", "value"}) + public static class BabushkaResult extends Structure { + public BabushkaResult() { + error = null; + value_type = 0; + value = null; + } + public static class ByValue extends BabushkaResult implements Structure.ByValue { } + public String error = null; + public byte value_type = 0; + //public BabushkaValue.ByReference value; + public BabushkaValue.ByValue value = null; + }; + } + + public static void main(String [] args) { + var targetDir = Paths.get("jna-stuff", "build", "resources", "main", "win32-x86-64").toAbsolutePath(); + + //System.setProperty("jna.debug_load", "true"); + System.setProperty("jna.library.path", targetDir.toString()); + + var created = targetDir.toFile().mkdirs(); + try { + Files.copy( + Paths.get(System.getProperty("user.dir"), "target", "debug", "javababushka.dll"), + Paths.get(targetDir.toString(), "javababushka.dll"), + StandardCopyOption.REPLACE_EXISTING); + } catch (IOException e) { + System.out.printf("Failed to copy lib: %s%n", e.getMessage()); + e.printStackTrace(); + } + + + //System.out.println("Working Directory = " + System.getProperty("jna.library.path")); + + var lib = (RustLib) Native.load( + "javababushka", + RustLib.class); + var res = lib.static_function_which_throws(); + + var res4 = lib.static_function4(); + + var res2_0 = lib.static_function2_0(); + var res2_1 = lib.static_function2_1(); + var res2_2 = lib.static_function2_2(); + var res2_3 = lib.static_function2_3(); + var res2_4 = lib.static_function2_4(); + int a = 5; + } +} diff --git a/java/settings.gradle b/java/settings.gradle index c392c65247..1b66925d56 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -3,3 +3,4 @@ rootProject.name = 'javababushka' include 'client' include 'integTest' include 'benchmarks' +include 'jna-stuff' diff --git a/java/src/lib.rs b/java/src/lib.rs index e69de29bb2..1de033a257 100644 --- a/java/src/lib.rs +++ b/java/src/lib.rs @@ -0,0 +1,391 @@ +use std::os::raw::c_char; +use std::ffi::{CStr,CString}; +use std::str; +use std::mem; +use std::ptr::null; + +/* +use std::sync::{Mutex}; +use redis::aio::MultiplexedConnection; +use redis::{Client, ErrorKind, FromRedisValue, RedisResult, Value}; +use redis::{AsyncCommands, RedisError}; +use tokio::runtime::Builder; +use tokio::runtime::Runtime; +*/ +#[no_mangle] +pub extern fn static_function_which_throws() -> BabushkaResultStr { + BabushkaResultStr { error: str_to_ptr(""), result: str_to_ptr("hello from rust -> static function which throws") } +} + +#[no_mangle] +pub extern fn static_function4() -> BabushkaResultStr { + BabushkaResultStr { error: str_to_ptr("pewpew"), result: null() } +} + +#[no_mangle] +pub extern fn static_function2_0() -> BabushkaResult { + //BabushkaResult::from_str(str_to_ptr("ololo")) + BabushkaResult { + error: null(), + value_type: ResultType::Str as u8, + //* + value: BabushkaValue { + str: str_to_ptr("ololo"), + num: 0 + } + // */ + } +} + +#[no_mangle] +pub extern fn static_function2_1() -> BabushkaResult { + //BabushkaResult::from_err(str_to_ptr("oh no")) + BabushkaResult { + error: str_to_ptr("oh no"), + value_type: ResultType::Err as u8, + value: Default::default() + } +} + +#[no_mangle] +pub extern fn static_function2_2() -> BabushkaResult { + //BabushkaResult::from_int(100500) + BabushkaResult { + error: null(), + value_type: ResultType::Int as u8, + //* + value: BabushkaValue { + str: null(), + num: 100500 + } + // */ + } +} + +#[no_mangle] +pub extern fn static_function2_3() -> BabushkaResult { + //BabushkaResult::from_ok() + BabushkaResult { + error: null(), + value_type: ResultType::Ok as u8, + value: Default::default() + } +} + +#[no_mangle] +pub extern fn static_function2_4() -> BabushkaResult { + BabushkaResult { + error: null(), + value_type: ResultType::Nil as u8, + value: Default::default() + } +} + +/// Convert a native string to a Rust string +fn to_string(pointer: * const c_char) -> String { + let slice = unsafe { CStr::from_ptr(pointer).to_bytes() }; + str::from_utf8(slice).unwrap().to_string() +} + +/// Convert a Rust string to a native string +fn string_to_ptr(string: String) -> * const c_char { + let cs = CString::new(string.as_bytes()).unwrap(); + let ptr = cs.as_ptr(); + // Tell Rust not to clean up the string while we still have a pointer to it. + // Otherwise, we'll get a segfault. + mem::forget(cs); + ptr +} + +/// Convert a Rust string to a native string +fn str_to_ptr(string: &str) -> * const c_char { + let cs = CString::new(string.as_bytes()).unwrap(); + let ptr = cs.as_ptr(); + // Tell Rust not to clean up the string while we still have a pointer to it. + // Otherwise, we'll get a segfault. + mem::forget(cs); + ptr +} + +#[repr(C)] +pub struct BabushkaResultStr { + pub error: * const c_char, + pub result: * const c_char +} + +// redis::Value +#[repr(C)] +pub enum ResultType { + Str = 0, // * const c_char + Int = 1, // i64 + Nil = 2, + Data = 3, // Vec + Bulk = 4, // Vec + Ok = 5, + Err = 6 +} + +#[repr(C)] +pub struct BabushkaResult { + pub error: * const c_char, + pub value_type: u8, //ResultType, + value: BabushkaValue, +} + +//impl BabushkaResult { +/* + pub fn from_str(str: * const c_char) -> Self { + Self { + error: null(), + value_type: ResultType::Str, + value: BabushkaValue { + str: str, + num: 0, +// data: Vec::new(), +// bulk: Vec::new(), + } + } + } + + pub fn from_int(int: i64) -> Self { + Self { + error: null(), + value_type: ResultType::Int, + value: BabushkaValue { + str: null(), + num: int, +// data: Vec::new(), +// bulk: Vec::new(), + } + } + } + + pub fn from_data(data: Vec) -> Self { + Self { + error: null(), + value_type: ResultType::Data, + value: BabushkaValue { + str: null(), + num: 0, +// data: data, +// bulk: Vec::new(), + } + } + } + + pub fn from_bulk(bulk: Vec) -> Self { + Self { + error: null(), + value_type: ResultType::Bulk, + value: BabushkaValue { + str: null(), + num: 0, +// data: Vec::new(), +// bulk: bulk, + } + } + } + + pub fn from_err(err: * const c_char) -> Self { + Self { + error: err, + value_type: ResultType::Err, + value: BabushkaValue::default() + } + } + + pub fn from_nil() -> Self { + Self { + error: null(), + value_type: ResultType::Nil, + value: BabushkaValue::default() + } + } + + pub fn from_ok() -> Self { + Self { + error: null(), + value_type: ResultType::Ok, + value: BabushkaValue::default() + } + } +*/ + +/* + #[no_mangle] + pub extern fn get_str(&self) -> * const c_char { + self.value.str + } + + #[no_mangle] + pub extern fn get_int(&self) -> i64 { + self.value.num + } +*/ + // TODO other types +//} + +#[repr(C)] +pub struct BabushkaValue { + str: * const c_char, + num: i64, +// data: Vec, +// bulk: Vec, +} + +impl Default for BabushkaValue { + fn default() -> Self { + Self { + str: null(), + num: 0, +// data: Vec::default(), +// bulk: Vec::default() + } + } +} + + +/* +#[repr(C)] +pub struct BabushkaClient { + runtime: Option>, + connection: Option>, +} + +impl BabushkaClient { + /* + fn new() -> Self { + Self { + runtime: None, + connection: None + } + }*/ + + #[no_mangle] + pub extern fn class_function(&self) -> String { + "hello from rust -> class function".into() + } + + #[no_mangle] + pub extern fn connect(&mut self, address: String) -> Result<(), String> { + //self.client = Some(redis::Client::open(address)?); + let client_res = redis::Client::open(address); + let client : Client; + + match client_res { + Ok(c) => client = c, + Err(err) => return Err(err.to_string()) + } + + let runtime_res = + Builder::new_multi_thread() + .enable_all() + .thread_name("Babushka java thread") + .build(); + + let runtime : Runtime; + + match runtime_res { + Ok(rt) => runtime = rt, + Err(err) => return Err(err.to_string()) + } + + let _runtime_handle = runtime.enter(); + + let connection_res = runtime + .block_on(client.get_multiplexed_async_connection()); + + let connection : MultiplexedConnection; + + match connection_res { + Ok(c) => connection = c, + Err(err) => return Err(err.to_string()) + } + + self.runtime = Some(Mutex::new(runtime)); + self.connection = Some(Mutex::new(connection)); + + Ok(()) + } + + /* + pub fn disconnect(&mut self) -> Result<(), RedisError> { + + } + */ + // TODO support any type for value + #[no_mangle] + pub extern fn set(&mut self, key: String, value: String) -> Result<(), String> { + //self.runtime.spawn(async move { + self.connection.as_mut().unwrap().lock().unwrap() + //.set/*::*/(key, value); + .set::(key, value); // TODO try RedisValue + //}); + Ok(()) + } + + #[no_mangle] + pub extern fn set2(&mut self, key: String, value: Option) -> Result<(), String> { + //self.runtime.spawn(async move { + //let val: Value = value.map_or_else(|| { Value::Nil }, |s| { Value::Status(s) }); + self.connection.as_mut().unwrap().lock().unwrap() + //.set/*::*/(key, value); + .set::, Option, ()>(Some(key), value); // TODO try RedisValue + //}); + Ok(()) + } + + // TODO support any type for value + // TODO support null value (Option<...>) + // TODO handle (nil) + // TODO handle other types + #[no_mangle] + pub extern fn get(&mut self, key: String) -> Result { + let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + self.connection.as_mut().unwrap().lock().unwrap().get::(key).await + }); + match res { + Ok(val) => Ok(val), + Err(err) => Err(err.to_string()) + } + } + + #[no_mangle] + pub extern fn get2(&mut self, key: String) -> Result { + let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + self.connection.as_mut().unwrap().lock().unwrap().get::(key).await + }); + match res { + Ok(val) => Ok(String::from_redis_value(&val).unwrap()), + Err(err) => Err(err.to_string()) + } + } + + #[no_mangle] + pub extern fn get3(&mut self, key: String) -> Result, String> { + let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + self.connection.as_mut().unwrap().lock().unwrap().get::>(key).await + }); + match res { + Ok(val) => Ok(val), + Err(err) => Err(err.to_string()) + } + } + + #[no_mangle] + pub extern fn get4(&mut self, key: String) -> Result<* const String, String> { + let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + self.connection.as_mut().unwrap().lock().unwrap().get::>(key).await + }); + match res { + Ok(val) => { + let value: Option<* const String> = val.map(|val| { + &val as *const String + }); + Ok(value.unwrap_or(std::ptr::null())) + }, + Err(err) => Err(err.to_string()) + } + } +} +*/ From 879710c91ceb2befd8de85cafe8ee0b00caa3a85 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Wed, 18 Oct 2023 18:43:06 -0700 Subject: [PATCH 2/7] JNA client - connect and get. Signed-off-by: Yury-Fridlyand --- java/.cargo/config.toml | 2 +- java/Cargo.toml | 10 +- java/benchmarks/build.gradle | 2 + .../benchmarks/BenchmarkingApp.java | 9 +- .../javababushka/benchmarks/jna/Babushka.java | 133 ++++++++ java/javababushka.hpp | 29 +- java/jna-stuff/build.gradle | 2 +- java/jna-stuff/src/main/java/Loader.java | 141 ++++++-- java/src/lib.rs | 316 ++++++++++++------ 9 files changed, 486 insertions(+), 158 deletions(-) create mode 100644 java/benchmarks/src/main/java/javababushka/benchmarks/jna/Babushka.java mode change 100755 => 100644 java/javababushka.hpp mode change 100755 => 100644 java/jna-stuff/build.gradle mode change 100755 => 100644 java/jna-stuff/src/main/java/Loader.java diff --git a/java/.cargo/config.toml b/java/.cargo/config.toml index 24a6f21533..07cff72751 100644 --- a/java/.cargo/config.toml +++ b/java/.cargo/config.toml @@ -1,3 +1,3 @@ [env] -BABUSHKA_NAME = { value = "BabushkaPy", force = true } +BABUSHKA_NAME = { value = "BabushkaJava", force = true } BABUSHKA_VERSION = "0.1.0" diff --git a/java/Cargo.toml b/java/Cargo.toml index a2b9d7b0bc..2cb1a29cb9 100644 --- a/java/Cargo.toml +++ b/java/Cargo.toml @@ -10,12 +10,14 @@ name = "javababushka" crate-type = ["cdylib"] [dependencies] -# redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] } -# babushka = { path = "../babushka-core" } -# tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } -logger_core = {path = "../logger_core"} +redis = { path = "../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] } +babushka = { path = "../babushka-core" } +tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } +logger_core = { path = "../logger_core" } tracing-subscriber = "0.3.16" thiserror = "1.0.49" +num-derive = "0.4.1" +num-traits = "0.2.17" [profile.release] lto = true diff --git a/java/benchmarks/build.gradle b/java/benchmarks/build.gradle index 8d9e500284..8c0aaec33a 100644 --- a/java/benchmarks/build.gradle +++ b/java/benchmarks/build.gradle @@ -18,6 +18,8 @@ dependencies { implementation 'io.lettuce:lettuce-core:6.2.6.RELEASE' implementation 'commons-cli:commons-cli:1.5.0' implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0' + + implementation "net.java.dev.jna:jna:5.8.0" } // Apply a specific Java toolchain to ease working on different environments. diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java index 66ea1f5029..e3316a1b71 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java @@ -11,6 +11,7 @@ import java.util.stream.Stream; import javababushka.benchmarks.jedis.JedisClient; import javababushka.benchmarks.jedis.JedisPseudoAsyncClient; +import javababushka.benchmarks.jna.Babushka; import javababushka.benchmarks.lettuce.LettuceAsyncClient; import javababushka.benchmarks.lettuce.LettuceClient; import org.apache.commons.cli.CommandLine; @@ -53,7 +54,7 @@ public static void main(String[] args) { testClientSetGet(LettuceAsyncClient::new, runConfiguration, true); break; case BABUSHKA: - System.out.println("Babushka not yet configured"); + testClientSetGet(Babushka::new, runConfiguration, false); break; } } @@ -150,7 +151,7 @@ private static RunConfiguration verifyOptions(CommandLine line) throws ParseExce case ALL_SYNC: return Stream.of( ClientName.JEDIS, - // ClientName.BABUSHKA, + ClientName.BABUSHKA, ClientName.LETTUCE); default: return Stream.of(e); @@ -227,8 +228,8 @@ public RunConfiguration() { concurrentTasks = List.of(10, 100); clients = new ClientName[] { - // ClientName.BABUSHKA, - ClientName.JEDIS, ClientName.JEDIS_ASYNC, ClientName.LETTUCE, ClientName.LETTUCE_ASYNC + ClientName.BABUSHKA, + ClientName.JEDIS, ClientName.LETTUCE, }; host = "localhost"; port = 6379; diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/jna/Babushka.java b/java/benchmarks/src/main/java/javababushka/benchmarks/jna/Babushka.java new file mode 100644 index 0000000000..9934a7ea8c --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/jna/Babushka.java @@ -0,0 +1,133 @@ +package javababushka.benchmarks.jna; + +import com.sun.jna.Library; +import com.sun.jna.Native; +import com.sun.jna.Structure; +import javababushka.benchmarks.SyncClient; +import javababushka.benchmarks.utils.ConnectionSettings; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; + +public class Babushka implements SyncClient { + + private final long ptr = lib.init_client0(42); + + // = enum + public static enum ResultType { + Str(0), + Int(1), + Nil(2), + Data(3), + Bulk(4), + Ok(5), + Err(6), + Undef(-1); + + private int id; + ResultType(int id) { + this.id = id; + } + + public static ResultType of(int val) { + switch (val) { + case 0: return ResultType.Str; + case 1: return ResultType.Int; + case 2: return ResultType.Nil; + case 3: return ResultType.Data; + case 4: return ResultType.Bulk; + case 5: return ResultType.Ok; + case 6: return ResultType.Err; + default: return ResultType.Undef; + } + } + } + + public interface RustLib extends Library { + + @Structure.FieldOrder({"error", "value_type", "string", "num"}) + public static class BabushkaResult extends Structure { + public BabushkaResult() { + error = null; + value_type = 0; + string = null; + num = 0; + } + public static class ByValue extends BabushkaResult implements Structure.ByValue { } + public String error = null; + public int value_type = 0; + public String string = null; + public long num = 0; + }; + + public long init_client0(int data); + public BabushkaResult.ByValue connect0(long client, String address); + public BabushkaResult.ByValue set0(long client, String key, String value); + public BabushkaResult.ByValue get0(long client, String key); + } + + private static final RustLib lib; + static { + var is_win = System.getProperty("os.name").contains("Windows"); + var targetDir = Paths.get("jna-stuff", "build", "resources", "main", is_win ? "win32-x86-64" : "linux-x86-64").toAbsolutePath(); + + //System.setProperty("jna.debug_load", "true"); + System.setProperty("jna.library.path", targetDir.toString()); + + var created = targetDir.toFile().mkdirs(); + try { + if (is_win) { + Files.copy( + Paths.get(System.getProperty("user.dir"), "target", "debug", "javababushka.dll"), + Paths.get(targetDir.toString(), "javababushka.dll"), + StandardCopyOption.REPLACE_EXISTING); + } else { + Files.copy( + Paths.get(System.getProperty("user.dir"), "..", "target", "debug", "libjavababushka.so"), + Paths.get(targetDir.toString(), "libjavababushka.so"), + StandardCopyOption.REPLACE_EXISTING); + } + } catch (IOException e) { + System.out.printf("Failed to copy lib: %s%n", e.getMessage()); + e.printStackTrace(); + } + + lib = Native.load("javababushka", RustLib.class); + } + + @Override + public void connectToRedis() { + connectToRedis(new ConnectionSettings("localhost", 6379, false)); + } + + @Override + public void connectToRedis(ConnectionSettings connectionSettings) { + var connStr = String.format( + "%s://%s:%d", + connectionSettings.useSsl ? "rediss" : "redis", + connectionSettings.host, + connectionSettings.port); + lib.connect0(ptr, connStr); + } + + @Override + public String getName() { + return "JNA babushka"; + } + + @Override + public void set(String key, String value) { + + } + + @Override + public String get(String key) { + var res = lib.get0(ptr, key); + if (res.value_type == ResultType.Str.id) { + return res.string; + } + return res.error; + } +} diff --git a/java/javababushka.hpp b/java/javababushka.hpp old mode 100755 new mode 100644 index 1331438fef..37a90b06a2 --- a/java/javababushka.hpp +++ b/java/javababushka.hpp @@ -4,20 +4,25 @@ #include #include +template +struct Option; + struct BabushkaResultStr { const char *error; const char *result; }; -struct BabushkaValue { +struct BabushkaResult { + const char *error; + uint32_t value_type; const char *str; int64_t num; }; -struct BabushkaResult { - const char *error; - uint8_t value_type; - BabushkaValue value; +struct BabushkaClient { + Option> runtime; + Option> connection; + int32_t data; }; extern "C" { @@ -36,4 +41,18 @@ BabushkaResult static_function2_3(); BabushkaResult static_function2_4(); +uint64_t init_client0(int32_t data); + +BabushkaResult test0(uint64_t ptr, const char *address); + +BabushkaResult connect0(uint64_t ptr, const char *address); + +BabushkaResult set0(uint64_t ptr, const char *key, const char *value); + +BabushkaResult get0(uint64_t ptr, const char *key); + +BabushkaResult set(BabushkaClient *self, const char *key, const char *value); + +BabushkaResult get(BabushkaClient *self, const char *key); + } // extern "C" diff --git a/java/jna-stuff/build.gradle b/java/jna-stuff/build.gradle old mode 100755 new mode 100644 index eddb64fa79..941771480f --- a/java/jna-stuff/build.gradle +++ b/java/jna-stuff/build.gradle @@ -21,4 +21,4 @@ test { application { mainClass = 'Loader' -} \ No newline at end of file +} diff --git a/java/jna-stuff/src/main/java/Loader.java b/java/jna-stuff/src/main/java/Loader.java old mode 100755 new mode 100644 index 1c7665c761..07a8bf8965 --- a/java/jna-stuff/src/main/java/Loader.java +++ b/java/jna-stuff/src/main/java/Loader.java @@ -10,15 +10,33 @@ public class Loader { // = enum - public static class ResultType { - public static final int Str = 0; - public static final int Int = 1; - public static final int Nil = 2; - public static final int Data = 3; - public static final int Bulk = 4; - public static final int Ok = 5; - public static final int Err = 6; - public static final int Undef = -1; + public static enum ResultType { + Str(0), + Int(1), + Nil(2), + Data(3), + Bulk(4), + Ok(5), + Err(6), + Undef(-1); + + private int id; + ResultType(int id) { + this.id = id; + } + + public static ResultType of(int val) { + switch (val) { + case 0: return ResultType.Str; + case 1: return ResultType.Int; + case 2: return ResultType.Nil; + case 3: return ResultType.Data; + case 4: return ResultType.Bulk; + case 5: return ResultType.Ok; + case 6: return ResultType.Err; + default: return ResultType.Undef; + } + } }; public interface RustLib extends Library { @@ -41,51 +59,59 @@ public static class ByValue extends BabushkaResultStr implements Structure.ByVal public String result; } - @Structure.FieldOrder({"str", "num"/*, "data", "bulk"*/}) - public static class BabushkaValue extends Structure { - public BabushkaValue() { - str = null; - num = 0; - } - //public static class ByReference extends BabushkaValue implements Structure.ByReference { - //public ByReference() { } - //} - public static class ByValue extends BabushkaValue implements Structure.ByValue { - //public ByValue() { } - } - public String str; - public long num; -// List data; -// List bulk; - }; - - @Structure.FieldOrder({"error", "value_type", "value"}) + @Structure.FieldOrder({"error", "value_type", "string", "num"}) public static class BabushkaResult extends Structure { public BabushkaResult() { error = null; value_type = 0; - value = null; + string = null; + num = 0; } public static class ByValue extends BabushkaResult implements Structure.ByValue { } public String error = null; - public byte value_type = 0; + public int value_type = 0; //public BabushkaValue.ByReference value; - public BabushkaValue.ByValue value = null; + public String string = null; + public long num = 0; }; + + public static class BabushkaClient extends Structure { + public static class ByValue extends BabushkaClient implements Structure.ByValue { } + public static class ByReference extends BabushkaClient implements Structure.ByReference { } + } + + public long init_client0(int data); + public BabushkaResult.ByValue connect0(long client, String address); + public BabushkaResult.ByValue test0(long client, String address); + + + public BabushkaResult.ByValue set0(long client, String key, String value); + + public BabushkaResult.ByValue get0(long client, String key); + + } public static void main(String [] args) { - var targetDir = Paths.get("jna-stuff", "build", "resources", "main", "win32-x86-64").toAbsolutePath(); + var is_win = System.getProperty("os.name").contains("Windows"); + var targetDir = Paths.get("jna-stuff", "build", "resources", "main", is_win ? "win32-x86-64" : "linux-x86-64").toAbsolutePath(); //System.setProperty("jna.debug_load", "true"); System.setProperty("jna.library.path", targetDir.toString()); var created = targetDir.toFile().mkdirs(); try { - Files.copy( - Paths.get(System.getProperty("user.dir"), "target", "debug", "javababushka.dll"), - Paths.get(targetDir.toString(), "javababushka.dll"), - StandardCopyOption.REPLACE_EXISTING); + if (is_win) { + Files.copy( + Paths.get(System.getProperty("user.dir"), "target", "debug", "javababushka.dll"), + Paths.get(targetDir.toString(), "javababushka.dll"), + StandardCopyOption.REPLACE_EXISTING); + } else { + Files.copy( + Paths.get(System.getProperty("user.dir"), "..", "target", "debug", "libjavababushka.so"), + Paths.get(targetDir.toString(), "libjavababushka.so"), + StandardCopyOption.REPLACE_EXISTING); + } } catch (IOException e) { System.out.printf("Failed to copy lib: %s%n", e.getMessage()); e.printStackTrace(); @@ -107,5 +133,48 @@ public static void main(String [] args) { var res2_3 = lib.static_function2_3(); var res2_4 = lib.static_function2_4(); int a = 5; + + var bab = lib.init_client0(42); + var t1 = lib.test0(bab, "pewpew"); + var t2 = lib.test0(bab, "ololo"); + var t3 = lib.test0(bab, "ikiki"); + + + + + + + + + + + System.out.println("Before connect"); + var con = lib.connect0(bab, "redis://127.0.0.1:6379"); + System.out.println("After connect"); + if (con.value_type == ResultType.Ok.id) { + System.out.println("Connected"); + } else { + System.out.printf("Conn failed: Res = %s, str = %s, err = %s%n", ResultType.of(con.value_type), con.string, con.error); + } + + System.out.println("=======\nBefore set"); + var set = lib.set0(bab, "kkkey", "ololo"); + System.out.println("After set"); + if (set.value_type == ResultType.Ok.id) { + System.out.println("Set ok"); + } else { + System.out.printf("Set failed: Res = %s, str = %s, err = %s%n", ResultType.of(set.value_type), set.string, set.error); + } + + System.out.println("=======\nBefore get"); + var get = lib.get0(bab, "key"); + System.out.println("After get"); + if (get.value_type == ResultType.Str.id) { + System.out.printf("Get ok: %s%n", get.string); + } else { + System.out.printf("Set failed: Res = %s, str = %s, err = %s%n", ResultType.of(get.value_type), get.string, get.error); + } + + int b = 5; } } diff --git a/java/src/lib.rs b/java/src/lib.rs index 1de033a257..7b5f5249c0 100644 --- a/java/src/lib.rs +++ b/java/src/lib.rs @@ -3,15 +3,16 @@ use std::ffi::{CStr,CString}; use std::str; use std::mem; use std::ptr::null; - -/* use std::sync::{Mutex}; +//* use redis::aio::MultiplexedConnection; use redis::{Client, ErrorKind, FromRedisValue, RedisResult, Value}; use redis::{AsyncCommands, RedisError}; use tokio::runtime::Builder; use tokio::runtime::Runtime; -*/ +// */ + + #[no_mangle] pub extern fn static_function_which_throws() -> BabushkaResultStr { BabushkaResultStr { error: str_to_ptr(""), result: str_to_ptr("hello from rust -> static function which throws") } @@ -27,13 +28,9 @@ pub extern fn static_function2_0() -> BabushkaResult { //BabushkaResult::from_str(str_to_ptr("ololo")) BabushkaResult { error: null(), - value_type: ResultType::Str as u8, - //* - value: BabushkaValue { - str: str_to_ptr("ololo"), - num: 0 - } - // */ + value_type: ResultType::Str as u32, + str: str_to_ptr("ololo"), + num: 0 } } @@ -42,8 +39,9 @@ pub extern fn static_function2_1() -> BabushkaResult { //BabushkaResult::from_err(str_to_ptr("oh no")) BabushkaResult { error: str_to_ptr("oh no"), - value_type: ResultType::Err as u8, - value: Default::default() + value_type: ResultType::Err as u32, + str: null(), + num: 0 } } @@ -52,13 +50,9 @@ pub extern fn static_function2_2() -> BabushkaResult { //BabushkaResult::from_int(100500) BabushkaResult { error: null(), - value_type: ResultType::Int as u8, - //* - value: BabushkaValue { - str: null(), - num: 100500 - } - // */ + value_type: ResultType::Int as u32, + str: null(), + num: 100500 } } @@ -67,8 +61,9 @@ pub extern fn static_function2_3() -> BabushkaResult { //BabushkaResult::from_ok() BabushkaResult { error: null(), - value_type: ResultType::Ok as u8, - value: Default::default() + value_type: ResultType::Ok as u32, + str: null(), + num: 0 } } @@ -76,17 +71,24 @@ pub extern fn static_function2_3() -> BabushkaResult { pub extern fn static_function2_4() -> BabushkaResult { BabushkaResult { error: null(), - value_type: ResultType::Nil as u8, - value: Default::default() + value_type: ResultType::Nil as u32, + str: null(), + num: 0 } } /// Convert a native string to a Rust string -fn to_string(pointer: * const c_char) -> String { +fn ptr_to_string(pointer: * const c_char) -> String { let slice = unsafe { CStr::from_ptr(pointer).to_bytes() }; str::from_utf8(slice).unwrap().to_string() } +/// Convert a native string to a Rust string +fn ptr_to_str(pointer: * const c_char) -> &'static str { + let slice = unsafe { CStr::from_ptr(pointer).to_bytes() }; + str::from_utf8(slice).unwrap() +} + /// Convert a Rust string to a native string fn string_to_ptr(string: String) -> * const c_char { let cs = CString::new(string.as_bytes()).unwrap(); @@ -113,8 +115,11 @@ pub struct BabushkaResultStr { pub result: * const c_char } +use num_derive::FromPrimitive; +use num_traits::FromPrimitive; + // redis::Value -#[repr(C)] +#[derive(FromPrimitive)] pub enum ResultType { Str = 0, // * const c_char Int = 1, // i64 @@ -128,102 +133,84 @@ pub enum ResultType { #[repr(C)] pub struct BabushkaResult { pub error: * const c_char, - pub value_type: u8, //ResultType, - value: BabushkaValue, + pub value_type: u32, //ResultType, + pub str: * const c_char, + pub num: i64, } -//impl BabushkaResult { -/* - pub fn from_str(str: * const c_char) -> Self { +impl BabushkaResult { + pub fn from_str(str: String) -> Self { Self { error: null(), - value_type: ResultType::Str, - value: BabushkaValue { - str: str, - num: 0, -// data: Vec::new(), -// bulk: Vec::new(), - } - } - } - - pub fn from_int(int: i64) -> Self { - Self { - error: null(), - value_type: ResultType::Int, - value: BabushkaValue { - str: null(), - num: int, -// data: Vec::new(), -// bulk: Vec::new(), - } + value_type: ResultType::Str as u32, + str: string_to_ptr(str), + num: 0, } } - pub fn from_data(data: Vec) -> Self { + pub fn from_empty_str() -> Self { Self { error: null(), - value_type: ResultType::Data, - value: BabushkaValue { - str: null(), - num: 0, -// data: data, -// bulk: Vec::new(), - } + value_type: ResultType::Str as u32, + str: null(), + num: 0, } } - pub fn from_bulk(bulk: Vec) -> Self { + pub fn from_int(int: i64) -> Self { Self { error: null(), - value_type: ResultType::Bulk, - value: BabushkaValue { - str: null(), - num: 0, -// data: Vec::new(), -// bulk: bulk, - } + value_type: ResultType::Int as u32, + str: null(), + num: int, } } - pub fn from_err(err: * const c_char) -> Self { + pub fn from_err(err: String) -> Self { Self { - error: err, - value_type: ResultType::Err, - value: BabushkaValue::default() + error: string_to_ptr(err), + value_type: ResultType::Err as u32, + str: null(), + num: 0, } } pub fn from_nil() -> Self { Self { error: null(), - value_type: ResultType::Nil, - value: BabushkaValue::default() + value_type: ResultType::Nil as u32, + str: null(), + num: 0, } } pub fn from_ok() -> Self { Self { error: null(), - value_type: ResultType::Ok, - value: BabushkaValue::default() + value_type: ResultType::Ok as u32, + str: null(), + num: 0, } } -*/ -/* - #[no_mangle] - pub extern fn get_str(&self) -> * const c_char { - self.value.str + pub fn get_type(&self) -> ResultType { + // unsafe { std::mem::transmute(self.value_type as u32) }; + ResultType::from_u32(self.value_type).unwrap() } - #[no_mangle] - pub extern fn get_int(&self) -> i64 { - self.value.num + pub fn get_err(&self) -> String { + ptr_to_string(self.error) + } + + pub fn get_str(&self) -> String { + ptr_to_string(self.str) + } + + pub fn get_int(&self) -> i64 { + self.num } -*/ // TODO other types -//} +} #[repr(C)] pub struct BabushkaValue { @@ -245,13 +232,111 @@ impl Default for BabushkaValue { } -/* + #[repr(C)] pub struct BabushkaClient { runtime: Option>, connection: Option>, + //runtime: Option>, + //connection: Option>, + data: i32 +} + + +#[no_mangle] +pub extern fn init_client0(data: i32) -> u64 { + let p = Box::::into_raw(Box::new( + BabushkaClient { + runtime: None, + connection: None, + data + })); + p as u64 + //p.into(); +} + +#[no_mangle] +pub extern fn test0(ptr: u64, address: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + babushka.data += 15; + BabushkaResult { + error: null(), + value_type: ResultType::Ok as u32, + str: string_to_ptr(format!("{} {}", babushka.data, ptr_to_string(address))), + num: Box::::into_raw(babushka) as i64, + } +} + +//* +#[no_mangle] +pub extern fn connect0(ptr: u64, address: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + let client_res = redis::Client::open(ptr_to_string(address)); + let client : Client; + + match client_res { + Ok(c) => client = c, + Err(err) => return BabushkaResult::from_err(err.to_string()) + } + + let runtime_res = + Builder::new_multi_thread() + .enable_all() + .thread_name("Babushka java thread") + .build(); + + let runtime : Runtime; + + match runtime_res { + Ok(rt) => runtime = rt, + Err(err) => return BabushkaResult::from_err(err.to_string()) + } + + let _runtime_handle = runtime.enter(); + + let connection_res = runtime + .block_on(client.get_multiplexed_async_connection()); + + let connection : MultiplexedConnection; + + match connection_res { + Ok(c) => connection = c, + Err(err) => return BabushkaResult::from_err(err.to_string()) + } + + babushka.runtime = Some(Mutex::new(runtime)); + babushka.connection = Some(Mutex::new(connection)); + + Box::::into_raw(babushka); + BabushkaResult::from_ok() } +#[no_mangle] +pub extern fn set0(ptr: u64, key: * const c_char, value: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + //self.runtime.spawn(async move { + babushka.connection.as_mut().unwrap().lock().unwrap() + .set::(ptr_to_string(key), ptr_to_string(value)); // TODO try RedisValue + //}); + Box::::into_raw(babushka); + BabushkaResult::from_ok() +} + +#[no_mangle] +pub extern fn get0(ptr: u64, key: * const c_char) -> BabushkaResult { + let mut babushka = unsafe { Box::from_raw(ptr as *mut BabushkaClient) }; + let res = babushka.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + babushka.connection.as_mut().unwrap().lock().unwrap().get::>(ptr_to_string(key)).await + }); + Box::::into_raw(babushka); + match res { + Ok(Some(val)) => BabushkaResult::from_str(val), + Ok(None) => BabushkaResult::from_empty_str(), + Err(err) => BabushkaResult::from_err(err.to_string()) + } +} +// */ + impl BabushkaClient { /* fn new() -> Self { @@ -261,20 +346,35 @@ impl BabushkaClient { } }*/ +/* + #[no_mangle] + pub extern fn connect(&mut self, address: * const c_char) -> BabushkaResult { + self.runtime = Some(Mutex::new(BabushkaValue::default())); + self.connection = Some(Mutex::new(BabushkaValue::default())); + + BabushkaResult::from_str(ptr_to_string(address).to_lowercase()) + } +*/ #[no_mangle] - pub extern fn class_function(&self) -> String { - "hello from rust -> class function".into() + pub extern fn set(&mut self, key: * const c_char, value: * const c_char) -> BabushkaResult { + BabushkaResult::from_str(ptr_to_string(key) + ptr_to_str(value)) } #[no_mangle] - pub extern fn connect(&mut self, address: String) -> Result<(), String> { + pub extern fn get(&mut self, key: * const c_char) -> BabushkaResult { + BabushkaResult::from_str(ptr_to_string(key).repeat(3)) + } + +/* + #[no_mangle] + pub extern fn connect(&mut self, address: String) -> BabushkaResult { //self.client = Some(redis::Client::open(address)?); let client_res = redis::Client::open(address); let client : Client; match client_res { Ok(c) => client = c, - Err(err) => return Err(err.to_string()) + Err(err) => return BabushkaResult::from_err(err.to_string()) } let runtime_res = @@ -287,7 +387,7 @@ impl BabushkaClient { match runtime_res { Ok(rt) => runtime = rt, - Err(err) => return Err(err.to_string()) + Err(err) => return BabushkaResult::from_err(err.to_string()) } let _runtime_handle = runtime.enter(); @@ -299,13 +399,13 @@ impl BabushkaClient { match connection_res { Ok(c) => connection = c, - Err(err) => return Err(err.to_string()) + Err(err) => return BabushkaResult::from_err(err.to_string()) } self.runtime = Some(Mutex::new(runtime)); self.connection = Some(Mutex::new(connection)); - Ok(()) + BabushkaResult::from_ok() } /* @@ -315,63 +415,65 @@ impl BabushkaClient { */ // TODO support any type for value #[no_mangle] - pub extern fn set(&mut self, key: String, value: String) -> Result<(), String> { + pub extern fn set(&mut self, key: String, value: String) -> BabushkaResult { //self.runtime.spawn(async move { self.connection.as_mut().unwrap().lock().unwrap() //.set/*::*/(key, value); .set::(key, value); // TODO try RedisValue //}); - Ok(()) + BabushkaResult::from_ok() } #[no_mangle] - pub extern fn set2(&mut self, key: String, value: Option) -> Result<(), String> { + pub extern fn set2(&mut self, key: String, value: Option) -> BabushkaResult { //self.runtime.spawn(async move { //let val: Value = value.map_or_else(|| { Value::Nil }, |s| { Value::Status(s) }); self.connection.as_mut().unwrap().lock().unwrap() //.set/*::*/(key, value); .set::, Option, ()>(Some(key), value); // TODO try RedisValue //}); - Ok(()) + BabushkaResult::from_ok() } // TODO support any type for value // TODO support null value (Option<...>) - // TODO handle (nil) // TODO handle other types #[no_mangle] - pub extern fn get(&mut self, key: String) -> Result { + pub extern fn get(&mut self, key: String) -> BabushkaResult { let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { self.connection.as_mut().unwrap().lock().unwrap().get::(key).await }); match res { - Ok(val) => Ok(val), - Err(err) => Err(err.to_string()) + Ok(val) => BabushkaResult::from_str(val), + Err(err) => BabushkaResult::from_err(err.to_string()) } } #[no_mangle] - pub extern fn get2(&mut self, key: String) -> Result { + pub extern fn get2(&mut self, key: String) -> BabushkaResult { let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { self.connection.as_mut().unwrap().lock().unwrap().get::(key).await }); match res { - Ok(val) => Ok(String::from_redis_value(&val).unwrap()), - Err(err) => Err(err.to_string()) + Ok(val) => BabushkaResult::from_str(String::from_redis_value(&val).unwrap()), + Err(err) => BabushkaResult::from_err(err.to_string()) } } #[no_mangle] - pub extern fn get3(&mut self, key: String) -> Result, String> { + pub extern fn get3(&mut self, key: String) -> BabushkaResult { let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { self.connection.as_mut().unwrap().lock().unwrap().get::>(key).await }); match res { - Ok(val) => Ok(val), - Err(err) => Err(err.to_string()) + Ok(Some(val)) => BabushkaResult::from_str(val), + Ok(None) => BabushkaResult::from_empty_str(), + Err(err) => BabushkaResult::from_err(err.to_string()) } } + */ + /* #[no_mangle] pub extern fn get4(&mut self, key: String) -> Result<* const String, String> { let res = self.runtime.as_mut().unwrap().lock().unwrap().block_on(async { @@ -387,5 +489,5 @@ impl BabushkaClient { Err(err) => Err(err.to_string()) } } + */ } -*/ From 9324ba733673b6cbdfe589373b869bb064dc2a2b Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Thu, 26 Oct 2023 10:34:57 -0700 Subject: [PATCH 3/7] Add JNI FFI sync client to benchmarking. Signed-off-by: Yury-Fridlyand --- java/Cargo.toml | 3 + java/benchmarks/build.gradle | 2 + .../benchmarks/BenchmarkingApp.java | 11 +- .../javababushka/benchmarks/babushka/Jni.java | 132 +++++++++ .../benchmarks/babushka/JniFfi.java | 41 +++ .../benchmarks/utils/Benchmarking.java | 23 +- java/javababushka_benchmarks_babushka_Jni.h | 85 ++++++ java/src/lib.rs | 262 ++++++++++++++++++ 8 files changed, 544 insertions(+), 15 deletions(-) create mode 100644 java/benchmarks/src/main/java/javababushka/benchmarks/babushka/Jni.java create mode 100644 java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniFfi.java create mode 100644 java/javababushka_benchmarks_babushka_Jni.h diff --git a/java/Cargo.toml b/java/Cargo.toml index 01ecb23e4c..9eb26ea7c9 100644 --- a/java/Cargo.toml +++ b/java/Cargo.toml @@ -15,6 +15,9 @@ babushka = { path = "../babushka-core" } tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } logger_core = {path = "../logger_core"} tracing-subscriber = "0.3.16" +jni = "0.21.1" +env_logger = "0.10.0" +log = "0.4.20" [profile.release] lto = true diff --git a/java/benchmarks/build.gradle b/java/benchmarks/build.gradle index 5e22fda5c7..c7b93e9014 100644 --- a/java/benchmarks/build.gradle +++ b/java/benchmarks/build.gradle @@ -34,6 +34,8 @@ java { application { // Define the main class for the application. mainClass = 'javababushka.benchmarks.BenchmarkingApp' + // mainClass = 'javababushka.benchmarks.babushka.Jni' + applicationDefaultJvmArgs += "-Djava.library.path=${projectDir}/../target/debug" } tasks.withType(Test) { diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java index 1e3c9ac0e0..b673e49c0e 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.Optional; import java.util.stream.Stream; +import javababushka.benchmarks.babushka.JniFfi; import javababushka.benchmarks.jedis.JedisClient; import javababushka.benchmarks.jedis.JedisPseudoAsyncClient; import javababushka.benchmarks.lettuce.LettuceAsyncClient; @@ -46,6 +47,9 @@ public static void main(String[] args) { for (ClientName client : runConfiguration.clients) { switch (client) { + case JNI_FFI: + testClientSetGet(JniFfi::new, runConfiguration, false); + break; case JEDIS: testClientSetGet(JedisClient::new, runConfiguration, false); break; @@ -197,6 +201,7 @@ public enum ClientName { LETTUCE_ASYNC("Lettuce async"), BABUSHKA("Babushka"), BABUSHKA_ASYNC("Babushka async"), + JNI_FFI("JNI FFI"), ALL("All"), ALL_SYNC("All sync"), ALL_ASYNC("All async"); @@ -232,12 +237,12 @@ public static class RunConfiguration { public RunConfiguration() { configuration = "Release"; resultsFile = Optional.empty(); - dataSize = new int[] {100, 4000}; - concurrentTasks = new int[] {100, 1000}; + dataSize = new int[] {20}; + concurrentTasks = new int[] {10, 100}; clients = new ClientName[] { // ClientName.BABUSHKA_ASYNC, - ClientName.JEDIS, ClientName.JEDIS_ASYNC, ClientName.LETTUCE, ClientName.LETTUCE_ASYNC + ClientName.JEDIS, ClientName.LETTUCE, ClientName.JNI_FFI }; host = "localhost"; port = 6379; diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/Jni.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/Jni.java new file mode 100644 index 0000000000..017b2d8d9d --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/Jni.java @@ -0,0 +1,132 @@ +package javababushka.benchmarks.babushka; + +import java.nio.file.Paths; +import lombok.Builder; + +public class Jni { + static { + System.setProperty( + "java.library.path", + Paths.get(System.getProperty("user.dir"), "target", "debug").toString()); + System.loadLibrary("javababushka"); + } + + public static native long init_client(int a); + + public static native BabushkaResult test(long ptr, String address); + + public static native BabushkaResult connect(long ptr, String address); + + public static native BabushkaResult set(long ptr, String name, String value); + + public static native BabushkaResult get(long ptr, String name); + + public static native BabushkaResult from_str(String str); + + public static native BabushkaResult from_number(long num); + + public static native BabushkaResult from_ok(); + + public static native BabushkaResult nnew(String str, int resultType, String string, long number); + + public static enum ResultType { + STR, // * const c_char + NUM, // i64 + NIL, + DATA, // Vec + BULK, // Vec + OK, + ERR; + + public static ResultType of(int ordinal) { + switch (ordinal) { + case 0: + return STR; + case 1: + return NUM; + case 2: + return NIL; + case 3: + return DATA; + case 4: + return BULK; + case 5: + return OK; + default: + return ERR; + } + } + } + + @Builder + public static class BabushkaResult { + public String error = null; + public ResultType resultType; + public String string = null; + public long number = 0; + + public BabushkaResult(String error, ResultType resultType, String string, long number) { + this.error = error; + this.resultType = resultType; + this.string = string; + this.number = number; + } + + public BabushkaResult(String error, int resultType, String string, long number) { + this(error, ResultType.of(resultType), string, number); + } + + // private BabushkaResult(){} + + public static BabushkaResult from_str(String str) { + return BabushkaResult.builder().string(str).resultType(ResultType.STR).build(); + } + + public static BabushkaResult from_empty_str() { + return BabushkaResult.builder().resultType(ResultType.STR).build(); + } + + public static BabushkaResult from_number(long num) { + return BabushkaResult.builder().number(num).resultType(ResultType.NUM).build(); + } + + public static BabushkaResult from_error(String err) { + return BabushkaResult.builder().error(err).resultType(ResultType.ERR).build(); + } + + public static BabushkaResult from_ok() { + return BabushkaResult.builder().resultType(ResultType.OK).build(); + } + + public static BabushkaResult from_nil() { + return BabushkaResult.builder().resultType(ResultType.NIL).build(); + } + } + + public static void main(String[] args) { + var t = BabushkaResult.from_empty_str(); + + var ptr = init_client(42); + var a = test(ptr, "12334"); + System.out.printf("Test1: %s%n", a.string); + var b = test(ptr, "abadfgdg"); + System.out.printf("Test2: %s%n", b.string); + + var c = connect(ptr, "redis://localhost:6379"); + System.out.printf("Connect: str = %s, err = %s, type = %s%n", c.string, c.error, c.resultType); + + var set = set(ptr, "JNI value", "JJJ"); + System.out.printf( + "Set: str = %s, err = %s, type = %s%n", set.string, set.error, set.resultType); + + var get1 = get(ptr, "JNI value"); + System.out.printf( + "Get1: str = %s, err = %s, type = %s%n", get1.string, get1.error, get1.resultType); + + var get2 = get(ptr, "JJJ"); + System.out.printf( + "Get2: str = %s, err = %s, type = %s%n", get2.string, get2.error, get2.resultType); + + int d = 5; + } +} diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniFfi.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniFfi.java new file mode 100644 index 0000000000..05448e279b --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JniFfi.java @@ -0,0 +1,41 @@ +package javababushka.benchmarks.babushka; + +import javababushka.benchmarks.SyncClient; +import javababushka.benchmarks.utils.ConnectionSettings; + +public class JniFfi implements SyncClient { + + private long ptr = 0; + + @Override + public void connectToRedis() { + connectToRedis(new ConnectionSettings("localhost", 6379, false)); + } + + @Override + public void connectToRedis(ConnectionSettings connectionSettings) { + ptr = Jni.init_client(0); + Jni.connect( + ptr, + String.format( + "%s://%s:%d", + connectionSettings.useSsl ? "rediss" : "redis", + connectionSettings.host, + connectionSettings.port)); + } + + @Override + public String getName() { + return "JNI FFI Sync client"; + } + + @Override + public void set(String key, String value) { + Jni.set(ptr, key, value); + } + + @Override + public String get(String key) { + return Jni.get(ptr, key).string; + } +} diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java index d3d7baadb1..f89dbfcfca 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java @@ -89,18 +89,17 @@ public static Map calculateResults( ChosenAction action = entry.getKey(); ArrayList latencies = entry.getValue(); - double avgLatency = - SECONDS_IN_NANO * latencies.stream().mapToLong(Long::longValue).sum() / latencies.size(); + double avgLatency = latencies.stream().mapToLong(Long::longValue).sum() / latencies.size(); Collections.sort(latencies); results.put( action, new LatencyResults( avgLatency, - SECONDS_IN_NANO * percentile(latencies, 50), - SECONDS_IN_NANO * percentile(latencies, 90), - SECONDS_IN_NANO * percentile(latencies, 99), - SECONDS_IN_NANO * stdDeviation(latencies, avgLatency))); + percentile(latencies, 50), + percentile(latencies, 90), + percentile(latencies, 99), + stdDeviation(latencies, avgLatency))); } return results; @@ -111,18 +110,18 @@ public static void printResults(Map resultsMap) { ChosenAction action = entry.getKey(); LatencyResults results = entry.getValue(); - System.out.println("Avg. time in ms per " + action + ": " + results.avgLatency / 1000000.0); - System.out.println(action + " p50 latency in ms: " + results.p50Latency / 1000000.0); - System.out.println(action + " p90 latency in ms: " + results.p90Latency / 1000000.0); - System.out.println(action + " p99 latency in ms: " + results.p99Latency / 1000000.0); - System.out.println(action + " std dev in ms: " + results.stdDeviation / 1000000.0); + System.out.println("Avg. time in ms per " + action + ": " + results.avgLatency / 1000000); + System.out.println(action + " p50 latency in ms: " + results.p50Latency / 1000000); + System.out.println(action + " p90 latency in ms: " + results.p90Latency / 1000000); + System.out.println(action + " p99 latency in ms: " + results.p99Latency / 1000000); + System.out.println(action + " std dev in ms: " + results.stdDeviation / 1000000); } } public static void testClientSetGet( Supplier clientCreator, BenchmarkingApp.RunConfiguration config, boolean async) { for (int concurrentNum : config.concurrentTasks) { - int iterations = Math.min(Math.max(100000, concurrentNum * 10000), 10000000); + int iterations = 1000; // Math.min(Math.max(100000, concurrentNum * 10000), 10000000); for (int clientCount : config.clientCount) { for (int dataSize : config.dataSize) { System.out.printf( diff --git a/java/javababushka_benchmarks_babushka_Jni.h b/java/javababushka_benchmarks_babushka_Jni.h new file mode 100644 index 0000000000..3f0fcd5bd9 --- /dev/null +++ b/java/javababushka_benchmarks_babushka_Jni.h @@ -0,0 +1,85 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class javababushka_benchmarks_babushka_Jni */ + +#ifndef _Included_javababushka_benchmarks_babushka_Jni +#define _Included_javababushka_benchmarks_babushka_Jni +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: init_client + * Signature: (I)J + */ +JNIEXPORT jlong JNICALL Java_javababushka_benchmarks_babushka_Jni_init_1client + (JNIEnv *, jclass, jint); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: test + * Signature: (JLjava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_test + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: connect + * Signature: (JLjava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_connect + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: set + * Signature: (JLjava/lang/String;Ljava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_set + (JNIEnv *, jclass, jlong, jstring, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: get + * Signature: (JLjava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_get + (JNIEnv *, jclass, jlong, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: from_str + * Signature: (Ljava/lang/String;)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_from_1str + (JNIEnv *, jclass, jstring); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: from_number + * Signature: (J)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_from_1number + (JNIEnv *, jclass, jlong); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: from_ok + * Signature: ()Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_from_1ok + (JNIEnv *, jclass); + +/* + * Class: javababushka_benchmarks_babushka_Jni + * Method: nnew + * Signature: (Ljava/lang/String;ILjava/lang/String;J)Ljavababushka/benchmarks/babushka/Jni/BabushkaResult; + */ +JNIEXPORT jobject JNICALL Java_javababushka_benchmarks_babushka_Jni_nnew + (JNIEnv *, jclass, jstring, jint, jstring, jlong); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/java/src/lib.rs b/java/src/lib.rs index e69de29bb2..6e7d65e131 100644 --- a/java/src/lib.rs +++ b/java/src/lib.rs @@ -0,0 +1,262 @@ +use jni::objects::{JClass, JObject, JStaticFieldID, JString}; +use jni::JNIEnv; +use jni::sys::{jclass, jfieldID, jint, jlong, jstring}; +use std::sync::{mpsc, Mutex}; +//use log::error; +use log::{debug, error}; + +use redis::{AsyncCommands, Client, RedisResult, Value}; +use redis::aio::MultiplexedConnection; +use tokio::runtime::{Builder, Runtime}; + + +// redis::Value +//#[derive(FromPrimitive)] +pub enum ResultType { + Str = 0, // * const c_char + Int = 1, // i64 + Nil = 2, + Data = 3, // Vec + Bulk = 4, // Vec + Ok = 5, + Err = 6 +} + +fn BabushkaResult_from_error<'local>(env: &mut JNIEnv<'local>, error: String) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&env.new_string(error.clone()).unwrap()).into(), + jint::from(ResultType::Err as i32).into(), + (&JObject::null()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from error {}: {}", error, err) + } + JObject::null() +} + +fn BabushkaResult_from_ok<'local>(env: &mut JNIEnv<'local>) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&JObject::null()).into(), + jint::from(ResultType::Ok as i32).into(), + (&JObject::null()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from ok: {}", err) + } + JObject::null() +} + +fn BabushkaResult_from_string<'local>(env: &mut JNIEnv<'local>, string: String) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&JObject::null()).into(), + jint::from(ResultType::Str as i32).into(), + (&env.new_string(string.clone()).unwrap()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from string {}: {}", string, err) + } + JObject::null() +} + +fn BabushkaResult_from_empty_string<'local>(env: &mut JNIEnv<'local>) -> JObject<'local> { + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&JObject::null()).into(), + jint::from(ResultType::Str as i32).into(), + (&JObject::null()).into(), + 0i64.into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("Failed to create `BabushkaResult` from empty string: {}", err) + } + JObject::null() +} + +#[repr(C)] +pub struct BabushkaClient { + runtime: Option>, + connection: Option>, + //runtime: Option>, + //connection: Option>, + data: i32 +} + +#[link_section = ".init_array"] +pub static INITIALIZE: extern "C" fn() = rust_ctor; + +#[no_mangle] +pub extern "C" fn rust_ctor() { + env_logger::init(); +} + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_init_1client<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + data: jint +) -> jlong { + let p = Box::::into_raw(Box::new( + BabushkaClient { + runtime: None, + connection: None, + data + })); + jlong::from(p as i64) +} + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_test<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + data: jstring +) -> JObject<'local> { + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + babushka.data += 15; + +/* + // ENUM: + let clSTATUS: JClass = env.find_class("javababushka/benchmarks/babushka/Jni$ResultType")?; + let fidONE: JStaticFieldID = env.get_static_field_id(clSTATUS , "ONE", "LMyClass$STATUS;")?; + let STATUS_ONE = env.get_static_field(clSTATUS, fidONE)?; +*/ + let err = JObject::null(); + //let res_type = env.new_object("java/lang/Integer", "(I)V", &[(ResultType::Ok as i32).into()]).unwrap(); + let res_type = jint::from(ResultType::Ok as i32); + let str = env.new_string(format!("{} {:?}", babushka.data, data)).unwrap(); + //let num = env.new_object("java/lang/Long", "(J)V", &[(Box::::into_raw(babushka) as i64).into()]).unwrap(); + let num = Box::::into_raw(babushka) as i64; + + let res = env.new_object( + "javababushka/benchmarks/babushka/Jni$BabushkaResult", + "(Ljava/lang/String;ILjava/lang/String;J)V", + &[ + (&err).into(), + //(&res_type).into(), + (res_type).into(), + (&str).into(), + //(&num).into(), + (num).into(), + ]);//.unwrap() + match res { + Ok(res) => return res, + Err(err) => error!("{}", err) + } + JObject::null() +} + + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_connect<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + //address: jstring + address: JString +) -> JObject<'local> { + let addr : String = env.get_string(&address).unwrap().into(); + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + let client_res = redis::Client::open(addr); + let client : Client; + + match client_res { + Ok(c) => client = c, + Err(err) => return BabushkaResult_from_error(&mut env, err.to_string()) + } + + let runtime_res = + Builder::new_multi_thread() + .enable_all() + .thread_name("Babushka java thread") + .build(); + + let runtime : Runtime; + + match runtime_res { + Ok(rt) => runtime = rt, + Err(err) => return BabushkaResult_from_error(&mut env, err.to_string()) + } + + let _runtime_handle = runtime.enter(); + + let connection_res = runtime + .block_on(client.get_multiplexed_async_connection()); + + let connection : MultiplexedConnection; + + match connection_res { + Ok(c) => connection = c, + Err(err) => return BabushkaResult_from_error(&mut env, err.to_string()) + } + + babushka.runtime = Some(Mutex::new(runtime)); + babushka.connection = Some(Mutex::new(connection)); + + Box::::into_raw(babushka); + BabushkaResult_from_ok(&mut env) +} + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_set<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + key: jstring, + value: jstring +) -> JObject<'local> { + let key_str : String = env.get_string(&unsafe { JString::from_raw(key) }).unwrap().into(); + let value_str : String = env.get_string(&unsafe { JString::from_raw(value) }).unwrap().into(); + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + let res = babushka.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + babushka.connection.as_mut().unwrap().lock().unwrap() + .set::(key_str, value_str).await + }); + Box::::into_raw(babushka); + match res { + Ok(_) => BabushkaResult_from_ok(&mut env), + Err(err) => BabushkaResult_from_error(&mut env, err.to_string()) + } +} + +#[no_mangle] +pub extern "system" fn Java_javababushka_benchmarks_babushka_Jni_get<'local>( + mut env: JNIEnv<'local>, + _class: JClass<'local>, + pointer: jlong, + key: jstring +) -> JObject<'local> { + let key_str : String = env.get_string(&unsafe { JString::from_raw(key) }).unwrap().into(); + + let mut babushka = unsafe { Box::from_raw(pointer as *mut BabushkaClient) }; + + let res = babushka.runtime.as_mut().unwrap().lock().unwrap().block_on(async { + babushka.connection.as_mut().unwrap().lock().unwrap().get::>(key_str).await + }); + Box::::into_raw(babushka); + match res { + Ok(Some(val)) => BabushkaResult_from_string(&mut env, val), + Ok(None) => BabushkaResult_from_empty_string(&mut env), + Err(err) => BabushkaResult_from_error(&mut env, err.to_string()) + } +} From 29d3cc2a69d4fc552222af878c9516346f54df75 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Thu, 26 Oct 2023 10:36:05 -0700 Subject: [PATCH 4/7] Typo fix. Signed-off-by: Yury-Fridlyand --- .../main/java/javababushka/benchmarks/utils/Benchmarking.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java index f89dbfcfca..bdf9a579b3 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java @@ -121,7 +121,7 @@ public static void printResults(Map resultsMap) { public static void testClientSetGet( Supplier clientCreator, BenchmarkingApp.RunConfiguration config, boolean async) { for (int concurrentNum : config.concurrentTasks) { - int iterations = 1000; // Math.min(Math.max(100000, concurrentNum * 10000), 10000000); + int iterations = Math.min(Math.max(100000, concurrentNum * 10000), 10000000); for (int clientCount : config.clientCount) { for (int dataSize : config.dataSize) { System.out.printf( From 4ea66f2e657158381d7b159d50992d819ec06330 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Thu, 26 Oct 2023 14:40:04 -0700 Subject: [PATCH 5/7] Add uniffi Kotlin client from #25. Signed-off-by: Yury-Fridlyand --- java/.gitignore | 8 + java/benchmarks/build.gradle | 4 + .../benchmarks/BenchmarkingApp.java | 11 +- .../benchmarks/babushka/KotlinClient.java | 60 +++++ java/build.gradle | 1 + java/kotlin-sample/build.gradle | 16 ++ .../src/main/java/babushka/javababushka.java | 66 +++++ java/settings.gradle | 1 + kotlin/.gitignore | 16 ++ kotlin/build.gradle.kts | 14 ++ kotlin/client/build.gradle.kts | 40 +++ kotlin/gradle.properties | 1 + kotlin/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + kotlin/gradlew | 234 ++++++++++++++++++ kotlin/gradlew.bat | 89 +++++++ kotlin/interop/.cargo/config.toml | 3 + kotlin/interop/Cargo.toml | 45 ++++ kotlin/interop/build.rs | 3 + kotlin/interop/src/babushka.udl | 56 +++++ kotlin/interop/src/lib.rs | 147 +++++++++++ kotlin/interop/uniffi-bindgen.rs | 3 + kotlin/interop/uniffi.toml | 12 + kotlin/plugin/build.gradle.kts | 18 ++ .../plugin/src/main/kotlin/babushka/Enums.kt | 16 ++ .../main/kotlin/babushka/UniFfiJvmPlugin.kt | 141 +++++++++++ kotlin/settings.gradle.kts | 11 + 27 files changed, 1020 insertions(+), 1 deletion(-) create mode 100644 java/benchmarks/src/main/java/javababushka/benchmarks/babushka/KotlinClient.java create mode 100644 java/kotlin-sample/build.gradle create mode 100644 java/kotlin-sample/src/main/java/babushka/javababushka.java create mode 100644 kotlin/.gitignore create mode 100644 kotlin/build.gradle.kts create mode 100644 kotlin/client/build.gradle.kts create mode 100644 kotlin/gradle.properties create mode 100644 kotlin/gradle/wrapper/gradle-wrapper.jar create mode 100644 kotlin/gradle/wrapper/gradle-wrapper.properties create mode 100755 kotlin/gradlew create mode 100755 kotlin/gradlew.bat create mode 100644 kotlin/interop/.cargo/config.toml create mode 100644 kotlin/interop/Cargo.toml create mode 100644 kotlin/interop/build.rs create mode 100644 kotlin/interop/src/babushka.udl create mode 100644 kotlin/interop/src/lib.rs create mode 100644 kotlin/interop/uniffi-bindgen.rs create mode 100644 kotlin/interop/uniffi.toml create mode 100644 kotlin/plugin/build.gradle.kts create mode 100644 kotlin/plugin/src/main/kotlin/babushka/Enums.kt create mode 100644 kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt create mode 100644 kotlin/settings.gradle.kts diff --git a/java/.gitignore b/java/.gitignore index 8f60484e5a..cedb8f35b3 100644 --- a/java/.gitignore +++ b/java/.gitignore @@ -1,8 +1,16 @@ # Ignore Gradle project-specific cache directory .gradle +# Ignore gradle wrapper files (they are managed by gradle) +gradlew +gradlew.bat +gradle + # Ignore Gradle build output directory build +# IDE files +.idea + # Ignore generated files (e.g. protobuf) generated diff --git a/java/benchmarks/build.gradle b/java/benchmarks/build.gradle index 8f265ee7a1..b47b58c224 100644 --- a/java/benchmarks/build.gradle +++ b/java/benchmarks/build.gradle @@ -22,7 +22,11 @@ dependencies { compileOnly 'org.projectlombok:lombok:1.18.30' annotationProcessor 'org.projectlombok:lombok:1.18.30' + + // Required for interop implementation "net.java.dev.jna:jna:5.8.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20" + implementation files("../../kotlin/client/build/libs/kotlinbabushka-0.0.1.jar") } // Apply a specific Java toolchain to ease working on different environments. diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java index 98c20d51a9..7f7937d110 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java @@ -7,6 +7,7 @@ import java.util.stream.Stream; import javababushka.benchmarks.babushka.JnaFfi; import javababushka.benchmarks.babushka.JniFfi; +import javababushka.benchmarks.babushka.KotlinClient; import javababushka.benchmarks.jedis.JedisClient; import javababushka.benchmarks.jedis.JedisPseudoAsyncClient; import javababushka.benchmarks.lettuce.LettuceAsyncClient; @@ -66,6 +67,12 @@ public static void main(String[] args) { case JNA_FFI: testClientSetGet(JnaFfi::new, runConfiguration, false); break; + case KOTLIN: + testClientSetGet(KotlinClient::new, runConfiguration, false); + break; + case BABUSHKA: + System.out.println("Babushka not yet configured"); + break; } } } @@ -205,6 +212,8 @@ public enum ClientName { JNA_FFI("JNA FFI"), BABUSHKA_ASYNC("Babushka async"), JNI_FFI("JNI FFI"), + BABUSHKA("Babushka"), + KOTLIN("Kotlin"), ALL("All"), ALL_SYNC("All sync"), ALL_ASYNC("All async"); @@ -244,7 +253,7 @@ public RunConfiguration() { concurrentTasks = new int[] {10, 100}; clients = new ClientName[] { - ClientName.LETTUCE, ClientName.JNI_FFI, ClientName.JNA_FFI, + ClientName.LETTUCE, ClientName.JNI_FFI, ClientName.JNA_FFI, ClientName.KOTLIN }; host = "localhost"; port = 6379; diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/KotlinClient.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/KotlinClient.java new file mode 100644 index 0000000000..54dae871d8 --- /dev/null +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/KotlinClient.java @@ -0,0 +1,60 @@ +package javababushka.benchmarks.babushka; + +import babushka.BabushkaClient; +import babushka.BabushkaClientData; +import babushka.BabushkaRedisException; +import javababushka.benchmarks.SyncClient; +import javababushka.benchmarks.utils.ConnectionSettings; + +public class KotlinClient implements SyncClient { + + private BabushkaClient client = new BabushkaClient(); + private BabushkaClientData data = null; + + @Override + public void connectToRedis() { + connectToRedis(new ConnectionSettings("localhost", 6379, false)); + } + + @Override + public void connectToRedis(ConnectionSettings connectionSettings) { + try { + data = + client.connect( + String.format( + "%s://%s:%d", + connectionSettings.useSsl ? "rediss" : "redis", + connectionSettings.host, + connectionSettings.port)); + } catch (BabushkaRedisException e) { + System.out.printf("Failed to connect: %s%n", e.getMessage()); + e.printStackTrace(); + } + } + + @Override + public String getName() { + return "kotlin"; + } + + @Override + public void set(String key, String value) { + try { + client.set(data, key, value); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get3: %s%n", e.getMessage()); + e.printStackTrace(); + } + } + + @Override + public String get(String key) { + try { + return client.get(data, key); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get3: %s%n", e.getMessage()); + e.printStackTrace(); + } + return null; + } +} diff --git a/java/build.gradle b/java/build.gradle index 340f2c98cb..5e612c0b51 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'application' id 'java-library' id 'io.freefair.lombok' version '6.4.0' id 'jacoco' diff --git a/java/kotlin-sample/build.gradle b/java/kotlin-sample/build.gradle new file mode 100644 index 0000000000..7b75df24b4 --- /dev/null +++ b/java/kotlin-sample/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' + id 'application' +} + +dependencies { + // Required for interop + implementation "net.java.dev.jna:jna:5.8.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20" + + implementation files("../../kotlin/client/build/libs/kotlinbabushka-0.0.1.jar") +} + +application { + mainClass = 'babushka.javababushka' +} diff --git a/java/kotlin-sample/src/main/java/babushka/javababushka.java b/java/kotlin-sample/src/main/java/babushka/javababushka.java new file mode 100644 index 0000000000..772a7539a5 --- /dev/null +++ b/java/kotlin-sample/src/main/java/babushka/javababushka.java @@ -0,0 +1,66 @@ +package babushka; + +import static babushka.KotlibbabushkaKt.staticFunction; +import static babushka.KotlibbabushkaKt.staticFunctionWhichThrows; + +public class javababushka { + + public static void main(String[] args) { + + var d = staticFunction(); + + try { + var c = staticFunctionWhichThrows(); + } catch (BabushkaException e) { + throw new RuntimeException(e); + } + + var b = new BabushkaClient().classFunction(); + var a = 42; + + System.out.println("Before babushka"); + var babushka = new BabushkaClient(); + System.out.println("after babushka"); + BabushkaClientData data = null; + + try { + data = babushka.connect("redis://127.0.0.1:6379"); + System.out.println("connected"); + } catch (BabushkaRedisException e) { + System.out.printf("Failed to connect: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + var missing = babushka.get(data, "keyadsf"); + System.out.printf("get missing: %s %n", missing); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get3 missing: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + babushka.set(data, "key", "val"); + System.out.println("set"); + } catch (BabushkaRedisException e) { + System.out.printf("failed to set: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + var value = babushka.get(data, "key"); + System.out.printf("get non missing: %s %n", value); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get value: %s%n", e.getMessage()); + e.printStackTrace(); + } + + try { + var value = babushka.get(data, "keyuuuu"); + System.out.printf("get missing: %s %n", value); + } catch (BabushkaRedisException e) { + System.out.printf("failed to get value: %s%n", e.getMessage()); + e.printStackTrace(); + } + } +} diff --git a/java/settings.gradle b/java/settings.gradle index 1b66925d56..f8255d2261 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -4,3 +4,4 @@ include 'client' include 'integTest' include 'benchmarks' include 'jna-stuff' +include 'kotlin-sample' diff --git a/kotlin/.gitignore b/kotlin/.gitignore new file mode 100644 index 0000000000..4353c2d811 --- /dev/null +++ b/kotlin/.gitignore @@ -0,0 +1,16 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore gradle wrapper files (they are managed by gradle) +gradlew +gradlew.bat +gradle + +# Ignore Gradle build output directory +build + +# IDE files +.idea + +# All client sources are autogenerated +client/src diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts new file mode 100644 index 0000000000..45055baab8 --- /dev/null +++ b/kotlin/build.gradle.kts @@ -0,0 +1,14 @@ +buildscript { + repositories { + mavenCentral() + } +} + +allprojects { + group = "babushka" + version = "0.0.1" + + repositories { + mavenCentral() + } +} diff --git a/kotlin/client/build.gradle.kts b/kotlin/client/build.gradle.kts new file mode 100644 index 0000000000..1b48689014 --- /dev/null +++ b/kotlin/client/build.gradle.kts @@ -0,0 +1,40 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version "1.9.10" + `java-library` + + // Custom plugin to generate the native libs and bindings file + id("babushka.plugin.generate-jvm-bindings") +} + +// This task dependency ensures that we build the bindings +// binaries before running the tests +tasks.withType { + dependsOn("buildJvmLib") + + kotlinOptions { + jvmTarget = "11" + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + withSourcesJar() + withJavadocJar() +} + +dependencies { + implementation(platform("org.jetbrains.kotlin:kotlin-bom")) + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7") + implementation("net.java.dev.jna:jna:5.8.0") +} + +tasks.jar { + manifest { + attributes(mapOf("Implementation-Title" to "kotlinbabushka", + "Implementation-Version" to project.version)) + } + archiveBaseName.set("kotlinbabushka") +} diff --git a/kotlin/gradle.properties b/kotlin/gradle.properties new file mode 100644 index 0000000000..7fc6f1ff27 --- /dev/null +++ b/kotlin/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/kotlin/gradle/wrapper/gradle-wrapper.jar b/kotlin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +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"' + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# 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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/kotlin/gradlew.bat b/kotlin/gradlew.bat new file mode 100755 index 0000000000..107acd32c4 --- /dev/null +++ b/kotlin/gradlew.bat @@ -0,0 +1,89 @@ +@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 a 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 + +@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=. +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%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +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%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/kotlin/interop/.cargo/config.toml b/kotlin/interop/.cargo/config.toml new file mode 100644 index 0000000000..c8e15bc8bf --- /dev/null +++ b/kotlin/interop/.cargo/config.toml @@ -0,0 +1,3 @@ +[env] +BABUSHKA_NAME = { value = "BabushkaKo", force = true } +BABUSHKA_VERSION = "0.1.0" diff --git a/kotlin/interop/Cargo.toml b/kotlin/interop/Cargo.toml new file mode 100644 index 0000000000..1d626b6bd9 --- /dev/null +++ b/kotlin/interop/Cargo.toml @@ -0,0 +1,45 @@ +[package] +name = "kotlinbabushka" +version = "0.1.0" +edition = "2021" +license = "BSD-3-Clause" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +name = "kotlinbabushka" +crate-type = ["lib", "staticlib", "cdylib"] + +[[bin]] +name = "uniffi-bindgen" +path = "uniffi-bindgen.rs" + +[features] +default = ["uniffi/cli"] + + +[dependencies] +redis = { path = "../../submodules/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tls", "tokio-rustls-comp"] } +tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] } +logger_core = {path = "../../logger_core"} +tracing-subscriber = "0.3.16" +uniffi = "0.23.0" +thiserror = "1.0.49" + +[build-dependencies] +uniffi = { version = "0.23.0", features = ["build"] } + +[dev-dependencies] +uniffi = { version = "0.23.0", features = ["bindgen-tests"] } +assert_matches = "1.5.0" + +[profile.release] +lto = true +debug = true + +[profile.release-smaller] +inherits = "release" +opt-level = 'z' # Optimize for size. +lto = true # Enable Link Time Optimization +codegen-units = 1 # Reduce number of codegen units to increase optimizations. +panic = 'abort' # Abort on panic +strip = true # Strip symbols from binary diff --git a/kotlin/interop/build.rs b/kotlin/interop/build.rs new file mode 100644 index 0000000000..7cc75f8d3e --- /dev/null +++ b/kotlin/interop/build.rs @@ -0,0 +1,3 @@ +fn main() { + uniffi::generate_scaffolding("./src/babushka.udl").unwrap(); +} diff --git a/kotlin/interop/src/babushka.udl b/kotlin/interop/src/babushka.udl new file mode 100644 index 0000000000..e46d39608f --- /dev/null +++ b/kotlin/interop/src/babushka.udl @@ -0,0 +1,56 @@ + +[Error] +enum BabushkaError { + "Oops", +}; + +[Error] +enum BabushkaRedisError { + "ResponseError", + "AuthenticationFailed", + "TypeError", + "ExecAbortError", + "BusyLoadingError", + "NoScriptError", + "InvalidClientConfig", + "Moved", + "Ask", + "TryAgain", + "ClusterDown", + "CrossSlot", + "MasterDown", + "IoError", + "ClientError", + "ExtensionError", + "ReadOnly", + "MasterNameNotFoundBySentinel", + "NoValidReplicasFoundBySentinel", + "EmptySentinelList", + "NotBusy", +}; + +namespace kotlibbabushka { + + [Throws=BabushkaError] + string static_function_which_throws(); + + string static_function(); +}; + +interface BabushkaClientData { + +}; + +interface BabushkaClient { + constructor(); + string class_function(); + + [Throws=BabushkaRedisError] + BabushkaClientData connect(string address); + + [Throws=BabushkaRedisError] + void set(BabushkaClientData data, string key, string? value); + + [Throws=BabushkaRedisError] + string? get(BabushkaClientData data, string key); +}; diff --git a/kotlin/interop/src/lib.rs b/kotlin/interop/src/lib.rs new file mode 100644 index 0000000000..abb1010470 --- /dev/null +++ b/kotlin/interop/src/lib.rs @@ -0,0 +1,147 @@ +use std::fmt::Formatter; +use std::sync::{Arc, Mutex}; +use redis::aio::MultiplexedConnection; +use redis::{ErrorKind, FromRedisValue, RedisResult, Value}; +use redis::{AsyncCommands, RedisError}; +use tokio::runtime::Builder; +use tokio::runtime::Runtime; + +uniffi::include_scaffolding!("babushka"); + +#[derive(Debug, thiserror::Error)] +pub enum BabushkaError { + #[error("...")] + Oops, +} + + +#[derive(Debug, thiserror::Error)] +pub enum BabushkaRedisError { + ResponseError, + AuthenticationFailed, + TypeError, + ExecAbortError, + BusyLoadingError, + NoScriptError, + InvalidClientConfig, + Moved, + Ask, + TryAgain, + ClusterDown, + CrossSlot, + MasterDown, + IoError, + ClientError, + ExtensionError, + ReadOnly, + MasterNameNotFoundBySentinel, + NoValidReplicasFoundBySentinel, + EmptySentinelList, + NotBusy +} + +impl std::fmt::Display for BabushkaRedisError { + fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { + write!(f, "{:?}", self) + } +} + +fn convert_to_babushka_error(err: RedisError) -> BabushkaRedisError { + match err.kind() { + ErrorKind::ResponseError => BabushkaRedisError::ResponseError, + ErrorKind::AuthenticationFailed => BabushkaRedisError::AuthenticationFailed, + ErrorKind::TypeError => BabushkaRedisError::TypeError, + ErrorKind::ExecAbortError => BabushkaRedisError::ExecAbortError, + ErrorKind::BusyLoadingError => BabushkaRedisError::BusyLoadingError, + ErrorKind::NoScriptError => BabushkaRedisError::NoScriptError, + ErrorKind::InvalidClientConfig => BabushkaRedisError::InvalidClientConfig, + ErrorKind::Moved => BabushkaRedisError::Moved, + ErrorKind::Ask => BabushkaRedisError::Ask, + ErrorKind::TryAgain => BabushkaRedisError::TryAgain, + ErrorKind::ClusterDown => BabushkaRedisError::ClusterDown, + ErrorKind::CrossSlot => BabushkaRedisError::CrossSlot, + ErrorKind::MasterDown => BabushkaRedisError::MasterDown, + ErrorKind::IoError => BabushkaRedisError::IoError, + ErrorKind::ClientError => BabushkaRedisError::ClientError, + ErrorKind::ExtensionError => BabushkaRedisError::ExtensionError, + ErrorKind::ReadOnly => BabushkaRedisError::ReadOnly, + ErrorKind::MasterNameNotFoundBySentinel => BabushkaRedisError::MasterNameNotFoundBySentinel, + ErrorKind::NoValidReplicasFoundBySentinel => BabushkaRedisError::NoValidReplicasFoundBySentinel, + ErrorKind::EmptySentinelList => BabushkaRedisError::EmptySentinelList, + ErrorKind::NotBusy => BabushkaRedisError::NotBusy, + //ErrorKind::Serialize => {} +// _ => BabushkaRedisError::__ + _ => todo!() + } +} + +pub fn static_function_which_throws() -> Result { + Ok("hello from rust -> static function which throws".into()) +} + +pub fn static_function() -> String { + "hello from rust -> static function".into() +} + +pub struct BabushkaClient { +} + +pub struct BabushkaClientData { + runtime: Mutex, + connection: Mutex, +} + +impl BabushkaClient { + pub fn new() -> Self { + Self { } + } + + pub fn class_function(&self) -> String { + "hello from rust -> class function".into() + } + + pub fn connect(&self, address: String) -> Result, BabushkaRedisError> { + match self.inner_connect(address) { + Ok(data) => Ok(data), + Err(err) => Err(convert_to_babushka_error(err)) + } + } + + fn inner_connect(&self, address: String) -> Result, RedisError> { + let client = redis::Client::open(address)?; + let runtime = + Builder::new_multi_thread() + .enable_all() + .thread_name("Babushka kotlin thread") + .build()?; + + let _runtime_handle = runtime.enter(); + + let connection = + runtime + .block_on(client.get_multiplexed_async_connection())?; + + Ok(Arc::new(BabushkaClientData { runtime : Mutex::new(runtime), connection : Mutex::new(connection)} )) + } + + pub fn set(&self, data: Arc, key: String, value: Option) -> Result<(), BabushkaRedisError> { + let res = data.runtime.lock().unwrap().block_on(async { + data.connection.lock().unwrap() + .set::, ()>(key, value).await + }); + match res { + Ok(_) => Ok(()), + Err(err) => Err(convert_to_babushka_error(err)) + } + } + + pub fn get(&self, data: Arc, key: String) -> Result, BabushkaRedisError> { + let res = data.runtime.lock().unwrap().block_on(async { + data.connection.lock().unwrap().get::>(key).await + }); + match res { + Ok(val) => Ok(val), + Err(err) => Err(convert_to_babushka_error(err)) + } + } +} diff --git a/kotlin/interop/uniffi-bindgen.rs b/kotlin/interop/uniffi-bindgen.rs new file mode 100644 index 0000000000..f6cff6cf1d --- /dev/null +++ b/kotlin/interop/uniffi-bindgen.rs @@ -0,0 +1,3 @@ +fn main() { + uniffi::uniffi_bindgen_main() +} diff --git a/kotlin/interop/uniffi.toml b/kotlin/interop/uniffi.toml new file mode 100644 index 0000000000..d64e720f92 --- /dev/null +++ b/kotlin/interop/uniffi.toml @@ -0,0 +1,12 @@ +[bindings.kotlin] +package_name = "babushka" +cdylib_name = "kotlinbabushka" + +[bindings.python] +cdylib_name = "kotlinbabushka" + +[bindings.ruby] +cdylib_name = "kotlinbabushka" + +[bindings.swift] +cdylib_name = "kotlinbabushka" diff --git a/kotlin/plugin/build.gradle.kts b/kotlin/plugin/build.gradle.kts new file mode 100644 index 0000000000..8f78983141 --- /dev/null +++ b/kotlin/plugin/build.gradle.kts @@ -0,0 +1,18 @@ +repositories { + mavenCentral() + gradlePluginPortal() +} + +plugins { + id("java-gradle-plugin") + `kotlin-dsl` +} + +gradlePlugin { + plugins { + create("uniFfiJvmBindings") { + id = "babushka.plugin.generate-jvm-bindings" + implementationClass = "babushka.UniFfiJvmPlugin" + } + } +} diff --git a/kotlin/plugin/src/main/kotlin/babushka/Enums.kt b/kotlin/plugin/src/main/kotlin/babushka/Enums.kt new file mode 100644 index 0000000000..a8a7a8e7c8 --- /dev/null +++ b/kotlin/plugin/src/main/kotlin/babushka/Enums.kt @@ -0,0 +1,16 @@ +package babushka + + +val operatingSystem: OS = when { + System.getProperty("os.name").contains("mac", ignoreCase = true) -> OS.MAC + System.getProperty("os.name").contains("linux", ignoreCase = true) -> OS.LINUX + System.getProperty("os.name").contains("windows", ignoreCase = true) -> OS.WINDOWS + else -> OS.OTHER +} + +enum class OS { + MAC, + LINUX, + WINDOWS, + OTHER, +} diff --git a/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt b/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt new file mode 100644 index 0000000000..ac9e96100d --- /dev/null +++ b/kotlin/plugin/src/main/kotlin/babushka/UniFfiJvmPlugin.kt @@ -0,0 +1,141 @@ +package babushka + +import org.gradle.api.DefaultTask +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.api.tasks.Exec +import org.gradle.kotlin.dsl.getValue +import org.gradle.kotlin.dsl.provideDelegate +import org.gradle.kotlin.dsl.register + +internal class UniFfiJvmPlugin : Plugin { + override fun apply(target: Project): Unit = target.run { +//* + // register a task called buildJvmBinaries which will run something like + // cargo build --release --target aarch64-apple-darwin + val buildJvmBinaries by tasks.register("buildJvmBinaries") { + if (operatingSystem == OS.MAC) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-apple-darwin") + args(cargoArgs) + } + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "aarch64-apple-darwin") + args(cargoArgs) + } + } else if (operatingSystem == OS.LINUX) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-unknown-linux-gnu") + args(cargoArgs) + } + } else if (operatingSystem == OS.WINDOWS) { + exec { + workingDir("$rootDir/interop") + executable("cargo") + val cargoArgs: List = listOf("build", "--profile", "release-smaller", "--target", "x86_64-pc-windows-msvc") + args(cargoArgs) + } + } + } + + // move the native libs build by cargo from target/.../release/ + // to their place in the jvm library + val moveNativeJvmLibs by tasks.register("moveNativeJvmLibs") { + + // dependsOn(buildJvmBinaryX86_64MacOS, buildJvmBinaryAarch64MacOS, buildJvmBinaryLinux) + dependsOn(buildJvmBinaries) + + data class CopyMetadata(val targetDir: String, val ext: String) + val libsToCopy: MutableList = mutableListOf() + var resDir = "" + + if (operatingSystem == OS.MAC) { + resDir = "darwin-aarch64" + libsToCopy.add( + CopyMetadata( + targetDir = "aarch64-apple-darwin", + ext = "dylib" + ) + ) + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-apple-darwin", + ext = "dylib" + ) + ) + } else if (operatingSystem == OS.LINUX) { + resDir = "linux-x86-64" + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-unknown-linux-gnu", + ext = "so" + ) + ) + } else if (operatingSystem == OS.WINDOWS) { + resDir = "win32-x86-64" + libsToCopy.add( + CopyMetadata( + targetDir = "x86_64-pc-windows-msvc", + ext = "dll" + ) + ) + } + val libName = when (operatingSystem) { + OS.WINDOWS -> "kotlinbabushka" + else -> "libkotlinbabushka" + } + + val destDir = "$rootDir/client/src/main/resources/${resDir}/" + mkdir(destDir) + + libsToCopy.forEach { + doFirst { + copy { + with(it) { + from("$rootDir/interop/target/${this.targetDir}/release-smaller/${libName}.${this.ext}") + into(destDir) + } + } + } + } + } + + // generate the bindings using the bindgen tool + val generateJvmBindings by tasks.register("generateJvmBindings") { + + dependsOn(moveNativeJvmLibs) + + workingDir("$rootDir/interop") + val cargoArgs: List = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/babushka.udl", + "--language", "kotlin", "--out-dir", "../client/src/main/kotlin", "--no-format") + + executable("cargo") + args(cargoArgs) + + doLast { + println("JVM bindings file successfully created") + } + } +//*/ + // we need an aggregate task which will run the 3 required tasks to build the JVM libs in order + // the task will also appear in the printout of the ./gradlew tasks task with a group and description + tasks.register("buildJvmLib") { + group = "babushka" + description = "Aggregate task to build JVM library" + + dependsOn( + //* + buildJvmBinaries, + moveNativeJvmLibs, + generateJvmBindings + //*/ + ) + } + } +} diff --git a/kotlin/settings.gradle.kts b/kotlin/settings.gradle.kts new file mode 100644 index 0000000000..bd7df3933a --- /dev/null +++ b/kotlin/settings.gradle.kts @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = "kotlinbabushka" + +include("client") +includeBuild("plugin") From e137673b8f3cffc3816e9ad3b549f6f4605a9268 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Thu, 26 Oct 2023 15:05:02 -0700 Subject: [PATCH 6/7] Minor fixes. Signed-off-by: Yury-Fridlyand --- .../main/java/javababushka/benchmarks/BenchmarkingApp.java | 1 + .../main/java/javababushka/benchmarks/babushka/JnaFfi.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java index 7f7937d110..e143f4b014 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java @@ -151,6 +151,7 @@ private static RunConfiguration verifyOptions(CommandLine line) throws ParseExce ClientName.JEDIS_ASYNC, ClientName.JNA_FFI, ClientName.JNI_FFI, + ClientName.KOTLIN, // ClientName.BABUSHKA_ASYNC, ClientName.LETTUCE, ClientName.LETTUCE_ASYNC); diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JnaFfi.java b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JnaFfi.java index fb9f55620b..68d1544f09 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JnaFfi.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/babushka/JnaFfi.java @@ -138,7 +138,9 @@ public String getName() { } @Override - public void set(String key, String value) {} + public void set(String key, String value) { + var res = lib.set0(ptr, key, value); + } @Override public String get(String key) { From 4ddebdbb913a0a2d5dbbae86623e473f3b19dc9c Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Thu, 26 Oct 2023 19:02:16 -0700 Subject: [PATCH 7/7] Update scripts and reporing. Signed-off-by: Yury-Fridlyand --- benchmarks/install_and_test.sh | 20 ++++++----- benchmarks/utilities/csv_exporter.py | 3 -- .../benchmarks/BenchmarkingApp.java | 2 +- .../benchmarks/utils/Benchmarking.java | 33 +++++++++++-------- .../benchmarks/utils/JsonWriter.java | 4 +-- .../benchmarks/jedis/JedisClientIT.java | 2 +- java/javababushka.hpp | 13 -------- 7 files changed, 35 insertions(+), 42 deletions(-) diff --git a/benchmarks/install_and_test.sh b/benchmarks/install_and_test.sh index 8c9a1ca67a..ee1cedbb51 100755 --- a/benchmarks/install_and_test.sh +++ b/benchmarks/install_and_test.sh @@ -26,9 +26,9 @@ runNode=0 runCsharp=0 runJava=0 runRust=0 -concurrentTasks="1 10 100 1000" -dataSize="100 4000" -clientCount="1" +concurrentTasks="10 100 1000" +dataSize="100" +clientCount="2" chosenClients="all" host="localhost" port=6379 @@ -71,18 +71,20 @@ function runCSharpBenchmark(){ } function runJavaBenchmark(){ + cd ${BENCH_FOLDER}/../kotlin + ./gradlew build cd ${BENCH_FOLDER}/../java - echo "./gradlew run --args=\"--resultsFile=${BENCH_FOLDER}/$1 --clients $chosenClients --host $host --port $port\"" -# ./gradlew run --args="--resultsFile=../$1 --dataSize $2 --concurrentTasks $concurrentTasks --clients $chosenClients --host $host --port $port --clientCount $clientCount $tlsFlag" - ./gradlew run --args="--resultsFile=${BENCH_FOLDER}/$1 --clients $chosenClients --host $host --port $port" - cd ${BENCH_FOLDER}/java + cargo build + # ./gradlew build + # echo ./gradlew :benchmarks:run --args="-resultsFile ${BENCH_FOLDER}/$1 -dataSize \"$2\" -concurrentTasks \"$concurrentTasks\" -clients \"$chosenClients\" -host $host -port $port -clientCount \"$clientCount\" $tlsFlag" + ./gradlew :benchmarks:run --args="-resultsFile ${BENCH_FOLDER}/$1 -dataSize \"$2\" -concurrentTasks \"$concurrentTasks\" -clients \"$chosenClients\" -host $host -port $port -clientCount \"$clientCount\" $tlsFlag" } function runRustBenchmark(){ rustConcurrentTasks= for value in $concurrentTasks do - rustConcurrentTasks=$rustConcurrentTasks" --concurrentTasks "$value + rustConcurrentTasks="$rustConcurrentTasks --concurrentTasks $value" done cd ${BENCH_FOLDER}/rust cargo run --release -- --resultsFile=../$1 --dataSize $2 $rustConcurrentTasks --host $host --clientCount $clientCount $tlsFlag $clusterFlag $portFlag @@ -198,7 +200,7 @@ do -java) runAllBenchmarks=0 runJava=1 - chosenClients="Babushka" + chosenClients="Lettuce,JNI_FFI,JNA_FFI,Kotlin" ;; -lettuce) runAllBenchmarks=0 diff --git a/benchmarks/utilities/csv_exporter.py b/benchmarks/utilities/csv_exporter.py index 3d48adfe17..292b86d13c 100644 --- a/benchmarks/utilities/csv_exporter.py +++ b/benchmarks/utilities/csv_exporter.py @@ -50,6 +50,3 @@ json_object["language"] = language values = [json_object[field] for field in base_fields] writer.writerow(values) - -for json_file_full_path in sys.argv[1:-1]: - os.remove(json_file_full_path) diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java index e143f4b014..bfaa63f8ec 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/BenchmarkingApp.java @@ -198,7 +198,7 @@ private static int[] parseIntListOption(String line) throws ParseException { lineValue = lineValue.substring(1, lineValue.length() - 1); } // check if it's the correct format - if (!lineValue.matches("\\d+(\\s+\\d+)?")) { + if (!lineValue.matches("\\d+(\\s+\\d+)*")) { throw new ParseException("Invalid option: " + line); } // split the string into a list of integers diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java index bdf9a579b3..d7abbd1d45 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/Benchmarking.java @@ -89,32 +89,38 @@ public static Map calculateResults( ChosenAction action = entry.getKey(); ArrayList latencies = entry.getValue(); - double avgLatency = latencies.stream().mapToLong(Long::longValue).sum() / latencies.size(); + double avgLatency = + latencies.stream().mapToLong(Long::longValue).sum() * 1e-6 / latencies.size(); Collections.sort(latencies); results.put( action, new LatencyResults( avgLatency, - percentile(latencies, 50), - percentile(latencies, 90), - percentile(latencies, 99), - stdDeviation(latencies, avgLatency))); + percentile(latencies, 50) * 1e-6, + percentile(latencies, 90) * 1e-6, + percentile(latencies, 99) * 1e-6, + stdDeviation(latencies, avgLatency) * 1e-6)); } return results; } - public static void printResults(Map resultsMap) { + public static void printResults( + Map resultsMap, double duration, int iterations) { + System.out.printf("Runtime s: %f%n", duration); + System.out.printf("Iterations: %d%n", iterations); + System.out.printf("TPS: %f%n", iterations / duration); for (Map.Entry entry : resultsMap.entrySet()) { ChosenAction action = entry.getKey(); LatencyResults results = entry.getValue(); - System.out.println("Avg. time in ms per " + action + ": " + results.avgLatency / 1000000); - System.out.println(action + " p50 latency in ms: " + results.p50Latency / 1000000); - System.out.println(action + " p90 latency in ms: " + results.p90Latency / 1000000); - System.out.println(action + " p99 latency in ms: " + results.p99Latency / 1000000); - System.out.println(action + " std dev in ms: " + results.stdDeviation / 1000000); + System.out.printf("===> %s <===%n", action); + System.out.printf("avg. time ms: %f%n", results.avgLatency); + System.out.printf("std dev ms: %f%n", results.stdDeviation); + System.out.printf("p50 latency ms: %f%n", results.p50Latency); + System.out.printf("p90 latency ms: %f%n", results.p90Latency); + System.out.printf("p99 latency ms: %f%n", results.p99Latency); } } @@ -188,6 +194,7 @@ public static void testClientSetGet( e.printStackTrace(); } }); + long ended = System.nanoTime(); var calculatedResults = calculateResults(actionResults); if (config.resultsFile.isPresent()) { @@ -198,9 +205,9 @@ public static void testClientSetGet( clientCreator.get().getName(), clientCount, concurrentNum, - iterationCounter.get() * 1e9 / (System.nanoTime() - started)); + iterationCounter.get() * 1e9 / (ended - started)); } - printResults(calculatedResults); + printResults(calculatedResults, (ended - started) / 1e9, iterationCounter.get()); } } } diff --git a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java index 064148de51..0304eecbd5 100644 --- a/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java +++ b/java/benchmarks/src/main/java/javababushka/benchmarks/utils/JsonWriter.java @@ -38,7 +38,7 @@ public static void Write( // TODO: is_cluster .data_size(dataSize) .client(client) - .client_count(clientCount) + .clientCount(clientCount) .num_of_tasks(numOfTasks) .tps(tps) .get_existing_average_latency( @@ -79,7 +79,7 @@ public static void Write( @Builder public static class Measurements { private String client; - private int client_count; + private int clientCount; private int data_size; private double get_existing_average_latency; private double get_existing_p50_latency; diff --git a/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java b/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java index 12f800260f..2b3e9bb659 100644 --- a/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java +++ b/java/benchmarks/src/test/java/javababushka/benchmarks/jedis/JedisClientIT.java @@ -66,6 +66,6 @@ public void testResourceSetGet() { latencies.get(latency.getKey()).add(latency.getValue()); } - Benchmarking.printResults(Benchmarking.calculateResults(latencies)); + Benchmarking.printResults(Benchmarking.calculateResults(latencies), 0, iterations); } } diff --git a/java/javababushka.hpp b/java/javababushka.hpp index 2108535e3b..f6a62857c5 100644 --- a/java/javababushka.hpp +++ b/java/javababushka.hpp @@ -4,9 +4,6 @@ #include #include -template -struct Option; - struct BabushkaResultStr { const char *error; const char *result; @@ -19,12 +16,6 @@ struct BabushkaResult { int64_t num; }; -struct BabushkaClient { - Option> runtime; - Option> connection; - int32_t data; -}; - extern "C" { BabushkaResultStr static_function_which_throws(); @@ -53,8 +44,4 @@ BabushkaResult set0(uint64_t ptr, const char *key, const char *value); BabushkaResult get0(uint64_t ptr, const char *key); -BabushkaResult set(BabushkaClient *self, const char *key, const char *value); - -BabushkaResult get(BabushkaClient *self, const char *key); - } // extern "C"