Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(504)

Unified Diff: webrtc/base/java/src/org/webrtc/ThreadUtils.java

Issue 1459123002: Revert of Adding thread timeout for audio recorer thread in Java (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/base/java/src/org/webrtc/ThreadUtils.java
diff --git a/webrtc/base/java/src/org/webrtc/ThreadUtils.java b/webrtc/base/java/src/org/webrtc/ThreadUtils.java
deleted file mode 100644
index 3536fec658a0dcd9af5839e45aaedca7c4c31a53..0000000000000000000000000000000000000000
--- a/webrtc/base/java/src/org/webrtc/ThreadUtils.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2015 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.
- */
-
-package org.webrtc;
-
-import android.os.Handler;
-import android.os.SystemClock;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public final class ThreadUtils {
- /**
- * Utility class to be used for checking that a method is called on the correct thread.
- */
- public static class ThreadChecker {
- private Thread thread = Thread.currentThread();
-
- public void checkIsOnValidThread() {
- if (thread == null) {
- thread = Thread.currentThread();
- }
- if (Thread.currentThread() != thread) {
- throw new IllegalStateException("Wrong thread");
- }
- }
-
- public void detachThread() {
- thread = null;
- }
- }
-
- /**
- * Utility interface to be used with executeUninterruptibly() to wait for blocking operations
- * to complete without getting interrupted..
- */
- public interface BlockingOperation {
- void run() throws InterruptedException;
- }
-
- /**
- * Utility method to make sure a blocking operation is executed to completion without getting
- * interrupted. This should be used in cases where the operation is waiting for some critical
- * work, e.g. cleanup, that must complete before returning. If the thread is interrupted during
- * the blocking operation, this function will re-run the operation until completion, and only then
- * re-interrupt the thread.
- */
- public static void executeUninterruptibly(BlockingOperation operation) {
- boolean wasInterrupted = false;
- while (true) {
- try {
- operation.run();
- break;
- } catch (InterruptedException e) {
- // Someone is asking us to return early at our convenience. We can't cancel this operation,
- // but we should preserve the information and pass it along.
- wasInterrupted = true;
- }
- }
- // Pass interruption information along.
- if (wasInterrupted) {
- Thread.currentThread().interrupt();
- }
- }
-
- public static boolean joinUninterruptibly(final Thread thread, long timeoutMs) {
- final long startTimeMs = SystemClock.elapsedRealtime();
- long timeRemainingMs = timeoutMs;
- boolean wasInterrupted = false;
- while (timeRemainingMs > 0) {
- try {
- thread.join(timeRemainingMs);
- break;
- } catch (InterruptedException e) {
- // Someone is asking us to return early at our convenience. We can't cancel this operation,
- // but we should preserve the information and pass it along.
- wasInterrupted = true;
- final long elapsedTimeMs = SystemClock.elapsedRealtime() - startTimeMs;
- timeRemainingMs = timeoutMs - elapsedTimeMs;
- }
- }
- // Pass interruption information along.
- if (wasInterrupted) {
- Thread.currentThread().interrupt();
- }
- return !thread.isAlive();
- }
-
- public static void joinUninterruptibly(final Thread thread) {
- executeUninterruptibly(new BlockingOperation() {
- @Override
- public void run() throws InterruptedException {
- thread.join();
- }
- });
- }
-
- public static void awaitUninterruptibly(final CountDownLatch latch) {
- executeUninterruptibly(new BlockingOperation() {
- @Override
- public void run() throws InterruptedException {
- latch.await();
- }
- });
- }
-
- public static boolean awaitUninterruptibly(CountDownLatch barrier, long timeoutMs) {
- final long startTimeMs = SystemClock.elapsedRealtime();
- long timeRemainingMs = timeoutMs;
- boolean wasInterrupted = false;
- boolean result = false;
- do {
- try {
- result = barrier.await(timeRemainingMs, TimeUnit.MILLISECONDS);
- break;
- } catch (InterruptedException e) {
- // Someone is asking us to return early at our convenience. We can't cancel this operation,
- // but we should preserve the information and pass it along.
- wasInterrupted = true;
- final long elapsedTimeMs = SystemClock.elapsedRealtime() - startTimeMs;
- timeRemainingMs = timeoutMs - elapsedTimeMs;
- }
- } while (timeRemainingMs > 0);
- // Pass interruption information along.
- if (wasInterrupted) {
- Thread.currentThread().interrupt();
- }
- return result;
- }
-
- /**
- * Post |callable| to |handler| and wait for the result.
- */
- public static <V> V invokeUninterruptibly(final Handler handler, final Callable<V> callable) {
- class Result {
- public V value;
- }
- final Result result = new Result();
- final CountDownLatch barrier = new CountDownLatch(1);
- handler.post(new Runnable() {
- @Override public void run() {
- try {
- result.value = callable.call();
- } catch (Exception e) {
- throw new RuntimeException("Callable threw exception: " + e);
- }
- barrier.countDown();
- }
- });
- awaitUninterruptibly(barrier);
- return result.value;
- }
-
- /**
- * Post |runner| to |handler| and wait for the result.
- */
- public static void invokeUninterruptibly(final Handler handler, final Runnable runner) {
- final CountDownLatch barrier = new CountDownLatch(1);
- handler.post(new Runnable() {
- @Override public void run() {
- runner.run();
- barrier.countDown();
- }
- });
- awaitUninterruptibly(barrier);
- }
-}
« no previous file with comments | « talk/libjingle.gyp ('k') | webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698