Skip to content

Commit

Permalink
Remove metadata mutex for multi threading
Browse files Browse the repository at this point in the history
  • Loading branch information
houjun committed Jun 27, 2024
1 parent 1b3b1da commit 67cc3b6
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions src/server/pdc_server_metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ PDC_Server_add_tag_metadata(metadata_add_tag_in_t *in, metadata_add_tag_out_t *o
#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
unlocked = 0;
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (metadata_hash_table_g != NULL) {
Expand Down Expand Up @@ -765,7 +765,7 @@ PDC_Server_add_tag_metadata(metadata_add_tag_in_t *in, metadata_add_tag_out_t *o

#ifdef ENABLE_MULTITHREAD
// ^ Release hash table lock
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
unlocked = 1;
#endif

Expand All @@ -790,7 +790,7 @@ PDC_Server_add_tag_metadata(metadata_add_tag_in_t *in, metadata_add_tag_out_t *o
done:
#ifdef ENABLE_MULTITHREAD
if (unlocked == 0)
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif
fflush(stdout);

Expand Down Expand Up @@ -829,7 +829,7 @@ PDC_Server_update_metadata(metadata_update_in_t *in, metadata_update_out_t *out)
#ifdef ENABLE_MULTITHREAD
int unlocked = 0;
// Obtain lock for hash table
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (metadata_hash_table_g != NULL) {
Expand Down Expand Up @@ -893,7 +893,7 @@ PDC_Server_update_metadata(metadata_update_in_t *in, metadata_update_out_t *out)

#ifdef ENABLE_MULTITHREAD
// ^ Release hash table lock
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
unlocked = 1;
#endif

Expand All @@ -917,8 +917,8 @@ PDC_Server_update_metadata(metadata_update_in_t *in, metadata_update_out_t *out)

done:
#ifdef ENABLE_MULTITHREAD
if (unlocked == 0)
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* if (unlocked == 0) */
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif
fflush(stdout);
FUNC_LEAVE(ret_value);
Expand Down Expand Up @@ -952,7 +952,7 @@ PDC_Server_delete_metadata_by_id(metadata_delete_by_id_in_t *in, metadata_delete
#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
int unlocked = 0;
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (container_hash_table_g != NULL) {
Expand Down Expand Up @@ -1026,7 +1026,7 @@ PDC_Server_delete_metadata_by_id(metadata_delete_by_id_in_t *in, metadata_delete
done:
#ifdef ENABLE_MULTITHREAD
// ^ Release hash table lock
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
unlocked = 1;
#endif

Expand Down Expand Up @@ -1058,8 +1058,8 @@ PDC_Server_delete_metadata_by_id(metadata_delete_by_id_in_t *in, metadata_delete
#endif

#ifdef ENABLE_MULTITHREAD
if (unlocked == 0)
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* if (unlocked == 0) */
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif

FUNC_LEAVE(ret_value);
Expand Down Expand Up @@ -1102,7 +1102,7 @@ PDC_delete_metadata_from_hash_table(metadata_delete_in_t *in, metadata_delete_ou
#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
int unlocked = 0;
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (metadata_hash_table_g != NULL) {
Expand Down Expand Up @@ -1155,7 +1155,7 @@ PDC_delete_metadata_from_hash_table(metadata_delete_in_t *in, metadata_delete_ou

#ifdef ENABLE_MULTITHREAD
// ^ Release hash table lock
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
unlocked = 1;
#endif

Expand Down Expand Up @@ -1187,8 +1187,8 @@ PDC_delete_metadata_from_hash_table(metadata_delete_in_t *in, metadata_delete_ou

done:
#ifdef ENABLE_MULTITHREAD
if (unlocked == 0)
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* if (unlocked == 0) */
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif

FUNC_LEAVE(ret_value);
Expand All @@ -1203,7 +1203,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out)
#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
int unlocked = 0;
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif
// DEBUG
int debug_flag = 0;
Expand Down Expand Up @@ -1268,7 +1268,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out)
#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
unlocked = 0;
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (debug_flag == 1)
Expand Down Expand Up @@ -1323,7 +1323,7 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out)

#ifdef ENABLE_MULTITHREAD
// ^ Release hash table lock
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
unlocked = 1;
#endif

Expand Down Expand Up @@ -1358,8 +1358,8 @@ PDC_insert_metadata_to_hash_table(gen_obj_id_in_t *in, gen_obj_id_out_t *out)

done:
#ifdef ENABLE_MULTITHREAD
if (unlocked == 0)
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* if (unlocked == 0) */
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif

FUNC_LEAVE(ret_value);
Expand Down Expand Up @@ -2912,7 +2912,7 @@ PDC_Server_add_kvtag(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t *out)
#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
unlocked = 0;
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (use_rocksdb_g == 1) {
Expand Down Expand Up @@ -2940,7 +2940,7 @@ PDC_Server_add_kvtag(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t *out)
done:
#ifdef ENABLE_MULTITHREAD
// ^ Release hash table lock
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
unlocked = 1;
#endif

Expand All @@ -2963,8 +2963,8 @@ PDC_Server_add_kvtag(metadata_add_kvtag_in_t *in, metadata_add_tag_out_t *out)
#endif

#ifdef ENABLE_MULTITHREAD
if (unlocked == 0)
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* if (unlocked == 0) */
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif
fflush(stdout);

Expand Down Expand Up @@ -3165,7 +3165,7 @@ PDC_Server_get_kvtag(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out_t *out)
#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
unlocked = 0;
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (use_rocksdb_g == 1) {
Expand Down Expand Up @@ -3194,7 +3194,7 @@ PDC_Server_get_kvtag(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out_t *out)
done:
#ifdef ENABLE_MULTITHREAD
// ^ Release hash table lock
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
unlocked = 1;
#endif

Expand All @@ -3217,8 +3217,8 @@ PDC_Server_get_kvtag(metadata_get_kvtag_in_t *in, metadata_get_kvtag_out_t *out)
#endif

#ifdef ENABLE_MULTITHREAD
if (unlocked == 0)
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* if (unlocked == 0) */
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif
fflush(stdout);

Expand Down Expand Up @@ -3366,7 +3366,7 @@ PDC_Server_del_kvtag(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t *out)

#ifdef ENABLE_MULTITHREAD
// Obtain lock for hash table
hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_lock(&pdc_metadata_hash_table_mutex_g); */
#endif

if (use_rocksdb_g) {
Expand All @@ -3393,7 +3393,7 @@ PDC_Server_del_kvtag(metadata_get_kvtag_in_t *in, metadata_add_tag_out_t *out)

done:
#ifdef ENABLE_MULTITHREAD
hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g);
/* hg_thread_mutex_unlock(&pdc_metadata_hash_table_mutex_g); */
#endif

#ifdef ENABLE_TIMING
Expand Down

0 comments on commit 67cc3b6

Please sign in to comment.