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

Commit f5b6e559 authored by Dmitriy Filchenko's avatar Dmitriy Filchenko
Browse files

Handle long process names correctly. 

pthread_setname_np() expects 16 or fewer characters for the name argument. When the process name is longer, we should trim it.

Change-Id: I40be3a4212bdaab900c8eb30fa27aeeb7ed1b0d1
parent 8ee58b3b

cmds/app_process/app_main.cpp

+1 −3
Original line number Diff line number Diff line
@@ -299,9 +299,7 @@ int main(int argc, char* const argv[]) 
    }



    if (!niceName.isEmpty()) {

        const char* procName = niceName.string();

        pthread_setname_np(pthread_self(), procName);

        runtime.setArgv0(procName);

        runtime.setArgv0(niceName.string(), true /* setProcName */);

    }



    if (zygote) {

core/jni/AndroidRuntime.cpp

+9 −1
Original line number Diff line number Diff line
@@ -269,7 +269,15 @@ AndroidRuntime::~AndroidRuntime() 
    return jniRegisterNativeMethods(env, className, gMethods, numMethods);

}



void AndroidRuntime::setArgv0(const char* argv0) {

void AndroidRuntime::setArgv0(const char* argv0, bool setProcName) {

    if (setProcName) {

        int len = strlen(argv0);

        if (len < 15) {

            pthread_setname_np(pthread_self(), argv0);

        } else {

            pthread_setname_np(pthread_self(), argv0 + len - 15);

        }

    }

    memset(mArgBlockStart, 0, mArgBlockLength);

    strlcpy(mArgBlockStart, argv0, mArgBlockLength);

}

core/jni/android_util_Process.cpp

+1 −3
Original line number Diff line number Diff line
@@ -412,9 +412,7 @@ void android_os_Process_setArgV0(JNIEnv* env, jobject clazz, jstring name) 
    }



    if (!name8.isEmpty()) {

        const char* procName = name8.string();

        pthread_setname_np(pthread_self(), procName);

        AndroidRuntime::getRuntime()->setArgv0(procName);

        AndroidRuntime::getRuntime()->setArgv0(name8.string(), true /* setProcName */);

    }

}

include/android_runtime/AndroidRuntime.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: 
        Tool,

    };



    void setArgv0(const char* argv0);

    void setArgv0(const char* argv0, bool setProcName = false);

    void addOption(const char* optionString, void* extra_info = NULL);



    /**