Changeset fbcfc4da in mainline for uspace/lib

Timestamp:

2009-12-03T19:25:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9510be2

Parents:

cb3d641a (diff), 22e6802 (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.

Location:

uspace/lib/libc

Files:

• arch/amd64/include/atomic.h (modified) (1 diff)
• arch/arm32/include/atomic.h (modified) (2 diffs)
• arch/ia32/Makefile.inc (modified) (1 diff)
• arch/ia32/include/atomic.h (modified) (1 diff)
• arch/ia64/include/atomic.h (modified) (1 diff)
• arch/mips32/include/atomic.h (modified) (1 diff)
• arch/ppc32/include/atomic.h (modified) (1 diff)
• arch/sparc64/include/atomic.h (modified) (1 diff)
• generic/async.c (modified) (2 diffs)
• generic/futex.c (modified) (3 diffs)
• generic/io/console.c (modified) (1 diff)
• generic/io/klog.c (modified) (1 diff)
• generic/string.c (modified) (4 diffs)
• generic/time.c (modified) (3 diffs)
• generic/vfs/canonify.c (modified) (2 diffs)
• include/atomic.h (modified) (2 diffs)
• include/atomicdflt.h (added)
• include/futex.h (modified) (1 diff)
• include/io/console.h (modified) (1 diff)
• include/ipc/console.h (modified) (1 diff)
• include/string.h (modified) (1 diff)
• include/unistd.h (modified) (2 diffs)

uspace/lib/libc/arch/amd64/include/atomic.h

@@ -37 +37 @@
 #ifndef LIBC_amd64_ATOMIC_H_
 #define LIBC_amd64_ATOMIC_H_
+
+#define LIBC_ARCH_ATOMIC_H_
+
+#include <atomicdflt.h>
 
 static inline void atomic_inc(atomic_t *val) {

uspace/lib/libc/arch/arm32/include/atomic.h

@@ -37 +37 @@
 #define LIBC_arm32_ATOMIC_H_
 
+#include <bool.h>
+
+typedef struct atomic {
+        volatile long count;
+} atomic_t;
+
+static inline void atomic_set(atomic_t *val, long i)
+{
+        val->count = i;
+}
+
+static inline long atomic_get(atomic_t *val)
+{
+        return val->count;
+}
+
+static inline bool cas(atomic_t *val, long ov, long nv)
+{
+        /* FIXME: is not atomic */
+        if (val->count == ov) {
+                val->count = nv;
+                return true;
+        }
+        return false;
+}
+
 /** Atomic addition.
  *
@@ -49 +75 @@
         volatile long * mem = &(val->count);
 
+        /* FIXME: is not atomic, is broken */
         asm volatile (
         "1:\n"

uspace/lib/libc/arch/ia32/Makefile.inc

@@ -39 +39 @@
         arch/$(UARCH)/src/setjmp.S
 
+GCC_CFLAGS += -march=pentium
 LFLAGS += -N
 

uspace/lib/libc/arch/ia32/include/atomic.h

@@ -35 +35 @@
 #ifndef LIBC_ia32_ATOMIC_H_
 #define LIBC_ia32_ATOMIC_H_
+
+#define LIBC_ARCH_ATOMIC_H_
+
+#include <atomicdflt.h>
 
 static inline void atomic_inc(atomic_t *val) {

uspace/lib/libc/arch/ia64/include/atomic.h

@@ -35 +35 @@
 #ifndef LIBC_ia64_ATOMIC_H_
 #define LIBC_ia64_ATOMIC_H_
+
+#define LIBC_ARCH_ATOMIC_H_
+
+#include <atomicdflt.h>
 
 static inline void atomic_inc(atomic_t *val)

uspace/lib/libc/arch/mips32/include/atomic.h

@@ -36 +36 @@
 #ifndef LIBC_mips32_ATOMIC_H_
 #define LIBC_mips32_ATOMIC_H_
+
+#define LIBC_ARCH_ATOMIC_H_
+
+#include <atomicdflt.h>
 
 #define atomic_inc(x)   ((void) atomic_add(x, 1))

uspace/lib/libc/arch/ppc32/include/atomic.h

@@ -35 +35 @@
 #ifndef LIBC_ppc32_ATOMIC_H_
 #define LIBC_ppc32_ATOMIC_H_
+
+#define LIBC_ARCH_ATOMIC_H_
+
+#include <atomicdflt.h>
 
 static inline void atomic_inc(atomic_t *val)

uspace/lib/libc/arch/sparc64/include/atomic.h

@@ -36 +36 @@
 #define LIBC_sparc64_ATOMIC_H_
 
+#define LIBC_ARCH_ATOMIC_H_
+
+#include <atomicdflt.h>
 #include <sys/types.h>
 

uspace/lib/libc/generic/async.c

@@ -392 +392 @@
         /* If nothing in queue, wait until something arrives */
         while (list_empty(&conn->msg_queue)) {
+                if (conn->close_callid) {
+                        /*
+                         * Handle the case when the connection was already
+                         * closed by the client but the server did not notice
+                         * the first IPC_M_PHONE_HUNGUP call and continues to
+                         * call async_get_call_timeout(). Repeat
+                         * IPC_M_PHONE_HUNGUP until the caller notices. 
+                         */
+                        memset(call, 0, sizeof(ipc_call_t));
+                        IPC_SET_METHOD(*call, IPC_M_PHONE_HUNGUP);
+                        futex_up(&async_futex);
+                        return conn->close_callid;
+                }
+
                 if (usecs)
                         async_insert_timeout(&conn->wdata);
@@ -528 +542 @@
         list_initialize(&conn->msg_queue);
         conn->callid = callid;
-        conn->close_callid = false;
+        conn->close_callid = 0;
         
         if (call)

uspace/lib/libc/generic/futex.c

@@ -36 +36 @@
 #include <atomic.h>
 #include <libc.h>
-#include <stdio.h>
 #include <sys/types.h>
-#include <kernel/synch/synch.h>
-
-/*
- * Note about race conditions.
- * Because of non-atomic nature of operations performed sequentially on the
- * futex counter and the futex wait queue, there is a race condition:
- *
- * (wq->missed_wakeups == 1) && (futex->count = 1)
- *
- * Scenario 1 (wait queue timeout vs. futex_up()):
- * 1. assume wq->missed_wakeups == 0 && futex->count == -1
- *    (ie. thread A sleeping, thread B in the critical section)
- * 2. A receives timeout and gets removed from the wait queue
- * 3. B wants to leave the critical section and calls futex_up()
- * 4. B thus changes futex->count from -1 to 0
- * 5. B has to call SYS_FUTEX_WAKEUP syscall to wake up the sleeping thread
- * 6. B finds the wait queue empty and changes wq->missed_wakeups from 0 to 1
- * 7. A fixes futex->count (i.e. the number of waiting threads) by changing it
- *    from 0 to 1
- *
- * Scenario 2 (conditional down operation vs. futex_up)
- * 1. assume wq->missed_wakeups == 0 && futex->count == 0
- *    (i.e. thread A is in the critical section)
- * 2. thread B performs futex_trydown() operation and changes futex->count from
- *    0 to -1
- *    B is now obliged to call SYS_FUTEX_SLEEP syscall
- * 3. A wants to leave the critical section and does futex_up()
- * 4. A thus changes futex->count from -1 to 0 and must call SYS_FUTEX_WAKEUP
- *    syscall
- * 5. B finds the wait queue empty and immediatelly aborts the conditional sleep
- * 6. No thread is queueing in the wait queue so wq->missed_wakeups changes from
- *    0 to 1
- * 6. B fixes futex->count (i.e. the number of waiting threads) by changing it
- *    from 0 to 1
- *
- * Both scenarios allow two threads to be in the critical section
- * simultaneously. One without kernel intervention and the other through
- * wq->missed_wakeups being 1.
- *
- * To mitigate this problem, futex_down_timeout() detects that the syscall
- * didn't sleep in the wait queue, fixes the futex counter and RETRIES the
- * whole operation again.
- */
 
 /** Initialize futex counter.
@@ -92 +48 @@
 }
 
-int futex_down(futex_t *futex)
-{
-        return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
-}
-
-int futex_trydown(futex_t *futex)
-{
-        return futex_down_timeout(futex, SYNCH_NO_TIMEOUT,
-            SYNCH_FLAGS_NON_BLOCKING);
-}
-
 /** Try to down the futex.
  *
  * @param futex         Futex.
- * @param usec          Microseconds to wait. Zero value means sleep without
- *                      timeout.
- * @param flags         Select mode of operation. See comment for
- *                      waitq_sleep_timeout(). 
+ * @return              Non-zero if the futex was acquired.
+ * @return              Zero if the futex was not acquired.
+ */
+int futex_trydown(futex_t *futex)
+{
+        return cas(futex, 1, 0);
+}
+
+/** Down the futex.
  *
- * @return              ENOENT if there is no such virtual address. One of
- *                      ESYNCH_OK_ATOMIC and ESYNCH_OK_BLOCKED on success or
- *                      ESYNCH_TIMEOUT if the lock was not acquired because of
- *                      a timeout or ESYNCH_WOULD_BLOCK if the operation could
- *                      not be carried out atomically (if requested so).
+ * @param futex         Futex.
+ * @return              ENOENT if there is no such virtual address.
+ * @return              Zero in the uncontended case. 
+ * @return              Otherwise one of ESYNCH_OK_ATOMIC or ESYNCH_OK_BLOCKED.
  */
-int futex_down_timeout(futex_t *futex, uint32_t usec, int flags)
+int futex_down(futex_t *futex)
 {
-        int rc;
-        
-        while (atomic_predec(futex) < 0) {
-                rc = __SYSCALL3(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count,
-                    (sysarg_t) usec, (sysarg_t) flags);
-                
-                switch (rc) {
-                case ESYNCH_OK_ATOMIC:
-                        /*
-                         * Because of a race condition between timeout and
-                         * futex_up() and between conditional
-                         * futex_down_timeout() and futex_up(), we have to give
-                         * up and try again in this special case.
-                         */
-                        atomic_inc(futex);
-                        break;
+        if (atomic_predec(futex) < 0)
+                return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count);
 
-                case ESYNCH_TIMEOUT:
-                        atomic_inc(futex);
-                        return ESYNCH_TIMEOUT;
-                        break;
-
-                case ESYNCH_WOULD_BLOCK:
-                        /*
-                         * The conditional down operation should be implemented
-                         * this way. The userspace-only variant tends to
-                         * accumulate missed wakeups in the kernel futex wait
-                         * queue.
-                         */
-                        atomic_inc(futex);
-                        return ESYNCH_WOULD_BLOCK;
-                        break;
-
-                case ESYNCH_OK_BLOCKED:
-                        /*
-                         * Enter the critical section.
-                         * The futex counter has already been incremented for
-                         * us.
-                         */
-                        return ESYNCH_OK_BLOCKED;
-                        break;
-                default:
-                        return rc;
-                }
-        }
-
-        /*
-         * Enter the critical section.
-         */
-        return ESYNCH_OK_ATOMIC;
+        return 0;
 }
 
@@ -174 +77 @@
  *
  * @param futex         Futex.
- *
- * @return              ENOENT if there is no such virtual address. Otherwise
- *                      zero.
+ * @return              ENOENT if there is no such virtual address.
+ * @return              Zero in the uncontended case.
  */
 int futex_up(futex_t *futex)
 {
-        long val;
-        
-        val = atomic_postinc(futex);
-        if (val < 0)
+        if (atomic_postinc(futex) < 0)
                 return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->count);
                 

uspace/lib/libc/generic/io/console.c

@@ -94 +94 @@
 }
 
+int console_get_pos(int phone, int *col, int *row)
+{
+        ipcarg_t col_v;
+        ipcarg_t row_v;
+        int rc;
+
+        rc = async_req_0_2(phone, CONSOLE_GET_POS, &col_v, &row_v);
+
+        *col = (int) col_v;
+        *row = (int) row_v;
+        return rc;
+}
+
 void console_goto(int phone, int col, int row)
 {

uspace/lib/libc/generic/io/klog.c

@@ -42 +42 @@
 size_t klog_write(const void *buf, size_t size)
 {
-        return (size_t) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size);
+        ssize_t ret = (ssize_t) __SYSCALL3(SYS_KLOG, 1, (sysarg_t) buf, size);
+        
+        if (ret >= 0)
+                return (size_t) ret;
+        
+        return 0;
 }
 

uspace/lib/libc/generic/string.c

@@ -471 +471 @@
  * null-terminated and containing only complete characters.
  *
- * @param dst   Destination buffer.
+ * @param dest   Destination buffer.
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
@@ -505 +505 @@
  * have to be null-terminated.
  *
- * @param dst   Destination buffer.
+ * @param dest   Destination buffer.
  * @param count Size of the destination buffer (must be > 0).
  * @param src   Source string.
@@ -537 +537 @@
  * null-terminated and containing only complete characters.
  *
- * @param dst   Destination buffer.
+ * @param dest   Destination buffer.
  * @param count Size of the destination buffer.
  * @param src   Source string.
@@ -549 +549 @@
 }
 
-/** Copy NULL-terminated wide string to string
- *
- * Copy source wide string @a src to destination buffer @a dst.
- * No more than @a size bytes are written. NULL-terminator is always
- * written after the last succesfully copied character (i.e. if the
- * destination buffer is has at least 1 byte, it will be always
- * NULL-terminated).
- *
- * @param src   Source wide string.
- * @param dst   Destination buffer.
- * @param count Size of the destination buffer.
- *
- */
-void wstr_nstr(char *dst, const wchar_t *src, size_t size)
-{
-        /* No space for the NULL-terminator in the buffer */
-        if (size == 0)
-                return;
-        
+/** Convert wide string to string.
+ *
+ * Convert wide string @a src to string. The output is written to the buffer
+ * specified by @a dest and @a size. @a size must be non-zero and the string
+ * written will always be well-formed.
+ *
+ * @param dest  Destination buffer.
+ * @param size  Size of the destination buffer.
+ * @param src   Source wide string.
+ */
+void wstr_to_str(char *dest, size_t size, const wchar_t *src)
+{
         wchar_t ch;
-        size_t src_idx = 0;
-        size_t dst_off = 0;
-        
+        size_t src_idx;
+        size_t dest_off;
+
+        /* There must be space for a null terminator in the buffer. */
+        assert(size > 0);
+        
+        src_idx = 0;
+        dest_off = 0;
+
         while ((ch = src[src_idx++]) != 0) {
-                if (chr_encode(ch, dst, &dst_off, size) != EOK)
+                if (chr_encode(ch, dest, &dest_off, size - 1) != EOK)
                         break;
         }
-        
-        if (dst_off >= size)
-                dst[size - 1] = 0;
-        else
-                dst[dst_off] = 0;
+
+        dest[dest_off] = '\0';
+}
+
+/** Convert wide string to new string.
+ *
+ * Convert wide string @a src to string. Space for the new string is allocated
+ * on the heap.
+ *
+ * @param src   Source wide string.
+ * @return      New string.
+ */
+char *wstr_to_astr(const wchar_t *src)
+{
+        char dbuf[STR_BOUNDS(1)];
+        char *str;
+        wchar_t ch;
+
+        size_t src_idx;
+        size_t dest_off;
+        size_t dest_size;
+
+        /* Compute size of encoded string. */
+
+        src_idx = 0;
+        dest_size = 0;
+
+        while ((ch = src[src_idx++]) != 0) {
+                dest_off = 0;
+                if (chr_encode(ch, dbuf, &dest_off, STR_BOUNDS(1)) != EOK)
+                        break;
+                dest_size += dest_off;
+        }
+
+        str = malloc(dest_size + 1);
+        if (str == NULL)
+                return NULL;
+
+        /* Encode string. */
+
+        src_idx = 0;
+        dest_off = 0;
+
+        while ((ch = src[src_idx++]) != 0) {
+                if (chr_encode(ch, str, &dest_off, dest_size) != EOK)
+                        break;
+        }
+
+        str[dest_size] = '\0';
+        return str;
+}
+
+
+/** Convert string to wide string.
+ *
+ * Convert string @a src to wide string. The output is written to the
+ * buffer specified by @a dest and @a dlen. @a dlen must be non-zero
+ * and the wide string written will always be null-terminated.
+ *
+ * @param dest  Destination buffer.
+ * @param dlen  Length of destination buffer (number of wchars).
+ * @param src   Source string.
+ */
+void str_to_wstr(wchar_t *dest, size_t dlen, const char *src)
+{
+        size_t offset;
+        size_t di;
+        wchar_t c;
+
+        assert(dlen > 0);
+
+        offset = 0;
+        di = 0;
+
+        do {
+                if (di >= dlen - 1)
+                        break;
+
+                c = str_decode(src, &offset, STR_NO_LIMIT);
+                dest[di++] = c;
+        } while (c != '\0');
+
+        dest[dlen - 1] = '\0';
 }
 

uspace/lib/libc/generic/time.c

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #include <sys/time.h>
@@ -40 +40 @@
 #include <unistd.h>
 #include <atomic.h>
-#include <futex.h>
 #include <sysinfo.h>
 #include <ipc/services.h>
+#include <libc.h>
 
 #include <sysinfo.h>
@@ -189 +189 @@
 
 /** Wait unconditionally for specified number of microseconds */
-int usleep(unsigned long usec)
-{
-        atomic_t futex = FUTEX_INITIALIZER;
-
-        futex_initialize(&futex, 0);
-        futex_down_timeout(&futex, usec, 0);
+int usleep(useconds_t usec)
+{
+        (void) __SYSCALL1(SYS_THREAD_USLEEP, usec);
         return 0;
 }
 
 /** Wait unconditionally for specified number of seconds */
-unsigned int sleep(unsigned int seconds)
-{
-        atomic_t futex = FUTEX_INITIALIZER;
-
-        futex_initialize(&futex, 0);
-        
+unsigned int sleep(unsigned int sec)
+{
         /* Sleep in 1000 second steps to support
            full argument range */
-        while (seconds > 0) {
-                unsigned int period = (seconds > 1000) ? 1000 : seconds;
+        while (sec > 0) {
+                unsigned int period = (sec > 1000) ? 1000 : sec;
         
-                futex_down_timeout(&futex, period * 1000000, 0);
-                seconds -= period;
+                usleep(period * 1000000);
+                sec -= period;
         }
         return 0;

uspace/lib/libc/generic/vfs/canonify.c

@@ -142 +142 @@
         t->start[-1] = '\0';
 }
-/** Eat the extra '/'..
+/** Eat the extra '/'.
  *
  * @param t             The current TK_SLASH token.
@@ -288 +288 @@
  *
  * A file system path is canonical, if the following holds:
- * 1) the path is absolute (i.e. a/b/c is not canonical)
- * 2) there is no trailing slash in the path (i.e. /a/b/c is not canonical)
- * 3) there is no extra slash in the path (i.e. /a//b/c is not canonical)
- * 4) there is no '.' component in the path (i.e. /a/./b/c is not canonical)
- * 5) there is no '..' component in the path (i.e. /a/b/../c is not canonical) 
+ *
+ * 1) the path is absolute
+ *    (i.e. a/b/c is not canonical)
+ * 2) there is no trailing slash in the path if it has components
+ *    (i.e. /a/b/c/ is not canonical)
+ * 3) there is no extra slash in the path
+ *    (i.e. /a//b/c is not canonical)
+ * 4) there is no '.' component in the path
+ *    (i.e. /a/./b/c is not canonical)
+ * 5) there is no '..' component in the path
+ *    (i.e. /a/b/../c is not canonical)
  *
  * This function makes a potentially non-canonical file system path canonical.

uspace/lib/libc/include/atomic.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -36 +36 @@
 #define LIBC_ATOMIC_H_
 
-typedef struct atomic {
-        volatile long count;
-} atomic_t;
-
 #include <libarch/atomic.h>
-
-static inline void atomic_set(atomic_t *val, long i)
-{
-        val->count = i;
-}
-
-static inline long atomic_get(atomic_t *val)
-{
-        return val->count;
-}
 
 #endif

uspace/lib/libc/include/futex.h

@@ -46 +46 @@
 extern int futex_down(futex_t *futex);
 extern int futex_trydown(futex_t *futex);
-extern int futex_down_timeout(futex_t *futex, uint32_t usec, int flags);
 extern int futex_up(futex_t *futex);
 

uspace/lib/libc/include/io/console.h

@@ -69 +69 @@
 
 extern int console_get_size(int phone, int *cols, int *rows);
+extern int console_get_pos(int phone, int *col, int *row);
 extern void console_goto(int phone, int col, int row);
 

uspace/lib/libc/include/ipc/console.h

@@ -43 +43 @@
         CONSOLE_GET_COLOR_CAP,
         CONSOLE_GET_EVENT,
+        CONSOLE_GET_POS,
         CONSOLE_GOTO,
         CONSOLE_CLEAR,

uspace/lib/libc/include/string.h

@@ -73 +73 @@
 extern void str_append(char *dest, size_t size, const char *src);
 
-extern void wstr_nstr(char *dst, const wchar_t *src, size_t size);
+extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
+extern char *wstr_to_astr(const wchar_t *src);
+extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);

uspace/lib/libc/include/unistd.h

@@ -51 +51 @@
 #endif
 
+typedef uint32_t useconds_t;
+
 extern int dup2(int oldfd, int newfd);
 
@@ -68 +70 @@
 
 extern void _exit(int status) __attribute__ ((noreturn));
-extern int usleep(unsigned long usec);
-extern unsigned int sleep(unsigned int seconds);
+extern int usleep(useconds_t uses);
+extern unsigned int sleep(unsigned int se);
 
 #endif