103f3289b5
We apparently hit an obscure problem on mac where seemingly an unaligned mutex causes memory corruption. The effect was that the |modules_| list became corrupt and we crashed. At this point I'm not exactly sure what the alignment requirements are but for now, I've fixed up the layout in a way that doesn't cause these same issues. I'm also changing auto->proper type at the request of drive by reviewers from my previous cl in the same file. TBR=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/38989004 Cr-Commit-Position: refs/heads/master@{#8286} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8286 4adac7df-926f-26a2-2b94-8c16560cd09d
80 lines
2.5 KiB
C++
80 lines
2.5 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_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
|
|
#define WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
|
|
|
|
#include <list>
|
|
|
|
#include "webrtc/base/criticalsection.h"
|
|
#include "webrtc/base/thread_checker.h"
|
|
#include "webrtc/modules/utility/interface/process_thread.h"
|
|
#include "webrtc/system_wrappers/interface/event_wrapper.h"
|
|
#include "webrtc/system_wrappers/interface/thread_wrapper.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class ProcessThreadImpl : public ProcessThread {
|
|
public:
|
|
ProcessThreadImpl();
|
|
~ProcessThreadImpl() override;
|
|
|
|
int32_t Start() override;
|
|
int32_t Stop() override;
|
|
|
|
void WakeUp(Module* module) override;
|
|
|
|
int32_t RegisterModule(Module* module) override;
|
|
int32_t DeRegisterModule(const Module* module) override;
|
|
|
|
protected:
|
|
static bool Run(void* obj);
|
|
bool Process();
|
|
|
|
private:
|
|
struct ModuleCallback {
|
|
ModuleCallback() : module(nullptr), next_callback(0) {}
|
|
ModuleCallback(const ModuleCallback& cb)
|
|
: module(cb.module), next_callback(cb.next_callback) {}
|
|
ModuleCallback(Module* module) : module(module), next_callback(0) {}
|
|
bool operator==(const ModuleCallback& cb) const {
|
|
return cb.module == module;
|
|
}
|
|
|
|
Module* const module;
|
|
int64_t next_callback; // Absolute timestamp.
|
|
|
|
private:
|
|
ModuleCallback& operator=(ModuleCallback&);
|
|
};
|
|
|
|
typedef std::list<ModuleCallback> ModuleList;
|
|
|
|
// Warning: For some reason, if |lock_| comes immediately before |modules_|
|
|
// with the current class layout, we will start to have mysterious crashes
|
|
// on Mac 10.9 debug. I (Tommi) suspect we're hitting some obscure alignemnt
|
|
// issues, but I haven't figured out what they are, if there are alignment
|
|
// requirements for mutexes on Mac or if there's something else to it.
|
|
// So be careful with changing the layout.
|
|
rtc::CriticalSection lock_; // Used to guard modules_ and stop_.
|
|
|
|
rtc::ThreadChecker thread_checker_;
|
|
const rtc::scoped_ptr<EventWrapper> wake_up_;
|
|
rtc::scoped_ptr<ThreadWrapper> thread_;
|
|
|
|
ModuleList modules_;
|
|
bool stop_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_UTILITY_SOURCE_PROCESS_THREAD_IMPL_H_
|