[gentoo-commits] gentoo-alt r1629 - trunk/aix-miscutils/ldd

[Michael Haubenwallner (haubi)]

Author: haubi
Date: 2008-05-06 17:07:58 +0000 (Tue, 06 May 2008)
New Revision: 1629

Modified:
   trunk/aix-miscutils/ldd/Object.h
   trunk/aix-miscutils/ldd/ObjectKey.h
   trunk/aix-miscutils/ldd/ObjectReader.cc
   trunk/aix-miscutils/ldd/ObjectReader.h
   trunk/aix-miscutils/ldd/aixdll-query.cc
   trunk/aix-miscutils/ldd/ldd.cc
Log:
added cache for nonexistent/broken files (performance factor 10).
various minor fixes.

Modified: trunk/aix-miscutils/ldd/Object.h
===================================================================
--- trunk/aix-miscutils/ldd/Object.h	2008-05-06 13:57:29 UTC (rev 1628)
+++ trunk/aix-miscutils/ldd/Object.h	2008-05-06 17:07:58 UTC (rev 1629)
@@ -64,7 +64,7 @@
 	) : key_(key)
 	  , flags_()
 	  , format_(format)
-	  , resolved_("not found")
+	  , resolved_()
 	{
 		std::string::const_iterator start = flags.begin();
 		std::string::const_iterator end = start;

Modified: trunk/aix-miscutils/ldd/ObjectKey.h
===================================================================
--- trunk/aix-miscutils/ldd/ObjectKey.h	2008-05-06 13:57:29 UTC (rev 1628)
+++ trunk/aix-miscutils/ldd/ObjectKey.h	2008-05-06 17:07:58 UTC (rev 1629)
@@ -17,7 +17,13 @@
 public:
 	~ObjectPath() {}
 
-	ObjectPath(std::string const& path) : std::string(path) {}
+	ObjectPath(std::string const& path)
+		: std::string(path)
+	{
+		if (length() > 0 && operator[](length() - 1) != '/') {
+			append("/");
+		}
+	}
 
 	std::string const& asIdentifier() const { return *this; }
 	std::string const& string() const { return *this; }

Modified: trunk/aix-miscutils/ldd/ObjectReader.cc
===================================================================
--- trunk/aix-miscutils/ldd/ObjectReader.cc	2008-05-06 13:57:29 UTC (rev 1628)
+++ trunk/aix-miscutils/ldd/ObjectReader.cc	2008-05-06 17:07:58 UTC (rev 1629)
@@ -63,15 +63,28 @@
 
 class ObjectReader::Dumper {
 public:
-	Dumper(FILE* file)
-		: file_(file)
-	{}
+	Dumper() : file_(0) {}
 
 	~Dumper()
 	{
+		close();
+	}
+
+	bool open(std::string const& filename)
+	{
+		std::string dumpcommand = "/usr/bin/dump -Hov -X32_64 '";
+		dumpcommand += filename;
+		dumpcommand += "' 2>/dev/null";
+		file_ = popen(dumpcommand.c_str(), "r");
+		return file_ ? true : false;
+	}
+
+	int close()
+	{
 		if (file_) {
-			pclose(file_);
+			return pclose(file_);
 		}
+		return -1;
 	}
 
 	FILE* file() { return file_; }
@@ -206,13 +219,17 @@
 		return rv;
 	}
 
-	std::string dumpcommand = "/usr/bin/dump -Hov -X32_64 '";
-	dumpcommand += filePath;
-	dumpcommand += base;
-	dumpcommand += "' 2>/dev/null";
+	if (brokenFilesCache_.find(filePath + base) != brokenFilesCache_.end()) {
+		return 0;
+	}
 
-	Dumper dumper(popen(dumpcommand.c_str(), "r"));
+	Dumper dumper;
 
+	if (! dumper.open(filePath + base)) {
+		brokenFilesCache_[filePath + base] = true;
+		return 0;
+	}
+
 	std::string line;
 
 	enum { NoSection, ImportFileStrings, ObjectModuleHeader } section = NoSection;
@@ -322,6 +339,10 @@
 		}
 	}
 
+	if (dumper.close() != 0 && rv == 0) {
+		brokenFilesCache_[filePath + base] = true;
+	}
+
 	return rv;
 }
 

Modified: trunk/aix-miscutils/ldd/ObjectReader.h
===================================================================
--- trunk/aix-miscutils/ldd/ObjectReader.h	2008-05-06 13:57:29 UTC (rev 1628)
+++ trunk/aix-miscutils/ldd/ObjectReader.h	2008-05-06 17:07:58 UTC (rev 1629)
@@ -30,6 +30,7 @@
 	void parseRunpathDeplibs(Dumper *dumper, SharedObjectPtr &object) const;
 
 	std::map<std::string, ObjectPtr> objectCache_;
+	std::map<std::string, bool> brokenFilesCache_;
 
 	typedef std::vector<std::string> LibraryMemberNameContainer;
 	typedef std::map<std::string, LibraryMemberNameContainer> LibraryMemberCache;

Modified: trunk/aix-miscutils/ldd/aixdll-query.cc
===================================================================
--- trunk/aix-miscutils/ldd/aixdll-query.cc	2008-05-06 13:57:29 UTC (rev 1628)
+++ trunk/aix-miscutils/ldd/aixdll-query.cc	2008-05-06 17:07:58 UTC (rev 1629)
@@ -29,12 +29,13 @@
 	  ; o != objects.end()
 	  ; o++
 	) {
-		if (questions.find("FILE") != questions.end()) std::cout
-			<< " FILE='"
-				<< (*o)->key()->path()->asIdentifier()
-				<< (*o)->key()->name()->base()
-			<< "';"
-		;
+		if (questions.find("FILE") != questions.end()) {
+				std::cout << " FILE='";
+				if ((*o)->key()->path()) {
+					std::cout << (*o)->key()->path()->asIdentifier();
+				}
+				std::cout << (*o)->key()->name()->base() << "';";
+		}
 		if (questions.find("MEMBER") != questions.end()) std::cout
 			<< " MEMBER='"
 				<< (*o)->key()->name()->member()

Modified: trunk/aix-miscutils/ldd/ldd.cc
===================================================================
--- trunk/aix-miscutils/ldd/ldd.cc	2008-05-06 13:57:29 UTC (rev 1628)
+++ trunk/aix-miscutils/ldd/ldd.cc	2008-05-06 17:07:58 UTC (rev 1629)
@@ -138,10 +138,21 @@
 	  ; r != resolved.end()
 	  ; r++
 	) {
-		std::cout << "	" << (*r)->key()->asIdentifier()
-			<< " => "
-			<< (*r)->getResolved()
-			<< std::endl;
+		std::cout << "	"; // tab
+		if ((*r)->getResolved().length() == 0) {
+			std::cout
+				<< (*r)->key()->asIdentifier()
+				<< " => not found"
+			;
+		} else
+		if ((*r)->key()->path()) {
+			std::cout << (*r)->getResolved();
+		} else {
+			std::cout
+				<< (*r)->key()->asIdentifier()
+				<< " => " << (*r)->getResolved();
+		}
+		std::cout << std::endl;
 	}
 }
 

-- 
gentoo-commits@l.g.o mailing list