Changeset 79ae36dd in mainline for uspace/app/bdsh/cmds


Ignore:
Timestamp:
2011-06-08T19:01:55Z (14 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0eff68e
Parents:
764d71e
Message:

new async framework with integrated exchange tracking

  • strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
    • each IPC connection is represented by an async_sess_t structure
    • each IPC exchange is represented by an async_exch_t structure
    • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
  • async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
  • IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
  • IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
  • IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
  • console routines in libc have been rewritten for better abstraction
  • additional use for libc-private header files (FILE structure opaque to the client)
  • various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)
Location:
uspace/app/bdsh/cmds/modules
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/bdsh/cmds/modules/bdd/bdd.c

    r764d71e r79ae36dd  
    102102        }
    103103
    104         rc = block_init(handle, 2048);
     104        rc = block_init(EXCHANGE_SERIALIZE, handle, 2048);
    105105        if (rc != EOK)  {
    106106                printf("%s: Error initializing libblock.\n", cmdname);

  • uspace/app/bdsh/cmds/modules/cat/cat.c

    r764d71e r79ae36dd  
    6464static sysarg_t console_rows = 0;
    6565static bool should_quit = false;
     66
     67static console_ctrl_t *console = NULL;
    6668
    6769static struct option const long_options[] = {
    … …  
    102104static void waitprompt()
    103105{
    104         console_set_pos(fphone(stdout), 0, console_rows-1);
    105         console_set_color(fphone(stdout), COLOR_BLUE, COLOR_WHITE, 0);
     106        console_set_pos(console, 0, console_rows-1);
     107        console_set_color(console, COLOR_BLUE, COLOR_WHITE, 0);
     108       
    106109        printf("ENTER/SPACE/PAGE DOWN - next page, "
    107110               "ESC/Q - quit, C - continue unpaged");
    108111        fflush(stdout);
    109         console_set_style(fphone(stdout), STYLE_NORMAL);
     112       
     113        console_set_style(console, STYLE_NORMAL);
    110114}
    111115
    112116static void waitkey()
    113117{
    114         console_event_t ev;
     118        kbd_event_t ev;
    115119       
    116120        while (true) {
    117                 if (!console_get_event(fphone(stdin), &ev)) {
     121                if (!console_get_kbd_event(console, &ev)) {
    118122                        return;
    119123                }
    … …  
    138142static void newpage()
    139143{
    140         console_clear(fphone(stdout));
     144        console_clear(console);
    141145        chars_remaining = console_cols;
    142         lines_remaining = console_rows-1;
     146        lines_remaining = console_rows - 1;
    143147}
    144148
    … …  
    238242        console_rows = 0;
    239243        should_quit = false;
     244        console = console_init(stdin, stdout);
    240245
    241246        argc = cli_count_args(argv);
    … …  
    280285       
    281286        if (more) {
    282                 rc = console_get_size(fphone(stdout), &cols, &rows);
     287                rc = console_get_size(console, &cols, &rows);
    283288                if (rc != EOK) {
    284289                        printf("%s - cannot get console size\n", cmdname);

  • uspace/app/bdsh/cmds/modules/kcon/kcon.c

    r764d71e r79ae36dd  
    3232#include <stdlib.h>
    3333#include <io/console.h>
    34 #include <vfs/vfs.h>
    3534#include "config.h"
    3635#include "util.h"
    … …  
    4241static const char *cmdname = "kcon";
    4342
    44 /* Dispays help for kcon in various levels */
     43/* Display help for kcon in various levels */
    4544void help_cmd_kcon(unsigned int level)
    4645{
    4746        printf("`kcon' switches to the kernel debug console.\n");
    48 
    49         if (level != HELP_SHORT) {
    50                 printf("Usage:  %s\n", cmdname);
    51         }
    52 
     47       
     48        if (level != HELP_SHORT)
     49                printf("Usage: %s\n", cmdname);
     50       
    5351        return;
    5452}
    … …  
    5755int cmd_kcon(char **argv)
    5856{
    59         unsigned int argc;
    60 
    61         argc = cli_count_args(argv);
    62 
     57        unsigned int argc = cli_count_args(argv);
     58       
    6359        if (argc != 1) {
    6460                printf("%s - incorrect number of arguments. Try `%s --help'\n",
    65                         cmdname, cmdname);
     61                    cmdname, cmdname);
    6662                return CMD_FAILURE;
    6763        }
    68 
    69         console_kcon_enable(fphone(stdout));
    70 
    71         return CMD_SUCCESS;
     64       
     65        if (console_kcon())
     66                return CMD_SUCCESS;
     67        else
     68                return CMD_FAILURE;
    7269}
    73 
Note: See TracChangeset for help on using the changeset viewer.