- fix incorrectly registered function openocd_array2mem

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

diff --git a/src/server/server.c b/src/server/server.c
index 8c4fd7d2978ad41c152cc9ee4298fb47e2378102..ce0ee6cd231863a41fbbe973042d608a2860f4a3 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -37,6 +37,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <signal.h>
+#ifndef _WIN32
+#include <netinet/tcp.h>
+#endif
 
 service_t *services = NULL;
 
@@ -49,6 +52,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 +64,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 +165,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));
@@ -221,6 +246,9 @@ int remove_services()
        return ERROR_OK;
 }
 
+extern void openocd_sleep_prelude();
+extern void openocd_sleep_postlude();
+
 int server_loop(command_context_t *command_context)
 {
        service_t *service;
@@ -237,7 +265,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 +303,18 @@ int server_loop(command_context_t *command_context)
                }
                
 #ifndef _WIN32
+#ifndef BUILD_ECOSBOARD
                /* 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
@@ -363,6 +397,7 @@ int server_loop(command_context_t *command_context)
                }
                
 #ifndef _WIN32
+#ifndef BUILD_ECOSBOARD
                if (FD_ISSET(fileno(stdin), &read_fds))
                {
                        if (getc(stdin) == 'x')
@@ -370,6 +405,7 @@ int server_loop(command_context_t *command_context)
                                shutdown_openocd = 1;
                        }
                }
+#endif
 #else
                MSG msg;
                while (PeekMessage(&msg,NULL,0,0,PM_REMOVE))