diff options
author | Nikolaus Rath <Nikolaus@rath.org> | 2018-09-17 10:45:16 +0100 |
---|---|---|
committer | Nikolaus Rath <Nikolaus@rath.org> | 2018-09-17 10:45:16 +0100 |
commit | 161983e2416bc6e26bbbe89664fff62c48c70858 (patch) | |
tree | 6cf06b3b11950ca32b854a2ce622c5da213f507d /lib/fuse_loop_mt.c | |
parent | d9bef3c6e4bd06de59589b3e5f4cbbbd2661dbfc (diff) | |
download | libfuse-161983e2416bc6e26bbbe89664fff62c48c70858.tar.gz |
Do not include struct fuse_buf in struct fuse_worker
This is only used in fuse_do_work(), so we can put it on
the stack.
Diffstat (limited to 'lib/fuse_loop_mt.c')
-rw-r--r-- | lib/fuse_loop_mt.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/fuse_loop_mt.c b/lib/fuse_loop_mt.c index 2739435..53e5b9b 100644 --- a/lib/fuse_loop_mt.c +++ b/lib/fuse_loop_mt.c @@ -32,8 +32,6 @@ struct fuse_worker { struct fuse_worker *prev; struct fuse_worker *next; pthread_t thread_id; - size_t bufsize; - struct fuse_buf fbuf; struct fuse_chan *ch; struct fuse_mt *mt; }; @@ -115,13 +113,16 @@ static void *fuse_do_work(void *data) { struct fuse_worker *w = (struct fuse_worker *) data; struct fuse_mt *mt = w->mt; + struct fuse_buf fbuf; + + memset(&fbuf, 0, sizeof(struct fuse_buf)); while (!fuse_session_exited(mt->se)) { int isforget = 0; int res; pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); - res = fuse_session_receive_buf_int(mt->se, &w->fbuf, w->ch); + res = fuse_session_receive_buf_int(mt->se, &fbuf, w->ch); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); if (res == -EINTR) continue; @@ -143,8 +144,8 @@ static void *fuse_do_work(void *data) * This disgusting hack is needed so that zillions of threads * are not created on a burst of FORGET messages */ - if (!(w->fbuf.flags & FUSE_BUF_IS_FD)) { - struct fuse_in_header *in = w->fbuf.mem; + if (!(fbuf.flags & FUSE_BUF_IS_FD)) { + struct fuse_in_header *in = fbuf.mem; if (in->opcode == FUSE_FORGET || in->opcode == FUSE_BATCH_FORGET) @@ -157,7 +158,7 @@ static void *fuse_do_work(void *data) fuse_loop_start_thread(mt); pthread_mutex_unlock(&mt->lock); - fuse_session_process_buf_int(mt->se, &w->fbuf, w->ch); + fuse_session_process_buf_int(mt->se, &fbuf, w->ch); pthread_mutex_lock(&mt->lock); if (!isforget) @@ -173,7 +174,7 @@ static void *fuse_do_work(void *data) pthread_mutex_unlock(&mt->lock); pthread_detach(w->thread_id); - free(w->fbuf.mem); + free(fbuf.mem); fuse_chan_put(w->ch); free(w); return NULL; @@ -182,6 +183,7 @@ static void *fuse_do_work(void *data) } sem_post(&mt->finish); + free(fbuf.mem); return NULL; } @@ -256,14 +258,12 @@ static struct fuse_chan *fuse_clone_chan(struct fuse_mt *mt) static int fuse_loop_start_thread(struct fuse_mt *mt) { int res; - struct fuse_worker *w = malloc(sizeof(struct fuse_worker)); if (!w) { fprintf(stderr, "fuse: failed to allocate worker structure\n"); return -1; } memset(w, 0, sizeof(struct fuse_worker)); - w->fbuf.mem = NULL; w->mt = mt; w->ch = NULL; @@ -296,7 +296,6 @@ static void fuse_join_worker(struct fuse_mt *mt, struct fuse_worker *w) pthread_mutex_lock(&mt->lock); list_del_worker(w); pthread_mutex_unlock(&mt->lock); - free(w->fbuf.mem); fuse_chan_put(w->ch); free(w); } |