From 7b2906de246bc37af99d432b3edf12e9f5f63521 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Sun, 29 Nov 2009 18:27:45 -0800 Subject: do not extern 'interp' from command.c Adds 'interp' field to command_context, chasing the few remaining references to the global variable outside of the command module. --- src/helper/command.c | 2 +- src/helper/command.h | 3 +-- src/jtag/core.c | 2 +- src/openocd.c | 2 +- src/server/httpd.c | 18 +++++++++++------- src/server/server.c | 4 ++-- src/server/server.h | 2 +- src/server/tcl_server.c | 7 +++++-- src/server/tcl_server.h | 2 +- src/target/target.c | 11 +++++++---- src/target/target.h | 1 - 11 files changed, 31 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/helper/command.c b/src/helper/command.c index 319f0810..5df4a453 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -1257,7 +1257,7 @@ struct command_context* command_init(const char *startup_tcl) #if !BUILD_ECOSBOARD Jim_InitEmbedded(); /* Create an interpreter */ - interp = Jim_CreateInterp(); + interp = context->interp = Jim_CreateInterp(); /* Add all the Jim core commands */ Jim_RegisterCoreCommands(interp); #endif diff --git a/src/helper/command.h b/src/helper/command.h index 07235961..f27364ea 100644 --- a/src/helper/command.h +++ b/src/helper/command.h @@ -59,6 +59,7 @@ typedef int (*command_output_handler_t)(struct command_context *context, struct command_context { + Jim_Interp *interp; enum command_mode mode; struct command *commands; int current_target; @@ -359,8 +360,6 @@ void process_jim_events(void); #define ERROR_COMMAND_ARGUMENT_OVERFLOW (-604) #define ERROR_COMMAND_ARGUMENT_UNDERFLOW (-605) -extern Jim_Interp *interp; - int parse_ulong(const char *str, unsigned long *ul); int parse_ullong(const char *str, unsigned long long *ul); diff --git a/src/jtag/core.c b/src/jtag/core.c index 211b9d5a..9230cc2b 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -1535,7 +1535,7 @@ int jtag_init(struct command_context *cmd_ctx) if ((retval = jtag_execute_queue()) != ERROR_OK) return retval; - if (Jim_Eval_Named(interp, "jtag_init", __FILE__, __LINE__) != JIM_OK) + if (Jim_Eval_Named(cmd_ctx->interp, "jtag_init", __FILE__, __LINE__) != JIM_OK) return ERROR_FAIL; return ERROR_OK; diff --git a/src/openocd.c b/src/openocd.c index 2a65b4d8..1be209ad 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -277,7 +277,7 @@ int openocd_main(int argc, char *argv[]) return EXIT_FAILURE; #endif - ret = server_init(); + ret = server_init(cmd_ctx); if (ERROR_OK != ret) return EXIT_FAILURE; diff --git a/src/server/httpd.c b/src/server/httpd.c index 9fa58790..b346ca2e 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -180,6 +180,7 @@ httpd_Jim_Command_formfetch(Jim_Interp *interp, struct httpd_request { int post; + Jim_Interp *interp; struct MHD_PostProcessor *postprocessor; //Jim_Obj *dict; @@ -208,7 +209,8 @@ static void request_completed(void *cls, struct MHD_Connection *connection, } /* append to said key in dictionary */ -static void append_key(struct httpd_request *r, const char *key, +static void append_key(Jim_Interp *interp, + struct httpd_request *r, const char *key, const char *data, size_t off, size_t size) { Jim_Obj *keyObj = Jim_NewStringObj(interp, key, -1); @@ -259,7 +261,7 @@ static int iterate_post(void *con_cls, enum MHD_ValueKind kind, { struct httpd_request *r = (struct httpd_request*) con_cls; - append_key(r, key, data, off, size); + append_key(r->interp, r, key, data, off, size); return MHD_YES; } @@ -268,12 +270,13 @@ static int record_arg(void *cls, enum MHD_ValueKind kind, const char *key, const char *value) { struct httpd_request *r = (struct httpd_request*) cls; - append_key(r, key, value, 0, strlen(value)); + append_key(r->interp, r, key, value, 0, strlen(value)); return MHD_YES; } -static int handle_request(struct MHD_Connection * connection, const char * url) +static int handle_request(Jim_Interp *interp, + struct MHD_Connection * connection, const char * url) { struct MHD_Response * response; @@ -358,6 +361,7 @@ static int ahc_echo_inner(void * cls, struct MHD_Connection * connection, const char * url, const char * method, const char * version, const char * upload_data, size_t * upload_data_size, void ** ptr) { + Jim_Interp *interp = (Jim_Interp *)cls; int post = 0; if (0 == strcmp(method, "POST")) @@ -384,7 +388,7 @@ static int ahc_echo_inner(void * cls, struct MHD_Connection * connection, memset(*ptr, 0, sizeof(struct httpd_request)); r = (struct httpd_request *) *ptr; - + r->interp = interp; r->post = post; Jim_SetVariableStr(interp, "httppostdata", Jim_NewDictObj(interp, NULL, 0)); @@ -437,7 +441,7 @@ static int ahc_echo_inner(void * cls, struct MHD_Connection * connection, url="index.tcl"; const char *file_name = alloc_printf("%s/%s", httpd_dir, url); - int result = handle_request(connection, file_name); + int result = handle_request(interp, connection, file_name); free((void *)file_name); return result; } @@ -487,7 +491,7 @@ int httpd_start(struct command_context *cmd_ctx) int port = 8888; LOG_USER("Launching httpd server on port %d", port); d = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, port, NULL, NULL, - &ahc_echo, NULL, /* could be data for handler, but we only have a single handler, use global variables instead */ + &ahc_echo, cmd_ctx->interp, MHD_OPTION_NOTIFY_COMPLETED, request_completed, NULL, /* Closure... what's that??? */ MHD_OPTION_END); if (d == NULL) diff --git a/src/server/server.c b/src/server/server.c index 256c590d..a02d4a5c 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -487,7 +487,7 @@ void sig_handler(int sig) { } #endif -int server_init(void) +int server_init(struct command_context *cmd_ctx) { #ifdef _WIN32 WORD wVersionRequested; @@ -518,7 +518,7 @@ int server_init(void) signal(SIGABRT, sig_handler); #endif - int ret = tcl_init(); + int ret = tcl_init(cmd_ctx); if (ERROR_OK != ret) return ret; diff --git a/src/server/server.h b/src/server/server.h index 5e862815..173de951 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -74,7 +74,7 @@ int add_service(char *name, enum connection_type type, unsigned short port, input_handler_t in_handler, connection_closed_handler_t close_handler, void *priv); -int server_init(void); +int server_init(struct command_context *cmd_ctx); int server_quit(void); int server_loop(struct command_context *command_context); diff --git a/src/server/tcl_server.c b/src/server/tcl_server.c index 22469a4f..08247686 100644 --- a/src/server/tcl_server.c +++ b/src/server/tcl_server.c @@ -81,6 +81,7 @@ static int tcl_new_connection(struct connection *connection) static int tcl_input(struct connection *connection) { + Jim_Interp *interp = (Jim_Interp *)connection->priv; int retval; int i; ssize_t rlen; @@ -156,7 +157,7 @@ static int tcl_closed(struct connection *connection) return ERROR_OK; } -int tcl_init(void) +int tcl_init(struct command_context *cmd_ctx) { int retval; @@ -166,7 +167,9 @@ int tcl_init(void) return ERROR_OK; } - retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1, tcl_new_connection, tcl_input, tcl_closed, NULL); + retval = add_service("tcl", CONNECTION_TCP, tcl_port, 1, + &tcl_new_connection, &tcl_input, + &tcl_closed, cmd_ctx->interp); return retval; } diff --git a/src/server/tcl_server.h b/src/server/tcl_server.h index 1f6ba62e..e0d7b166 100644 --- a/src/server/tcl_server.h +++ b/src/server/tcl_server.h @@ -22,7 +22,7 @@ #include "server.h" -int tcl_init(void); +int tcl_init(struct command_context *cmd_ctx); int tcl_register_commands(struct command_context *cmd_ctx); #endif /* _TCL_SERVER_H_ */ diff --git a/src/target/target.c b/src/target/target.c index 42972582..31734b8f 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -449,12 +449,12 @@ int target_process_reset(struct command_context *cmd_ctx, enum target_reset_mode jtag_poll_set_enabled(false); sprintf(buf, "ocd_process_reset %s", n->name); - retval = Jim_Eval(interp, buf); + retval = Jim_Eval(cmd_ctx->interp, buf); jtag_poll_set_enabled(save_poll); if (retval != JIM_OK) { - Jim_PrintErrorMessage(interp); + Jim_PrintErrorMessage(cmd_ctx->interp); return ERROR_FAIL; } @@ -759,6 +759,8 @@ err_write_phys_memory(struct target *target, uint32_t address, return ERROR_FAIL; } +static int handle_target(void *priv); + int target_init(struct command_context *cmd_ctx) { struct target *target; @@ -876,7 +878,7 @@ int target_init(struct command_context *cmd_ctx) { if ((retval = target_register_user_commands(cmd_ctx)) != ERROR_OK) return retval; - if ((retval = target_register_timer_callback(handle_target, 100, 1, NULL)) != ERROR_OK) + if ((retval = target_register_timer_callback(&handle_target, 100, 1, cmd_ctx->interp)) != ERROR_OK) return retval; } @@ -1796,8 +1798,9 @@ static void target_call_event_callbacks_all(enum target_event e) { } /* process target state changes */ -int handle_target(void *priv) +static int handle_target(void *priv) { + Jim_Interp *interp = (Jim_Interp *)priv; int retval = ERROR_OK; /* we do not want to recurse here... */ diff --git a/src/target/target.h b/src/target/target.h index af4727ce..3e307142 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -251,7 +251,6 @@ int target_register_commands(struct command_context *cmd_ctx); int target_register_user_commands(struct command_context *cmd_ctx); int target_init(struct command_context *cmd_ctx); int target_examine(void); -int handle_target(void *priv); int target_process_reset(struct command_context *cmd_ctx, enum target_reset_mode reset_mode); -- cgit v1.2.3