X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=generator%2Fgenerator_java.ml;h=0152bb3b5e6b5a11b1f3ea48e3813cc53b13bb73;hp=90ae26332e63224a65f14c19928cab16cd342f03;hb=20480068caefae4ff62c3564113df0788a2a1c87;hpb=0b2e45da609002d44cbbf689cfdee252e6806648 diff --git a/generator/generator_java.ml b/generator/generator_java.ml index 90ae263..0152bb3 100644 --- a/generator/generator_java.ml +++ b/generator/generator_java.ml @@ -106,7 +106,7 @@ public class GuestFS { let doc = replace_str longdesc "C [] then - doc ^ "\n\nOptional arguments are supplied in the final Map parameter, which is a hash of the argument name to its value (cast to Object). Pass an empty Map for no optional arguments." + doc ^ "\n\nOptional arguments are supplied in the final Map parameter, which is a hash of the argument name to its value (cast to Object). Pass an empty Map or null for no optional arguments." else doc in let doc = if List.mem ProtocolLimitWarning flags then @@ -142,12 +142,53 @@ public class GuestFS { pr " if (g == 0)\n"; pr " throw new LibGuestFSException (\"%s: handle is closed\");\n" name; - pr " "; - if ret <> RErr then pr "return "; - pr "_%s " name; - generate_java_call_args ~handle:"g" style; - pr ";\n"; + if optargs <> [] then ( + pr "\n"; + pr " /* Unpack optional args. */\n"; + pr " Object _optobj;\n"; + pr " long _optargs_bitmask = 0;\n"; + iteri ( + fun i argt -> + let t, boxed_t, convert, n, default = + match argt with + | Bool n -> "boolean", "Boolean", ".booleanValue()", n, "false" + | Int n -> "int", "Integer", ".intValue()", n, "0" + | Int64 n -> "long", "Long", ".longValue()", n, "0" + | String n -> "String", "String", "", n, "\"\"" + | _ -> assert false in + pr " %s %s = %s;\n" t n default; + pr " _optobj = null;\n"; + pr " if (optargs != null)\n"; + pr " _optobj = optargs.get (\"%s\");\n" n; + pr " if (_optobj != null) {\n"; + pr " %s = ((%s) _optobj)%s;\n" n boxed_t convert; + pr " _optargs_bitmask |= %Ld;\n" + (Int64.shift_left Int64.one i); + pr " }\n"; + ) optargs + ); + pr "\n"; + (match ret with + | RErr -> + pr " _%s " name; + generate_java_call_args ~handle:"g" style; + pr ";\n" + | RHashtable _ -> + pr " String[] r = _%s " name; + generate_java_call_args ~handle:"g" style; + pr ";\n"; + pr "\n"; + pr " HashMap rhash = new HashMap ();\n"; + pr " for (int i = 0; i < r.length; i += 2)\n"; + pr " rhash.put (r[i], r[i+1]);\n"; + pr " return rhash;\n" + | _ -> + pr " return _%s " name; + generate_java_call_args ~handle:"g" style; + pr ";\n" + ); pr " }\n"; + pr "\n"; pr " "; generate_java_prototype ~privat:true ~native:true name style; pr "\n"; @@ -160,7 +201,10 @@ public class GuestFS { and generate_java_call_args ~handle (_, args, optargs) = pr "(%s" handle; List.iter (fun arg -> pr ", %s" (name_of_argt arg)) args; - if optargs <> [] then pr ", optargs"; + if optargs <> [] then ( + pr ", _optargs_bitmask"; + List.iter (fun arg -> pr ", %s" (name_of_argt arg)) optargs + ); pr ")" and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false) @@ -184,7 +228,11 @@ and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false) | RStructList (_, typ) -> let name = java_name_of_struct typ in pr "%s[] " name; - | RHashtable _ -> pr "Map "; + | RHashtable _ -> + if not native then + pr "Map " + else + pr "String[] "; ); if native then pr "_%s " name else pr "%s " name; @@ -225,7 +273,21 @@ and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false) if optargs <> [] then ( if !needs_comma then pr ", "; needs_comma := true; - pr "HashMap optargs" + + if not native then + pr "Map optargs" + else ( + pr "long _optargs_bitmask"; + List.iter ( + fun argt -> + match argt with + | Bool n -> pr ", boolean %s" n + | Int n -> pr ", int %s" n + | Int64 n -> pr ", long %s" n + | String n -> pr ", String %s" n + | _ -> assert false + ) optargs + ) ); pr ")\n"; @@ -328,7 +390,6 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr "JNICALL\n"; pr "Java_com_redhat_et_libguestfs_GuestFS_"; pr "%s" (replace_str ("_" ^ name) "_" "_1"); - pr "\n"; pr " (JNIEnv *env, jobject obj, jlong jg"; List.iter ( function @@ -351,45 +412,54 @@ Java_com_redhat_et_libguestfs_GuestFS__1close | Int64 n | Pointer (_, n) -> pr ", jlong j%s" n ) args; - if optargs <> [] then - pr ", jobject joptargs"; + if optargs <> [] then ( + pr ", jlong joptargs_bitmask"; + List.iter ( + function + | Bool n -> pr ", jboolean j%s" n + | Int n -> pr ", jint j%s" n + | Int64 n -> pr ", jlong j%s" n + | String n -> pr ", jstring j%s" n + | _ -> assert false + ) optargs + ); pr ")\n"; pr "{\n"; pr " guestfs_h *g = (guestfs_h *) (long) jg;\n"; - let error_code, no_ret = - match ret with - | RErr -> pr " int r;\n"; "-1", "" - | RBool _ - | RInt _ -> pr " int r;\n"; "-1", "0" - | RInt64 _ -> pr " int64_t r;\n"; "-1", "0" - | RConstString _ -> pr " const char *r;\n"; "NULL", "NULL" - | RConstOptString _ -> pr " const char *r;\n"; "NULL", "NULL" - | RString _ -> - pr " jstring jr;\n"; - pr " char *r;\n"; "NULL", "NULL" - | RStringList _ -> - pr " jobjectArray jr;\n"; - pr " int r_len;\n"; - pr " jclass cl;\n"; - pr " jstring jstr;\n"; - pr " char **r;\n"; "NULL", "NULL" - | RStruct (_, typ) -> - pr " jobject jr;\n"; - pr " jclass cl;\n"; - pr " jfieldID fl;\n"; - pr " struct guestfs_%s *r;\n" typ; "NULL", "NULL" - | RStructList (_, typ) -> - pr " jobjectArray jr;\n"; - pr " jclass cl;\n"; - pr " jfieldID fl;\n"; - pr " jobject jfl;\n"; - pr " struct guestfs_%s_list *r;\n" typ; "NULL", "NULL" - | RHashtable _ -> pr " char **r;\n"; "NULL", "NULL" - | RBufferOut _ -> - pr " jstring jr;\n"; - pr " char *r;\n"; - pr " size_t size;\n"; - "NULL", "NULL" in + (match ret with + | RErr -> pr " int r;\n" + | RBool _ + | RInt _ -> pr " int r;\n" + | RInt64 _ -> pr " int64_t r;\n" + | RConstString _ -> pr " const char *r;\n" + | RConstOptString _ -> pr " const char *r;\n" + | RString _ -> + pr " jstring jr;\n"; + pr " char *r;\n" + | RStringList _ + | RHashtable _ -> + pr " jobjectArray jr;\n"; + pr " size_t r_len;\n"; + pr " jclass cl;\n"; + pr " jstring jstr;\n"; + pr " char **r;\n" + | RStruct (_, typ) -> + pr " jobject jr;\n"; + pr " jclass cl;\n"; + pr " jfieldID fl;\n"; + pr " struct guestfs_%s *r;\n" typ + | RStructList (_, typ) -> + pr " jobjectArray jr;\n"; + pr " jclass cl;\n"; + pr " jfieldID fl;\n"; + pr " jobject jfl;\n"; + pr " struct guestfs_%s_list *r;\n" typ + | RBufferOut _ -> + pr " jstring jr;\n"; + pr " char *r;\n"; + pr " size_t size;\n" + ); + List.iter ( function | Pathname n @@ -401,11 +471,11 @@ Java_com_redhat_et_libguestfs_GuestFS__1close | Key n -> pr " const char *%s;\n" n | BufferIn n -> - pr " jbyte *%s;\n" n; + pr " char *%s;\n" n; pr " size_t %s_size;\n" n | StringList n | DeviceList n -> - pr " int %s_len;\n" n; - pr " const char **%s;\n" n + pr " size_t %s_len;\n" n; + pr " char **%s;\n" n | Bool n | Int n -> pr " int %s;\n" n @@ -415,12 +485,17 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " %s %s;\n" t n ) args; + if optargs <> [] then ( + pr " struct guestfs_%s_argv optargs_s;\n" name; + pr " const struct guestfs_%s_argv *optargs = &optargs_s;\n" name + ); + let needs_i = (match ret with - | RStringList _ | RStructList _ -> true + | RStringList _ | RStructList _ | RHashtable _ -> true | RErr | RBool _ | RInt _ | RInt64 _ | RConstString _ | RConstOptString _ - | RString _ | RBufferOut _ | RStruct _ | RHashtable _ -> false) || + | RString _ | RBufferOut _ | RStruct _ -> false) || List.exists (function | StringList _ -> true | DeviceList _ -> true @@ -446,7 +521,7 @@ Java_com_redhat_et_libguestfs_GuestFS__1close *) pr " %s = j%s ? (*env)->GetStringUTFChars (env, j%s, NULL) : NULL;\n" n n n | BufferIn n -> - pr " %s = (*env)->GetByteArrayElements (env, j%s, NULL);\n" n n; + pr " %s = (char *) (*env)->GetByteArrayElements (env, j%s, NULL);\n" n n; pr " %s_size = (*env)->GetArrayLength (env, j%s);\n" n n | StringList n | DeviceList n -> pr " %s_len = (*env)->GetArrayLength (env, j%s);\n" n n; @@ -454,7 +529,7 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " for (i = 0; i < %s_len; ++i) {\n" n; pr " jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n" n; - pr " %s[i] = (*env)->GetStringUTFChars (env, o, NULL);\n" n; + pr " %s[i] = (char *) (*env)->GetStringUTFChars (env, o, NULL);\n" n; pr " }\n"; pr " %s[%s_len] = NULL;\n" n n; | Bool n @@ -466,12 +541,22 @@ Java_com_redhat_et_libguestfs_GuestFS__1close ) args; if optargs <> [] then ( - (* XXX *) - pr " throw_exception (env, \"%s: internal error: please let us know how to read a Java HashMap parameter from JNI bindings!\");\n" name; - pr " return NULL;\n"; - pr " /*\n"; + pr " optargs_s.bitmask = joptargs_bitmask;\n"; + List.iter ( + function + | Bool n + | Int n + | Int64 n -> + pr " optargs_s.%s = j%s;\n" n n + | String n -> + pr " optargs_s.%s = (*env)->GetStringUTFChars (env, j%s, NULL);\n" + n n + | _ -> assert false + ) optargs; ); + pr "\n"; + (* Make the call. *) if optargs = [] then pr " r = guestfs_%s " name @@ -480,6 +565,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close generate_c_call_args ~handle:"g" style; pr ";\n"; + pr "\n"; + (* Release the parameters. *) List.iter ( function @@ -494,7 +581,7 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " if (j%s)\n" n; pr " (*env)->ReleaseStringUTFChars (env, j%s, %s);\n" n n | BufferIn n -> - pr " (*env)->ReleaseByteArrayElements (env, j%s, %s, 0);\n" n n + pr " (*env)->ReleaseByteArrayElements (env, j%s, (jbyte *) %s, 0);\n" n n | StringList n | DeviceList n -> pr " for (i = 0; i < %s_len; ++i) {\n" n; pr " jobject o = (*env)->GetObjectArrayElement (env, j%s, i);\n" @@ -508,11 +595,44 @@ Java_com_redhat_et_libguestfs_GuestFS__1close | Pointer _ -> () ) args; + List.iter ( + function + | Bool n + | Int n + | Int64 n -> () + | String n -> + pr " (*env)->ReleaseStringUTFChars (env, j%s, optargs_s.%s);\n" n n + | _ -> assert false + ) optargs; + + pr "\n"; + (* Check for errors. *) - pr " if (r == %s) {\n" error_code; - pr " throw_exception (env, guestfs_last_error (g));\n"; - pr " return %s;\n" no_ret; - pr " }\n"; + (match errcode_of_ret ret with + | `CannotReturnError -> () + | (`ErrorIsMinusOne|`ErrorIsNULL) as errcode -> + (match errcode with + | `ErrorIsMinusOne -> + pr " if (r == -1) {\n"; + | `ErrorIsNULL -> + pr " if (r == NULL) {\n"; + ); + pr " throw_exception (env, guestfs_last_error (g));\n"; + (match ret with + | RErr -> + pr " return;\n" + | RInt _ + | RInt64 _ + | RBool _ -> + pr " return -1;\n" + | RConstString _ | RConstOptString _ | RString _ + | RBufferOut _ + | RStruct _ | RHashtable _ + | RStringList _ | RStructList _ -> + pr " return NULL;\n" + ); + pr " }\n" + ); (* Return value. *) (match ret with @@ -527,7 +647,8 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " jr = (*env)->NewStringUTF (env, r);\n"; pr " free (r);\n"; pr " return jr;\n" - | RStringList _ -> + | RStringList _ + | RHashtable _ -> pr " for (r_len = 0; r[r_len] != NULL; ++r_len) ;\n"; pr " cl = (*env)->FindClass (env, \"java/lang/String\");\n"; pr " jstr = (*env)->NewStringUTF (env, \"\");\n"; @@ -547,19 +668,12 @@ Java_com_redhat_et_libguestfs_GuestFS__1close let jtyp = java_name_of_struct typ in let cols = cols_of_struct typ in generate_java_struct_list_return typ jtyp cols - | RHashtable _ -> - (* XXX *) - pr " throw_exception (env, \"%s: internal error: please let us know how to make a Java HashMap from JNI bindings!\");\n" name; - pr " return NULL;\n" | RBufferOut _ -> - pr " jr = (*env)->NewStringUTF (env, r); /* XXX size */\n"; + pr " jr = (*env)->NewStringUTF (env, r); // XXX size\n"; pr " free (r);\n"; pr " return jr;\n" ); - if optargs <> [] then - pr " */\n"; - pr "}\n"; pr "\n" ) all_functions