Overview
| Comment: | Updated to call Tcl_Preserve/Tcl_Release as appropriate |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
d9f1a05711323fb72b3f01377bbb6d76 |
| User & Date: | rkeene on 2014-11-12 05:54:38 |
| Other Links: | manifest | tags |
Context
|
2014-11-12
| ||
| 08:36 | Corrected issue where package name was not considered when looking up package check-in: eb52173aaa user: rkeene tags: trunk | |
| 05:54 | Updated to call Tcl_Preserve/Tcl_Release as appropriate check-in: d9f1a05711 user: rkeene tags: trunk | |
| 05:46 | Fixed actual problem with interruptions (which was really unrelated) -- Tcl notifier thread is terminated on fork() called by fuse_main(), since we create a Tcl interpreter for testing before calling fuse_main() the notifier dies and is not restarted. We now terminate it before fork(). check-in: 0819a7a89c user: rkeene tags: trunk | |
Changes
Modified appfsd.c from [3ceaeb1976] to [e49bb6021f].
| ︙ | ︙ | |||
658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 |
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);
attr_key_time = Tcl_NewStringObj("time", -1);
attr_key_source = Tcl_NewStringObj("source", -1);
attr_key_childcount = Tcl_NewStringObj("childcount", -1);
attr_key_packaged = Tcl_NewStringObj("packaged", -1);
}
attrs_dict = Tcl_GetObjResult(interp);
tcl_ret = Tcl_DictObjGet(interp, attrs_dict, attr_key_type, &attr_value);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("[dict get \"type\"] failed");
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-EIO);
}
if (attr_value == NULL) {
return(-EIO);
}
pathinfo->packaged = 0;
pathinfo->inode = appfs_get_path_inode(path);
attr_value_str = Tcl_GetString(attr_value);
| > > > > > > > > | 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 |
return(0);
}
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
Tcl_Preserve(interp);
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);
Tcl_Release(interp);
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);
attr_key_time = Tcl_NewStringObj("time", -1);
attr_key_source = Tcl_NewStringObj("source", -1);
attr_key_childcount = Tcl_NewStringObj("childcount", -1);
attr_key_packaged = Tcl_NewStringObj("packaged", -1);
}
attrs_dict = Tcl_GetObjResult(interp);
tcl_ret = Tcl_DictObjGet(interp, attrs_dict, attr_key_type, &attr_value);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("[dict get \"type\"] failed");
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
Tcl_Release(interp);
return(-EIO);
}
if (attr_value == NULL) {
Tcl_Release(interp);
return(-EIO);
}
pathinfo->packaged = 0;
pathinfo->inode = appfs_get_path_inode(path);
attr_value_str = Tcl_GetString(attr_value);
|
| ︙ | ︙ | |||
757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 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 |
case 'F': /* pipe/fifo */
pathinfo->type = APPFS_PATHTYPE_FIFO;
break;
case 'S': /* UNIX domain socket */
pathinfo->type = APPFS_PATHTYPE_SOCKET;
break;
default:
return(-EIO);
}
Tcl_DictObjGet(interp, attrs_dict, attr_key_packaged, &attr_value);
if (attr_value != NULL) {
pathinfo->packaged = 1;
}
Tcl_DictObjGet(interp, attrs_dict, attr_key_time, &attr_value);
if (attr_value != NULL) {
tcl_ret = Tcl_GetWideIntFromObj(NULL, attr_value, &attr_value_wide);
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);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::prepare_to_create(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(NULL);
}
real_path = Tcl_GetStringResult(interp);
if (real_path == NULL) {
return(NULL);
}
return(strdup(real_path));
}
static char *appfs_localpath(const char *path) {
Tcl_Interp *interp;
const char *real_path;
int tcl_ret;
interp = appfs_TclInterp();
if (interp == NULL) {
return(NULL);
}
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::localpath", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::localpath(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(NULL);
}
real_path = Tcl_GetStringResult(interp);
if (real_path == NULL) {
return(NULL);
}
return(strdup(real_path));
}
| > > > > > > > > > > > > > > > > | 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 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 |
case 'F': /* pipe/fifo */
pathinfo->type = APPFS_PATHTYPE_FIFO;
break;
case 'S': /* UNIX domain socket */
pathinfo->type = APPFS_PATHTYPE_SOCKET;
break;
default:
Tcl_Release(interp);
return(-EIO);
}
Tcl_DictObjGet(interp, attrs_dict, attr_key_packaged, &attr_value);
if (attr_value != NULL) {
pathinfo->packaged = 1;
}
Tcl_DictObjGet(interp, attrs_dict, attr_key_time, &attr_value);
if (attr_value != NULL) {
tcl_ret = Tcl_GetWideIntFromObj(NULL, attr_value, &attr_value_wide);
if (tcl_ret == TCL_OK) {
pathinfo->time = attr_value_wide;
}
} else {
pathinfo->time = 0;
}
Tcl_Release(interp);
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_Preserve(interp);
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::prepare_to_create", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::prepare_to_create(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
Tcl_Release(interp);
return(NULL);
}
real_path = Tcl_GetStringResult(interp);
Tcl_Release(interp);
if (real_path == NULL) {
return(NULL);
}
return(strdup(real_path));
}
static char *appfs_localpath(const char *path) {
Tcl_Interp *interp;
const char *real_path;
int tcl_ret;
interp = appfs_TclInterp();
if (interp == NULL) {
return(NULL);
}
Tcl_Preserve(interp);
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::localpath", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::localpath(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(NULL);
}
real_path = Tcl_GetStringResult(interp);
Tcl_Release(interp);
if (real_path == NULL) {
return(NULL);
}
return(strdup(real_path));
}
|
| ︙ | ︙ | |||
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 |
APPFS_DEBUG("Enter (path = %s, ...)", path);
interp = appfs_TclInterp();
if (interp == NULL) {
return(0);
}
filler(buf, ".", NULL, 0);
filler(buf, "..", NULL, 0);
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::getchildren", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::getchildren(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(0);
}
tcl_ret = Tcl_ListObjGetElements(interp, Tcl_GetObjResult(interp), &children_count, &children);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("Parsing list of children on path %s failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(0);
}
for (idx = 0; idx < children_count; idx++) {
filler(buf, Tcl_GetString(children[idx]), NULL, 0);
}
return(0);
}
static int appfs_fuse_open(const char *path, struct fuse_file_info *fi) {
Tcl_Interp *interp;
struct appfs_pathinfo pathinfo;
| > > > > > > > > | 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 |
APPFS_DEBUG("Enter (path = %s, ...)", path);
interp = appfs_TclInterp();
if (interp == NULL) {
return(0);
}
Tcl_Preserve(interp);
filler(buf, ".", NULL, 0);
filler(buf, "..", NULL, 0);
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::getchildren", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::getchildren(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
Tcl_Release(interp);
return(0);
}
tcl_ret = Tcl_ListObjGetElements(interp, Tcl_GetObjResult(interp), &children_count, &children);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("Parsing list of children on path %s failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
Tcl_Release(interp);
return(0);
}
for (idx = 0; idx < children_count; idx++) {
filler(buf, Tcl_GetString(children[idx]), NULL, 0);
}
Tcl_Release(interp);
return(0);
}
static int appfs_fuse_open(const char *path, struct fuse_file_info *fi) {
Tcl_Interp *interp;
struct appfs_pathinfo pathinfo;
|
| ︙ | ︙ | |||
1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 |
return(-EISDIR);
}
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
tcl_ret = appfs_Tcl_Eval(interp, 3, "::appfs::openpath", path, mode);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::openpath(%s, %s) failed.", path, mode);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-EIO);
}
real_path = Tcl_GetStringResult(interp);
if (real_path == NULL) {
return(-EIO);
}
APPFS_DEBUG("Translated request to open %s to opening %s (mode = \"%s\")", path, real_path, mode);
fh = open(real_path, fi->flags, 0600);
| > > > > > > > | 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 |
return(-EISDIR);
}
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
Tcl_Preserve(interp);
tcl_ret = appfs_Tcl_Eval(interp, 3, "::appfs::openpath", path, mode);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::openpath(%s, %s) failed.", path, mode);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
Tcl_Release(interp);
return(-EIO);
}
real_path = Tcl_GetStringResult(interp);
Tcl_Release(interp);
if (real_path == NULL) {
return(-EIO);
}
APPFS_DEBUG("Translated request to open %s to opening %s (mode = \"%s\")", path, real_path, mode);
fh = open(real_path, fi->flags, 0600);
|
| ︙ | ︙ | |||
1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 |
}
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::unlinkpath", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::unlinkpath(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-EIO);
}
return(0);
}
static int appfs_fuse_mkdir(const char *path, mode_t mode) {
char *real_path;
int mkdir_ret;
| > > > > | 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 |
}
tcl_ret = appfs_Tcl_Eval(interp, 2, "::appfs::unlinkpath", path);
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::unlinkpath(%s) failed.", path);
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
Tcl_Release(interp);
return(-EIO);
}
Tcl_Release(interp);
return(0);
}
static int appfs_fuse_mkdir(const char *path, mode_t mode) {
char *real_path;
int mkdir_ret;
|
| ︙ | ︙ | |||
1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 |
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");
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::openpath(%s, %s) failed.", path, "write");
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
return(-EIO);
}
real_path = Tcl_GetStringResult(interp);
if (real_path == NULL) {
return(-EIO);
}
appfs_simulate_user_fs_enter();
chmod_ret = chmod(real_path, mode);
| > > > > > > > | 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 |
appfs_get_path_info_cache_rm(path, appfs_get_fsuid());
interp = appfs_TclInterp();
if (interp == NULL) {
return(-EIO);
}
Tcl_Preserve(interp);
tcl_ret = appfs_Tcl_Eval(interp, 3, "::appfs::openpath", path, "write");
if (tcl_ret != TCL_OK) {
APPFS_DEBUG("::appfs::openpath(%s, %s) failed.", path, "write");
APPFS_DEBUG("Tcl Error is: %s", Tcl_GetStringResult(interp));
Tcl_Release(interp);
return(-EIO);
}
real_path = Tcl_GetStringResult(interp);
Tcl_Release(interp);
if (real_path == NULL) {
return(-EIO);
}
appfs_simulate_user_fs_enter();
chmod_ret = chmod(real_path, mode);
|
| ︙ | ︙ |