changeset 1:fbffc249990c

Rename

--- a/Makefile	Wed Apr 06 16:10:11 2016 +0100
+++ b/Makefile	Tue Apr 12 13:33:00 2016 +0100
@@ -1,9 +1,9 @@
 
 CXXFLAGS	:= -Wall -Werror 
 
-checker:	checker.o
+helper:	helper.o
 		$(CXX) -o $@ $< -ldl
 
 clean:
-		rm checker.o
+		rm helper.o
 

--- a/checker.cpp	Wed Apr 06 16:10:11 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-
-/**
- * Vamp Plugin Load Checker
- *
- * This program reads a list of Vamp plugin library paths from stdin,
- * one per line. For each path read, it attempts to load that library
- * and retrieve its descriptor function, printing a line to stdout
- * reporting whether this was successful or not and then flushing
- * stdout. The output line format is described below. The program
- * exits with code 0 if all libraries were loaded successfully and
- * non-zero otherwise.
- *
- * Note that library paths must be ready to pass to dlopen() or
- * equivalent; this usually means they should be absolute paths.
- *
- * Output line for successful load of library libname.so:
- * SUCCESS|/path/to/libname.so|
- * 
- * Output line for failed load of library libname.so:
- * FAILURE|/path/to/libname.so|Reason for failure if available
- *
- * Note that sometimes plugins will crash completely on load, bringing
- * down this program with them. If the program exits before all listed
- * plugins have been checked, this means that the plugin following the
- * last reported one has crashed. Typically the caller may want to run
- * it again, omitting that plugin.
- */
-
-#ifdef _WIN32
-#include <windows.h>
-#include <process.h>
-#define DLOPEN(a,b)  LoadLibrary((a).toStdWString().c_str())
-#define DLSYM(a,b)   GetProcAddress((HINSTANCE)(a),(b))
-#define DLCLOSE(a)   (!FreeLibrary((HINSTANCE)(a)))
-#define DLERROR()    ""
-#else
-#include <dlfcn.h>
-#define DLOPEN(a,b)  dlopen((a).c_str(),(b))
-#define DLSYM(a,b)   dlsym((a),(b).c_str())
-#define DLCLOSE(a)   dlclose((a))
-#define DLERROR()    dlerror()
-#endif
-
-#include <string>
-#include <iostream>
-
-using namespace std;
-
-string error()
-{
-    string e = dlerror();
-    if (e == "") return "(unknown error)";
-    else return e;
-}
-
-string check(string soname)
-{
-    void *handle = DLOPEN(soname, RTLD_NOW | RTLD_LOCAL);
-    if (!handle) {
-	return "Unable to open plugin library: " + error();
-    }
-
-    string descriptor = "vampGetPluginDescriptor"; //!!! todo: make an arg
-    void *fn = DLSYM(handle, descriptor);
-    if (!fn) {
-	return "Failed to find plugin descriptor " + descriptor +
-	    " in library: " + error();
-    }
-
-    return "";
-}
-
-int main(int argc, char **argv)
-{
-    bool allGood = true;
-    string soname;
-
-    while (getline(cin, soname)) {
-	string report = check(soname);
-	if (report != "") {
-	    cout << "FAILURE|" << soname << "|" << report << endl;
-	    allGood = false;
-	} else {
-	    cout << "SUCCESS|" << soname << "|" << endl;
-	}
-    }
-
-    return allGood ? 0 : 1;
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/helper.cpp	Tue Apr 12 13:33:00 2016 +0100
@@ -0,0 +1,99 @@
+
+/**
+ * Plugin Load Checker Helper
+ *
+ * This program accepts the name of a descriptor function as its only
+ * command-line argument. It then reads a list of plugin library paths
+ * from stdin, one per line. For each path read, it attempts to load
+ * that library and retrieve the named descriptor function, printing a
+ * line to stdout reporting whether this was successful or not and
+ * then flushing stdout. The output line format is described
+ * below. The program exits with code 0 if all libraries were loaded
+ * successfully and non-zero otherwise.
+ *
+ * Note that library paths must be ready to pass to dlopen() or
+ * equivalent; this usually means they should be absolute paths.
+ *
+ * Output line for successful load of library libname.so:
+ * SUCCESS|/path/to/libname.so|
+ * 
+ * Output line for failed load of library libname.so:
+ * FAILURE|/path/to/libname.so|Reason for failure if available
+ *
+ * Note that sometimes plugins will crash completely on load, bringing
+ * down this program with them. If the program exits before all listed
+ * plugins have been checked, this means that the plugin following the
+ * last reported one has crashed. Typically the caller may want to run
+ * it again, omitting that plugin.
+ */
+
+#ifdef _WIN32
+#include <windows.h>
+#include <process.h>
+#define DLOPEN(a,b)  LoadLibrary((a).toStdWString().c_str())
+#define DLSYM(a,b)   GetProcAddress((HINSTANCE)(a),(b))
+#define DLCLOSE(a)   (!FreeLibrary((HINSTANCE)(a)))
+#define DLERROR()    ""
+#else
+#include <dlfcn.h>
+#define DLOPEN(a,b)  dlopen((a).c_str(),(b))
+#define DLSYM(a,b)   dlsym((a),(b).c_str())
+#define DLCLOSE(a)   dlclose((a))
+#define DLERROR()    dlerror()
+#endif
+
+#include <string>
+#include <iostream>
+
+using namespace std;
+
+string error()
+{
+    string e = dlerror();
+    if (e == "") return "(unknown error)";
+    else return e;
+}
+
+string check(string soname, string descriptor)
+{
+    void *handle = DLOPEN(soname, RTLD_NOW | RTLD_LOCAL);
+    if (!handle) {
+	return "Unable to open plugin library: " + error();
+    }
+
+    void *fn = DLSYM(handle, descriptor);
+    if (!fn) {
+	return "Failed to find plugin descriptor " + descriptor +
+	    " in library: " + error();
+    }
+
+    return "";
+}
+
+int main(int argc, char **argv)
+{
+    bool allGood = true;
+    string soname;
+
+    if (argc != 2) {
+	cerr << "\nUsage:\n    " << argv[0] << " descriptorname\n"
+	    "\nwhere descriptorname is the name of a plugin descriptor function to be sought\n"
+	    "in each library (e.g. vampGetPluginDescriptor for Vamp plugins). The list of\n"
+	    "candidate plugin library filenames is read from stdin.\n" << endl;
+	return 2;
+    }
+
+    string descriptor = argv[1];
+    
+    while (getline(cin, soname)) {
+	string report = check(soname, descriptor);
+	if (report != "") {
+	    cout << "FAILURE|" << soname << "|" << report << endl;
+	    allGood = false;
+	} else {
+	    cout << "SUCCESS|" << soname << "|" << endl;
+	}
+    }
+
+    return allGood ? 0 : 1;
+}