- added patch for faster start of OpenOCD

[openocd.git] / src / helper / command.c

diff --git a/src/helper/command.c b/src/helper/command.c
index b4b2164e9eb08425f37fd565cec4a610a4964eb6..e9ea06927759558e72a4189ce3e36ca361af92bd 100644 (file)
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -76,9 +76,15 @@ int build_unique_lengths(command_context_t *context, command_t *commands)
        return ERROR_OK;
 }
 
+/* Avoid evaluating this each time we add a command. Reduces overhead from O(n^2) to O(n). 
+ * Makes a difference on ARM7 types machines and is not observable on GHz machines.
+ */
+static int unique_length_dirty=1; 
+
 command_t* register_command(command_context_t *context, command_t *parent, char *name, int (*handler)(struct command_context_s *context, char* name, char** args, int argc), enum command_mode mode, char *help)
 {
        command_t *c, *p;
+       unique_length_dirty=1;
        
        if (!context || !name)
                return NULL;
@@ -127,14 +133,13 @@ command_t* register_command(command_context_t *context, command_t *parent, char
                }
        }
        
-       /* update unique lengths */
-       build_unique_lengths(context, (parent) ? parent : context->commands);
-       
        return c;
 }
 
 int unregister_command(command_context_t *context, char *name)
 {
+       unique_length_dirty=1;
+       
        command_t *c, *p = NULL, *c2;
        
        if ((!context) || (!name))
@@ -200,25 +205,24 @@ int parse_line(char *line, char *words[], int max_words)
                        /* we're inside a word or quote, and reached its end*/
                        if (word_start)
                        {
-                         int len;
-                            char *word_end=p;
-                            /* This will handle extra whitespace within quotes */
-                         while (isspace(*word_start)&&(word_start<word_end))
-                                   word_start++;
-                         while (isspace(*(word_end-1))&&(word_start<word_end))
-                                   word_end--;
-                            
-                            len = word_end - word_start;
-                            
-                            if (len>0)
-                            {
-                                   /* copy the word */
-                                   memcpy(words[nwords] = malloc(len + 1), word_start, len);
-                                   /* add terminating NUL */
-                                   words[nwords++][len] = 0;
-                            }
+                               int len;
+                               char *word_end=p;
+                               
+                               /* This will handle extra whitespace within quotes */
+                               while (isspace(*word_start)&&(word_start<word_end))
+                                       word_start++;
+                               while (isspace(*(word_end-1))&&(word_start<word_end))
+                                       word_end--;
+                               len = word_end - word_start;
+                               
+                               if (len>0)
+                               {
+                                       /* copy the word */
+                                       memcpy(words[nwords] = malloc(len + 1), word_start, len);
+                                       /* add terminating NUL */
+                                       words[nwords++][len] = 0;
+                               }
                        }
-
                        /* we're done parsing the line */
                        if (!*p)
                                break;
@@ -226,9 +230,9 @@ int parse_line(char *line, char *words[], int max_words)
                        /* skip over trailing quote or whitespace*/
                        if (inquote || isspace(*p))
                                p++;
-                     while (isspace(*p))
-                            p++;
-
+                       while (isspace(*p))
+                               p++;
+                       
                        inquote = 0;
                        word_start = 0;
                }
@@ -267,14 +271,23 @@ void command_print(command_context_t *context, char *format, ...)
        {
                /* increase buffer until it fits the whole string */
                if (!(p = realloc(buffer, size += 4096)))
+               {
+                       /* gotta free up */
+                       if (buffer)
+                               free(buffer);
                        return;
+               }
 
                buffer = p;
        }
        
        /* vsnprintf failed */
        if (n < 0)
+       {
+               if (buffer)
+                       free(buffer);
                return;
+       }
 
        p = buffer;
        
@@ -301,6 +314,13 @@ int find_and_run_command(command_context_t *context, command_t *commands, char *
 {
        command_t *c;
        
+       if (unique_length_dirty)
+       {
+               unique_length_dirty=0;
+               /* update unique lengths */
+               build_unique_lengths(context, context->commands);
+       }
+       
        for (c = commands; c; c = c->next)
        {
                if (strncasecmp(c->name, words[start_word], c->unique_len))
@@ -357,6 +377,10 @@ int command_run_line(command_context_t *context, char *line)
        if (!*line)
                return ERROR_OK;
        
+       /* ignore comments */
+       if (*line && (line[0] == '#'))
+               return ERROR_OK;
+       
        if (context->echo)
        {
                command_print(context, "%s", line);
@@ -379,7 +403,11 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m
 {
        int retval = ERROR_OK;
        int old_command_mode;
-       char buffer[4096];
+       char *buffer=malloc(4096);
+       if (buffer==NULL)
+       {
+               return ERROR_INVALID_ARGUMENTS;
+       }
        
        old_command_mode = context->mode;
        context->mode = mode;
@@ -418,6 +446,9 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m
        }
        
        context->mode = old_command_mode;
+
+       
+       free(buffer);
        
        return retval;
 }
@@ -495,6 +526,7 @@ command_context_t* copy_command_context(command_context_t* context)
 int command_done(command_context_t *context)
 {
        free(context);
+       context = NULL;
        
        return ERROR_OK;
 }