[sr-dev] git:master:3426b153: db_postgres: init libssl in a thread

Module: kamailio Branch: master Commit: 3426b153d02d9d8d3e909eff9d18cb14108072ca URL: https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb1… Author: S-P Chan &lt;shihping.chan(a)gmail.com&gt; Committer: S-P Chan &lt;shihping.chan(a)gmail.com&gt; Date: 2024-01-30T06:53:10+08:00 db_postgres: init libssl in a thread --- Modified: src/modules/db_postgres/km_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb1… Patch: https://github.com/kamailio/kamailio/commit/3426b153d02d9d8d3e909eff9d18cb1… --- diff --git a/src/modules/db_postgres/km_dbase.c b/src/modules/db_postgres/km_dbase.c index 02cb5c421d5..065b71f0709 100644 --- a/src/modules/db_postgres/km_dbase.c +++ b/src/modules/db_postgres/km_dbase.c @@ -34,6 +34,7 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> +#include <pthread.h> #include "../../core/dprint.h" #include "../../core/mem/mem.h" #include "../../lib/srdb1/db.h" @@ -108,24 +109,57 @@ static void db_postgres_free_query(const db1_con_t *_con); * \param _url URL of the database that should be opened * \return database connection on success, NULL on error * \note this function must be called prior to any database functions + * + * Init libssl in a thread */ -db1_con_t *db_postgres_init(const str *_url) +static db1_con_t *db_postgres_init0(const str *_url) { return db_do_init(_url, (void *)db_postgres_new_connection); } +db1_con_t *db_postgres_init(const str *_url) +{ + pthread_t tid; + db1_con_t *ret; + + pthread_create( + &tid, NULL, (void *(*)(void *))db_postgres_init0, (void *)_url); + pthread_join(tid, (void **)&ret); + + return ret; +} /*! * \brief Initialize database for future queries, specify pooling * \param _url URL of the database that should be opened * \param pooling whether or not to use a pooled connection * \return database connection on success, NULL on error * \note this function must be called prior to any database functions + * + * Init libssl in thread */ -db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) +struct _thread_args +{ + const str *_url; + db_pooling_t pooling; +}; + +static db1_con_t *_db_postgres_init2(struct _thread_args *args) { - return db_do_init2(_url, (void *)db_postgres_new_connection, pooling); + return db_do_init2( + args->_url, (void *)db_postgres_new_connection, args->pooling); } +db1_con_t *db_postgres_init2(const str *_url, db_pooling_t pooling) +{ + pthread_t tid; + db1_con_t *ret; + + pthread_create(&tid, NULL, (void *(*)(void *))_db_postgres_init2, + (void *)&(struct _thread_args){_url, pooling}); + pthread_join(tid, (void **)&ret); + + return ret; +} /*! * \brief Close database when the database is no longer needed * \param _h closed connection, as returned from db_postgres_init