generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle $LAST_P10_REVISION-> $NEW_P10_REVISION

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@5572 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-02-18 22:28:52 +00:00
parent 27c6980239
commit 5cf3e8f0f0
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
talk/base/event.cc
View File

@@ -103,10 +103,16 @@ bool Event::Wait(int cms) {
// Converting from seconds and microseconds (1e-6) plus // Converting from seconds and microseconds (1e-6) plus
// milliseconds (1e-3) to seconds and nanoseconds (1e-9). // 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; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
struct timespec ts;
ts.tv_sec = tv.tv_sec + (cms / 1000); ts.tv_sec = tv.tv_sec + (cms / 1000);
ts.tv_nsec = tv.tv_usec * 1000 + (cms % 1000) * 1000000; ts.tv_nsec = tv.tv_usec * 1000 + (cms % 1000) * 1000000;
@@ -115,9 +121,16 @@ bool Event::Wait(int cms) {
ts.tv_sec++; ts.tv_sec++;
ts.tv_nsec -= 1000000000; 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); error = pthread_cond_timedwait(&event_cond_, &event_mutex_, &ts);
#endif
}
} else { } else {
while (!event_status_ && error == 0) while (!event_status_ && error == 0)
error = pthread_cond_wait(&event_cond_, &event_mutex_); error = pthread_cond_wait(&event_cond_, &event_mutex_);

1
talk/xmpp/constants.cc
View File

@@ -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_HANGOUT_LITE[] = "muc_lite";
const char STR_MUC_ROOM_FEATURE_BROADCAST[] = "broadcast"; const char STR_MUC_ROOM_FEATURE_BROADCAST[] = "broadcast";
const char STR_MUC_ROOM_FEATURE_MULTI_USER_VC[] = "muc_muvc"; 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 STR_ID_TYPE_CONVERSATION[] = "conversation";
const char NS_GOOGLE_MUC_HANGOUT[] = "google:muc#hangout"; const char NS_GOOGLE_MUC_HANGOUT[] = "google:muc#hangout";

1
talk/xmpp/constants.h
View File

@@ -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_HANGOUT_LITE[];
extern const char STR_MUC_ROOM_FEATURE_BROADCAST[]; extern const char STR_MUC_ROOM_FEATURE_BROADCAST[];
extern const char STR_MUC_ROOM_FEATURE_MULTI_USER_VC[]; 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 STR_ID_TYPE_CONVERSATION[];
extern const char NS_GOOGLE_MUC_HANGOUT[]; extern const char NS_GOOGLE_MUC_HANGOUT[];