MonetDB: default - Improved timeout stack trace on Windows.

[Sjoerd Mullender]

Changeset: 724649e9e8aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=724649e9e8aa
Modified Files:
        NT/rules.msc
        testing/Mtest.py.in
Branch: default
Log Message:

Improved timeout stack trace on Windows.
We now produce .pdb files (symbol tables) also during optimized
compilation and we use a slightly different command to get the stack
trace so that function arguments are included in the trace.


diffs (44 lines):

diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -189,14 +189,10 @@ CONFIGURE_PY = "$(TOPDIR)\..\NT\winconfi
 WINCONFIG_INCS = "-I$(TOPDIR)\..\buildtools\conf"
 
 !IFDEF DEBUG
-!IF $(bits) == 64
-ZI = -Zi
+COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MDd -nologo -Od -D_DEBUG 
-RTC1 -Zi
 !ELSE
-ZI = -ZI
-!ENDIF
-COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MDd -nologo -Od -D_DEBUG 
-RTC1 $(ZI)
-!ELSE
-COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox
+# add -Zi flag (implies -debug, not -D_DEBUG) to get symbol info in .pdb files
+COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox -Zi
 !ENDIF
 CFLAGS = $(COMPILERFLAGS)  -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES) 
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
 
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2362,14 +2362,17 @@ def killProc(proc, outfile = None, cmd =
     if os.name == "nt":
         if os.path.exists(r'c:\Program Files\Debugging Tools for Windows 
(x64)\cdb.exe'):
             cdb = r'c:\Program Files\Debugging Tools for Windows (x64)\cdb.exe'
+            sym = r'c:\Symbols'
         elif os.path.exists(r'c:\Program Files\Debugging Tools for Windows 
(x86)\cdb.exe'):
             cdb = r'c:\Program Files\Debugging Tools for Windows (x86)\cdb.exe'
+            sym = r'c:\WINDOWS\Symbols'
         else:
             cdb = None
+            sym = None
         if cdb:
-            p = subprocess.Popen([cdb, '-pv', '-p', str(proc.pid)],
+            p = subprocess.Popen([cdb, '-pv', '-p', str(proc.pid), '-y', 
r'%s;cache*;srv*http://msdl.microsoft.com/download/symbols' % sym],
                                  stdin = subprocess.PIPE, stdout = 
subprocess.PIPE)
-            out, err = p.communicate('~*k\nq\n')
+            out, err = p.communicate('~*kP\nq\n')
         else:
             out = ''
     else:
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list