Skip to content

Commit c307e18

Browse files
authored
Revert "Fix a thread race issue (#224)" (#225)
This reverts commit 1c78dab.
1 parent 1c78dab commit c307e18

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ perlmutter-cache-build:
108108
- module list
109109
- mkdir -p ${PDC_BUILD_PATH}/perlmutter/cache
110110
- cd ${PDC_BUILD_PATH}/perlmutter/cache
111-
- cmake ../../.. -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DPDC_SERVER_CACHE=ON -DBUILD_TESTING=ON -DPDC_SERVER_CACHE_MAX_GB=1 -DCMAKE_INSTALL_PREFIX=$PDC_DIR -DPDC_ENABLE_MPI=ON -DMERCURY_DIR=$MERCURY_DIR -DCMAKE_C_COMPILER=cc -DMPI_RUN_CMD="srun -A ${PDC_PROJECT} --qos=debug --constraint=cpu --tasks-per-node=64" -DCMAKE_INSTALL_PREFIX=${PDC_INSTALL_PATH}/perlmutter/cache
111+
- cmake ../../.. -DBUILD_MPI_TESTING=ON -DBUILD_SHARED_LIBS=ON -DPDC_SERVER_CACHE=ON -DBUILD_TESTING=ON -DCMAKE_INSTALL_PREFIX=$PDC_DIR -DPDC_ENABLE_MPI=ON -DMERCURY_DIR=$MERCURY_DIR -DCMAKE_C_COMPILER=cc -DMPI_RUN_CMD="srun -A ${PDC_PROJECT} --qos=debug --constraint=cpu --tasks-per-node=64" -DCMAKE_INSTALL_PREFIX=${PDC_INSTALL_PATH}/perlmutter/cache
112112
- make -j
113113
- make install
114114
artifacts:

src/server/pdc_server_region/pdc_server_region_cache.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -967,9 +967,8 @@ PDC_region_cache_clock_cycle(void *ptr)
967967
}
968968
}
969969
else {
970-
pthread_mutex_lock(&pdc_obj_cache_list_mutex);
971970
obj_cache_iter = obj_cache_iter->next;
972-
pthread_mutex_unlock(&pdc_obj_cache_list_mutex);
971+
/* pthread_mutex_unlock(&pdc_obj_cache_list_mutex); */
973972

974973
/* PDC_get_time_str(cur_time); */
975974
/* fprintf(stderr, "%s ==PDC_SERVER[%d]: stop flush to allow processing new RPCs\n", */

src/tests/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ if(BUILD_MPI_TESTING)
494494
add_test(NAME obj_put_data_mpi WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND mpi_test.sh ./obj_put_data ${MPI_RUN_CMD} 4 6 )
495495
add_test(NAME obj_get_data_mpi WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND mpi_test.sh ./obj_get_data ${MPI_RUN_CMD} 4 6 )
496496
add_test(NAME vpicio_bdcats_mpi WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND run_multiple_mpi_test.sh ${MPI_RUN_CMD} 4 6 ./vpicio ./bdcats)
497-
add_test(NAME vpicio_mpi_small_cache WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND mpi_test.sh ./vpicio ${MPI_RUN_CMD} 1 16)
498497

499498
set_tests_properties(read_obj_shared_int PROPERTIES LABELS "parallel;parallel_obj" )
500499
set_tests_properties(read_obj_shared_float PROPERTIES LABELS "parallel;parallel_obj" )
@@ -523,7 +522,6 @@ if(BUILD_MPI_TESTING)
523522
# set_tests_properties(region_transfer_3D_skewed_mpi PROPERTIES LABELS "parallel;parallel_region_transfer" )
524523
set_tests_properties(region_transfer_write_read_mpi PROPERTIES LABELS "parallel;parallel_region_transfer" )
525524
set_tests_properties(vpicio_bdcats_mpi PROPERTIES LABELS "parallel;parallel_region_transfer" )
526-
set_tests_properties(vpicio_mpi_small_cache PROPERTIES LABELS "parallel;parallel_region_transfer" )
527525
set_tests_properties(region_transfer_all_mpi PROPERTIES LABELS "parallel;parallel_region_transfer_all" )
528526
set_tests_properties(region_transfer_all_2D_mpi PROPERTIES LABELS "parallel;parallel_region_transfer_all" )
529527
set_tests_properties(region_transfer_all_3D_mpi PROPERTIES LABELS "parallel;parallel_region_transfer_all" )

0 commit comments

Comments
 (0)