- remove target specific variant and use target->variant member

[openocd.git] / src / server / server.c

diff --git a/src/server/server.c b/src/server/server.c
index 8c4fd7d2978ad41c152cc9ee4298fb47e2378102..db61b1a52ee593cc146d28b5006c9171a032b251 100644 (file)
--- 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 <sys/types.h>
 #include <fcntl.h>
 #include <signal.h>
+#ifndef _WIN32
+#include <netinet/tcp.h>
+#endif
 
 service_t *services = NULL;
 
@@ -49,6 +58,7 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
        unsigned int address_size;
        connection_t *c, **p;
        int retval;
+       int flag=1;
        
        c = malloc(sizeof(connection_t));
        c->fd = -1;
@@ -60,9 +70,17 @@ 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)
        {
@@ -153,6 +171,19 @@ int add_service(char *name, enum connection_type type, unsigned short port, int
                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)
        {
                LOG_ERROR("couldn't listen on socket: %s", strerror(errno));
@@ -194,7 +225,7 @@ int remove_service(unsigned short port)
        return ERROR_OK;
 }
 
-int remove_services()
+int remove_services(void)
 {
        service_t *c = services;
 
@@ -221,6 +252,9 @@ int remove_services()
        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;
@@ -237,7 +271,7 @@ int server_loop(command_context_t *command_context)
        if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
                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;
@@ -275,12 +309,18 @@ 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 == -1)
                {
 #ifdef _WIN32
@@ -309,6 +349,7 @@ int server_loop(command_context_t *command_context)
                }
                
                target_call_timer_callbacks();
+               process_jim_events ();
 
                if (retval == 0)
                {
@@ -363,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')
@@ -370,6 +412,7 @@ int server_loop(command_context_t *command_context)
                                shutdown_openocd = 1;
                        }
                }
+#endif
 #else
                MSG msg;
                while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))
@@ -386,16 +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;
+       shutdown_openocd = 1;
 }
 #endif
 
-int server_init()
+int server_init(void)
 {
 #ifdef _WIN32
        WORD wVersionRequested;
@@ -421,7 +464,7 @@ int server_init()
        return ERROR_OK;
 }
 
-int server_quit()
+int server_quit(void)
 {
        remove_services();
 
@@ -448,5 +491,3 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char *
 
        return ERROR_COMMAND_CLOSE_CONNECTION;
 }
-
-