Duane Ellis: fix warnings

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

diff --git a/src/server/server.c b/src/server/server.c
index 33bf00cf218907256daa8b962ae5ab0c8aa9fc2f..aad98747445bdeb68c42d6c84c88655cf54087bc 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   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     *
@@ -52,9 +55,7 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
        unsigned int address_size;
        connection_t *c, **p;
        int retval;
-#ifndef _WIN32
        int flag=1;
-#endif
        
        c = malloc(sizeof(connection_t));
        c->fd = -1;
@@ -66,34 +67,17 @@ int add_connection(service_t *service, command_context_t *cmd_ctx)
        c->next = NULL;
 
        address_size = sizeof(c->sin);
-#ifndef _WIN32
-       int segsize=65536;
-       setsockopt(service->fd, IPPROTO_TCP, TCP_MAXSEG,  &segsize, sizeof(int));
-       int window_size = 128 * 1024;   
-
-       /* These setsockopt()s must happen before the accept() */
-
-       setsockopt(service->fd, SOL_SOCKET, SO_SNDBUF,
-                (char *) &window_size, sizeof(window_size));
-
-       setsockopt(service->fd, SOL_SOCKET, SO_RCVBUF,
-                (char *) &window_size, sizeof(window_size));
        
-#endif
        c->fd = accept(service->fd, (struct sockaddr *)&service->sin, &address_size);
-#ifndef _WIN32
-       // 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 */
-    setsockopt(c->fd, IPPROTO_TCP, TCP_MAXSEG,  &segsize, sizeof(int));
-#endif 
-                               
-                               
+       
+       /* 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)
        {
@@ -184,6 +168,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));
@@ -225,7 +222,7 @@ int remove_service(unsigned short port)
        return ERROR_OK;
 }
 
-int remove_services()
+int remove_services(void)
 {
        service_t *c = services;
 
@@ -252,8 +249,8 @@ int remove_services()
        return ERROR_OK;
 }
 
-extern void lockBigLock();
-extern void unlockBigLock();
+extern void openocd_sleep_prelude(void);
+extern void openocd_sleep_postlude(void);
 
 int server_loop(command_context_t *command_context)
 {
@@ -272,13 +269,6 @@ int server_loop(command_context_t *command_context)
                LOG_ERROR("couldn't set SIGPIPE to SIG_IGN");
 #endif
 
-       // This function is reentrant(workaround for configuration problems)
-       static int lockCount=0;
-       if (lockCount++==0)
-       {
-               lockBigLock();
-       }
-       
        /* do regular tasks after at most 10ms */
        tv.tv_sec = 0;
        tv.tv_usec = 10000;
@@ -322,10 +312,11 @@ int server_loop(command_context_t *command_context)
 #endif
 #endif
 
+               openocd_sleep_prelude();
+               kept_alive();
                // Only while we're sleeping we'll let others run
-               unlockBigLock();
                retval = select(fd_max + 1, &read_fds, NULL, NULL, &tv);
-               lockBigLock();
+               openocd_sleep_postlude();
 
                if (retval == -1)
                {
@@ -427,10 +418,6 @@ int server_loop(command_context_t *command_context)
                }
 #endif
        }
-       if (--lockCount==0)
-       {
-               unlockBigLock();
-       }
        
        return ERROR_OK;
 }
@@ -447,7 +434,7 @@ void sig_handler(int sig) {
 }
 #endif
 
-int server_init()
+int server_init(void)
 {
 #ifdef _WIN32
        WORD wVersionRequested;
@@ -473,7 +460,7 @@ int server_init()
        return ERROR_OK;
 }
 
-int server_quit()
+int server_quit(void)
 {
        remove_services();