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

Timestamp:

2010-03-07T15:11:56Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

Location:

uspace/lib/libc/generic

Files:

• async.c (modified) (1 diff)
• futex.c (modified) (2 diffs)
• io/io.c (modified) (1 diff)
• loader.c (modified) (2 diffs)
• sysinfo.c (modified) (1 diff)
• task.c (modified) (1 diff)
• thread.c (modified) (1 diff)

uspace/lib/libc/generic/async.c

@@ -1101 +1101 @@
 }
 
+/** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework.
+ * 
+ * Ask through phone for a new connection to some service.
+ *
+ * @param phoneid       Phone handle used for contacting the other side.
+ * @param arg1          User defined argument.
+ * @param arg2          User defined argument.
+ * @param arg3          User defined argument.
+ *
+ * @return              New phone handle on success or a negative error code.
+ */
+int
+async_connect_me_to(int phoneid, ipcarg_t arg1, ipcarg_t arg2, ipcarg_t arg3)
+{
+        int rc;
+        ipcarg_t newphid;
+
+        rc = async_req_3_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3, NULL,
+            NULL, NULL, NULL, &newphid);
+        
+        if (rc != EOK)  
+                return rc;
+
+        return newphid;
+}
+
+/** Wrapper for making IPC_M_CONNECT_ME_TO calls using the async framework.
+ * 
+ * Ask through phone for a new connection to some service and block until
+ * success.
+ *
+ * @param phoneid       Phone handle used for contacting the other side.
+ * @param arg1          User defined argument.
+ * @param arg2          User defined argument.
+ * @param arg3          User defined argument.
+ *
+ * @return              New phone handle on success or a negative error code.
+ */
+int
+async_connect_me_to_blocking(int phoneid, ipcarg_t arg1, ipcarg_t arg2,
+    ipcarg_t arg3)
+{
+        int rc;
+        ipcarg_t newphid;
+
+        rc = async_req_4_5(phoneid, IPC_M_CONNECT_ME_TO, arg1, arg2, arg3,
+            IPC_FLAG_BLOCKING, NULL, NULL, NULL, NULL, &newphid);
+        
+        if (rc != EOK)  
+                return rc;
+
+        return newphid;
+}
+
 /** Wrapper for making IPC_M_SHARE_IN calls using the async framework.
  *

uspace/lib/libc/generic/futex.c

@@ -68 +68 @@
 int futex_down(futex_t *futex)
 {
-        if (atomic_predec(futex) < 0)
+        if ((atomic_signed_t) atomic_predec(futex) < 0)
                 return __SYSCALL1(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count);
 
@@ -82 +82 @@
 int futex_up(futex_t *futex)
 {
-        if (atomic_postinc(futex) < 0)
+        if ((atomic_signed_t) atomic_postinc(futex) < 0)
                 return __SYSCALL1(SYS_FUTEX_WAKEUP, (sysarg_t) &futex->count);
                 

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

@@ -536 +536 @@
 }
 
+char *fgets(char *str, int size, FILE *stream)
+{
+        int c;
+        int idx;
+
+        idx = 0;
+        while (idx < size - 1) {
+                c = fgetc(stream);
+                if (c == EOF)
+                        break;
+
+                str[idx++] = c;
+
+                if (c == '\n')
+                        break;
+        }
+
+        if (ferror(stream))
+                return NULL;
+
+        if (idx == 0)
+                return NULL;
+
+        str[idx] = '\0';
+        return str;
+}
+
 int getchar(void)
 {

uspace/lib/libc/generic/loader.c

@@ -183 +183 @@
  *
  */
-int loader_set_args(loader_t *ldr, char *const argv[])
+int loader_set_args(loader_t *ldr, const char *const argv[])
 {
         /*
@@ -189 +189 @@
          * compute size of the buffer needed.
          */
-        char *const *ap = argv;
+        const char *const *ap = argv;
         size_t buffer_size = 0;
         while (*ap != NULL) {

uspace/lib/libc/generic/sysinfo.c

@@ -37 +37 @@
 #include <string.h>
 
-sysarg_t sysinfo_value(char *name)
+sysarg_t sysinfo_value(const char *name)
 {
-        return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t ) name,
+        return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t) name,
             (sysarg_t) str_size(name));
 }

uspace/lib/libc/generic/task.c

@@ -76 +76 @@
  *
  */
-task_id_t task_spawn(const char *path, char *const args[])
+task_id_t task_spawn(const char *path, const char *const args[])
 {
         /* Connect to a program loader. */

uspace/lib/libc/generic/thread.c

@@ -86 +86 @@
  * @return Zero on success or a code from @ref errno.h on failure.
  */
-int thread_create(void (* function)(void *), void *arg, char *name,
+int thread_create(void (* function)(void *), void *arg, const char *name,
     thread_id_t *tid)
 {