ngscopeclient · Mar 20, 2020 · Mar 20, 2020
Showing with 63 additions and 4 deletions.

+1 −1 scopehal/ProtocolDecoder.cpp

+3 −1 scopehal/ProtocolDecoder.h

+57 −0 scopehal/scopehal.cpp

+2 −0 scopehal/scopehal.h

+0 −2 scopeprotocols/scopeprotocols.cpp
diff --git a/scopehal/ProtocolDecoder.cpp b/scopehal/ProtocolDecoder.cpp
@@ -318,7 +318,7 @@ void ProtocolDecoder::RefreshIfDirty()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Enumeration
 
-void ProtocolDecoder::AddDecoderClass(string name, CreateProcType proc)
+void ProtocolDecoder::DoAddDecoderClass(string name, CreateProcType proc)
 {
 	m_createprocs[name] = proc;
 }

diff --git a/scopehal/ProtocolDecoder.h b/scopehal/ProtocolDecoder.h
@@ -188,7 +188,7 @@ class ProtocolDecoder : public OscilloscopeChannel
 
 public:
 	typedef ProtocolDecoder* (*CreateProcType)(std::string);
-	static void AddDecoderClass(std::string name, CreateProcType proc);
+	static void DoAddDecoderClass(std::string name, CreateProcType proc);
 
 	static void EnumProtocols(std::vector<std::string>& names);
 	static ProtocolDecoder* CreateDecoder(std::string protocol, std::string color);
@@ -207,4 +207,6 @@ class ProtocolDecoder : public OscilloscopeChannel
 	virtual std::string GetProtocolDisplayName() \
 	{ return GetProtocolName(); }
 
+#define AddDecoderClass(T) ProtocolDecoder::DoAddDecoderClass(T::GetProtocolName(), T::CreateInstance)
+
 #endif
diff --git a/scopehal/scopehal.cpp b/scopehal/scopehal.cpp
@@ -40,6 +40,8 @@
 #include "RigolOscilloscope.h"
 #include "RohdeSchwarzOscilloscope.h"
 #include "SiglentSCPIOscilloscope.h"
+#include <libgen.h>
+#include <dlfcn.h>
 
 using namespace std;
 
@@ -97,3 +99,58 @@ uint64_t ConvertVectorSignalToScalar(vector<bool> bits)
 		rval = (rval << 1) | b;
 	return rval;
 }
+
+/**
+	@brief Initialize all plugins
+ */
+void InitializePlugins()
+{
+	char tmp[1024];
+	vector<string> search_dirs;
+	search_dirs.push_back("/usr/lib/scopehal/plugins/");
+	search_dirs.push_back("/usr/local/lib/scopehal/plugins/");
+
+	//current binary dir
+	char selfPath[1024] = {0};
+	ssize_t readlinkReturn = readlink("/proc/self/exe", selfPath, (sizeof(selfPath) - 1) );
+	if ( readlinkReturn > 0)
+		search_dirs.push_back(dirname(selfPath));
+
+	//Home directory
+	snprintf(tmp, sizeof(tmp), "%s/.scopehal/plugins", getenv("HOME"));
+	search_dirs.push_back(tmp);
+
+	for(auto dir : search_dirs)
+	{
+		DIR* hdir = opendir(dir.c_str());
+		if(!hdir)
+			continue;
+
+		dirent* pent;
+		while((pent = readdir(hdir)))
+		{
+			//Don't load hidden files or parent directory entries
+			if(pent->d_name[0] == '.')
+				continue;
+
+			//Try loading it and see if it works.
+			//(for now, never unload the plugins)
+			string fname = dir + "/" + pent->d_name;
+			void* hlib = dlopen(fname.c_str(), RTLD_NOW);
+			if(hlib == NULL)
+				continue;
+
+			//If loaded, look for PluginInit()
+			typedef void (*PluginInit)();
+			PluginInit init = (PluginInit)dlsym(hlib, "PluginInit");
+			if(!init)
+				continue;
+
+			//If found, it's a valid plugin
+			LogDebug("Loading plugin %s\n", fname.c_str());
+			init();
+		}
+
+		closedir(hdir);
+	}
+}
diff --git a/scopehal/scopehal.h b/scopehal/scopehal.h
@@ -75,4 +75,6 @@ std::string GetDefaultChannelColor(int i);
 void TransportStaticInit();
 void DriverStaticInit();
 
+void InitializePlugins();
+
 #endif
diff --git a/scopeprotocols/scopeprotocols.cpp b/scopeprotocols/scopeprotocols.cpp
@@ -35,8 +35,6 @@
 
 #include "scopeprotocols.h"
 
-#define AddDecoderClass(T) ProtocolDecoder::AddDecoderClass(T::GetProtocolName(), T::CreateInstance)
-
 /**
 	@brief Static initialization for protocol list
  */