X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=db61b1a52ee593cc146d28b5006c9171a032b251;hp=951be45053b4159764affb5985a50da7863f3318;hb=0cba0d4df3fe120f08945703506f8405760325c9;hpb=7d244761461701e1161df32c2f1d4cd50ae2bb26 diff --git a/src/server/server.c b/src/server/server.c index 951be45053..db61b1a52e 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -2,6 +2,12 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -37,6 +43,9 @@ #include #include #include +#ifndef _WIN32 +#include +#endif service_t *services = NULL; @@ -47,8 +56,9 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char * int add_connection(service_t *service, command_context_t *cmd_ctx) { unsigned int address_size; - connection_t *c, *p; + connection_t *c, **p; int retval; + int flag=1; c = malloc(sizeof(connection_t)); c->fd = -1; @@ -60,29 +70,32 @@ int add_connection(service_t *service, command_context_t *cmd_ctx) c->next = NULL; address_size = sizeof(c->sin); + c->fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size); - + + /* This increases performance dramatically for e.g. GDB load which + * does not have a sliding window protocol. */ + retval=setsockopt(c->fd, /* socket affected */ + IPPROTO_TCP, /* set option at TCP level */ + TCP_NODELAY, /* name of option */ + (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); if ((retval = service->new_connection(c)) == ERROR_OK) { - INFO("accepted '%s' connection from %i", service->name, c->sin.sin_port); } else { close_socket(c->fd); - INFO("attempted '%s' connection rejected", service->name); + LOG_ERROR("attempted '%s' connection rejected", service->name); free(c); + return retval; } - if (service->connections) - { - for (p = service->connections; p && p->next; p = p->next); - if (p) - p->next = c; - } - else - { - service->connections = c; - } + /* add to the end of linked list */ + for (p = &service->connections; *p; p = &(*p)->next); + *p = c; service->max_connections--; @@ -91,30 +104,28 @@ int add_connection(service_t *service, command_context_t *cmd_ctx) int remove_connection(service_t *service, connection_t *connection) { - connection_t *c = service->connections; + connection_t **p = &service->connections; + connection_t *c; /* find connection */ - while(c) - { - connection_t *next = c->next; - + while((c = *p)) + { if (c->fd == connection->fd) { - service->connections = next; service->connection_closed(c); close_socket(c->fd); - command_done(c->cmd_ctx); /* delete connection */ + *p = c->next; free(c); service->max_connections++; break; } - /* remember the last connection for unlinking */ - c = next; + /* redirect p to next list pointer */ + p = &(*p)->next; } return ERROR_OK; @@ -122,7 +133,7 @@ int remove_connection(service_t *service, connection_t *connection) int add_service(char *name, enum connection_type type, unsigned short port, int max_connections, new_connection_handler_t new_connection_handler, input_handler_t input_handler, connection_closed_handler_t connection_closed_handler, void *priv) { - service_t *c, *p; + service_t *c, **p; int so_reuseaddr_option = 1; c = malloc(sizeof(service_t)); @@ -141,7 +152,7 @@ int add_service(char *name, enum connection_type type, unsigned short port, int if ((c->fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) { - ERROR("error creating socket: %s", strerror(errno)); + LOG_ERROR("error creating socket: %s", strerror(errno)); exit(-1); } @@ -156,39 +167,44 @@ int add_service(char *name, enum connection_type type, unsigned short port, int if (bind(c->fd, (struct sockaddr *)&c->sin, sizeof(c->sin)) == -1) { - ERROR("couldn't bind to socket: %s", strerror(errno)); + LOG_ERROR("couldn't bind to socket: %s", strerror(errno)); exit(-1); } +#ifndef _WIN32 + int segsize=65536; + setsockopt(c->fd, IPPROTO_TCP, TCP_MAXSEG, &segsize, sizeof(int)); +#endif + int window_size = 128 * 1024; + + /* These setsockopt()s must happen before the listen() */ + + setsockopt(c->fd, SOL_SOCKET, SO_SNDBUF, + (char *)&window_size, sizeof(window_size)); + setsockopt(c->fd, SOL_SOCKET, SO_RCVBUF, + (char *)&window_size, sizeof(window_size)); + if (listen(c->fd, 1) == -1) { - ERROR("couldn't listen on socket: %s", strerror(errno)); + LOG_ERROR("couldn't listen on socket: %s", strerror(errno)); exit(-1); } - if (services) - { - for (p = services; p && p->next; p = p->next); - if (p) - p->next = c; - } - else - { - services = c; - } + /* add to the end of linked list */ + for (p = &services; *p; p = &(*p)->next); + *p = c; return ERROR_OK; } int remove_service(unsigned short port) { - service_t *c = services; + service_t **p = &services; + service_t *c; /* find service */ - while(c) - { - service_t *next = c->next; - + while((c = *p)) + { if (c->port == port) { if (c->name) @@ -198,17 +214,18 @@ int remove_service(unsigned short port) free(c->priv); /* delete service */ + *p = c->next; free(c); } - - /* remember the last service for unlinking */ - c = next; + + /* redirect p to next list pointer */ + p = &(*p)->next; } return ERROR_OK; } -int remove_services() +int remove_services(void) { service_t *c = services; @@ -230,9 +247,14 @@ int remove_services() c = next; } + services = NULL; + return ERROR_OK; } +extern void openocd_sleep_prelude(void); +extern void openocd_sleep_postlude(void); + int server_loop(command_context_t *command_context) { service_t *service; @@ -247,9 +269,9 @@ int server_loop(command_context_t *command_context) #ifndef _WIN32 if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) - ERROR("couldn't set SIGPIPE to SIG_IGN"); + 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; @@ -287,11 +309,19 @@ int server_loop(command_context_t *command_context) } #ifndef _WIN32 +#if BUILD_ECOSBOARD == 0 /* add STDIN to read_fds */ FD_SET(fileno(stdin), &read_fds); #endif +#endif + + openocd_sleep_prelude(); + kept_alive(); + // Only while we're sleeping we'll let others run + retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv); + openocd_sleep_postlude(); - if ((retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv)) == -1) + if (retval == -1) { #ifdef _WIN32 @@ -301,35 +331,32 @@ int server_loop(command_context_t *command_context) FD_ZERO(&read_fds); else { - ERROR("error during select: %d", strerror(errno)); + LOG_ERROR("error during select: %s", strerror(errno)); exit(-1); } #else if (errno == EINTR) + { FD_ZERO(&read_fds); + } else { - ERROR("error during select: %s", strerror(errno)); + LOG_ERROR("error during select: %s", strerror(errno)); exit(-1); } #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; - -#if 0 - if (shutdown_openocd) - return ERROR_COMMAND_CLOSE_CONNECTION; - - handle_target(); -#endif + FD_ZERO(&read_fds); /* eCos leaves read_fds unchanged in this case! */ } for (service = services; service; service = service->next) @@ -339,7 +366,9 @@ int server_loop(command_context_t *command_context) && (FD_ISSET(service->fd, &read_fds))) { if (service->max_connections > 0) + { add_connection(service, command_context); + } else { struct sockaddr_in sin; @@ -347,7 +376,7 @@ int server_loop(command_context_t *command_context) int tmp_fd; tmp_fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size); close_socket(tmp_fd); - INFO("rejected '%s' connection, no more connections allowed", service->name); + LOG_INFO("rejected '%s' connection, no more connections allowed", service->name); } } @@ -364,7 +393,7 @@ int server_loop(command_context_t *command_context) { connection_t *next = c->next; remove_connection(service, c); - INFO("dropped '%s' connection", service->name); + LOG_INFO("dropped '%s' connection", service->name); c = next; continue; } @@ -375,6 +404,7 @@ int server_loop(command_context_t *command_context) } #ifndef _WIN32 +#if BUILD_ECOSBOARD == 0 if (FD_ISSET(fileno(stdin), &read_fds)) { if (getc(stdin) == 'x') @@ -382,6 +412,14 @@ int server_loop(command_context_t *command_context) shutdown_openocd = 1; } } +#endif +#else + MSG msg; + while (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) + { + if (msg.message == WM_QUIT) + shutdown_openocd = 1; + } #endif } @@ -391,12 +429,16 @@ int server_loop(command_context_t *command_context) #ifdef _WIN32 BOOL WINAPI ControlHandler(DWORD dwCtrlType) { - shutdown_openocd = 1; - return TRUE; + shutdown_openocd = 1; + return TRUE; +} + +void sig_handler(int sig) { + shutdown_openocd = 1; } #endif -int server_init() +int server_init(void) { #ifdef _WIN32 WORD wVersionRequested; @@ -406,18 +448,23 @@ int server_init() if (WSAStartup(wVersionRequested, &wsaData) != 0) { - ERROR("Failed to Open Winsock"); + LOG_ERROR("Failed to Open Winsock"); exit(-1); } SetConsoleCtrlHandler( ControlHandler, TRUE ); + + signal(SIGINT, sig_handler); + signal(SIGTERM, sig_handler); + signal(SIGBREAK, sig_handler); + signal(SIGABRT, sig_handler); #endif return ERROR_OK; } -int server_quit() +int server_quit(void) { remove_services(); @@ -444,4 +491,3 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char * return ERROR_COMMAND_CLOSE_CONNECTION; } -