Merge pull request #6057 from taosdata/feature/cp

Feature/cp

src/common/inc/tdataformat.h

@@ -15,10 +15,7 @@
 #ifndef _TD_DATA_FORMAT_H_
 #define _TD_DATA_FORMAT_H_
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include "os.h"
 #include "talgo.h"
 #include "ttype.h"
 #include "tutil.h"

src/inc/taosdef.h

@@ -22,7 +22,6 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "osDef.h"
 #include "taos.h"
 
 #define TSDB__packed

src/inc/ttype.h

@@ -5,6 +5,8 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
+#include <stdint.h>
 #include "taosdef.h"
 
 // ----------------- For variable data types such as TSDB_DATA_TYPE_BINARY and TSDB_DATA_TYPE_NCHAR

src/os/CMakeLists.txt

@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 IF (TD_LINUX)
-  ADD_SUBDIRECTORY(src/linux)
+  ADD_SUBDIRECTORY(src/linux)  
 ELSEIF (TD_DARWIN)
   ADD_SUBDIRECTORY(src/darwin)  
 ELSEIF (TD_WINDOWS)

src/os/inc/os.h

@@ -20,42 +20,7 @@
 extern "C" {
 #endif
 
-#ifdef _TD_DARWIN_64
-#include "osDarwin.h"
-#endif
-
-#ifdef _TD_ARM_64
-#include "osArm64.h"
-#endif
-
-#ifdef _TD_ARM_32
-#include "osArm32.h"
-#endif
-
-#ifdef _TD_MIPS_64
-#include "osMips64.h"
-#endif
-
-#ifdef _TD_LINUX_64
-#include "osLinux64.h"
-#endif
-
-#ifdef _TD_LINUX_32
-#include "osLinux32.h"
-#endif
-
-#ifdef _ALPINE
-#include "osAlpine.h"
-#endif
-
-#ifdef _TD_NINGSI_60
-#include "osNingsi.h"
-#endif
-
-#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
-#include "osWindows.h"
-#endif
-
+#include "osInc.h"
 #include "osDef.h"
 #include "osAtomic.h"
 #include "osDir.h"

src/os/inc/osAlpine.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_OS_ALPINE_H
-#define TDENGINE_OS_ALPINE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <argp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/sendfile.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <linux/sysctl.h>
-#include <math.h>
-
-typedef int(*__compar_fn_t)(const void *, const void *);
-void  error (int, int, const char *);
-#ifndef PTHREAD_MUTEX_RECURSIVE_NP
-  #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/os/inc/osArm32.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_OS_ARM32_H
-#define TDENGINE_OS_ARM32_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <argp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/sendfile.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <error.h>
-#include <math.h>
-#include <poll.h>
-
-#define TAOS_OS_FUNC_LZ4
-  #define BUILDIN_CLZL(val) __builtin_clzll(val)
-  #define BUILDIN_CTZL(val) __builtin_ctzll(val)
-  #define BUILDIN_CLZ(val) __builtin_clz(val)
-  #define BUILDIN_CTZ(val) __builtin_ctz(val)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/os/inc/osArm64.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_OS_ARM64_H
-#define TDENGINE_OS_ARM64_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <argp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/sendfile.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <error.h>
-#include <linux/sysctl.h>
-#include <math.h>
-#include <poll.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/os/inc/osDef.h

@@ -20,6 +20,103 @@
 extern "C" {
 #endif
 
+#if defined(_TD_DARWIN_64)
+  // specific
+  typedef int(*__compar_fn_t)(const void *, const void *);
+
+  // for send function in tsocket.c
+  #if defined(MSG_NOSIGNAL)
+    #undef MSG_NOSIGNAL
+  #endif
+
+  #define MSG_NOSIGNAL             0
+
+  #define SO_NO_CHECK              0x1234
+  #define SOL_TCP                  0x1234
+  #define TCP_KEEPIDLE             0x1234
+
+  #ifndef PTHREAD_MUTEX_RECURSIVE_NP
+    #define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+  #endif
+#endif
+
+#if defined(_ALPINE)
+  typedef int(*__compar_fn_t)(const void *, const void *);
+  void  error (int, int, const char *);
+  #ifndef PTHREAD_MUTEX_RECURSIVE_NP
+    #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+  #endif
+#endif
+
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  char *stpcpy (char *dest, const char *src);
+  char *stpncpy (char *dest, const char *src, size_t n);
+
+  // specific
+  typedef int (*__compar_fn_t)(const void *, const void *);
+  #define ssize_t int
+  #define bzero(ptr, size) memset((ptr), 0, (size))
+  #define strcasecmp  _stricmp
+  #define strncasecmp _strnicmp
+  #define wcsncasecmp _wcsnicmp
+  #define strtok_r strtok_s
+  #define snprintf _snprintf
+  #define in_addr_t unsigned long
+  #define socklen_t int
+
+  struct tm *localtime_r(const time_t *timep, struct tm *result);
+  char *     strptime(const char *buf, const char *fmt, struct tm *tm);
+  char *     strsep(char **stringp, const char *delim);
+  char *     getpass(const char *prefix);
+  int        flock(int fd, int option);
+  char *     strndup(const char *s, size_t n);
+  int        gettimeofday(struct timeval *ptv, void *pTimeZone);
+
+  // for send function in tsocket.c
+  #define MSG_NOSIGNAL             0
+  #define SO_NO_CHECK              0x1234
+  #define SOL_TCP                  0x1234
+
+  #ifndef TCP_KEEPCNT
+  #define TCP_KEEPCNT              0x1234
+  #endif
+
+  #ifndef TCP_KEEPIDLE
+  #define TCP_KEEPIDLE             0x1234
+  #endif
+
+  #ifndef TCP_KEEPINTVL
+  #define TCP_KEEPINTVL            0x1234
+  #endif
+
+  #define SHUT_RDWR                SD_BOTH
+  #define SHUT_RD                  SD_RECEIVE
+  #define SHUT_WR                  SD_SEND
+
+  #define LOCK_EX 1
+  #define LOCK_NB 2
+  #define LOCK_UN 3
+
+  #ifndef PATH_MAX
+  #define PATH_MAX 256
+  #endif
+
+  typedef struct {
+    int    we_wordc;
+    char  *we_wordv[1];
+    int    we_offs;
+    char   wordPos[1025];
+  } wordexp_t;
+  int  wordexp(char *words, wordexp_t *pwordexp, int flags);
+  void wordfree(wordexp_t *pwordexp);
+
+  #define openlog(a, b, c)
+  #define closelog()
+  #define LOG_ERR 0
+  #define LOG_INFO 1
+  void syslog(int unused, const char *format, ...);
+#endif
+
 #ifndef WINDOWS
   #ifndef O_BINARY
     #define O_BINARY 0

src/os/inc/osEok.h

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _eok_h_fd274616_996c_400e_9023_ae70be881fa3_
-#define _eok_h_fd274616_996c_400e_9023_ae70be881fa3_
+#ifndef TDENGINE_OS_EOK_H
+#define TDENGINE_OS_EOK_H
 
 #include <stdint.h>
 

src/os/inc/osDarwin.h → src/os/inc/osInc.h

@@ -13,84 +13,103 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_DARWIN_H
-#define TDENGINE_OS_DARWIN_H
+#ifndef TDENGINE_OS_INC_H
+#define TDENGINE_OS_INC_H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <arpa/inet.h>
 #include <assert.h>
 #include <ctype.h>
-#include <dirent.h>
 #include <errno.h>
 #include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
+#include <inttypes.h>
 #include <locale.h>
 #include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
 #include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
 #include <semaphore.h>
 #include <signal.h>
 #include <stdarg.h>
 #include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <strings.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <dispatch/dispatch.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-#include <math.h>
-#include "osEok.h"
-
-// specific
-typedef int(*__compar_fn_t)(const void *, const void *);
 
-// for send function in tsocket.c
-#if defined(MSG_NOSIGNAL)
-#undef MSG_NOSIGNAL
-#endif
+#if defined(_TD_LINUX_64) || defined(_TD_LINUX_32) || defined(_TD_MIPS_64)  || defined(_TD_ARM_32) || defined(_TD_ARM_64)  || defined(_TD_DARWIN_64)
+  #include <arpa/inet.h>
+  #include <dirent.h>
+  #include <fcntl.h>
+  #include <inttypes.h>
+  #include <libgen.h>
+  #include <limits.h>
+  #include <netdb.h>
+  #include <netinet/in.h>
+  #include <netinet/ip.h>
+  #include <netinet/tcp.h>
+  #include <netinet/udp.h>
+  #include <pwd.h>
+  #include <regex.h>
+  #include <stddef.h>
+  #include <strings.h>
+  #include <sys/file.h>
+  #include <sys/ioctl.h>
+  #include <sys/mman.h>
+  #include <sys/socket.h>
+  #include <sys/stat.h>
+  #include <sys/syscall.h>
+  #include <sys/statvfs.h>
+  #include <sys/time.h>
+  #include <sys/types.h>
+  #include <sys/uio.h>
+  #include <sys/un.h>
+  #include <sys/utsname.h>
+  #include <syslog.h>
+  #include <termios.h>
+  #include <unistd.h>
+  #include <wchar.h>
+  #include <wordexp.h>
+  #include <wctype.h>
 
-#define MSG_NOSIGNAL             0
+  #if defined(_TD_DARWIN_64)
+    #include <dispatch/dispatch.h>
+    #include "osEok.h"
+  #else
+    #include <argp.h> 
+    #include <endian.h>
+    #include <linux/sysctl.h>
+    #include <poll.h>
+    #include <sys/epoll.h>
+    #include <sys/eventfd.h>
+    #include <sys/resource.h>
+    #include <sys/sendfile.h>
 
-#define SO_NO_CHECK              0x1234
-#define SOL_TCP                  0x1234
-#define TCP_KEEPIDLE             0x1234
-
-#ifndef PTHREAD_MUTEX_RECURSIVE_NP
-  #define  PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+    #if !(defined(_ALPINE))
+      #include <error.h>
+    #endif
+  #endif
 #endif
 
+#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
+  #include <intrin.h>
+  #include <io.h>
+  #include "winsock2.h"
+  #include <WS2tcpip.h>
+  #include <winbase.h>
+  #include <Winsock2.h>
+  #include <time.h>
+  #include <conio.h>
+  #include "msvcProcess.h"
+  #include "msvcDirect.h"
+  #include "msvcFcntl.h"
+  #include "msvcLibgen.h"
+  #include "msvcStdio.h"
+  #include "msvcUnistd.h"
+  #include "msvcLibgen.h"
+  #include "sys/msvcStat.h"
+  #include "sys/msvcTypes.h"
+#endif
 
 #ifdef __cplusplus
 }

src/os/inc/osLinux32.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_OS_LINUX32_H
-#define TDENGINE_OS_LINUX32_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <argp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/sendfile.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <error.h>
-#include <math.h>
-#include <poll.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/os/inc/osLinux64.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_OS_LINUX64_H
-#define TDENGINE_OS_LINUX64_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <argp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/sendfile.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <poll.h>
-#ifndef _ALPINE
-#include <error.h>
-#endif
-#include <linux/sysctl.h>
-#include <math.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/os/inc/osMips64.h

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TDENGINE_OS_MIPS64_H
-#define TDENGINE_OS_MIPS64_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <argp.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <float.h>
-#include <ifaddrs.h>
-#include <libgen.h>
-#include <limits.h>
-#include <locale.h>
-#include <math.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#include <pthread.h>
-#include <pwd.h>
-#include <regex.h>
-#include <semaphore.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/sendfile.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/statvfs.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <syslog.h>
-#include <termios.h>
-#include <unistd.h>
-#include <wchar.h>
-#include <wordexp.h>
-#include <wctype.h>
-#include <inttypes.h>
-#include <fcntl.h>
-#include <sys/utsname.h>
-#include <sys/resource.h>
-#include <error.h>
-#include <linux/sysctl.h>
-#include <math.h>
-#include <poll.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/os/inc/osSocket.h

@@ -95,7 +95,9 @@ const char *taosInetNtoa(struct in_addr ipInt);
   #if defined(_TD_GO_DLL_)
     uint64_t htonll(uint64_t val);
   #endif
-#elif defined(_TD_DARWIN_64)
+#endif
+
+#if defined(_TD_DARWIN_64)
   #define htobe64 htonll
 #endif
 

src/os/inc/osWindows.h

-/*
-* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
-*
-* This program is free software: you can use, redistribute, and/or modify
-* it under the terms of the GNU Affero General Public License, version 3
-* or later ("AGPL"), as published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TDENGINE_OS_WINDOWS_H
-#define TDENGINE_OS_WINDOWS_H
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <float.h>
-#include <locale.h>
-#include <intrin.h>
-#include <io.h>
-#include <math.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include "winsock2.h"
-#include <WS2tcpip.h>
-#include <winbase.h>
-#include <Winsock2.h>
-#include <time.h>
-#include <inttypes.h>
-#include <conio.h>
-#include <math.h>
-#include "msvcProcess.h"
-#include "msvcDirect.h"
-#include "msvcFcntl.h"
-#include "msvcLibgen.h"
-#include "msvcStdio.h"
-#include "msvcUnistd.h"
-#include "msvcLibgen.h"
-#include "sys/msvcStat.h"
-#include "sys/msvcTypes.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char *stpcpy (char *dest, const char *src);
-char *stpncpy (char *dest, const char *src, size_t n);
-
-// specific
-typedef int (*__compar_fn_t)(const void *, const void *);
-#define ssize_t int
-#define bzero(ptr, size) memset((ptr), 0, (size))
-#define strcasecmp  _stricmp
-#define strncasecmp _strnicmp
-#define wcsncasecmp _wcsnicmp
-#define strtok_r strtok_s
-#define snprintf _snprintf
-#define in_addr_t unsigned long
-#define socklen_t int
-
-struct tm *localtime_r(const time_t *timep, struct tm *result);
-char *     strptime(const char *buf, const char *fmt, struct tm *tm);
-char *     strsep(char **stringp, const char *delim);
-char *     getpass(const char *prefix);
-int        flock(int fd, int option);
-char *     strndup(const char *s, size_t n);
-int        gettimeofday(struct timeval *ptv, void *pTimeZone);
-
-// for send function in tsocket.c
-#define MSG_NOSIGNAL             0
-#define SO_NO_CHECK              0x1234
-#define SOL_TCP                  0x1234
-
-#ifndef TCP_KEEPCNT
-  #define TCP_KEEPCNT              0x1234
-#endif
-
-#ifndef TCP_KEEPIDLE
-  #define TCP_KEEPIDLE             0x1234
-#endif
-
-#ifndef TCP_KEEPINTVL
-  #define TCP_KEEPINTVL            0x1234
-#endif
-
-#define SHUT_RDWR                SD_BOTH
-#define SHUT_RD                  SD_RECEIVE
-#define SHUT_WR                  SD_SEND
-
-#define LOCK_EX 1
-#define LOCK_NB 2
-#define LOCK_UN 3
-
-#ifndef PATH_MAX
-  #define PATH_MAX 256
-#endif
-
-typedef struct {
-  int    we_wordc;
-  char  *we_wordv[1];
-  int    we_offs;
-  char   wordPos[1025];
-} wordexp_t;
-int  wordexp(char *words, wordexp_t *pwordexp, int flags);
-void wordfree(wordexp_t *pwordexp);
-
-#define openlog(a, b, c)
-#define closelog()
-#define LOG_ERR 0
-#define LOG_INFO 1
-void syslog(int unused, const char *format, ...);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

src/os/src/alpine/CMakeLists.txt

-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(TDengine)
-
-AUX_SOURCE_DIRECTORY(. SRC)
-ADD_LIBRARY(os ${SRC})
-TARGET_LINK_LIBRARIES(os m rt)
-

src/os/src/alpine/alpineEnv.c

-/*
- * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
- *
- * This program is free software: you can use, redistribute, and/or modify
- * it under the terms of the GNU Affero General Public License, version 3
- * or later ("AGPL"), as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#define _DEFAULT_SOURCE
-#include "os.h"
-#include "tglobal.h"
-
-void osInit() {
-  if (configDir[0] == 0) {
-    strcpy(configDir, "/etc/taos");
-  }
-
-  strcpy(tsVnodeDir, "");
-  strcpy(tsDnodeDir, "");
-  strcpy(tsMnodeDir, "");
-  strcpy(tsDataDir, "/var/lib/taos");
-  strcpy(tsLogDir, "/var/log/taos");
-  strcpy(tsScriptDir, "/etc/taos");
-  strcpy(tsOsName, "Linux");
-}
\ No newline at end of file

src/os/src/darwin/CMakeLists.txt

@@ -2,4 +2,4 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)
-ADD_LIBRARY(os ${SRC})
+ADD_LIBRARY(osdarwin ${SRC})

src/os/src/detail/CMakeLists.txt

@@ -7,10 +7,15 @@ AUX_SOURCE_DIRECTORY(. SRC)
 SET_SOURCE_FILES_PROPERTIES(osSysinfo.c PROPERTIES COMPILE_FLAGS -w)
 SET_SOURCE_FILES_PROPERTIES(osCoredump.c PROPERTIES COMPILE_FLAGS -w)
 
-ADD_LIBRARY(osdetail ${SRC})
-TARGET_LINK_LIBRARIES(osdetail os)
+ADD_LIBRARY(os ${SRC})
 
-IF (TD_ARM_32 OR TD_LINUX_32)
-  TARGET_LINK_LIBRARIES(osdetail atomic)
+IF (TD_LINUX)
+  TARGET_LINK_LIBRARIES(os oslinux)
+  IF (TD_ARM_32 OR TD_LINUX_32)
+    TARGET_LINK_LIBRARIES(os atomic)
+  ENDIF ()
+ELSEIF (TD_DARWIN)
+  TARGET_LINK_LIBRARIES(os osdarwin)
+ELSEIF (TD_WINDOWS)
+  TARGET_LINK_LIBRARIES(os oswindows)
 ENDIF ()
-

src/os/src/linux/ningsi.c → src/os/src/detail/osAtomic.c

@@ -53,4 +53,3 @@ int64_t atomic_exchange_64_impl(int64_t* ptr, int64_t val ) {
   return old;
 }
 #endif
-

src/os/src/linux/CMakeLists.txt

@@ -2,6 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)
+ADD_LIBRARY(oslinux ${SRC})
 
-ADD_LIBRARY(os ${SRC})
-TARGET_LINK_LIBRARIES(os m rt z)
+TARGET_LINK_LIBRARIES(oslinux m rt z)
\ No newline at end of file

src/os/src/linux/linuxEnv.c

@@ -40,9 +40,8 @@ void osInit() {
   strcpy(tsOsName, "Linux");
 }
 
-char cmdline[1024];
-
 char* taosGetCmdlineByPID(int pid) {
+  static char cmdline[1024];
   sprintf(cmdline, "/proc/%d/cmdline", pid);
   FILE* f = fopen(cmdline, "r");
   if (f) {

src/os/src/windows/CMakeLists.txt

@@ -2,6 +2,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
 AUX_SOURCE_DIRECTORY(. SRC)
-ADD_LIBRARY(os ${SRC})
+ADD_LIBRARY(oswindows ${SRC})
 
-TARGET_LINK_LIBRARIES(os winmm IPHLPAPI ws2_32 MsvcLibXw)
+TARGET_LINK_LIBRARIES(oswindows winmm IPHLPAPI ws2_32 MsvcLibXw)
\ No newline at end of file

src/os/tests/CMakeLists.txt

@@ -11,5 +11,5 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
     AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SOURCE_LIST)
 
     ADD_EXECUTABLE(osTest ${SOURCE_LIST})
-    TARGET_LINK_LIBRARIES(osTest taos osdetail tutil common gtest pthread)
+    TARGET_LINK_LIBRARIES(osTest taos os tutil common gtest pthread)
 ENDIF()
\ No newline at end of file

src/sync/CMakeLists.txt

@@ -11,6 +11,6 @@ TARGET_LINK_LIBRARIES(sync tutil pthread common)
 LIST(APPEND BIN_SRC src/syncArbitrator.c)
 LIST(APPEND BIN_SRC src/syncTcp.c)
 ADD_EXECUTABLE(tarbitrator ${BIN_SRC})
-TARGET_LINK_LIBRARIES(tarbitrator sync common osdetail tutil)
+TARGET_LINK_LIBRARIES(tarbitrator sync common os tutil)
 
 #ADD_SUBDIRECTORY(test)

src/util/CMakeLists.txt

@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/sync/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/rmonotonic/inc)
 AUX_SOURCE_DIRECTORY(src SRC)
 ADD_LIBRARY(tutil ${SRC})
-TARGET_LINK_LIBRARIES(tutil pthread osdetail lz4 z rmonotonic)
+TARGET_LINK_LIBRARIES(tutil pthread os lz4 z rmonotonic)
 
 IF (TD_LINUX)
   TARGET_LINK_LIBRARIES(tutil m rt)

src/util/src/exception.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "os.h"
 #include "exception.h"
 
-
 static threadlocal SExceptionNode* expList;
 
 void exceptionPushNode( SExceptionNode* node ) {

src/util/src/tarray.c

@@ -13,6 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "os.h"
 #include "tarray.h"
 
 void* taosArrayInit(size_t size, size_t elemSize) {

src/util/src/tbase64.c

-/**
- * Copyright (c) 2006-2008 Apple Inc. All rights reserved.
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "os.h"
 
 // deprecated this file for bug prone
 // base64 encode

src/util/src/tbuffer.c

@@ -14,12 +14,9 @@
  */
 
 #include "os.h"
-#include <stdlib.h>
-#include <memory.h>
-#include <assert.h>
 #include "tbuffer.h"
 #include "exception.h"
-#include <taoserror.h>
+#include "taoserror.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // reader functions

src/util/src/tcompare.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "os.h"
 #include "ttype.h"
 #include "tcompare.h"
 #include "tarray.h"

src/util/src/tcompression.c

@@ -47,8 +47,8 @@
  *
  */
 
-#include "lz4.h"
 #include "os.h"
+#include "lz4.h"
 #include "taosdef.h"
 #include "tscompression.h"
 #include "tulog.h"

src/util/src/tcrc32c.c

@@ -17,6 +17,7 @@
 	  misrepresented as being the original software.
 	  3. This notice may not be removed or altered from any source distribution.
 	*/
+
 #ifndef _TD_ARM_
 #include <nmmintrin.h>
 #endif

src/util/src/tdes.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "os.h"
 #include "tkey.h"

src/util/src/terror.c

 /*
- * Copyright (c) 2020 TAOS Data, Inc. <jhtao@taosdata.com>
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
  * This program is free software: you can use, redistribute, and/or modify
  * it under the terms of the GNU Affero General Public License, version 3
@@ -13,10 +13,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
+#include "os.h"
 
 #define TAOS_ERROR_C
  

src/util/src/thashutil.c

-/**
- * MurmurHash3 by Austin Appleby
- * @ref
- * https://github.com/aappleby/smhasher/blob/master/src/MurmurHash3.cpp
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
  *
- * Plese refers to the link above for the complete implementation of
- * MurmurHash algorithm
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
  *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+#include "os.h"
 #include "hashfunc.h"
 #include "tutil.h"
 

src/util/src/tidpool.c

@@ -15,7 +15,6 @@
 
 #include "os.h"
 #include "tulog.h"
-#include <stdbool.h>
 
 typedef struct {
   int             maxId;

src/util/src/tlist.c

@@ -12,9 +12,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdlib.h>
-#include <string.h>
 
+#include "os.h"
 #include "tlist.h"
 
 SList *tdListNew(int eleSize) {

src/util/src/tlockfree.c

@@ -12,9 +12,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-// #define _GNU_SOURCE
-// #include <pthread.h>
 
+#include "os.h"
 #include "tlockfree.h"
 
 #define TD_RWLATCH_WRITE_FLAG 0x40000000

src/util/src/tlosertree.c

@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "tlosertree.h"
 #include "os.h"
+#include "tlosertree.h"
 #include "taosmsg.h"
 #include "tulog.h"
 

src/util/src/tmd5.c

@@ -33,10 +33,8 @@
  ***********************************************************************
  */
 
+#include "os.h"
 #include "tmd5.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include "taosdef.h"
 
 /* forward declaration */

src/util/tests/CMakeLists.txt

@@ -12,7 +12,7 @@ IF (HEADER_GTEST_INCLUDE_DIR AND LIB_GTEST_STATIC_DIR)
     
     LIST(REMOVE_ITEM SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
     ADD_EXECUTABLE(utilTest ${SOURCE_LIST})
-    TARGET_LINK_LIBRARIES(utilTest tutil common osdetail gtest pthread gcov)
+    TARGET_LINK_LIBRARIES(utilTest tutil common os gtest pthread gcov)
 
     LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
     ADD_EXECUTABLE(trefTest ${BIN_SRC})

src/wal/test/CMakeLists.txt

@@ -6,7 +6,7 @@ IF (TD_LINUX)
 
   LIST(APPEND WALTEST_SRC ./waltest.c)
   ADD_EXECUTABLE(waltest ${WALTEST_SRC})
-  TARGET_LINK_LIBRARIES(waltest twal osdetail tutil)
+  TARGET_LINK_LIBRARIES(waltest twal os tutil)
 
 ENDIF ()
 
@@ -15,7 +15,7 @@ IF (TD_DARWIN)
 
   LIST(APPEND WALTEST_SRC ./waltest.c)
   ADD_EXECUTABLE(waltest ${WALTEST_SRC})
-  TARGET_LINK_LIBRARIES(waltest twal osdetail tutil)
+  TARGET_LINK_LIBRARIES(waltest twal os tutil)
 
 ENDIF ()