Changeset 3375bd4 in mainline for uspace/lib/c/generic

Timestamp:

2011-05-17T07:44:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

Location:

uspace/lib/c/generic

Files:

• adt/prodcons.c (added)
• as.c (modified) (3 diffs)
• assert.c (added)
• async.c (modified) (1 diff)
• async_sess.c (modified) (1 diff)
• dlfcn.c (added)
• errno.c (modified) (1 diff)
• event.c (modified) (1 diff)
• fibril_synch.c (modified) (1 diff)
• io/io.c (modified) (1 diff)
• libc.c (modified) (2 diffs)
• malloc.c (modified) (1 diff)
• rtld/dynamic.c (added)
• rtld/elf_load.c (added)
• rtld/module.c (added)
• rtld/rtld.c (added)
• rtld/symbol.c (added)
• stacktrace.c (modified) (1 diff)
• str.c (modified) (2 diffs)

uspace/lib/c/generic/as.c

@@ -52 +52 @@
  *
  */
-void *as_area_create(void *address, size_t size, int flags)
+void *as_area_create(void *address, size_t size, unsigned int flags)
 {
         return (void *) __SYSCALL3(SYS_AS_AREA_CREATE, (sysarg_t) address,
@@ -68 +68 @@
  *
  */
-int as_area_resize(void *address, size_t size, int flags)
+int as_area_resize(void *address, size_t size, unsigned int flags)
 {
         return __SYSCALL3(SYS_AS_AREA_RESIZE, (sysarg_t) address,
@@ -96 +96 @@
  *
  */
-int as_area_change_flags(void *address, int flags)
+int as_area_change_flags(void *address, unsigned int flags)
 {
         return __SYSCALL2(SYS_AS_AREA_CHANGE_FLAGS, (sysarg_t) address,

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"
 

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/event.c

@@ -41 +41 @@
 #include <kernel/ipc/event_types.h>
 
-/** Subscribe for event notifications.
+/** Subscribe event notifications.
  *
- * @param evno   Event number.
- * @param method Use this method for notifying me.
+ * @param evno    Event type to subscribe.
+ * @param imethod Use this interface and method for notifying me.
  *
  * @return Value returned by the kernel.
+ *
  */
-int event_subscribe(event_type_t e, sysarg_t method)
+int event_subscribe(event_type_t evno, sysarg_t imethod)
 {
-        return __SYSCALL2(SYS_EVENT_SUBSCRIBE, (sysarg_t) e, (sysarg_t) method);
+        return __SYSCALL2(SYS_EVENT_SUBSCRIBE, (sysarg_t) evno,
+            (sysarg_t) imethod);
+}
+
+/** Unmask event notifications.
+ *
+ * @param evno Event type to unmask.
+ *
+ * @return Value returned by the kernel.
+ *
+ */
+int event_unmask(event_type_t evno)
+{
+        return __SYSCALL1(SYS_EVENT_UNMASK, (sysarg_t) evno);
 }
 

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/libc.c

@@ -53 +53 @@
 #include "private/io.h"
 
+#ifdef CONFIG_RTLD
+#include <rtld/rtld.h>
+#endif
+
 static bool env_setup = false;
 
@@ -77 +81 @@
         char **argv;
         
+#ifdef __IN_SHARED_LIBC__
+        if (__pcb != NULL && __pcb->rtld_runtime != NULL) {
+                runtime_env = (runtime_env_t *) __pcb->rtld_runtime;
+        }
+#endif
         /*
          * Get command line arguments and initialize

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";
+        }
+}
+
 /** @}
  */