Changeset d4d8255 in mainline

Timestamp:

2016-03-09T20:01:43Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c1b8ad4

Parents:

df425da (diff), dc0e41c (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 lp:~aurelio-x/helenos/kcon-devel

Location:

kernel

Files:

• generic/include/console/kconsole.h (modified) (3 diffs)
• generic/include/str.h (modified) (1 diff)
• generic/include/symtab.h (modified) (1 diff)
• generic/src/console/cmd.c (modified) (8 diffs)
• generic/src/console/kconsole.c (modified) (9 diffs)
• generic/src/debug/symtab.c (modified) (1 diff)
• test/test.c (modified) (2 diffs)
• test/test.h (modified) (1 diff)

kernel/generic/include/console/kconsole.h

@@ -43 +43 @@
 #define KCONSOLE_HISTORY  10
 
+/** Callback to be used to enum hints for cmd tab completion. */
+typedef const char *(*hints_enum_func_t)(const char *, const char **, void **);
+
 typedef enum {
         ARG_TYPE_INVALID = 0,
@@ -85 +88 @@
         /** Function for printing detailed help. */
         void (* help)(void);
+        /** Function for enumerating hints for arguments. */
+        hints_enum_func_t hints_enum;
 } cmd_info_t;
 
@@ -100 +105 @@
 
 extern bool cmd_register(cmd_info_t *cmd);
+extern const char *cmdtab_enum(const char *name, const char **h, void **ctx);
 
 #endif

kernel/generic/include/str.h

@@ -62 +62 @@
 
 /**< Maximum size of a string containing cnt characters */
-#define STR_BOUNDS(cnt)  (cnt << 2)
+#define STR_BOUNDS(cnt)  ((cnt) << 2)
 
 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);

kernel/generic/include/symtab.h

@@ -40 +40 @@
 
 extern void symtab_print_search(const char *);
-extern int symtab_compl(char *, size_t, indev_t *);
+extern const char* symtab_hints_enum(const char *, const char **, void **);
 
 #endif

kernel/generic/src/console/cmd.c

@@ -206 +206 @@
         .func = cmd_test,
         .argc = 1,
-        .argv = test_argv
+        .argv = test_argv,
+        .hints_enum = tests_hints_enum
 };
 
@@ -246 +247 @@
         .func = cmd_desc,
         .argc = 1,
-        .argv = &desc_argv
+        .argv = &desc_argv,
+        .hints_enum = cmdtab_enum
 };
 
@@ -262 +264 @@
         .func = cmd_symaddr,
         .argc = 1,
-        .argv = &symaddr_argv
+        .argv = &symaddr_argv,
+        .hints_enum = symtab_hints_enum,
 };
 
@@ -303 +306 @@
         .func = cmd_call0,
         .argc = 1,
-        .argv = &call0_argv
+        .argv = &call0_argv,
+        .hints_enum = symtab_hints_enum
 };
 
@@ -318 +322 @@
         .func = cmd_mcall0,
         .argc = 1,
-        .argv = &mcall0_argv
+        .argv = &mcall0_argv,
+        .hints_enum = symtab_hints_enum
 };
 
@@ -340 +345 @@
         .func = cmd_call1,
         .argc = 2,
-        .argv = call1_argv
+        .argv = call1_argv,
+        .hints_enum = symtab_hints_enum
 };
 
@@ -367 +373 @@
         .func = cmd_call2,
         .argc = 3,
-        .argv = call2_argv
+        .argv = call2_argv,
+        .hints_enum = symtab_hints_enum
 };
 
@@ -400 +407 @@
         .func = cmd_call3,
         .argc = 4,
-        .argv = call3_argv
+        .argv = call3_argv,
+        .hints_enum = symtab_hints_enum
 };
 

kernel/generic/src/console/kconsole.c

@@ -165 +165 @@
 
 /** Try to find a command beginning with prefix */
-NO_TRACE static const char *cmdtab_search_one(const char *name,
-    link_t **startpos)
-{
+const char *cmdtab_enum(const char *name, const char **h, void **ctx)
+{
+        link_t **startpos = (link_t**)ctx;
         size_t namelen = str_length(name);
         
@@ -183 +183 @@
                 
                 if (str_lcmp(curname, name, namelen) == 0) {
+                        *startpos = (*startpos)->next;
+                        if (h) {
+                                *h = hlp->description;
+                        }
                         spinlock_unlock(&cmd_lock);
                         return (curname + str_lsize(curname, namelen));
@@ -200 +204 @@
  *
  */
-NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev)
+NO_TRACE static int cmdtab_compl(char *input, size_t size, indev_t *indev,
+    hints_enum_func_t hints_enum)
 {
         const char *name = input;
@@ -212 +217 @@
         size_t max_match_len = size;
         size_t max_match_len_tmp = size;
-        size_t input_len = str_length(input);
-        link_t *pos = NULL;
+        void *pos = NULL;
         const char *hint;
+        const char *help;
         char *output = malloc(MAX_CMDLINE, 0);
         size_t hints_to_show = MAX_TAB_HINTS - 1;
@@ -222 +227 @@
         output[0] = 0;
         
-        while ((hint = cmdtab_search_one(name, &pos))) {
-                if ((found == 0) || (str_length(output) > str_length(hint)))
+        while ((hint = hints_enum(name, NULL, &pos))) {
+                if ((found == 0) || (str_length(hint) > str_length(output)))
                         str_cpy(output, MAX_CMDLINE, hint);
                 
-                pos = pos->next;
                 found++;
         }
@@ -243 +247 @@
                 printf("\n");
                 pos = NULL;
-                while (cmdtab_search_one(name, &pos)) {
-                        cmd_info_t *hlp = list_get_instance(pos, cmd_info_t, link);
+                while ((hint = hints_enum(name, &help, &pos))) {
                         
                         if (continue_showing_hints) {
-                                printf("%s (%s)\n", hlp->name, hlp->description);
+                                
+                                if (help)
+                                        printf("%s%s (%s)\n", name, hint, help);
+                                else
+                                        printf("%s%s\n", name, hint);
+                                
                                 --hints_to_show;
                                 ++total_hints_shown;
@@ -258 +266 @@
                         }
                         
-                        pos = pos->next;
-                        
                         for (max_match_len_tmp = 0;
                             (output[max_match_len_tmp] ==
-                            hlp->name[input_len + max_match_len_tmp]) &&
+                            hint[max_match_len_tmp]) &&
                             (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
                         
@@ -277 +283 @@
         free(output);
         return found;
+}
+
+NO_TRACE static cmd_info_t *parse_cmd(const wchar_t *cmdline)
+{
+        size_t start = 0;
+        size_t end;
+        char *tmp;
+        
+        while (isspace(cmdline[start]))
+                start++;
+        end = start + 1;
+        while (!isspace(cmdline[end]))
+                end++;
+        
+        tmp = malloc(STR_BOUNDS(end - start + 1), 0);
+        
+        wstr_to_str(tmp, end - start + 1, &cmdline[start]);
+        
+        spinlock_lock(&cmd_lock);
+        
+        list_foreach(cmd_list, link, cmd_info_t, hlp) {
+                spinlock_lock(&hlp->lock);
+                
+                if (str_cmp(hlp->name, tmp) == 0) {
+                        spinlock_unlock(&hlp->lock);
+                        spinlock_unlock(&cmd_lock);
+                        free(tmp);
+                        return hlp;
+                }
+                
+                spinlock_unlock(&hlp->lock);
+        }
+        
+        free(tmp);
+        spinlock_unlock(&cmd_lock);
+        
+        return NULL;
 }
 
@@ -338 +381 @@
                         if (beg == 0) {
                                 /* Command completion */
-                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
+                                    cmdtab_enum);
                         } else {
-                                /* Symbol completion */
-                                found = symtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev);
+                                /* Arguments completion */
+                                cmd_info_t *cmd = parse_cmd(current);
+                                if (!cmd || !cmd->hints_enum)
+                                        continue;
+                                found = cmdtab_compl(tmp, STR_BOUNDS(MAX_CMDLINE), indev,
+                                    cmd->hints_enum);
                         }
                         

kernel/generic/src/debug/symtab.c

@@ -202 +202 @@
 }
 
-/** Symtab completion
- *
- * @param input Search string, completes to symbol name
- * @param size  Input buffer size
- *
- * @return 0 - nothing found, 1 - success, >1 print duplicates
- *
- */
-int symtab_compl(char *input, size_t size, indev_t *indev)
-{
-#ifdef CONFIG_SYMTAB
-        const char *name = input;
-        
-        /* Allow completion of pointers */
-        if ((name[0] == '*') || (name[0] == '&'))
-                name++;
-        
-        /* Do not print all symbols */
-        if (str_length(name) == 0)
-                return 0;
-        
-        size_t found = 0;
-        size_t pos = 0;
-        const char *hint;
-        char output[MAX_SYMBOL_NAME];
-        
-        /*
-         * Maximum Match Length: Length of longest matching common substring in
-         * case more than one match is found.
-         */
-        size_t max_match_len = size;
-        size_t max_match_len_tmp = size;
-        size_t input_len = str_length(input);
-        char *sym_name;
-        size_t hints_to_show = MAX_TAB_HINTS - 1;
-        size_t total_hints_shown = 0;
-        bool continue_showing_hints = true;
-        
-        output[0] = 0;
-        
-        while ((hint = symtab_search_one(name, &pos)))
-                pos++;
-        
-        pos = 0;
-        
-        while ((hint = symtab_search_one(name, &pos))) {
-                if ((found == 0) || (str_length(output) > str_length(hint)))
-                        str_cpy(output, MAX_SYMBOL_NAME, hint);
-                
-                pos++;
-                found++;
-        }
-        
-        /*
-         * If the number of possible completions is more than MAX_TAB_HINTS,
-         * ask the user whether to display them or not.
-         */
-        if (found > MAX_TAB_HINTS) {
-                printf("\n");
-                continue_showing_hints =
-                    console_prompt_display_all_hints(indev, found);
-        }
-        
-        if ((found > 1) && (str_length(output) != 0)) {
-                printf("\n");
-                pos = 0;
-                while (symtab_search_one(name, &pos)) {
-                        sym_name = symbol_table[pos].symbol_name;
-                        pos++;
-                        
-                        if (continue_showing_hints) {
-                                /* We are still showing hints */
-                                printf("%s\n", sym_name);
-                                --hints_to_show;
-                                ++total_hints_shown;
-                                
-                                if ((hints_to_show == 0) && (total_hints_shown != found)) {
-                                        /* Ask the user to continue */
-                                        continue_showing_hints =
-                                            console_prompt_more_hints(indev, &hints_to_show);
-                                }
-                        }
-                        
-                        for (max_match_len_tmp = 0;
-                            (output[max_match_len_tmp] ==
-                            sym_name[input_len + max_match_len_tmp]) &&
-                            (max_match_len_tmp < max_match_len); ++max_match_len_tmp);
-                        
-                        max_match_len = max_match_len_tmp;
+/** Symtab completion enum, see kernel/generic/include/kconsole.h */
+const char* symtab_hints_enum(const char *input, const char **help,
+    void **ctx)
+{
+#ifdef CONFIG_SYMTAB
+        size_t len = str_length(input);
+        struct symtab_entry **entry = (struct symtab_entry**)ctx;
+        
+        if (*entry == NULL)
+                *entry = symbol_table;
+        
+        for (; (*entry)->address_le; (*entry)++) {
+                const char *curname = (*entry)->symbol_name;
+                
+                /* Find a ':' in curname */
+                const char *colon = str_chr(curname, ':');
+                if (colon == NULL)
+                        continue;
+                
+                if (str_length(curname) < len)
+                        continue;
+                
+                if (str_lcmp(input, curname, len) == 0) {
+                        (*entry)++;
+                        if (help)
+                                *help = NULL;
+                        return (curname + str_lsize(curname, len));
                 }
-                
-                /* Keep only the characters common in all completions */
-                output[max_match_len] = 0;
-        }
-        
-        if (found > 0)
-                str_cpy(input, size, output);
-        
-        return found;
-        
-#else
-        return 0;
+        }
+        
+        return NULL;
+        
+#else
+        return NULL;
 #endif
 }

kernel/test/test.c

@@ -34 +34 @@
 
 #include <test.h>
+#include <str.h>
 
 bool test_quiet;
@@ -68 +69 @@
 };
 
+const char* tests_hints_enum(const char *input, const char **help,
+    void **ctx)
+{
+        size_t len = str_length(input);
+        test_t **test = (test_t**)ctx;
+        
+        if (*test == NULL)
+                *test = tests;
+        
+        for (; (*test)->name; (*test)++) {
+                const char *curname = (*test)->name;
+                
+                if (str_length(curname) < len)
+                        continue;
+                
+                if (str_lcmp(input, curname, len) == 0) {
+                        (*test)++;
+                        if (help)
+                                *help = (*test)->desc;
+                        return (curname + str_lsize(curname, len));
+                }
+        }
+        
+        return NULL;
+}
+
 /** @}
  */

kernel/test/test.h

@@ -85 +85 @@
 extern test_t tests[];
 
+extern const char* tests_hints_enum(const char *, const char **, void **);
+
 #endif