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

[TD-13760]<fix>: libuv replace socket error.

This commit is contained in:
afwerar 2022-03-07 18:50:38 +08:00
parent 3588761cc7
commit 44367a009f
7 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
include/util/thttp.h → include/libs/transport/thttp.h
View File

8
include/os/osSocket.h
View File

@ -34,16 +34,10 @@
#include <sys/epoll.h> #include <sys/epoll.h>
#endif #endif
#ifdef USE_UV
#include <uv.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef USE_UV
#define TAOS_EPOLL_WAIT_TIME 500 #define TAOS_EPOLL_WAIT_TIME 500
typedef int32_t SOCKET; typedef int32_t SOCKET;
typedef SOCKET EpollFd; typedef SOCKET EpollFd;
@ -92,8 +86,6 @@ SOCKET taosOpenTcpClientSocket(uint32_t ip, uint16_t port, uint32_t localIp);
SOCKET taosOpenTcpServerSocket(uint32_t ip, uint16_t port); SOCKET taosOpenTcpServerSocket(uint32_t ip, uint16_t port);
int32_t taosKeepTcpAlive(SOCKET sockFd); int32_t taosKeepTcpAlive(SOCKET sockFd);
#endif
void taosBlockSIGPIPE(); void taosBlockSIGPIPE();
uint32_t taosGetIpv4FromFqdn(const char *); uint32_t taosGetIpv4FromFqdn(const char *);
int32_t taosGetFqdn(char *); int32_t taosGetFqdn(char *);

8
source/libs/catalog/test/CMakeLists.txt
View File

@ -17,7 +17,7 @@ TARGET_INCLUDE_DIRECTORIES(
PRIVATE "${CMAKE_SOURCE_DIR}/source/libs/catalog/inc" PRIVATE "${CMAKE_SOURCE_DIR}/source/libs/catalog/inc"
) )
add_test( # add_test(
NAME catalogTest # NAME catalogTest
COMMAND catalogTest # COMMAND catalogTest
) # )

3
source/libs/monitor/CMakeLists.txt
View File

@ -3,10 +3,11 @@ add_library(monitor STATIC ${MONITOR_SRC})
target_include_directories( target_include_directories(
monitor monitor
PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/monitor" PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/monitor"
PUBLIC "${CMAKE_SOURCE_DIR}/include/libs/transport"
PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc" PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/inc"
) )
target_link_libraries(monitor os util common) target_link_libraries(monitor os util common transport)
if(${BUILD_TEST}) if(${BUILD_TEST})
add_subdirectory(test) add_subdirectory(test)

8
source/util/src/thttp.c → source/libs/transport/src/thttp.c
View File

@ -111,18 +111,16 @@ _OVER:
} }
#ifdef USE_UV #ifdef USE_UV
#include <uv.h>
static void clientConnCb(uv_connect_t* req, int32_t status) { static void clientConnCb(uv_connect_t* req, int32_t status) {
if (status < 0) { if (status < 0) {
terrno = TAOS_SYSTEM_ERROR(status); terrno = TAOS_SYSTEM_ERROR(status);
uError("Connection error %s\n", uv_strerror(status)); uError("Connection error %s\n", uv_strerror(status));
uv_close((uv_handle_t*)req->handle, NULL);
return; return;
} }
// impl later
uv_buf_t* wb = req->data; uv_buf_t* wb = req->data;
if (wb == NULL) { assert(wb != NULL);
uv_close((uv_handle_t*)req->handle, NULL);
}
uv_write_t write_req; uv_write_t write_req;
uv_write(&write_req, req->handle, wb, 2, NULL); uv_write(&write_req, req->handle, wb, 2, NULL);
uv_close((uv_handle_t*)req->handle, NULL); uv_close((uv_handle_t*)req->handle, NULL);

6
source/os/src/osSocket.c
View File

@ -34,8 +34,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#ifndef USE_UV
// typedef struct TdSocketServer { // typedef struct TdSocketServer {
// #if SOCKET_WITH_LOCK // #if SOCKET_WITH_LOCK
// pthread_rwlock_t rwlock; // pthread_rwlock_t rwlock;
@ -686,10 +684,6 @@ int64_t taosCopyFds(SOCKET sfd, int32_t dfd, int64_t len) {
return len; return len;
} }
#endif
void taosBlockSIGPIPE() { void taosBlockSIGPIPE() {
#if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32) #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
#else #else

7
source/util/CMakeLists.txt
View File

@ -12,13 +12,6 @@ target_link_libraries(
PUBLIC lz4_static PUBLIC lz4_static
PUBLIC api cjson zlib PUBLIC api cjson zlib
) )
if(${BUILD_WITH_UV})
target_link_libraries(
util
PUBLIC uv_a
)
add_definitions(-DUSE_UV)
endif(${BUILD_TEST})
if(${BUILD_TEST}) if(${BUILD_TEST})
ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(test)