/ Check-in [95811877]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Merge mmap test fix from trunk.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | winOsTrace
Files: files | file ages | folders
SHA1: 95811877fdcbede4f61269ff1c7a6d9554f669cd
User & Date: mistachkin 2013-04-29 09:20:06
Context
2013-04-30
07:54
Define the sqlite3ErrName() function only when necessary. More robust handling of unknown return codes. check-in: e47cd314 user: mistachkin tags: winOsTrace
2013-04-29
09:20
Merge mmap test fix from trunk. check-in: 95811877 user: mistachkin tags: winOsTrace
09:17
Fix mmap1.test so that it passes on windows as well as unix. check-in: 52417eac user: dan tags: trunk
08:58
Adjust a WAL test result due to changes in the corresponding return code name. check-in: 9272009f user: mistachkin tags: winOsTrace
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/mmap1.test.

    36     36         set str [format %.8x [expr [set ::rcnt] ^ 0xbdf20da3]] 
    37     37         string range [string repeat [set str] [expr [set n]/4]] 1 [set n]
    38     38       }
    39     39       $dbname func rblob rblob
    40     40     }]
    41     41   }
    42     42   
           43  +# For cases 1.1 and 1.4, the number of pages read using xRead() is 4 on
           44  +# unix and 9 on windows. The difference is that windows only ever maps
           45  +# an integer number of OS pages (i.e. creates mappings that are a multiple 
           46  +# of 4KB in size). Whereas on unix any sized mapping may be created.
           47  +#
    43     48   foreach {t mmap_size nRead c2init} {
    44         -  1.1 { PRAGMA mmap_size = 67108864 }   4 {PRAGMA mmap_size = 0}
    45         -  1.2 { PRAGMA mmap_size =    53248 } 150 {PRAGMA mmap_size = 0}
    46         -  1.3 { PRAGMA mmap_size =        0 } 344 {PRAGMA mmap_size = 0}
    47         -  1.4 { PRAGMA mmap_size = 67108864 }   4 {PRAGMA mmap_size = 67108864 }
    48         -  1.5 { PRAGMA mmap_size =    53248 } 150 {PRAGMA mmap_size = 67108864 }
    49         -  1.6 { PRAGMA mmap_size =        0 } 344 {PRAGMA mmap_size = 67108864 }
           49  +  1.1 { PRAGMA mmap_size = 67108864 } /[49]/ {PRAGMA mmap_size = 0}
           50  +  1.2 { PRAGMA mmap_size =    53248 } 150    {PRAGMA mmap_size = 0}
           51  +  1.3 { PRAGMA mmap_size =        0 } 344    {PRAGMA mmap_size = 0}
           52  +  1.4 { PRAGMA mmap_size = 67108864 } /[49]/ {PRAGMA mmap_size = 67108864 }
           53  +  1.5 { PRAGMA mmap_size =    53248 } 150    {PRAGMA mmap_size = 67108864 }
           54  +  1.6 { PRAGMA mmap_size =        0 } 344    {PRAGMA mmap_size = 67108864 }
    50     55   } {
           56  +
    51     57     do_multiclient_test tn {
    52     58       sql1 {PRAGMA page_size=1024}
    53     59       sql1 $mmap_size
    54     60       sql2 $c2init
    55     61   
    56     62       code2 [register_rblob_code db2 0]
    57     63