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

Commit 1bfcceac authored by Alex Sakhartchouk's avatar Alex Sakhartchouk
Browse files

For the serialization context, no fifo initialization is necessary. 

On shutdown it was attempting to free uninitialized memory.

Change-Id: I9141be5a51253f87f21594ae38f7e653f9e69c6c
parent 9cba6863

libs/rs/rsContext.cpp

+0 −4
Original line number Original line Diff line number Diff line
@@ -340,10 +340,6 @@ Context::Context() { 
Context * Context::createContext(Device *dev, const RsSurfaceConfig *sc) {

Context * Context::createContext(Device *dev, const RsSurfaceConfig *sc) {

    Context * rsc = new Context();

    Context * rsc = new Context();





    // Temporary to avoid breaking the tools

    if (!dev) {

        return rsc;

    }

    if (!rsc->initContext(dev, sc)) {

    if (!rsc->initContext(dev, sc)) {

        delete rsc;

        delete rsc;

        return NULL;

        return NULL;

libs/rs/rsLocklessFifo.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -21,15 +21,17 @@ 
using namespace android;

using namespace android;

using namespace android::renderscript;

using namespace android::renderscript;





LocklessCommandFifo::LocklessCommandFifo() {

LocklessCommandFifo::LocklessCommandFifo() : mBuffer(0) {

}

}





LocklessCommandFifo::~LocklessCommandFifo() {

LocklessCommandFifo::~LocklessCommandFifo() {

    if (!mInShutdown) {

    if (!mInShutdown) {

        shutdown();

        shutdown();

    }

    }

    if (mBuffer) {

        free(mBuffer);

        free(mBuffer);

    }

    }

}





void LocklessCommandFifo::shutdown() {

void LocklessCommandFifo::shutdown() {

    mInShutdown = true;

    mInShutdown = true;

libs/rs/rsThreadIO.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,8 +21,7 @@ 
using namespace android;

using namespace android;

using namespace android::renderscript;

using namespace android::renderscript;





ThreadIO::ThreadIO() {

ThreadIO::ThreadIO() : mUsingSocket(false) {

    mToCore.init(16 * 1024);

}

}





ThreadIO::~ThreadIO() {

ThreadIO::~ThreadIO() {
@@ -30,6 +29,7 @@ ThreadIO::~ThreadIO() { 




void ThreadIO::init(bool useSocket) {

void ThreadIO::init(bool useSocket) {

    mUsingSocket = useSocket;

    mUsingSocket = useSocket;

    mToCore.init(16 * 1024);





    if (mUsingSocket) {

    if (mUsingSocket) {

        mToClientSocket.init();

        mToClientSocket.init();