Reverse accidental commits for changesets 8001 and 7996-7999.

The Mercurial Queues extensions suddenly looks a lot less useful than it first
seemed.
 
Signed-off-by: Ewan Mellor <ewan@xensource.com>

tools/python/setup.py

@@ -4,7 +4,7 @@ import os
 
 XEN_ROOT = "../.."
 
-extra_compile_args  = [ "-fno-strict-aliasing", "-Wall", "-Werror", "-ggdb3", "-O0" ]
+extra_compile_args  = [ "-fno-strict-aliasing", "-Wall", "-Werror" ]
 
 
 include_dirs = [ XEN_ROOT + "/tools/libxc",

tools/python/xen/xend/XendLogging.py

@@ -42,7 +42,7 @@ DEFAULT_MAX_BYTES = 1 << 20  # 1MB
 DEFAULT_BACKUP_COUNT = 5
 
 STDERR_FORMAT = "[%(name)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s"
-LOGFILE_FORMAT = "[%(asctime)s %(name)s %(thread)d] %(levelname)s (%(module)s:%(lineno)d) %(message)s"
+LOGFILE_FORMAT = "[%(asctime)s %(name)s] %(levelname)s (%(module)s:%(lineno)d) %(message)s"
 DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 
 

tools/python/xen/xend/server/SrvDaemon.py

@@ -8,9 +8,7 @@
 import os
 import signal
 import sys
-import thread
 import threading
-import time
 import linecache
 import pwd
 import re
@@ -203,8 +201,6 @@ class Daemon:
                 pass
 
     def print_trace(self, string):
-        self.tracefile.write(time.strftime("%Y-%m-%d %H:%M:%S "))
-        self.tracefile.write("%10x" % thread.get_ident())
         for i in range(self.traceindent):
             ch = " "
             if (i % 5):