idl: support pass-by-reference for input/output args

Author: jengelh

tools/exmidl.pl

@@ -12,7 +12,7 @@
 );
 
 if ($gen_mode eq "CLN" || $gen_mode eq "SDP") {
-	print "#include <$_>\n" for qw(cstring gromox/exmdb_client.hpp gromox/exmdb_rpc.hpp);
+	print "#include <$_>\n" for qw(cstring utility gromox/exmdb_client.hpp gromox/exmdb_rpc.hpp);
 	if ($gen_mode eq "SDP") {
 		print "#include <$_>\n" for qw(gromox/exmdb_common_util.hpp gromox/exmdb_ext.hpp gromox/exmdb_provider_client.hpp gromox/exmdb_server.hpp);
 	}
@@ -56,8 +56,8 @@
 			print "\tauto &r = *r1;\n";
 		}
 		print "\treturn exmdb_server::$func(", join(", ", "q0->dir",
-			(map { my($type, $field) = @$_; "q.$field"; } @$iargs),
-			(map { my($type, $field) = @$_; "&r.$field"; } @$oargs),
+			(map { my($type, $field) = @$_; (substr($type, -1, 1) eq "&" ? "*" : "")."q.$field"; } @$iargs),
+			(map { my($type, $field) = @$_; (substr($type, -1, 1) eq "&" ? "" : "&")."r.$field"; } @$oargs),
 		), ");\n}\n";
 		next;
 	}
@@ -68,6 +68,11 @@
 		my($type, $field) = @$_;
 		if (substr($type, -1, 1) eq "*") {
 			print ", deconst($field)";
+		} elsif (substr($type, -1, 1) eq "&") {
+			# struct members should continue to use a pointer,
+			# because refs are so awkward to assign (more so during
+			# deserialization than with serialization)
+			print ", deconst(&$field)";
 		} else {
 			print ", $field";
 		}
@@ -76,7 +81,8 @@
 	print "\tif (!exmdb_client_do_rpc(&q, &r))\n\t\treturn false;\n";
 	for (@$oargs) {
 		my($type, $field) = @$_;
-		print "\t*$field = r.$field;\n";
+		print "\t", (substr($type, -1, 1) eq "&" ? "" : "*"),
+		      "$field = std::move(r.$field);\n";
 	}
 	print "\treturn TRUE;\n}\n\n";
 }

tools/zcidl.pl

@@ -11,7 +11,7 @@
 );
 
 if ($gen_mode eq "CLN") {
-	print "#include <$_>\n" for qw(gromox/defs.h gromox/zcore_client.hpp gromox/zcore_rpc.hpp);
+	print "#include <$_>\n" for qw(utility gromox/defs.h gromox/zcore_client.hpp gromox/zcore_rpc.hpp);
 	print "#include \"$_\"\n" for qw(php.h);
 }
 
@@ -39,8 +39,8 @@
 			print "\tauto &r = *r1;\n";
 		}
 		print "\tr0->result = zs_$func(", join(", ",
-			(map { my($type, $field) = @$_; "q.$field"; } @$iargs),
-			(map { my($type, $field) = @$_; "&r.$field"; } @$oargs),
+			(map { my($type, $field) = @$_; (substr($type, -1, 1) eq "&" ? "*" : "")."q.$field"; } @$iargs),
+			(map { my($type, $field) = @$_; (substr($type, -1, 1) eq "&" ? "" : "&")."r.$field"; } @$oargs),
 		), ");\n";
 		print "\tbreak;\n}\n";
 		next;
@@ -52,6 +52,8 @@
 		my($type, $field) = @$_;
 		if (substr($type, -1, 1) eq "*") {
 			print ", deconst($field)";
+		} elsif (substr($type, -1, 1) eq "&") {
+			print ", deconst(&$field)";
 		} else {
 			print ", $field";
 		}
@@ -63,7 +65,8 @@
 	}
 	for (@$oargs) {
 		my($type, $field) = @$_;
-		print "\t*$field = r.$field;\n";
+		print "\t", (substr($type, -1, 1) eq "&" ? "" : "*"),
+		      "$field = std::move(r.$field);\n";
 	}
 	print "\treturn r.result;\n}\n\n";
 }