Overview
Comment: | Updated to implement "vfs::mkcl" using Readkit
Updated local Readkit implementation to not attempt to replace Mk4tcl |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
096098536d21d1b4183dd647f0f837e2 |
User & Date: | rkeene on 2010-09-26 04:42:20 |
Other Links: | manifest | tags |
Context
2010-09-26
| ||
04:42 | KitCreator 0.2.0.x check-in: b9f7f215ae user: rkeene tags: trunk, 0.2.0 | |
04:42 |
Updated to implement "vfs::mkcl" using Readkit
Updated local Readkit implementation to not attempt to replace Mk4tcl check-in: 096098536d user: rkeene tags: trunk | |
04:42 | Added internal script to build a minimal Tclkit check-in: 7596e618f3 user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/boot.tcl from [22b7e78c5d] to [a3240f621e].
︙ | ︙ | |||
17 18 19 20 21 22 23 | # the following code only gets executed once on startup if {[info exists tcl_rcFileName]} { load {} vfs # lookup and emulate "source" of lib/vfs/{vfs*.tcl,mk4vfs.tcl} # must use raw MetaKit calls because VFS is not yet in place | | | | | > > | > | > > > > > > | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | # the following code only gets executed once on startup if {[info exists tcl_rcFileName]} { load {} vfs # lookup and emulate "source" of lib/vfs/{vfs*.tcl,mk4vfs.tcl} # must use raw MetaKit calls because VFS is not yet in place set d [${::tclkitMkNamespace}::select exe.dirs parent 0 name lib] set d [${::tclkitMkNamespace}::select exe.dirs parent $d name vfs] foreach x {vfsUtils vfslib mk4vfs} { set n [${::tclkitMkNamespace}::select exe.dirs!$d.files name $x.tcl] set s [${::tclkitMkNamespace}::get exe.dirs!$d.files!$n contents] catch {set s [zlib decompress $s]} uplevel #0 $s } # use on-the-fly decompression, if mk4vfs understands that switch -- $::tclkitMkNamespace { "mk" { set mk4vfs::zstreamed 1 set vfsimpl "mk4" } "readkit" { set mkcl_vfs::zstreamed 1 set vfsimpl "mkcl" } } # mount the executable, i.e. make all runtime files available vfs::filesystem mount $noe [list ::vfs::${vfsimpl}::handler exe] # alter path to find encodings if {[info tclversion] eq "8.4"} { load {} pwb librarypath [info library] } else { encoding dirs [list [file join [info library] encoding]] ;# TIP 258 |
︙ | ︙ | |||
61 62 63 64 65 66 67 | set noe [info nameofexecutable] # Resolve symlinks set noe [file dirname [file normalize [file join $noe __dummy__]]] set tcl_library [file join $noe lib tcl$tcl_version] set tcl_libPath [list $tcl_library [file join $noe lib]] | | | > > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | set noe [info nameofexecutable] # Resolve symlinks set noe [file dirname [file normalize [file join $noe __dummy__]]] set tcl_library [file join $noe lib tcl$tcl_version] set tcl_libPath [list $tcl_library [file join $noe lib]] vfs::filesystem mount $noe [list ::vfs::${vfsimpl}::handler exe] } # load config settings file if present namespace eval ::vfs { variable tclkit_version 1 } catch { uplevel #0 [list source [file join $noe config.tcl]] } uplevel #0 [list source [file join $tcl_library init.tcl]] # reset auto_path, so that init.tcl's search outside of tclkit is cancelled set auto_path $tcl_libPath unset ::tclkitMkNamespace } |
Modified kitsh/buildsrc/kitsh-0.0/kitInit.c from [40729608ac] to [f0bdde86c9].
︙ | ︙ | |||
76 77 78 79 80 81 82 83 84 85 | "return -code $code $res\n" "}\n" #endif "proc tclKitInit {} {\n" "rename tclKitInit {}\n" #ifdef KIT_INCLUDES_MK4TCL "catch { load {} Mk4tcl }\n" #else #include "mk4tcl.tcl.h" #endif | > > | | | | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | "return -code $code $res\n" "}\n" #endif "proc tclKitInit {} {\n" "rename tclKitInit {}\n" #ifdef KIT_INCLUDES_MK4TCL "catch { load {} Mk4tcl }\n" "set ::tclkitMkNamespace \"mk\"\n" #else #include "mk4tcl.tcl.h" "set ::tclkitMkNamespace \"readkit\"\n" #endif "${::tclkitMkNamespace}::file open exe [info nameofexecutable] -readonly\n" "set n [${::tclkitMkNamespace}::select exe.dirs!0.files name boot.tcl]\n" "if {$n != \"\"} {\n" "set s [${::tclkitMkNamespace}::get exe.dirs!0.files!$n contents]\n" "if {![string length $s]} { error \"empty boot.tcl\" }\n" "catch {load {} zlib}\n" "if {[${::tclkitMkNamespace}::get exe.dirs!0.files!$n size] != [string length $s]} {\n" "set s [zlib decompress $s]\n" "}\n" "} else {\n" "set f [open setup.tcl]\n" "set s [read $f]\n" "close $f\n" "}\n" |
︙ | ︙ |
Modified kitsh/buildsrc/kitsh-0.0/mk4tcl.tcl from [4aa4852a38] to [122176da29].
︙ | ︙ | |||
530 531 532 533 534 535 536 | # requires dbopen/dbclose/dbtree/access/vnames/vlen/mvec primitives #source [file join [info dirname [info script]] decode.tcl] namespace export mk_* proc mk_file {cmd args} { #set indent [string repeat " " [info level]] | | | 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 | # requires dbopen/dbclose/dbtree/access/vnames/vlen/mvec primitives #source [file join [info dirname [info script]] decode.tcl] namespace export mk_* proc mk_file {cmd args} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::file $cmd $args" lassign $args db file switch $cmd { open { return [dbopen $db $file] } close { dbclose $db |
︙ | ︙ | |||
553 554 555 556 557 558 559 | error "mk_file $cmd?" } } } proc mk_view {cmd path args} { #set indent [string repeat " " [info level]] | | | 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 | error "mk_file $cmd?" } } } proc mk_view {cmd path args} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::view $cmd $path $args" lassign $args a1 switch $cmd { info { return [vnames [access $path]] } layout { set layout "NOTYET" |
︙ | ︙ | |||
581 582 583 584 585 586 587 | error "mk_view $cmd?" } } } proc mk_cursor {cmd cursor args} { #set indent [string repeat " " [info level]] | | | 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 | error "mk_view $cmd?" } } } proc mk_cursor {cmd cursor args} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::cursor $cmd $cursor $args" upvar $cursor v switch $cmd { create { NOTYET } incr { NOTYET |
︙ | ︙ | |||
610 611 612 613 614 615 616 | error "mk_cursor $cmd?" } } } proc mk_get {path args} { #set indent [string repeat " " [info level]] | | | 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 | error "mk_cursor $cmd?" } } } proc mk_get {path args} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::get $path $args" set rowref [access $path] set sized 0 if {[lindex $args 0] == "-size"} { set sized 1 set args [lrange $args 1 end] } set ids 0 |
︙ | ︙ | |||
650 651 652 653 654 655 656 | } return $r } proc mk_loop {cursor path args} { #set indent [string repeat " " [info level]] | | | 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 | } return $r } proc mk_loop {cursor path args} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::loop $cursor $path ..." upvar $cursor v if {[llength $args] == 0} { set args [list $path] set path $v regsub {!-?\d+$} $path {} path } lassign $args a1 a2 a3 a4 |
︙ | ︙ | |||
703 704 705 706 707 708 709 | } } } } proc mk_select {path args} { #set indent [string repeat " " [info level]] | | | 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 | } } } } proc mk_select {path args} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::select $path $args" # only handle the simplest case: exact matches if {[lindex $args 0] == "-count"} { set maxitems [lindex $args 1] set args [lrange $args 2 end] } set currmatchmode "caseinsensitive" |
︙ | ︙ | |||
771 772 773 774 775 776 777 | } return $r } proc mk__rechan {path prop cmd chan args} { #set indent [string repeat " " [info level]] | | | | 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 | } return $r } proc mk__rechan {path prop cmd chan args} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::_rechan $path $prop $cmd $chan $args" set key [list $path $prop] if {![info exists ::mk__cache($key)]} { set ::mk__cache($key) [readkit::get $path $prop] } if {![info exists ::mk__offset($key)]} { set ::mk__offset($key) 0 } set data $::mk__cache($key) set offset $::mk__offset($key) |
︙ | ︙ | |||
798 799 800 801 802 803 804 | } "close" { unset -nocomplain ::mk__cache($key) unset -nocomplain ::mk__offset($key) return } default { | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 | } "close" { unset -nocomplain ::mk__cache($key) unset -nocomplain ::mk__offset($key) return } default { #puts stderr "${indent}DEBUG: readkit::_rechan: Called for cmd $cmd" return -code error "Not implemented: cmd = $cmd" } } set ::mk__offset($key) $offset return $retval } proc mk_channel {path prop {mode "r"}} { #set indent [string repeat " " [info level]] #puts stderr "${indent}DEBUG: readkit::channel $path $prop $mode" set fd [rechan [list mk__rechan $path $prop] 2] return $fd } # vim: ft=tcl } # set up the MetaKit compatibility definitions foreach x {file view cursor get loop select channel} { interp alias {} ::readkit::$x {} ::mk_$x } # mk4vfs.tcl -- Mk4tcl Virtual File System driver # Copyright (C) 1997-2003 Sensus Consulting Ltd. All Rights Reserved. # Matt Newman <matt@sensus.org> and Jean-Claude Wippler <jcw@equi4.com> # # $Id: mk4vfs.tcl,v 1.41 2008/04/15 21:11:53 andreas_kupries Exp $ # # 05apr02 jcw 1.3 fixed append mode & close, # privatized memchan_handler # added zip, crc back in # 28apr02 jcw 1.4 reorged memchan and pkg dependencies # 22jun02 jcw 1.5 fixed recursive dir deletion # 16oct02 jcw 1.6 fixed periodic commit once a change is made # 20jan03 jcw 1.7 streamed zlib decompress mode, reduces memory usage # 01feb03 jcw 1.8 fix mounting a symlink, cleanup mount/unmount procs # 04feb03 jcw 1.8 whoops, restored vfs::mkcl::Unmount logic # 17mar03 jcw 1.9 start with mode translucent or readwrite # 18oct05 jcw 1.10 add fallback to MK Compatible Lite driver (vfs::mkcl) # Removed provision of the backward compatible name. Moved to separate # file/package. catch { load {} vfs } package require vfs # things that can no longer really be left out (but this is the wrong spot!) # be as non-invasive as possible, using these definitions as last resort namespace eval vfs::mkcl { proc Mount {mkfile local args} { if {$mkfile != ""} { # dereference a symlink, otherwise mounting on it fails (why?) catch { set mkfile [file join [file dirname $mkfile] \ [file readlink $mkfile]] } set mkfile [file normalize $mkfile] } set db [eval [list ::mkcl_vfs::_mount $mkfile] $args] ::vfs::filesystem mount $local [list ::vfs::mkcl::handler $db] ::vfs::RegisterMount $local [list ::vfs::mkcl::Unmount $db] return $db } proc Unmount {db local} { vfs::filesystem unmount $local ::mkcl_vfs::_umount $db } proc attributes {db} { return [list "state" "commit"] } # Can use this to control commit/nocommit or whatever. # I'm not sure yet of what functionality jcw needs. proc commit {db args} { switch -- [llength $args] { 0 { if {$::mkcl_vfs::v::mode($db) == "readonly"} { return 0 } else { # To Do: read the commit state return 1 } } 1 { set val [lindex $args 0] if {$val != 0 && $val != 1} { return -code error \ "invalid commit value $val, must be 0,1" } # To Do: set the commit state. } default { return -code error "Wrong num args" } } } proc state {db args} { switch -- [llength $args] { 0 { return $::mkcl_vfs::v::mode($db) } 1 { set val [lindex $args 0] if {[lsearch -exact [::vfs::states] $val] == -1} { return -code error \ "invalid state $val, must be one of: [vfs::states]" } set ::mkcl_vfs::v::mode($db) $val ::mkcl_vfs::setupCommits $db } default { return -code error "Wrong num args" } } } proc handler {db cmd root relative actualpath args} { #puts stderr "handler: $db - $cmd - $root - $relative - $actualpath - $args" if {$cmd == "matchindirectory"} { eval [list $cmd $db $relative $actualpath] $args } elseif {$cmd == "fileattributes"} { eval [list $cmd $db $root $relative] $args } else { eval [list $cmd $db $relative] $args } } proc utime {db path actime modtime} { ::mkcl_vfs::stat $db $path sb if { $sb(type) == "file" } { readkit::set $sb(ino) date $modtime } } proc matchindirectory {db path actualpath pattern type} { set newres [list] if {![string length $pattern]} { # check single file if {[catch {access $db $path 0}]} { return {} } set res [list $actualpath] set actualpath "" } else { set res [::mkcl_vfs::getdir $db $path $pattern] } foreach p [::vfs::matchCorrectTypes $type $res $actualpath] { lappend newres [file join $actualpath $p] } return $newres } proc stat {db name} { ::mkcl_vfs::stat $db $name sb set sb(ino) 0 array get sb } proc access {db name mode} { if {$mode & 2} { if {$::mkcl_vfs::v::mode($db) == "readonly"} { vfs::filesystem posixerror $::vfs::posix(EROFS) } } # We can probably do this more efficiently, can't we? ::mkcl_vfs::stat $db $name sb } proc open {db file mode permissions} { # return a list of two elements: # 1. first element is the Tcl channel name which has been opened # 2. second element (optional) is a command to evaluate when # the channel is closed. switch -glob -- $mode { {} - r { ::mkcl_vfs::stat $db $file sb if { $sb(csize) != $sb(size) } { if {$::mkcl_vfs::zstreamed} { set fd [readkit::channel $sb(ino) contents r] fconfigure $fd -translation binary set fd [vfs::zstream decompress $fd $sb(csize) $sb(size)] } else { set fd [vfs::memchan] fconfigure $fd -translation binary set s [readkit::get $sb(ino) contents] puts -nonewline $fd [vfs::zip -mode decompress $s] fconfigure $fd -translation auto seek $fd 0 } } elseif { $::mkcl_vfs::direct } { set fd [vfs::memchan] fconfigure $fd -translation binary puts -nonewline $fd [readkit::get $sb(ino) contents] fconfigure $fd -translation auto seek $fd 0 } else { set fd [readkit::channel $sb(ino) contents r] } return [list $fd] } a { if {$::mkcl_vfs::v::mode($db) == "readonly"} { vfs::filesystem posixerror $::vfs::posix(EROFS) } if { [catch {::mkcl_vfs::stat $db $file sb }] } { # Create file ::mkcl_vfs::stat $db [file dirname $file] sb set tail [file tail $file] set fview $sb(ino).files if {[info exists mkcl_vfs::v::fcache($fview)]} { lappend mkcl_vfs::v::fcache($fview) $tail } set now [clock seconds] set sb(ino) [readkit::row append $fview \ name $tail size 0 date $now ] if { [string match *z* $mode] || $mkcl_vfs::compress } { set sb(csize) -1 ;# HACK - force compression } else { set sb(csize) 0 } } set fd [vfs::memchan] fconfigure $fd -translation binary set s [readkit::get $sb(ino) contents] if { $sb(csize) != $sb(size) && $sb(csize) > 0 } { append mode z puts -nonewline $fd [vfs::zip -mode decompress $s] } else { if { $mkcl_vfs::compress } { append mode z } puts -nonewline $fd $s #set fd [readkit::channel $sb(ino) contents a] } fconfigure $fd -translation auto seek $fd 0 end return [list $fd [list mkcl_vfs::do_close $db $fd $mode $sb(ino)]] } w* { if {$::mkcl_vfs::v::mode($db) == "readonly"} { vfs::filesystem posixerror $::vfs::posix(EROFS) } if { [catch {::mkcl_vfs::stat $db $file sb }] } { # Create file ::mkcl_vfs::stat $db [file dirname $file] sb set tail [file tail $file] set fview $sb(ino).files if {[info exists mkcl_vfs::v::fcache($fview)]} { lappend mkcl_vfs::v::fcache($fview) $tail } set now [clock seconds] set sb(ino) [readkit::row append $fview \ name $tail size 0 date $now ] } if { [string match *z* $mode] || $mkcl_vfs::compress } { append mode z set fd [vfs::memchan] } else { set fd [readkit::channel $sb(ino) contents w] } return [list $fd [list mkcl_vfs::do_close $db $fd $mode $sb(ino)]] } default { error "illegal access mode \"$mode\"" } } } proc createdirectory {db name} { mkcl_vfs::mkdir $db $name } proc removedirectory {db name recursive} { mkcl_vfs::delete $db $name $recursive } proc deletefile {db name} { mkcl_vfs::delete $db $name } proc fileattributes {db root relative args} { switch -- [llength $args] { 0 { # list strings return [::vfs::listAttributes] } 1 { # get value set index [lindex $args 0] return [::vfs::attributesGet $root $relative $index] } 2 { # set value if {$::mkcl_vfs::v::mode($db) == "readonly"} { vfs::filesystem posixerror $::vfs::posix(EROFS) } set index [lindex $args 0] set val [lindex $args 1] return [::vfs::attributesSet $root $relative $index $val] } } } } namespace eval mkcl_vfs { variable compress 1 ;# HACK - needs to be part of "Super-Block" variable flush 5000 ;# Auto-Commit frequency variable direct 0 ;# read through a memchan, or from Mk4tcl if zero variable zstreamed 0 ;# decompress on the fly (needs zlib 1.1) namespace eval v { variable seq 0 variable mode ;# array key is db, value is mode # (readwrite/translucent/readonly) variable timer ;# array key is db, set to afterid, periodicCommit array set cache {} array set fcache {} array set mode {exe translucent} } proc init {db} { readkit::view layout $db.dirs \ {name:S parent:I {files {name:S size:I date:I contents:M}}} if { [readkit::view size $db.dirs] == 0 } { readkit::row append $db.dirs name <root> parent -1 } } proc _mount {{file ""} args} { set db mk4vfs[incr v::seq] if {$file == ""} { readkit::file open $db init $db set v::mode($db) "translucent" } else { eval [list readkit::file open $db $file] $args init $db set mode 0 foreach arg $args { switch -- $arg { -readonly { set mode 1 } -nocommit { set mode 2 } } } if {$mode == 0} { periodicCommit $db } set v::mode($db) [lindex {translucent readwrite readwrite} $mode] } return $db } proc periodicCommit {db} { variable flush set v::timer($db) [after $flush [list ::mkcl_vfs::periodicCommit $db]] readkit::file commit $db return ;# 2005-01-20 avoid returning a value } proc _umount {db args} { catch {after cancel $v::timer($db)} array unset v::mode $db array unset v::timer $db array unset v::cache $db,* array unset v::fcache $db.* readkit::file close $db } proc stat {db path {arr ""}} { set sp [::file split $path] set tail [lindex $sp end] set parent 0 set view $db.dirs set type directory foreach ele [lrange $sp 0 end-1] { if {[info exists v::cache($db,$parent,$ele)]} { set parent $v::cache($db,$parent,$ele) } else { set row [readkit::select $view -count 1 parent $parent name $ele] if { $row == "" } { vfs::filesystem posixerror $::vfs::posix(ENOENT) } set v::cache($db,$parent,$ele) $row set parent $row } } # Now check if final comp is a directory or a file # CACHING is required - it can deliver a x15 speed-up! if { [string equal $tail "."] || [string equal $tail ":"] \ || [string equal $tail ""] } { set row $parent } elseif { [info exists v::cache($db,$parent,$tail)] } { set row $v::cache($db,$parent,$tail) } else { # File? set fview $view!$parent.files # create a name cache of files in this directory if {![info exists v::fcache($fview)]} { # cache only a limited number of directories if {[array size v::fcache] >= 10} { array unset v::fcache * } set v::fcache($fview) {} readkit::loop c $fview { lappend v::fcache($fview) [readkit::get $c name] } } set row [lsearch -exact $v::fcache($fview) $tail] #set row [readkit::select $fview -count 1 name $tail] #if {$row == ""} { set row -1 } if { $row != -1 } { set type file set view $view!$parent.files } else { # Directory? set row [readkit::select $view -count 1 parent $parent name $tail] if { $row != "" } { set v::cache($db,$parent,$tail) $row } else { vfs::filesystem posixerror $::vfs::posix(ENOENT) } } } if {![string length $arr]} { # The caller doesn't need more detailed information. return 1 } set cur $view!$row upvar 1 $arr sb set sb(type) $type set sb(view) $view set sb(ino) $cur if { [string equal $type "directory"] } { set sb(atime) 0 set sb(ctime) 0 set sb(gid) 0 set sb(mode) 0777 set sb(mtime) 0 set sb(nlink) [expr { [readkit::get $cur files] + 1 }] set sb(size) 0 set sb(csize) 0 set sb(uid) 0 } else { set mtime [readkit::get $cur date] set sb(atime) $mtime set sb(ctime) $mtime set sb(gid) 0 set sb(mode) 0777 set sb(mtime) $mtime set sb(nlink) 1 set sb(size) [readkit::get $cur size] set sb(csize) [readkit::get $cur -size contents] set sb(uid) 0 } } proc do_close {db fd mode cur} { if {![regexp {[aw]} $mode]} { error "mkcl_vfs::do_close called with bad mode: $mode" } readkit::set $cur size -1 date [clock seconds] flush $fd if { [string match *z* $mode] } { fconfigure $fd -translation binary seek $fd 0 set data [read $fd] set cdata [vfs::zip -mode compress $data] set len [string length $data] set clen [string length $cdata] if { $clen < $len } { readkit::set $cur size $len contents $cdata } else { readkit::set $cur size $len contents $data } } else { readkit::set $cur size [readkit::get $cur -size contents] } # 16oct02 new logic to start a periodic commit timer if not yet running setupCommits $db return "" } proc setupCommits {db} { if {$v::mode($db) eq "readwrite" && ![info exists v::timer($db)]} { periodicCommit $db readkit::file autocommit $db } } proc mkdir {db path} { if {$v::mode($db) == "readonly"} { vfs::filesystem posixerror $::vfs::posix(EROFS) } set sp [::file split $path] set parent 0 set view $db.dirs set npath {} # This actually does more work than is needed. Tcl's # vfs only requires us to create the last piece, and # Tcl already knows it is not a file. foreach ele $sp { set npath [file join $npath $ele] if {![catch {stat $db $npath sb}] } { if { $sb(type) != "directory" } { vfs::filesystem posixerror $::vfs::posix(EROFS) } set parent [readkit::cursor position sb(ino)] continue } #set parent [readkit::cursor position sb(ino)] set cur [readkit::row append $view name $ele parent $parent] set parent [readkit::cursor position cur] } setupCommits $db return "" } proc getdir {db path {pat *}} { if {[catch { stat $db $path sb }] || $sb(type) != "directory" } { return } # Match directories set parent [readkit::cursor position sb(ino)] foreach row [readkit::select $sb(view) parent $parent -glob name $pat] { set hits([readkit::get $sb(view)!$row name]) 1 } # Match files set view $sb(view)!$parent.files foreach row [readkit::select $view -glob name $pat] { set hits([readkit::get $view!$row name]) 1 } return [lsort [array names hits]] } proc mtime {db path time} { if {$v::mode($db) == "readonly"} { vfs::filesystem posixerror $::vfs::posix(EROFS) } stat $db $path sb if { $sb(type) == "file" } { readkit::set $sb(ino) date $time } return $time } proc delete {db path {recursive 0}} { #puts stderr "mk4delete db $db path $path recursive $recursive" if {$v::mode($db) == "readonly"} { vfs::filesystem posixerror $::vfs::posix(EROFS) } stat $db $path sb if {$sb(type) == "file" } { readkit::row delete $sb(ino) if {[regexp {(.*)!(\d+)} $sb(ino) - v r] \ && [info exists v::fcache($v)]} { set v::fcache($v) [lreplace $v::fcache($v) $r $r] } } else { # just mark dirs as deleted set contents [getdir $db $path *] if {$recursive} { # We have to delete these manually, else # they (or their cache) may conflict with # something later foreach f $contents { delete $db [file join $path $f] $recursive } } else { if {[llength $contents]} { vfs::filesystem posixerror $::vfs::posix(ENOTEMPTY) } } array unset v::cache \ "$db,[readkit::get $sb(ino) parent],[file tail $path]" # flag with -99, because parent -1 is not reserved for the root dir # deleted entries never get re-used, should be cleaned up one day readkit::set $sb(ino) parent -99 name "" # get rid of file entries to release the space in the datafile readkit::view size $sb(ino).files 0 } setupCommits $db return "" } } package provide readkit 0.8 package provide vfs::mkcl 2.4.0.1 |