Add user defined libraries to interpreted souffle

Author: mmcgr

src/Interpreter.h

@@ -36,8 +36,6 @@
 #include <vector>
 #include <dlfcn.h>
 
-#define SOUFFLE_DLL "libfunctors.so"
-
 namespace souffle {
 
 class InterpreterProgInterface;
@@ -75,16 +73,38 @@ class Interpreter {
         }
 
         if (!Global::config().has("libraries")) {
-            Global::config().set("libraries", SOUFFLE_DLL);
+            Global::config().set("libraries", "functors");
+        }
+        if (!Global::config().has("library-dir")) {
+            Global::config().set("library-dir", ".");
         }
-        std::cout << "libraries: <" << Global::config().get("libraries") << ">" << std::endl;
-        for (const std::string& library : splitString(Global::config().get("libraries"), ',')) {
-            auto tmp = dlopen(library.c_str(), RTLD_LAZY);
-            std::cout << tmp << std::endl;
-            dll.push_back(tmp);
-            if (dll.back() == nullptr) {
-                std::cerr << "Cannot find '" << library << "' DLL" << std::endl;
-                exit(1);
+        for (const std::string& library : splitString(Global::config().get("libraries"), ' ')) {
+            // The library may be blank
+            if (library.empty()) {
+                continue;
+            }
+            auto paths = splitString(Global::config().get("library-dir"), ' ');
+            // Set up our paths to have a library appended
+            for (std::string& path : paths) {
+                if (path.back() != '/') {
+                    path += '/';
+                }
+            }
+
+            if (library.find('/') != std::string::npos) {
+                paths.clear();
+            }
+
+            paths.push_back("");
+
+            void* tmp = nullptr;
+            for (const std::string& path : paths) {
+                std::string fullpath = path + "lib" + library + ".so";
+                tmp = dlopen(fullpath.c_str(), RTLD_LAZY);
+                if (tmp != nullptr) {
+                    dll.push_back(tmp);
+                    break;
+                }
             }
         }
 
@@ -94,7 +114,10 @@ class Interpreter {
     void* getMethodHandle(const std::string& method) {
         // load DLLs (if not done yet)
         for (void* libHandle : loadDLL()) {
-            return dlsym(libHandle, method.c_str());
+            auto* methodHandle = dlsym(libHandle, method.c_str());
+            if (methodHandle != nullptr) {
+                return methodHandle;
+            }
         }
         return nullptr;
     }

src/LVM.cpp

@@ -464,8 +464,7 @@ void LVM::execute(std::unique_ptr<LVMCode>& codeStream, InterpreterContext& ctxt
 
                 auto fn = reinterpret_cast<void (*)()>(getMethodHandle(name));
                 if (fn == nullptr) {
-                    std::cerr << "Cannot find user-defined operator " << name << " in " << SOUFFLE_DLL
-                              << std::endl;
+                    std::cerr << "Cannot find user-defined operator " << name << std::endl;
                     exit(1);
                 }
 

src/LVM.h

@@ -37,8 +37,6 @@
 #include <vector>
 #include <dlfcn.h>
 
-#define SOUFFLE_DLL "libfunctors.so"
-
 namespace souffle {
 
 class InterpreterProgInterface;

src/LVMGenerator.h

@@ -18,8 +18,6 @@
 #include "LVMCode.h"
 #include "RamVisitor.h"
 
-#define SOUFFLE_DLL "libfunctors.so"
-
 namespace souffle {
 
 /**

src/RAMI.h

@@ -141,34 +141,6 @@ class RAMI : public Interpreter {
         environment[ramRel2.getName()] = rel1;
     }
 
-    /** Load dll */
-    const std::vector<void*>& loadDLL() {
-        if (!dll.empty()) {
-            return dll;
-        }
-
-        if (!Global::config().has("libraries")) {
-            Global::config().set("libraries", SOUFFLE_DLL);
-        }
-        for (const std::string& library : splitString(Global::config().get("libraries"), ',')) {
-            dll.push_back(dlopen(library.c_str(), RTLD_LAZY));
-            if (dll.back() == nullptr) {
-                std::cerr << "Cannot find '" << library << "' DLL" << std::endl;
-                exit(1);
-            }
-        }
-
-        return dll;
-    }
-
-    void* getMethodHandle(const std::string& method) {
-        // load DLLs (if not done yet)
-        for (void* libHandle : loadDLL()) {
-            return dlsym(libHandle, method.c_str());
-        }
-        return nullptr;
-    }
-
 private:
     friend InterpreterProgInterface;
 

src/main.cpp

@@ -190,7 +190,7 @@ int main(int argc, char** argv) {
                 {"generate", 'g', "FILE", "", false,
                         "Generate C++ source code for the given Datalog program and write it to "
                         "<FILE>."},
-                {"library-dir", 'L', "DIR", ".", true, "Specify directory for library files."},
+                {"library-dir", 'L', "DIR", "", true, "Specify directory for library files."},
                 {"libraries", 'l', "FILE", "", true, "Specify libraries."},
                 {"no-warn", 'w', "", "", false, "Disable warnings."},
                 {"magic-transform", 'm', "RELATIONS", "", false,