Changeset 9dae191e in mainline for uspace/lib/c

Timestamp:

2010-04-18T00:24:40Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a80687e5

Parents:

d8e3467

Message:

sysinfo API cleanup

• better support for generated subtrees
• synchronization
• memory management (generated items cleanup)
• simplier sysinfo_dump()

remove separate statistical syscalls, replace with virtual sysinfo items (some functionality is still missing)

• naming consolidation
• cleaner API
• proper synchronization

minor renames

• zone_print_list() → zones_print_list()
• zone_busy_and_free() → zones_stats()

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• generic/cpuinfo.c (deleted)
• generic/load.c (deleted)
• generic/meminfo.c (deleted)
• generic/ps.c (deleted)
• generic/stats.c (added)
• generic/sysinfo.c (modified) (2 diffs)
• generic/uptime.c (deleted)
• include/load.h (deleted)
• include/stats.h (moved) (moved from uspace/lib/c/include/ps.h ) (1 diff)
• include/uptime.h (deleted)

uspace/lib/c/Makefile

@@ -96 +96 @@
         generic/stacktrace.c \
         generic/arg_parse.c \
-        generic/ps.c \
-        generic/cpuinfo.c \
-        generic/meminfo.c \
-        generic/load.c \
-        generic/uptime.c
+        generic/stats.c
 
 SOURCES = \

uspace/lib/c/generic/sysinfo.c

@@ -58 +58 @@
 }
 
-extern void *sysinfo_get_data(const char *path, size_t *size)
+void *sysinfo_get_data(const char *path, size_t *size)
 {
         while (true) {
@@ -74 +74 @@
                         return data;
                 
+                free(data);
+                
                 if (ret != ENOMEM)
                         return NULL;
-                
-                free(data);
         }
 }

uspace/lib/c/include/stats.h

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
-#ifndef LIBC_PS_H_
-#define LIBC_PS_H_
+#ifndef LIBC_STATS_H_
+#define LIBC_STATS_H_
 
 #include <task.h>
-#include <kernel/ps/taskinfo.h>
-#include <kernel/ps/cpuinfo.h>
-#include <kernel/ps/meminfo.h>
+#include <kernel/sysinfo/abi.h>
 
-extern int get_cpu_info(uspace_cpu_info_t *cpus);
-extern int get_mem_info(uspace_mem_info_t *meminfo);
-extern size_t get_task_ids(task_id_t *ids, size_t size);
-extern int get_task_info(task_id_t id, task_info_t *info);
-extern size_t get_task_threads(thread_info_t *infos, size_t size);
+extern stats_cpu_t *get_stats_cpus(size_t *);
+extern stats_physmem_t *get_stats_physmem(void);
+extern task_id_t *get_stats_tasks(size_t *);
+extern stats_task_t *get_stats_task(task_id_t);
+extern load_t *get_stats_load(size_t *);
+extern sysarg_t get_stats_uptime(void);
+
+extern void print_load_fragment(load_t, unsigned int);
 
 #endif