← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to qemu-coroutine.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
qemu-coroutine.c
14
14
 
15
15
#include "trace.h"
16
16
#include "qemu-common.h"
 
17
#include "qemu/thread.h"
17
18
#include "block/coroutine.h"
18
19
#include "block/coroutine_int.h"
19
20
 
23
24
};
24
25
 
25
26
/** Free list to speed up creation */
 
27
static QemuMutex pool_lock;
26
28
static QSLIST_HEAD(, Coroutine) pool = QSLIST_HEAD_INITIALIZER(pool);
27
29
static unsigned int pool_size;
28
30
 
29
31
Coroutine *qemu_coroutine_create(CoroutineEntry *entry)
30
32
{
31
 
    Coroutine *co;
32
 
 
33
 
    co = QSLIST_FIRST(&pool);
34
 
    if (co) {
35
 
        QSLIST_REMOVE_HEAD(&pool, pool_next);
36
 
        pool_size--;
37
 
    } else {
 
33
    Coroutine *co = NULL;
 
34
 
 
35
    if (CONFIG_COROUTINE_POOL) {
 
36
        qemu_mutex_lock(&pool_lock);
 
37
        co = QSLIST_FIRST(&pool);
 
38
        if (co) {
 
39
            QSLIST_REMOVE_HEAD(&pool, pool_next);
 
40
            pool_size--;
 
41
        }
 
42
        qemu_mutex_unlock(&pool_lock);
 
43
    }
 
44
 
 
45
    if (!co) {
38
46
        co = qemu_coroutine_new();
39
47
    }
40
48
 
41
49
    co->entry = entry;
 
50
    QTAILQ_INIT(&co->co_queue_wakeup);
42
51
    return co;
43
52
}
44
53
 
45
54
static void coroutine_delete(Coroutine *co)
46
55
{
47
 
    if (pool_size < POOL_MAX_SIZE) {
48
 
        QSLIST_INSERT_HEAD(&pool, co, pool_next);
49
 
        co->caller = NULL;
50
 
        pool_size++;
51
 
        return;
 
56
    if (CONFIG_COROUTINE_POOL) {
 
57
        qemu_mutex_lock(&pool_lock);
 
58
        if (pool_size < POOL_MAX_SIZE) {
 
59
            QSLIST_INSERT_HEAD(&pool, co, pool_next);
 
60
            co->caller = NULL;
 
61
            pool_size++;
 
62
            qemu_mutex_unlock(&pool_lock);
 
63
            return;
 
64
        }
 
65
        qemu_mutex_unlock(&pool_lock);
52
66
    }
53
67
 
54
68
    qemu_coroutine_delete(co);
55
69
}
56
70
 
57
 
static void __attribute__((destructor)) coroutine_cleanup(void)
 
71
static void __attribute__((constructor)) coroutine_pool_init(void)
 
72
{
 
73
    qemu_mutex_init(&pool_lock);
 
74
}
 
75
 
 
76
static void __attribute__((destructor)) coroutine_pool_cleanup(void)
58
77
{
59
78
    Coroutine *co;
60
79
    Coroutine *tmp;
63
82
        QSLIST_REMOVE_HEAD(&pool, pool_next);
64
83
        qemu_coroutine_delete(co);
65
84
    }
 
85
 
 
86
    qemu_mutex_destroy(&pool_lock);
66
87
}
67
88
 
68
89
static void coroutine_swap(Coroutine *from, Coroutine *to)
71
92
 
72
93
    ret = qemu_coroutine_switch(from, to, COROUTINE_YIELD);
73
94
 
 
95
    qemu_co_queue_run_restart(to);
 
96
 
74
97
    switch (ret) {
75
98
    case COROUTINE_YIELD:
76
99
        return;