X-Git-Url: http://git.tremily.us/?p=hooke.git;a=blobdiff_plain;f=hooke%2Fhooke.py;h=b16a800c738005b2e3ecc50079430f914daad8da;hp=e8a00506602665605fb43193ff2bb4ad3150b805;hb=8fd6046cf6e14aef820e949a1c485e2a4957db10;hpb=ea537e738fddb19b55a3ec72edf58130a6e57f8f diff --git a/hooke/hooke.py b/hooke/hooke.py index e8a0050..b16a800 100644 --- a/hooke/hooke.py +++ b/hooke/hooke.py @@ -5,15 +5,15 @@ # # This file is part of Hooke. # -# Hooke is free software: you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation, either -# version 3 of the License, or (at your option) any later version. +# Hooke is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. # -# Hooke is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. +# Hooke is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General +# Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with Hooke. If not, see @@ -22,18 +22,55 @@ """Hooke - A force spectroscopy review & analysis tool. """ +if False: # Queue pickle error debugging code + """The Hooke class is passed back from the CommandEngine process + to the main process via a :class:`multiprocessing.queues.Queue`, + which uses :mod:`pickle` for serialization. There are a number of + objects that are unpicklable, and the error messages are not + always helpful. This block of code hooks you into the Queue's + _feed method so you can print out useful tidbits to help find the + particular object that is gumming up the pickle works. + """ + import multiprocessing.queues + import sys + feed = multiprocessing.queues.Queue._feed + def new_feed (buffer, notempty, send, writelock, close): + def s(obj): + print 'SEND:', obj, dir(obj) + for a in dir(obj): + attr = getattr(obj, a) + #print ' ', a, attr, type(attr) + if obj.__class__.__name__ == 'Hooke': + # Set suspect attributes to None until you resolve the + # PicklingError. Then fix whatever is breaking the + # pickling. + #obj.commands = None + #obj.drivers = None + #obj.plugins = None + #obj.ui = None + pass + sys.stdout.flush() + send(obj) + feed(buffer, notempty, s, writelock, close) + multiprocessing.queues.Queue._feed = staticmethod(new_feed) + +import logging +import logging.config import multiprocessing import optparse import os.path +import Queue import unittest +import StringIO import sys -from . import engine as engine +from . import version +from . import engine from . import config as config_mod -from . import playlist as playlist +from . import playlist from . import plugin as plugin_mod from . import driver as driver_mod -from . import ui as ui +from . import ui class Hooke (object): @@ -49,13 +86,21 @@ class Hooke (object): default_settings=default_settings) config.read() self.config = config + self.load_log() self.load_plugins() self.load_drivers() self.load_ui() - self.command = engine.CommandEngine() - + self.engine = engine.CommandEngine() self.playlists = playlist.NoteIndexList() + def load_log(self): + config_file = StringIO.StringIO() + self.config.write(config_file) + logging.config.fileConfig(StringIO.StringIO(config_file.getvalue())) + # Don't attach the logger because it contains an unpicklable + # thread.lock. Instead, grab it directly every time you need it. + #self.log = logging.getLogger('hooke') + def load_plugins(self): self.plugins = plugin_mod.load_graph( plugin_mod.PLUGIN_GRAPH, self.config, include_section='plugins') @@ -73,6 +118,16 @@ class Hooke (object): def close(self): self.config.write() # Does not preserve original comments + def run_command(self, command, arguments): + """Run `command` with `arguments` using + :meth:`~hooke.engine.CommandEngine.run_command`. + + Allows for running commands without spawning another process + as in :class:`HookeRunner`. + """ + self.engine.run_command(self, command, arguments) + + class HookeRunner (object): def run(self, hooke): """Run Hooke's main execution loop. @@ -83,7 +138,7 @@ class HookeRunner (object): """ ui_to_command,command_to_ui,command = self._setup_run(hooke) try: - self.ui.run(hooke.commands, ui_to_command, command_to_ui) + hooke.ui.run(hooke.commands, ui_to_command, command_to_ui) finally: hooke = self._cleanup_run(ui_to_command, command_to_ui, command) return hooke @@ -106,22 +161,30 @@ class HookeRunner (object): def _setup_run(self, hooke): ui_to_command = multiprocessing.Queue() command_to_ui = multiprocessing.Queue() - manager = multiprocessing.Manager() + manager = multiprocessing.Manager() command = multiprocessing.Process(name='command engine', - target=hooke.command.run, args=(hooke, ui_to_command, command_to_ui)) + target=hooke.engine.run, args=(hooke, ui_to_command, command_to_ui)) command.start() return (ui_to_command, command_to_ui, command) def _cleanup_run(self, ui_to_command, command_to_ui, command): + log = logging.getLogger('hooke') + log.debug('cleanup sending CloseEngine') ui_to_command.put(ui.CloseEngine()) - hooke = command_to_ui.get() - assert isinstance(hooke, Hooke) + hooke = None + while not isinstance(hooke, Hooke): + log.debug('cleanup waiting for Hooke instance from the engine.') + hooke = command_to_ui.get(block=True) + log.debug('cleanup got %s instance' % type(hooke)) command.join() return hooke def main(): p = optparse.OptionParser() + p.add_option( + '--version', dest='version', default=False, action='store_true', + help="Print Hooke's version information and exit.") p.add_option( '-s', '--script', dest='script', metavar='FILE', help='Script of command line Hooke commands to run.') @@ -129,31 +192,42 @@ def main(): '-c', '--command', dest='commands', metavar='COMMAND', action='append', default=[], help='Add a command line Hooke command to run.') + p.add_option( + '--command-no-exit', dest='command_exit', + action='store_false', default=True, + help="Don't exit after running a script or commands.") + p.add_option( + '--debug', dest='debug', action='store_true', default=False, + help="Enable debug logging.") options,arguments = p.parse_args() if len(arguments) > 0: - print >> sys.stderr, 'Too many arguments to %s: %d > 0' \ - % (sys.argv[0], len(arguments)) - print >> sys.stderr, p.help() + print >> sys.stderr, 'More than 0 arguments to %s: %s' \ + % (sys.argv[0], arguments) + p.print_help(sys.stderr) sys.exit(1) hooke = Hooke(debug=__debug__) runner = HookeRunner() + if options.version == True: + print version() + sys.exit(0) + if options.debug == True: + hooke.config.set( + section='handler_hand1', option='level', value='NOTSET') + hooke.load_log() if options.script != None: - f = open(os.path.expanduser(options.script), 'r') - options.commands.extend(f.readlines()) - f.close + with open(os.path.expanduser(options.script), 'r') as f: + options.commands.extend(f.readlines()) if len(options.commands) > 0: try: hooke = runner.run_lines(hooke, options.commands) finally: - hooke.close() - sys.exit(0) + if options.command_exit == True: + hooke.close() + sys.exit(0) try: hooke = runner.run(hooke) finally: hooke.close() - -if __name__ == '__main__': - main()