Commit f8c6e1cb authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Stefan Hajnoczi
Browse files

coroutine-lock: place CoMutex before CoQueue in header 



This will avoid forward references in the next patch.  It is also
more logical because CoQueue is not anymore the basic primitive.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Message-id: 20170213181244.16297-5-pbonzini@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent c05df34a

include/qemu/coroutine.h

+44 −45
Original line number Diff line number Diff line
@@ -112,51 +112,6 @@ bool qemu_in_coroutine(void); 
 */

bool qemu_coroutine_entered(Coroutine *co);





/**

 * CoQueues are a mechanism to queue coroutines in order to continue executing

 * them later. They provide the fundamental primitives on which coroutine locks

 * are built.

 */

typedef struct CoQueue {

    QSIMPLEQ_HEAD(, Coroutine) entries;

} CoQueue;



/**

 * Initialise a CoQueue. This must be called before any other operation is used

 * on the CoQueue.

 */

void qemu_co_queue_init(CoQueue *queue);



/**

 * Adds the current coroutine to the CoQueue and transfers control to the

 * caller of the coroutine.

 */

void coroutine_fn qemu_co_queue_wait(CoQueue *queue);



/**

 * Restarts the next coroutine in the CoQueue and removes it from the queue.

 *

 * Returns true if a coroutine was restarted, false if the queue is empty.

 */

bool coroutine_fn qemu_co_queue_next(CoQueue *queue);



/**

 * Restarts all coroutines in the CoQueue and leaves the queue empty.

 */

void coroutine_fn qemu_co_queue_restart_all(CoQueue *queue);



/**

 * Enter the next coroutine in the queue

 */

bool qemu_co_enter_next(CoQueue *queue);



/**

 * Checks if the CoQueue is empty.

 */

bool qemu_co_queue_empty(CoQueue *queue);





/**

 * Provides a mutex that can be used to synchronise coroutines

 */
@@ -202,6 +157,50 @@ void coroutine_fn qemu_co_mutex_lock(CoMutex *mutex); 
 */

void coroutine_fn qemu_co_mutex_unlock(CoMutex *mutex);





/**

 * CoQueues are a mechanism to queue coroutines in order to continue executing

 * them later.

 */

typedef struct CoQueue {

    QSIMPLEQ_HEAD(, Coroutine) entries;

} CoQueue;



/**

 * Initialise a CoQueue. This must be called before any other operation is used

 * on the CoQueue.

 */

void qemu_co_queue_init(CoQueue *queue);



/**

 * Adds the current coroutine to the CoQueue and transfers control to the

 * caller of the coroutine.

 */

void coroutine_fn qemu_co_queue_wait(CoQueue *queue);



/**

 * Restarts the next coroutine in the CoQueue and removes it from the queue.

 *

 * Returns true if a coroutine was restarted, false if the queue is empty.

 */

bool coroutine_fn qemu_co_queue_next(CoQueue *queue);



/**

 * Restarts all coroutines in the CoQueue and leaves the queue empty.

 */

void coroutine_fn qemu_co_queue_restart_all(CoQueue *queue);



/**

 * Enter the next coroutine in the queue

 */

bool qemu_co_enter_next(CoQueue *queue);



/**

 * Checks if the CoQueue is empty.

 */

bool qemu_co_queue_empty(CoQueue *queue);





typedef struct CoRwlock {

    bool writer;

    int reader;