Changeset b678410 in mainline for uspace/app

Timestamp:

2011-04-27T20:01:13Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a6dffb8

Parents:

628d548 (diff), 933cadf (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 mainline changes.

Location:

uspace/app

Files:

• klog/klog.c (modified) (1 diff)
• stats/stats.c (modified) (2 diffs)
• tester/Makefile (modified) (1 diff)
• tester/mm/malloc2.c (moved) (moved from kernel/generic/include/proc/tasklet.h ) (2 diffs)
• tester/mm/malloc2.def (added)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (1 diff)
• top/screen.c (modified) (2 diffs)

uspace/app/klog/klog.c

@@ -118 +118 @@
         }
         
-        /*
-         * Mode "a" would be definitively much better here, but it is
-         * not well supported by the FAT driver.
-         */
-        log = fopen(LOG_FNAME, "w");
+        log = fopen(LOG_FNAME, "a");
         if (log == NULL)
                 printf("%s: Unable to create log file %s (%s)\n", NAME, LOG_FNAME,

uspace/app/stats/stats.c

@@ -69 +69 @@
         size_t i;
         for (i = 0; i < count; i++) {
-                uint64_t resmem, virtmem, ucycles, kcycles;
-                char resmem_suffix, virtmem_suffix, usuffix, ksuffix;
-                
-                order_suffix(stats_tasks[i].resmem, &resmem, &resmem_suffix);
-                order_suffix(stats_tasks[i].virtmem, &virtmem, &virtmem_suffix);
+                uint64_t resmem;
+                uint64_t virtmem;
+                uint64_t ucycles;
+                uint64_t kcycles;
+                const char *resmem_suffix;
+                const char *virtmem_suffix;
+                char usuffix;
+                char ksuffix;
+                
+                bin_order_suffix(stats_tasks[i].resmem, &resmem, &resmem_suffix, true);
+                bin_order_suffix(stats_tasks[i].virtmem, &virtmem, &virtmem_suffix, true);
                 order_suffix(stats_tasks[i].ucycles, &ucycles, &usuffix);
                 order_suffix(stats_tasks[i].kcycles, &kcycles, &ksuffix);
                 
-                printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c %8" PRIu64 "%c"
+                printf("%-8" PRIu64 " %7zu %7" PRIu64 "%s %6" PRIu64 "%s"
                     " %8" PRIu64 "%c %8" PRIu64 "%c %s\n",
                     stats_tasks[i].task_id, stats_tasks[i].threads,
@@ -265 +271 @@
                 /* Threads */
                 if ((off = arg_parse_short_long(argv[i], "-t", "--task=")) != -1) {
-                        /* TODO: Support for 64b range */
+                        // TODO: Support for 64b range
                         int tmp;
                         int ret = arg_parse_int(argc, argv, &i, &tmp, off);

uspace/app/tester/Makefile

@@ -49 +49 @@
         loop/loop1.c \
         mm/malloc1.c \
+        mm/malloc2.c \
         devs/devman1.c \
         hw/misc/virtchar1.c \

uspace/app/tester/mm/malloc2.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Jan Hudecek
- * Copyright (c) 2008 Martin Decky
+ * Copyright (c) 2011 Jakub Jermar 
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup genericproc
- * @{
- */
-/** @file tasklet.h
- * @brief Tasklets declarations
- */
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <malloc.h>
+#include "../tester.h"
 
-#ifndef KERN_TASKLET_H_
-#define KERN_TASKLET_H_
+const char *test_malloc2(void)
+{
+        int cnt = 0;
+        char *p;
 
-#include <adt/list.h>
+        TPRINTF("Provoking the kernel into overcommitting memory to us...\n");
+        while ((p = malloc(1024 * 1024))) {
+                TPRINTF("%dM ", ++cnt);
+                *p = 'A';
+        }
+        TPRINTF("\nWas refused more memory as expected.\n");
 
-/** Tasklet callback type */
-typedef void (* tasklet_callback_t)(void *arg);
-
-/** Tasklet state */
-typedef enum {
-        NotActive,
-        Scheduled,
-        InProgress,
-        Disabled
-} tasklet_state_t;
-
-/** Structure describing a tasklet */
-typedef struct tasklet_descriptor {
-        link_t link;
-        
-        /** Callback to call */
-        tasklet_callback_t callback;
-        
-        /** Argument passed to the callback */
-        void *arg;
-        
-        /** State of the tasklet */
-        tasklet_state_t state;
-} tasklet_descriptor_t;
-
-
-extern void tasklet_init(void);
-
-#endif
-
-/** @}
- */
+        return NULL;
+}

uspace/app/tester/tester.c

@@ -62 +62 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "mm/malloc2.def"
 #include "hw/serial/serial1.def"
 #include "hw/misc/virtchar1.def"

uspace/app/tester/tester.h

@@ -78 +78 @@
 extern const char *test_loop1(void);
 extern const char *test_malloc1(void);
+extern const char *test_malloc2(void);
 extern const char *test_serial1(void);
 extern const char *test_virtchar1(void);

uspace/app/top/screen.c

@@ -254 +254 @@
         uint64_t used;
         uint64_t free;
-        char total_suffix;
-        char unavail_suffix;
-        char used_suffix;
-        char free_suffix;
-        
-        order_suffix(data->physmem->total, &total, &total_suffix);
-        order_suffix(data->physmem->unavail, &unavail, &unavail_suffix);
-        order_suffix(data->physmem->used, &used, &used_suffix);
-        order_suffix(data->physmem->free, &free, &free_suffix);
-        
-        printf("memory: %" PRIu64 "%c total, %" PRIu64 "%c unavail, %"
-            PRIu64 "%c used, %" PRIu64 "%c free", total, total_suffix,
+        const char *total_suffix;
+        const char *unavail_suffix;
+        const char *used_suffix;
+        const char *free_suffix;
+        
+        bin_order_suffix(data->physmem->total, &total, &total_suffix, false);
+        bin_order_suffix(data->physmem->unavail, &unavail, &unavail_suffix, false);
+        bin_order_suffix(data->physmem->used, &used, &used_suffix, false);
+        bin_order_suffix(data->physmem->free, &free, &free_suffix, false);
+        
+        printf("memory: %" PRIu64 "%s total, %" PRIu64 "%s unavail, %"
+            PRIu64 "%s used, %" PRIu64 "%s free", total, total_suffix,
             unavail, unavail_suffix, used, used_suffix, free, free_suffix);
         screen_newline();
@@ -295 +295 @@
                 
                 uint64_t resmem;
-                char resmem_suffix;
-                order_suffix(task->resmem, &resmem, &resmem_suffix);
+                const char *resmem_suffix;
+                bin_order_suffix(task->resmem, &resmem, &resmem_suffix, true);
                 
                 uint64_t virtmem;
-                char virtmem_suffix;
-                order_suffix(task->virtmem, &virtmem, &virtmem_suffix);
-                
-                printf("%-8" PRIu64 " %7zu %9" PRIu64 "%c ",
+                const char *virtmem_suffix;
+                bin_order_suffix(task->virtmem, &virtmem, &virtmem_suffix, true);
+                
+                printf("%-8" PRIu64 " %7zu %7" PRIu64 "%s ",
                     task->task_id, task->threads, resmem, resmem_suffix);
                 print_percent(perc->resmem, 2);
-                printf(" %8" PRIu64 "%c ", virtmem, virtmem_suffix);
+                printf(" %6" PRIu64 "%s ", virtmem, virtmem_suffix);
                 print_percent(perc->virtmem, 2);
                 puts(" ");