b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 1 | libmariadb: Fix async api by linking to libucontext |
| 2 | The asynchronous API of libmariadb uses cooperative multi threading |
| 3 | by using the system calls |
| 4 | * makecontext |
| 5 | * swapcontext |
| 6 | * getcontext |
| 7 | * setcontext |
| 8 | of the ucontext.h C-API. |
| 9 | |
| 10 | Thus additionally link libmariadb to libucontext which is a library |
| 11 | providing these system calls on platforms not supporting them out of |
| 12 | the box - like musl based platforms. |
| 13 | --- a/libmariadb/CMakeLists.txt |
| 14 | +++ b/libmariadb/CMakeLists.txt |
| 15 | @@ -458,7 +458,7 @@ ELSE() |
| 16 | SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) |
| 17 | ENDIF() |
| 18 | |
| 19 | -TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS} ${CRYPTO_LIBS}) |
| 20 | +TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS} ${CRYPTO_LIBS} ${LIBUCONTEXT_POSIX} ${LIBUCONTEXT}) |
| 21 | |
| 22 | SIGN_TARGET(libmariadb) |
| 23 | |
| 24 | --- a/CMakeLists.txt |
| 25 | +++ b/CMakeLists.txt |
| 26 | @@ -251,6 +251,14 @@ IF(UNIX) |
| 27 | SEARCH_LIBRARY(LIBPTHREAD pthread_getspecific "pthread;pthreads") |
| 28 | SEARCH_LIBRARY(LIBNSL gethostbyname_r "nsl_r;nsl") |
| 29 | SEARCH_LIBRARY(LIBSOCKET setsockopt socket) |
| 30 | + SEARCH_LIBRARY(LIBUCONTEXT libucontext_swapcontext libucontext.a) |
| 31 | + SEARCH_LIBRARY(LIBUCONTEXT_POSIX swapcontext libucontext_posix.a) |
| 32 | + IF (NOT HAVE_LIBUCONTEXT_POSIX OR NOT HAVE_LIBUCONTEXT) |
| 33 | + UNSET(HAVE_LIBUCONTEXT) |
| 34 | + UNSET(LIBUCONTEXT) |
| 35 | + UNSET(HAVE_LIBUCONTEXT_POSIX) |
| 36 | + UNSET(LIBUCONTEXT_POSIX) |
| 37 | + ENDIF() |
| 38 | FIND_PACKAGE(Threads) |
| 39 | SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND} ${LIBICONV} ${ZLIB_LIBRARY} |
| 40 | ${LIBSOCKET} ${CMAKE_DL_LIBS} ${LIBM} ${LIBPTHREAD}) |
| 41 | --- a/include/ma_config.h.in |
| 42 | +++ b/include/ma_config.h.in |
| 43 | @@ -28,6 +28,7 @@ |
| 44 | #cmakedefine HAVE_SYS_UN_H 1 |
| 45 | #cmakedefine HAVE_UNISTD_H 1 |
| 46 | #cmakedefine HAVE_UCONTEXT_H 1 |
| 47 | +#cmakedefine HAVE_LIBUCONTEXT_POSIX 1 |
| 48 | |
| 49 | /* |
| 50 | * function definitions - processed in LibmysqlFunctions.txt |
| 51 | --- a/include/ma_context.h |
| 52 | +++ b/include/ma_context.h |
| 53 | @@ -32,7 +32,7 @@ |
| 54 | #define MY_CONTEXT_USE_X86_64_GCC_ASM |
| 55 | #elif defined(__GNUC__) && __GNUC__ >= 3 && defined(__i386__) |
| 56 | #define MY_CONTEXT_USE_I386_GCC_ASM |
| 57 | -#elif defined(HAVE_UCONTEXT_H) |
| 58 | +#elif defined(HAVE_UCONTEXT_H) || defined(HAVE_LIBUCONTEXT_POSIX) |
| 59 | #define MY_CONTEXT_USE_UCONTEXT |
| 60 | #else |
| 61 | #define MY_CONTEXT_DISABLE |