arr_len = ret_arr_len
assert(ty_info.c_ty == "jbyteArray")
if ty_info.rust_obj is not None:
- arg_conv = ty_info.rust_obj + " " + arr_name + "_ref;\n" + "(*_env)->GetByteArrayRegion (_env, """ + arr_name + ", 0, " + arr_len + ", " + arr_name + "_ref.data);"
+ arg_conv = ty_info.rust_obj + " " + arr_name + "_ref;\n" + "(*_env)->GetByteArrayRegion (_env, " + arr_name + ", 0, " + arr_len + ", " + arr_name + "_ref.data);"
arr_access = ("", ".data")
else:
- arg_conv = "unsigned char " + arr_name + "_arr[" + arr_len + "];\n" + "(*_env)->GetByteArrayRegion (_env, """ + arr_name + ", 0, " + arr_len + ", " + arr_name + "_arr);\n" + "unsigned char (*""" + arr_name + "_ref)[" + arr_len + "] = &" + arr_name + "_arr;"
+ arg_conv = "unsigned char " + arr_name + "_arr[" + arr_len + "];\n" + "(*_env)->GetByteArrayRegion (_env, " + arr_name + ", 0, " + arr_len + ", " + arr_name + "_arr);\n" + "unsigned char (*" + arr_name + "_ref)[" + arr_len + "] = &" + arr_name + "_arr;"
arr_access = ("*", "")
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
arg_conv = arg_conv,
# If we have a parameter name, print it (noting that it may indicate its a pointer)
if ty_info.rust_obj is not None:
assert(ty_info.passed_as_ptr)
+ opaque_arg_conv = ty_info.rust_obj + " " + ty_info.var_name + "_conv;\n"
+ opaque_arg_conv = opaque_arg_conv + ty_info.var_name + "_conv.inner = (void*)(" + ty_info.var_name + " & (~1));\n"
+ opaque_arg_conv = opaque_arg_conv + ty_info.var_name + "_conv.is_owned = (" + ty_info.var_name + " & 1) || (" + ty_info.var_name + " == 0);"
if not ty_info.is_ptr:
if ty_info.rust_obj in unitary_enums:
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
arg_conv_name = ty_info.var_name + "_conv",
ret_conv = ("jclass " + ty_info.var_name + "_conv = " + ty_info.rust_obj + "_to_java(_env, ", ");"),
ret_conv_name = ty_info.var_name + "_conv")
+ if ty_info.rust_obj in opaque_structs:
+ ret_conv_suf = ";\nDO_ASSERT((((long)" + ty_info.var_name + "_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.\n"
+ ret_conv_suf = ret_conv_suf + "DO_ASSERT((((long)&" + ty_info.var_name + "_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.\n"
+ ret_conv_suf = ret_conv_suf + "long " + ty_info.var_name + "_ref;\n"
+ ret_conv_suf = ret_conv_suf + "if (" + ty_info.var_name + "_var.is_owned) {\n"
+ ret_conv_suf = ret_conv_suf + "\t" + ty_info.var_name + "_ref = (long)" + ty_info.var_name + "_var.inner | 1;\n"
+ ret_conv_suf = ret_conv_suf + "} else {\n"
+ ret_conv_suf = ret_conv_suf + "\t" + ty_info.var_name + "_ref = (long)&" + ty_info.var_name + "_var;\n"
+ ret_conv_suf = ret_conv_suf + "}"
+ return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
+ arg_conv = opaque_arg_conv, arg_conv_name = ty_info.var_name + "_conv",
+ ret_conv = (ty_info.rust_obj + " " + ty_info.var_name + "_var = ", ret_conv_suf),
+ ret_conv_name = ty_info.var_name + "_ref")
base_conv = ty_info.rust_obj + " " + ty_info.var_name + "_conv = *(" + ty_info.rust_obj + "*)" + ty_info.var_name + ";";
if ty_info.rust_obj in trait_structs:
if not is_free:
arg_conv_name = ty_info.var_name + "_conv",
ret_conv = ("CANT PASS TRAIT TO Java?", ""), ret_conv_name = "NO CONV POSSIBLE")
if ty_info.rust_obj != "LDKu8slice":
- # Don't bother free'ing slices passed in - we often pass them Rust -> Rust
+ # Don't bother free'ing slices passed in - Rust doesn't auto-free the
+ # underlying unlike Vecs, and it gives Java more freedom.
base_conv = base_conv + "\nFREE((void*)" + ty_info.var_name + ");";
- if ty_info.rust_obj in opaque_structs:
- return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
- arg_conv = base_conv + "\n" + ty_info.var_name + "_conv.is_owned = true;",
- arg_conv_name = ty_info.var_name + "_conv",
- ret_conv = ("long " + ty_info.var_name + "_ref = (long)&", ";"), ret_conv_name = ty_info.var_name + "_ref")
-
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
arg_conv = base_conv, arg_conv_name = ty_info.var_name + "_conv",
ret_conv = ("long " + ty_info.var_name + "_ref = (long)&", ";"), ret_conv_name = ty_info.var_name + "_ref")
else:
assert(not is_free)
+ if ty_info.rust_obj in opaque_structs:
+ return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
+ arg_conv = opaque_arg_conv, arg_conv_name = "&" + ty_info.var_name + "_conv",
+ ret_conv = None, ret_conv_name = None) # its a pointer, no conv needed
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
arg_conv = ty_info.rust_obj + "* " + ty_info.var_name + "_conv = (" + ty_info.rust_obj + "*)" + ty_info.var_name + ";",
arg_conv_name = ty_info.var_name + "_conv",
# any _free function.
# To avoid any issues, we first assert that the incoming object is non-ref.
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
- ret_conv = (ty_info.rust_obj + "* ret = MALLOC(sizeof(" + ty_info.rust_obj + "), \"" + ty_info.rust_obj + "\");\n*ret = ", ";\nDO_ASSERT(ret->is_owned);\nret->is_owned = false;"),
- ret_conv_name = "(long)ret",
+ ret_conv = (ty_info.rust_obj + " ret = ", ";\nDO_ASSERT(ret.is_owned);"),
+ ret_conv_name = "((long)ret.inner) | 1",
arg_conv = None, arg_conv_name = None)
else:
return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name,
if field_map.ret_conv is not None:
out_c.write("\t\t\t" + field_map.ret_conv[0].replace("\n", "\n\t\t\t").replace("_env", "env"))
out_c.write("obj->" + camel_to_snake(var_name) + "." + field_map.arg_name)
- out_c.write(field_map.ret_conv[1] + "\n")
+ out_c.write(field_map.ret_conv[1].replace("\n", "\n\t\t\t") + "\n")
c_params_text = c_params_text + ", " + field_map.ret_conv_name
else:
c_params_text = c_params_text + ", obj->" + camel_to_snake(var_name) + "." + field_map.arg_name
out_c.write("\t\tdefault: abort();\n")
out_c.write("\t}\n}\n")
-
def map_trait(struct_name, field_var_lines, trait_fn_lines):
out_c.write("typedef struct " + struct_name + "_JCalls {\n")
out_c.write("\tatomic_size_t refcnt;\n")
out_c.write(", " + arg_info.arg_name)
out_c.write(");\n");
if ret_ty_info.c_ty.endswith("Array"):
- out_c.write("\tLDKThirtyTwoBytes ret;\n")
+ out_c.write("\t" + ret_ty_info.rust_obj + " ret;\n")
out_c.write("\t(*env)->GetByteArrayRegion(env, jret, 0, " + ret_ty_info.arr_len + ", ret.data);\n")
out_c.write("\treturn ret;\n")
out_c.write("""#include <assert.h>
#define DO_ASSERT(a) do { bool _assert_val = (a); assert(_assert_val); } while(0)
+// Running a leak check across all the allocations and frees of the JDK is a mess,
+// so instead we implement our own naive leak checker here, relying on the -wrap
+// linker option to wrap malloc/calloc/realloc/free, tracking everyhing allocated
+// and free'd in Rust or C across the generated bindings shared library.
#include <threads.h>
+#include <execinfo.h>
+#include <unistd.h>
static mtx_t allocation_mtx;
void __attribute__((constructor)) init_mtx() {
DO_ASSERT(mtx_init(&allocation_mtx, mtx_plain) == thrd_success);
}
+#define BT_MAX 128
typedef struct allocation {
struct allocation* next;
void* ptr;
const char* struct_name;
+ void* bt[BT_MAX];
+ int bt_len;
} allocation;
static allocation* allocation_ll = NULL;
-static void* MALLOC(size_t len, const char* struct_name) {
- void* res = malloc(len);
- allocation* new_alloc = malloc(sizeof(allocation));
+void* __real_malloc(size_t len);
+void* __real_calloc(size_t nmemb, size_t len);
+static void new_allocation(void* res, const char* struct_name) {
+ allocation* new_alloc = __real_malloc(sizeof(allocation));
new_alloc->ptr = res;
new_alloc->struct_name = struct_name;
+ new_alloc->bt_len = backtrace(new_alloc->bt, BT_MAX);
DO_ASSERT(mtx_lock(&allocation_mtx) == thrd_success);
new_alloc->next = allocation_ll;
allocation_ll = new_alloc;
DO_ASSERT(mtx_unlock(&allocation_mtx) == thrd_success);
+}
+static void* MALLOC(size_t len, const char* struct_name) {
+ void* res = __real_malloc(len);
+ new_allocation(res, struct_name);
return res;
}
-
-static void FREE(void* ptr) {
+void __real_free(void* ptr);
+static void alloc_freed(void* ptr) {
allocation* p = NULL;
DO_ASSERT(mtx_lock(&allocation_mtx) == thrd_success);
allocation* it = allocation_ll;
if (p) { p->next = it->next; } else { allocation_ll = it->next; }
DO_ASSERT(mtx_unlock(&allocation_mtx) == thrd_success);
DO_ASSERT(it->ptr == ptr);
- free(it);
- free(ptr);
+ __real_free(it);
+}
+static void FREE(void* ptr) {
+ alloc_freed(ptr);
+ __real_free(ptr);
+}
+
+void* __wrap_malloc(size_t len) {
+ void* res = __real_malloc(len);
+ new_allocation(res, "malloc call");
+ return res;
+}
+void* __wrap_calloc(size_t nmemb, size_t len) {
+ void* res = __real_calloc(nmemb, len);
+ new_allocation(res, "calloc call");
+ return res;
+}
+void __wrap_free(void* ptr) {
+ alloc_freed(ptr);
+ __real_free(ptr);
+}
+
+void* __real_realloc(void* ptr, size_t newlen);
+void* __wrap_realloc(void* ptr, size_t len) {
+ alloc_freed(ptr);
+ void* res = __real_realloc(ptr, len);
+ new_allocation(res, "realloc call");
+ return res;
+}
+void __wrap_reallocarray(void* ptr, size_t new_sz) {
+ // Rust doesn't seem to use reallocarray currently
+ assert(false);
}
void __attribute__((destructor)) check_leaks() {
- for (allocation* a = allocation_ll; a != NULL; a = a->next) { fprintf(stderr, "%s %p remains\\n", a->struct_name, a->ptr); }
+ for (allocation* a = allocation_ll; a != NULL; a = a->next) {
+ fprintf(stderr, "%s %p remains:\\n", a->struct_name, a->ptr);
+ backtrace_symbols_fd(a->bt, a->bt_len, STDERR_FILENO);
+ fprintf(stderr, "\\n\\n");
+ }
DO_ASSERT(allocation_ll == NULL);
}
""")
public static native byte[] read_bytes(long ptr, long len);
public static native byte[] get_u8_slice_bytes(long slice_ptr);
public static native long bytes_to_u8_vec(byte[] bytes);
+ public static native long new_txpointer_copy_data(byte[] txdata);
public static native long vec_slice_len(long vec);
public static native long new_empty_slice_vec();
JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_bytes_1to_1u8_1vec (JNIEnv * _env, jclass _b, jbyteArray bytes) {
LDKCVec_u8Z *vec = (LDKCVec_u8Z*)MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8");
vec->datalen = (*_env)->GetArrayLength(_env, bytes);
- vec->data = (uint8_t*)malloc(vec->datalen); // May be freed by rust, so don't track allocation
+ vec->data = (uint8_t*)MALLOC(vec->datalen, "LDKCVec_u8Z Bytes");
(*_env)->GetByteArrayRegion (_env, bytes, 0, vec->datalen, vec->data);
return (long)vec;
}
+JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_new_1txpointer_1copy_1data (JNIEnv * env, jclass _b, jbyteArray bytes) {
+ LDKTransaction *txdata = (LDKTransaction*)MALLOC(sizeof(LDKTransaction), "LDKTransaction");
+ txdata->datalen = (*env)->GetArrayLength(env, bytes);
+ txdata->data = (uint8_t*)MALLOC(txdata->datalen, "Tx Data Bytes");
+ txdata->data_is_owned = true;
+ (*env)->GetByteArrayRegion (env, bytes, 0, txdata->datalen, txdata->data);
+ return (long)txdata;
+}
JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_vec_1slice_1len (JNIEnv * env, jclass _a, jlong ptr) {
// Check offsets of a few Vec types are all consistent as we're meant to be generic across types
_Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKCVec_SignatureZ, datalen), "Vec<*> needs to be mapped identically");
union_enum_items = {}
for line in in_h:
if in_block_comment:
- #out_java.write("\t" + line)
if line.endswith("*/\n"):
in_block_comment = False
elif cur_block_obj is not None:
is_unitary_enum = False
is_union_enum = False
is_union = False
+ is_tuple = False
trait_fn_lines = []
field_var_lines = []
in_block_comment = False
else:
struct_name_match = struct_name_regex.match(struct_line)
- vec_ty_match = line_indicates_vec_regex.match(struct_line)
if struct_name_match is not None:
struct_name = struct_name_match.group(3)
if struct_name_match.group(1) == "enum":
is_opaque = True
elif line_indicates_result_regex.match(struct_line):
is_result = True
- elif vec_ty_match is not None and struct_name.startswith("LDKCVecTempl_"):
+ vec_ty_match = line_indicates_vec_regex.match(struct_line)
+ if vec_ty_match is not None and struct_name.startswith("LDKCVecTempl_"):
vec_ty = vec_ty_match.group(1)
+ elif struct_name.startswith("LDKC2TupleTempl_") or struct_name.startswith("LDKC3TupleTempl_"):
+ is_tuple = True
trait_fn_match = line_indicates_trait_regex.match(struct_line)
if trait_fn_match is not None:
trait_fn_lines.append(trait_fn_match)
if is_opaque:
opaque_structs.add(struct_name)
- out_java.write("\tpublic static native long " + struct_name + "_optional_none();\n")
- out_c.write("JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1optional_1none (JNIEnv * env, jclass _a) {\n")
- out_c.write("\t" + struct_name + " *ret = MALLOC(sizeof(" + struct_name + "), \"" + struct_name + "\");\n")
- out_c.write("\tret->inner = NULL;\n")
- out_c.write("\treturn (long)ret;\n")
- out_c.write("}\n")
elif is_result:
result_templ_structs.add(struct_name)
+ elif is_tuple:
+ out_java.write("\tpublic static native long " + struct_name + "_new(")
+ out_c.write("JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1new(JNIEnv *_env, jclass _b")
+ for idx, line in enumerate(field_lines):
+ if idx != 0 and idx < len(field_lines) - 2:
+ ty_info = java_c_types(line.strip(';'), None)
+ if idx != 1:
+ out_java.write(", ")
+ e = chr(ord('a') + idx - 1)
+ out_java.write(ty_info.java_ty + " " + e)
+ out_c.write(", " + ty_info.c_ty + " " + e)
+ out_java.write(");\n")
+ out_c.write(") {\n")
+ out_c.write("\t" + struct_name + "* ret = MALLOC(sizeof(" + struct_name + "), \"" + struct_name + "\");\n")
+ for idx, line in enumerate(field_lines):
+ if idx != 0 and idx < len(field_lines) - 2:
+ ty_info = map_type(line.strip(';'), False, None, False)
+ e = chr(ord('a') + idx - 1)
+ if ty_info.arg_conv is not None:
+ out_c.write("\t" + ty_info.arg_conv.replace("\n", "\n\t"))
+ out_c.write("\n\tret->" + e + " = " + ty_info.arg_conv_name + ";\n")
+ else:
+ out_c.write("\tret->" + e + " = " + e + ";\n")
+ out_c.write("\treturn (long)ret;\n")
+ out_c.write("}\n")
elif vec_ty is not None:
- out_java.write("\tpublic static native VecOrSliceDef " + struct_name + "_arr_info(long vec_ptr);\n")
- out_c.write("JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {\n")
+ if vec_ty in opaque_structs:
+ out_java.write("\tpublic static native long[] " + struct_name + "_arr_info(long vec_ptr);\n")
+ out_c.write("JNIEXPORT jlongArray JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {\n")
+ else:
+ out_java.write("\tpublic static native VecOrSliceDef " + struct_name + "_arr_info(long vec_ptr);\n")
+ out_c.write("JNIEXPORT jobject JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1arr_1info(JNIEnv *env, jclass _b, jlong ptr) {\n")
out_c.write("\t" + struct_name + " *vec = (" + struct_name + "*)ptr;\n")
- out_c.write("\treturn (*env)->NewObject(env, slicedef_cls, slicedef_meth, (long)vec->data, (long)vec->datalen, sizeof(" + vec_ty + "));\n")
+ if vec_ty in opaque_structs:
+ out_c.write("\tjlongArray ret = (*env)->NewLongArray(env, vec->datalen);\n")
+ out_c.write("\tjlong *ret_elems = (*env)->GetPrimitiveArrayCritical(env, ret, NULL);\n")
+ out_c.write("\tfor (size_t i = 0; i < vec->datalen; i++) {\n")
+ out_c.write("\t\tDO_ASSERT((((long)vec->data[i].inner) & 1) == 0);\n")
+ out_c.write("\t\tret_elems[i] = (long)vec->data[i].inner | (vec->data[i].is_owned ? 1 : 0);\n")
+ out_c.write("\t}\n")
+ out_c.write("\t(*env)->ReleasePrimitiveArrayCritical(env, ret, ret_elems, 0);\n")
+ out_c.write("\treturn ret;\n")
+ else:
+ out_c.write("\treturn (*env)->NewObject(env, slicedef_cls, slicedef_meth, (long)vec->data, (long)vec->datalen, sizeof(" + vec_ty + "));\n")
+ out_c.write("}\n")
+
+ ty_info = map_type(vec_ty + " arr_elem", False, None, False)
+ out_java.write("\tpublic static native long " + struct_name + "_new(" + ty_info.java_ty + "[] elems);\n")
+ out_c.write("JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1new(JNIEnv *env, jclass _b, j" + ty_info.java_ty + "Array elems){\n")
+ out_c.write("\t" + struct_name + " *ret = MALLOC(sizeof(" + struct_name + "), \"" + struct_name + "\");\n")
+ out_c.write("\tret->datalen = (*env)->GetArrayLength(env, elems);\n")
+ out_c.write("\tif (ret->datalen == 0) {\n")
+ out_c.write("\t\tret->data = NULL;\n")
+ out_c.write("\t} else {\n")
+ out_c.write("\t\tret->data = MALLOC(sizeof(" + vec_ty + ") * ret->datalen, \"" + struct_name + " Data\");\n")
+ assert len(ty_info.java_fn_ty_arg) == 1 # ie we're a primitive of some form
+ out_c.write("\t\t" + ty_info.c_ty + " *java_elems = (*env)->GetPrimitiveArrayCritical(env, elems, NULL);\n")
+ out_c.write("\t\tfor (size_t i = 0; i < ret->datalen; i++) {\n")
+ if ty_info.arg_conv is not None:
+ out_c.write("\t\t\t" + ty_info.c_ty + " arr_elem = java_elems[i];\n")
+ out_c.write("\t\t\t" + ty_info.arg_conv.replace("\n", "\n\t\t\t") + "\n")
+ out_c.write("\t\t\tret->data[i] = " + ty_info.arg_conv_name + ";\n")
+ else:
+ out_c.write("\t\t\tret->data[i] = java_elems[i];\n")
+ out_c.write("\t\t}\n")
+ out_c.write("\t\t(*env)->ReleasePrimitiveArrayCritical(env, elems, java_elems, 0);\n")
+ out_c.write("\t}\n")
+ out_c.write("\treturn (long)ret;\n")
out_c.write("}\n")
elif is_union_enum:
assert(struct_name.endswith("_Tag"))