From: Ralph Boehme Date: Mon, 25 Mar 2019 15:11:30 +0000 (+0100) Subject: s3-mdssvc: use default g_main context X-Git-Tag: tdb-1.4.1~308 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=984c890cd0561bc016fd327ba7030df4e6b20b45;p=thirdparty%2Fsamba.git s3-mdssvc: use default g_main context Way back when the module was developed it seemed to be necessary the use a private context with push/pop as thread default. Maybe there was a bug in libtracker-sparql dispatching callback in the wrong (global) context. It's not necessary anymore with a recent libtracker-sparql version. Signed-off-by: Ralph Boehme Reviewed-by: Noel Power --- diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c index c8545a52e55..e297333ad16 100644 --- a/source3/rpc_server/mdssvc/mdssvc.c +++ b/source3/rpc_server/mdssvc/mdssvc.c @@ -1818,18 +1818,12 @@ static struct mdssvc_ctx *mdssvc_init(struct tevent_context *ev) mdssvc_ctx->ev_ctx = ev; - mdssvc_ctx->gmain_ctx = g_main_context_new(); + mdssvc_ctx->gmain_ctx = g_main_context_default(); if (mdssvc_ctx->gmain_ctx == NULL) { DBG_ERR("error from g_main_context_new\n"); return NULL; } - /* - * This ensures all glib threads, especially gioi worker threads - * dispatch their async callbacks via our gmain_ctx. - */ - g_main_context_push_thread_default(mdssvc_ctx->gmain_ctx); - mdssvc_ctx->glue = samba_tevent_glib_glue_create(ev, mdssvc_ctx->ev_ctx, mdssvc_ctx->gmain_ctx); @@ -1861,8 +1855,6 @@ bool mds_shutdown(void) samba_tevent_glib_glue_quit(mdssvc_ctx->glue); TALLOC_FREE(mdssvc_ctx->glue); - g_main_context_pop_thread_default(mdssvc_ctx->gmain_ctx); - TALLOC_FREE(mdssvc_ctx); return true;