Changeset 4b662f8c in mainline

Timestamp:

2007-04-20T18:43:49Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ea63704

Parents:

cc85fb9

Message:

add fancy uptime kconsole command

Location:

kernel/generic

Files:

• include/time/clock.h (modified) (1 diff)
• src/console/cmd.c (modified) (3 diffs)
• src/time/clock.c (modified) (4 diffs)

kernel/generic/include/time/clock.h

@@ -36 +36 @@
 #define KERN_CLOCK_H_
 
+#include <arch/types.h>
+
 #define HZ              100
+
+/** Uptime structure */
+typedef struct {
+        unative_t seconds1;
+        unative_t useconds;
+        unative_t seconds2;
+} uptime_t;
+
+extern uptime_t *uptime;
 
 extern void clock(void);

kernel/generic/src/console/cmd.c

@@ -93 +93 @@
 };
 
+static int cmd_uptime(cmd_arg_t *argv);
+static cmd_info_t uptime_info = {
+        .name = "uptime",
+        .description = "Print uptime information.",
+        .func = cmd_uptime,
+        .argc = 0
+};
+
 static int cmd_continue(cmd_arg_t *argv);
 static cmd_info_t continue_info = {
@@ -440 +448 @@
         &exit_info,
         &reboot_info,
+        &uptime_info,
         &halt_info,
         &help_info,
@@ -530 +539 @@
 }
 
+
+/** Print system uptime information.
+ *
+ * @param argv Argument vector.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+int cmd_uptime(cmd_arg_t *argv)
+{
+        ASSERT(uptime);
+        
+        /* This doesn't have to be very accurate */
+        unative_t sec = uptime->seconds1;
+        
+        printf("Up %u days, %u hours, %u minutes, %u seconds\n",
+                sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
+        
+        return 1;
+}
+
 /** Describe specified command.
  *

kernel/generic/src/time/clock.c

@@ -42 +42 @@
 #include <time/clock.h>
 #include <time/timeout.h>
-#include <arch/types.h>
 #include <config.h>
 #include <synch/spinlock.h>
@@ -58 +57 @@
 #include <ddi/ddi.h>
 
-/** Physical memory area of the real time clock. */
+/* Pointer to variable with uptime */
+uptime_t *uptime;
+
+/** Physical memory area of the real time clock */
 static parea_t clock_parea;
 
-/* Pointers to public variables with time */
-struct ptime {
-        unative_t seconds1;
-        unative_t useconds;
-        unative_t seconds2;
-};
-struct ptime *public_time;
 /* Variable holding fragment of second, so that we would update
  * seconds correctly
@@ -87 +82 @@
                 panic("Cannot allocate page for clock");
         
-        public_time = (struct ptime *) PA2KA(faddr);
-
-        /* TODO: We would need some arch dependent settings here */
-        public_time->seconds1 = 0;
-        public_time->seconds2 = 0;
-        public_time->useconds = 0; 
+        uptime = (uptime_t *) PA2KA(faddr);
+        
+        uptime->seconds1 = 0;
+        uptime->seconds2 = 0;
+        uptime->useconds = 0; 
 
         clock_parea.pbase = (uintptr_t) faddr;
-        clock_parea.vbase = (uintptr_t) public_time;
+        clock_parea.vbase = (uintptr_t) uptime;
         clock_parea.frames = 1;
         clock_parea.cacheable = true;
@@ -117 +111 @@
 {
         if (CPU->id == 0) {
-                secfrag += 1000000/HZ;
+                secfrag += 1000000 / HZ;
                 if (secfrag >= 1000000) {
                         secfrag -= 1000000;
-                        public_time->seconds1++;
+                        uptime->seconds1++;
                         write_barrier();
-                        public_time->useconds = secfrag;
+                        uptime->useconds = secfrag;
                         write_barrier();
-                        public_time->seconds2 = public_time->seconds1;
+                        uptime->seconds2 = uptime->seconds1;
                 } else
-                        public_time->useconds += 1000000/HZ;
+                        uptime->useconds += 1000000 / HZ;
         }
 }