tdb2: more stats

[ccan] / ccan / tdb2 / lock.c

diff --git a/ccan/tdb2/lock.c b/ccan/tdb2/lock.c
index 4033d0afe813e59bf4dee4b8bcc9e5d34757c298..666aa09038a731d2f8c0b36d605c08c8d5409235 100644 (file)
--- a/ccan/tdb2/lock.c
+++ b/ccan/tdb2/lock.c
@@ -37,7 +37,7 @@ static enum TDB_ERROR owner_conflict(struct tdb_context *tdb, const char *call)
                          call);
 }
 
-/* If we fork, we no longer really own locks: preserves errno */
+/* If we fork, we no longer really own locks. */
 static bool check_lock_pid(struct tdb_context *tdb,
                           const char *call, bool log)
 {
@@ -99,16 +99,21 @@ int tdb_fcntl_unlock(int fd, int rw, off_t off, off_t len, void *unused)
 static int lock(struct tdb_context *tdb,
                      int rw, off_t off, off_t len, bool waitflag)
 {
+       int ret;
        if (tdb->file->allrecord_lock.count == 0
            && tdb->file->num_lockrecs == 0) {
                tdb->file->locker = getpid();
        }
 
        tdb->stats.lock_lowlevel++;
-       if (!waitflag)
+       ret = tdb->lock_fn(tdb->file->fd, rw, off, len, waitflag,
+                          tdb->lock_data);
+       if (!waitflag) {
                tdb->stats.lock_nonblock++;
-       return tdb->lock_fn(tdb->file->fd, rw, off, len, waitflag,
-                           tdb->lock_data);
+               if (ret != 0)
+                       tdb->stats.lock_nonblock_fail++;
+       }
+       return ret;
 }
 
 static int unlock(struct tdb_context *tdb, int rw, off_t off, off_t len)
@@ -224,16 +229,14 @@ static enum TDB_ERROR tdb_brlock(struct tdb_context *tdb,
 static enum TDB_ERROR tdb_brunlock(struct tdb_context *tdb,
                                   int rw_type, tdb_off_t offset, size_t len)
 {
-       int ret;
-
        if (tdb->flags & TDB_NOLOCK) {
                return TDB_SUCCESS;
        }
 
-       ret = unlock(tdb, rw_type, offset, len);
+       if (!check_lock_pid(tdb, "tdb_brunlock", true))
+               return TDB_ERR_LOCK;
 
-       /* If we fail, *then* we verify that we owned the lock.  If not, ok. */
-       if (ret == -1 && check_lock_pid(tdb, "tdb_brunlock", false)) {
+       if (unlock(tdb, rw_type, offset, len) == -1) {
                return tdb_logerr(tdb, TDB_ERR_LOCK, TDB_LOG_ERROR,
                                  "tdb_brunlock failed (fd=%d) at offset %zu"
                                  " rw_type=%d len=%zu: %s",
@@ -851,6 +854,10 @@ void tdb_lock_cleanup(struct tdb_context *tdb)
 {
        unsigned int i;
 
+       /* We don't want to warn: they're allowed to close tdb after fork. */
+       if (!check_lock_pid(tdb, "tdb_close", false))
+               return;
+
        while (tdb->file->allrecord_lock.count
               && tdb->file->allrecord_lock.owner == tdb) {
                tdb_allrecord_unlock(tdb, tdb->file->allrecord_lock.ltype);