Skip to content

Fix err #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Fix err #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
791de07
fix
ColinLeeo May 15, 2025
15607aa
update.
ColinLeeo Jun 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cmake_policy(SET CMP0079 NEW)
set(TsFile_CPP_VERSION 2.1.0.dev)
set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -Wall")
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized -D__STDC_FORMAT_MACROS")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_FORMAT_MACROS")
endif()

message("cmake using: USE_CPP11=${USE_CPP11}")
Expand Down Expand Up @@ -51,9 +51,7 @@ if (${COV_ENABLED})
endif()


if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)
endif ()
set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build." FORCE)

message("CMAKE BUILD TYPE " ${CMAKE_BUILD_TYPE})
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
Expand Down
2 changes: 2 additions & 0 deletions cpp/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ if (${COV_ENABLED})
endif ()
add_definitions(-DANTLR4CPP_STATIC)
set(ANTLR4_WITH_STATIC_CRT OFF)
add_compile_options(-Wall -Wextra -Wconversion -Wsign-conversion)


set(PROJECT_INCLUDE_DIR
Expand Down Expand Up @@ -79,6 +80,7 @@ set(LIBTSFILE_PROJECT_VERSION ${TsFile_CPP_VERSION})
set(LIBTSFILE_SO_VERSION ${TsFile_CPP_VERSION})
set_target_properties(tsfile PROPERTIES VERSION ${LIBTSFILE_PROJECT_VERSION})
set_target_properties(tsfile PROPERTIES SOVERSION ${LIBTSFILE_SO_VERSION})
target_compile_options(tsfile PRIVATE -Wall -Wextra -Werror -Wconversion -Wsign-conversion)

install(TARGETS tsfile LIBRARY DESTINATION ${LIBRARY_OUTPUT_PATH})

Expand Down
19 changes: 12 additions & 7 deletions cpp/src/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,20 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/container common_container_SRC_
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/tsblock common_tsblock_SRC_LIST)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/mutex common_mutex_SRC_LIST)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/datatype common_datatype_SRC_LIST)
aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/error_info common_error_info_SRC_LIST)

set(CMAKE_POSITION_INDEPENDENT_CODE ON)
add_library(common_obj OBJECT ${common_SRC_LIST}
${common_allocator_SRC_LIST}
${common_container_SRC_LIST}
${common_tsblock_SRC_LIST}
${common_mutex_SRC_LIST}
${common_datatype_SRC_LIST})
add_library(common_obj OBJECT ${common_SRC_LIST}
${common_allocator_SRC_LIST}
${common_container_SRC_LIST}
${common_tsblock_SRC_LIST}
${common_mutex_SRC_LIST}
${common_datatype_SRC_LIST}
${common_error_info_SRC_LIST}
)

# install header files recursively
file(GLOB_RECURSE HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
file(GLOB_RECURSE HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
file(GLOB_RECURSE INC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*.inc")
set(HEADERS ${HEADER_FILES} ${INC_FILES})
copy_to_dir(${HEADERS} "common_obj")
49 changes: 4 additions & 45 deletions cpp/src/common/allocator/alloc_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,56 +75,15 @@ enum AllocModID {
extern const char *g_mod_names[__LAST_MOD_ID];

/* very basic alloc/free interface in C style */
void *mem_alloc(uint32_t size, AllocModID mid);
void *mem_alloc(size_t size, AllocModID mid);
void mem_free(void *ptr);
void *mem_realloc(void *ptr, uint32_t size);

class ModStat {
public:
ModStat() : stat_arr_(NULL) {}

static ModStat &get_instance() {
/*
* This is the singleton of Mod Memory Statistic.
* gms is short for Global Mod Statistic
*/
static ModStat gms;
return gms;
}
void init();
void destroy();
INLINE void update_alloc(AllocModID mid, int32_t size) {
// ASSERT(mid < __LAST_MOD_ID);
// ATOMIC_FAA(get_item(mid), size);
}
void update_free(AllocModID mid, uint32_t size) {
// ASSERT(mid < __LAST_MOD_ID);
// ATOMIC_FAA(get_item(mid), 0 - size);
}
void print_stat();

#ifdef ENABLE_TEST
int32_t TEST_get_stat(int8_t mid) { return ATOMIC_FAA(get_item(mid), 0); }
#endif

private:
INLINE int32_t *get_item(int8_t mid) {
return &(stat_arr_[mid * (ITEM_SIZE / sizeof(int32_t))]);
}

private:
static const int32_t ITEM_SIZE = CACHE_LINE_SIZE;
static const int32_t ITEM_COUNT = __LAST_MOD_ID;
int32_t *stat_arr_;

STATIC_ASSERT((ITEM_SIZE % sizeof(int32_t) == 0), ModStat_ITEM_SIZE_ERROR);
};
void *mem_realloc(void *ptr, size_t size);

/* base allocator */
class BaseAllocator {
public:
void *alloc(uint32_t size, AllocModID mid) { return mem_alloc(size, mid); }
void free(void *ptr) { mem_free(ptr); }
static void *alloc(const size_t size, const AllocModID mid) { return mem_alloc(size, mid); }
static void free(void *ptr) { mem_free(ptr); }
};

extern BaseAllocator g_base_allocator;
Expand Down
Loading
Loading