xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

change read/write to taosRead/Write

This commit is contained in:
Shengliang Guan 2020-11-06 06:25:06 +00:00
parent 9d95c7f6e6
commit 4735b224ef
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/inc/tfile.h
View File

@ -23,18 +23,17 @@ extern "C" {
#include <unistd.h> #include <unistd.h>
// init taos file module // init taos file module
int tfinit(); int32_t tfinit();
// clean up taos file module // clean up taos file module
void tfcleanup(); void tfcleanup();
// the same syntax as UNIX standard open/close/read/write // the same syntax as UNIX standard open/close/read/write
// but FD is int64_t and will never be reused // but FD is int64_t and will never be reused
int64_t tfopen(const char *pathname, int flags); int64_t tfopen(const char *pathname, int32_t flags);
int64_t tfclose(int64_t tfd); int64_t tfclose(int64_t tfd);
ssize_t tfwrite(int64_t tfd, const void *buf, size_t count); int64_t tfwrite(int64_t tfd, void *buf, int64_t count);
ssize_t tfread(int64_t tfd, void *buf, size_t count); int64_t tfread(int64_t tfd, void *buf, int64_t count);
#ifdef __cplusplus #ifdef __cplusplus
} }

25
src/util/src/tfile.c
View File

@ -19,13 +19,13 @@
#include "tutil.h" #include "tutil.h"
#include "tref.h" #include "tref.h"
static int tsFileRsetId = -1; static int32_t tsFileRsetId = -1;
static void taosCloseFile(void *p) { static void taosCloseFile(void *p) {
close((int)(uintptr_t)p); close((int32_t)(uintptr_t)p);
} }
int tfinit() { int32_t tfinit() {
tsFileRsetId = taosOpenRef(2000, taosCloseFile); tsFileRsetId = taosOpenRef(2000, taosCloseFile);
return tsFileRsetId; return tsFileRsetId;
} }
@ -35,8 +35,8 @@ void tfcleanup() {
tsFileRsetId = -1; tsFileRsetId = -1;
} }
int64_t tfopen(const char *pathname, int flags) { int64_t tfopen(const char *pathname, int32_t flags) {
int fd = open(pathname, flags); int32_t fd = open(pathname, flags);
if (fd < 0) { if (fd < 0) {
terrno = TAOS_SYSTEM_ERROR(errno); terrno = TAOS_SYSTEM_ERROR(errno);
@ -54,31 +54,28 @@ int64_t tfclose(int64_t tfd) {
return taosRemoveRef(tsFileRsetId, tfd); return taosRemoveRef(tsFileRsetId, tfd);
} }
ssize_t tfwrite(int64_t tfd, const void *buf, size_t count) { int64_t tfwrite(int64_t tfd, void *buf, int64_t count) {
void *p = taosAcquireRef(tsFileRsetId, tfd); void *p = taosAcquireRef(tsFileRsetId, tfd);
if (p == NULL) return -1; if (p == NULL) return -1;
int fd = (int)(uintptr_t)p; int32_t fd = (int32_t)(uintptr_t)p;
ssize_t ret = write(fd, buf, (uint32_t)count); int64_t ret = taosWrite(fd, buf, count);
if (ret < 0) terrno = TAOS_SYSTEM_ERROR(errno); if (ret < 0) terrno = TAOS_SYSTEM_ERROR(errno);
taosReleaseRef(tsFileRsetId, tfd); taosReleaseRef(tsFileRsetId, tfd);
return ret; return ret;
} }
ssize_t tfread(int64_t tfd, void *buf, size_t count) { int64_t tfread(int64_t tfd, void *buf, int64_t count) {
void *p = taosAcquireRef(tsFileRsetId, tfd); void *p = taosAcquireRef(tsFileRsetId, tfd);
if (p == NULL) return -1; if (p == NULL) return -1;
int fd = (int)(uintptr_t)p; int32_t fd = (int32_t)(uintptr_t)p;
ssize_t ret = read(fd, buf, (uint32_t)count); int64_t ret = taosRead(fd, buf, count);
if (ret < 0) terrno = TAOS_SYSTEM_ERROR(errno); if (ret < 0) terrno = TAOS_SYSTEM_ERROR(errno);
taosReleaseRef(tsFileRsetId, tfd); taosReleaseRef(tsFileRsetId, tfd);
return ret; return ret;
} }