Rename member for prefetch list.

xrootd · Jun 30, 2016 · 626c6e3 · 626c6e3
1 parent f7e32ce
commit 626c6e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/XrdFileCache/XrdFileCache.cc b/src/XrdFileCache/XrdFileCache.cc
@@ -291,7 +291,7 @@ Cache::RegisterPrefetchFile(File* file)
 
       XrdCl::DefaultEnv::GetLog()->Dump(XrdCl::AppMsg, "Cache::Register new file BEGIN");
       m_prefetch_condVar.Lock();
-      m_files.push_back(file);
+      m_prefetchList.push_back(file);
       m_prefetch_condVar.Signal();
       m_prefetch_condVar.UnLock();
       XrdCl::DefaultEnv::GetLog()->Dump(XrdCl::AppMsg, "Cache::Register new file End");
@@ -306,9 +306,9 @@ Cache::DeRegisterPrefetchFile(File* file)
    //  called from last line File::InitiateClose()
 
    m_prefetch_condVar.Lock();
-   for (FileList::iterator it = m_files.begin(); it != m_files.end(); ++it) {
+   for (FileList::iterator it = m_prefetchList.begin(); it != m_prefetchList.end(); ++it) {
       if (*it == file) {
-         m_files.erase(it);
+         m_prefetchList.erase(it);
          break;
       }
    }
@@ -321,15 +321,15 @@ File*
 Cache::GetNextFileToPrefetch()
 {
    m_prefetch_condVar.Lock();
-   if (m_files.empty()) {
+   if (m_prefetchList.empty()) {
       m_prefetch_condVar.Wait();
    }
 
-   //  std::sort(m_files.begin(), m_files.end(), myobject);
+   //  std::sort(m_prefetchList.begin(), m_prefetchList.end(), myobject);
 
-   size_t l = m_files.size();
+   size_t l = m_prefetchList.size();
    int idx = rand() % l;
-   File* f = m_files[idx];
+   File* f = m_prefetchList[idx];
    f->MarkPrefetch();
    m_prefetch_condVar.UnLock();
    return f;

diff --git a/src/XrdFileCache/XrdFileCache.hh b/src/XrdFileCache/XrdFileCache.hh
@@ -223,8 +223,8 @@ namespace XrdFileCache
          WriteQ s_writeQ;
 
        // prefetching
-       typedef std::vector<File*>  FileList;
-       FileList  m_files;
+       typedef std::vector<File*>  PrefetchList;
+       PrefetchList  m_prefetchList;
    };
 
 }