commit 3b7cc7516737f7ae563e839885b3736453a1f3bf
author Jason Sams <jsams@google.com> Wed Apr 15 02:27:19 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 15 02:27:19 2015 +0000
tree 9a332f9c01e4174fa96cbe47cb7e267fc82165f7
parent 6f48d51468551474d272d80102a6805b366a4ff6
parent 3e7e176b0625702745542679f96cdf2bcd42e242

am 3e7e176b: am 6e7f4ff0: am 54950687: Merge "Fix refcounting bug"

* commit '3e7e176b0625702745542679f96cdf2bcd42e242':
  Fix refcounting bug

rsScriptC_Lib.cpp

diff --git a/rsScriptC_Lib.cpp b/rsScriptC_Lib.cpp
index 628190d..c404bde 100644
--- a/rsScriptC_Lib.cpp
+++ b/rsScriptC_Lib.cpp
@@ -142,28 +142,11 @@
 }
 
 // Legacy, remove when drivers are updated
-void rsrSetObject(const Context *rsc, void *dst, ObjectBase *src) {
-    ObjectBase **odst = (ObjectBase **)dst;
-    //ALOGE("rsrSetObject (base) %p,%p  %p", dst, *odst, src);
-    SetObjectRef(rsc, odst[0], src);
-    if (src != nullptr) {
-        src->callUpdateCacheObject(rsc, dst);
-    }
-}
-
-void rsrSetObject(const Context *rsc, rs_object_base *dst, const ObjectBase *src) {
-    ObjectBase **odst = (ObjectBase **)dst;
-    //ALOGE("rsrSetObject (base) %p,%p  %p", dst, *odst, src);
-    SetObjectRef(rsc, odst[0], src);
-    if (src != nullptr) {
-        src->callUpdateCacheObject(rsc, dst);
-    }
-}
-
-// Legacy, remove when drivers are updated
 void rsrClearObject(const Context *rsc, void *dst) {
     ObjectBase **odst = (ObjectBase **)dst;
-    //ALOGE("rsrClearObject  %p,%p", odst, *odst);
+    if (ObjectBase::gDebugReferences) {
+        ALOGE("rsrClearObject  %p,%p", odst, *odst);
+    }
     if (odst[0]) {
         CHECK_OBJ(odst[0]);
         odst[0]->decSysRef();
@@ -172,7 +155,9 @@
 }
 
 void rsrClearObject(const Context *rsc, rs_object_base *dst) {
-    //ALOGE("rsrClearObject  %p,%p", odst, *odst);
+    if (ObjectBase::gDebugReferences) {
+        ALOGE("rsrClearObject  %p,%p", dst, dst->p);
+    }
     if (dst->p) {
         CHECK_OBJ(dst->p);
         dst->p->decSysRef();
@@ -181,6 +166,35 @@
 }
 
 // Legacy, remove when drivers are updated
+void rsrSetObject(const Context *rsc, void *dst, ObjectBase *src) {
+    if (src == nullptr) {
+        rsrClearObject(rsc, dst);
+        return;
+    }
+
+    ObjectBase **odst = (ObjectBase **)dst;
+    if (ObjectBase::gDebugReferences) {
+        ALOGE("rsrSetObject (base) %p,%p  %p", dst, *odst, src);
+    }
+    SetObjectRef(rsc, odst[0], src);
+    src->callUpdateCacheObject(rsc, dst);
+}
+
+void rsrSetObject(const Context *rsc, rs_object_base *dst, const ObjectBase *src) {
+    if (src == nullptr) {
+        rsrClearObject(rsc, dst);
+        return;
+    }
+
+    ObjectBase **odst = (ObjectBase **)dst;
+    if (ObjectBase::gDebugReferences) {
+        ALOGE("rsrSetObject (base) %p,%p  %p", dst, *odst, src);
+    }
+    SetObjectRef(rsc, odst[0], src);
+    src->callUpdateCacheObject(rsc, dst);
+}
+
+// Legacy, remove when drivers are updated
 bool rsrIsObject(const Context *, ObjectBase* src) {
     ObjectBase **osrc = (ObjectBase **)src;
     return osrc != nullptr;