X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=java_strings.py;h=1633756431634f47efaa60fb3e86aade84003691;hb=refs%2Fheads%2F2021-03-check-determinism;hp=d827da9e05f62d586e0605568cdb8c579b2ab64f;hpb=51b99938ad39a1215696f57e37c8ee79307c1086;p=ldk-java

diff --git a/java_strings.py b/java_strings.py
index d827da9e..16337564 100644
--- a/java_strings.py
+++ b/java_strings.py
@@ -197,6 +197,9 @@ void __wrap_reallocarray(void* ptr, size_t new_sz) {
 void __attribute__((destructor)) check_leaks() {
 	size_t alloc_count = 0;
 	size_t alloc_size = 0;
+	fprintf(stderr, "The following LDK-allocated blocks still remain.\\n");
+	fprintf(stderr, "Note that this is only accurate if System.gc(); System.runFinalization()\\n");
+	fprintf(stderr, "was called prior to exit after all LDK objects were out of scope.\\n");
 	for (allocation* a = allocation_ll; a != NULL; a = a->next) {
 		fprintf(stderr, "%s %p (%lu bytes) remains:\\n", a->struct_name, a->ptr, a->alloc_len);
 		backtrace_symbols_fd(a->bt, a->bt_len, STDERR_FILENO);
@@ -205,7 +208,8 @@ void __attribute__((destructor)) check_leaks() {
 		alloc_size += a->alloc_len;
 	}
 	fprintf(stderr, "%lu allocations remained for %lu bytes.\\n", alloc_count, alloc_size);
-	DO_ASSERT(allocation_ll == NULL);
+	fprintf(stderr, "Note that this is only accurate if System.gc(); System.runFinalization()\\n");
+	fprintf(stderr, "was called prior to exit after all LDK objects were out of scope.\\n");
 }
 """
         self.c_file_pfx = self.c_file_pfx + """
@@ -387,10 +391,10 @@ import java.util.Arrays;
 
     def init_str(self):
         res = ""
-        for ty in self.c_array_class_caches:
+        for ty in sorted(self.c_array_class_caches):
             res = res + "static jclass " + ty + "_clz = NULL;\n"
         res = res + "JNIEXPORT void Java_org_ldk_impl_bindings_init_1class_1cache(JNIEnv * env, jclass clz) {\n"
-        for ty in self.c_array_class_caches:
+        for ty in sorted(self.c_array_class_caches):
             res = res + "\t" + ty + "_clz = (*env)->FindClass(env, \"" + ty.replace("arr_of_", "[") + "\");\n"
             res = res + "\tCHECK(" + ty + "_clz != NULL);\n"
             res = res + "\t" + ty + "_clz = (*env)->NewGlobalRef(env, " + ty + "_clz);\n"
@@ -634,7 +638,7 @@ import java.util.Arrays;
         for idx, fn_line in enumerate(field_fns):
             if fn_line.fn_name != "free" and fn_line.fn_name != "clone":
                 assert fn_line.ret_ty_info.ty_info.get_full_rust_ty()[1] == ""
-                out_c = out_c + fn_line.ret_ty_info.ty_info.get_full_rust_ty()[0] + " " + fn_line.fn_name + "_jcall("
+                out_c = out_c + fn_line.ret_ty_info.ty_info.get_full_rust_ty()[0] + " " + fn_line.fn_name + "_" + struct_name + "_jcall("
                 if fn_line.self_is_const:
                     out_c = out_c + "const void* this_arg"
                 else:
@@ -710,7 +714,7 @@ import java.util.Arrays;
         out_c = out_c + "\t\t.this_arg = (void*) calls,\n"
         for fn_line in field_fns:
             if fn_line.fn_name != "free" and fn_line.fn_name != "clone":
-                out_c = out_c + "\t\t." + fn_line.fn_name + " = " + fn_line.fn_name + "_jcall,\n"
+                out_c = out_c + "\t\t." + fn_line.fn_name + " = " + fn_line.fn_name + "_" + struct_name + "_jcall,\n"
             elif fn_line.fn_name == "free":
                 out_c = out_c + "\t\t.free = " + struct_name + "_JCalls_free,\n"
             else: