mirrors
/
faiss
mirror of https://github.com/facebookresearch/faiss.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix race condition in OnDiskInvertedlists. (#464)

pull/450/merge
Lucas Hosseini 2018-05-30 16:25:24 +02:00 committed by Matthijs Douze
parent 28e9f74511
commit dcd83f95b9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OnDiskInvertedLists.cpp
View File

@ -164,6 +164,7 @@ struct OnDiskInvertedLists::OngoingPrefetch {
static void* prefetch_list (void * arg) { static void* prefetch_list (void * arg) {
Thread *th = static_cast<Thread*>(arg); Thread *th = static_cast<Thread*>(arg);
th->od->locks->lock_1(th->list_no);
size_t n = th->od->list_size(th->list_no); size_t n = th->od->list_size(th->list_no);
const Index::idx_t *idx = th->od->get_ids(th->list_no); const Index::idx_t *idx = th->od->get_ids(th->list_no);
const uint8_t *codes = th->od->get_codes(th->list_no); const uint8_t *codes = th->od->get_codes(th->list_no);
@ -177,6 +178,7 @@ struct OnDiskInvertedLists::OngoingPrefetch {
for (size_t i = 0; i < n8;i++) { for (size_t i = 0; i < n8;i++) {
cs += codes8[i]; cs += codes8[i];
} }
th->od->locks->unlock_1(th->list_no);
global_cs += cs & 1; global_cs += cs & 1;
return nullptr; return nullptr;
} }
@ -241,7 +243,7 @@ void OnDiskInvertedLists::do_mmap ()
uint8_t * ptro = (uint8_t*)mmap (nullptr, totsize, uint8_t * ptro = (uint8_t*)mmap (nullptr, totsize,
prot, MAP_SHARED, fileno (f), 0); prot, MAP_SHARED, fileno (f), 0);
FAISS_THROW_IF_NOT_FMT (ptro != MAP_FAILED, FAISS_THROW_IF_NOT_FMT (ptro != MAP_FAILED,
"could not mmap %s: %s", "could not mmap %s: %s",
filename.c_str(), filename.c_str(),
@ -335,8 +337,8 @@ OnDiskInvertedLists::OnDiskInvertedLists (
OnDiskInvertedLists::OnDiskInvertedLists (): OnDiskInvertedLists::OnDiskInvertedLists ():
InvertedLists (0, 0), InvertedLists (0, 0),
totsize (0), totsize (0),
ptr (nullptr), ptr (nullptr),
read_only (false), read_only (false),
locks (new LockLevels ()), locks (new LockLevels ()),
pf (new OngoingPrefetch (this)) pf (new OngoingPrefetch (this))