Changeset d9fae235 in mainline for uspace/lib/c

Timestamp:

2010-04-17T01:28:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9d6bfa5

Parents:

9256ad29

Message:

sysinfo overhaul

• cleanup (nicer data structures, use of SLAB allocator)
• add support for storing arbitrary binary data
• properly reimplement non-constant values (generated by functions)
• add support for non-constant subtrees (generated by functions)
• syscall ABI change, libc API change
• reflect changes in user code

libc: task_spawn() can now return error code

• reflect change in user code, print error strings after failed task_spawn()

uspace cleanup

• more use of string and other constants
• more use of str_error()
• unify error reporting in init

Location:

uspace/lib/c

Files:

• arch/ia64/src/ddi.c (modified) (1 diff)
• generic/sysinfo.c (modified) (1 diff)
• generic/task.c (modified) (3 diffs)
• include/sysinfo.h (modified) (2 diffs)
• include/task.h (modified) (1 diff)

uspace/lib/c/arch/ia64/src/ddi.c

@@ -2 +2 @@
 #include <sysinfo.h>
 
-uint64_t ia64_iospace_address=0;
-
+uint64_t ia64_iospace_address = 0;
 
 uint64_t get_ia64_iospace_address(void)
 {
-
-        return sysinfo_value("ia64_iospace.address.virtual");
-
+        sysarg_t addr;
+        if (sysinfo_get_value("ia64_iospace.address.virtual", &addr) != 0)
+                addr = 0;
+        
+        return addr;
 }
 

uspace/lib/c/generic/sysinfo.c

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #include <libc.h>
 #include <sysinfo.h>
 #include <str.h>
+#include <errno.h>
+#include <malloc.h>
+#include <bool.h>
 
-sysarg_t sysinfo_value(const char *name)
+sysinfo_item_tag_t sysinfo_get_tag(const char *path)
 {
-        return __SYSCALL2(SYS_SYSINFO_VALUE, (sysarg_t) name,
-            (sysarg_t) str_size(name));
+        return (sysinfo_item_tag_t) __SYSCALL2(SYS_SYSINFO_GET_TAG,
+            (sysarg_t) path, (sysarg_t) str_size(path));
+}
+
+int sysinfo_get_value(const char *path, sysarg_t *value)
+{
+        return (int) __SYSCALL3(SYS_SYSINFO_GET_VALUE, (sysarg_t) path,
+            (sysarg_t) str_size(path), (sysarg_t) value);
+}
+
+static int sysinfo_get_data_size(const char *path, size_t *size)
+{
+        return (int) __SYSCALL3(SYS_SYSINFO_GET_DATA_SIZE, (sysarg_t) path,
+            (sysarg_t) str_size(path), (sysarg_t) size);
+}
+
+extern void *sysinfo_get_data(const char *path, size_t *size)
+{
+        while (true) {
+                int ret = sysinfo_get_data_size(path, size);
+                if (ret != EOK)
+                        return NULL;
+                
+                void *data = malloc(*size);
+                if (data == NULL)
+                        return NULL;
+                
+                ret = __SYSCALL4(SYS_SYSINFO_GET_DATA, (sysarg_t) path,
+                    (sysarg_t) str_size(path), (sysarg_t) data, (sysarg_t) *size);
+                if (ret == EOK)
+                        return data;
+                
+                if (ret != ENOMEM)
+                        return NULL;
+                
+                free(data);
+        }
 }
 

uspace/lib/c/generic/task.c

@@ -70 +70 @@
  * loader API.
  *
- * @param path pathname of the binary to execute
- * @param argv command-line arguments
+ * @param path Pathname of the binary to execute.
+ * @param argv Command-line arguments.
+ * @param err  If not NULL, the error value is stored here.
  *
  * @return ID of the newly created task or zero on error.
  *
  */
-task_id_t task_spawn(const char *path, const char *const args[])
+task_id_t task_spawn(const char *path, const char *const args[], int *err)
 {
         /* Connect to a program loader. */
         loader_t *ldr = loader_connect();
-        if (ldr == NULL)
+        if (ldr == NULL) {
+                if (err != NULL)
+                        *err = EREFUSED;
+                
                 return 0;
+        }
         
         /* Get task ID. */
@@ -143 +148 @@
         /* Success */
         free(ldr);
+        
+        if (err != NULL)
+                *err = EOK;
+        
         return task_id;
         
@@ -149 +158 @@
         loader_abort(ldr);
         free(ldr);
+        
+        if (err != NULL)
+                *err = rc;
         
         return 0;

uspace/lib/c/include/sysinfo.h

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #ifndef LIBC_SYSINFO_H_
@@ -37 +37 @@
 
 #include <libc.h>
-#include <sysinfo.h>
-#include <str.h>
 
-sysarg_t sysinfo_value(const char *name);
+typedef enum {
+        SYSINFO_VAL_UNDEFINED = 0,
+        SYSINFO_VAL_VAL = 1,
+        SYSINFO_VAL_DATA = 2
+} sysinfo_item_tag_t;
+
+extern sysinfo_item_tag_t sysinfo_get_tag(const char *);
+extern int sysinfo_get_value(const char *, sysarg_t *);
+extern void *sysinfo_get_data(const char *, size_t *);
 
 #endif

uspace/lib/c/include/task.h

@@ -46 +46 @@
 
 extern task_id_t task_get_id(void);
-extern int task_set_name(const char *name);
-extern task_id_t task_spawn(const char *path, const char *const argv[]);
-extern int task_wait(task_id_t id, task_exit_t *texit, int *retval);
-extern int task_retval(int val);
-
+extern int task_set_name(const char *);
+extern task_id_t task_spawn(const char *, const char *const[], int *);
+extern int task_wait(task_id_t id, task_exit_t *, int *);
+extern int task_retval(int);
 
 #endif