From 63517ff7e42ca558fabf897e044be3ef6bb066b9 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Thu, 2 Jan 2020 19:17:53 +0900 Subject: [PATCH] fixup! Avoid infinite blocking on internalWait() by replacing cond_wait with cond_timedwait [Version] 0.5.24 [Issue Type] Bug Change-Id: Ic116edc1ee4a23c2c6a3c5bd3cf4ae96e414b3b8 --- packaging/capi-media-audio-io.spec | 2 +- src/cpp/CAudioIO.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packaging/capi-media-audio-io.spec b/packaging/capi-media-audio-io.spec index 11038f3..bf33384 100644 --- a/packaging/capi-media-audio-io.spec +++ b/packaging/capi-media-audio-io.spec @@ -1,6 +1,6 @@ Name: capi-media-audio-io Summary: An Audio Input & Audio Output library in Tizen Native API -Version: 0.5.23 +Version: 0.5.24 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/cpp/CAudioIO.cpp b/src/cpp/CAudioIO.cpp index bda8400..c39ec15 100644 --- a/src/cpp/CAudioIO.cpp +++ b/src/cpp/CAudioIO.cpp @@ -116,9 +116,10 @@ void CAudioIO::internalWait() { until_ts.tv_sec = until.tv_sec; until_ts.tv_nsec = until.tv_usec * 1000UL; - if (pthread_cond_timedwait(&__mCond, &__mCondMutex, &until_ts) != 0) { + int ret = pthread_cond_timedwait(&__mCond, &__mCondMutex, &until_ts); + if (ret != 0) { char str_error[256]; - AUDIO_IO_LOGE("pthread_cond_timedwait error=%s", strerror_r(errno, str_error, sizeof(str_error))); + AUDIO_IO_LOGE("pthread_cond_timedwait error=[%d][%s]", ret, strerror_r(ret, str_error, sizeof(str_error))); } pthread_mutex_unlock(&__mCondMutex); -- 2.7.4