Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e3a6f62 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Move CopyJob to optimized FileUtils.copy(). 

This new API tries its best to use optimized in-kernel copying
whenever possible, resulting in typical speed improvements of 50%!

However, since reading/writing is now the same step in the
kernel, we can't differentiate between reading/writing errors, so
report them both as Metrics.SUBFILEOP_WRITE_FILE.

Test: bit FrameworksCoreTests:android.os.FileUtilsTest
Test: vogar --mode app_process --benchmark frameworks/base/core/tests/benchmarks/src/android/os/FileUtilsBenchmark.java
Bug: 71932978
Change-Id: Ic203ef7dcb7b8a7c56084c2474cc643784e23d9d
parent 5729be86

src/com/android/documentsui/services/CopyJob.java

+19 −21
Original line number Diff line number Diff line
@@ -44,17 +44,19 @@ import android.content.res.AssetFileDescriptor; 
import android.database.ContentObserver;

import android.database.Cursor;

import android.net.Uri;

import android.os.CancellationSignal;

import android.os.FileUtils;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.os.OperationCanceledException;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.storage.StorageManager;

import android.provider.DocumentsContract;

import android.provider.DocumentsContract.Document;

import android.system.ErrnoException;

import android.system.Int64Ref;

import android.system.Os;

import android.system.OsConstants;

import android.text.format.DateUtils;
@@ -541,7 +543,6 @@ class CopyJob extends ResolvedResourcesJob { 
     */

    private void copyFileHelper(DocumentInfo src, DocumentInfo dest, DocumentInfo destParent,

            String mimeType) throws ResourceException {

        CancellationSignal canceller = new CancellationSignal();

        AssetFileDescriptor srcFileAsAsset = null;

        ParcelFileDescriptor srcFile = null;

        ParcelFileDescriptor dstFile = null;
@@ -555,7 +556,7 @@ class CopyJob extends ResolvedResourcesJob { 
            if (src.isVirtual()) {

                try {

                    srcFileAsAsset = getClient(src).openTypedAssetFileDescriptor(

                                src.derivedUri, mimeType, null, canceller);

                                src.derivedUri, mimeType, null, mSignal);

                } catch (FileNotFoundException | RemoteException | RuntimeException e) {

                    Metrics.logFileOperationFailure(

                            appContext, Metrics.SUBFILEOP_OPEN_FILE, src.derivedUri);
@@ -576,7 +577,7 @@ class CopyJob extends ResolvedResourcesJob { 
                        appContext, operationType, Metrics.OPMODE_CONVERTED);

            } else {

                try {

                    srcFile = getClient(src).openFile(src.derivedUri, "r", canceller);

                    srcFile = getClient(src).openFile(src.derivedUri, "r", mSignal);

                } catch (FileNotFoundException | RemoteException | RuntimeException e) {

                    Metrics.logFileOperationFailure(

                            appContext, Metrics.SUBFILEOP_OPEN_FILE, src.derivedUri);
@@ -590,7 +591,7 @@ class CopyJob extends ResolvedResourcesJob { 
            }



            try {

                dstFile = getClient(dest).openFile(dest.derivedUri, "w", canceller);

                dstFile = getClient(dest).openFile(dest.derivedUri, "w", mSignal);

            } catch (FileNotFoundException | RemoteException | RuntimeException e) {

                Metrics.logFileOperationFailure(

                        appContext, Metrics.SUBFILEOP_OPEN_FILE, dest.derivedUri);
@@ -599,9 +600,6 @@ class CopyJob extends ResolvedResourcesJob { 
            }

            out = new ParcelFileDescriptor.AutoCloseOutputStream(dstFile);



            byte[] buffer = new byte[32 * 1024];

            int len;

            boolean reading = true;

            try {

                // If we know the source size, and the destination supports disk

                // space allocation, then allocate the space we'll need. This
@@ -614,18 +612,18 @@ class CopyJob extends ResolvedResourcesJob { 
                    sm.allocateBytes(dstFd, srcSize);

                }



                while ((len = in.read(buffer)) != -1) {

                    if (isCanceled()) {

                try {

                    final Int64Ref last = new Int64Ref(0);

                    FileUtils.copy(in, out, (long progress) -> {

                        final long delta = progress - last.value;

                        last.value = progress;

                        makeCopyProgress(delta);

                    }, mSignal);

                } catch (OperationCanceledException e) {

                    if (DEBUG) Log.d(TAG, "Canceled copy mid-copy of: " + src.derivedUri);

                    return;

                }

                    reading = false;

                    out.write(buffer, 0, len);

                    makeCopyProgress(len);

                    reading = true;

                }



                reading = false;

                // Need to invoke Os#fsync to ensure the file is written to the storage device.

                try {

                    Os.fsync(dstFile.getFileDescriptor());
@@ -643,8 +641,8 @@ class CopyJob extends ResolvedResourcesJob { 
            } catch (IOException e) {

                Metrics.logFileOperationFailure(

                        appContext,

                        reading ? Metrics.SUBFILEOP_READ_FILE : Metrics.SUBFILEOP_WRITE_FILE,

                        reading ? src.derivedUri: dest.derivedUri);

                        Metrics.SUBFILEOP_WRITE_FILE,

                        dest.derivedUri);

                throw new ResourceException(

                        "Failed to copy bytes from %s to %s due to an IO exception.",

                        src.derivedUri, dest.derivedUri, e);
@@ -666,7 +664,7 @@ class CopyJob extends ResolvedResourcesJob { 
                }



                if (DEBUG) Log.d(TAG, "Cleaning up failed operation leftovers.");

                canceller.cancel();

                mSignal.cancel();

                try {

                    deleteDocument(dest, destParent);

                } catch (ResourceException e) {

src/com/android/documentsui/services/Job.java

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.os.CancellationSignal;

import android.os.Parcelable;

import android.os.RemoteException;

import android.provider.DocumentsContract;
@@ -101,6 +102,8 @@ abstract public class Job implements Runnable { 


    final Notification.Builder mProgressBuilder;



    final CancellationSignal mSignal = new CancellationSignal();



    private final Map<String, ContentProviderClient> mClients = new HashMap<>();

    private final Features mFeatures;
@@ -216,6 +219,7 @@ abstract public class Job implements Runnable { 


    final void cancel() {

        mState = STATE_CANCELED;

        mSignal.cancel();

        Metrics.logFileOperationCancelled(service, operationType);

    }