Commit 4900116e authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Michael S. Tsirkin
Browse files

Add a 'name' parameter to qemu_thread_create 



If enabled, set the thread name at creation (on GNU systems with
  pthread_set_np)
Fix up all the callers with a thread name

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
parent 8f480de0

cpus.c

+20 −5
Original line number Diff line number Diff line
@@ -1117,8 +1117,13 @@ void resume_all_vcpus(void) 
    }

}



/* For temporary buffers for forming a name */

#define VCPU_THREAD_NAME_SIZE 16



static void qemu_tcg_init_vcpu(CPUState *cpu)

{

    char thread_name[VCPU_THREAD_NAME_SIZE];



    tcg_cpu_address_space_init(cpu, cpu->as);



    /* share a single thread for all cpus with TCG */
@@ -1127,8 +1132,10 @@ static void qemu_tcg_init_vcpu(CPUState *cpu) 
        cpu->halt_cond = g_malloc0(sizeof(QemuCond));

        qemu_cond_init(cpu->halt_cond);

        tcg_halt_cond = cpu->halt_cond;

        qemu_thread_create(cpu->thread, qemu_tcg_cpu_thread_fn, cpu,

                           QEMU_THREAD_JOINABLE);

        snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/TCG",

                 cpu->cpu_index);

        qemu_thread_create(cpu->thread, thread_name, qemu_tcg_cpu_thread_fn,

                           cpu, QEMU_THREAD_JOINABLE);

#ifdef _WIN32

        cpu->hThread = qemu_thread_get_handle(cpu->thread);

#endif
@@ -1144,11 +1151,15 @@ static void qemu_tcg_init_vcpu(CPUState *cpu) 


static void qemu_kvm_start_vcpu(CPUState *cpu)

{

    char thread_name[VCPU_THREAD_NAME_SIZE];



    cpu->thread = g_malloc0(sizeof(QemuThread));

    cpu->halt_cond = g_malloc0(sizeof(QemuCond));

    qemu_cond_init(cpu->halt_cond);

    qemu_thread_create(cpu->thread, qemu_kvm_cpu_thread_fn, cpu,

                       QEMU_THREAD_JOINABLE);

    snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/KVM",

             cpu->cpu_index);

    qemu_thread_create(cpu->thread, thread_name, qemu_kvm_cpu_thread_fn,

                       cpu, QEMU_THREAD_JOINABLE);

    while (!cpu->created) {

        qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);

    }
@@ -1156,10 +1167,14 @@ static void qemu_kvm_start_vcpu(CPUState *cpu) 


static void qemu_dummy_start_vcpu(CPUState *cpu)

{

    char thread_name[VCPU_THREAD_NAME_SIZE];



    cpu->thread = g_malloc0(sizeof(QemuThread));

    cpu->halt_cond = g_malloc0(sizeof(QemuCond));

    qemu_cond_init(cpu->halt_cond);

    qemu_thread_create(cpu->thread, qemu_dummy_cpu_thread_fn, cpu,

    snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/DUMMY",

             cpu->cpu_index);

    qemu_thread_create(cpu->thread, thread_name, qemu_dummy_cpu_thread_fn, cpu,

                       QEMU_THREAD_JOINABLE);

    while (!cpu->created) {

        qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);

hw/block/dataplane/virtio-blk.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static void start_data_plane_bh(void *opaque) 


    qemu_bh_delete(s->start_bh);

    s->start_bh = NULL;

    qemu_thread_create(&s->thread, data_plane_thread,

    qemu_thread_create(&s->thread, "data_plane", data_plane_thread,

                       s, QEMU_THREAD_JOINABLE);

}

hw/usb/ccid-card-emulated.c

+4 −4
Original line number Diff line number Diff line
@@ -546,10 +546,10 @@ static int emulated_initfn(CCIDCardState *base) 
        printf("%s: failed to initialize vcard\n", EMULATED_DEV_NAME);

        return -1;

    }

    qemu_thread_create(&card->event_thread_id, event_thread, card,

                       QEMU_THREAD_JOINABLE);

    qemu_thread_create(&card->apdu_thread_id, handle_apdu_thread, card,

                       QEMU_THREAD_JOINABLE);

    qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread,

                       card, QEMU_THREAD_JOINABLE);

    qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thread,

                       card, QEMU_THREAD_JOINABLE);

    return 0;

}

include/qemu/thread.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void qemu_event_reset(QemuEvent *ev); 
void qemu_event_wait(QemuEvent *ev);

void qemu_event_destroy(QemuEvent *ev);



void qemu_thread_create(QemuThread *thread,

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

                        void *(*start_routine)(void *),

                        void *arg, int mode);

void *qemu_thread_join(QemuThread *thread);

libcacard/vscclient.c

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ on_host_init(VSCMsgHeader *mhHeader, VSCMsgInit *incoming) 
    send_msg(VSC_ReaderRemove, VSCARD_MINIMAL_READER_ID, NULL, 0);

    /* launch the event_thread. This will trigger reader adds for all the

     * existing readers */

    qemu_thread_create(&thread_id, event_thread, NULL, 0);

    qemu_thread_create(&thread_id, "vsc/event", event_thread, NULL, 0);

    return 0;

}