diff options
| author | Richard Braun <rbraun@sceen.net> | 2012-11-25 23:12:41 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-27 23:03:06 +0100 |
| commit | 3aef6957c38c5f6fcdcadc878ae16fb690485f95 (patch) | |
| tree | 4f739c11a9bec9ad1f2e9c8436fac7ee3e6dcf60 /libmachdev/queue.h | |
| parent | e1b0e34210b385d05e50900486262709a9ee3a31 (diff) | |
Move DDE to pthreads
Makefiles, headers, types, macros and function calls are renamed where
appropriate. ds_server now takes a void* and returns a void*.
* dde26_test/Makefile: Switch from cthreads to pthreads.
* dde_e100/Makefile: Likewise.
* dde_e100/main.c: Likewise.
* dde26_test/Makefile: Likewise.
* dde_e100/Makefile: Likewise.
* dde_e100/main.c: Likewise.
* dde_e1000/Makefile: Likewise.
* dde_e1000/main.c: Likewise.
* dde_ne2k_pci/Makefile: Likewise.
* dde_ne2k_pci/main.c: Likewise.
* dde_pcnet32/Makefile: Likewise.
* dde_pcnet32/main.c: Likewise.
* dde_pcnet32_test/Makefile: Likewise.
* dde_rtl8139/Makefile: Likewise.
* dde_rtl8139/main.c: Likewise.
* libbpf/Makefile: Likewise.
* libddekit/Makefile: Likewise.
* libddekit/condvar.c: Likewise.
* libddekit/lock.c: Likewise.
* libddekit/pgtab.c: Likewise.
* libddekit/thread.c: Likewise.
* libddekit/timer.c: Likewise.
* libhurd-slab/Makefile: Likewise.
* libhurd-slab/slab.c: Likewise.
* libhurd-slab/slab.h: Likewise.
* libmachdev/Makefile: Likewise.
* libmachdev/dev_hdr.h: Likewise.
* libmachdev/ds_routines.c: Likewise.
* libmachdev/if_hdr.h: Likewise.
* libmachdev/io_req.h: Likewise.
* libmachdev/machdev.h: Likewise.
* libmachdev/net.c: Likewise.
* libmachdev/queue.h: Likewise.
Diffstat (limited to 'libmachdev/queue.h')
| -rw-r--r-- | libmachdev/queue.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libmachdev/queue.h b/libmachdev/queue.h index 0637dede..86ef74dc 100644 --- a/libmachdev/queue.h +++ b/libmachdev/queue.h @@ -35,7 +35,7 @@ #ifndef _KERN_QUEUE_H_ #define _KERN_QUEUE_H_ -#include <cthreads.h> +#include <pthread.h> /* * Queue of abstract objects. Queue is maintained @@ -337,7 +337,7 @@ void insque(queue_entry_t, queue_entry_t); */ struct mpqueue_head { struct queue_entry head; /* header for queue */ - struct mutex lock; /* lock for queue */ + pthread_mutex_t lock; /* lock for queue */ }; typedef struct mpqueue_head mpqueue_head_t; @@ -347,21 +347,21 @@ typedef struct mpqueue_head mpqueue_head_t; #define mpqueue_init(q) \ { \ queue_init(&(q)->head); \ - mutex_init(&(q)->lock); \ + pthread_mutex_init(&(q)->lock, NULL); \ } #define mpenqueue_tail(q, elt) \ - mutex_lock(&(q)->lock); \ + pthread_mutex_lock(&(q)->lock); \ enqueue_tail(&(q)->head, elt); \ - mutex_unlock(&(q)->lock); + pthread_mutex_unlock(&(q)->lock); #define mpdequeue_head(q, elt) \ - mutex_lock(&(q)->lock); \ + pthread_mutex_lock(&(q)->lock); \ if (queue_empty(&(q)->head)) \ *(elt) = 0; \ else \ *(elt) = dequeue_head(&(q)->head); \ - mutex_unlock(&(q)->lock); + pthread_mutex_unlock(&(q)->lock); /* * Old queue stuff, will go away soon. |