mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 18:21:39 +01:00
Ian Campbell
1a4af67d32
The latter is GPL which makes the whole of mini-os GPL rather than BSD as intended. In tree users are all GPL or GPL-compatible but we should fix this so that mini-os is BSD. Do so by using the same BSD sys/queue.h as we use in libxl. Tested with the builtin mini-os test app and qemu stubdomain, both of which appear to still function as expected. Move tools/libxl/external and the associated sed script to tools/include/xen-external to allow more sensible access from mini-os. Also add s/NULL/0/ in the sed script due to NULL not always being defined in stubdom code when mini-os/wait.h is included. As well as the obvious ABI changes there are a few API updates associated with the change: - struct rw_semaphore.wait_list is unused - remove_waiter needs to take the wait_queue_head The latter requires a qemu update, so there is also a QEMU_TAG update in this changeset. I sprinkled some extra-emacs local variables around the files I edited which didn't have them. I think this should be backported to the stable branches since external users of mini-os may have been mislead into thinking they could safely link mini-os against GPL-incompatible code. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
106 lines
3.3 KiB
C
106 lines
3.3 KiB
C
#ifndef __WAIT_H__
|
|
#define __WAIT_H__
|
|
|
|
#include <mini-os/sched.h>
|
|
#include <mini-os/os.h>
|
|
#include <mini-os/waittypes.h>
|
|
|
|
#define DEFINE_WAIT(name) \
|
|
struct wait_queue name = { \
|
|
.thread = get_current(), \
|
|
.waiting = 0, \
|
|
}
|
|
|
|
|
|
static inline void init_waitqueue_head(struct wait_queue_head *h)
|
|
{
|
|
MINIOS_STAILQ_INIT(h);
|
|
}
|
|
|
|
static inline void init_waitqueue_entry(struct wait_queue *q, struct thread *thread)
|
|
{
|
|
q->thread = thread;
|
|
q->waiting = 0;
|
|
}
|
|
|
|
static inline void add_wait_queue(struct wait_queue_head *h, struct wait_queue *q)
|
|
{
|
|
if (!q->waiting) {
|
|
MINIOS_STAILQ_INSERT_HEAD(h, q, thread_list);
|
|
q->waiting = 1;
|
|
}
|
|
}
|
|
|
|
static inline void remove_wait_queue(struct wait_queue_head *h, struct wait_queue *q)
|
|
{
|
|
if (q->waiting) {
|
|
MINIOS_STAILQ_REMOVE(h, q, struct wait_queue, thread_list);
|
|
q->waiting = 0;
|
|
}
|
|
}
|
|
|
|
static inline void wake_up(struct wait_queue_head *head)
|
|
{
|
|
unsigned long flags;
|
|
struct wait_queue *curr, *tmp;
|
|
local_irq_save(flags);
|
|
MINIOS_STAILQ_FOREACH_SAFE(curr, head, thread_list, tmp)
|
|
wake(curr->thread);
|
|
local_irq_restore(flags);
|
|
}
|
|
|
|
#define add_waiter(w, wq) do { \
|
|
unsigned long flags; \
|
|
local_irq_save(flags); \
|
|
add_wait_queue(&wq, &w); \
|
|
block(get_current()); \
|
|
local_irq_restore(flags); \
|
|
} while (0)
|
|
|
|
#define remove_waiter(w, wq) do { \
|
|
unsigned long flags; \
|
|
local_irq_save(flags); \
|
|
remove_wait_queue(&wq, &w); \
|
|
local_irq_restore(flags); \
|
|
} while (0)
|
|
|
|
#define wait_event_deadline(wq, condition, deadline) do { \
|
|
unsigned long flags; \
|
|
DEFINE_WAIT(__wait); \
|
|
if(condition) \
|
|
break; \
|
|
for(;;) \
|
|
{ \
|
|
/* protect the list */ \
|
|
local_irq_save(flags); \
|
|
add_wait_queue(&wq, &__wait); \
|
|
get_current()->wakeup_time = deadline; \
|
|
clear_runnable(get_current()); \
|
|
local_irq_restore(flags); \
|
|
if((condition) || (deadline && NOW() >= deadline)) \
|
|
break; \
|
|
schedule(); \
|
|
} \
|
|
local_irq_save(flags); \
|
|
/* need to wake up */ \
|
|
wake(get_current()); \
|
|
remove_wait_queue(&wq, &__wait); \
|
|
local_irq_restore(flags); \
|
|
} while(0)
|
|
|
|
#define wait_event(wq, condition) wait_event_deadline(wq, condition, 0)
|
|
|
|
|
|
|
|
#endif /* __WAIT_H__ */
|
|
|
|
/*
|
|
* Local variables:
|
|
* mode: C
|
|
* c-set-style: "BSD"
|
|
* c-basic-offset: 4
|
|
* tab-width: 4
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*/
|