commit 86a112bdfae618d6538307839a6c39555bceb79d
author Andreas Huber <andih@google.com> Wed Oct 19 14:25:16 2016 -0700
committer Andreas Huber <andih@google.com> Fri Oct 21 09:11:14 2016 -0700
tree 2a75125999a8a0d7c463196effec6fd510996ffb
parent b054e8c630f27fbc53ea766cf0de2a9f7f4d155a

Special consideration for passing vec<interface> or vec<IFoo> to and from

methods. These remain unsupported inside structures.

Bug: 30570663
Test: hidl_test
Change-Id: Ic19db58d3c3ae8caa85a773a143fc148fd8affb6

VectorType.cpp

diff --git a/VectorType.cpp b/VectorType.cpp
index d7eb581..461a05b 100644
--- a/VectorType.cpp
+++ b/VectorType.cpp
@@ -30,11 +30,20 @@
     mElementType->addNamedTypesToSet(set);
 }
 
+bool VectorType::isVector() const {
+    return true;
+}
+
+bool VectorType::isVectorOfBinders() const {
+    return mElementType->isBinder();
+}
+
 std::string VectorType::getCppType(StorageMode mode,
                                    std::string *extra,
                                    bool specifyNamespaces) const {
     std::string elementExtra;
-    const std::string elementBase = mElementType->getCppType(&elementExtra, specifyNamespaces);
+    const std::string elementBase =
+        mElementType->getCppType(&elementExtra, specifyNamespaces);
 
     const std::string base =
           std::string(specifyNamespaces ? "::android::hardware::" : "")
@@ -53,7 +62,13 @@
             return "const " + base + "&";
 
         case StorageMode_Result:
+        {
+            if (isVectorOfBinders()) {
+                return base;
+            }
+
             return "const " + base + "*";
+        }
     }
 }
 
@@ -84,6 +99,13 @@
         bool parcelObjIsPointer,
         bool isReader,
         ErrorMode mode) const {
+    if (isVectorOfBinders()) {
+        emitReaderWriterForVectorOfBinders(
+                out, name, parcelObj, parcelObjIsPointer, isReader, mode);
+
+        return;
+    }
+
     std::string baseExtra;
     std::string baseType = mElementType->getCppType(&baseExtra);
 
@@ -142,6 +164,92 @@
             "0 /* parentOffset */");
 }
 
+void VectorType::emitReaderWriterForVectorOfBinders(
+        Formatter &out,
+        const std::string &name,
+        const std::string &parcelObj,
+        bool parcelObjIsPointer,
+        bool isReader,
+        ErrorMode mode) const {
+    const std::string parcelObjDeref =
+        parcelObj + (parcelObjIsPointer ? "->" : ".");
+
+    if (isReader) {
+        out << "{\n";
+        out.indent();
+
+        const std::string sizeName = "_hidl_" + name + "_size";
+
+        out << "uint64_t "
+            << sizeName
+            << ";\n";
+
+        out << "_hidl_err = "
+            << parcelObjDeref
+            << "readUint64(&"
+            << sizeName
+            << ");\n";
+
+        handleError(out, mode);
+
+        out << name
+            << ".resize("
+            << sizeName
+            << ");\n\n"
+            << "for (size_t _hidl_index = 0; _hidl_index < "
+            << sizeName
+            << "; ++_hidl_index) {\n";
+
+        out.indent();
+
+        std::string extra;
+        out << mElementType->getCppType(&extra, true /* specifyNamespaces */)
+            << " _hidl_binder;\n";
+
+        mElementType->emitReaderWriter(
+                out,
+                "_hidl_binder",
+                parcelObj,
+                parcelObjIsPointer,
+                isReader,
+                mode);
+
+        out << name
+            << "[_hidl_index] = _hidl_binder;\n";
+
+        out.unindent();
+        out << "}\n";
+
+        out.unindent();
+        out << "}\n";
+    } else {
+        out << "_hidl_err = "
+            << parcelObjDeref
+            << "writeUint64("
+            << name
+            << ".size());\n";
+
+        handleError(out, mode);
+
+        out << "for (size_t _hidl_index = 0; _hidl_index < "
+            << name
+            << ".size(); ++_hidl_index) {\n";
+
+        out.indent();
+
+        mElementType->emitReaderWriter(
+                out,
+                name + "[_hidl_index]",
+                parcelObj,
+                parcelObjIsPointer,
+                isReader,
+                mode);
+
+        out.unindent();
+        out << "}\n";
+    }
+}
+
 void VectorType::emitReaderWriterEmbedded(
         Formatter &out,
         size_t depth,
@@ -580,7 +688,7 @@
 }
 
 bool VectorType::resultNeedsDeref() const {
-    return true;
+    return !isVectorOfBinders();
 }
 
 status_t VectorType::emitVtsTypeDeclarations(Formatter &out) const {
@@ -621,6 +729,10 @@
         return false;
     }
 
+    if (isVectorOfBinders()) {
+        return false;
+    }
+
     return true;
 }