From 698e37b41c08fd2a3b250ba3d0737c942af14f19 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 15 Aug 2011 08:49:20 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3236
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/Posix-GCC/Makefile |  1 +
 demos/Posix-GCC/main.c   | 64 ++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 60 insertions(+), 5 deletions(-)

(limited to 'demos/Posix-GCC')

diff --git a/demos/Posix-GCC/Makefile b/demos/Posix-GCC/Makefile
index 3a8b43c90..55fa40fb7 100644
--- a/demos/Posix-GCC/Makefile
+++ b/demos/Posix-GCC/Makefile
@@ -72,6 +72,7 @@ SRC  = ${PORTSRC} \
        ${PLATFORMSRC} \
        $(BOARDSRC) \
        ${CHIBIOS}/os/various/shell.c \
+       ${CHIBIOS}/os/various/chprintf.c \
        main.c
 
 # List ASM source files here
diff --git a/demos/Posix-GCC/main.c b/demos/Posix-GCC/main.c
index adfcf6925..543386a85 100644
--- a/demos/Posix-GCC/main.c
+++ b/demos/Posix-GCC/main.c
@@ -24,6 +24,7 @@
 #include "hal.h"
 #include "test.h"
 #include "shell.h"
+#include "chprintf.h"
 
 #define SHELL_WA_SIZE       THD_WA_SIZE(4096)
 #define CONSOLE_WA_SIZE     THD_WA_SIZE(4096)
@@ -35,24 +36,76 @@ static Thread *cdtp;
 static Thread *shelltp1;
 static Thread *shelltp2;
 
-void cmd_test(BaseChannel *chp, int argc, char *argv[]) {
+static void cmd_mem(BaseChannel *chp, int argc, char *argv[]) {
+  size_t n, size;
+
+  (void)argv;
+  if (argc > 0) {
+    chprintf(chp, "Usage: mem\r\n");
+    return;
+  }
+  n = chHeapStatus(NULL, &size);
+  chprintf(chp, "core free memory : %u bytes\r\n", chCoreStatus());
+  chprintf(chp, "heap fragments   : %u\r\n", n);
+  chprintf(chp, "heap free total  : %u bytes\r\n", size);
+}
+
+static void cmd_threads(BaseChannel *chp, int argc, char *argv[]) {
+  static const char *states[] = {
+    "READY",
+    "CURRENT",
+    "SUSPENDED",
+    "WTSEM",
+    "WTMTX",
+    "WTCOND",
+    "SLEEPING",
+    "WTEXIT",
+    "WTOREVT",
+    "WTANDEVT",
+    "SNDMSGQ",
+    "SNDMSG",
+    "WTMSG",
+    "WTQUEUE",
+    "FINAL"
+  };
+  Thread *tp;
+
+  (void)argv;
+  if (argc > 0) {
+    chprintf(chp, "Usage: threads\r\n");
+    return;
+  }
+  chprintf(chp, "    addr    stack prio refs     state time\r\n");
+  tp = chRegFirstThread();
+  do {
+    chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s %lu\r\n",
+            (uint32_t)tp, (uint32_t)tp->p_ctx.esp,
+            (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),
+            states[tp->p_state], (uint32_t)tp->p_time);
+    tp = chRegNextThread(tp);
+  } while (tp != NULL);
+}
+
+static void cmd_test(BaseChannel *chp, int argc, char *argv[]) {
   Thread *tp;
 
   (void)argv;
   if (argc > 0) {
-    shellPrintLine(chp, "Usage: test");
+    chprintf(chp, "Usage: test\r\n");
     return;
   }
   tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),
                            TestThread, chp);
   if (tp == NULL) {
-    shellPrintLine(chp, "out of memory");
+    chprintf(chp, "out of memory\r\n");
     return;
   }
   chThdWait(tp);
 }
 
 static const ShellCommand commands[] = {
+  {"mem", cmd_mem},
+  {"threads", cmd_threads},
   {"test", cmd_test},
   {NULL, NULL}
 };
@@ -76,9 +129,10 @@ static msg_t console_thread(void *arg) {
 
   (void)arg;
   while (!chThdShouldTerminate()) {
-    puts((char *)chMsgWait());
+    Thread *tp = chMsgWait();
+    puts((char *)chMsgGet(tp));
     fflush(stdout);
-    chMsgRelease(RDY_OK);
+    chMsgRelease(tp, RDY_OK);
   }
   return 0;
 }
-- 
cgit v1.2.3