Changeset 878e181 in mainline for uspace/lib/c

Timestamp:

2013-03-12T07:30:11Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b92a0ee

Parents:

7f25c4e (diff), 623bab8f (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

Files:

• arch/mips32/include/libarch/stack.h (modified) (1 diff, 1 prop)
• arch/mips64/include/libarch/stack.h (modified) (1 diff, 1 prop)
• generic/async.c (modified) (3 diffs)
• generic/fibril.c (modified) (2 diffs)
• include/async.h (modified) (1 diff)
• include/fibril.h (modified) (1 diff)
• include/macros.h (modified) (1 diff)

uspace/lib/c/arch/mips32/include/libarch/stack.h

@@ -1 @@
-../../../../../../../kernel/arch/mips32/include/arch/stack.h
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libcmips32
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_mips32_STACK_H_
+#define LIBC_mips32_STACK_H_
+
+#define STACK_ITEM_SIZE  4
+#define STACK_ALIGNMENT  8
+#define ABI_STACK_FRAME  32
+
+#endif
+
+/** @}
+ */

uspace/lib/c/arch/mips64/include/libarch/stack.h

@@ -1 @@
-../../../../../../../kernel/arch/mips64/include/arch/stack.h
+/*
+ * Copyright (c) 2006 Josef Cejka
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libcmips64
+ * @{
+ */
+/** @file
+ */
+
+#ifndef LIBC_mips64_STACK_H_
+#define LIBC_mips64_STACK_H_
+
+#define STACK_ITEM_SIZE  8
+#define STACK_ALIGNMENT  8
+#define ABI_STACK_FRAME  64
+
+#endif
+
+/** @}
+ */

uspace/lib/c/generic/async.c

@@ -350 +350 @@
 static async_client_conn_t client_connection = default_client_connection;
 static async_interrupt_handler_t interrupt_received = default_interrupt_received;
+static size_t interrupt_handler_stksz = (size_t) -1;
 
 /** Setter for client_connection function pointer.
@@ -370 +371 @@
 {
         interrupt_received = intr;
+}
+
+/** Set the stack size for the interrupt handler notification fibrils.
+ *
+ * @param size Stack size. Use -1 to use the system default stack size.
+ */
+void async_set_interrupt_handler_stack_size(size_t size)
+{
+        interrupt_handler_stksz = size;
 }
 
@@ -587 +597 @@
         msg->call = *call;
         
-        fid_t fid = fibril_create(notification_fibril, msg);
+        fid_t fid = fibril_create_generic(notification_fibril, msg,
+            interrupt_handler_stksz);
         if (fid == 0) {
                 free(msg);

uspace/lib/c/generic/fibril.c

@@ -256 +256 @@
  * @param func Implementing function of the new fibril.
  * @param arg Argument to pass to func.
+ * @param stksz Stack size, -1 for the system default stack size.
  *
  * @return 0 on failure or TLS of the new fibril.
  *
  */
-fid_t fibril_create(int (*func)(void *), void *arg)
+fid_t fibril_create_generic(int (*func)(void *), void *arg, size_t stksz)
 {
         fibril_t *fibril;
@@ -268 +269 @@
                 return 0;
         
-        size_t stack_size = stack_size_get();
+        size_t stack_size = (stksz == (size_t) -1) ? stack_size_get() : stksz;
         fibril->stack = as_area_create((void *) -1, stack_size,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |

uspace/lib/c/include/async.h

@@ -156 +156 @@
 extern void async_set_client_connection(async_client_conn_t);
 extern void async_set_interrupt_received(async_interrupt_handler_t);
+extern void async_set_interrupt_handler_stack_size(size_t);
 
 /*

uspace/lib/c/include/fibril.h

@@ -86 +86 @@
 extern void context_restore(context_t *ctx) __attribute__((noreturn));
 
-extern fid_t fibril_create(int (*func)(void *), void *arg);
+#define fibril_create(func, arg) \
+        fibril_create_generic((func), (arg), (size_t) -1)
+extern fid_t fibril_create_generic(int (*func)(void *), void *arg, size_t);
 extern void fibril_destroy(fid_t fid);
 extern fibril_t *fibril_setup(void);

uspace/lib/c/include/macros.h

@@ -38 +38 @@
 #define min(a, b)  ((a) < (b) ? (a) : (b))
 #define max(a, b)  ((a) > (b) ? (a) : (b))
-#define abs(a)     ((a) >= 0 ? (a) : (-a))
+#define abs(a)     ((a) >= 0 ? (a) : -(a))