Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 04f07d28: am 2a555d0a: am d3edd1c2: am ba164dfb: Merge "camera2: Fix race conditions and deadlocks around configuration" into lmp-dev

Browse Source 
* commit '04f07d2808c260db92324fe21338085a4dd9452a':
  camera2: Fix race conditions and deadlocks around configuration
This commit is contained in:
Igor Murashkin
2014-09-26 22:41:15 +00:00
committed by Android Git Automerger
parent 1acd81fbcc c8636b3c7b
commit d1b710bc82
7 changed files with 96 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
View File

@@ -633,7 +633,11 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession {
@Override
public void onDrained() {
if (VERBOSE) Log.v(TAG, mIdString + "onIdleDrained");
synchronized (CameraCaptureSessionImpl.this) {
// Take device lock before session lock so that we can call back into device
// without causing a deadlock
synchronized (mDeviceImpl.mInterfaceLock) {
synchronized (CameraCaptureSessionImpl.this) {
/*
* The device is now IDLE, and has settled. It will not transition to
* ACTIVE or BUSY again by itself.
@@ -642,28 +646,31 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession {
*
* This operation is idempotent; a session will not be closed twice.
*/
if (VERBOSE) Log.v(TAG, mIdString + "Session drain complete, skip unconfigure: " +
mSkipUnconfigure);
if (VERBOSE)
Log.v(TAG, mIdString + "Session drain complete, skip unconfigure: " +
mSkipUnconfigure);
// Fast path: A new capture session has replaced this one; don't unconfigure.
if (mSkipUnconfigure) {
mStateCallback.onClosed(CameraCaptureSessionImpl.this);
return;
// Fast path: A new capture session has replaced this one; don't unconfigure.
if (mSkipUnconfigure) {
mStateCallback.onClosed(CameraCaptureSessionImpl.this);
return;
}
// Slow path: #close was called explicitly on this session; unconfigure first
try {
mUnconfigureDrainer.taskStarted();
mDeviceImpl
.configureOutputsChecked(null); // begin transition to unconfigured
} catch (CameraAccessException e) {
// OK: do not throw checked exceptions.
Log.e(TAG, mIdString + "Exception while configuring outputs: ", e);
// TODO: call onError instead of onClosed if this happens
}
mUnconfigureDrainer.beginDrain();
}
// Slow path: #close was called explicitly on this session; unconfigure first
try {
mUnconfigureDrainer.taskStarted();
mDeviceImpl.configureOutputsChecked(null); // begin transition to unconfigured
} catch (CameraAccessException e) {
// OK: do not throw checked exceptions.
Log.e(TAG, mIdString + "Exception while configuring outputs: ", e);
// TODO: call onError instead of onClosed if this happens
}
mUnconfigureDrainer.beginDrain();
}
}
}

2
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

@@ -60,7 +60,7 @@ public class CameraDeviceImpl extends CameraDevice {
private ICameraDeviceUser mRemoteDevice;
// Lock to synchronize cross-thread access to device public interface
private final Object mInterfaceLock = new Object();
final Object mInterfaceLock = new Object(); // access from this class and Session only!
private final CameraDeviceCallbacks mCallbacks = new CameraDeviceCallbacks();
private final StateCallback mDeviceCallback;

15
core/java/android/hardware/camera2/legacy/CameraDeviceState.java
View File

@@ -73,6 +73,7 @@ public class CameraDeviceState {
void onError(int errorCode, RequestHolder holder);
void onConfiguring();
void onIdle();
void onBusy();
void onCaptureStarted(RequestHolder holder, long timestamp);
void onCaptureResult(CameraMetadataNative result, RequestHolder holder);
}
@@ -217,6 +218,20 @@ public class CameraDeviceState {
}
Log.i(TAG, "Legacy camera service transitioning to state " + stateName);
}
// If we transitioned into a non-IDLE/non-ERROR state then mark the device as busy
if(newState != STATE_ERROR && newState != STATE_IDLE) {
if (mCurrentState != newState && mCurrentHandler != null &&
mCurrentListener != null) {
mCurrentHandler.post(new Runnable() {
@Override
public void run() {
mCurrentListener.onBusy();
}
});
}
}
switch(newState) {
case STATE_ERROR:
if (mCurrentState != STATE_ERROR && mCurrentHandler != null &&

3
core/java/android/hardware/camera2/legacy/GLThreadManager.java
View File

@@ -113,6 +113,9 @@ public class GLThreadManager {
case MSG_ALLOW_FRAMES:
mDroppingFrames = false;
break;
case RequestHandlerThread.MSG_POKE_IDLE_HANDLER:
// OK: Ignore message.
break;
default:
Log.e(TAG, "Unhandled message " + msg.what + " on GLThread.");
break;

34
core/java/android/hardware/camera2/legacy/LegacyCameraDevice.java
View File

@@ -21,6 +21,7 @@ import android.graphics.SurfaceTexture;
import android.hardware.Camera;
import android.hardware.camera2.CameraCharacteristics;
import android.hardware.camera2.CaptureRequest;
import android.hardware.camera2.impl.CameraDeviceImpl;
import android.hardware.camera2.impl.CaptureResultExtras;
import android.hardware.camera2.ICameraDeviceCallbacks;
import android.hardware.camera2.params.StreamConfiguration;
@@ -95,7 +96,25 @@ public class LegacyCameraDevice implements AutoCloseable {
new CameraDeviceState.CameraDeviceStateListener() {
@Override
public void onError(final int errorCode, final RequestHolder holder) {
mIdle.open();
if (DEBUG) {
Log.d(TAG, "onError called, errorCode = " + errorCode);
}
switch (errorCode) {
/*
* Only be considered idle if we hit a fatal error
* and no further requests can be processed.
*/
case CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DISCONNECTED:
case CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_SERVICE:
case CameraDeviceImpl.CameraDeviceCallbacks.ERROR_CAMERA_DEVICE: {
mIdle.open();
if (DEBUG) {
Log.d(TAG, "onError - opening idle");
}
}
}
final CaptureResultExtras extras = getExtrasFromRequest(holder);
mResultHandler.post(new Runnable() {
@Override
@@ -124,6 +143,10 @@ public class LegacyCameraDevice implements AutoCloseable {
@Override
public void onIdle() {
if (DEBUG) {
Log.d(TAG, "onIdle called");
}
mIdle.open();
mResultHandler.post(new Runnable() {
@@ -142,6 +165,15 @@ public class LegacyCameraDevice implements AutoCloseable {
});
}
@Override
public void onBusy() {
mIdle.close();
if (DEBUG) {
Log.d(TAG, "onBusy called");
}
}
@Override
public void onCaptureStarted(final RequestHolder holder, final long timestamp) {
final CaptureResultExtras extras = getExtrasFromRequest(holder);

14
core/java/android/hardware/camera2/legacy/RequestHandlerThread.java
View File

@@ -23,6 +23,15 @@ import android.os.Looper;
import android.os.MessageQueue;
public class RequestHandlerThread extends HandlerThread {
/**
* Ensure that the MessageQueue's idle handler gets run by poking the message queue;
* normally if the message queue is already idle, the idle handler won't get invoked.
*
* <p>Users of this handler thread should ignore this message.</p>
*/
public final static int MSG_POKE_IDLE_HANDLER = -1;
private final ConditionVariable mStarted = new ConditionVariable(false);
private final ConditionVariable mIdle = new ConditionVariable(true);
private Handler.Callback mCallback;
@@ -86,12 +95,15 @@ public class RequestHandlerThread extends HandlerThread {
// Blocks until thread is idling
public void waitUntilIdle() {
Looper looper = waitAndGetHandler().getLooper();
Handler handler = waitAndGetHandler();
Looper looper = handler.getLooper();
if (looper.isIdling()) {
return;
}
mIdle.close();
looper.getQueue().addIdleHandler(mIdleHandler);
// Ensure that the idle handler gets run even if the looper already went idle
handler.sendEmptyMessage(MSG_POKE_IDLE_HANDLER);
if (looper.isIdling()) {
return;
}

3
core/java/android/hardware/camera2/legacy/RequestThreadManager.java
View File

@@ -864,6 +864,9 @@ public class RequestThreadManager {
}
resetJpegSurfaceFormats(mCallbackOutputs);
break;
case RequestHandlerThread.MSG_POKE_IDLE_HANDLER:
// OK: Ignore message.
break;
default:
throw new AssertionError("Unhandled message " + msg.what +
" on RequestThread.");