Overview
Comment: | Updated to include attribute caching since we now disable all FUSE attribute caching |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
89eabdaec1f1875e07aae2ae900bb78d |
User & Date: | rkeene on 2014-11-10 20:09:19 |
Other Links: | manifest | tags |
Context
2014-11-11
| ||
05:11 | Updated allow future versions to deal with manifests that are not linked from the index file check-in: 34f1255a38 user: rkeene tags: trunk | |
2014-11-10
| ||
20:09 | Updated to include attribute caching since we now disable all FUSE attribute caching check-in: 89eabdaec1 user: rkeene tags: trunk | |
19:19 | Updated to correctly deal with the "latest" symlink check-in: a706ef58b8 user: rkeene tags: trunk | |
Changes
Modified appfsd.c from [a0dcafd0c9] to [5e5056a24c].
︙ | |||
42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | + + + + + + + + | * Global variables, needed for all threads but only initialized before any * FUSE threads are created */ const char *appfs_cachedir; time_t appfs_boottime; int appfs_fuse_started = 0; /* * Global variables for AppFS caching */ pthread_mutex_t appfs_path_info_cache_mutex = PTHREAD_MUTEX_INITIALIZER; int appfs_path_info_cache_size = 8209; struct appfs_pathinfo *appfs_path_info_cache = NULL; /* * AppFS Path Type: Describes the type of path a given file is */ typedef enum { APPFS_PATHTYPE_INVALID, APPFS_PATHTYPE_DOES_NOT_EXIST, APPFS_PATHTYPE_FILE, APPFS_PATHTYPE_DIRECTORY, APPFS_PATHTYPE_SYMLINK, APPFS_PATHTYPE_SOCKET, APPFS_PATHTYPE_FIFO, } appfs_pathtype_t; |
︙ | |||
78 79 80 81 82 83 84 85 86 87 88 89 90 91 | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | + + + + | off_t size; } file; struct { off_t size; char source[256]; } symlink; } typeinfo; /* Attributes used only for caching entries */ char *_cache_path; uid_t _cache_uid; }; /* * Create a new Tcl interpreter and completely initialize it */ static Tcl_Interp *appfs_create_TclInterp(char **error_string) { Tcl_Interp *interp; |
︙ | |||
403 404 405 406 407 408 409 | 415 416 417 418 419 420 421 422 423 424 425 426 427 428 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | } retval = strdup(result->pw_dir); return(retval); } |
︙ | |||
503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 | 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | } retval += 10; retval %= 4294967296ULL; return(retval); } /* * Cache Get Path Info lookups for speed */ static int appfs_get_path_info_cache_get(const char *path, uid_t uid, struct appfs_pathinfo *pathinfo) { unsigned int hash_idx; int pthread_ret; int retval; retval = 1; pthread_ret = pthread_mutex_lock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to lock path_info cache mutex !"); return(-1); } if (appfs_path_info_cache != NULL) { hash_idx = (appfs_get_path_inode(path) + uid) % appfs_path_info_cache_size; if (appfs_path_info_cache[hash_idx]._cache_path != NULL) { if (strcmp(appfs_path_info_cache[hash_idx]._cache_path, path) == 0 && appfs_path_info_cache[hash_idx]._cache_uid == uid) { retval = 0; memcpy(pathinfo, &appfs_path_info_cache[hash_idx], sizeof(*pathinfo)); pathinfo->_cache_path = NULL; } } } pthread_ret = pthread_mutex_unlock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to unlock path_info cache mutex !"); return(-1); } if (retval == 0) { APPFS_DEBUG("Cache hit on %s", path); } else { APPFS_DEBUG("Cache miss on %s", path); } return(retval); } static void appfs_get_path_info_cache_add(const char *path, uid_t uid, struct appfs_pathinfo *pathinfo) { unsigned int hash_idx; int pthread_ret; pthread_ret = pthread_mutex_lock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to lock path_info cache mutex !"); return; } if (appfs_path_info_cache == NULL) { appfs_path_info_cache = calloc(appfs_path_info_cache_size, sizeof(*appfs_path_info_cache)); } hash_idx = (appfs_get_path_inode(path) + uid) % appfs_path_info_cache_size; if (appfs_path_info_cache[hash_idx]._cache_path != NULL) { free(appfs_path_info_cache[hash_idx]._cache_path); } memcpy(&appfs_path_info_cache[hash_idx], pathinfo, sizeof(*pathinfo)); appfs_path_info_cache[hash_idx]._cache_path = strdup(path); appfs_path_info_cache[hash_idx]._cache_uid = uid; pthread_ret = pthread_mutex_unlock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to unlock path_info cache mutex !"); return; } return; } static void appfs_get_path_info_cache_rm(const char *path, uid_t uid) { unsigned int hash_idx; int pthread_ret; pthread_ret = pthread_mutex_lock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to lock path_info cache mutex !"); return; } if (appfs_path_info_cache != NULL) { hash_idx = (appfs_get_path_inode(path) + uid) % appfs_path_info_cache_size; if (appfs_path_info_cache[hash_idx]._cache_path != NULL) { free(appfs_path_info_cache[hash_idx]._cache_path); appfs_path_info_cache[hash_idx]._cache_path = NULL; } } pthread_ret = pthread_mutex_unlock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to unlock path_info cache mutex !"); return; } return; } static void appfs_get_path_info_cache_flush(uid_t uid, int new_size) { unsigned int idx; int pthread_ret; pthread_ret = pthread_mutex_lock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to lock path_info cache mutex !"); return; } if (appfs_path_info_cache != NULL) { for (idx = 0; idx < appfs_path_info_cache_size; idx++) { if (appfs_path_info_cache[idx]._cache_path != NULL) { if (uid != ((uid_t) -1)) { if (appfs_path_info_cache[idx]._cache_uid != uid) { continue; } } free(appfs_path_info_cache[idx]._cache_path); appfs_path_info_cache[idx]._cache_path = NULL; } } } if (uid == ((uid_t) -1)) { free(appfs_path_info_cache); appfs_path_info_cache = NULL; if (new_size != -1) { appfs_path_info_cache_size = new_size; } } pthread_ret = pthread_mutex_unlock(&appfs_path_info_cache_mutex); if (pthread_ret != 0) { APPFS_DEBUG("Unable to unlock path_info cache mutex !"); return; } return; } /* Get information about a path, and optionally list children */ static int appfs_get_path_info(const char *path, struct appfs_pathinfo *pathinfo) { Tcl_Interp *interp; Tcl_Obj *attrs_dict, *attr_value; const char *attr_value_str; Tcl_WideInt attr_value_wide; int attr_value_int; static __thread Tcl_Obj *attr_key_type = NULL, *attr_key_perms = NULL, *attr_key_size = NULL, *attr_key_time = NULL, *attr_key_source = NULL, *attr_key_childcount = NULL, *attr_key_packaged = NULL; int cache_ret; int tcl_ret; cache_ret = appfs_get_path_info_cache_get(path, appfs_get_fsuid(), pathinfo); if (cache_ret == 0) { if (pathinfo->type == APPFS_PATHTYPE_DOES_NOT_EXIST) { return(-ENOENT); } if (pathinfo->type == APPFS_PATHTYPE_INVALID) { return(-EIO); } return(0); } interp = appfs_TclInterp(); if (interp == NULL) { return(-EIO); } tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::getattr", path); if (tcl_ret != TCL_OK) { APPFS_DEBUG("::appfs::getattr(%s) failed.", path); APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp)); pathinfo->type = APPFS_PATHTYPE_DOES_NOT_EXIST; appfs_get_path_info_cache_add(path, appfs_get_fsuid(), pathinfo); return(-ENOENT); } if (attr_key_type == NULL) { attr_key_type = Tcl_NewStringObj("type", -1); attr_key_perms = Tcl_NewStringObj("perms", -1); attr_key_size = Tcl_NewStringObj("size", -1); |
︙ | |||
631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 | 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 | + + + + | if (tcl_ret == TCL_OK) { pathinfo->time = attr_value_wide; } } else { pathinfo->time = 0; } appfs_get_path_info_cache_add(path, appfs_get_fsuid(), pathinfo); return(0); } static char *appfs_prepare_to_create(const char *path) { Tcl_Interp *interp; const char *real_path; int tcl_ret; appfs_get_path_info_cache_flush(appfs_get_fsuid(), -1); interp = appfs_TclInterp(); if (interp == NULL) { return(NULL); } tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::prepare_to_create", path); |
︙ | |||
765 766 767 768 769 770 771 | 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 | - + + + + + | stbuf->st_size = 0; break; case APPFS_PATHTYPE_FIFO: stbuf->st_mode = S_IFIFO | 0555; stbuf->st_nlink = 1; stbuf->st_size = 0; break; |
︙ | |||
837 838 839 840 841 842 843 844 845 846 847 848 849 850 | 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 | + + + + + + | if ((fi->flags & (O_WRONLY|O_CREAT)) == (O_CREAT|O_WRONLY)) { /* The file will be created if it does not exist */ if (gpi_ret != 0 && gpi_ret != -ENOENT) { return(gpi_ret); } mode = "create"; /* * We have to clear the cache here so that the number of * links gets maintained on the parent directory */ appfs_get_path_info_cache_flush(appfs_get_fsuid(), -1); } else { /* The file must already exist */ if (gpi_ret != 0) { return(gpi_ret); } mode = ""; |
︙ | |||
888 889 890 891 892 893 894 895 896 897 898 899 900 901 | 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 | + + | return(0); } static int appfs_fuse_close(const char *path, struct fuse_file_info *fi) { int close_ret; appfs_get_path_info_cache_rm(path, appfs_get_fsuid()); close_ret = close(fi->fh); if (close_ret != 0) { return(-EIO); } return(0); } |
︙ | |||
917 918 919 920 921 922 923 924 925 926 927 928 929 930 | 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 | + + | } static int appfs_fuse_write(const char *path, const char *buf, size_t size, off_t offset, struct fuse_file_info *fi) { off_t lseek_ret; ssize_t write_ret; APPFS_DEBUG("Enter (path = %s, ...)", path); appfs_get_path_info_cache_rm(path, appfs_get_fsuid()); lseek_ret = lseek(fi->fh, offset, SEEK_SET); if (lseek_ret != offset) { return(-EIO); } write_ret = write(fi->fh, buf, size); |
︙ | |||
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 | 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 | + + + + | APPFS_DEBUG("Enter (path = %s, ...)", path); real_path = appfs_localpath(path); if (real_path == NULL) { return(-EIO); } appfs_get_path_info_cache_rm(path, appfs_get_fsuid()); appfs_simulate_user_fs_enter(); truncate_ret = truncate(real_path, size); appfs_simulate_user_fs_leave(); free(real_path); if (truncate_ret != 0) { return(errno * -1); } return(0); } static int appfs_fuse_unlink_rmdir(const char *path) { Tcl_Interp *interp; int tcl_ret; APPFS_DEBUG("Enter (path = %s, ...)", path); appfs_get_path_info_cache_flush(appfs_get_fsuid(), -1); interp = appfs_TclInterp(); if (interp == NULL) { return(-EIO); } tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::unlinkpath", path); |
︙ | |||
1051 1052 1053 1054 1055 1056 1057 | 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 | - | } static int appfs_fuse_mkdir(const char *path, mode_t mode) { char *real_path; int mkdir_ret; APPFS_DEBUG("Enter (path = %s, ...)", path); |
︙ | |||
1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 | 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 | + + | static int appfs_fuse_chmod(const char *path, mode_t mode) { Tcl_Interp *interp; const char *real_path; int tcl_ret, chmod_ret; APPFS_DEBUG("Enter (path = %s, ...)", path); appfs_get_path_info_cache_rm(path, appfs_get_fsuid()); interp = appfs_TclInterp(); if (interp == NULL) { return(-EIO); } tcl_ret = appfs_Tcl_Eval(interp, 3, "::appfs::openpath", path, "write"); |
︙ | |||
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 | 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 1431 1432 1433 1434 1435 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | } /* * AppFSd Package for Tcl: * Bridge for I/O operations to request information about the current * transaction */ /* * Tcl interface to get the home directory for the user making the "current" * FUSE I/O request */ static int tcl_appfs_get_homedir(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { char *homedir; Tcl_Obj *homedir_obj; uid_t fsuid; static __thread Tcl_Obj *last_homedir_obj = NULL; static __thread uid_t last_fsuid = -1; if (objc != 1) { Tcl_WrongNumArgs(interp, 1, objv, NULL); return(TCL_ERROR); } fsuid = appfs_get_fsuid(); if (fsuid == last_fsuid && last_homedir_obj != NULL) { homedir_obj = last_homedir_obj; } else { homedir = appfs_get_homedir(appfs_get_fsuid()); if (homedir == NULL) { return(TCL_ERROR); } homedir_obj = Tcl_NewStringObj(homedir, -1); free(homedir); if (last_homedir_obj != NULL) { Tcl_DecrRefCount(last_homedir_obj); } last_homedir_obj = homedir_obj; last_fsuid = fsuid; Tcl_IncrRefCount(last_homedir_obj); } Tcl_SetObjResult(interp, homedir_obj); return(TCL_OK); } static int tcl_appfs_simulate_user_fs_enter(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { appfs_simulate_user_fs_enter(); return(TCL_OK); } static int tcl_appfs_simulate_user_fs_leave(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { appfs_simulate_user_fs_leave(); return(TCL_OK); } static int tcl_appfs_get_fsuid(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { uid_t fsuid; fsuid = appfs_get_fsuid(); Tcl_SetObjResult(interp, Tcl_NewWideIntObj(fsuid)); return(TCL_OK); } static int tcl_appfs_get_fsgid(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { gid_t fsgid; fsgid = appfs_get_fsgid(); Tcl_SetObjResult(interp, Tcl_NewWideIntObj(fsgid)); return(TCL_OK); } static int tcl_appfs_get_path_info_cache_flush(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { int tcl_ret; int new_size; new_size = -1; if (objc == 2) { tcl_ret = Tcl_GetIntFromObj(interp, objv[1], &new_size); if (tcl_ret != TCL_OK) { return(tcl_ret); } } else if (objc > 2 || objc < 1) { Tcl_WrongNumArgs(interp, 1, objv, "?new_cache_size?"); return(TCL_ERROR); } appfs_get_path_info_cache_flush(-1, new_size); return(TCL_OK); } static int Appfsd_Init(Tcl_Interp *interp) { #ifdef USE_TCL_STUBS if (Tcl_InitStubs(interp, TCL_VERSION, 0) == 0L) { return(TCL_ERROR); } #endif Tcl_CreateObjCommand(interp, "appfsd::get_homedir", tcl_appfs_get_homedir, NULL, NULL); Tcl_CreateObjCommand(interp, "appfsd::get_fsuid", tcl_appfs_get_fsuid, NULL, NULL); Tcl_CreateObjCommand(interp, "appfsd::get_fsgid", tcl_appfs_get_fsgid, NULL, NULL); Tcl_CreateObjCommand(interp, "appfsd::simulate_user_fs_enter", tcl_appfs_simulate_user_fs_enter, NULL, NULL); Tcl_CreateObjCommand(interp, "appfsd::simulate_user_fs_leave", tcl_appfs_simulate_user_fs_leave, NULL, NULL); Tcl_CreateObjCommand(interp, "appfsd::get_path_info_cache_flush", tcl_appfs_get_path_info_cache_flush, NULL, NULL); Tcl_PkgProvide(interp, "appfsd", "1.0"); return(TCL_OK); } /* |
︙ |
Modified appfsd.tcl from [bfe8021807] to [99393ab276].
︙ | |||
278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | + + + | } if {$pkgInfo(isLatest)} { db eval {UPDATE packages SET isLatest = 0 WHERE hostname = $hostname AND package = $pkgInfo($package) AND os = $pkgInfo($package) AND cpuArch = $pkgInfo(cpuArch);} } db eval {INSERT INTO packages (hostname, sha1, package, version, os, cpuArch, isLatest, haveManifest) VALUES ($hostname, $pkgInfo(hash), $pkgInfo(package), $pkgInfo(version), $pkgInfo(os), $pkgInfo(cpuArch), $pkgInfo(isLatest), 0);} } # Look for packages that have been deleted set found_packages [db eval {SELECT sha1 FROM packages WHERE hostname = $hostname;}] foreach package $found_packages { set found_packages_arr($package) 1 } foreach package $curr_packages { unset -nocomplain found_packages_arr($package) } foreach package [array names found_packages_arr] { db eval {DELETE FROM packages WHERE hostname = $hostname AND sha1 = $package;} } db eval {INSERT OR REPLACE INTO sites (hostname, lastUpdate, ttl) VALUES ($hostname, $now, $::appfs::ttl);} appfsd::get_path_info_cache_flush return COMPLETE } proc getpkgmanifest {hostname package_sha1} { set haveManifests [db eval {SELECT haveManifest FROM packages WHERE sha1 = $package_sha1 LIMIT 1;}] set haveManifest [lindex $haveManifests 0] |
︙ | |||
354 355 356 357 358 359 360 361 362 363 364 365 366 367 | 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 | + + | set fileInfo(directory) [join [lrange $fileInfo(name) 0 end-1] "/"] set fileInfo(name) [lindex $fileInfo(name) end] db eval {INSERT INTO files (package_sha1, type, time, source, size, perms, file_sha1, file_name, file_directory) VALUES ($package_sha1, $fileInfo(type), $fileInfo(time), $fileInfo(source), $fileInfo(size), $fileInfo(perms), $fileInfo(sha1), $fileInfo(name), $fileInfo(directory) );} db eval {UPDATE packages SET haveManifest = 1 WHERE sha1 = $package_sha1;} } } appfsd::get_path_info_cache_flush return COMPLETE } proc _localpath {package hostname file} { set dir "" catch { |
︙ |