diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-03-10 19:10:29 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-03-28 05:28:58 +0100 |
| commit | f99a759ce7cb5492442c018f976619f0ba439a43 (patch) | |
| tree | 3990213bd1fd6f2e1a87c198e9abbf6d78d67b95 /ctdb/server/ctdb_lock.c | |
| parent | d1c8f8d63506c099e2ee9be7cb91f0fac4a8d848 (diff) | |
| download | samba-f99a759ce7cb5492442c018f976619f0ba439a43.tar.gz samba-f99a759ce7cb5492442c018f976619f0ba439a43.tar.xz samba-f99a759ce7cb5492442c018f976619f0ba439a43.zip | |
ctdb-locking: Instead of comparing key, compare key hash
This replaces memory comparison of the key with integer comparison.
In addition, this also avoids scheduling locks with the same hash.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Mar 28 05:28:58 CET 2014 on sn-devel-104
Diffstat (limited to 'ctdb/server/ctdb_lock.c')
| -rw-r--r-- | ctdb/server/ctdb_lock.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c index 9d3b7c1003..339a9d25c0 100644 --- a/ctdb/server/ctdb_lock.c +++ b/ctdb/server/ctdb_lock.c @@ -79,6 +79,7 @@ struct lock_context { pid_t block_child; int block_fd[2]; struct timeval start_time; + uint32_t key_hash; }; /* lock_request is the client specific part for a lock request */ @@ -672,7 +673,8 @@ static struct lock_context *find_lock_context(struct lock_context *lock_list, struct ctdb_db_context *ctdb_db, TDB_DATA key, uint32_t priority, - enum lock_type type) + enum lock_type type, + uint32_t key_hash) { struct lock_context *lock_ctx; @@ -685,8 +687,7 @@ static struct lock_context *find_lock_context(struct lock_context *lock_list, switch (lock_ctx->type) { case LOCK_RECORD: if (ctdb_db == lock_ctx->ctdb_db && - key.dsize == lock_ctx->key.dsize && - memcmp(key.dptr, lock_ctx->key.dptr, key.dsize) == 0) { + key_hash == lock_ctx->key_hash) { goto done; } break; @@ -763,7 +764,7 @@ static void ctdb_lock_schedule(struct ctdb_context *ctdb) } else { active_ctx = find_lock_context(ctdb->lock_current, lock_ctx->ctdb_db, lock_ctx->key, lock_ctx->priority, - lock_ctx->type); + lock_ctx->type, lock_ctx->key_hash); if (active_ctx == NULL) { if (lock_ctx->ctdb_db == NULL || lock_ctx->ctdb_db->lock_num_current < MAX_LOCK_PROCESSES_PER_DB) { @@ -932,6 +933,7 @@ static struct lock_request *ctdb_lock_internal(struct ctdb_context *ctdb, talloc_free(lock_ctx); return NULL; } + lock_ctx->key_hash = ctdb_hash(&key); } else { lock_ctx->key.dptr = NULL; } |