summaryrefslogtreecommitdiffstats
path: root/src/server/locks.c
diff options
context:
space:
mode:
authorSimon Rettberg2015-02-22 15:26:21 +0100
committerSimon Rettberg2015-02-22 15:26:21 +0100
commit7dfeb1c1963596edd36193ede5ce8f82c2bf76a5 (patch)
treefea6055a7a6eb7d620782de2786efd6aa91f3cb5 /src/server/locks.c
parent[SERVER] Fix bug where checking if a request is cached would yield a false ne... (diff)
downloaddnbd3-7dfeb1c1963596edd36193ede5ce8f82c2bf76a5.tar.gz
dnbd3-7dfeb1c1963596edd36193ede5ce8f82c2bf76a5.tar.xz
dnbd3-7dfeb1c1963596edd36193ede5ce8f82c2bf76a5.zip
Get rid of unneccessary volatile
Some minor debugging code, mostly commented out
Diffstat (limited to 'src/server/locks.c')
-rw-r--r--src/server/locks.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/locks.c b/src/server/locks.c
index cf35986..de37734 100644
--- a/src/server/locks.c
+++ b/src/server/locks.c
@@ -25,8 +25,8 @@
typedef struct
{
void *lock;
- volatile time_t locktime;
- volatile char locked;
+ time_t locktime;
+ char locked;
pthread_t thread;
int lockId;
char name[LOCKLEN];
@@ -48,7 +48,7 @@ static debug_lock_t locks[MAXLOCKS];
static debug_thread_t threads[MAXTHREADS];
static int init_done = 0;
static pthread_spinlock_t initdestory;
-static volatile int lockId = 0;
+static int lockId = 0;
static pthread_t watchdog = 0;
static int watchdogSignal = -1;