Commit d820fa5b authored by Peter Xu's avatar Peter Xu Committed by Paolo Bonzini
Browse files

qemu-thread: always keep the posix wrapper layer 



We will conditionally have a wrapper layer depending on whether the host
has the PTHREAD_SETNAME capability.  It complicates stuff.  Let's keep
the wrapper there; we opt out the pthread_setname_np() call only.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20180412053444.17801-1-peterx@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 48564041

util/qemu-thread-posix.c

+13 −20
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ static void __attribute__((constructor)) qemu_thread_atexit_init(void) 
}





#ifdef CONFIG_PTHREAD_SETNAME_NP

typedef struct {

    void *(*start_routine)(void *);

    void *arg;
@@ -495,16 +494,18 @@ static void *qemu_thread_start(void *args) 
    void *(*start_routine)(void *) = qemu_thread_args->start_routine;

    void *arg = qemu_thread_args->arg;



#ifdef CONFIG_PTHREAD_SETNAME_NP

    /* Attempt to set the threads name; note that this is for debug, so

     * we're not going to fail if we can't set it.

     */

    if (name_threads && qemu_thread_args->name) {

        pthread_setname_np(pthread_self(), qemu_thread_args->name);

    }

#endif

    g_free(qemu_thread_args->name);

    g_free(qemu_thread_args);

    return start_routine(arg);

}

#endif





void qemu_thread_create(QemuThread *thread, const char *name,

                       void *(*start_routine)(void*),
@@ -513,6 +514,7 @@ void qemu_thread_create(QemuThread *thread, const char *name, 
    sigset_t set, oldset;

    int err;

    pthread_attr_t attr;

    QemuThreadArgs *qemu_thread_args;



    err = pthread_attr_init(&attr);

    if (err) {
@@ -527,9 +529,6 @@ void qemu_thread_create(QemuThread *thread, const char *name, 
    sigfillset(&set);

    pthread_sigmask(SIG_SETMASK, &set, &oldset);



#ifdef CONFIG_PTHREAD_SETNAME_NP

    if (name_threads) {

        QemuThreadArgs *qemu_thread_args;

    qemu_thread_args = g_new0(QemuThreadArgs, 1);

    qemu_thread_args->name = g_strdup(name);

    qemu_thread_args->start_routine = start_routine;
@@ -537,12 +536,6 @@ void qemu_thread_create(QemuThread *thread, const char *name, 


    err = pthread_create(&thread->thread, &attr,

                         qemu_thread_start, qemu_thread_args);

    } else

#endif

    {

        err = pthread_create(&thread->thread, &attr,

                             start_routine, arg);

    }



    if (err)

        error_exit(err, __func__);