X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fcommand.c;h=386572ed94d7b5f989cf8d7405b02d5a717fca79;hp=df12ffc1b43cde99d9e978c016c0b5f8c1e083f5;hb=dc796a209113c3fdc27de0211edcaa67faed7b5f;hpb=f2a5a1ce8125936f7d96254da7e1f77867b3cb7b

diff --git a/src/helper/command.c b/src/helper/command.c
index df12ffc1b4..386572ed94 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -29,6 +29,7 @@
 #include "command.h"
 
 #include "log.h"
+#include "time_support.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -37,7 +38,16 @@
 #include <stdio.h>
 #include <unistd.h>
 
+int fast_and_dangerous = 0;
+
+void command_print_help_line(command_context_t* context, struct command_s *command, int indent);
+
 int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+
+/* forward declaration of jim_command */
+extern int jim_command(command_context_t *context, char *line);
 
 int build_unique_lengths(command_context_t *context, command_t *commands)
 {
@@ -136,12 +146,51 @@ command_t* register_command(command_context_t *context, command_t *parent, char
 	return c;
 }
 
-int unregister_command(command_context_t *context, char *name)
+int unregister_all_commands(command_context_t *context)
 {
+	command_t *c, *c2;
+	
 	unique_length_dirty = 1;
 	
+	if (context == NULL)
+		return ERROR_OK;
+	
+	
+	while(NULL != context->commands)
+	{
+		c = context->commands;
+		
+		while(NULL != c->children)
+		{
+			c2 = c->children;
+			c->children = c->children->next;
+			free(c2->name);
+			c2->name = NULL;
+			free(c2->help);
+			c2->help = NULL;
+			free(c2);
+			c2 = NULL;
+		}
+		
+		context->commands = context->commands->next;
+		
+		free(c->name);
+		c->name = NULL;
+		free(c->help);
+		c->help = NULL;
+		free(c);
+		c = NULL;		
+	}
+	
+	return ERROR_OK;
+}
+
+int unregister_command(command_context_t *context, char *name)
+{
 	command_t *c, *p = NULL, *c2;
 	
+	unique_length_dirty = 1;
+	
 	if ((!context) || (!name))
 		return ERROR_INVALID_ARGUMENTS;
 	
@@ -256,66 +305,42 @@ int parse_line(char *line, char *words[], int max_words)
 	return nwords;
 }
 
-void command_print(command_context_t *context, char *format, ...)
+void command_print_n(command_context_t *context, char *format, ...)
 {
-	char *buffer = NULL;
-	int n, size = 0;
-	char *p;
-
-	/* process format string */
-	for (;;)
-	{
-		va_list ap;
-		va_start(ap, format);
-		if (!buffer || (n = vsnprintf(buffer, size, format, ap)) >= size)
-		{
-			/* increase buffer until it fits the whole string */
-			if (!(p = realloc(buffer, size += 4096)))
-			{
-				/* gotta free up */
-				if (buffer)
-					free(buffer);
-				va_end(ap);
-				return;
-			}
-	
-			buffer = p;
-			
-			va_end(ap);
-			continue;
-		}
-		va_end(ap);
-		break;
-	}
+	char *string;
 	
-	/* vsnprintf failed */
-	if (n < 0)
+	va_list ap;
+	va_start(ap, format);
+
+	string = alloc_vprintf(format, ap);
+	if (string != NULL)
 	{
-		if (buffer)
-			free(buffer);
-		return;
+		context->output_handler(context, string);
+		free(string);
 	}
 
-	p = buffer;
-	
-	/* process lines in buffer */
-	do {
-		char *next = strchr(p, '\n');
-		
-		if (next)
-			*next++ = 0;
+	va_end(ap);
+}
+
+void command_print(command_context_t *context, char *format, ...)
+{
+	char *string;
 
-		if (context->output_handler)
-			context->output_handler(context, p);
+	va_list ap;
+	va_start(ap, format);
 
-		p = next;
-	} while (p);
-	
-	if (buffer)
-		free(buffer);
+	string = alloc_vprintf(format, ap);
+	if (string != NULL)
+	{
+		strcat(string, "\n"); /* alloc_vprintf guaranteed the buffer to be at least one char longer */
+		context->output_handler(context, string);
+		free(string);
+	}
+
+	va_end(ap);
 }
 
-int find_and_run_command(command_context_t *context, command_t *commands, char *words[], int num_words, int start_word)
+command_t *find_command(command_context_t *context, command_t *commands, char *words[], int num_words, int start_word, int *new_start_word)
 {
 	command_t *c;
 	
@@ -340,40 +365,67 @@ int find_and_run_command(command_context_t *context, command_t *commands, char *
 			{
 				if (!c->handler)
 				{
-					command_print(context, "No handler for command");
-					break;
+					return NULL;
 				}
 				else
 				{
-					return c->handler(context, c->name, words + start_word + 1, num_words - start_word - 1);
+					*new_start_word=start_word;
+					return c;
 				}
 			}
 			else
 			{
 				if (start_word == num_words - 1)
 				{
-					command_print(context, "Incomplete command");
-					break;
+					return NULL;
 				}
-				return find_and_run_command(context, c->children, words, num_words, start_word + 1);
+				return find_command(context, c->children, words, num_words, start_word + 1, new_start_word);
 			}
 		}
 	}
+	return NULL;
+}
+
+int find_and_run_command(command_context_t *context, command_t *commands, char *words[], int num_words)
+{
+	int start_word=0;
+	command_t *c;
+	c=find_command(context, commands, words, num_words, start_word, &start_word);
+	if (c==NULL)
+	{
+		command_print(context, "Command %s not found", words[start_word]);
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	}
 	
-	command_print(context, "Command %s not found", words[start_word]);
-	return ERROR_OK;
+	int retval = c->handler(context, c->name, words + start_word + 1, num_words - start_word - 1);
+	if (retval == ERROR_COMMAND_SYNTAX_ERROR)
+	{
+		command_print(context, "Syntax error:");
+		command_print_help_line(context, c, 0);
+	}
+	else if (retval == ERROR_COMMAND_CLOSE_CONNECTION)
+	{
+		/* just fall through for a shutdown request */
+	}
+	else if (retval != ERROR_OK)
+	{
+		/* we do not print out an error message because the command *should*
+		 * have printed out an error
+		 */
+		LOG_DEBUG("Command failed with error code %d", retval); 
+	}
+	return retval; 
 }
 
-static int command_run_line_inner(command_context_t *context, char *line)
+int command_run_line_internal_op(command_context_t *context, char *line, int run)
 {
+	LOG_USER_N("%s", ""); /* Keep GDB connection alive*/ 
+	
 	int nwords;
 	char *words[128] = {0};
 	int retval;
 	int i;
-	
-	if ((!context) || (!line))
-		return ERROR_INVALID_ARGUMENTS;
-	
+
 	/* skip preceding whitespace */
 	while (isspace(*line))
 		line++;
@@ -386,15 +438,19 @@ static int command_run_line_inner(command_context_t *context, char *line)
 	if (*line && (line[0] == '#'))
 		return ERROR_OK;
 	
-	if (context->echo)
-	{
-		command_print(context, "%s", line);
-	}
+	LOG_DEBUG("%s", line);
 
 	nwords = parse_line(line, words, sizeof(words) / sizeof(words[0]));
 	
 	if (nwords > 0)
-		retval = find_and_run_command(context, context->commands, words, nwords, 0);
+		if (run)
+		{
+			retval = find_and_run_command(context, context->commands, words, nwords);
+		} else
+		{
+			int t;
+			return (find_command(context, context->commands, words, nwords, 0, &t)!=NULL)?ERROR_OK:ERROR_FAIL;
+		}
 	else
 		return ERROR_INVALID_ARGUMENTS;
 	
@@ -404,17 +460,31 @@ static int command_run_line_inner(command_context_t *context, char *line)
 	return retval;
 }
 
+int command_run_line_internal(command_context_t *context, char *line)
+{
+	return command_run_line_internal_op(context, line, 1);
+}
+
 int command_run_line(command_context_t *context, char *line)
 {
-	int retval=command_run_line_inner(context, line);
-	// we don't want any dangling callbacks!
-	// 
-	// Capturing output from logging is *very* loosly modeled on C/C++ exceptions.
-	// the capture must be set up at function entry and 
-	// stops when the function call returns
-	log_setCallback(NULL, NULL);
-	return retval;
+	if ((!context) || (!line))
+		return ERROR_INVALID_ARGUMENTS;
+
+	if (command_run_line_internal_op(context, line, 0)!=ERROR_OK)
+	{
+		/* If we can't find a command, then try the interpreter. 
+		 * If there is no interpreter implemented, then this will
+		 * simply print a syntax error.
+		 * 
+		 * These hooks were left in to reduce patch size for 
+		 * wip to add scripting language.
+		 */
+		return jim_command(context, line);
+	}
+
+	return command_run_line_internal(context, line);
 }
+
 int command_run_file(command_context_t *context, FILE *file, enum command_mode mode)
 {
 	int retval = ERROR_OK;
@@ -457,7 +527,7 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m
 			break;
 
 		/* run line */
-		if ((retval = command_run_line_inner(context, cmd)) == ERROR_COMMAND_CLOSE_CONNECTION)
+		if ((retval = command_run_line(context, cmd)) == ERROR_COMMAND_CLOSE_CONNECTION)
 			break;
 	}
 	
@@ -469,27 +539,45 @@ int command_run_file(command_context_t *context, FILE *file, enum command_mode m
 	return retval;
 }
 
+int command_run_linef(command_context_t *context, char *format, ...)
+{
+	int retval=ERROR_FAIL;
+	char *string;
+	va_list ap;
+	va_start(ap, format);
+	string = alloc_vprintf(format, ap);
+	if (string!=NULL)
+	{
+		retval=command_run_line(context, string);
+	}
+	va_end(ap);
+	return retval;
+}
+
 void command_print_help_line(command_context_t* context, struct command_s *command, int indent)
 {
 	command_t *c;
-	char indents[32] = {0};
+	char *indent_text=malloc(indent + 2);
+	
 	char *help = "no help available";
 	char name_buf[64];
-	int i;
 	
-	for (i = 0; i < indent; i+=2)
+	if (indent)
 	{
-		indents[i*2] = ' ';
-		indents[i*2+1] = '-';
+	    indent_text[0] = ' ';
+	    memset(indent_text + 1, '-', indent);
+	    indent_text[indent + 1] = 0;
 	}
-	indents[i*2] = 0;
 	
 	if (command->help)
 		help = command->help;
 		
 	snprintf(name_buf, 64, command->name);
-	strncat(name_buf, indents, 64);
-	command_print(context, "%20s\t%s", name_buf, help);
+
+	if (indent)
+	    strncat(name_buf, indent_text, 64);
+
+	command_print(context, "%20s\t%s", name_buf, help, indent);
 	
 	if (command->children)
 	{
@@ -498,22 +586,29 @@ void command_print_help_line(command_context_t* context, struct command_s *comma
 			command_print_help_line(context, c, indent + 1);
 		}
 	}
+	free(indent_text);
 }
 
-int command_print_help(command_context_t* context, char* name, char** args, int argc)
+int command_print_help_match(command_context_t* context, command_t* c_first, char* name, char** args, int argc)
 {
-	command_t *c;
+	command_t * c;
 
-	for (c = context->commands; c; c = c->next)
+	for (c = c_first; c; c = c->next)
 	{
-		if (argc == 1)
+		if (argc > 0)
 		{
-			 if (strncasecmp(c->name, args[0], c->unique_len))
-				 continue;
+			if (strncasecmp(c->name, args[0], c->unique_len))
+				continue;
+
+			if (strncasecmp(c->name, args[0], strlen(args[0])))
+				continue;
 
-			 if (strncasecmp(c->name, args[0], strlen(args[0])))
-				 continue;
-		} 
+			if (argc > 1)
+			{
+				command_print_help_match(context, c->children, name, args + 1, argc - 1);
+				continue;
+			}
+		}
 
 		command_print_help_line(context, c, 0);
 	}
@@ -521,7 +616,12 @@ int command_print_help(command_context_t* context, char* name, char** args, int
 	return ERROR_OK;
 }
 
-void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, char* line), void *priv)
+int command_print_help(command_context_t* context, char* name, char** args, int argc)
+{
+    return command_print_help_match(context, context->commands, name, args, argc);
+}
+
+void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, const char* line), void *priv)
 {
 	context->output_handler = output_handler;
 	context->output_handler_priv = priv;
@@ -551,7 +651,6 @@ command_context_t* command_init()
 	context->mode = COMMAND_EXEC;
 	context->commands = NULL;
 	context->current_target = 0;
-	context->echo = 0;
 	context->output_handler = NULL;
 	context->output_handler_priv = NULL;
 	
@@ -561,6 +660,12 @@ command_context_t* command_init()
 	register_command(context, NULL, "sleep", handle_sleep_command,
 					 COMMAND_ANY, "sleep for <n> milliseconds");
 	
+	register_command(context, NULL, "time", handle_time_command,
+					 COMMAND_ANY, "time <cmd + args> - execute <cmd + args> and print time it took");
+	
+	register_command(context, NULL, "fast", handle_fast_command,
+					 COMMAND_ANY, "fast <enable/disable> - place at beginning of config files. Sets defaults to fast and dangerous.");
+	
 	return context;
 }
 
@@ -579,3 +684,46 @@ int handle_sleep_command(struct command_context_s *cmd_ctx, char *cmd, char **ar
 
 	return ERROR_OK;
 }
+
+int handle_fast_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	if (argc!=1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	
+	fast_and_dangerous = strcmp("enable", args[0])==0;
+	
+	return ERROR_OK;
+}
+
+
+int handle_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	duration_t duration;
+	char *duration_text;
+	int retval;
+	float t;
+	
+	if (argc<1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	
+	duration_start_measure(&duration);
+	
+	retval = find_and_run_command(cmd_ctx, cmd_ctx->commands, args, argc);
+	
+	duration_stop_measure(&duration, &duration_text);
+	
+	t=duration.duration.tv_sec;
+	t+=((float)duration.duration.tv_usec / 1000000.0);
+	command_print(cmd_ctx, "%s took %fs", args[0], t);
+	
+	free(duration_text);
+
+	return retval;
+}
+/*
+ * Local Variables: **
+ * tab-width: 4 **
+ * c-basic-offset: 4 **
+ * End: **
+ */
+