From cac4cb12e67659cc74f17a8e22a221f32140def6 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 31 Aug 2022 15:36:53 +0800 Subject: [PATCH] remove assert --- source/libs/index/src/indexFstFile.c | 3 ++- source/libs/transport/src/thttp.c | 25 +++++++++-------- source/libs/transport/src/transSvr.c | 40 ++++++++++++++++++---------- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/source/libs/index/src/indexFstFile.c b/source/libs/index/src/indexFstFile.c index 4f278c7af6..1900e50973 100644 --- a/source/libs/index/src/indexFstFile.c +++ b/source/libs/index/src/indexFstFile.c @@ -39,7 +39,8 @@ static void idxGenLRUKey(char* buf, const char* path, int32_t blockId) { } static int idxFileCtxDoWrite(IFileCtx* ctx, uint8_t* buf, int len) { if (ctx->type == TFILE) { - assert(len == taosWriteFile(ctx->file.pFile, buf, len)); + int nwr = taosWriteFile(ctx->file.pFile, buf, len); + assert(nwr == len); } else { memcpy(ctx->mem.buf + ctx->offset, buf, len); } diff --git a/source/libs/transport/src/thttp.c b/source/libs/transport/src/thttp.c index e880a5abdb..275e7b42cc 100644 --- a/source/libs/transport/src/thttp.c +++ b/source/libs/transport/src/thttp.c @@ -21,6 +21,7 @@ #include "taoserror.h" #include "tlog.h" +// clang-format on #define HTTP_RECV_BUF_SIZE 1024 @@ -29,7 +30,7 @@ typedef struct SHttpClient { uv_tcp_t tcp; uv_write_t req; uv_buf_t* wbuf; - char *rbuf; + char* rbuf; char* addr; uint16_t port; } SHttpClient; @@ -130,37 +131,36 @@ static void destroyHttpClient(SHttpClient* cli) { taosMemoryFree(cli->rbuf); taosMemoryFree(cli->addr); taosMemoryFree(cli); - } static void clientCloseCb(uv_handle_t* handle) { SHttpClient* cli = handle->data; destroyHttpClient(cli); } -static void clientAllocBuffCb(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) { - SHttpClient* cli = handle->data; - buf->base = cli->rbuf; - buf->len = HTTP_RECV_BUF_SIZE; +static void clientAllocBuffCb(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) { + SHttpClient* cli = handle->data; + buf->base = cli->rbuf; + buf->len = HTTP_RECV_BUF_SIZE; } -static void clientRecvCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t *buf) { - SHttpClient* cli = handle->data; +static void clientRecvCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf) { + SHttpClient* cli = handle->data; if (nread < 0) { uError("http-report recv error:%s", uv_err_name(nread)); } else { uTrace("http-report succ to recv %d bytes, just ignore it", nread); } uv_close((uv_handle_t*)&cli->tcp, clientCloseCb); -} +} static void clientSentCb(uv_write_t* req, int32_t status) { SHttpClient* cli = req->data; if (status != 0) { terrno = TAOS_SYSTEM_ERROR(status); uError("http-report failed to send data %s", uv_strerror(status)); uv_close((uv_handle_t*)&cli->tcp, clientCloseCb); - return; + return; } else { uTrace("http-report succ to send data"); } - uv_read_start((uv_stream_t *)&cli->tcp, clientAllocBuffCb, clientRecvCb); + uv_read_start((uv_stream_t*)&cli->tcp, clientAllocBuffCb, clientRecvCb); } static void clientConnCb(uv_connect_t* req, int32_t status) { SHttpClient* cli = req->data; @@ -212,7 +212,7 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32 cli->tcp.data = cli; cli->req.data = cli; cli->wbuf = wb; - cli->rbuf = taosMemoryCalloc(1, HTTP_RECV_BUF_SIZE); + cli->rbuf = taosMemoryCalloc(1, HTTP_RECV_BUF_SIZE); cli->addr = tstrdup(server); cli->port = port; @@ -233,4 +233,3 @@ int32_t taosSendHttpReport(const char* server, uint16_t port, char* pCont, int32 uv_loop_close(loop); return terrno; } -// clang-format on diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c index 46046b2a95..7007079f87 100644 --- a/source/libs/transport/src/transSvr.c +++ b/source/libs/transport/src/transSvr.c @@ -906,23 +906,30 @@ static void uvDestroyConn(uv_handle_t* handle) { } } static void uvPipeListenCb(uv_stream_t* handle, int status) { - ASSERT(status == 0); + if (status != 0) { + tError("server failed to init pipe"); + return; + } SServerObj* srv = container_of(handle, SServerObj, pipeListen); uv_pipe_t* pipe = &(srv->pipe[srv->numOfWorkerReady][0]); - ASSERT(0 == uv_pipe_init(srv->loop, pipe, 1)); - ASSERT(0 == uv_accept((uv_stream_t*)&srv->pipeListen, (uv_stream_t*)pipe)); - ASSERT(1 == uv_is_readable((uv_stream_t*)pipe)); - ASSERT(1 == uv_is_writable((uv_stream_t*)pipe)); - ASSERT(0 == uv_is_closing((uv_handle_t*)pipe)); + int ret = uv_pipe_init(srv->loop, pipe, 1); + assert(ret == 0); + + ret = uv_accept((uv_stream_t*)&srv->pipeListen, (uv_stream_t*)pipe); + assert(ret == 0); + + ret = uv_is_readable((uv_stream_t*)pipe); + assert(ret == 1); + + ret = uv_is_writable((uv_stream_t*)pipe); + assert(ret == 1); + + ret = uv_is_closing((uv_handle_t*)pipe); + assert(ret == 0); srv->numOfWorkerReady++; - - // ASSERT(0 == uv_listen((uv_stream_t*)&ctx.send.tcp, 512, uvOnAcceptCb)); - - // r = uv_read_start((uv_stream_t*)&ctx.channel, alloc_cb, read_cb); - // ASSERT(r == 0); } void* transInitServer(uint32_t ip, uint32_t port, char* label, int numOfThreads, void* fp, void* shandle) { @@ -937,7 +944,9 @@ void* transInitServer(uint32_t ip, uint32_t port, char* label, int numOfThreads, srv->port = port; uv_loop_init(srv->loop); - assert(0 == uv_pipe_init(srv->loop, &srv->pipeListen, 0)); + int ret = uv_pipe_init(srv->loop, &srv->pipeListen, 0); + assert(ret == 0); + #ifdef WINDOWS char pipeName[64]; snprintf(pipeName, sizeof(pipeName), "\\\\?\\pipe\\trans.rpc.%p-" PRIu64, taosSafeRand(), GetCurrentProcessId()); @@ -946,8 +955,11 @@ void* transInitServer(uint32_t ip, uint32_t port, char* label, int numOfThreads, snprintf(pipeName, sizeof(pipeName), "%s%spipe.trans.rpc.%08X-" PRIu64, tsTempDir, TD_DIRSEP, taosSafeRand(), taosGetSelfPthreadId()); #endif - assert(0 == uv_pipe_bind(&srv->pipeListen, pipeName)); - assert(0 == uv_listen((uv_stream_t*)&srv->pipeListen, SOMAXCONN, uvPipeListenCb)); + ret = uv_pipe_bind(&srv->pipeListen, pipeName); + assert(ret == 0); + + ret = uv_listen((uv_stream_t*)&srv->pipeListen, SOMAXCONN, uvPipeListenCb); + assert(ret == 0); for (int i = 0; i < srv->numOfThreads; i++) { SWorkThrd* thrd = (SWorkThrd*)taosMemoryCalloc(1, sizeof(SWorkThrd));