Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Add comments for the various debug levels. When debugging, disable optimizations. Prevent the win32lock tests from spinning forever. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | winNativeHeap |
| Files: | files | file ages | folders |
| SHA1: |
401859236b0d97bde82b11f32efce6eb |
| User & Date: | mistachkin 2011-08-25 04:09:12 |
Context
|
2011-08-26
| ||
| 01:32 | Allow the Win32 native heap flags to be overridden at compile-time. (check-in: 1c2ecec8 user: mistachkin tags: winNativeHeap) | |
|
2011-08-25
| ||
| 04:09 | Add comments for the various debug levels. When debugging, disable optimizations. Prevent the win32lock tests from spinning forever. (check-in: 40185923 user: mistachkin tags: winNativeHeap) | |
| 02:02 | In the MSVC makefile, support several levels of debugging, each one building on the previous. Also, add comment about the SQLITE_WIN32_MALLOC_VALIDATE macro. (check-in: 4257e9b7 user: mistachkin tags: winNativeHeap) | |
Changes
Changes to Makefile.msc.
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 ... 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 ... 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 |
# that contains this "Makefile.msc". # TOP = . # Set this non-0 to create and use the SQLite amalgamation file. # USE_AMALGAMATION = 1 DEBUG=0 # Version numbers and release number for the SQLite being compiled. # VERSION = 3.7 VERSION_NUMBER = 3007007 RELEASE = 3.7.7 ................................................................................ TCC = $(TCC) $(OPT_FEATURE_FLAGS) # Add in any optional parameters specified on the make commane line # ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". TCC = $(TCC) $(OPTS) # Add debug information if enabled. !IF $(DEBUG)!=0 TCC = $(TCC) -Zi -D_DEBUG !ENDIF # libtool compile/link LTCOMPILE = $(TCC) -Fo$@ LTLIB = lib.exe LTLINK = $(TCC) -Fe$@ ................................................................................ # set this for you. Otherwise, the linker will attempt # to deduce the binary type based on the object files. !IF "$(PLATFORM)"!="" LTLINKOPTS = /MACHINE:$(PLATFORM) LTLIBOPTS = /MACHINE:$(PLATFORM) !ENDIF !IF $(DEBUG)!=0 LTLINKOPTS = $(LTLINKOPTS) /DEBUG !ENDIF # nawk compatible awk. NAWK = gawk.exe # You should not have to change anything below this line |
> > > > > > > > > > > > | | | | > | |
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 ... 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 ... 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 |
# that contains this "Makefile.msc". # TOP = . # Set this non-0 to create and use the SQLite amalgamation file. # USE_AMALGAMATION = 1 # Set this to one of the following values to enable various debugging # features. Each level includes the debugging options from the previous # levels. Currently, the recognized values for DEBUG are: # # 0 == NDEBUG: Disables assert() and other runtime diagnostics. # 1 == Disables NDEBUG and all optimizations and then enables PDBs. # 2 == SQLITE_DEBUG: Enables various diagnostics messages and code. # 3 == SQLITE_WIN32_MALLOC_VALIDATE: Validate the Win32 native heap per call. # 4 == SQLITE_DEBUG_OS_TRACE: Enables output from the OSTRACE() macros. # 5 == SQLITE_ENABLE_IOTRACE: Enables output from the IOTRACE() macros. # DEBUG = 0 # Version numbers and release number for the SQLite being compiled. # VERSION = 3.7 VERSION_NUMBER = 3007007 RELEASE = 3.7.7 ................................................................................ TCC = $(TCC) $(OPT_FEATURE_FLAGS) # Add in any optional parameters specified on the make commane line # ie. make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1". TCC = $(TCC) $(OPTS) # If debugging is enabled, disable all optimizations and enable PDBs. !IF $(DEBUG)>0 TCC = $(TCC) -Od -Zi -D_DEBUG !ENDIF # libtool compile/link LTCOMPILE = $(TCC) -Fo$@ LTLIB = lib.exe LTLINK = $(TCC) -Fe$@ ................................................................................ # set this for you. Otherwise, the linker will attempt # to deduce the binary type based on the object files. !IF "$(PLATFORM)"!="" LTLINKOPTS = /MACHINE:$(PLATFORM) LTLIBOPTS = /MACHINE:$(PLATFORM) !ENDIF # If debugging is enabled, enable PDBs. !IF $(DEBUG)>0 LTLINKOPTS = $(LTLINKOPTS) /DEBUG !ENDIF # nawk compatible awk. NAWK = gawk.exe # You should not have to change anything below this line |
Changes to test/win32lock.test.
65
66
67
68
69
70
71
72
73
74
75
76
77
78
...
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
regsub {\d+} $::log # x
set x
} {{delayed #ms for lock/sharing conflict}}
}
}
if {[llength $win32_lock_ok] && [llength $win32_lock_error]} break
incr delay1 25
sqlite3_sleep 10
}
do_test win32lock-2.0 {
file_control_win32_av_retry db -1 -1
} {0 10 25}
do_test win32lock-2.1 {
................................................................................
regsub {\d+} $::log # x
set x
} {{delayed #ms for lock/sharing conflict}}
}
}
if {[llength $win32_lock_ok] && [llength $win32_lock_error]} break
incr delay1 1
sqlite3_sleep 10
}
file_control_win32_av_retry db 10 25
sqlite3_test_control_pending_byte $old_pending_byte
sqlite3_shutdown
test_sqlite3_log
sqlite3_initialize
finish_test
|
>
>
>
>
>
>
>
>
|
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
...
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
regsub {\d+} $::log # x
set x
} {{delayed #ms for lock/sharing conflict}}
}
}
if {[llength $win32_lock_ok] && [llength $win32_lock_error]} break
incr delay1 25
if {$delay1 > 12500} {
puts "Timed out waiting for \"ok\" and \"error\" results."
break
}
sqlite3_sleep 10
}
do_test win32lock-2.0 {
file_control_win32_av_retry db -1 -1
} {0 10 25}
do_test win32lock-2.1 {
................................................................................
regsub {\d+} $::log # x
set x
} {{delayed #ms for lock/sharing conflict}}
}
}
if {[llength $win32_lock_ok] && [llength $win32_lock_error]} break
incr delay1 1
if {$delay1 > 500} {
puts "Timed out waiting for \"ok\" and \"error\" results."
break
}
sqlite3_sleep 10
}
file_control_win32_av_retry db 10 25
sqlite3_test_control_pending_byte $old_pending_byte
sqlite3_shutdown
test_sqlite3_log
sqlite3_initialize
finish_test
|