pnx/dlight
Archived
1
0
Fork 0
Code Activity

lockfile: expose locked()

Browse source 
usefull to have this macro in the interface so other modules using lockfiles
can check if a certain lock is active.
This commit is contained in:
Henrik Hautakoski 2011-09-24 13:03:22 +02:00
parent 2f9e968717
commit 611409c777
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lockfile.c
View file

@ -30,8 +30,6 @@
#include "error.h" #include "error.h"
#include "lockfile.h" #include "lockfile.h"
#define locked(x) ((x)->fd >= 0)
static struct lockfile *active_locks; static struct lockfile *active_locks;
static void release_all_locks() { static void release_all_locks() {
@ -101,7 +99,7 @@ int hold_lock(struct lockfile *lock, const char *filename, int force) {
init(); init();
if (locked(lock)) if (is_locked(lock))
return -1; return -1;
if (!force) if (!force)
@ -127,7 +125,7 @@ int commit_lock(struct lockfile *lock) {
char target[4096]; char target[4096];
int len; int len;
if (!locked(lock)) if (!is_locked(lock))
return 0; return 0;
len = strlen(lock->name) - 5; /* .lock */ len = strlen(lock->name) - 5; /* .lock */
@ -148,7 +146,7 @@ int release_lock(struct lockfile *lock) {
int rc; int rc;
if (!locked(lock)) if (!is_locked(lock))
return 0; return 0;
rc = unlink(lock->name); rc = unlink(lock->name);
if (rc == 0) { if (rc == 0) {

2
lockfile.h
View file

@ -31,6 +31,8 @@ struct lockfile {
#define LOCKFILE_INIT { 0, -1, { 0 } } #define LOCKFILE_INIT { 0, -1, { 0 } }
#define is_locked(x) ((x)->fd >= 0)
int hold_lock(struct lockfile *lock, const char *filename, int force); int hold_lock(struct lockfile *lock, const char *filename, int force);
int commit_lock(struct lockfile *lock); int commit_lock(struct lockfile *lock);