X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=genbindings.py;h=441c045e738142a225956d959fbb244b563d2381;hb=eaa3207af2c2e5aadf8b94cef4bb4ce2b6c722ec;hp=838bd2710a9c98448f6afb8b529f441009dcdc9e;hpb=fb5b87c5bee0e32fe4997dc11d4c2d7314f40f05;p=ldk-java diff --git a/genbindings.py b/genbindings.py index 838bd271..441c045e 100755 --- a/genbindings.py +++ b/genbindings.py @@ -1,8 +1,9 @@ #!/usr/bin/env python3 import sys, re -if len(sys.argv) != 4: - print("USAGE: /path/to/lightning.h /path/to/bindings/output.java /path/to/bindings/output.c") +if len(sys.argv) != 5: + print("USAGE: /path/to/lightning.h /path/to/bindings/output.java /path/to/bindings/output.c debug") + print("debug should be true or false and indicates whether to track allocations and ensure we don't leak") sys.exit(1) class TypeInfo: @@ -45,6 +46,7 @@ class ConvInfo: with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.argv[3], "w") as out_c: opaque_structs = set() trait_structs = set() + unitary_enums = set() var_is_arr_regex = re.compile("\(\*([A-za-z_]*)\)\[([0-9]*)\]") var_ty_regex = re.compile("([A-za-z_0-9]*)(.*)") @@ -85,11 +87,14 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg c_ty = "jint" fn_ty_arg = "I" fn_arg = fn_arg[8:].strip() - elif fn_arg.startswith("uint64_t"): + elif fn_arg.startswith("uint64_t") or fn_arg.startswith("uintptr_t"): java_ty = "long" c_ty = "jlong" fn_ty_arg = "J" - fn_arg = fn_arg[8:].strip() + if fn_arg.startswith("uint64_t"): + fn_arg = fn_arg[8:].strip() + else: + fn_arg = fn_arg[9:].strip() elif is_const and fn_arg.startswith("char *"): java_ty = "String" c_ty = "const char*" @@ -97,12 +102,20 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg fn_arg = fn_arg[6:].strip() else: ma = var_ty_regex.match(fn_arg) - java_ty = "long" - c_ty = "jlong" - fn_ty_arg = "J" - fn_arg = ma.group(2).strip() - rust_obj = ma.group(1).strip() - take_by_ptr = True + if ma.group(1).strip() in unitary_enums: + java_ty = ma.group(1).strip() + c_ty = "jclass" + fn_ty_arg = "Lorg/ldk/impl/bindings$" + ma.group(1).strip() + ";" + fn_arg = ma.group(2).strip() + rust_obj = ma.group(1).strip() + take_by_ptr = True + else: + java_ty = "long" + c_ty = "jlong" + fn_ty_arg = "J" + fn_arg = ma.group(2).strip() + rust_obj = ma.group(1).strip() + take_by_ptr = True if fn_arg.startswith(" *") or fn_arg.startswith("*"): fn_arg = fn_arg.replace("*", "").strip() @@ -152,18 +165,28 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg if ty_info.rust_obj is not None: assert(ty_info.passed_as_ptr) 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 = ty_info.rust_obj + " " + ty_info.var_name + "_conv = " + ty_info.rust_obj + "_from_java(_env, " + 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") + 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: - base_conv = ty_info.rust_obj + " *" + ty_info.var_name + "_conv = (" + ty_info.rust_obj + "*)" + ty_info.var_name + ";" if not is_free: - base_conv = base_conv + "\n" + ty_info.rust_obj + "_JCalls_clone(" + ty_info.var_name + "_conv->this_arg);" + base_conv = base_conv + "\nif (" + ty_info.var_name + "_conv.free == " + ty_info.rust_obj + "_JCalls_free) {\n" + base_conv = base_conv + "\t// If this_arg is a JCalls struct, then we need to increment the refcnt in it.\n" + base_conv = base_conv + "\t" + ty_info.rust_obj + "_JCalls_clone(" + ty_info.var_name + "_conv.this_arg);\n}" + else: + base_conv = base_conv + "\n" + "FREE((void*)" + ty_info.var_name + ");" return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name, arg_conv = base_conv, - arg_conv_name = "*" + ty_info.var_name + "_conv", + arg_conv_name = ty_info.var_name + "_conv", ret_conv = None, ret_conv_name = None) - base_conv = ty_info.rust_obj + " " + ty_info.var_name + "_conv = *(" + ty_info.rust_obj + "*)" + ty_info.var_name + ";\nfree((void*)" + ty_info.var_name + ");"; + 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._underlying_ref = false;", + arg_conv = base_conv + "\n" + ty_info.var_name + "_conv.is_owned = true;", arg_conv_name = ty_info.var_name + "_conv", ret_conv = None, ret_conv_name = None) @@ -191,7 +214,7 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg if ty_info.rust_obj is not None: assert(not is_free or ty_info.rust_obj not in opaque_structs); return ConvInfo(ty_info = ty_info, arg_name = ty_info.var_name, - arg_conv = ty_info.rust_obj + " arg_conv = *(" + ty_info.rust_obj + "*)arg;\nfree((void*)arg);", + arg_conv = ty_info.rust_obj + " arg_conv = *(" + ty_info.rust_obj + "*)arg;\nFREE((void*)arg);", arg_conv_name = "arg_conv", ret_conv = None, ret_conv_name = None) else: @@ -202,18 +225,23 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg # We don't have a parameter name, and don't want one (cause we're returning) if ty_info.rust_obj is not None: 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 = ty_info.rust_obj + " ret = " + ty_info.rust_obj + "_from_java(_env, " + ty_info.var_name + ");", + arg_conv_name = "ret", + ret_conv = ("jclass ret = " + ty_info.rust_obj + "_to_java(_env, ", ");"), ret_conv_name = "ret") if ty_info.rust_obj in opaque_structs: # If we're returning a newly-allocated struct, we don't want Rust to ever # free, instead relying on the Java GC to lose the ref. We undo this in # 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 + "));\n*ret = ", ";\nassert(!ret->_underlying_ref);\nret->_underlying_ref = true;"), + ret_conv = (ty_info.rust_obj + "* ret = MALLOC(sizeof(" + ty_info.rust_obj + "), \"" + ty_info.rust_obj + "\");\n*ret = ", ";\nassert(ret->is_owned);\nret->is_owned = false;"), ret_conv_name = "(long)ret", arg_conv = None, arg_conv_name = None) else: 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 + "));\n*ret = ", ";"), + ret_conv = (ty_info.rust_obj + "* ret = MALLOC(sizeof(" + ty_info.rust_obj + "), \"" + ty_info.rust_obj + "\");\n*ret = ", ";"), ret_conv_name = "(long)ret", arg_conv = None, arg_conv_name = None) else: @@ -275,11 +303,157 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg out_c.write(";") out_c.write("\n}\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("\tJNIEnv *env;\n") + out_c.write("\tjobject o;\n") + for var_line in field_var_lines: + if var_line.group(1) in trait_structs: + out_c.write("\t" + var_line.group(1) + "_JCalls* " + var_line.group(2) + ";\n") + for fn_line in trait_fn_lines: + if fn_line.group(2) != "free" and fn_line.group(2) != "clone": + out_c.write("\tjmethodID " + fn_line.group(2) + "_meth;\n") + out_c.write("} " + struct_name + "_JCalls;\n") + + out_java.write("\tpublic interface " + struct_name + " {\n") + java_meths = [] + for fn_line in trait_fn_lines: + java_meth_descr = "(" + if fn_line.group(2) != "free" and fn_line.group(2) != "clone": + ret_ty_info = java_c_types(fn_line.group(1), None) + + out_java.write("\t\t " + ret_ty_info.java_ty + " " + fn_line.group(2) + "(") + is_const = fn_line.group(3) is not None + out_c.write(fn_line.group(1) + fn_line.group(2) + "_jcall(") + if is_const: + out_c.write("const void* this_arg") + else: + out_c.write("void* this_arg") + + arg_names = [] + for idx, arg in enumerate(fn_line.group(4).split(',')): + if arg == "": + continue + if idx >= 2: + out_java.write(", ") + out_c.write(", ") + arg_conv_info = map_type(arg, True, None, False) + out_c.write(arg.strip()) + out_java.write(arg_conv_info.java_ty + " " + arg_conv_info.arg_name) + arg_names.append(arg_conv_info) + java_meth_descr = java_meth_descr + arg_conv_info.java_fn_ty_arg + java_meth_descr = java_meth_descr + ")" + ret_ty_info.java_fn_ty_arg + java_meths.append(java_meth_descr) + + out_java.write(");\n") + out_c.write(") {\n") + out_c.write("\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n") + + for arg_info in arg_names: + if arg_info.ret_conv is not None: + out_c.write("\t" + arg_info.ret_conv[0].replace('\n', '\n\t').replace("_env", "j_calls->env")); + out_c.write(arg_info.arg_name) + out_c.write(arg_info.ret_conv[1].replace('\n', '\n\t').replace("_env", "j_calls->env") + "\n") + + if not ret_ty_info.passed_as_ptr: + out_c.write("\treturn (*j_calls->env)->Call" + ret_ty_info.java_ty.title() + "Method(j_calls->env, j_calls->o, j_calls->" + fn_line.group(2) + "_meth") + else: + out_c.write("\t" + fn_line.group(1).strip() + "* ret = (" + fn_line.group(1).strip() + "*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->" + fn_line.group(2) + "_meth"); + + for arg_info in arg_names: + if arg_info.ret_conv is not None: + out_c.write(", " + arg_info.ret_conv_name) + else: + out_c.write(", " + arg_info.arg_name) + out_c.write(");\n"); + + if ret_ty_info.passed_as_ptr: + out_c.write("\t" + fn_line.group(1).strip() + " res = *ret;\n") + out_c.write("\tFREE(ret);\n") + out_c.write("\treturn res;\n") + out_c.write("}\n") + elif fn_line.group(2) == "free": + out_c.write("static void " + struct_name + "_JCalls_free(void* this_arg) {\n") + out_c.write("\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n") + out_c.write("\tif (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {\n") + out_c.write("\t\t(*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o);\n") + out_c.write("\t\tFREE(j_calls);\n") + out_c.write("\t}\n}\n") + + # Write out a clone function whether we need one or not, as we use them in moving to rust + out_c.write("static void* " + struct_name + "_JCalls_clone(const void* this_arg) {\n") + out_c.write("\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n") + out_c.write("\tatomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);\n") + for var_line in field_var_lines: + if var_line.group(1) in trait_structs: + out_c.write("\tatomic_fetch_add_explicit(&j_calls->" + var_line.group(2) + "->refcnt, 1, memory_order_release);\n") + out_c.write("\treturn (void*) this_arg;\n") + out_c.write("}\n") + + out_java.write("\t}\n") + + out_java.write("\tpublic static native long " + struct_name + "_new(" + struct_name + " impl") + out_c.write("static inline " + struct_name + " " + struct_name + "_init (JNIEnv * env, jclass _a, jobject o") + for var_line in field_var_lines: + if var_line.group(1) in trait_structs: + out_java.write(", " + var_line.group(1) + " " + var_line.group(2)) + out_c.write(", jobject " + var_line.group(2)) + out_java.write(");\n") + out_c.write(") {\n") + + out_c.write("\tjclass c = (*env)->GetObjectClass(env, o);\n") + out_c.write("\tassert(c != NULL);\n") + out_c.write("\t" + struct_name + "_JCalls *calls = MALLOC(sizeof(" + struct_name + "_JCalls), \"" + struct_name + "_JCalls\");\n") + out_c.write("\tatomic_init(&calls->refcnt, 1);\n") + out_c.write("\tcalls->env = env;\n") + out_c.write("\tcalls->o = (*env)->NewGlobalRef(env, o);\n") + for (fn_line, java_meth_descr) in zip(trait_fn_lines, java_meths): + if fn_line.group(2) != "free" and fn_line.group(2) != "clone": + out_c.write("\tcalls->" + fn_line.group(2) + "_meth = (*env)->GetMethodID(env, c, \"" + fn_line.group(2) + "\", \"" + java_meth_descr + "\");\n") + out_c.write("\tassert(calls->" + fn_line.group(2) + "_meth != NULL);\n") + out_c.write("\n\t" + struct_name + " ret = {\n") + out_c.write("\t\t.this_arg = (void*) calls,\n") + for fn_line in trait_fn_lines: + if fn_line.group(2) != "free" and fn_line.group(2) != "clone": + out_c.write("\t\t." + fn_line.group(2) + " = " + fn_line.group(2) + "_jcall,\n") + elif fn_line.group(2) == "free": + out_c.write("\t\t.free = " + struct_name + "_JCalls_free,\n") + else: + out_c.write("\t\t.clone = " + struct_name + "_JCalls_clone,\n") + for var_line in field_var_lines: + if var_line.group(1) in trait_structs: + out_c.write("\t\t." + var_line.group(2) + " = " + var_line.group(1) + "_init(env, _a, " + var_line.group(2) + "),\n") + out_c.write("\t};\n") + for var_line in field_var_lines: + if var_line.group(1) in trait_structs: + out_c.write("\tcalls->" + var_line.group(2) + " = ret." + var_line.group(2) + ".this_arg;\n") + out_c.write("\treturn ret;\n") + out_c.write("}\n") + + out_c.write("JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1new (JNIEnv * env, jclass _a, jobject o") + for var_line in field_var_lines: + if var_line.group(1) in trait_structs: + out_c.write(", jobject " + var_line.group(2)) + out_c.write(") {\n") + out_c.write("\t" + struct_name + " *res_ptr = MALLOC(sizeof(" + struct_name + "), \"" + struct_name + "\");\n") + out_c.write("\t*res_ptr = " + struct_name + "_init(env, _a, o") + for var_line in field_var_lines: + if var_line.group(1) in trait_structs: + out_c.write(", " + var_line.group(2)) + out_c.write(");\n") + out_c.write("\treturn (long)res_ptr;\n") + out_c.write("}\n") + + + out_java.write("""package org.ldk.impl; public class bindings { + static native void init(java.lang.Class c); static { System.loadLibrary(\"lightningjni\"); + init(java.lang.Enum.class); } """) @@ -290,42 +464,99 @@ public class bindings { out_c.write("#include \n") out_c.write("#include \n\n") + out_c.write("jmethodID ordinal_meth = NULL;\n") + out_c.write("JNIEXPORT void Java_org_ldk_impl_bindings_init(JNIEnv * env, jclass _b, jclass enum_class) {\n") + out_c.write("\tordinal_meth = (*env)->GetMethodID(env, enum_class, \"ordinal\", \"()I\");\n") + out_c.write("\tassert(ordinal_meth != NULL);\n") + out_c.write("}\n\n") + + if sys.argv[4] == "false": + out_c.write("#define MALLOC(a, _) malloc(a)\n") + out_c.write("#define FREE free\n\n") + else: + out_c.write("#include \n") + out_c.write("static mtx_t allocation_mtx;\n\n") + out_c.write("void __attribute__((constructor)) init_mtx() {\n") + out_c.write("\tassert(mtx_init(&allocation_mtx, mtx_plain) == thrd_success);\n") + out_c.write("}\n\n") + out_c.write("typedef struct allocation {\n") + out_c.write("\tstruct allocation* next;\n") + out_c.write("\tvoid* ptr;\n") + out_c.write("\tconst char* struct_name;\n") + out_c.write("} allocation;\n") + out_c.write("static allocation* allocation_ll = NULL;\n\n") + out_c.write("void* MALLOC(size_t len, const char* struct_name) {\n") + out_c.write("\tvoid* res = malloc(len);\n") + out_c.write("\tallocation* new_alloc = malloc(sizeof(allocation));\n") + out_c.write("\tnew_alloc->ptr = res;\n") + out_c.write("\tnew_alloc->struct_name = struct_name;\n") + out_c.write("\tassert(mtx_lock(&allocation_mtx) == thrd_success);\n") + out_c.write("\tnew_alloc->next = allocation_ll;\n") + out_c.write("\tallocation_ll = new_alloc;\n") + out_c.write("\tassert(mtx_unlock(&allocation_mtx) == thrd_success);\n") + out_c.write("\treturn res;\n") + out_c.write("}\n\n") + out_c.write("void FREE(void* ptr) {\n") + out_c.write("\tallocation* p = NULL;\n") + out_c.write("\tassert(mtx_lock(&allocation_mtx) == thrd_success);\n") + out_c.write("\tallocation* it = allocation_ll;\n") + out_c.write("\twhile (it->ptr != ptr) { p = it; it = it->next; }\n") + out_c.write("\tif (p) { p->next = it->next; } else { allocation_ll = it->next; }\n") + out_c.write("\tassert(mtx_unlock(&allocation_mtx) == thrd_success);\n") + out_c.write("\tassert(it->ptr == ptr);\n") + out_c.write("\tfree(it);\n") + out_c.write("\tfree(ptr);\n") + out_c.write("}\n\n") + out_c.write("void __attribute__((destructor)) check_leaks() {\n") + out_c.write("\tfor (allocation* a = allocation_ll; a != NULL; a = a->next) { fprintf(stderr, \"%s %p remains\\n\", a->struct_name, a->ptr); }\n") + out_c.write("\tassert(allocation_ll == NULL);\n") + out_c.write("}\n\n") + + # XXX: Temporarily write out a manual SecretKey_new() for testing, we should auto-gen this kind of thing + out_java.write("\tpublic static native long LDKSecretKey_new();\n\n") # TODO: rm me + out_c.write("JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LDKSecretKey_1new(JNIEnv * _env, jclass _b) {\n") # TODO: rm me + out_c.write("\tLDKSecretKey* key = (LDKSecretKey*)MALLOC(sizeof(LDKSecretKey), \"LDKSecretKey\");\n") # TODO: rm me + out_c.write("\treturn (long)key;\n") # TODO: rm me + out_c.write("}\n") # TODO: rm me + in_block_comment = False - in_block_enum = False - cur_block_struct = None - in_block_union = False + cur_block_obj = None fn_ptr_regex = re.compile("^extern const ([A-Za-z_0-9\* ]*) \(\*(.*)\)\((.*)\);$") fn_ret_arr_regex = re.compile("(.*) \(\*(.*)\((.*)\)\)\[([0-9]*)\];$") reg_fn_regex = re.compile("([A-Za-z_0-9\* ]* \*?)([a-zA-Z_0-9]*)\((.*)\);$") const_val_regex = re.compile("^extern const ([A-Za-z_0-9]*) ([A-Za-z_0-9]*);$") - line_indicates_opaque_regex = re.compile("^ bool _underlying_ref;$") + line_indicates_opaque_regex = re.compile("^ bool is_owned;$") line_indicates_trait_regex = re.compile("^ ([A-Za-z_0-9]* \*?)\(\*([A-Za-z_0-9]*)\)\((const )?void \*this_arg(.*)\);$") assert(line_indicates_trait_regex.match(" uintptr_t (*send_data)(void *this_arg, LDKu8slice data, bool resume_read);")) assert(line_indicates_trait_regex.match(" LDKCVec_MessageSendEventZ (*get_and_clear_pending_msg_events)(const void *this_arg);")) assert(line_indicates_trait_regex.match(" void *(*clone)(const void *this_arg);")) line_field_var_regex = re.compile("^ ([A-Za-z_0-9]*) ([A-Za-z_0-9]*);$") assert(line_field_var_regex.match(" LDKMessageSendEventsProvider MessageSendEventsProvider;")) - struct_name_regex = re.compile("^typedef struct (MUST_USE_STRUCT )?(LDK[A-Za-z_0-9]*) {$") + struct_name_regex = re.compile("^typedef (struct|enum|union) (MUST_USE_STRUCT )?(LDK[A-Za-z_0-9]*) {$") assert(struct_name_regex.match("typedef struct LDKCVecTempl_u8 {")) + assert(struct_name_regex.match("typedef enum LDKNetwork {")) 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_struct is not None: - cur_block_struct = cur_block_struct + line + elif cur_block_obj is not None: + cur_block_obj = cur_block_obj + line if line.startswith("} "): field_lines = [] struct_name = None - struct_lines = cur_block_struct.split("\n") + obj_lines = cur_block_obj.split("\n") is_opaque = False + is_unitary_enum = False + is_union_enum = False + is_union = False trait_fn_lines = [] field_var_lines = [] - for idx, struct_line in enumerate(struct_lines): + for idx, struct_line in enumerate(obj_lines): if struct_line.strip().startswith("/*"): in_block_comment = True if in_block_comment: @@ -334,7 +565,14 @@ public class bindings { else: struct_name_match = struct_name_regex.match(struct_line) if struct_name_match is not None: - struct_name = struct_name_match.group(2) + struct_name = struct_name_match.group(3) + if struct_name_match.group(1) == "enum": + if not struct_name.endswith("_Tag"): + is_unitary_enum = True + else: + is_union_enum = True + elif struct_name_match.group(1) == "union": + is_union = True if line_indicates_opaque_regex.match(struct_line): is_opaque = True trait_fn_match = line_indicates_trait_regex.match(struct_line) @@ -346,143 +584,57 @@ public class bindings { field_lines.append(struct_line) assert(struct_name is not None) - assert(len(trait_fn_lines) == 0 or not is_opaque) + assert(len(trait_fn_lines) == 0 or not (is_opaque or is_unitary_enum or is_union_enum or is_union)) + assert(not is_opaque or not (len(trait_fn_lines) != 0 or is_unitary_enum or is_union_enum or is_union)) + assert(not is_unitary_enum or not (len(trait_fn_lines) != 0 or is_opaque or is_union_enum or is_union)) + assert(not is_union_enum or not (len(trait_fn_lines) != 0 or is_unitary_enum or is_opaque or is_union)) + assert(not is_union or not (len(trait_fn_lines) != 0 or is_unitary_enum or is_union_enum or is_opaque)) if is_opaque: opaque_structs.add(struct_name) - if len(trait_fn_lines) > 0: - trait_structs.add(struct_name) - out_c.write("typedef struct " + struct_name + "_JCalls {\n") - out_c.write("\tatomic_size_t refcnt;\n") - out_c.write("\tJNIEnv *env;\n") - out_c.write("\tjobject o;\n") - for var_line in field_var_lines: - if var_line.group(1) in trait_structs: - out_c.write("\t" + var_line.group(1) + "_JCalls* " + var_line.group(2) + ";\n") - for fn_line in trait_fn_lines: - if fn_line.group(2) != "free" and fn_line.group(2) != "clone": - out_c.write("\tjmethodID " + fn_line.group(2) + "_meth;\n") - out_c.write("} " + struct_name + "_JCalls;\n") - - out_java.write("\tpublic interface " + struct_name + " {\n") - java_meths = [] - for fn_line in trait_fn_lines: - java_meth_descr = "(" - if fn_line.group(2) != "free" and fn_line.group(2) != "clone": - ret_ty_info = java_c_types(fn_line.group(1), None) - - out_java.write("\t\t " + ret_ty_info.java_ty + " " + fn_line.group(2) + "(") - is_const = fn_line.group(3) is not None - out_c.write(fn_line.group(1) + fn_line.group(2) + "_jcall(") - if is_const: - out_c.write("const void* this_arg") - else: - out_c.write("void* this_arg") - - arg_names = [] - for idx, arg in enumerate(fn_line.group(4).split(',')): - if arg == "": - continue - if idx >= 2: - out_java.write(", ") - out_c.write(", ") - arg_conv_info = map_type(arg, True, None, False) - out_c.write(arg.strip()) - out_java.write(arg_conv_info.java_ty + " " + arg_conv_info.arg_name) - arg_names.append(arg_conv_info) - java_meth_descr = java_meth_descr + arg_conv_info.java_fn_ty_arg - java_meth_descr = java_meth_descr + ")" + ret_ty_info.java_fn_ty_arg - java_meths.append(java_meth_descr) - - out_java.write(");\n") - out_c.write(") {\n") - out_c.write("\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n") - - for arg_info in arg_names: - if arg_info.ret_conv is not None: - out_c.write("\t" + arg_info.ret_conv[0].replace('\n', '\n\t').replace("_env", "j_calls->env")); - out_c.write(arg_info.arg_name) - out_c.write(arg_info.ret_conv[1].replace('\n', '\n\t').replace("_env", "j_calls->env") + "\n") - - if not ret_ty_info.passed_as_ptr: - out_c.write("\treturn (*j_calls->env)->Call" + ret_ty_info.java_ty.title() + "Method(j_calls->env, j_calls->o, j_calls->" + fn_line.group(2) + "_meth") - else: - out_c.write("\t" + fn_line.group(1).strip() + "* ret = (" + fn_line.group(1).strip() + "*)(*j_calls->env)->CallLongMethod(j_calls->env, j_calls->o, j_calls->" + fn_line.group(2) + "_meth"); - - for arg_info in arg_names: - if arg_info.ret_conv is not None: - out_c.write(", " + arg_info.ret_conv_name) - else: - out_c.write(", " + arg_info.arg_name) - out_c.write(");\n"); - - if ret_ty_info.passed_as_ptr: - out_c.write("\t" + fn_line.group(1).strip() + " res = *ret;\n") - out_c.write("\tfree(ret);\n") - out_c.write("\treturn res;\n") - out_c.write("}\n") - elif fn_line.group(2) == "free": - out_c.write("void " + struct_name + "_JCalls_free(void* this_arg) {\n") - out_c.write("\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n") - out_c.write("\tif (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {\n") - out_c.write("\t\t(*j_calls->env)->DeleteGlobalRef(j_calls->env, j_calls->o);\n") - out_c.write("\t\tfree(j_calls);\n") - out_c.write("\t}\n}\n") - - # Write out a clone function whether we need one or not, as we use them in moving to rust - out_c.write("void* " + struct_name + "_JCalls_clone(const void* this_arg) {\n") - out_c.write("\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n") - out_c.write("\tatomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);\n") - for var_line in field_var_lines: - if var_line.group(1) in trait_structs: - out_c.write("\tatomic_fetch_add_explicit(&j_calls->" + var_line.group(2) + "->refcnt, 1, memory_order_release);\n") - out_c.write("\treturn (void*) this_arg;\n") + elif is_unitary_enum: + unitary_enums.add(struct_name) + out_c.write("static inline " + struct_name + " " + struct_name + "_from_java(JNIEnv *env, jclass val) {\n") + out_c.write("\tswitch ((*env)->CallIntMethod(env, val, ordinal_meth)) {\n") + ord_v = 0 + for idx, struct_line in enumerate(field_lines): + if idx == 0: + out_java.write("\tpublic enum " + struct_name + " {\n") + elif idx == len(field_lines) - 3: + assert(struct_line.endswith("_Sentinel,")) + elif idx == len(field_lines) - 2: + out_java.write("\t}\n") + elif idx == len(field_lines) - 1: + assert(struct_line == "") + else: + out_java.write("\t" + struct_line + "\n") + out_c.write("\t\tcase %d: return %s;\n" % (ord_v, struct_line.strip().strip(","))) + ord_v = ord_v + 1 + out_c.write("\t}\n") + out_c.write("\tassert(false);\n") out_c.write("}\n") - out_java.write("\t}\n") - - out_java.write("\tpublic static native long " + struct_name + "_new(" + struct_name + " impl") - out_c.write("JNIEXPORT long JNICALL Java_org_ldk_impl_bindings_" + struct_name.replace("_", "_1") + "_1new (JNIEnv * env, jclass _a, jobject o") - for var_line in field_var_lines: - if var_line.group(1) in trait_structs: - out_java.write(", " + var_line.group(1) + " " + var_line.group(2)) - out_c.write(", jobject " + var_line.group(2)) - out_java.write(");\n") - out_c.write(") {\n") - - out_c.write("\tjclass c = (*env)->GetObjectClass(env, o);\n") - out_c.write("\tassert(c != NULL);\n") - out_c.write("\t" + struct_name + "_JCalls *calls = malloc(sizeof(" + struct_name + "_JCalls));\n") - out_c.write("\tatomic_init(&calls->refcnt, 1);\n") - out_c.write("\tcalls->env = env;\n") - out_c.write("\tcalls->o = (*env)->NewGlobalRef(env, o);\n") - for (fn_line, java_meth_descr) in zip(trait_fn_lines, java_meths): - if fn_line.group(2) != "free" and fn_line.group(2) != "clone": - out_c.write("\tcalls->" + fn_line.group(2) + "_meth = (*env)->GetMethodID(env, c, \"" + fn_line.group(2) + "\", \"" + java_meth_descr + "\");\n") - out_c.write("\tassert(calls->" + fn_line.group(2) + "_meth != NULL);\n") - out_c.write("\n\t" + struct_name + " *ret = malloc(sizeof(" + struct_name + "));\n") - out_c.write("\tret->this_arg = (void*) calls;\n") - for fn_line in trait_fn_lines: - if fn_line.group(2) != "free" and fn_line.group(2) != "clone": - out_c.write("\tret->" + fn_line.group(2) + " = " + fn_line.group(2) + "_jcall;\n") - elif fn_line.group(2) == "free": - out_c.write("\tret->free = " + struct_name + "_JCalls_free;\n") - else: - out_c.write("\tret->clone = " + struct_name + "_JCalls_clone;\n") - for var_line in field_var_lines: - if var_line.group(1) in trait_structs: - out_c.write("\tret->" + var_line.group(2) + " = *(" + var_line.group(1) + "*)Java_org_ldk_impl_bindings_" + var_line.group(1) + "_1new(env, _a, " + var_line.group(2) + ");\n") - out_c.write("\tcalls->" + var_line.group(2) + " = ret->" + var_line.group(2) + ".this_arg;\n") - out_c.write("\treturn (long)ret;\n") + ord_v = 0 + out_c.write("static inline jclass " + struct_name + "_to_java(JNIEnv *env, " + struct_name + " val) {\n") + out_c.write("\t// TODO: This is pretty inefficient, we really need to cache the field IDs and class\n") + out_c.write("\tjclass enum_class = (*env)->FindClass(env, \"Lorg/ldk/impl/bindings$" + struct_name + ";\");\n") + out_c.write("\tassert(enum_class != NULL);\n") + out_c.write("\tswitch (val) {\n") + for idx, struct_line in enumerate(field_lines): + if idx > 0 and idx < len(field_lines) - 3: + variant = struct_line.strip().strip(",") + out_c.write("\t\tcase " + variant + ": {\n") + out_c.write("\t\t\tjfieldID field = (*env)->GetStaticFieldID(env, enum_class, \"" + variant + "\", \"Lorg/ldk/impl/bindings$" + struct_name + ";\");\n") + out_c.write("\t\t\tassert(field != NULL);\n") + out_c.write("\t\t\treturn (*env)->GetStaticObjectField(env, enum_class, field);\n") + out_c.write("\t\t}\n") + ord_v = ord_v + 1 + out_c.write("\t\tdefault: assert(false);\n") + out_c.write("\t}\n") out_c.write("}\n\n") - - #out_java.write("/* " + "\n".join(field_lines) + "*/\n") - cur_block_struct = None - elif in_block_union: - if line.startswith("} "): - in_block_union = False - elif in_block_enum: - if line.startswith("} "): - in_block_enum = False + elif len(trait_fn_lines) > 0: + trait_structs.add(struct_name) + map_trait(struct_name, field_var_lines, trait_fn_lines) + cur_block_obj = None else: fn_ptr = fn_ptr_regex.match(line) fn_ret_arr = fn_ret_arr_regex.match(line) @@ -496,11 +648,11 @@ public class bindings { if not line.endswith("*/\n"): in_block_comment = True elif line.startswith("typedef enum "): - in_block_enum = True + cur_block_obj = line elif line.startswith("typedef struct "): - cur_block_struct = line + cur_block_obj = line elif line.startswith("typedef union "): - in_block_union = True + cur_block_obj = line elif line.startswith("typedef "): pass elif fn_ptr is not None: