diff options
| -rw-r--r-- | base/event.cc | 17 | ||||
| -rw-r--r-- | xmpp/constants.cc | 1 | ||||
| -rw-r--r-- | xmpp/constants.h | 1 |
3 files changed, 17 insertions, 2 deletions
diff --git a/base/event.cc b/base/event.cc index 6089c8c..410c658 100644 --- a/base/event.cc +++ b/base/event.cc @@ -103,10 +103,16 @@ bool Event::Wait(int cms) { // Converting from seconds and microseconds (1e-6) plus // milliseconds (1e-3) to seconds and nanoseconds (1e-9). + struct timespec ts; +#if HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE + // Use relative time version, which tends to be more efficient for + // pthread implementations where provided (like on Android). + ts.tv_sec = cms / 1000; + ts.tv_nsec = (cms % 1000) * 1000000; +#else struct timeval tv; gettimeofday(&tv, NULL); - struct timespec ts; ts.tv_sec = tv.tv_sec + (cms / 1000); ts.tv_nsec = tv.tv_usec * 1000 + (cms % 1000) * 1000000; @@ -115,9 +121,16 @@ bool Event::Wait(int cms) { ts.tv_sec++; ts.tv_nsec -= 1000000000; } +#endif - while (!event_status_ && error == 0) + while (!event_status_ && error == 0) { +#if HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE + error = pthread_cond_timedwait_relative_np( + &event_cond_, &event_mutex_, &ts); +#else error = pthread_cond_timedwait(&event_cond_, &event_mutex_, &ts); +#endif + } } else { while (!event_status_ && error == 0) error = pthread_cond_wait(&event_cond_, &event_mutex_); diff --git a/xmpp/constants.cc b/xmpp/constants.cc index c56796b..b1febd8 100644 --- a/xmpp/constants.cc +++ b/xmpp/constants.cc @@ -118,6 +118,7 @@ const char STR_MUC_ROOM_FEATURE_HANGOUT[] = "muc_es"; const char STR_MUC_ROOM_FEATURE_HANGOUT_LITE[] = "muc_lite"; const char STR_MUC_ROOM_FEATURE_BROADCAST[] = "broadcast"; const char STR_MUC_ROOM_FEATURE_MULTI_USER_VC[] = "muc_muvc"; +const char STR_MUC_ROOM_OWNER_PROFILE_ID[] = "muc#roominfo_owner_profile_id"; const char STR_ID_TYPE_CONVERSATION[] = "conversation"; const char NS_GOOGLE_MUC_HANGOUT[] = "google:muc#hangout"; diff --git a/xmpp/constants.h b/xmpp/constants.h index c53abb5..2533e1e 100644 --- a/xmpp/constants.h +++ b/xmpp/constants.h @@ -111,6 +111,7 @@ extern const char STR_MUC_ROOM_FEATURE_HANGOUT[]; extern const char STR_MUC_ROOM_FEATURE_HANGOUT_LITE[]; extern const char STR_MUC_ROOM_FEATURE_BROADCAST[]; extern const char STR_MUC_ROOM_FEATURE_MULTI_USER_VC[]; +extern const char STR_MUC_ROOM_OWNER_PROFILE_ID[]; extern const char STR_ID_TYPE_CONVERSATION[]; extern const char NS_GOOGLE_MUC_HANGOUT[]; |