From 256f2c6f983ec346c00addfb3d8c6f5b8622f330 Mon Sep 17 00:00:00 2001 From: erdgeist <> Date: Sat, 6 Dec 2008 00:41:12 +0000 Subject: [PATCH] Make mutex_lock_bucket_by_hash generic to any OT_BUCKET_COUNT --- ot_mutex.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ot_mutex.c b/ot_mutex.c index b6da4be..2300f5c 100644 --- a/ot_mutex.c +++ b/ot_mutex.c @@ -13,6 +13,7 @@ /* Libowfat */ #include "byte.h" #include "io.h" +#include "uint32.h" /* Opentracker */ #include "trackerlogic.h" @@ -79,12 +80,10 @@ ot_vector *mutex_bucket_lock( int bucket ) { } ot_vector *mutex_bucket_lock_by_hash( ot_hash *hash ) { - unsigned char *local_hash = hash[0]; - int bucket = ( local_hash[0] << 2 ) | ( local_hash[1] >> 6 ); + int bucket = uint32_read( *hash ) % OT_BUCKET_COUNT; /* Can block */ mutex_bucket_lock( bucket ); - return all_torrents + bucket; } @@ -96,9 +95,7 @@ void mutex_bucket_unlock( int bucket ) { } void mutex_bucket_unlock_by_hash( ot_hash *hash ) { - unsigned char *local_hash = hash[0]; - int bucket = ( local_hash[0] << 2 ) | ( local_hash[1] >> 6 ); - mutex_bucket_unlock( bucket ); + mutex_bucket_unlock( uint32_read( *hash ) % OT_BUCKET_COUNT ); } /* TaskQueue Magic */