From 6fcc263c182fc49d9ba2d1bd7649b4af1e9f3e3a Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 10 Sep 2020 12:14:02 +0200 Subject: keyboxd: Use D-lines instead of a separate thread. * kbx/kbx-client-util.c (kbx_client_data_new): Add arg 'dlines'. * g10/call-keyboxd.c (open_context): Set DLINES to true. * sm/keydb.c (open_context): Ditto. -- This allows to compile time switch between the D-line and the fd-passing data communication between gpg/gpgsm and keyboxd. A quick test with about 3000 OpenPGP keys showed that D-lines are only 10% slower than the fd-passing based implementation. Given that the thread adds extra complexity we go for now with the D-line approach. Signed-off-by: Werner Koch --- kbx/kbx-client-util.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'kbx/kbx-client-util.c') diff --git a/kbx/kbx-client-util.c b/kbx/kbx-client-util.c index ba356b3c5..910050372 100644 --- a/kbx/kbx-client-util.c +++ b/kbx/kbx-client-util.c @@ -270,10 +270,12 @@ datastream_thread (void *arg) /* Create a new keyboxd client data object and return it at R_KCD. - * CTX is the assuan context to be used for connecting the - * keyboxd. */ + * CTX is the assuan context to be used for connecting the keyboxd. + * If dlines is set, communication is done without fd passing via + * D-lines. */ gpg_error_t -kbx_client_data_new (kbx_client_data_t *r_kcd, assuan_context_t ctx) +kbx_client_data_new (kbx_client_data_t *r_kcd, assuan_context_t ctx, + int dlines) { kbx_client_data_t kcd; int rc; @@ -285,6 +287,9 @@ kbx_client_data_new (kbx_client_data_t *r_kcd, assuan_context_t ctx) kcd->ctx = ctx; + if (dlines) + goto leave; + rc = npth_mutex_init (&kcd->mutex, NULL); if (rc) { @@ -312,6 +317,7 @@ kbx_client_data_new (kbx_client_data_t *r_kcd, assuan_context_t ctx) return err; } + leave: *r_kcd = kcd; return 0; } -- cgit v1.2.3