From f3a14655b0092c5ee07989d2d9bb23b9566dbad9 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Tue, 5 Sep 2017 14:25:33 +0200 Subject: [PATCH] Weak cache for threads --- .../cameraview/CameraController.java | 2 +- .../otaliastudios/cameraview/CameraView.java | 2 +- .../cameraview/WorkerHandler.java | 25 +++++++++++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java index 81d6dd7e..0432fcbc 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraController.java @@ -35,7 +35,7 @@ abstract class CameraController implements Preview.SurfaceCallback { mCameraCallbacks = callback; mPreview = preview; mPreview.setSurfaceCallback(this); - mHandler = new WorkerHandler("CameraViewController"); + mHandler = WorkerHandler.get("CameraViewController"); } //region Start&Stop diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java index 948c40f4..4e4de4ea 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java @@ -117,7 +117,7 @@ public class CameraView extends FrameLayout { mPreviewImpl = instantiatePreview(context, this); mCameraController = instantiateCameraController(mCameraCallbacks, mPreviewImpl); mUiHandler = new Handler(Looper.getMainLooper()); - mWorkerHandler = new WorkerHandler("CameraViewWorker"); + mWorkerHandler = WorkerHandler.get("CameraViewWorker"); // Views mGridLinesLayout = new GridLinesLayout(context); diff --git a/cameraview/src/main/utils/com/otaliastudios/cameraview/WorkerHandler.java b/cameraview/src/main/utils/com/otaliastudios/cameraview/WorkerHandler.java index 798d8366..2ffcdaba 100644 --- a/cameraview/src/main/utils/com/otaliastudios/cameraview/WorkerHandler.java +++ b/cameraview/src/main/utils/com/otaliastudios/cameraview/WorkerHandler.java @@ -3,13 +3,34 @@ package com.otaliastudios.cameraview; import android.os.Handler; import android.os.HandlerThread; +import java.lang.ref.WeakReference; +import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; + /** * Class holding a background handler. - * Using setDaemon right now but a better approach would be to have - * start() and stop() callbacks here. TODO + * We want them to survive configuration changes if there's still job to do. */ class WorkerHandler { + private static ConcurrentHashMap> sCache = new ConcurrentHashMap<>(4); + + public static WorkerHandler get(String name) { + if (sCache.containsKey(name)) { + WorkerHandler cached = sCache.get(name).get(); + if (cached != null) { + HandlerThread thread = cached.mThread; + if (thread.isAlive() && !thread.isInterrupted()) { + return cached; + } + } + sCache.remove(name); + } + WorkerHandler handler = new WorkerHandler(name); + sCache.put(name, new WeakReference<>(handler)); + return handler; + } + private HandlerThread mThread; private Handler mHandler;