53cf3463c0
The intended signalling from StartTimer() to Process() is that created_at_.tv_sec is set to 0, and timer_event_->Set() is then called in order to wake the process thread from timer_event_->Wait(). When this happens the process thread will return early and the run Process() again. This time it will pick up created_at_.tv_sec = 0 and run a new Wait() call with the desired end time. However if the process thread was NOT blocking on timer_event_->Wait() when timer_event_->Set() was called from StartTimer() it will mean that the first call to timer_event_->Wait() from Process(), AFTER the new time has been configured (count_ = 1), will return early. If the timer is not periodic it means that Set() will never be called, and any calls will Wait() will block until the time out. The solution is to always reset the event in timer_event_ on the first call to timerEvent_->Wait(), after a timer has started. Also some general cleanup. BUG= Review URL: https://codereview.webrtc.org/1812533002 Cr-Commit-Position: refs/heads/master@{#12082}
66 lines
1.6 KiB
C++
66 lines
1.6 KiB
C++
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
|
|
#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
|
|
|
|
#include "webrtc/system_wrappers/include/event_wrapper.h"
|
|
|
|
#include <pthread.h>
|
|
#include <time.h>
|
|
|
|
#include "webrtc/base/platform_thread.h"
|
|
|
|
namespace webrtc {
|
|
|
|
enum State {
|
|
kUp = 1,
|
|
kDown = 2
|
|
};
|
|
|
|
class EventTimerPosix : public EventTimerWrapper {
|
|
public:
|
|
EventTimerPosix();
|
|
~EventTimerPosix() override;
|
|
|
|
EventTypeWrapper Wait(unsigned long max_time) override;
|
|
bool Set() override;
|
|
|
|
bool StartTimer(bool periodic, unsigned long time) override;
|
|
bool StopTimer() override;
|
|
|
|
private:
|
|
friend class EventTimerPosixTest;
|
|
|
|
static bool Run(void* obj);
|
|
bool Process();
|
|
EventTypeWrapper Wait(timespec* end_at, bool reset_state);
|
|
|
|
virtual rtc::PlatformThread* CreateThread();
|
|
|
|
pthread_cond_t cond_;
|
|
pthread_mutex_t mutex_;
|
|
bool event_set_;
|
|
|
|
// TODO(pbos): Remove scoped_ptr and use PlatformThread directly.
|
|
rtc::scoped_ptr<rtc::PlatformThread> timer_thread_;
|
|
rtc::scoped_ptr<EventTimerPosix> timer_event_;
|
|
timespec created_at_;
|
|
|
|
bool periodic_;
|
|
unsigned long time_ms_;
|
|
unsigned long count_;
|
|
bool is_stopping_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_EVENT_POSIX_H_
|