diff options
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index b8f25c8cd..345845cb0 100644 --- a/src/main.c +++ b/src/main.c @@ -35,7 +35,8 @@ struct _libfuse_params libfuse_params = { 0 }; /* pointer to the fuse structure of this translator process */ struct fuse *libfuse_fuse = NULL; -__thread struct fuse_context *libfuse_ctx; +/* the key for the fuse_context */ +static pthread_key_t libfuse_ctx_key; /* the port where to write out debug messages to, NULL to omit these */ FILE *debug_port = NULL; @@ -44,6 +45,25 @@ FILE *debug_port = NULL; static int fuse_bootstrap(const char *mountpoint); +/* Destroy the fuse_context held as TSD. + */ +static void +fuse_destroy_context(void *data) +{ + free(data); +} + + +/* Create the TSD key. + */ +static void +fuse_create_key(void) +{ + int err = pthread_key_create(&libfuse_ctx_key, fuse_destroy_context); + assert_perror(err); +} + + /* Interpret a __single__ mount option * The option itself `opt' may be modified during this call. */ @@ -322,7 +342,7 @@ fuse_new(struct fuse_chan *ch, struct fuse_args *args, new->conn.max_readahead = UINT_MAX; update_context_struct(NULL, new); - libfuse_ctx->private_data = user_data; + fuse_get_context()->private_data = user_data; if(new->op.ops.init != NULL) { @@ -582,7 +602,26 @@ fuse_exited(struct fuse *f) struct fuse_context * fuse_get_context(void) { - return libfuse_ctx; + static pthread_once_t libfuse_ctx_key_once = PTHREAD_ONCE_INIT; + + pthread_once(&libfuse_ctx_key_once, fuse_create_key); + + struct fuse_context *ctx = pthread_getspecific(libfuse_ctx_key); + + if(! ctx) + { + ctx = calloc(1, sizeof(*ctx)); + if(! ctx) + { + fprintf(stderr, "Cannot allocate a new fuse_context\n"); + fprintf(stderr, "libfuse will abort now\n"); + abort(); + } + + pthread_setspecific(libfuse_ctx_key, ctx); + } + + return ctx; } |