Convert plugin list to dict

manticore/core/manticore.py

@@ -2,7 +2,7 @@
 import itertools
 import logging
 import sys
-import time
+import typing
 import random
 import weakref
 from typing import Callable
@@ -364,7 +364,7 @@ def __init__(self, initial_state, workspace_url=None, outputspace_url=None, **kw
         # the different type of events occur over an exploration.
         # Note that each callback will run in a worker process and that some
         # careful use of the shared context is needed.
-        self.plugins = set()
+        self.plugins = {}
 
         # Set initial root state
         if not isinstance(initial_state, StateBase):
@@ -850,7 +850,7 @@ def generate_testcase(self, state, message: str = "test", name: str = "test") ->
             PickleSerializer().serialize(state, statef)
 
         # Let the plugins generate a state based report
-        for p in self.plugins:
+        for p in self.plugins.values():
             p.generate_testcase(state, testcase, message)
 
         logger.info("Generated testcase No. %d - %s", testcase.num, message)
@@ -860,11 +860,11 @@ def generate_testcase(self, state, message: str = "test", name: str = "test") ->
     def register_plugin(self, plugin: Plugin):
         # Global enumeration of valid events
         assert isinstance(plugin, Plugin)
-        assert plugin not in self.plugins, "Plugin instance already registered"
+        assert plugin.unique_name not in self.plugins, "Plugin instance already registered"
         assert getattr(plugin, "manticore", None) is None, "Plugin instance already owned"
 
         plugin.manticore = self
-        self.plugins.add(plugin)
+        self.plugins[plugin.unique_name] = plugin
 
         events = Eventful.all_events()
         prefix = Eventful.prefixes
@@ -916,13 +916,17 @@ def register_plugin(self, plugin: Plugin):
         return plugin
 
     @at_not_running
-    def unregister_plugin(self, plugin):
+    def unregister_plugin(self, plugin: typing.Union[str, Plugin]):
         """ Removes a plugin from manticore.
             No events should be sent to it after
         """
-        assert plugin in self.plugins, "Plugin instance not registered"
+        if type(plugin) is str:  # Passed plugin.unique_name instead of value
+            assert plugin in self.plugins, "Plugin instance not registered"
+            plugin = self.plugins[plugin]
+
+        assert plugin.unique_name in self.plugins, "Plugin instance not registered"
         plugin.on_unregister()
-        self.plugins.remove(plugin)
+        del self.plugins[plugin.unique_name]
         plugin.manticore = None
 
     def subscribe(self, name, callback):

manticore/core/plugin.py

@@ -55,9 +55,13 @@ def is_enabled(self):
             return context.get(self._enabled_key, True)
 
     @property
-    def name(self):
+    def name(self) -> str:
         return str(self.__class__)
 
+    @property
+    def unique_name(self) -> str:
+        return f"{self.name}_{id(self)}"
+
     @contextmanager
     def locked_context(self, key=None, value_type=list):
         """

manticore/ethereum/cli.py

@@ -125,7 +125,7 @@ def ethereum_main(args, logger):
             m.register_plugin(filter_nohuman_constants)
 
         if m.plugins:
-            logger.info(f'Registered plugins: {", ".join(d.name for d in m.plugins)}')
+            logger.info(f'Registered plugins: {", ".join(d.name for d in m.plugins.values())}')
 
         logger.info("Beginning analysis")