Make m.verbosity=2 work (#24)

* Make each model get "MODEL" logger instead of unique name

This makes implementing `manticore.verbosity` actually work for level
2

* Replace model names with 'MODEL'

manticore/__main__.py

@@ -133,7 +133,7 @@ def main():
     verbosity = {False:logging.INFO, True:logging.DEBUG}[args.verbose]
     ctxfilter = ContextFilter()
 
-    for loggername in ['VISITOR', 'EXECUTOR', 'CPU', 'SMT', 'MEMORY', 'MAIN', 'LINUX', 'DECREE', 'WINDOWS', 'QNX', 'LIBC']:
+    for loggername in ['VISITOR', 'EXECUTOR', 'CPU', 'SMT', 'MEMORY', 'MAIN', 'MODEL']:
         logging.getLogger(loggername).addFilter(ctxfilter)
         logging.getLogger(loggername).setLevel(verbosity)
         logging.getLogger(loggername).setState = types.MethodType(loggerSetState, logging.getLogger(loggername))

manticore/models/decree.py

@@ -7,7 +7,7 @@ from ..core.cpu.abstractcpu import Interruption, Syscall, ConcretizeRegister
 from ..core.memory import SMemory32
 from ..core.smtlib import *
 from ..core.executor import SyscallNotImplemented, ProcessExit, Deadlock, RestartSyscall
-logger = logging.getLogger("DECREE")
+logger = logging.getLogger("MODEL")
 from ..binary import CGCElf
 from ..binary import CGCGrr
 from contextlib import closing

manticore/models/libc.py

@@ -10,7 +10,7 @@ from ..core.cpu.abstractcpu import Interruption, Syscall, \
 from ..core.memory import MemoryException
 from ..core.executor import ForkState
 
-logger = logging.getLogger("LIBC")
+logger = logging.getLogger("MODEL")
 
 def _memset_range(cpu, dst, value, rng):
 

manticore/models/linux.py

@@ -13,7 +13,7 @@ import logging
 import random
 from ..core.cpu.arm import *
 from ..core.executor import SyscallNotImplemented, ProcessExit
-logger = logging.getLogger("LINUX")
+logger = logging.getLogger("MODEL")
 
 class RestartSyscall(Exception):
     pass

manticore/models/windows.py

@@ -16,7 +16,7 @@ import StringIO
 import logging
 import random
 from windows_syscalls import syscalls_num
-logger = logging.getLogger("WINDOWS")
+logger = logging.getLogger("MODEL")
 
 class ProcessExit(Exception):
     def __init__(self, code):