Changeset b79d450 in mainline for uspace/lib/libc/generic

Timestamp:

2010-01-27T20:35:49Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (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/generic

Files:

• adt/hash_table.c (modified) (1 diff)
• io/io.c (modified) (2 diffs)
• stacktrace.c (modified) (2 diffs)
• udebug.c (modified) (2 diffs)
• vfs/vfs.c (modified) (1 diff)

uspace/lib/libc/generic/adt/hash_table.c

@@ -193 +193 @@
 }
 
+/** Apply fucntion to all items in hash table.
+ *
+ * @param h             Hash table.
+ * @param f             Function to be applied.
+ * @param arg           Argument to be passed to the function.
+ */
+void
+hash_table_apply(hash_table_t *h, void (*f)(link_t *, void *), void *arg)
+{
+        hash_index_t bucket;
+        link_t *cur;
+
+        for (bucket = 0; bucket < h->entries; bucket++) {
+                for (cur = h->entry[bucket].next; cur != &h->entry[bucket];
+                    cur = cur->next) {
+                        f(cur, arg);
+                }
+        }
+}
+
 /** @}
  */

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

@@ -554 +554 @@
 }
 
+int ftell(FILE *stream)
+{
+        off_t rc = lseek(stream->fd, 0, SEEK_CUR);
+        if (rc == (off_t) (-1)) {
+                /* errno has been set by lseek. */
+                return -1;
+        }
+
+        return rc;
+}
+
 void rewind(FILE *stream)
 {
@@ -584 +595 @@
 }
 
+void clearerr(FILE *stream)
+{
+        stream->eof = false;
+        stream->error = false;
+}
+
 int fphone(FILE *stream)
 {

uspace/lib/libc/generic/stacktrace.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Jakub Jermar
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +37 @@
 #include <stdio.h>
 #include <sys/types.h>
+#include <errno.h>
 
-void stack_trace_fp_pc(uintptr_t fp, uintptr_t pc)
+static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data);
+
+void stacktrace_print_fp_pc(uintptr_t fp, uintptr_t pc)
 {
-        printf("Printing stack trace:\n");
-        printf("=====================\n");
-        while (frame_pointer_validate(fp)) {
+        stacktrace_t st;
+        uintptr_t nfp;
+
+        st.op_arg = NULL;
+        st.read_uintptr = stacktrace_read_uintptr;
+
+        while (stacktrace_fp_valid(&st, fp)) {
                 printf("%p: %p()\n", fp, pc);
-                pc = return_address_get(fp);
-                fp = frame_pointer_prev(fp);
+                (void) stacktrace_ra_get(&st, fp, &pc);
+                (void) stacktrace_fp_prev(&st, fp, &nfp);
+                fp = nfp;
         }
-        printf("=====================\n");
 }
 
-void stack_trace(void)
+void stacktrace_print(void)
 {
-        stack_trace_fp_pc(frame_pointer_get(), program_counter_get());
+        stacktrace_prepare();
+        stacktrace_print_fp_pc(stacktrace_fp_get(), stacktrace_pc_get());
         /*
          * Prevent the tail call optimization of the previous call by
          * making it a non-tail call.
          */
-        (void) frame_pointer_get();
+        (void) stacktrace_fp_get();
+}
+
+static int stacktrace_read_uintptr(void *arg, uintptr_t addr, uintptr_t *data)
+{
+        (void) arg;
+        *data = *((uintptr_t *) addr);
+        return EOK;
 }
 

uspace/lib/libc/generic/udebug.c

@@ -69 +69 @@
 }
 
+int udebug_name_read(int phoneid, void *buffer, size_t n,
+        size_t *copied, size_t *needed)
+{
+        ipcarg_t a_copied, a_needed;
+        int rc;
+
+        rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_NAME_READ,
+                (sysarg_t)buffer, n, NULL, &a_copied, &a_needed);
+
+        *copied = (size_t)a_copied;
+        *needed = (size_t)a_needed;
+
+        return rc;
+}
+
+int udebug_areas_read(int phoneid, void *buffer, size_t n,
+        size_t *copied, size_t *needed)
+{
+        ipcarg_t a_copied, a_needed;
+        int rc;
+
+        rc = async_req_3_3(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_AREAS_READ,
+                (sysarg_t)buffer, n, NULL, &a_copied, &a_needed);
+
+        *copied = (size_t)a_copied;
+        *needed = (size_t)a_needed;
+
+        return rc;
+}
+
 int udebug_mem_read(int phoneid, void *buffer, uintptr_t addr, size_t n)
 {
@@ -78 +108 @@
 {
         return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_ARGS_READ,
+            tid, (sysarg_t)buffer);
+}
+
+int udebug_regs_read(int phoneid, thash_t tid, void *buffer)
+{
+        return async_req_3_0(phoneid, IPC_M_DEBUG_ALL, UDEBUG_M_REGS_READ,
             tid, (sysarg_t)buffer);
 }

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

@@ -197 +197 @@
 }
 
+int unmount(const char *mp)
+{
+        ipcarg_t rc;
+        ipcarg_t rc_orig;
+        aid_t req;
+        size_t mpa_size;
+        char *mpa;
+        
+        mpa = absolutize(mp, &mpa_size);
+        if (!mpa)
+                return ENOMEM;
+        
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        vfs_connect();
+        
+        req = async_send_0(vfs_phone, VFS_IN_UNMOUNT, NULL);
+        rc = async_data_write_start(vfs_phone, (void *) mpa, mpa_size);
+        if (rc != EOK) {
+                async_wait_for(req, &rc_orig);
+                async_serialize_end();
+                futex_up(&vfs_phone_futex);
+                free(mpa);
+                if (rc_orig == EOK)
+                        return (int) rc;
+                else
+                        return (int) rc_orig;
+        }
+        
+
+        async_wait_for(req, &rc);
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        free(mpa);
+        
+        return (int) rc;
+}
+
 static int open_internal(const char *abs, size_t abs_size, int lflag, int oflag)
 {