p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed RPP precendence bug in rospack and rosstack, #2854.

This commit is contained in:
Brian Gerkey 2010-07-02 22:44:07 +00:00
parent d3b4a1e8fe
commit bd78b542d2
4 changed files with 98 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/rospack/include/rospack/rospack.h
View File

@ -308,6 +308,8 @@ private:
bool cache_lock_failed;
bool crawled;
std::string getCachePath();
// Add package, filtering out duplicates.
Package* add_package(std::string path);
/** tests if the cache exists, is new enough, and is valid */
bool cache_is_good();
/** returns a double representing the seconds since the Epoch */

2
tools/rospack/include/rospack/rosstack.h
View File

@ -134,6 +134,8 @@ private:
/** tests if the cache exists, is new enough, and is valid */
void createROSHomeDirectory();
std::string getCachePath();
// Add stack, filtering out duplicates.
Stack* add_stack(std::string path);
bool cache_is_good();
/** returns a double representing the seconds since the Epoch */
static double time_since_epoch();

70
tools/rospack/rospack.cpp
View File

@ -772,8 +772,9 @@ int ROSPack::cmd_depends_on(bool include_indirect)
{
fprintf(stderr, "[rospack] warning: package %s doesn't exist\n",
opt_package.c_str());
p = new Package(opt_package);
Package::pkgs.push_back(p);
//p = new Package(opt_package);
//Package::pkgs.push_back(p);
p = add_package(opt_package);
}
assert(p);
const VecPkg descendants = include_indirect ? p->descendants()
@ -1523,6 +1524,33 @@ double ROSPack::time_since_epoch()
return tod.tv_sec + 1e-6 * tod.tv_usec;
}
// Add package, filtering out duplicates.
Package* ROSPack::add_package(string path)
{
// Filter out duplicates; first encountered takes precedence
Package* newp = new Package(path);
Package* return_p = newp;
// TODO: make this check more efficient
bool dup = false;
for(std::vector<Package *>::const_iterator it = Package::pkgs.begin();
it != Package::pkgs.end();
it++)
{
if((*it)->name == newp->name)
{
dup=true;
return_p = *it;
break;
}
}
if(dup)
delete newp;
else
Package::pkgs.push_back(newp);
return return_p;
}
void ROSPack::crawl_for_packages(bool force_crawl)
{
for (VecPkg::iterator p = Package::pkgs.begin();
@ -1549,7 +1577,8 @@ void ROSPack::crawl_for_packages(bool force_crawl)
char *newline_pos = strchr(linebuf, '\n');
if (newline_pos)
*newline_pos = 0;
Package::pkgs.push_back(new Package(linebuf));
//Package::pkgs.push_back(new Package(linebuf));
add_package(linebuf);
}
fclose(cache);
return; // cache load went OK; we're done here.
@ -1571,14 +1600,11 @@ void ROSPack::crawl_for_packages(bool force_crawl)
{
if(!i->size())
continue;
// Check whether this part of ROS_PACKAGE_PATH is itself a package
if (Package::is_package(*i))
Package::pkgs.push_back(new Package(*i));
else if (Package::is_no_subdirs(*i))
fprintf(stderr, "[rospack] WARNING: non-package directory in "
"ROS_PACKAGE_PATH marked rospack_nosubdirs:\n\t%s\n",
"ROS_PACKAGE_PATH marked rospack_nosubdirs:\n\t%s\n",
i->c_str());
else
else
q.push_back(CrawlQueueEntry(*i));
}
}
@ -1589,6 +1615,15 @@ void ROSPack::crawl_for_packages(bool force_crawl)
{
CrawlQueueEntry cqe = q.front();
q.pop_front();
// Check whether this part of ROS_PACKAGE_PATH is itself a package
if (Package::is_package(cqe.path))
{
//Package::pkgs.push_back(new Package(*i));
add_package(cqe.path);
continue;
}
//printf("crawling %s\n", cqe.path.c_str());
if (opt_profile_length != 0)
{
@ -1642,24 +1677,7 @@ void ROSPack::crawl_for_packages(bool force_crawl)
if (Package::is_package(child_path))
{
total_num_pkgs++;
// Filter out duplicates; first encountered takes precedence
Package* newp = new Package(child_path);
// TODO: make this check more efficient
bool dup = false;
for(std::vector<Package *>::const_iterator it = Package::pkgs.begin();
it != Package::pkgs.end();
it++)
{
if((*it)->name == newp->name)
{
dup=true;
break;
}
}
if(dup)
delete newp;
else
Package::pkgs.push_back(newp);
add_package(child_path);
}
//check to make sure we're allowed to descend
else if (!Package::is_no_subdirs(child_path))

60
tools/rospack/rosstack.cpp
View File

@ -449,8 +449,9 @@ int ROSStack::cmd_depends_on(bool include_indirect)
{
fprintf(stderr, "[rosstack] warning: stack %s doesn't exist\n",
g_stack.c_str());
s = new Stack(g_stack);
Stack::stacks.push_back(s);
//s = new Stack(g_stack);
//Stack::stacks.push_back(s);
s = add_stack(g_stack);
}
assert(s);
const VecStack descendants = include_indirect ? s->descendants()
@ -830,6 +831,33 @@ double ROSStack::time_since_epoch()
return tod.tv_sec + 1e-6 * tod.tv_usec;
}
// Add stack, filtering out duplicates.
Stack* ROSStack::add_stack(string path)
{
// Filter out duplicates; first encountered takes precedence
Stack* newp = new Stack(path);
Stack* return_p = newp;
// TODO: make this check more efficient
bool dup = false;
for(std::vector<Stack *>::const_iterator it = Stack::stacks.begin();
it != Stack::stacks.end();
it++)
{
if((*it)->name == newp->name)
{
dup=true;
return_p = *it;
break;
}
}
if(dup)
delete newp;
else
Stack::stacks.push_back(newp);
return return_p;
}
void ROSStack::crawl_for_stacks(bool force_crawl)
{
for (VecStack::iterator p = Stack::stacks.begin();
@ -857,7 +885,8 @@ void ROSStack::crawl_for_stacks(bool force_crawl)
char *newline_pos = strchr(linebuf, '\n');
if (newline_pos)
*newline_pos = 0;
Stack::stacks.push_back(new Stack(linebuf));
//Stack::stacks.push_back(new Stack(linebuf));
add_stack(linebuf);
}
fclose(cache);
return; // cache load went OK; we're done here.
@ -878,7 +907,9 @@ void ROSStack::crawl_for_stacks(bool force_crawl)
fprintf(stderr, "[rosstack] ERROR: ROS_ROOT not set.\n");
exit(1);
}
Stack::stacks.push_back(new Stack(string(rr))); // add the ROS stack
// Add the ROS stack
//Stack::stacks.push_back(new Stack(string(rr)));
add_stack(string(rr));
string rsp;
char *rpp = getenv("ROS_PACKAGE_PATH");
if (rpp)
@ -891,12 +922,7 @@ void ROSStack::crawl_for_stacks(bool force_crawl)
for (vector<string>::iterator i = rspvec.begin(); i != rspvec.end(); ++i)
{
// Check whether this part of ROS_PACKAGE_PATH is itself a package/stack
if (Stack::is_stack(*i))
Stack::stacks.push_back(new Stack(*i));
else if (Stack::is_package(*i))
continue; // ignore it.
else if (Stack::is_no_subdirs(*i))
if (Stack::is_no_subdirs(*i))
fprintf(stderr, "[rosstack] WARNING: non-stack directory in "
"ROS_PACKAGE_PATH marked "
"rosstack_nosubdirs:\n\t%s\n",
@ -911,6 +937,17 @@ void ROSStack::crawl_for_stacks(bool force_crawl)
{
CrawlQueueEntry cqe = q.front();
q.pop_front();
// Check whether this part of ROS_PACKAGE_PATH is itself a package/stack
if (Stack::is_stack(cqe.path))
{
//Stack::stacks.push_back(new Stack(*i));
add_stack(cqe.path);
continue;
}
else if (Stack::is_package(cqe.path))
continue; // ignore it.
//printf("crawling %s\n", cqe.path.c_str());
if (g_profile_length > 0)
{
@ -949,6 +986,8 @@ void ROSStack::crawl_for_stacks(bool force_crawl)
continue; // ignore this guy, he's a leaf.
if (Stack::is_stack(child_path))
{
add_stack(child_path);
/*
// Filter out duplicates; first encountered takes precedence
Stack *newp = new Stack(child_path);
//printf("found stack %s\n", child_path.c_str());
@ -968,6 +1007,7 @@ void ROSStack::crawl_for_stacks(bool force_crawl)
delete newp;
else
Stack::stacks.push_back(newp);
*/
}
//check to make sure we're allowed to descend
else if (!Stack::is_no_subdirs(child_path))