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

Commit 15222d6d authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Keep ScopedEndpointBufferAlloc in variables" am: 1fba0b75 

am: 5ffdae08

Change-Id: I0d1a1105450dc54af6a1e28a4a5eff40900d02c8
parents 4a0cca60 5ffdae08

media/mtp/MtpFfsHandle.cpp

+13 −6
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <string.h>

#include <sys/endian.h>

#include <sys/ioctl.h>

#include <sys/mman.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <unistd.h>
@@ -488,13 +489,15 @@ public: 
        mFd(fd),

        mAllocSize(alloc_size) {

        if (ioctl(mFd, FUNCTIONFS_ENDPOINT_ALLOC, static_cast<__u32>(mAllocSize)))

            PLOG(DEBUG) << "FFS endpoint alloc failed!";

            PLOG(ERROR) << "FFS endpoint alloc failed!";

    }



    ~ScopedEndpointBufferAlloc() {

        if (ioctl(mFd, FUNCTIONFS_ENDPOINT_ALLOC, static_cast<__u32>(0)))

            PLOG(DEBUG) << "FFS endpoint alloc reset failed!";

            PLOG(ERROR) << "FFS endpoint alloc reset failed!";

    }



    DISALLOW_COPY_AND_ASSIGN(ScopedEndpointBufferAlloc);

};



/* Read from USB and write to a local file. */
@@ -524,7 +527,9 @@ int MtpFfsHandle::receiveFile(mtp_file_range mfr) { 
    bool write = false;



    posix_fadvise(mfr.fd, 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);

    ScopedEndpointBufferAlloc(mBulkOut, mMaxRead);

    posix_madvise(data, buf1_len, POSIX_MADV_SEQUENTIAL | POSIX_MADV_WILLNEED);

    posix_madvise(data2, buf2_len, POSIX_MADV_SEQUENTIAL | POSIX_MADV_WILLNEED);

    ScopedEndpointBufferAlloc scoped_alloc(mBulkOut, mMaxRead);



    // Break down the file into pieces that fit in buffers

    while (file_length > 0 || write) {
@@ -602,8 +607,6 @@ int MtpFfsHandle::sendFile(mtp_file_range mfr) { 
        packet_size = mBulkIn_desc.wMaxPacketSize;

    }



    posix_fadvise(mfr.fd, 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);



    int init_read_len = packet_size - sizeof(mtp_data_header);

    int buf1_len = std::max(static_cast<uint64_t>(packet_size), std::min(

                  static_cast<uint64_t>(MAX_FILE_CHUNK_SIZE), file_length - init_read_len));
@@ -616,6 +619,10 @@ int MtpFfsHandle::sendFile(mtp_file_range mfr) { 
    std::vector<char> buf2(std::max(0, buf2_len));

    char *data2 = buf2.data();



    posix_fadvise(mfr.fd, 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);

    posix_madvise(data, buf1_len, POSIX_MADV_SEQUENTIAL | POSIX_MADV_WILLNEED);

    posix_madvise(data2, buf2_len, POSIX_MADV_SEQUENTIAL | POSIX_MADV_WILLNEED);



    struct aiocb aio;

    aio.aio_fildes = mfr.fd;

    struct aiocb *aiol[] = {&aio};
@@ -640,7 +647,7 @@ int MtpFfsHandle::sendFile(mtp_file_range mfr) { 
    if (writeHandle(mBulkIn, data, packet_size) == -1) return -1;

    if (file_length == 0) return 0;



    ScopedEndpointBufferAlloc(mBulkIn, mMaxWrite);

    ScopedEndpointBufferAlloc scoped_alloc(mBulkIn, mMaxWrite);



    // Break down the file into pieces that fit in buffers

    while(file_length > 0) {