diff --git a/include/common/taoserror.h b/include/common/taoserror.h index 7e30601037..c3f3e3b98b 100644 --- a/include/common/taoserror.h +++ b/include/common/taoserror.h @@ -20,9 +20,6 @@ extern "C" { #endif -#include -#include - #define TAOS_DEF_ERROR_CODE(mod, code) ((int32_t)((0x80000000 | ((mod)<<16) | (code)))) #define TAOS_SYSTEM_ERROR(code) (0x80ff0000 | (code)) diff --git a/include/common/taosmsg.h b/include/common/taosmsg.h index be2f690752..c296317758 100644 --- a/include/common/taosmsg.h +++ b/include/common/taosmsg.h @@ -20,9 +20,6 @@ extern "C" { #endif -#include -#include - #include "taosdef.h" #include "taoserror.h" #include "tdataformat.h" diff --git a/include/common/ttype.h b/include/common/ttype.h index 2150b818d7..941ad7ae84 100644 --- a/include/common/ttype.h +++ b/include/common/ttype.h @@ -5,8 +5,6 @@ extern "C" { #endif -#include -#include #include "taosdef.h" // this data type is internally used only in 'in' query to hold the values diff --git a/include/server/dnode/dnode.h b/include/server/dnode/dnode.h index 76a3d3ea1b..a41235e7c9 100644 --- a/include/server/dnode/dnode.h +++ b/include/server/dnode/dnode.h @@ -20,6 +20,10 @@ extern "C" { #endif +struct SRpcEpSet; +struct SRpcMsg; +struct Dnode; + /** * Initialize and start the dnode module. * diff --git a/include/util/tdef.h b/include/util/tdef.h index 04a06d1275..c67886f240 100644 --- a/include/util/tdef.h +++ b/include/util/tdef.h @@ -16,6 +16,8 @@ #ifndef _TD_UTIL_DEF_H #define _TD_UTIL_DEF_H +#include "os.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/include/util/tulog.h b/include/util/ulog.h similarity index 100% rename from include/util/tulog.h rename to include/util/ulog.h diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index 61378c79c4..6e76e3a8d0 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -13,7 +13,7 @@ * along with this program. If not, see . */ #include "tdataformat.h" -#include "tulog.h" +#include "ulog.h" #include "talgo.h" #include "tcoding.h" #include "wchar.h" diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 1cebf99351..9eab95cd41 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -17,7 +17,7 @@ #include "os.h" #include "taosdef.h" #include "taoserror.h" -#include "tulog.h" +#include "ulog.h" #include "tlog.h" #include "tconfig.h" #include "tglobal.h" diff --git a/source/common/src/tlocale.c b/source/common/src/tlocale.c index 46a3d951db..a98a46b28a 100644 --- a/source/common/src/tlocale.c +++ b/source/common/src/tlocale.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "tglobal.h" #include "tconfig.h" #include "tutil.h" diff --git a/source/common/src/ttimezone.c b/source/common/src/ttimezone.c index 62d4768db8..c45e39c20d 100644 --- a/source/common/src/ttimezone.c +++ b/source/common/src/ttimezone.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "tglobal.h" #include "tconfig.h" #include "tutil.h" diff --git a/source/server/server.c b/source/server/server.c index b5c8992b65..0e50b1f97f 100644 --- a/source/server/server.c +++ b/source/server/server.c @@ -13,11 +13,22 @@ * along with this program. If not, see . */ #include "os.h" -#include "tulog.h" -#include "trpc.h" +#include "ulog.h" #include "dnode.h" +static bool stop = false; +static void sigintHandler(int32_t signum, void *info, void *ctx) { stop = true; } +static void setSignalHandler() { + taosSetSignal(SIGTERM, sigintHandler); + taosSetSignal(SIGHUP, sigintHandler); + taosSetSignal(SIGINT, sigintHandler); + taosSetSignal(SIGABRT, sigintHandler); + taosSetSignal(SIGBREAK, sigintHandler); +} + int main(int argc, char const *argv[]) { + setSignalHandler(); + struct Dnode *dnode = dnodeCreateInstance(); if (dnode == NULL) { uInfo("Failed to start TDengine, please check the log at:%s", tsLogDir); @@ -26,12 +37,12 @@ int main(int argc, char const *argv[]) { uInfo("Started TDengine service successfully."); - // if (tsem_wait(&exitSem) != 0) { - // syslog(LOG_ERR, "failed to wait exit semphore: %s", strerror(errno)); - // } + while (!stop) { + taosMsleep(100); + } - dnodeDropInstance(dnode); - uInfo("TDengine is shut down!"); + dnodeDropInstance(dnode); + return 0; } diff --git a/source/util/src/hash.c b/source/util/src/hash.c index 644fc67eb5..72d293a0e9 100644 --- a/source/util/src/hash.c +++ b/source/util/src/hash.c @@ -15,7 +15,7 @@ #include "os.h" #include "hash.h" -#include "tulog.h" +#include "ulog.h" #include "tdef.h" #define EXT_SIZE 1024 diff --git a/source/util/src/tcache.c b/source/util/src/tcache.c index 589d3d4fa5..0c9a1a18ad 100644 --- a/source/util/src/tcache.c +++ b/source/util/src/tcache.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "ttimer.h" #include "tutil.h" #include "tcache.h" diff --git a/source/util/src/tcompare.c b/source/util/src/tcompare.c index 29cd13a6d5..1f47ae6be1 100644 --- a/source/util/src/tcompare.c +++ b/source/util/src/tcompare.c @@ -18,7 +18,7 @@ #define _DEFAULT_SOURCE #include "tcompare.h" -#include "tulog.h" +#include "ulog.h" #include "hash.h" #include "regex.h" #include "os.h" diff --git a/source/util/src/tcompression.c b/source/util/src/tcompression.c index 990008a840..4713de9772 100644 --- a/source/util/src/tcompression.c +++ b/source/util/src/tcompression.c @@ -53,7 +53,7 @@ #include "td_sz.h" #endif #include "tscompression.h" -#include "tulog.h" +#include "ulog.h" static const int TEST_NUMBER = 1; #define is_bigendian() ((*(char *)&TEST_NUMBER) == 0) diff --git a/source/util/src/tconfig.c b/source/util/src/tconfig.c index b0256471cd..6b3f08a446 100644 --- a/source/util/src/tconfig.c +++ b/source/util/src/tconfig.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "os.h" #include "tconfig.h" -#include "tulog.h" +#include "ulog.h" #include "tutil.h" SGlobalCfg tsGlobalConfig[TSDB_CFG_MAX_NUM] = {{0}}; diff --git a/source/util/src/tfile.c b/source/util/src/tfile.c index f4e1e5c115..2dafd689d3 100644 --- a/source/util/src/tfile.c +++ b/source/util/src/tfile.c @@ -16,7 +16,7 @@ #define _DEFAULT_SOURCE #include "os.h" #include "taoserror.h" -#include "tulog.h" +#include "ulog.h" #include "tutil.h" #include "tref.h" diff --git a/source/util/src/tidpool.c b/source/util/src/tidpool.c index 61cecf54c0..00c43bb25f 100644 --- a/source/util/src/tidpool.c +++ b/source/util/src/tidpool.c @@ -14,7 +14,7 @@ */ #include "os.h" -#include "tulog.h" +#include "ulog.h" typedef struct { int maxId; diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c index f134730c5c..2fb84656b6 100644 --- a/source/util/src/tlog.c +++ b/source/util/src/tlog.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "tlog.h" #include "tnote.h" #include "tutil.h" diff --git a/source/util/src/tlosertree.c b/source/util/src/tlosertree.c index c6e3a98493..6155ba4c1a 100644 --- a/source/util/src/tlosertree.c +++ b/source/util/src/tlosertree.c @@ -15,7 +15,7 @@ #include "os.h" #include "tlosertree.h" -#include "tulog.h" +#include "ulog.h" // set initial value for loser tree void tLoserTreeInit(SLoserTreeInfo* pTree) { diff --git a/source/util/src/tmempool.c b/source/util/src/tmempool.c index 678c965eb1..a61c4abb14 100644 --- a/source/util/src/tmempool.c +++ b/source/util/src/tmempool.c @@ -14,7 +14,7 @@ */ #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "tmempool.h" #include "tutil.h" diff --git a/source/util/src/tqueue.c b/source/util/src/tqueue.c index 6a37f11ece..da1fb1837f 100644 --- a/source/util/src/tqueue.c +++ b/source/util/src/tqueue.c @@ -14,7 +14,7 @@ */ #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "taoserror.h" #include "tqueue.h" diff --git a/source/util/src/tref.c b/source/util/src/tref.c index 7d64bd1f83..68f161bd3d 100644 --- a/source/util/src/tref.c +++ b/source/util/src/tref.c @@ -15,7 +15,7 @@ #include "os.h" #include "taoserror.h" -#include "tulog.h" +#include "ulog.h" #include "tutil.h" #define TSDB_REF_OBJECTS 50 diff --git a/source/util/src/tsched.c b/source/util/src/tsched.c index 915eaa8d4f..915edc45ce 100644 --- a/source/util/src/tsched.c +++ b/source/util/src/tsched.c @@ -16,7 +16,7 @@ #include "os.h" #include "tdef.h" #include "tutil.h" -#include "tulog.h" +#include "ulog.h" #include "tsched.h" #include "ttimer.h" diff --git a/source/util/src/tskiplist.c b/source/util/src/tskiplist.c index 4905b2723e..d02b148863 100644 --- a/source/util/src/tskiplist.c +++ b/source/util/src/tskiplist.c @@ -16,7 +16,7 @@ #include "tskiplist.h" #include "os.h" #include "tcompare.h" -#include "tulog.h" +#include "ulog.h" #include "tutil.h" static int initForwardBackwardPtr(SSkipList *pSkipList); diff --git a/source/util/src/tstep.c b/source/util/src/tstep.c index 97cd3290da..e307977e70 100644 --- a/source/util/src/tstep.c +++ b/source/util/src/tstep.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "tstep.h" SSteps *taosStepInit(int32_t maxsize) { diff --git a/source/util/src/tthread.c b/source/util/src/tthread.c index 2ffefa25e6..5ed7fb5aa0 100644 --- a/source/util/src/tthread.c +++ b/source/util/src/tthread.c @@ -17,7 +17,7 @@ #include "tthread.h" #include "tdef.h" #include "tutil.h" -#include "tulog.h" +#include "ulog.h" #include "taoserror.h" // create new thread diff --git a/source/util/src/tutil.c b/source/util/src/tutil.c index 9c79a7cca2..c5027af7c7 100644 --- a/source/util/src/tutil.c +++ b/source/util/src/tutil.c @@ -17,7 +17,7 @@ #include "tcrc32c.h" #include "tdef.h" #include "tutil.h" -#include "tulog.h" +#include "ulog.h" #include "taoserror.h" int32_t strdequote(char *z) { diff --git a/source/util/src/tworker.c b/source/util/src/tworker.c index 3fe34755d7..5370e78c09 100644 --- a/source/util/src/tworker.c +++ b/source/util/src/tworker.c @@ -15,7 +15,7 @@ #define _DEFAULT_SOURCE #include "os.h" -#include "tulog.h" +#include "ulog.h" #include "tqueue.h" #include "tworker.h" diff --git a/source/util/test/trefTest.c b/source/util/test/trefTest.c index e01da070af..54aa6a5f34 100644 --- a/source/util/test/trefTest.c +++ b/source/util/test/trefTest.c @@ -8,7 +8,7 @@ #include "tlog.h" #include "tglobal.h" #include "taoserror.h" -#include "tulog.h" +#include "ulog.h" typedef struct { int refNum; diff --git a/src/inc/module.h b/src/inc/module.h deleted file mode 100644 index b9b64c493e..0000000000 --- a/src/inc/module.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2019 TAOS Data, Inc. - * - * 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 . - */ - -#ifndef TDENGINE_MODULE -#define TDENGINE_MODULE - -#ifdef __cplusplus -extern "C" { -#endif - -int32_t moduleStart(); -void moduleStop(); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/inc/vnode.h b/src/inc/vnode.h deleted file mode 100644 index b3291645c0..0000000000 --- a/src/inc/vnode.h +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2019 TAOS Data, Inc. - * - * 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 . - */ - -#ifndef TDENGINE_VNODE_H -#define TDENGINE_VNODE_H - -#ifdef __cplusplus -extern "C" { -#endif -#include "trpc.h" -#include "twal.h" - -typedef struct { - int32_t len; - void * rsp; - void * qhandle; // used by query and retrieve msg -} SRspRet; - -typedef struct { - int32_t code; - int32_t contLen; - void * rpcHandle; - void * rpcAhandle; - void * qhandle; - void * pVnode; - int8_t qtype; - int8_t msgType; - SRspRet rspRet; - char pCont[]; -} SVReadMsg; - -typedef struct { - int32_t code; - int32_t processedCount; - int32_t qtype; - void * pVnode; - SRpcMsg rpcMsg; - SRspRet rspRet; - char reserveForSync[24]; - SWalHead walHead; -} SVWriteMsg; - -// vnodeStatus -extern char *vnodeStatus[]; - -// vnodeMain -int32_t vnodeCreate(SCreateVnodeMsg *pVnodeCfg); -int32_t vnodeDrop(int32_t vgId); -int32_t vnodeOpen(int32_t vgId); -int32_t vnodeAlter(void *pVnode, SCreateVnodeMsg *pVnodeCfg); -int32_t vnodeSync(int32_t vgId); -int32_t vnodeClose(int32_t vgId); -int32_t vnodeCompact(int32_t vgId); - -// vnodeMgmt -int32_t vnodeInitMgmt(); -void vnodeCleanupMgmt(); -void* vnodeAcquire(int32_t vgId); -void vnodeRelease(void *pVnode); -void* vnodeAcquireNotClose(int32_t vgId); -void* vnodeGetWal(void *pVnode); -int32_t vnodeGetVnodeList(int32_t vnodeList[], int32_t *numOfVnodes); -void vnodeBuildStatusMsg(void *pStatus); -void vnodeSetAccess(SVgroupAccess *pAccess, int32_t numOfVnodes); - -// vnodeWrite -int32_t vnodeWriteToWQueue(void *pVnode, void *pHead, int32_t qtype, void *pRpcMsg); -void vnodeFreeFromWQueue(void *pVnode, SVWriteMsg *pWrite); -int32_t vnodeProcessWrite(void *pVnode, void *pHead, int32_t qtype, void *pRspRet); - -// vnodeSync -void vnodeConfirmForward(void *pVnode, uint64_t version, int32_t code, bool force); - -// vnodeRead -int32_t vnodeWriteToRQueue(void *pVnode, void *pCont, int32_t contLen, int8_t qtype, void *rparam); -void vnodeFreeFromRQueue(void *pVnode, SVReadMsg *pRead); -int32_t vnodeProcessRead(void *pVnode, SVReadMsg *pRead); - -#ifdef __cplusplus -} -#endif - -#endif