diff --git a/src/inc/tfs.h b/src/inc/tfs.h index e0a86fa062a92d456a4b3dcbf4ef8cdf04c4c0ce..cf9988653d372467a9260f2456cceb4aa7c626f3 100644 --- a/src/inc/tfs.h +++ b/src/inc/tfs.h @@ -27,38 +27,35 @@ typedef struct { int id; } SDiskID; -// tfs.c +// tfs.c ==================================== int tfsInit(SDiskCfg *pDiskCfg, int ndisk); void tfsDestroy(); int tfsUpdateInfo(); -int tfsCreateDir(char *dirname); -int tfsRemoveDir(char *dirname); -int tfsRename(char *oldpath, char *newpath); +const char *tfsGetDiskName(int level, int id); const char *tfsPrimaryPath(); -// tfcntl.c +// tfcntl.c ==================================== typedef struct TFSFILE TFSFILE; -typedef struct TFSDIR TFSDIR; - -TFSDIR * tfsOpenDir(char *dir); -void tfsCloseDir(TFSDIR *tdir); -const TFSFILE *tfsReadDir(TFSDIR *tdir); const char *tfsAbsName(TFSFILE *pfile); const char *tfsRelName(TFSFILE *pfile); void tfsDirName(TFSFILE *pfile, char dest[]); void tfsBaseName(TFSFILE *pfile, char dest[]); +int tfsopen(TFSFILE *pfile, int flags); +int tfsclose(int fd); +TFSFILE * tfsCreateFiles(int level, int nfile, ...); +int tfsRemoveFiles(int nfile, ...); +SDiskID tfsFileID(TFSFILE *pfile); -int tfsopen(TFSFILE *pfile, int flags); -int tfsclose(int fd); - -TFSFILE *tfsCreateFiles(int level, int nfile, ...); -int tfsRemoveFiles(int nfile, ...); +typedef struct TFSDIR TFSDIR; -SDiskID tfsFileID(TFSFILE *pfile); - -const char *tfsGetDiskName(int level, int id); +int tfsCreateDir(char *dirname); +int tfsRemoveDir(char *dirname); +int tfsRename(char *oldpath, char *newpath); +TFSDIR * tfsOpenDir(char *dir); +void tfsCloseDir(TFSDIR *tdir); +const TFSFILE *tfsReadDir(TFSDIR *tdir); #ifdef __cplusplus } diff --git a/src/tfs/inc/tfsint.h b/src/tfs/inc/tfsint.h index 1a92868a5d7a455035896c22a4385ba6146cf6fa..0ee1a926411779b0760d21e511ec4733357f7157 100644 --- a/src/tfs/inc/tfsint.h +++ b/src/tfs/inc/tfsint.h @@ -43,7 +43,13 @@ int tfsUpdateDiskInfo(SDisk *pDisk); const char *tfsDiskDir(SDisk *pDisk); // ttier.c -typedef struct STier STier; +#define TSDB_MAX_DISK_PER_TIER 16 + +typedef struct STier { + int level; + int ndisk; + SDisk *disks[TSDB_MAX_DISK_PER_TIER]; +} STier; #define DISK_AT_TIER(pTier, id) ((pTier)->disks[id]) diff --git a/src/tfs/src/ttier.c b/src/tfs/src/ttier.c index d7f45d033136da8b7a5637649bbfb205b7564de7..fbad4c9f3c8eb7806438eec49c583ae080e74db5 100644 --- a/src/tfs/src/ttier.c +++ b/src/tfs/src/ttier.c @@ -17,13 +17,6 @@ #include "tfsint.h" #include "taoserror.h" -#define TSDB_MAX_DISK_PER_TIER 16 -struct STier { - int level; - int ndisk; - SDisk *disks[TSDB_MAX_DISK_PER_TIER]; -}; - // PROTECTED ========================================== void tfsInitTier(STier *pTier, int level) { pTier->level = level;