Changeset 985e26d2 in mainline for uspace/lib/libc/include/async_priv.h

Timestamp:

2010-01-07T19:06:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8190e63

Parents:

743e17b (diff), eca2435 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/libc/include/async_priv.h (moved) (moved from kernel/arch/mips32/include/arg.h ) (3 diffs)

uspace/lib/libc/include/async_priv.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2006 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup libc
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_mips32_ARG_H_
-#define KERN_mips32_ARG_H_
+#ifndef LIBC_ASYNC_PRIV_H_
+#define LIBC_ASYNC_PRIV_H_
 
-#include <arch/types.h>
+#include <adt/list.h>
+#include <fibril.h>
+#include <sys/time.h>
+#include <bool.h>
 
-/**
- * va_arg macro for MIPS32 - problem is that 64 bit values must be aligned on an 8-byte boundary (32bit values not)
- * To satisfy this, paddings must be sometimes inserted. 
- */
+/** Structures of this type are used to track the timeout events. */
+typedef struct {
+        /** If true, this struct is in the timeout list. */
+        bool inlist;
+        
+        /** Timeout list link. */
+        link_t link;
+        
+        /** If true, we have timed out. */
+        bool occurred;
 
-typedef uintptr_t va_list;
+        /** Expiration time. */
+        struct timeval expires;
+} to_event_t;
 
-#define va_start(ap, lst) \
-        ((ap) = (va_list)&(lst) + sizeof(lst))
+/** Structures of this type are used to track the wakeup events. */
+typedef struct {
+        /** If true, this struct is in a synchronization object wait queue. */
+        bool inlist;
+        
+        /** Wait queue linkage. */
+        link_t link;
+} wu_event_t;
 
-#define va_arg(ap, type)        \
-        (((type *)((ap) = (va_list)( (sizeof(type) <= 4) ? ((uintptr_t)((ap) + 2*4 - 1) & (~3)) : ((uintptr_t)((ap) + 2*8 -1) & (~7)) )))[-1])
 
-#define va_copy(dst,src) ((dst)=(src))
+/** Structures of this type represent a waiting fibril. */
+typedef struct {
+        /** Identification of and link to the waiting fibril. */
+        fid_t fid;
+        
+        /** If true, this fibril is currently active. */
+        bool active;
 
-#define va_end(ap)
+        /** Timeout wait data. */
+        to_event_t to_event;
+        /** Wakeup wait data. */
+        wu_event_t wu_event;
+} awaiter_t;
+
+extern void async_insert_timeout(awaiter_t *wd);
 
 #endif