X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=generator%2Fgenerator_java.ml;h=97bee841b210a7237171207c993f5722ac06f90a;hp=2ccb1b6c00107617d439b70ef1810dc9e810fe38;hb=adb5db58d850ce6d15380177a63c68276f863c98;hpb=04d8209077d2227eb1d42695ba71147f78987050 diff --git a/generator/generator_java.ml b/generator/generator_java.ml index 2ccb1b6..97bee84 100644 --- a/generator/generator_java.ml +++ b/generator/generator_java.ml @@ -1,5 +1,5 @@ (* libguestfs - * Copyright (C) 2009-2010 Red Hat Inc. + * Copyright (C) 2009-2011 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,6 +37,7 @@ let rec generate_java_java () = package com.redhat.et.libguestfs; import java.util.HashMap; +import java.util.Map; import com.redhat.et.libguestfs.LibGuestFSException; import com.redhat.et.libguestfs.PV; import com.redhat.et.libguestfs.VG; @@ -100,10 +101,14 @@ public class GuestFS { "; List.iter ( - fun (name, style, _, flags, _, shortdesc, longdesc) -> + fun (name, (ret, args, optargs as style), _, flags, _, shortdesc, longdesc) -> if not (List.mem NotInDocs flags); then ( 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." + else doc in + let doc = if List.mem ProtocolLimitWarning flags then doc ^ "\n\n" ^ protocol_limit_warning else doc in @@ -129,19 +134,33 @@ public class GuestFS { pr " * %s\n" doc; pr " * @throws LibGuestFSException\n"; pr " */\n"; - pr " "; ); + pr " "; generate_java_prototype ~public:true ~semicolon:false name style; pr "\n"; pr " {\n"; pr " if (g == 0)\n"; pr " throw new LibGuestFSException (\"%s: handle is closed\");\n" name; - pr " "; - if fst style <> RErr then pr "return "; - pr "_%s " name; - generate_java_call_args ~handle:"g" (snd style); - 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 " "; generate_java_prototype ~privat:true ~native:true name style; @@ -152,19 +171,20 @@ public class GuestFS { pr "}\n" (* Generate Java call arguments, eg "(handle, foo, bar)" *) -and generate_java_call_args ~handle args = +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"; pr ")" and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false) - ?(semicolon=true) name style = + ?(semicolon=true) name (ret, args, optargs) = if privat then pr "private "; if public then pr "public "; if native then pr "native "; (* return type *) - (match fst style with + (match ret with | RErr -> pr "void "; | RInt _ -> pr "int "; | RInt64 _ -> pr "long "; @@ -178,7 +198,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 "HashMap "; + | RHashtable _ -> + if not native then + pr "Map " + else + pr "String[] "; ); if native then pr "_%s " name else pr "%s " name; @@ -212,9 +236,15 @@ and generate_java_prototype ?(public=false) ?(privat=false) ?(native=false) pr "boolean %s" n | Int n -> pr "int %s" n - | Int64 n -> + | Int64 n | Pointer (_, n) -> pr "long %s" n - ) (snd style); + ) args; + + if optargs <> [] then ( + if !needs_comma then pr ", "; + needs_comma := true; + pr "HashMap optargs" + ); pr ")\n"; pr " throws LibGuestFSException"; @@ -299,9 +329,9 @@ Java_com_redhat_et_libguestfs_GuestFS__1close "; List.iter ( - fun (name, style, _, _, _, _, _) -> + fun (name, (ret, args, optargs as style), _, _, _, _, _) -> pr "JNIEXPORT "; - (match fst style with + (match ret with | RErr -> pr "void "; | RInt _ -> pr "jint "; | RInt64 _ -> pr "jlong "; @@ -336,46 +366,48 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr ", jboolean j%s" n | Int n -> pr ", jint j%s" n - | Int64 n -> + | Int64 n | Pointer (_, n) -> pr ", jlong j%s" n - ) (snd style); + ) args; + if optargs <> [] then + pr ", jobject joptargs"; pr ")\n"; pr "{\n"; pr " guestfs_h *g = (guestfs_h *) (long) jg;\n"; - let error_code, no_ret = - match fst style 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 " int 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 @@ -397,18 +429,20 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " int %s;\n" n | Int64 n -> pr " int64_t %s;\n" n - ) (snd style); + | Pointer (t, n) -> + pr " %s %s;\n" t n + ) args; let needs_i = - (match fst style with - | RStringList _ | RStructList _ -> true + (match ret with + | 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 - | _ -> false) (snd style) in + | _ -> false) args in if needs_i then pr " size_t i;\n"; @@ -445,10 +479,22 @@ Java_com_redhat_et_libguestfs_GuestFS__1close | Int n | Int64 n -> pr " %s = j%s;\n" n n - ) (snd style); + | Pointer (t, n) -> + pr " %s = (%s) j%s;\n" n t n + ) 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"; + ); (* Make the call. *) - pr " r = guestfs_%s " name; + if optargs = [] then + pr " r = guestfs_%s " name + else + pr " r = guestfs_%s_argv " name; generate_c_call_args ~handle:"g" style; pr ";\n"; @@ -474,19 +520,29 @@ Java_com_redhat_et_libguestfs_GuestFS__1close pr " (*env)->ReleaseStringUTFChars (env, o, %s[i]);\n" n; pr " }\n"; pr " free (%s);\n" n - | Bool n - | Int n - | Int64 n -> () - ) (snd style); + | Bool _ + | Int _ + | Int64 _ + | Pointer _ -> () + ) args; (* 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 -> + pr " if (r == -1) {\n"; + pr " throw_exception (env, guestfs_last_error (g));\n"; + pr " return -1;\n"; + pr " }\n" + | `ErrorIsNULL -> + pr " if (r == NULL) {\n"; + pr " throw_exception (env, guestfs_last_error (g));\n"; + pr " return NULL;\n"; + pr " }\n" + ); (* Return value. *) - (match fst style with + (match ret with | RErr -> () | RInt _ -> pr " return (jint) r;\n" | RBool _ -> pr " return (jboolean) r;\n" @@ -498,7 +554,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"; @@ -518,16 +575,15 @@ 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