X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=5ce01e82bd2892ad46759908995e2ef507ce9302;hp=5f890dbe0fc231019a4c925b9c0fea3d211f306c;hb=4cc359794420dbe0aedba38bde0ee4d871cdb354;hpb=505d4633cd7a4e8623ef70932cd7edc9f22e71d4

diff --git a/src/openocd.c b/src/openocd.c
index 5f890dbe0f..5ce01e82bd 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -42,7 +42,6 @@
 
 #include <server/server.h>
 #include <server/gdb_server.h>
-#include <server/httpd.h>
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -185,6 +184,29 @@ COMMAND_HANDLER(handle_add_script_search_dir_command)
 	return ERROR_OK;
 }
 
+
+static int jim_stacktrace_command(Jim_Interp *interp, int argc,
+		Jim_Obj * const *argv)
+{
+	if (argc != 1)
+	{
+		return JIM_ERR;
+	}
+	Jim_Obj * stacktrace = Jim_DuplicateObj(interp, interp->stackTrace);
+	
+	/* insert actual error site at beginning of list*/
+	Jim_Obj *procname = Jim_NewStringObj(interp, "", -1); /* Uhhh... don't know this one. */
+	Jim_ListInsertElements(interp, stacktrace, 0, 1, &procname);
+	Jim_Obj *filename = Jim_NewStringObj(interp, interp->errorFileName, -1);
+	Jim_ListInsertElements(interp, stacktrace, 1, 1, &filename);
+	Jim_Obj *line = Jim_NewIntObj(interp, interp->errorLine);
+	Jim_ListInsertElements(interp, stacktrace, 2, 1, &line);
+
+	Jim_SetResult(interp, stacktrace);
+
+	return JIM_OK;
+}
+
 static const struct command_registration openocd_command_handlers[] = {
 	{
 		.name = "version",
@@ -215,6 +237,14 @@ static const struct command_registration openocd_command_handlers[] = {
 		.help = "dir to search for config files and scripts",
 
 	},
+	{
+		.name = "stacktrace",
+		.jim_handler = jim_stacktrace_command,
+		.mode = COMMAND_ANY,
+		.help = "returns the stacktrace as a list of triples: proc, file, line."
+		"The stack trace is reset when a new stack trace is being built after "
+		"a new failure has occurred.",
+	},
 	COMMAND_REGISTRATION_DONE
 };
 
@@ -306,9 +336,6 @@ int openocd_main(int argc, char *argv[])
 	if (ret != ERROR_OK)
 		return EXIT_FAILURE;
 
-	if (httpd_start(cmd_ctx) != ERROR_OK)
-		return EXIT_FAILURE;
-
 	ret = server_init(cmd_ctx);
 	if (ERROR_OK != ret)
 		return EXIT_FAILURE;
@@ -326,8 +353,6 @@ int openocd_main(int argc, char *argv[])
 
 	server_quit();
 
-	httpd_stop();
-
 	unregister_all_commands(cmd_ctx, NULL);
 
 	/* free commandline interface */