- 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 21a8ebabaa1827e06f3356041cd713348e185981..ce0ee6cd231863a41fbbe973042d608a2860f4a3 100644 (file)
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -246,8 +246,8 @@ int remove_services()
        return ERROR_OK;
 }
 
-extern void lockBigLock();
-extern void unlockBigLock();
+extern void openocd_sleep_prelude();
+extern void openocd_sleep_postlude();
 
 int server_loop(command_context_t *command_context)
 {
@@ -266,13 +266,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;
@@ -316,10 +309,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)
                {
@@ -421,10 +415,6 @@ int server_loop(command_context_t *command_context)
                }
 #endif
        }
-       if (--lockCount==0)
-       {
-               unlockBigLock();
-       }
        
        return ERROR_OK;
 }