Changeset 88dea9d in mainline for uspace

Timestamp:

2010-04-17T16:28:49Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30a5470

Parents:

5ba201d (diff), 95319bd (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 from measuring branch

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• app/dummy_load/Makefile (added)
• app/dummy_load/dummy_load.c (added)
• app/dummy_load/input.c (added)
• app/dummy_load/input.h (added)
• app/ps/Makefile (added)
• app/ps/func.c (added)
• app/ps/func.h (added)
• app/ps/ps.c (added)
• app/top/Makefile (added)
• app/top/func.c (added)
• app/top/func.h (added)
• app/top/input.c (added)
• app/top/input.h (added)
• app/top/ps.c (added)
• app/top/ps.h (added)
• app/top/screen.c (added)
• app/top/screen.h (added)
• app/top/top.c (added)
• app/top/top.h (added)
• app/uptime/Makefile (added)
• app/uptime/uptime.c (added)
• lib/c/Makefile (modified) (1 diff)
• lib/c/generic/cpuinfo.c (added)
• lib/c/generic/load.c (added)
• lib/c/generic/meminfo.c (added)
• lib/c/generic/ps.c (added)
• lib/c/generic/uptime.c (added)
• lib/c/include/load.h (added)
• lib/c/include/ps.h (added)
• lib/c/include/uptime.h (added)

uspace/Makefile

@@ -46 +46 @@
         app/tetris \
         app/trace \
+        app/ps \
+        app/top \
+        app/uptime \
+        app/dummy_load \
         srv/clip \
         srv/devmap \

uspace/lib/c/Makefile

@@ -95 +95 @@
         generic/vfs/canonify.c \
         generic/stacktrace.c \
-        generic/arg_parse.c
+        generic/arg_parse.c \
+        generic/ps.c \
+        generic/cpuinfo.c \
+        generic/meminfo.c \
+        generic/load.c \
+        generic/uptime.c
 
 SOURCES = \