Skip to content

Commit

Permalink
fix: build error on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
DuanKuanJun committed Jun 11, 2024
1 parent 6f93351 commit 0b310ff
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
2 changes: 2 additions & 0 deletions inc/bench.h
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,8 @@ int32_t benchParseSingleOpt(int32_t key, char* arg);

void printErrCmdCodeStr(char *cmd, int32_t code, TAOS_RES *res);

int32_t benchGetTotalMemory(int64_t *totalKB);

#ifndef LINUX
int32_t benchParseArgsNoArgp(int argc, char* argv[]);
#endif
Expand Down
4 changes: 1 addition & 3 deletions src/benchInsert.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,6 @@ int32_t getVgroupsOfDb(SBenchConn *conn, SDataBase *database) {
}
#endif // TD_VER_COMPATIBLE_3_0_0_0

// export from taos osSysinfo.c
int32_t taosGetTotalMemory(int64_t *totalKB);

int32_t toolsGetDefaultVGroups() {
int32_t cores = toolsGetNumberOfCores();
Expand All @@ -503,7 +501,7 @@ int32_t toolsGetDefaultVGroups() {
}

int64_t MemKB = 0;
taosGetTotalMemory(&MemKB);
benchGetTotalMemory(&MemKB);

infoPrint("check local machine CPU: %d Memory:%d MB \n", cores, (int32_t)(MemKB/1024));
if (MemKB <= 2*1024*1024) { // 2G
Expand Down
19 changes: 19 additions & 0 deletions src/benchUtil.c
Original file line number Diff line number Diff line change
Expand Up @@ -1253,3 +1253,22 @@ FORCE_INLINE void printErrCmdCodeStr(char *cmd, int32_t code, TAOS_RES *res) {
taos_free_result(res);
}

int32_t benchGetTotalMemory(int64_t *totalKB) {
#ifdef WINDOWS
MEMORYSTATUSEX memsStat;
memsStat.dwLength = sizeof(memsStat);
if (!GlobalMemoryStatusEx(&memsStat)) {
return -1;
}

*totalKB = memsStat.ullTotalPhys / 1024;
return 0;
#elif defined(_TD_DARWIN_64)
*totalKB = 0;
return 0;
#else
int64_t tsPageSizeKB = sysconf(_SC_PAGESIZE) / 1024;
*totalKB = (int64_t)(sysconf(_SC_PHYS_PAGES) * tsPageSizeKB);
return 0;
#endif
}

0 comments on commit 0b310ff

Please sign in to comment.