Remote protocol working.

[wrappi.git] / generator / wrappi_c_impl.ml

diff --git a/generator/wrappi_c_impl.ml b/generator/wrappi_c_impl.ml
index 74f4d39..0b4b3a3 100644 (file)
--- a/generator/wrappi_c_impl.ml
+++ b/generator/wrappi_c_impl.ml
@@ -150,10 +150,13 @@ pr "\
     pr_defn ep;
 
     pr "{\n";
-    pr "  if (w->scheme == NULL) {\n";
+    pr "  /* XXX Argument precondition checks here. */\n";
+    pr "\n";
+    pr "  if (w->scheme == WRAP_SCHEME_LOCAL) {\n";
     pr "    /* Local connection. */\n";
     pr "    ";
 
+    let name = ep.ep_name in
     let ret, req, opt = ep.ep_ftype in
 
     (match ret with
@@ -161,10 +164,10 @@ pr "\
     | _ -> pr "return "
     );
 
-    pr "impl_%s ((struct wrap_internal_h *)w" ep.ep_name;
+    pr "impl_%s ((struct wrap_internal_h *)w" name;
 
     (* Required parameters. *)
-    List.iter (fun (name, _, _) -> pr ", %s" name) req;
+    List.iter (fun (n, _, _) -> pr ", %s" n) req;
 
     (* Optional parameters. *)
     if opt <> [] then
@@ -179,12 +182,139 @@ pr "\
 
     pr "  } else {\n";
     pr "    /* Remote connection. */\n";
-    pr "    abort (); /* XXX */\n";
+    pr "    struct wrap_%s_args args;\n" name;
+    pr "    struct wrap_%s_ret ret;\n" name;
+    pr "\n";
+    List.iter (fun (n, _, _) -> pr "    args.%s = %s;\n" n n) req;
+
+    if opt <> [] then assert false; (* XXX not implemented *)
+    pr "\n";
+
+    pr "    memset (&ret, 0, sizeof ret);\n";
+    pr "\n";
+
+    pr "    wrap_int_make_request (w, wrap_int_%s_num,\n" name;
+    pr "                           &args, &ret);\n";
+
+    (match ret with
+    | RVoid -> ()
+    | _ ->
+      pr "\n";
+      pr "    return ret.r;\n"
+    );
+
     pr "  }\n";
 
     pr "}\n"
   )
 
+let generate_lib_internal_procs_h api =
+  generate_header inputs CStyle LGPLv2plus;
+
+  pr "\
+#ifndef WRAPPI_INTERNAL_PROCS_H_
+#define WRAPPI_INTERNAL_PROCS_H_
+
+";
+
+  pr "\
+/* NOTE: These constants can change with each run of the generator.
+ * They are only for internal use within the library, eg. for indexing
+ * arrays.  The constants must not 'escape' from the library into
+ * on-the-wire formats etc.
+ */
+enum {
+";
+
+  iter_entry_points api (
+    fun ep -> pr "  wrap_int_%s_num,\n" ep.ep_name
+  );
+
+  pr "};\n";
+  pr "\n";
+
+  pr "#define wrap_int_nr_procs %d\n" (StringMap.cardinal api.api_entry_points);
+
+  pr "\n";
+  pr "#endif /* WRAPPI_INTERNAL_PROCS_H_ */\n"
+
+let generate_lib_internal_procs_c api =
+  generate_header inputs CStyle LGPLv2plus;
+
+  pr "\
+#include <config.h>
+
+#include <stdlib.h>
+
+#include \"wrappi.h\"
+#include \"internal.h\"
+
+/* Defined in lib/call.c */
+";
+
+  iter_entry_points api (
+    fun ep ->
+      pr "extern void wrap_int_call_%s (wrap_h *w, const void *args, void *ret);\n" ep.ep_name
+  );
+  pr "\n";
+
+  pr "/* Defined in lib/xdr.c */\n";
+
+  iter_entry_points api (
+    fun ep ->
+      let name = ep.ep_name in
+      pr "extern bool_t wrap_int_xdr_%s_args (XDR *, struct wrap_%s_args *);\n" name name;
+      pr "extern bool_t wrap_int_xdr_%s_ret (XDR *, struct wrap_%s_ret *);\n" name name
+  );
+  pr "\n";
+
+  pr "const struct proc_table wrap_int_proc_table[] = {\n";
+
+  iter_entry_points api (
+    fun ep ->
+      let name = ep.ep_name in
+      pr "  [wrap_int_%s_num] = {\n" name;
+      pr "    .name = \"%s\",\n" name;
+      pr "    .args_struct_size = sizeof (struct wrap_%s_args),\n" name;
+      pr "    .ret_struct_size = sizeof (struct wrap_%s_ret),\n" name;
+      pr "    .call = &wrap_int_call_%s,\n" name;
+      pr "    .args_xdrproc = (xdrproc_t) &wrap_int_xdr_%s_args,\n" name;
+      pr "    .ret_xdrproc = (xdrproc_t) &wrap_int_xdr_%s_ret,\n" name;
+      pr "  },\n"
+  );
+
+  pr "};\n"
+
+let generate_lib_internal_procs_lookup_gperf api =
+  generate_header inputs CStyle LGPLv2plus;
+
+  pr "\
+%%language=ANSI-C
+%%define lookup-function-name wrap_int_gperf_lookup_proc_entry
+%%readonly-tables
+%%null-strings
+
+%%{
+#include <config.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+#include \"wrappi.h\"
+#include \"internal.h\"
+%%}
+
+struct proc_entry;
+
+%%%%
+";
+
+  iter_entry_points api (
+    fun ep ->
+      let name = ep.ep_name in
+      pr "%s, wrap_int_%s_num\n" name name
+  )
+
 (* Make a unique, reproducible filename for each entry point. *)
 let filename_of_ep ep =
   let filename = Loc.file_name ep.ep_loc in
@@ -236,9 +366,18 @@ let generate api =
       )
   );
 
-  let gitignores = List.rev !gitignores in
-  output_to "lib/.gitignore"
-    (fun () -> List.iter (pr "%s\n") gitignores) ();
+  output_to "lib/internal-procs.h"
+    generate_lib_internal_procs_h api;
+
+  output_to "lib/internal-procs.c"
+    generate_lib_internal_procs_c api;
+
+  output_to "lib/internal-procs-lookup.gperf"
+    generate_lib_internal_procs_lookup_gperf api;
 
   output_to "lib/implementation_files.mk"
-    generate_lib_implementation_files_mk api
+    generate_lib_implementation_files_mk api;
+
+  let gitignores = List.rev !gitignores in
+  output_to "lib/.gitignore"
+    (fun () -> List.iter (pr "%s\n") gitignores) ()