summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2014-01-13 11:59:03 +0100
committerSimon Rettberg2014-01-13 11:59:03 +0100
commit7d1851a71dbbd3af8a38202687e61bfe63607db0 (patch)
tree56b73263c71952381ac151648da48ca67dbf69ce
parent[SERVER] Remove assertion that doesn't really check for an illegal state (diff)
downloaddnbd3-7d1851a71dbbd3af8a38202687e61bfe63607db0.tar.gz
dnbd3-7d1851a71dbbd3af8a38202687e61bfe63607db0.tar.xz
dnbd3-7d1851a71dbbd3af8a38202687e61bfe63607db0.zip
[SERVER] Don't wait forever on shutdown
-rw-r--r--src/server/server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/server.c b/src/server/server.c
index cf7e080..eef9fdc 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -140,6 +140,7 @@ void dnbd3_cleanup()
integrity_shutdown();
// Wait for clients to disconnect
+ int retries = 10;
do {
count = 0;
spin_lock( &_clients_lock );
@@ -152,7 +153,7 @@ void dnbd3_cleanup()
printf( "%d clients still active...\n", count );
sleep( 1 );
}
- } while ( count != 0 );
+ } while ( count != 0 && --retries > 0 );
_num_clients = 0;
// Clean up images