Merge "libbinder: Move vector writing templates to header" am: e1aa1c7e13 am: 709ae9a0a5
am: 14b02baada
* commit '14b02baadaa7143c5e059ab0e58c48c1a39de14b':
libbinder: Move vector writing templates to header
diff --git a/Parcel.cpp b/Parcel.cpp
index 1d6ec9e..59c85fe 100644
--- a/Parcel.cpp
+++ b/Parcel.cpp
@@ -336,39 +336,6 @@
return BAD_TYPE;
}
-namespace {
-
-template<typename T>
-status_t readTypedVector(std::vector<T>* val, const Parcel* p,
- status_t(Parcel::*read_func)(T*) const) {
- val->clear();
-
- int32_t size;
- status_t status = p->readInt32(&size);
-
- if (status != OK) {
- return status;
- }
-
- if (size < 0) {
- return UNEXPECTED_NULL;
- }
-
- val->resize(size);
-
- for (auto& v: *val) {
- status = (p->*read_func)(&v);
-
- if (status != OK) {
- return status;
- }
- }
-
- return OK;
-}
-
-} // namespace
-
// ---------------------------------------------------------------------------
Parcel::Parcel()
@@ -774,46 +741,6 @@
return NULL;
}
-namespace {
-
-template<typename T, typename U>
-status_t unsafeWriteTypedVector(const std::vector<T>& val, Parcel* p,
- status_t(Parcel::*write_func)(U)) {
- if (val.size() > std::numeric_limits<int32_t>::max()) {
- return BAD_VALUE;
- }
-
- status_t status = p->writeInt32(val.size());
-
- if (status != OK) {
- return status;
- }
-
- for (const auto& item : val) {
- status = (p->*write_func)(item);
-
- if (status != OK) {
- return status;
- }
- }
-
- return OK;
-}
-
-template<typename T>
-status_t writeTypedVector(const std::vector<T>& val, Parcel* p,
- status_t(Parcel::*write_func)(const T&)) {
- return unsafeWriteTypedVector(val, p, write_func);
-}
-
-template<typename T>
-status_t writeTypedVector(const std::vector<T>& val, Parcel* p,
- status_t(Parcel::*write_func)(T)) {
- return unsafeWriteTypedVector(val, p, write_func);
-}
-
-} // namespace
-
status_t Parcel::writeByteVector(const std::vector<int8_t>& val)
{
status_t status;
@@ -839,37 +766,37 @@
status_t Parcel::writeInt32Vector(const std::vector<int32_t>& val)
{
- return writeTypedVector(val, this, &Parcel::writeInt32);
+ return writeTypedVector(val, &Parcel::writeInt32);
}
status_t Parcel::writeInt64Vector(const std::vector<int64_t>& val)
{
- return writeTypedVector(val, this, &Parcel::writeInt64);
+ return writeTypedVector(val, &Parcel::writeInt64);
}
status_t Parcel::writeFloatVector(const std::vector<float>& val)
{
- return writeTypedVector(val, this, &Parcel::writeFloat);
+ return writeTypedVector(val, &Parcel::writeFloat);
}
status_t Parcel::writeDoubleVector(const std::vector<double>& val)
{
- return writeTypedVector(val, this, &Parcel::writeDouble);
+ return writeTypedVector(val, &Parcel::writeDouble);
}
status_t Parcel::writeBoolVector(const std::vector<bool>& val)
{
- return writeTypedVector(val, this, &Parcel::writeBool);
+ return writeTypedVector(val, &Parcel::writeBool);
}
status_t Parcel::writeCharVector(const std::vector<char16_t>& val)
{
- return writeTypedVector(val, this, &Parcel::writeChar);
+ return writeTypedVector(val, &Parcel::writeChar);
}
status_t Parcel::writeString16Vector(const std::vector<String16>& val)
{
- return writeTypedVector(val, this, &Parcel::writeString16);
+ return writeTypedVector(val, &Parcel::writeString16);
}
status_t Parcel::writeInt32(int32_t val)
@@ -1018,11 +945,11 @@
status_t Parcel::writeStrongBinderVector(const std::vector<sp<IBinder>>& val)
{
- return writeTypedVector(val, this, &Parcel::writeStrongBinder);
+ return writeTypedVector(val, &Parcel::writeStrongBinder);
}
status_t Parcel::readStrongBinderVector(std::vector<sp<IBinder>>* val) const {
- return readTypedVector(val, this, &Parcel::readStrongBinder);
+ return readTypedVector(val, &Parcel::readStrongBinder);
}
status_t Parcel::writeWeakBinder(const wp<IBinder>& val)
@@ -1343,19 +1270,19 @@
}
status_t Parcel::readInt32Vector(std::vector<int32_t>* val) const {
- return readTypedVector(val, this, &Parcel::readInt32);
+ return readTypedVector(val, &Parcel::readInt32);
}
status_t Parcel::readInt64Vector(std::vector<int64_t>* val) const {
- return readTypedVector(val, this, &Parcel::readInt64);
+ return readTypedVector(val, &Parcel::readInt64);
}
status_t Parcel::readFloatVector(std::vector<float>* val) const {
- return readTypedVector(val, this, &Parcel::readFloat);
+ return readTypedVector(val, &Parcel::readFloat);
}
status_t Parcel::readDoubleVector(std::vector<double>* val) const {
- return readTypedVector(val, this, &Parcel::readDouble);
+ return readTypedVector(val, &Parcel::readDouble);
}
status_t Parcel::readBoolVector(std::vector<bool>* val) const {
@@ -1391,11 +1318,11 @@
}
status_t Parcel::readCharVector(std::vector<char16_t>* val) const {
- return readTypedVector(val, this, &Parcel::readChar);
+ return readTypedVector(val, &Parcel::readChar);
}
status_t Parcel::readString16Vector(std::vector<String16>* val) const {
- return readTypedVector(val, this, &Parcel::readString16);
+ return readTypedVector(val, &Parcel::readString16);
}
diff --git a/include/hwbinder/Parcel.h b/include/hwbinder/Parcel.h
index 430c3ff..f50463e 100644
--- a/include/hwbinder/Parcel.h
+++ b/include/hwbinder/Parcel.h
@@ -296,6 +296,22 @@
template<class T>
status_t writeAligned(T val);
+ template<typename T, typename U>
+ status_t unsafeReadTypedVector(std::vector<T>* val,
+ status_t(Parcel::*read_func)(U*) const) const;
+ template<typename T>
+ status_t readTypedVector(std::vector<T>* val,
+ status_t(Parcel::*read_func)(T*) const) const;
+ template<typename T, typename U>
+ status_t unsafeWriteTypedVector(const std::vector<T>& val,
+ status_t(Parcel::*write_func)(U));
+ template<typename T>
+ status_t writeTypedVector(const std::vector<T>& val,
+ status_t(Parcel::*write_func)(const T&));
+ template<typename T>
+ status_t writeTypedVector(const std::vector<T>& val,
+ status_t(Parcel::*write_func)(T));
+
status_t mError;
uint8_t* mData;
size_t mDataSize;
@@ -458,6 +474,77 @@
return ret;
}
+template<typename T, typename U>
+status_t Parcel::unsafeReadTypedVector(
+ std::vector<T>* val, status_t(Parcel::*read_func)(U*) const) const {
+ val->clear();
+
+ int32_t size;
+ status_t status = this->readInt32(&size);
+
+ if (status != OK) {
+ return status;
+ }
+
+ if (size < 0) {
+ return UNEXPECTED_NULL;
+ }
+
+ val->resize(size);
+
+ for (auto& v: *val) {
+ status = (this->*read_func)(&v);
+
+ if (status != OK) {
+ return status;
+ }
+ }
+
+ return OK;
+}
+
+template<typename T>
+status_t Parcel::readTypedVector(std::vector<T>* val,
+ status_t(Parcel::*read_func)(T*) const) const {
+ return unsafeReadTypedVector(val, read_func);
+}
+
+template<typename T, typename U>
+status_t Parcel::unsafeWriteTypedVector(const std::vector<T>& val,
+ status_t(Parcel::*write_func)(U)) {
+ if (val.size() > std::numeric_limits<int32_t>::max()) {
+ return BAD_VALUE;
+ }
+
+ status_t status = this->writeInt32(val.size());
+
+ if (status != OK) {
+ return status;
+ }
+
+ for (const auto& item : val) {
+ status = (this->*write_func)(item);
+
+ if (status != OK) {
+ return status;
+ }
+ }
+
+ return OK;
+}
+
+template<typename T>
+status_t Parcel::writeTypedVector(const std::vector<T>& val,
+ status_t(Parcel::*write_func)(const T&)) {
+ return unsafeWriteTypedVector(val, write_func);
+}
+
+template<typename T>
+status_t Parcel::writeTypedVector(const std::vector<T>& val,
+ status_t(Parcel::*write_func)(T)) {
+ return unsafeWriteTypedVector(val, write_func);
+}
+
// ---------------------------------------------------------------------------
inline TextOutput& operator<<(TextOutput& to, const Parcel& parcel)