// dirsearch.cc -- directory searching for gold
-// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
// Written by Ian Lance Taylor <iant@google.com>.
// This file is part of gold.
namespace gold
{
+// Initialize.
+
void
Dirsearch::initialize(Workqueue* workqueue,
const General_options::Dir_list* directories)
gold_assert(caches == NULL);
caches = new Dir_caches;
this->directories_ = directories;
+ this->token_.add_blockers(directories->size());
for (General_options::Dir_list::const_iterator p = directories->begin();
p != directories->end();
++p)
- {
- this->token_.add_blocker();
- workqueue->queue(new Dir_cache_task(p->name().c_str(), this->token_));
- }
+ workqueue->queue(new Dir_cache_task(p->name().c_str(), this->token_));
}
-// NOTE: we only log failed file-lookup attempts here. Successfully
-// lookups will eventually get logged in File_read::open.
+// Search for a file. NOTE: we only log failed file-lookup attempts
+// here. Successfully lookups will eventually get logged in
+// File_read::open.
std::string
Dirsearch::find(const std::string& n1, const std::string& n2,
- bool *is_in_sysroot) const
+ bool* is_in_sysroot, int* pindex) const
{
gold_assert(!this->token_.is_blocked());
+ gold_assert(*pindex >= 0);
- for (General_options::Dir_list::const_iterator p =
- this->directories_->begin();
- p != this->directories_->end();
- ++p)
+ for (unsigned int i = static_cast<unsigned int>(*pindex);
+ i < this->directories_->size();
+ ++i)
{
+ const Search_directory* p = &this->directories_->at(i);
Dir_cache* pdc = caches->lookup(p->name().c_str());
gold_assert(pdc != NULL);
if (pdc->find(n1))
{
*is_in_sysroot = p->is_in_sysroot();
+ *pindex = i;
return p->name() + '/' + n1;
}
else
if (pdc->find(n2))
{
*is_in_sysroot = p->is_in_sysroot();
+ *pindex = i;
return p->name() + '/' + n2;
}
else
}
}
+ *pindex = -2;
return std::string();
}