Changeset b678410 in mainline for uspace/lib/c/generic

Timestamp:

2011-04-27T20:01:13Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (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/c/generic

Files:

• assert.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (2 diffs)
• async.c (modified) (3 diffs)
• async_sess.c (modified) (1 diff)
• errno.c (modified) (1 diff)
• fibril_synch.c (modified) (1 diff)
• io/io.c (modified) (1 diff)
• malloc.c (modified) (1 diff)
• stacktrace.c (modified) (1 diff)
• str.c (modified) (2 diffs)
• vfs/vfs.c (modified) (2 diffs)

uspace/lib/c/generic/assert.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jan Hudecek
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup genericproc
+/** @addtogroup libc
  * @{
  */
-/** @file tasklet.c
- *  @brief Tasklet implementation
- */
 
-#include <proc/tasklet.h>
-#include <synch/spinlock.h>
-#include <mm/slab.h>
-#include <config.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stacktrace.h>
 
-/** Spinlock protecting list of tasklets */
-SPINLOCK_INITIALIZE(tasklet_lock);
-
-/** Array of tasklet lists for every CPU */
-tasklet_descriptor_t **tasklet_list;
-
-void tasklet_init(void)
+void assert_abort(const char *cond, const char *file, unsigned int line)
 {
-        unsigned int i;
-        
-        tasklet_list = malloc(sizeof(tasklet_descriptor_t *) * config.cpu_count, 0);
-        if (!tasklet_list)
-                panic("Error initializing tasklets.");
-        
-        for (i = 0; i < config.cpu_count; i++)
-                tasklet_list[i] = NULL;
-        
-        spinlock_initialize(&tasklet_lock, "tasklet_lock");
+        printf("Assertion failed (%s) in file \"%s\", line %u.\n",
+            cond, file, line);
+        stacktrace_print();
+        abort();
 }
-
 
 /** @}

uspace/lib/c/generic/async.c

@@ -102 +102 @@
 #include <arch/barrier.h>
 #include <bool.h>
+#include <stdlib.h>
+#include <malloc.h>
 #include "private/async.h"
 
@@ -1572 +1574 @@
  * @param dst     Address of the beginning of the destination buffer.
  * @param size    Size of the destination buffer.
+ * @param flags   Flags to control the data transfer.
  *
  * @return Zero on success or a negative error code from errno.h.
  *
  */
-int async_data_read_start(int phoneid, void *dst, size_t size)
-{
-        return async_req_2_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
-            (sysarg_t) size);
+int
+async_data_read_start_generic(int phoneid, void *dst, size_t size, int flags)
+{
+        return async_req_3_0(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,
+            (sysarg_t) size, (sysarg_t) flags);
 }
 
@@ -1669 +1673 @@
  * @param src     Address of the beginning of the source buffer.
  * @param size    Size of the source buffer.
+ * @param flags   Flags to control the data transfer.
  *
  * @return Zero on success or a negative error code from errno.h.
  *
  */
-int async_data_write_start(int phoneid, const void *src, size_t size)
-{
-        return async_req_2_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src,
-            (sysarg_t) size);
+int
+async_data_write_start_generic(int phoneid, const void *src, size_t size,
+    int flags)
+{
+        return async_req_3_0(phoneid, IPC_M_DATA_WRITE, (sysarg_t) src,
+            (sysarg_t) size, (sysarg_t) flags);
 }
 

uspace/lib/c/generic/async_sess.c

@@ -105 +105 @@
 #include <errno.h>
 #include <assert.h>
+#include <async.h>
 #include "private/async_sess.h"
 

uspace/lib/c/generic/errno.c

@@ -36 +36 @@
 #include <fibril.h>
 
-int _errno;
+static fibril_local int fibril_errno;
+
+int *__errno(void)
+{
+        return &fibril_errno;
+}
 
 /** @}

uspace/lib/c/generic/fibril_synch.c

@@ -43 +43 @@
 #include <stacktrace.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include "private/async.h"
 

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

@@ -173 +173 @@
                 }
                 *flags = (O_APPEND | O_CREAT) | (plus ? O_RDWR : O_WRONLY);
+                break;
         default:
                 errno = EINVAL;

uspace/lib/c/generic/malloc.c

@@ -44 +44 @@
 #include <mem.h>
 #include <futex.h>
+#include <stdlib.h>
 #include <adt/gcdlcm.h>
 #include "private/malloc.h"

uspace/lib/c/generic/stacktrace.c

@@ -61 +61 @@
         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) stacktrace_fp_get();
+        
+        printf("-- end of stack trace --\n");
 }
 

uspace/lib/c/generic/str.c

@@ -1215 +1215 @@
 void order_suffix(const uint64_t val, uint64_t *rv, char *suffix)
 {
-        if (val > 10000000000000000000ULL) {
-                *rv = val / 1000000000000000000ULL;
+        if (val > UINT64_C(10000000000000000000)) {
+                *rv = val / UINT64_C(1000000000000000000);
                 *suffix = 'Z';
-        } else if (val > 1000000000000000000ULL) {
-                *rv = val / 1000000000000000ULL;
+        } else if (val > UINT64_C(1000000000000000000)) {
+                *rv = val / UINT64_C(1000000000000000);
                 *suffix = 'E';
-        } else if (val > 1000000000000000ULL) {
-                *rv = val / 1000000000000ULL;
+        } else if (val > UINT64_C(1000000000000000)) {
+                *rv = val / UINT64_C(1000000000000);
                 *suffix = 'T';
-        } else if (val > 1000000000000ULL) {
-                *rv = val / 1000000000ULL;
+        } else if (val > UINT64_C(1000000000000)) {
+                *rv = val / UINT64_C(1000000000);
                 *suffix = 'G';
-        } else if (val > 1000000000ULL) {
-                *rv = val / 1000000ULL;
+        } else if (val > UINT64_C(1000000000)) {
+                *rv = val / UINT64_C(1000000);
                 *suffix = 'M';
-        } else if (val > 1000000ULL) {
-                *rv = val / 1000ULL;
+        } else if (val > UINT64_C(1000000)) {
+                *rv = val / UINT64_C(1000);
                 *suffix = 'k';
         } else {
@@ -1239 +1239 @@
 }
 
+void bin_order_suffix(const uint64_t val, uint64_t *rv, const char **suffix,
+    bool fixed)
+{
+        if (val > UINT64_C(1152921504606846976)) {
+                *rv = val / UINT64_C(1125899906842624);
+                *suffix = "EiB";
+        } else if (val > UINT64_C(1125899906842624)) {
+                *rv = val / UINT64_C(1099511627776);
+                *suffix = "TiB";
+        } else if (val > UINT64_C(1099511627776)) {
+                *rv = val / UINT64_C(1073741824);
+                *suffix = "GiB";
+        } else if (val > UINT64_C(1073741824)) {
+                *rv = val / UINT64_C(1048576);
+                *suffix = "MiB";
+        } else if (val > UINT64_C(1048576)) {
+                *rv = val / UINT64_C(1024);
+                *suffix = "KiB";
+        } else {
+                *rv = val;
+                if (fixed)
+                        *suffix = "B  ";
+                else
+                        *suffix = "B";
+        }
+}
+
 /** @}
  */

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

@@ -378 +378 @@
         
         req = async_send_1(vfs_phone, VFS_IN_READ, fildes, &answer);
-        rc = async_data_read_start(vfs_phone, (void *)buf, nbyte);
+        rc = async_data_read_start_generic(vfs_phone, (void *) buf, nbyte,
+            IPC_XF_RESTRICT);
         if (rc != EOK) {
                 vfs_exchange_end(vfs_phone);
@@ -407 +408 @@
         
         req = async_send_1(vfs_phone, VFS_IN_WRITE, fildes, &answer);
-        rc = async_data_write_start(vfs_phone, (void *)buf, nbyte);
+        rc = async_data_write_start_generic(vfs_phone, (void *) buf, nbyte,
+            IPC_XF_RESTRICT);
         if (rc != EOK) {
                 vfs_exchange_end(vfs_phone);