Overview
Comment: | First implementation of nearly complete channel driver, marked more TODO and cleaned up whitespace |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
38bed7cee0b796aa128543211afd0694 |
User & Date: | rkeene on 2019-09-13 18:43:08 |
Other Links: | manifest | tags |
Context
2019-09-13
| ||
21:44 | Whitespace cleanup check-in: 48adf54b98 user: rkeene tags: trunk | |
18:43 | First implementation of nearly complete channel driver, marked more TODO and cleaned up whitespace check-in: 38bed7cee0 user: rkeene tags: trunk | |
16:02 | Added better error reporting in the core and as part of the ABI check-in: 149aa89b7d user: rkeene tags: trunk | |
Changes
Modified example/main.tcl from [20bdf959be] to [ff243d60b5].
|
| > > > > > > > | > | 1 2 3 4 5 6 7 8 9 | set fd [open "//xvfs:/example/foo"] seek $fd 0 end seek $fd -1 current set check [read $fd 1] if {$check != "\n"} { error "EXPECTED: (new line); GOT: [binary encode hex $check]" } puts "ALL TESTS PASSED" |
Modified xvfs-core.c from [ca046857f0] to [748a396e19].
1 2 3 4 5 6 7 8 9 | #include <xvfs-core.h> #include <string.h> #include <tcl.h> #if defined(XVFS_MODE_FLEXIBLE) || defined(XVFS_MODE_SERVER) #define XVFS_INTERNAL_SERVER_MAGIC "\xD4\xF3\x05\x96\x25\xCF\xAF\xFE" #define XVFS_INTERNAL_SERVER_MAGIC_LEN 8 struct xvfs_tclfs_server_info { | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 | #include <xvfs-core.h> #include <string.h> #include <sys/stat.h> #include <errno.h> #include <fcntl.h> #include <tcl.h> #if defined(XVFS_MODE_FLEXIBLE) || defined(XVFS_MODE_SERVER) #define XVFS_INTERNAL_SERVER_MAGIC "\xD4\xF3\x05\x96\x25\xCF\xAF\xFE" #define XVFS_INTERNAL_SERVER_MAGIC_LEN 8 struct xvfs_tclfs_server_info { |
︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | if (pathStr[rootLen] != '/') { return(NULL); } return(pathStr + rootLen + 1); } static const char *xvfs_perror(int xvfs_error) { if (xvfs_error >= 0) { return("Not an error"); } switch (xvfs_error) { case XVFS_RV_ERR_ENOENT: return("No such file or directory"); case XVFS_RV_ERR_EINVAL: return("Invalid argument"); case XVFS_RV_ERR_EISDIR: return("Is a directory"); case XVFS_RV_ERR_ENOTDIR: return("Not a directory"); case XVFS_RV_ERR_EFAULT: return("Bad address"); default: return("Unknown error"); } } /* * Internal Tcl_Filesystem functions, with the appropriate instance info */ static int xvfs_tclfs_pathInFilesystem(Tcl_Obj *path, ClientData *dataPtr, struct xvfs_tclfs_instance_info *instanceInfo) { const char *relativePath; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 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 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 | if (pathStr[rootLen] != '/') { return(NULL); } return(pathStr + rootLen + 1); } #if 0 /* * Currently unused */ static const char *xvfs_perror(int xvfs_error) { if (xvfs_error >= 0) { return("Not an error"); } switch (xvfs_error) { case XVFS_RV_ERR_ENOENT: return("No such file or directory"); case XVFS_RV_ERR_EINVAL: return("Invalid argument"); case XVFS_RV_ERR_EISDIR: return("Is a directory"); case XVFS_RV_ERR_ENOTDIR: return("Not a directory"); case XVFS_RV_ERR_EFAULT: return("Bad address"); default: return("Unknown error"); } } #endif static int xvfs_errorToErrno(int xvfs_error) { if (xvfs_error >= 0) { return(0); } switch (xvfs_error) { case XVFS_RV_ERR_ENOENT: return(ENOENT); case XVFS_RV_ERR_EINVAL: return(EINVAL); case XVFS_RV_ERR_EISDIR: return(EISDIR); case XVFS_RV_ERR_ENOTDIR: return(ENOTDIR); case XVFS_RV_ERR_EFAULT: return(EFAULT); default: return(ERANGE); } } /* * Xvfs Memory Channel */ struct xvfs_tclfs_channel_id { Tcl_Channel channel; struct xvfs_tclfs_instance_info *fsInstanceInfo; Tcl_Obj *path; Tcl_WideInt currentOffset; Tcl_WideInt fileSize; }; static Tcl_ChannelType xvfs_tclfs_channelType; static Tcl_Channel xvfs_tclfs_openChannel(Tcl_Obj *path, struct xvfs_tclfs_instance_info *instanceInfo) { struct xvfs_tclfs_channel_id *channelInstanceData; Tcl_Channel channel; Tcl_StatBuf fileInfo; int statRet; statRet = instanceInfo->fsInfo->getStatProc(Tcl_GetString(path), &fileInfo); if (statRet < 0) { return(NULL); } channelInstanceData = (struct xvfs_tclfs_channel_id *) Tcl_Alloc(sizeof(*channelInstanceData)); channelInstanceData->currentOffset = 0; channelInstanceData->channel = NULL; channelInstanceData->fsInstanceInfo = instanceInfo; channelInstanceData->path = path; channelInstanceData->fileSize = fileInfo.st_size; Tcl_IncrRefCount(path); channel = Tcl_CreateChannel(&xvfs_tclfs_channelType, Tcl_GetString(path), channelInstanceData, TCL_READABLE); if (!channel) { Tcl_DecrRefCount(path); Tcl_Free((char *) channelInstanceData); return(NULL); } channelInstanceData->channel = channel; return(channel); } static int xvfs_tclfs_closeChannel(ClientData channelInstanceData_p, Tcl_Interp *interp) { struct xvfs_tclfs_channel_id *channelInstanceData; channelInstanceData = (struct xvfs_tclfs_channel_id *) channelInstanceData_p; Tcl_DecrRefCount(channelInstanceData->path); Tcl_Free((char *) channelInstanceData); return(0); } static int xvfs_tclfs_readChannel(ClientData channelInstanceData_p, char *buf, int bufSize, int *errorCodePtr) { struct xvfs_tclfs_channel_id *channelInstanceData; const unsigned char *data; Tcl_WideInt offset, length; char *path; channelInstanceData = (struct xvfs_tclfs_channel_id *) channelInstanceData_p; path = Tcl_GetString(channelInstanceData->path); offset = channelInstanceData->currentOffset; length = bufSize; data = channelInstanceData->fsInstanceInfo->fsInfo->getDataProc(path, offset, &length); if (length < 0) { *errorCodePtr = xvfs_errorToErrno(length); return(-1); } memcpy(buf, data, length); channelInstanceData->currentOffset += length; return(length); } static void xvfs_tclfs_watchChannel(ClientData channelInstanceData_p, int mask) { if ((mask & TCL_READABLE) != TCL_READABLE) { return; } /* XXX:TODO: fprintf(stderr, "Incomplete watch called, mask = %i\n", mask); */ return; } static int xvfs_tclfs_seekChannel(ClientData channelInstanceData_p, long offset, int mode, int *errorCodePtr) { struct xvfs_tclfs_channel_id *channelInstanceData; Tcl_WideInt newOffset, fileSize; channelInstanceData = (struct xvfs_tclfs_channel_id *) channelInstanceData_p; newOffset = channelInstanceData->currentOffset; fileSize = channelInstanceData->fileSize; switch (mode) { case SEEK_CUR: newOffset += offset; break; case SEEK_SET: newOffset = offset; break; case SEEK_END: newOffset = fileSize + offset; break; default: *errorCodePtr = xvfs_errorToErrno(XVFS_RV_ERR_EINVAL); return(-1); } /* * We allow users to seek right up to the end of the buffer, but * no further, this way if they want to seek backwards from there * it is possible to do so. */ if (newOffset < 0 || newOffset > fileSize) { *errorCodePtr = xvfs_errorToErrno(XVFS_RV_ERR_EINVAL); return(-1); } channelInstanceData->currentOffset = newOffset; return(channelInstanceData->currentOffset); } static void xvfs_tclfs_prepareChannelType(void) { xvfs_tclfs_channelType.typeName = "xvfs"; xvfs_tclfs_channelType.version = TCL_CHANNEL_VERSION_2; xvfs_tclfs_channelType.closeProc = xvfs_tclfs_closeChannel; xvfs_tclfs_channelType.inputProc = xvfs_tclfs_readChannel; xvfs_tclfs_channelType.outputProc = NULL; xvfs_tclfs_channelType.watchProc = xvfs_tclfs_watchChannel; xvfs_tclfs_channelType.getHandleProc = NULL; xvfs_tclfs_channelType.seekProc = xvfs_tclfs_seekChannel; xvfs_tclfs_channelType.setOptionProc = NULL; xvfs_tclfs_channelType.getOptionProc = NULL; xvfs_tclfs_channelType.close2Proc = NULL; xvfs_tclfs_channelType.blockModeProc = NULL; xvfs_tclfs_channelType.flushProc = NULL; xvfs_tclfs_channelType.handlerProc = NULL; xvfs_tclfs_channelType.wideSeekProc = NULL; xvfs_tclfs_channelType.threadActionProc = NULL; xvfs_tclfs_channelType.truncateProc = NULL; } /* * Internal Tcl_Filesystem functions, with the appropriate instance info */ static int xvfs_tclfs_pathInFilesystem(Tcl_Obj *path, ClientData *dataPtr, struct xvfs_tclfs_instance_info *instanceInfo) { const char *relativePath; |
︙ | ︙ | |||
101 102 103 104 105 106 107 | static Tcl_Obj *xvfs_tclfs_listVolumes(struct xvfs_tclfs_instance_info *instanceInfo) { return(NULL); } static Tcl_Channel xvfs_tclfs_openFileChannel(Tcl_Interp *interp, Tcl_Obj *path, int mode, int permissions, struct xvfs_tclfs_instance_info *instanceInfo) { const char *pathStr; | < < < < > | < | | > | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 | static Tcl_Obj *xvfs_tclfs_listVolumes(struct xvfs_tclfs_instance_info *instanceInfo) { return(NULL); } static Tcl_Channel xvfs_tclfs_openFileChannel(Tcl_Interp *interp, Tcl_Obj *path, int mode, int permissions, struct xvfs_tclfs_instance_info *instanceInfo) { const char *pathStr; pathStr = xvfs_relativePath(path, instanceInfo); if (mode & O_WRONLY) { return(NULL); } return(xvfs_tclfs_openChannel(Tcl_NewStringObj(pathStr, -1), instanceInfo)); } #endif /* XVFS_MODE_SERVER || XVFS_MODE_STANDALONE || XVFS_MODE_FLEIXBLE */ #if defined(XVFS_MODE_STANDALONE) || defined(XVFS_MODE_FLEXIBLE) /* * Tcl_Filesystem handlers for the standalone implementation */ static struct xvfs_tclfs_instance_info xvfs_tclfs_standalone_info; |
︙ | ︙ | |||
187 188 189 190 191 192 193 | xvfs_tclfs_standalone_fs.createInternalRepProc = NULL; xvfs_tclfs_standalone_fs.normalizePathProc = NULL; xvfs_tclfs_standalone_fs.filesystemPathTypeProc = NULL; xvfs_tclfs_standalone_fs.filesystemSeparatorProc = NULL; xvfs_tclfs_standalone_fs.statProc = xvfs_tclfs_standalone_stat; xvfs_tclfs_standalone_fs.accessProc = NULL; xvfs_tclfs_standalone_fs.openFileChannelProc = xvfs_tclfs_standalone_openFileChannel; | | | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | xvfs_tclfs_standalone_fs.createInternalRepProc = NULL; xvfs_tclfs_standalone_fs.normalizePathProc = NULL; xvfs_tclfs_standalone_fs.filesystemPathTypeProc = NULL; xvfs_tclfs_standalone_fs.filesystemSeparatorProc = NULL; xvfs_tclfs_standalone_fs.statProc = xvfs_tclfs_standalone_stat; xvfs_tclfs_standalone_fs.accessProc = NULL; xvfs_tclfs_standalone_fs.openFileChannelProc = xvfs_tclfs_standalone_openFileChannel; xvfs_tclfs_standalone_fs.matchInDirectoryProc = NULL; /* XXX:TODO */ xvfs_tclfs_standalone_fs.utimeProc = NULL; xvfs_tclfs_standalone_fs.linkProc = NULL; xvfs_tclfs_standalone_fs.listVolumesProc = xvfs_tclfs_standalone_listVolumes; xvfs_tclfs_standalone_fs.fileAttrStringsProc = NULL; xvfs_tclfs_standalone_fs.fileAttrsGetProc = NULL; xvfs_tclfs_standalone_fs.fileAttrsSetProc = NULL; xvfs_tclfs_standalone_fs.createDirectoryProc = NULL; |
︙ | ︙ | |||
217 218 219 220 221 222 223 224 225 226 227 228 229 230 | if (tcl_ret != TCL_OK) { if (interp) { Tcl_SetResult(interp, "Tcl_FSRegister() failed", NULL); } return(tcl_ret); } return(TCL_OK); } #endif /* XVFS_MODE_STANDALONE || XVFS_MODE_FLEXIBLE */ #if defined(XVFS_MODE_FLEXIBLE) static int xvfs_flexible_register(Tcl_Interp *interp, struct Xvfs_FSInfo *fsInfo) { | > > | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 | if (tcl_ret != TCL_OK) { if (interp) { Tcl_SetResult(interp, "Tcl_FSRegister() failed", NULL); } return(tcl_ret); } xvfs_tclfs_prepareChannelType(); return(TCL_OK); } #endif /* XVFS_MODE_STANDALONE || XVFS_MODE_FLEXIBLE */ #if defined(XVFS_MODE_FLEXIBLE) static int xvfs_flexible_register(Tcl_Interp *interp, struct Xvfs_FSInfo *fsInfo) { |
︙ | ︙ |
Modified xvfs.c.rvt from [79089b8f52] to [4ed9e26994].
︙ | ︙ | |||
34 35 36 37 38 39 40 | unsigned int pathHash; size_t pathLen; if (path == NULL) { return(XVFS_NAME_LOOKUP_ERROR); } | < < | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | unsigned int pathHash; size_t pathLen; if (path == NULL) { return(XVFS_NAME_LOOKUP_ERROR); } pathLen = strlen(path); pathHash = Tcl_ZlibAdler32(0, (const unsigned char *) path, pathLen); switch (pathHash) { <? for {set index 0} {$index < [llength $::xvfs::outputFiles]} {incr index} { set outputFile [lindex $::xvfs::outputFiles $index] set outputFileHash [zlib adler32 $outputFile 0] |
︙ | ︙ |