Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/

Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/
Also remove mischievous tab character!
This is a part of getting rid of CriticalSectionWrapper and makes the code slightly simpler.

BUG=

Committed: https://crrev.com/31fc21f4545fe7ccb32eb83e5de51a07988a408e
Cr-Commit-Position: refs/heads/master@{#11346}

[tommi, 2016-01-20 17:34:47]

tommi@webrtc.org changed reviewers:
+ solenberg@webrtc.org

[tommi, 2016-01-20 17:34:48]

hej Fredrik - please take a look

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
File webrtc/voice_engine/statistics.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
webrtc/voice_engine/statistics.cc:63: rtc::CritScope cs(&lock_);
here I also reduced the scope of the lock.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
webrtc/voice_engine/statistics.cc:79: rtc::CritScope cs(&lock_);
and here too

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
webrtc/voice_engine/statistics.cc:88: rtc::CritScope cs(&lock_);
and here three...

[henrika_webrtc, 2016-01-21 08:50:48]

henrika@webrtc.org changed reviewers:
+ henrika@webrtc.org

[henrika_webrtc, 2016-01-21 08:50:48]

Soo many locks. Nice work Tommi. Imagine if we could add thread checks and
remove some of these locks (at the cost of being more strict) someday...

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.h
File webrtc/voice_engine/channel.h (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.h...
webrtc/voice_engine/channel.h:154: mutable rtc::CriticalSection lock_;
Just a question. Can we skip mutable and modify the const member method(s)?

[tommi, 2016-01-21 08:57:29]

Yes, I think there are many opportunities there to figure out what the threading
model actually is (or would make sense) and avoid many of these locks.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.h
File webrtc/voice_engine/channel.h (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.h...
webrtc/voice_engine/channel.h:154: mutable rtc::CriticalSection lock_;
On 2016/01/21 08:50:48, henrika_webrtc wrote:
> Just a question. Can we skip mutable and modify the const member method(s)?

I think it's better to do it this way and this is often the case with locks. 
The difference is that if we make a method non-const, all variables become non
const within it and current call sites that have a const pointer to the object,
cannot call the method.

[the sun, 2016-01-21 13:07:28]

Nice work!

LGTM with a few nits.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.cc
File webrtc/voice_engine/channel.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.c...
webrtc/voice_engine/channel.cc:186: mutable rtc::CriticalSection stats_lock_;
nit: No need for mutable, unless you make GetStats() const

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/dtmf_inba...
File webrtc/voice_engine/dtmf_inband.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/dtmf_inba...
webrtc/voice_engine/dtmf_inband.cc:248: _delaySinceLastToneMS +=
kDtmfFrameSizeMs;
Add CritScope; there's a a race with this function and the one above.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/dtmf_inba...
webrtc/voice_engine/dtmf_inband.cc:259: return _delaySinceLastToneMS;
Add CritScope to avoid TSAN warnings?

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
File webrtc/voice_engine/monitor_module.h (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
webrtc/voice_engine/monitor_module.h:48: mutable rtc::CriticalSection
_callbackCritSect;
nits: remove mutable, add GUARDED_BY to _observerPtr, and put lock first.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
File webrtc/voice_engine/statistics.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
webrtc/voice_engine/statistics.cc:63: rtc::CritScope cs(&lock_);
On 2016/01/20 17:34:48, tommi-webrtc wrote:
> here I also reduced the scope of the lock.

Acknowledged.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
webrtc/voice_engine/statistics.cc:79: rtc::CritScope cs(&lock_);
On 2016/01/20 17:34:48, tommi-webrtc wrote:
> and here too

Acknowledged.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/statistic...
webrtc/voice_engine/statistics.cc:88: rtc::CritScope cs(&lock_);
On 2016/01/20 17:34:48, tommi-webrtc wrote:
> and here three...

Acknowledged.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/transmit_...
File webrtc/voice_engine/transmit_mixer.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/transmit_...
webrtc/voice_engine/transmit_mixer.cc:39: rtc::CritScope cs(&_critSect);
suuuper nit: "lock" or "cs"?

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/voe_dtmf_...
File webrtc/voice_engine/voe_dtmf_impl.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/voe_dtmf_...
webrtc/voice_engine/voe_dtmf_impl.cc:199: rtc::CritScope
cs(_shared->crit_sec());
nit: transitive dependency? Include-what-you-use? A few more similar in the
other VoE interfaces.

[tommi, 2016-01-21 15:23:58]

Address comments

[tommi, 2016-01-21 15:27:22]

Remove mutable

[tommi, 2016-01-21 15:29:23]

all done except for the cs vs lock change. I figured I'd keep the original in
that file for now since the rest of the code also uses both.

oh and the branch got rebased automatically as a result of reparenting a
different branch :-/ git works in mysterious ways.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.cc
File webrtc/voice_engine/channel.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/channel.c...
webrtc/voice_engine/channel.cc:186: mutable rtc::CriticalSection stats_lock_;
On 2016/01/21 13:07:28, the sun wrote:
> nit: No need for mutable, unless you make GetStats() const

Done.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/dtmf_inba...
File webrtc/voice_engine/dtmf_inband.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/dtmf_inba...
webrtc/voice_engine/dtmf_inband.cc:248: _delaySinceLastToneMS +=
kDtmfFrameSizeMs;
On 2016/01/21 13:07:28, the sun wrote:
> Add CritScope; there's a a race with this function and the one above.

Done.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/dtmf_inba...
webrtc/voice_engine/dtmf_inband.cc:259: return _delaySinceLastToneMS;
On 2016/01/21 13:07:28, the sun wrote:
> Add CritScope to avoid TSAN warnings?

Done.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
File webrtc/voice_engine/monitor_module.h (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
webrtc/voice_engine/monitor_module.h:48: mutable rtc::CriticalSection
_callbackCritSect;
On 2016/01/21 13:07:28, the sun wrote:
> nits: remove mutable, add GUARDED_BY to _observerPtr, and put lock first.

Done.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/transmit_...
File webrtc/voice_engine/transmit_mixer.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/transmit_...
webrtc/voice_engine/transmit_mixer.cc:39: rtc::CritScope cs(&_critSect);
On 2016/01/21 13:07:28, the sun wrote:
> suuuper nit: "lock" or "cs"?

both are used throughout the code, so here I guess I just kept the original. 
Once all of this is done, doing a global |s/CritScope cs/CritScope lock| should
be possible.

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/voe_dtmf_...
File webrtc/voice_engine/voe_dtmf_impl.cc (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/voe_dtmf_...
webrtc/voice_engine/voe_dtmf_impl.cc:199: rtc::CritScope
cs(_shared->crit_sec());
On 2016/01/21 13:07:28, the sun wrote:
> nit: transitive dependency? Include-what-you-use? A few more similar in the
> other VoE interfaces.

Done.

[tommi, 2016-01-21 15:29:32]

The CQ bit was checked by tommi@webrtc.org

[tommi, 2016-01-21 15:29:32]

The patchset sent to the CQ was uploaded after l-g-t-m from solenberg@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1607353002/#ps40001 (title:
"Remove mutable")

[commit-bot: I haz the power, 2016-01-21 15:29:42]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1607353002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1607353002/40001

[commit-bot: I haz the power, 2016-01-21 15:31:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-01-21 15:31:22]

Try jobs failed on following builders:
  linux_asan on tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_asan/builds/12006)
  linux_compile_dbg on tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_compile_dbg/build...)
  linux_tsan2 on tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_tsan2/builds/9370)

[tommi, 2016-01-21 15:37:09]

Fix bug in monitor_module.cc

[tommi, 2016-01-21 15:37:15]

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
File webrtc/voice_engine/monitor_module.h (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
webrtc/voice_engine/monitor_module.h:48: mutable rtc::CriticalSection
_callbackCritSect;
On 2016/01/21 15:29:23, tommi-webrtc wrote:
> On 2016/01/21 13:07:28, the sun wrote:
> > nits: remove mutable, add GUARDED_BY to _observerPtr, and put lock first.
> 
> Done.

Oh and that nit uncovered a bug in the code! Nice.

[tommi, 2016-01-21 15:37:25]

The CQ bit was checked by tommi@webrtc.org

[tommi, 2016-01-21 15:37:25]

The patchset sent to the CQ was uploaded after l-g-t-m from solenberg@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1607353002/#ps60001 (title:
"Fix bug in monitor_module.cc")

[commit-bot: I haz the power, 2016-01-21 15:37:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1607353002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1607353002/60001

[commit-bot: I haz the power, 2016-01-21 17:37:57]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-01-21 17:37:58]

Try jobs failed on following builders:
  win_baremetal on tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[tommi, 2016-01-21 18:36:04]

The CQ bit was checked by tommi@webrtc.org

[commit-bot: I haz the power, 2016-01-21 18:36:13]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1607353002/60001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1607353002/60001

[commit-bot: I haz the power, 2016-01-21 18:37:39]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2016-01-21 18:37:53]

Description was changed from

==========
Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/
Also remove mischievous tab character!
This is a part of getting rid of CriticalSectionWrapper and makes the code
slightly simpler.

BUG=
==========

to

==========
Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/
Also remove mischievous tab character!
This is a part of getting rid of CriticalSectionWrapper and makes the code
slightly simpler.

BUG=

Committed: https://crrev.com/31fc21f4545fe7ccb32eb83e5de51a07988a408e
Cr-Commit-Position: refs/heads/master@{#11346}
==========

[commit-bot: I haz the power, 2016-01-21 18:37:54]

Patchset 4 (id:??) landed as
https://crrev.com/31fc21f4545fe7ccb32eb83e5de51a07988a408e
Cr-Commit-Position: refs/heads/master@{#11346}

[the sun, 2016-01-21 19:28:45]

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
File webrtc/voice_engine/monitor_module.h (right):

https://codereview.webrtc.org/1607353002/diff/1/webrtc/voice_engine/monitor_m...
webrtc/voice_engine/monitor_module.h:48: mutable rtc::CriticalSection
_callbackCritSect;
On 2016/01/21 15:37:15, tommi-webrtc wrote:
> On 2016/01/21 15:29:23, tommi-webrtc wrote:
> > On 2016/01/21 13:07:28, the sun wrote:
> > > nits: remove mutable, add GUARDED_BY to _observerPtr, and put lock first.
> > 
> > Done.
> 
> Oh and that nit uncovered a bug in the code! Nice.

How about that! :)