summaryrefslogtreecommitdiffstats
path: root/src/itf
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-10-14 12:44:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-14 12:44:01 -0700
commitb5b68e8d3b4420eed7cb18cac212c28af138048e (patch)
tree88b07430a8cbd85dbe625a76a6b30804e39ddca6 /src/itf
parent0e5f0772fac49acfed60f0dcdf02e97fc5e3b5d7 (diff)
parent9c56ff31ba35f87294e6f44107a7815913f973bc (diff)
downloadandroid_frameworks_wilhelm-b5b68e8d3b4420eed7cb18cac212c28af138048e.tar.gz
android_frameworks_wilhelm-b5b68e8d3b4420eed7cb18cac212c28af138048e.tar.bz2
android_frameworks_wilhelm-b5b68e8d3b4420eed7cb18cac212c28af138048e.zip
am fcdc9c4c: Merge "Improved deadlock detection logs." into ics-mr0
* commit 'fcdc9c4cc7da7044f92399b1b5c7a4ddd5fec3b4': Improved deadlock detection logs.
Diffstat (limited to 'src/itf')
-rw-r--r--src/itf/IObject.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/itf/IObject.c b/src/itf/IObject.c
index 98f27ec..befe939 100644
--- a/src/itf/IObject.c
+++ b/src/itf/IObject.c
@@ -775,6 +775,7 @@ void IObject_init(void *self)
memset(&thiz->mOwner, 0, sizeof(pthread_t));
thiz->mFile = NULL;
thiz->mLine = 0;
+ thiz->mGeneration = 0;
#endif
ok = pthread_cond_init(&thiz->mCond, (const pthread_condattr_t *) NULL);
assert(0 == ok);