search for: init_called

...re @@ -40,6 +40,7 @@ #include <string.h> #include <unistd.h> #include <dlfcn.h> +#include <fcntl.h> #define NBDKIT_API_VERSION 2 @@ -72,7 +73,8 @@ int vddk_debug_extents; #define VDDK_MINOR 1 static void *dl = NULL; /* dlopen handle */ -static int init_called = 0; /* was InitEx called */ +static bool init_called = false; /* was InitEx called */ +static char *reexeced = false; /* did libdir require reexec */ static char *config = NULL; /* config */ static const char *cookie = NULL; /* cookie...

...<fcntl.h> #include <libgen.h> +#include <pthread.h> + #define NBDKIT_API_VERSION 2 - #include <nbdkit-plugin.h> #include "cleanup.h" @@ -76,6 +77,7 @@ int vddk_debug_datapath = 1; static void *dl; /* dlopen handle */ static bool init_called; /* was InitEx called */ static char *reexeced; /* orig LD_LIBRARY_PATH on reexec */ +static pthread_key_t error_suppression; /* threadlocal error suppression */ static char *config; /* config */ static const char *cookie;...

...include <unistd.h> > #include <dlfcn.h> > +#include <fcntl.h> > > #define NBDKIT_API_VERSION 2 > > @@ -72,7 +73,8 @@ int vddk_debug_extents; > #define VDDK_MINOR 1 > > static void *dl = NULL; /* dlopen handle */ > -static int init_called = 0; /* was InitEx called */ > +static bool init_called = false; /* was InitEx called */ > +static char *reexeced = false; /* did libdir require reexec */ I guess this works, but is "NULL" better than "false"? > + /* If load_libra...

We had a query yesterday about the VDDK plugin and making it actually obey the weird "Multithreading Considerations" rules in the VDDK documentation (https://vdc-download.vmware.com/vmwb-repository/dcr-public/8f96698a-0e7b-4d67-bb6c-d18a1d101540/ef536a47-27cd-481a-90ef-76b38e75353c/vsphere-vddk-671-programming-guide.pdf) This patch is my attempt to implement this. The idea is that the

In v7: everything should work now! The re-exec code is slightly simplified, with Rich's suggestion to pass the original LD_LIBRARY_PATH rather than just the prefix being added, and I've now finished wiring up the initial dlopen() check into code that correctly computes the right prefix dir to add to LD_LIBRARY_PATH. Eric Blake (1): vddk: Add re-exec with altered environment Richard

...7d..87c0d146 100644 --- a/plugins/vddk/vddk.c +++ b/plugins/vddk/vddk.c @@ -70,7 +70,7 @@ int vddk_debug_datapath = 1; /* Parameters passed to InitEx. */ #define VDDK_MAJOR 5 -#define VDDK_MINOR 1 +#define VDDK_MINOR 5 static void *dl; /* dlopen handle */ static bool init_called; /* was InitEx called */ @@ -363,14 +363,14 @@ load_library (void) static const char *sonames[] = { /* Prefer the newest library in case multiple exist. Check two * possible directories: the usual VDDK installation puts .so - * files in an arch-specific subdirec...

...beecabc..4bfcdea7 100644 --- a/plugins/vddk/vddk.c +++ b/plugins/vddk/vddk.c @@ -71,7 +71,7 @@ int vddk_debug_extents; /* Parameters passed to InitEx. */ #define VDDK_MAJOR 5 -#define VDDK_MINOR 1 +#define VDDK_MINOR 5 static void *dl; /* dlopen handle */ static bool init_called; /* was InitEx called */ @@ -361,14 +361,14 @@ load_library (void) static const char *sonames[] = { /* Prefer the newest library in case multiple exist. Check two * possible directories: the usual VDDK installation puts .so - * files in an arch-specific subdirec...

This is my second attempt at this. The first version (also not working) was here: https://www.redhat.com/archives/libguestfs/2019-October/msg00062.html In part 1/2 I introduce a new .ready_to_serve plugin method which is called after forking and just before accepting any client connection. The idea would be that plugins could start background threads here. However this doesn't work well in

...ot;minmax.h" #include "rounding.h" -#include "vector.h" +#include "vddk.h" #include "vddk-structs.h" /* Debug flags. */ @@ -76,13 +75,12 @@ int vddk_debug_datapath = 1; static void *dl; /* dlopen handle */ static bool init_called; /* was InitEx called */ -static char *reexeced; /* orig LD_LIBRARY_PATH on reexec */ static pthread_key_t error_suppression; /* threadlocal error suppression */ static char *config; /* config */ static const char *cookie;...

I couldn't get this to work in the end. This is the latest non-working version. This email documents what doesn't work for the permanent record. The central problem is that VDDK InitEx() appears to dlopen() various of its own plugins. Although I wasn't able to capture exactly what dlopen() command it is running, the plugins cannot be loaded because they rely on the recompiled

...@ -71,7 +73,8 @@ int vddk_debug_extents; #define VDDK_MAJOR 5 #define VDDK_MINOR 1 -static void *dl = NULL; /* dlopen handle */ +static void *shimdl = NULL; /* shim dlopen handle */ +static void *dl = NULL; /* vddk dlopen handle */ static int init_called = 0; /* was InitEx called */ static char *config = NULL; /* config */ @@ -153,6 +156,8 @@ vddk_unload (void) } if (dl) dlclose (dl); + if (shimdl) + dlclose (shimdl); free (config); free (libdir); free (password); @@ -248,17 +253,67 @@ load_li...

Probably needs a bit of cleanup, but seems like it is generally the right direction. One thing I've noticed is that the expect test randomly (but rarely) hangs :-( I guess something is racey but I don't know what at the moment. Rich.