X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=e67be13e4e03f43a10ab8097af18630708adbdf4;hp=256c590da082b1174cefc26a0813fbbfe3c18392;hb=5a41435e45ae18c0823780382c214fb7324dbe7d;hpb=64653b0bbb0b2ac87de83d867f241360087b7588 diff --git a/src/server/server.c b/src/server/server.c index 256c590da0..e67be13e4e 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007-2010 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -28,7 +28,7 @@ #endif #include "server.h" -#include "target.h" +#include #include "openocd.h" #include "tcl_server.h" #include "telnet_server.h" @@ -40,7 +40,7 @@ #endif -struct service *services = NULL; +static struct service *services = NULL; /* shutdown_openocd == 1: exit the main event loop, and quit the debugger */ static int shutdown_openocd = 0; @@ -48,7 +48,7 @@ static int shutdown_openocd = 0; /* set when using pipes rather than tcp */ int server_use_pipes = 0; -int add_connection(struct service *service, struct command_context *cmd_ctx) +static int add_connection(struct service *service, struct command_context *cmd_ctx) { socklen_t address_size; struct connection *c, **p; @@ -57,6 +57,7 @@ int add_connection(struct service *service, struct command_context *cmd_ctx) c = malloc(sizeof(struct connection)); c->fd = -1; + c->fd_out = -1; memset(&c->sin, 0, sizeof(c->sin)); c->cmd_ctx = copy_command_context(cmd_ctx); c->service = service; @@ -69,6 +70,7 @@ int add_connection(struct service *service, struct command_context *cmd_ctx) address_size = sizeof(c->sin); c->fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size); + c->fd_out = c->fd; /* This increases performance dramatically for e.g. GDB load which * does not have a sliding window protocol. */ @@ -78,7 +80,7 @@ int add_connection(struct service *service, struct command_context *cmd_ctx) (char *)&flag, /* the cast is historical cruft */ sizeof(int)); /* length of option value */ - LOG_INFO("accepting '%s' connection from %i", service->name, c->sin.sin_port); + LOG_INFO("accepting '%s' connection from %i", service->name, service->port); if ((retval = service->new_connection(c)) != ERROR_OK) { close_socket(c->fd); @@ -90,6 +92,10 @@ int add_connection(struct service *service, struct command_context *cmd_ctx) else if (service->type == CONNECTION_PIPE) { c->fd = service->fd; + c->fd_out = fileno(stdout); + + /* do not check for new connections again on stdin */ + service->fd = -1; /* do not check for new connections again on stdin */ service->fd = -1; @@ -112,7 +118,7 @@ int add_connection(struct service *service, struct command_context *cmd_ctx) return ERROR_OK; } -int remove_connection(struct service *service, struct connection *connection) +static int remove_connection(struct service *service, struct connection *connection) { struct connection **p = &service->connections; struct connection *c; @@ -205,8 +211,7 @@ int add_service(char *name, enum connection_type type, unsigned short port, int } else if (type == CONNECTION_PIPE) { - /* use stdin */ - c->fd = STDIN_FILENO; + c->fd = fileno(stdin); #ifdef _WIN32 /* for win32 set stdin/stdout to binary mode */ @@ -233,35 +238,7 @@ int add_service(char *name, enum connection_type type, unsigned short port, int return ERROR_OK; } -int remove_service(unsigned short port) -{ - struct service **p = &services; - struct service *c; - - /* find service */ - while ((c = *p)) - { - if (c->port == port) - { - if (c->name) - free(c->name); - - if (c->priv) - free(c->priv); - - /* delete service */ - *p = c->next; - free(c); - } - - /* redirect p to next list pointer */ - p = &(*p)->next; - } - - return ERROR_OK; -} - -int remove_services(void) +static int remove_services(void) { struct service *c = services; @@ -292,9 +269,10 @@ int server_loop(struct command_context *command_context) { struct service *service; + bool poll_ok = true; + /* used in select() */ fd_set read_fds; - struct timeval tv; int fd_max; /* used in accept() */ @@ -305,10 +283,6 @@ int server_loop(struct command_context *command_context) LOG_ERROR("couldn't set SIGPIPE to SIG_IGN"); #endif - /* do regular tasks after at most 10ms */ - tv.tv_sec = 0; - tv.tv_usec = 10000; - while (!shutdown_openocd) { /* monitor sockets for activity */ @@ -341,22 +315,24 @@ int server_loop(struct command_context *command_context) } } -#ifndef _WIN32 -#if BUILD_ECOSBOARD == 0 - if (server_use_pipes == 0) + struct timeval tv; + tv.tv_sec = 0; + if (poll_ok) + { + /* we're just polling this iteration, this is faster on embedded + * hosts */ + tv.tv_usec = 0; + retval = socket_select(fd_max + 1, &read_fds, NULL, NULL, &tv); + } else { - /* add STDIN to read_fds */ - FD_SET(fileno(stdin), &read_fds); + /* Every 100ms */ + tv.tv_usec = 100000; + /* Only while we're sleeping we'll let others run */ + openocd_sleep_prelude(); + kept_alive(); + retval = socket_select(fd_max + 1, &read_fds, NULL, NULL, &tv); + openocd_sleep_postlude(); } -#endif -#endif - - openocd_sleep_prelude(); - kept_alive(); - - /* Only while we're sleeping we'll let others run */ - retval = socket_select(fd_max + 1, &read_fds, NULL, NULL, &tv); - openocd_sleep_postlude(); if (retval == -1) { @@ -385,15 +361,20 @@ int server_loop(struct command_context *command_context) #endif } - target_call_timer_callbacks(); - process_jim_events (); - if (retval == 0) { - /* do regular tasks after at most 100ms */ - tv.tv_sec = 0; - tv.tv_usec = 10000; + /* We only execute these callbacks when there was nothing to do or we timed out */ + target_call_timer_callbacks(); + process_jim_events(command_context); + FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case! */ + + /* We timed out/there was nothing to do, timeout rather than poll next time */ + poll_ok = false; + } else + { + /* There was something to do, next time we'll just poll */ + poll_ok = true; } for (service = services; service; service = service->next) @@ -408,7 +389,7 @@ int server_loop(struct command_context *command_context) } else { - if (service->type != CONNECTION_PIPE) + if (service->type == CONNECTION_TCP) { struct sockaddr_in sin; socklen_t address_size = sizeof(sin); @@ -448,21 +429,7 @@ int server_loop(struct command_context *command_context) } } -#ifndef _WIN32 -#if BUILD_ECOSBOARD == 0 - /* check for data on stdin if not using pipes */ - if (server_use_pipes == 0) - { - if (FD_ISSET(fileno(stdin), &read_fds)) - { - if (getc(stdin) == 'x') - { - shutdown_openocd = 1; - } - } - } -#endif -#else +#ifdef _WIN32 MSG msg; while (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) { @@ -487,8 +454,12 @@ void sig_handler(int sig) { } #endif -int server_init(void) +int server_preinit(void) { + /* this currently only calls WSAStartup on native win32 systems + * before any socket operations are performed. + * This is an issue if you call init in your config script */ + #ifdef _WIN32 WORD wVersionRequested; WSADATA wsaData; @@ -518,6 +489,11 @@ int server_init(void) signal(SIGABRT, sig_handler); #endif + return ERROR_OK; +} + +int server_init(struct command_context *cmd_ctx) +{ int ret = tcl_init(); if (ERROR_OK != ret) return ret; @@ -540,9 +516,11 @@ int server_quit(void) /* tell the server we want to shut down */ COMMAND_HANDLER(handle_shutdown_command) { + LOG_USER("shutdown command invoked"); + shutdown_openocd = 1; - return ERROR_COMMAND_CLOSE_CONNECTION; + return ERROR_OK; } static const struct command_registration server_command_handlers[] = {